d_a_tbox2 done, f_op_actor_mng cleanup, cleanup fopAc_ac_c member names (#2084)

This commit is contained in:
TakaRikka
2024-03-04 17:33:13 -08:00
committed by GitHub
parent 1a421c4a4e
commit dede32dbc9
334 changed files with 3797 additions and 6195 deletions
@@ -1,43 +0,0 @@
lbl_800DC5DC:
/* 800DC5DC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800DC5E0 7C 08 02 A6 */ mflr r0
/* 800DC5E4 90 01 00 24 */ stw r0, 0x24(r1)
/* 800DC5E8 39 61 00 20 */ addi r11, r1, 0x20
/* 800DC5EC 48 28 5B F1 */ bl _savegpr_29
/* 800DC5F0 7C 7D 1B 78 */ mr r29, r3
/* 800DC5F4 3B C0 00 00 */ li r30, 0
/* 800DC5F8 7F DF F3 78 */ mr r31, r30
/* 800DC5FC 80 83 27 EC */ lwz r4, 0x27ec(r3)
/* 800DC600 28 04 00 00 */ cmplwi r4, 0
/* 800DC604 41 82 00 20 */ beq lbl_800DC624
/* 800DC608 80 04 05 5C */ lwz r0, 0x55c(r4)
/* 800DC60C 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa
/* 800DC610 41 82 00 14 */ beq lbl_800DC624
/* 800DC614 4B FF 62 E1 */ bl checkCutHeadState__9daAlink_cFv
/* 800DC618 2C 03 00 00 */ cmpwi r3, 0
/* 800DC61C 40 82 00 08 */ bne lbl_800DC624
/* 800DC620 3B E0 00 01 */ li r31, 1
lbl_800DC624:
/* 800DC624 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 800DC628 41 82 00 34 */ beq lbl_800DC65C
/* 800DC62C 38 60 00 01 */ li r3, 1
/* 800DC630 80 9D 27 EC */ lwz r4, 0x27ec(r29)
/* 800DC634 88 04 04 96 */ lbz r0, 0x496(r4)
/* 800DC638 28 00 00 02 */ cmplwi r0, 2
/* 800DC63C 40 82 00 14 */ bne lbl_800DC650
/* 800DC640 A0 04 05 8E */ lhz r0, 0x58e(r4)
/* 800DC644 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 800DC648 41 82 00 08 */ beq lbl_800DC650
/* 800DC64C 38 60 00 00 */ li r3, 0
lbl_800DC650:
/* 800DC650 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800DC654 41 82 00 08 */ beq lbl_800DC65C
/* 800DC658 3B C0 00 01 */ li r30, 1
lbl_800DC65C:
/* 800DC65C 57 C3 06 3E */ clrlwi r3, r30, 0x18
/* 800DC660 39 61 00 20 */ addi r11, r1, 0x20
/* 800DC664 48 28 5B C5 */ bl _restgpr_29
/* 800DC668 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800DC66C 7C 08 03 A6 */ mtlr r0
/* 800DC670 38 21 00 20 */ addi r1, r1, 0x20
/* 800DC674 4E 80 00 20 */ blr
@@ -1,17 +0,0 @@
lbl_800DC5A4:
/* 800DC5A4 A8 03 00 08 */ lha r0, 8(r3)
/* 800DC5A8 38 80 00 00 */ li r4, 0
/* 800DC5AC 2C 00 02 41 */ cmpwi r0, 0x241
/* 800DC5B0 41 82 00 20 */ beq lbl_800DC5D0
/* 800DC5B4 2C 00 02 5A */ cmpwi r0, 0x25a
/* 800DC5B8 41 82 00 18 */ beq lbl_800DC5D0
/* 800DC5BC 2C 00 00 21 */ cmpwi r0, 0x21
/* 800DC5C0 40 82 00 14 */ bne lbl_800DC5D4
/* 800DC5C4 88 03 0A 7E */ lbz r0, 0xa7e(r3)
/* 800DC5C8 28 00 00 01 */ cmplwi r0, 1
/* 800DC5CC 41 82 00 08 */ beq lbl_800DC5D4
lbl_800DC5D0:
/* 800DC5D0 38 80 00 01 */ li r4, 1
lbl_800DC5D4:
/* 800DC5D4 54 83 06 3E */ clrlwi r3, r4, 0x18
/* 800DC5D8 4E 80 00 20 */ blr
@@ -1,53 +0,0 @@
lbl_800DD114:
/* 800DD114 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800DD118 7C 08 02 A6 */ mflr r0
/* 800DD11C 90 01 00 24 */ stw r0, 0x24(r1)
/* 800DD120 39 61 00 20 */ addi r11, r1, 0x20
/* 800DD124 48 28 50 B5 */ bl _savegpr_28
/* 800DD128 7C 7C 1B 78 */ mr r28, r3
/* 800DD12C 7C 9D 23 78 */ mr r29, r4
/* 800DD130 4B FF F8 FD */ bl checkWoodShieldEquipNotIronBall__9daAlink_cCFv
/* 800DD134 2C 03 00 00 */ cmpwi r3, 0
/* 800DD138 41 82 00 20 */ beq lbl_800DD158
/* 800DD13C 7F 83 E3 78 */ mr r3, r28
/* 800DD140 4B FF A6 89 */ bl checkMagicArmorNoDamage__9daAlink_cFv
/* 800DD144 2C 03 00 00 */ cmpwi r3, 0
/* 800DD148 40 82 00 10 */ bne lbl_800DD158
/* 800DD14C 3B E0 00 29 */ li r31, 0x29
/* 800DD150 3B C0 00 00 */ li r30, 0
/* 800DD154 48 00 00 0C */ b lbl_800DD160
lbl_800DD158:
/* 800DD158 3B E0 00 28 */ li r31, 0x28
/* 800DD15C 3B C0 00 01 */ li r30, 1
lbl_800DD160:
/* 800DD160 7F A3 EB 78 */ mr r3, r29
/* 800DD164 4B FA 73 E5 */ bl GetTgHitGObj__12dCcD_GObjInfFv
/* 800DD168 28 03 00 00 */ cmplwi r3, 0
/* 800DD16C 41 82 00 24 */ beq lbl_800DD190
/* 800DD170 7F A3 EB 78 */ mr r3, r29
/* 800DD174 4B FA 73 D5 */ bl GetTgHitGObj__12dCcD_GObjInfFv
/* 800DD178 80 03 00 10 */ lwz r0, 0x10(r3)
/* 800DD17C 28 00 00 20 */ cmplwi r0, 0x20
/* 800DD180 40 82 00 10 */ bne lbl_800DD190
/* 800DD184 3C 60 00 04 */ lis r3, 0x0004 /* 0x0004000B@ha */
/* 800DD188 38 83 00 0B */ addi r4, r3, 0x000B /* 0x0004000B@l */
/* 800DD18C 48 00 00 18 */ b lbl_800DD1A4
lbl_800DD190:
/* 800DD190 7F A3 EB 78 */ mr r3, r29
/* 800DD194 4B FA 73 E9 */ bl GetTgHitObjSe__12dCcD_GObjInfFv
/* 800DD198 7F C4 F3 78 */ mr r4, r30
/* 800DD19C 4B FA 74 15 */ bl getHitSeID__12dCcD_GObjInfFUci
/* 800DD1A0 7C 64 1B 78 */ mr r4, r3
lbl_800DD1A4:
/* 800DD1A4 38 7C 2C A8 */ addi r3, r28, 0x2ca8
/* 800DD1A8 7F E5 FB 78 */ mr r5, r31
/* 800DD1AC 81 9C 2C A8 */ lwz r12, 0x2ca8(r28)
/* 800DD1B0 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 800DD1B4 7D 89 03 A6 */ mtctr r12
/* 800DD1B8 4E 80 04 21 */ bctrl
/* 800DD1BC 39 61 00 20 */ addi r11, r1, 0x20
/* 800DD1C0 48 28 50 65 */ bl _restgpr_28
/* 800DD1C4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800DD1C8 7C 08 03 A6 */ mtlr r0
/* 800DD1CC 38 21 00 20 */ addi r1, r1, 0x20
/* 800DD1D0 4E 80 00 20 */ blr
@@ -1,20 +0,0 @@
lbl_8001DB90:
/* 8001DB90 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8001DB94 7C 08 02 A6 */ mflr r0
/* 8001DB98 90 01 00 14 */ stw r0, 0x14(r1)
/* 8001DB9C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8001DBA0 7C 7F 1B 79 */ or. r31, r3, r3
/* 8001DBA4 41 82 00 1C */ beq lbl_8001DBC0
/* 8001DBA8 3C A0 80 3A */ lis r5, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */
/* 8001DBAC 38 05 37 C0 */ addi r0, r5, __vt__8cM3dGPla@l /* 0x803A37C0@l */
/* 8001DBB0 90 1F 00 10 */ stw r0, 0x10(r31)
/* 8001DBB4 7C 80 07 35 */ extsh. r0, r4
/* 8001DBB8 40 81 00 08 */ ble lbl_8001DBC0
/* 8001DBBC 48 2B 11 81 */ bl __dl__FPv
lbl_8001DBC0:
/* 8001DBC0 7F E3 FB 78 */ mr r3, r31
/* 8001DBC4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8001DBC8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001DBCC 7C 08 03 A6 */ mtlr r0
/* 8001DBD0 38 21 00 10 */ addi r1, r1, 0x10
/* 8001DBD4 4E 80 00 20 */ blr
@@ -1,47 +0,0 @@
lbl_8001DAE4:
/* 8001DAE4 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 8001DAE8 7C 08 02 A6 */ mflr r0
/* 8001DAEC 90 01 00 34 */ stw r0, 0x34(r1)
/* 8001DAF0 39 61 00 30 */ addi r11, r1, 0x30
/* 8001DAF4 48 34 46 E9 */ bl _savegpr_29
/* 8001DAF8 7C 7D 1B 78 */ mr r29, r3
/* 8001DAFC 7C 9E 23 78 */ mr r30, r4
/* 8001DB00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8001DB04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8001DB08 3B E3 0F 38 */ addi r31, r3, 0xf38
/* 8001DB0C 7F E3 FB 78 */ mr r3, r31
/* 8001DB10 7F A4 EB 78 */ mr r4, r29
/* 8001DB14 48 05 6B 4D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo
/* 8001DB18 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8001DB1C 40 82 00 0C */ bne lbl_8001DB28
/* 8001DB20 38 60 00 00 */ li r3, 0
/* 8001DB24 48 00 00 54 */ b lbl_8001DB78
lbl_8001DB28:
/* 8001DB28 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */
/* 8001DB2C 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */
/* 8001DB30 90 01 00 18 */ stw r0, 0x18(r1)
/* 8001DB34 7F E3 FB 78 */ mr r3, r31
/* 8001DB38 7F A4 EB 78 */ mr r4, r29
/* 8001DB3C 38 A1 00 08 */ addi r5, r1, 8
/* 8001DB40 48 05 6C 05 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla
/* 8001DB44 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8001DB48 40 82 00 18 */ bne lbl_8001DB60
/* 8001DB4C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */
/* 8001DB50 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */
/* 8001DB54 90 01 00 18 */ stw r0, 0x18(r1)
/* 8001DB58 38 60 00 00 */ li r3, 0
/* 8001DB5C 48 00 00 1C */ b lbl_8001DB78
lbl_8001DB60:
/* 8001DB60 38 61 00 08 */ addi r3, r1, 8
/* 8001DB64 7F C4 F3 78 */ mr r4, r30
/* 8001DB68 48 00 00 71 */ bl fopAcM_getPolygonAngle__FPC8cM3dGPlas
/* 8001DB6C 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */
/* 8001DB70 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */
/* 8001DB74 90 01 00 18 */ stw r0, 0x18(r1)
lbl_8001DB78:
/* 8001DB78 39 61 00 30 */ addi r11, r1, 0x30
/* 8001DB7C 48 34 46 AD */ bl _restgpr_29
/* 8001DB80 80 01 00 34 */ lwz r0, 0x34(r1)
/* 8001DB84 7C 08 03 A6 */ mtlr r0
/* 8001DB88 38 21 00 30 */ addi r1, r1, 0x30
/* 8001DB8C 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_8001D890:
/* 8001D890 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8001D894 7C 08 02 A6 */ mflr r0
/* 8001D898 90 01 00 14 */ stw r0, 0x14(r1)
/* 8001D89C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8001D8A0 7C 9F 23 78 */ mr r31, r4
/* 8001D8A4 48 00 04 E1 */ bl waterCheck__11fopAcM_wt_cFPC4cXyz
/* 8001D8A8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8001D8AC 41 82 00 34 */ beq lbl_8001D8E0
/* 8001D8B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8001D8B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8001D8B8 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8001D8BC 3C 80 80 3F */ lis r4, mWaterCheck__11fopAcM_wt_c@ha /* 0x803F1D80@ha */
/* 8001D8C0 38 84 1D 80 */ addi r4, r4, mWaterCheck__11fopAcM_wt_c@l /* 0x803F1D80@l */
/* 8001D8C4 48 05 75 8D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo
/* 8001D8C8 2C 03 00 06 */ cmpwi r3, 6
/* 8001D8CC 41 82 00 14 */ beq lbl_8001D8E0
/* 8001D8D0 C0 0D 87 58 */ lfs f0, mWaterY__11fopAcM_wt_c(r13)
/* 8001D8D4 D0 1F 00 00 */ stfs f0, 0(r31)
/* 8001D8D8 38 60 00 01 */ li r3, 1
/* 8001D8DC 48 00 00 10 */ b lbl_8001D8EC
lbl_8001D8E0:
/* 8001D8E0 C0 02 82 58 */ lfs f0, lit_6353(r2)
/* 8001D8E4 D0 1F 00 00 */ stfs f0, 0(r31)
/* 8001D8E8 38 60 00 00 */ li r3, 0
lbl_8001D8EC:
/* 8001D8EC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8001D8F0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001D8F4 7C 08 03 A6 */ mtlr r0
/* 8001D8F8 38 21 00 10 */ addi r1, r1, 0x10
/* 8001D8FC 4E 80 00 20 */ blr
@@ -1,25 +0,0 @@
lbl_8001DCBC:
/* 8001DCBC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8001DCC0 7C 08 02 A6 */ mflr r0
/* 8001DCC4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8001DCC8 7C 64 1B 78 */ mr r4, r3
/* 8001DCCC 3C 60 80 3F */ lis r3, mGndCheck__11fopAcM_gc_c@ha /* 0x803F1CC4@ha */
/* 8001DCD0 38 63 1C C4 */ addi r3, r3, mGndCheck__11fopAcM_gc_c@l /* 0x803F1CC4@l */
/* 8001DCD4 48 24 A0 55 */ bl SetPos__11cBgS_GndChkFPC4cXyz
/* 8001DCD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8001DCDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8001DCE0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8001DCE4 3C 80 80 3F */ lis r4, mGndCheck__11fopAcM_gc_c@ha /* 0x803F1CC4@ha */
/* 8001DCE8 38 84 1C C4 */ addi r4, r4, mGndCheck__11fopAcM_gc_c@l /* 0x803F1CC4@l */
/* 8001DCEC 48 05 67 B5 */ bl GroundCross__4cBgSFP11cBgS_GndChk
/* 8001DCF0 D0 2D 87 50 */ stfs f1, mGroundY__11fopAcM_gc_c(r13)
/* 8001DCF4 C0 42 82 58 */ lfs f2, lit_6353(r2)
/* 8001DCF8 FC 00 08 18 */ frsp f0, f1
/* 8001DCFC FC 02 00 00 */ fcmpu cr0, f2, f0
/* 8001DD00 7C 00 00 26 */ mfcr r0
/* 8001DD04 54 00 1F FE */ rlwinm r0, r0, 3, 0x1f, 0x1f
/* 8001DD08 68 03 00 01 */ xori r3, r0, 1
/* 8001DD0C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001DD10 7C 08 03 A6 */ mtlr r0
/* 8001DD14 38 21 00 10 */ addi r1, r1, 0x10
/* 8001DD18 4E 80 00 20 */ blr
@@ -1,27 +0,0 @@
lbl_8001DD1C:
/* 8001DD1C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8001DD20 7C 08 02 A6 */ mflr r0
/* 8001DD24 90 01 00 14 */ stw r0, 0x14(r1)
/* 8001DD28 C0 03 00 00 */ lfs f0, 0(r3)
/* 8001DD2C 3C 80 80 3F */ lis r4, mRoofCheck__11fopAcM_rc_c@ha /* 0x803F1D24@ha */
/* 8001DD30 38 84 1D 24 */ addi r4, r4, mRoofCheck__11fopAcM_rc_c@l /* 0x803F1D24@l */
/* 8001DD34 D0 04 00 3C */ stfs f0, 0x3c(r4)
/* 8001DD38 C0 03 00 04 */ lfs f0, 4(r3)
/* 8001DD3C D0 04 00 40 */ stfs f0, 0x40(r4)
/* 8001DD40 C0 03 00 08 */ lfs f0, 8(r3)
/* 8001DD44 D0 04 00 44 */ stfs f0, 0x44(r4)
/* 8001DD48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8001DD4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8001DD50 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8001DD54 48 05 77 49 */ bl RoofChk__4dBgSFP12dBgS_RoofChk
/* 8001DD58 D0 2D 87 54 */ stfs f1, mRoofY__11fopAcM_rc_c(r13)
/* 8001DD5C C0 42 82 5C */ lfs f2, lit_6517(r2)
/* 8001DD60 FC 00 08 18 */ frsp f0, f1
/* 8001DD64 FC 02 00 00 */ fcmpu cr0, f2, f0
/* 8001DD68 7C 00 00 26 */ mfcr r0
/* 8001DD6C 54 00 1F FE */ rlwinm r0, r0, 3, 0x1f, 0x1f
/* 8001DD70 68 03 00 01 */ xori r3, r0, 1
/* 8001DD74 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001DD78 7C 08 03 A6 */ mtlr r0
/* 8001DD7C 38 21 00 10 */ addi r1, r1, 0x10
/* 8001DD80 4E 80 00 20 */ blr
@@ -1,38 +0,0 @@
lbl_8001DD84:
/* 8001DD84 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8001DD88 7C 08 02 A6 */ mflr r0
/* 8001DD8C 90 01 00 24 */ stw r0, 0x24(r1)
/* 8001DD90 C0 83 00 08 */ lfs f4, 8(r3)
/* 8001DD94 C0 43 00 04 */ lfs f2, 4(r3)
/* 8001DD98 C0 22 82 60 */ lfs f1, lit_6538(r2)
/* 8001DD9C EC 62 08 28 */ fsubs f3, f2, f1
/* 8001DDA0 C0 03 00 00 */ lfs f0, 0(r3)
/* 8001DDA4 D0 01 00 08 */ stfs f0, 8(r1)
/* 8001DDA8 D0 61 00 0C */ stfs f3, 0xc(r1)
/* 8001DDAC D0 81 00 10 */ stfs f4, 0x10(r1)
/* 8001DDB0 3C 60 80 3F */ lis r3, mWaterCheck__11fopAcM_wt_c@ha /* 0x803F1D80@ha */
/* 8001DDB4 38 63 1D 80 */ addi r3, r3, mWaterCheck__11fopAcM_wt_c@l /* 0x803F1D80@l */
/* 8001DDB8 38 81 00 08 */ addi r4, r1, 8
/* 8001DDBC EC 21 10 2A */ fadds f1, f1, f2
/* 8001DDC0 48 05 AD D1 */ bl Set__14dBgS_SplGrpChkFR4cXyzf
/* 8001DDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8001DDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8001DDCC 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8001DDD0 3C 80 80 3F */ lis r4, mWaterCheck__11fopAcM_wt_c@ha /* 0x803F1D80@ha */
/* 8001DDD4 38 84 1D 80 */ addi r4, r4, mWaterCheck__11fopAcM_wt_c@l /* 0x803F1D80@l */
/* 8001DDD8 48 05 77 8D */ bl SplGrpChk__4dBgSFP14dBgS_SplGrpChk
/* 8001DDDC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8001DDE0 41 82 00 1C */ beq lbl_8001DDFC
/* 8001DDE4 3C 60 80 3F */ lis r3, mWaterCheck__11fopAcM_wt_c@ha /* 0x803F1D80@ha */
/* 8001DDE8 38 63 1D 80 */ addi r3, r3, mWaterCheck__11fopAcM_wt_c@l /* 0x803F1D80@l */
/* 8001DDEC C0 03 00 4C */ lfs f0, 0x4c(r3)
/* 8001DDF0 D0 0D 87 58 */ stfs f0, mWaterY__11fopAcM_wt_c(r13)
/* 8001DDF4 38 60 00 01 */ li r3, 1
/* 8001DDF8 48 00 00 08 */ b lbl_8001DE00
lbl_8001DDFC:
/* 8001DDFC 38 60 00 00 */ li r3, 0
lbl_8001DE00:
/* 8001DE00 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8001DE04 7C 08 03 A6 */ mtlr r0
/* 8001DE08 38 21 00 20 */ addi r1, r1, 0x20
/* 8001DE0C 4E 80 00 20 */ blr
@@ -1,126 +0,0 @@
lbl_80496C20:
/* 80496C20 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80496C24 7C 08 02 A6 */ mflr r0
/* 80496C28 90 01 00 24 */ stw r0, 0x24(r1)
/* 80496C2C 39 61 00 20 */ addi r11, r1, 0x20
/* 80496C30 4B EC B5 A9 */ bl _savegpr_28
/* 80496C34 7C 7E 1B 78 */ mr r30, r3
/* 80496C38 3C 60 80 4A */ lis r3, l_arcName@ha /* 0x8049827C@ha */
/* 80496C3C 38 63 82 7C */ addi r3, r3, l_arcName@l /* 0x8049827C@l */
/* 80496C40 80 63 00 00 */ lwz r3, 0(r3)
/* 80496C44 88 1E 0A BC */ lbz r0, 0xabc(r30)
/* 80496C48 54 00 20 36 */ slwi r0, r0, 4
/* 80496C4C 3C 80 80 4A */ lis r4, l_resInfo@ha /* 0x80498160@ha */
/* 80496C50 38 84 81 60 */ addi r4, r4, l_resInfo@l /* 0x80498160@l */
/* 80496C54 7C 84 00 2E */ lwzx r4, r4, r0
/* 80496C58 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80496C5C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80496C60 3F E5 00 02 */ addis r31, r5, 2
/* 80496C64 3B FF C2 F8 */ addi r31, r31, -15624
/* 80496C68 7F E5 FB 78 */ mr r5, r31
/* 80496C6C 38 C0 00 80 */ li r6, 0x80
/* 80496C70 4B BA 56 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80496C74 3C 80 00 08 */ lis r4, 8
/* 80496C78 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */
/* 80496C7C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */
/* 80496C80 4B B7 DF D5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
/* 80496C84 90 7E 07 24 */ stw r3, 0x724(r30)
/* 80496C88 80 1E 07 24 */ lwz r0, 0x724(r30)
/* 80496C8C 28 00 00 00 */ cmplwi r0, 0
/* 80496C90 40 82 00 0C */ bne lbl_80496C9C
/* 80496C94 38 60 00 00 */ li r3, 0
/* 80496C98 48 00 01 44 */ b lbl_80496DDC
lbl_80496C9C:
/* 80496C9C 3C 60 80 4A */ lis r3, l_arcName@ha /* 0x8049827C@ha */
/* 80496CA0 38 63 82 7C */ addi r3, r3, l_arcName@l /* 0x8049827C@l */
/* 80496CA4 80 63 00 00 */ lwz r3, 0(r3)
/* 80496CA8 3C 80 80 4A */ lis r4, l_resInfo@ha /* 0x80498160@ha */
/* 80496CAC 38 84 81 60 */ addi r4, r4, l_resInfo@l /* 0x80498160@l */
/* 80496CB0 88 1E 0A BC */ lbz r0, 0xabc(r30)
/* 80496CB4 54 00 20 36 */ slwi r0, r0, 4
/* 80496CB8 7C 84 02 14 */ add r4, r4, r0
/* 80496CBC 80 84 00 04 */ lwz r4, 4(r4)
/* 80496CC0 7F E5 FB 78 */ mr r5, r31
/* 80496CC4 38 C0 00 80 */ li r6, 0x80
/* 80496CC8 4B BA 56 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80496CCC 7C 7C 1B 78 */ mr r28, r3
/* 80496CD0 38 60 00 1C */ li r3, 0x1c
/* 80496CD4 4B E3 7F 79 */ bl __nw__FUl
/* 80496CD8 7C 7D 1B 79 */ or. r29, r3, r3
/* 80496CDC 41 82 00 20 */ beq lbl_80496CFC
/* 80496CE0 3C 80 80 4A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80498444@ha */
/* 80496CE4 38 04 84 44 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80498444@l */
/* 80496CE8 90 1D 00 00 */ stw r0, 0(r29)
/* 80496CEC 38 80 00 00 */ li r4, 0
/* 80496CF0 4B E9 17 0D */ bl init__12J3DFrameCtrlFs
/* 80496CF4 38 00 00 00 */ li r0, 0
/* 80496CF8 90 1D 00 18 */ stw r0, 0x18(r29)
lbl_80496CFC:
/* 80496CFC 93 BE 07 28 */ stw r29, 0x728(r30)
/* 80496D00 80 7E 07 28 */ lwz r3, 0x728(r30)
/* 80496D04 28 03 00 00 */ cmplwi r3, 0
/* 80496D08 41 82 00 30 */ beq lbl_80496D38
/* 80496D0C 7F 84 E3 78 */ mr r4, r28
/* 80496D10 38 A0 00 01 */ li r5, 1
/* 80496D14 38 C0 00 00 */ li r6, 0
/* 80496D18 3C E0 80 4A */ lis r7, lit_3763@ha /* 0x804981D0@ha */
/* 80496D1C C0 27 81 D0 */ lfs f1, lit_3763@l(r7) /* 0x804981D0@l */
/* 80496D20 38 E0 00 00 */ li r7, 0
/* 80496D24 39 00 FF FF */ li r8, -1
/* 80496D28 39 20 00 00 */ li r9, 0
/* 80496D2C 4B B7 6A B1 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb
/* 80496D30 2C 03 00 00 */ cmpwi r3, 0
/* 80496D34 40 82 00 0C */ bne lbl_80496D40
lbl_80496D38:
/* 80496D38 38 60 00 00 */ li r3, 0
/* 80496D3C 48 00 00 A0 */ b lbl_80496DDC
lbl_80496D40:
/* 80496D40 38 60 00 C0 */ li r3, 0xc0
/* 80496D44 4B E3 7F 09 */ bl __nw__FUl
/* 80496D48 7C 60 1B 79 */ or. r0, r3, r3
/* 80496D4C 41 82 00 0C */ beq lbl_80496D58
/* 80496D50 4B BE 4C 21 */ bl __ct__4dBgWFv
/* 80496D54 7C 60 1B 78 */ mr r0, r3
lbl_80496D58:
/* 80496D58 90 1E 0A C8 */ stw r0, 0xac8(r30)
/* 80496D5C 80 1E 0A C8 */ lwz r0, 0xac8(r30)
/* 80496D60 28 00 00 00 */ cmplwi r0, 0
/* 80496D64 41 82 00 64 */ beq lbl_80496DC8
/* 80496D68 3C 60 80 4A */ lis r3, l_arcName@ha /* 0x8049827C@ha */
/* 80496D6C 38 63 82 7C */ addi r3, r3, l_arcName@l /* 0x8049827C@l */
/* 80496D70 80 63 00 00 */ lwz r3, 0(r3)
/* 80496D74 3C 80 80 4A */ lis r4, l_resInfo@ha /* 0x80498160@ha */
/* 80496D78 38 84 81 60 */ addi r4, r4, l_resInfo@l /* 0x80498160@l */
/* 80496D7C 88 1E 0A BC */ lbz r0, 0xabc(r30)
/* 80496D80 54 00 20 36 */ slwi r0, r0, 4
/* 80496D84 7C 84 02 14 */ add r4, r4, r0
/* 80496D88 80 84 00 0C */ lwz r4, 0xc(r4)
/* 80496D8C 7F E5 FB 78 */ mr r5, r31
/* 80496D90 38 C0 00 80 */ li r6, 0x80
/* 80496D94 4B BA 55 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80496D98 7C 64 1B 78 */ mr r4, r3
/* 80496D9C 80 7E 0A C8 */ lwz r3, 0xac8(r30)
/* 80496DA0 38 A0 00 01 */ li r5, 1
/* 80496DA4 38 DE 05 6C */ addi r6, r30, 0x56c
/* 80496DA8 4B BE 31 91 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f
/* 80496DAC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80496DB0 40 82 00 18 */ bne lbl_80496DC8
/* 80496DB4 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */
/* 80496DB8 38 03 5A D8 */ addi r0, r3, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */
/* 80496DBC 80 7E 0A C8 */ lwz r3, 0xac8(r30)
/* 80496DC0 90 03 00 B0 */ stw r0, 0xb0(r3)
/* 80496DC4 48 00 00 14 */ b lbl_80496DD8
lbl_80496DC8:
/* 80496DC8 38 00 00 00 */ li r0, 0
/* 80496DCC 90 1E 0A C8 */ stw r0, 0xac8(r30)
/* 80496DD0 38 60 00 00 */ li r3, 0
/* 80496DD4 48 00 00 08 */ b lbl_80496DDC
lbl_80496DD8:
/* 80496DD8 38 60 00 01 */ li r3, 1
lbl_80496DDC:
/* 80496DDC 39 61 00 20 */ addi r11, r1, 0x20
/* 80496DE0 4B EC B4 45 */ bl _restgpr_28
/* 80496DE4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80496DE8 7C 08 03 A6 */ mtlr r0
/* 80496DEC 38 21 00 20 */ addi r1, r1, 0x20
/* 80496DF0 4E 80 00 20 */ blr
@@ -1,93 +0,0 @@
lbl_80496AB8:
/* 80496AB8 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80496ABC 7C 08 02 A6 */ mflr r0
/* 80496AC0 90 01 00 34 */ stw r0, 0x34(r1)
/* 80496AC4 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 80496AC8 93 C1 00 28 */ stw r30, 0x28(r1)
/* 80496ACC 7C 7F 1B 78 */ mr r31, r3
/* 80496AD0 3C 80 80 4A */ lis r4, l_resInfo@ha /* 0x80498160@ha */
/* 80496AD4 3B C4 81 60 */ addi r30, r4, l_resInfo@l /* 0x80498160@l */
/* 80496AD8 48 00 0F 35 */ bl init_actionOpenWait__9daTbox2_cFv
/* 80496ADC 7F E3 FB 78 */ mr r3, r31
/* 80496AE0 4B FF FF 39 */ bl initBaseMtx__9daTbox2_cFv
/* 80496AE4 80 7F 07 24 */ lwz r3, 0x724(r31)
/* 80496AE8 38 03 00 24 */ addi r0, r3, 0x24
/* 80496AEC 90 1F 05 04 */ stw r0, 0x504(r31)
/* 80496AF0 80 7F 07 24 */ lwz r3, 0x724(r31)
/* 80496AF4 80 83 00 04 */ lwz r4, 4(r3)
/* 80496AF8 7F E3 FB 78 */ mr r3, r31
/* 80496AFC 4B B8 3A 7D */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData
/* 80496B00 38 00 00 40 */ li r0, 0x40
/* 80496B04 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 80496B08 80 1F 05 5C */ lwz r0, 0x55c(r31)
/* 80496B0C 64 00 00 40 */ oris r0, r0, 0x40
/* 80496B10 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 80496B14 38 7F 09 04 */ addi r3, r31, 0x904
/* 80496B18 C0 3E 00 5C */ lfs f1, 0x5c(r30)
/* 80496B1C C0 5E 00 60 */ lfs f2, 0x60(r30)
/* 80496B20 4B BD F4 39 */ bl SetWall__12dBgS_AcchCirFff
/* 80496B24 38 1F 04 E4 */ addi r0, r31, 0x4e4
/* 80496B28 90 01 00 08 */ stw r0, 8(r1)
/* 80496B2C 38 7F 07 2C */ addi r3, r31, 0x72c
/* 80496B30 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 80496B34 38 BF 04 BC */ addi r5, r31, 0x4bc
/* 80496B38 7F E6 FB 78 */ mr r6, r31
/* 80496B3C 38 E0 00 01 */ li r7, 1
/* 80496B40 39 1F 09 04 */ addi r8, r31, 0x904
/* 80496B44 39 3F 04 F8 */ addi r9, r31, 0x4f8
/* 80496B48 39 5F 04 DC */ addi r10, r31, 0x4dc
/* 80496B4C 4B BD F6 FD */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz
/* 80496B50 C0 1E 00 64 */ lfs f0, 0x64(r30)
/* 80496B54 D0 1F 05 30 */ stfs f0, 0x530(r31)
/* 80496B58 38 7F 09 44 */ addi r3, r31, 0x944
/* 80496B5C 38 80 00 FF */ li r4, 0xff
/* 80496B60 38 A0 00 FF */ li r5, 0xff
/* 80496B64 7F E6 FB 78 */ mr r6, r31
/* 80496B68 4B BE CC F9 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c
/* 80496B6C 38 7F 09 80 */ addi r3, r31, 0x980
/* 80496B70 3C 80 80 4A */ lis r4, l_cyl_src@ha /* 0x80498284@ha */
/* 80496B74 38 84 82 84 */ addi r4, r4, l_cyl_src@l /* 0x80498284@l */
/* 80496B78 4B BE DD 3D */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl
/* 80496B7C 38 1F 09 44 */ addi r0, r31, 0x944
/* 80496B80 90 1F 09 C4 */ stw r0, 0x9c4(r31)
/* 80496B84 38 7F 0A A4 */ addi r3, r31, 0xaa4
/* 80496B88 88 1F 0A BC */ lbz r0, 0xabc(r31)
/* 80496B8C 1C 00 00 14 */ mulli r0, r0, 0x14
/* 80496B90 38 9E 00 20 */ addi r4, r30, 0x20
/* 80496B94 7C 84 02 14 */ add r4, r4, r0
/* 80496B98 4B DD 85 7D */ bl Set__8cM3dGCylFRC9cM3dGCylS
/* 80496B9C C0 5F 04 A8 */ lfs f2, 0x4a8(r31)
/* 80496BA0 D0 41 00 1C */ stfs f2, 0x1c(r1)
/* 80496BA4 C0 3F 04 AC */ lfs f1, 0x4ac(r31)
/* 80496BA8 D0 21 00 20 */ stfs f1, 0x20(r1)
/* 80496BAC C0 1F 04 B0 */ lfs f0, 0x4b0(r31)
/* 80496BB0 D0 01 00 24 */ stfs f0, 0x24(r1)
/* 80496BB4 D0 41 00 10 */ stfs f2, 0x10(r1)
/* 80496BB8 D0 21 00 14 */ stfs f1, 0x14(r1)
/* 80496BBC D0 01 00 18 */ stfs f0, 0x18(r1)
/* 80496BC0 C0 1E 00 68 */ lfs f0, 0x68(r30)
/* 80496BC4 EC 01 00 2A */ fadds f0, f1, f0
/* 80496BC8 D0 01 00 20 */ stfs f0, 0x20(r1)
/* 80496BCC C0 1E 00 6C */ lfs f0, 0x6c(r30)
/* 80496BD0 EC 01 00 28 */ fsubs f0, f1, f0
/* 80496BD4 D0 01 00 14 */ stfs f0, 0x14(r1)
/* 80496BD8 38 61 00 1C */ addi r3, r1, 0x1c
/* 80496BDC 38 81 00 10 */ addi r4, r1, 0x10
/* 80496BE0 7F E5 FB 78 */ mr r5, r31
/* 80496BE4 4B B8 70 85 */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c
/* 80496BE8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80496BEC 40 82 00 10 */ bne lbl_80496BFC
/* 80496BF0 38 00 00 00 */ li r0, 0
/* 80496BF4 98 1F 0A BE */ stb r0, 0xabe(r31)
/* 80496BF8 48 00 00 0C */ b lbl_80496C04
lbl_80496BFC:
/* 80496BFC 38 00 00 01 */ li r0, 1
/* 80496C00 98 1F 0A BE */ stb r0, 0xabe(r31)
lbl_80496C04:
/* 80496C04 38 60 00 01 */ li r3, 1
/* 80496C08 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 80496C0C 83 C1 00 28 */ lwz r30, 0x28(r1)
/* 80496C10 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80496C14 7C 08 03 A6 */ mtlr r0
/* 80496C18 38 21 00 30 */ addi r1, r1, 0x30
/* 80496C1C 4E 80 00 20 */ blr
@@ -1,29 +0,0 @@
lbl_80497E6C:
/* 80497E6C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80497E70 7C 08 02 A6 */ mflr r0
/* 80497E74 90 01 00 14 */ stw r0, 0x14(r1)
/* 80497E78 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80497E7C 7C 7F 1B 78 */ mr r31, r3
/* 80497E80 80 63 0A C8 */ lwz r3, 0xac8(r3)
/* 80497E84 28 03 00 00 */ cmplwi r3, 0
/* 80497E88 41 82 00 24 */ beq lbl_80497EAC
/* 80497E8C 4B DD 03 49 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80497E90 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80497E94 41 82 00 18 */ beq lbl_80497EAC
/* 80497E98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497E9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497EA0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80497EA4 80 9F 0A C8 */ lwz r4, 0xac8(r31)
/* 80497EA8 4B BD C3 A9 */ bl Release__4cBgSFP9dBgW_Base
lbl_80497EAC:
/* 80497EAC 38 7F 07 1C */ addi r3, r31, 0x71c
/* 80497EB0 3C 80 80 4A */ lis r4, l_arcName@ha /* 0x8049827C@ha */
/* 80497EB4 38 84 82 7C */ addi r4, r4, l_arcName@l /* 0x8049827C@l */
/* 80497EB8 80 84 00 00 */ lwz r4, 0(r4)
/* 80497EBC 4B B9 51 4D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
/* 80497EC0 38 60 00 01 */ li r3, 1
/* 80497EC4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80497EC8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80497ECC 7C 08 03 A6 */ mtlr r0
/* 80497ED0 38 21 00 10 */ addi r1, r1, 0x10
/* 80497ED4 4E 80 00 20 */ blr
@@ -1,54 +0,0 @@
lbl_80497DA0:
/* 80497DA0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80497DA4 7C 08 02 A6 */ mflr r0
/* 80497DA8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80497DAC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80497DB0 93 C1 00 08 */ stw r30, 8(r1)
/* 80497DB4 7C 7E 1B 78 */ mr r30, r3
/* 80497DB8 88 03 0A BF */ lbz r0, 0xabf(r3)
/* 80497DBC 28 00 00 00 */ cmplwi r0, 0
/* 80497DC0 41 82 00 0C */ beq lbl_80497DCC
/* 80497DC4 38 60 00 01 */ li r3, 1
/* 80497DC8 48 00 00 8C */ b lbl_80497E54
lbl_80497DCC:
/* 80497DCC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80497DD0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80497DD4 38 80 00 10 */ li r4, 0x10
/* 80497DD8 38 BE 04 D0 */ addi r5, r30, 0x4d0
/* 80497DDC 38 DE 01 0C */ addi r6, r30, 0x10c
/* 80497DE0 4B D0 B9 E5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c
/* 80497DE4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80497DE8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80497DEC 80 9E 07 24 */ lwz r4, 0x724(r30)
/* 80497DF0 80 84 00 04 */ lwz r4, 4(r4)
/* 80497DF4 38 BE 01 0C */ addi r5, r30, 0x10c
/* 80497DF8 4B D0 CF A9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c
/* 80497DFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497E00 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497E04 80 04 5F 70 */ lwz r0, 0x5f70(r4)
/* 80497E08 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 80497E0C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */
/* 80497E10 90 1F 00 48 */ stw r0, 0x48(r31)
/* 80497E14 80 04 5F 74 */ lwz r0, 0x5f74(r4)
/* 80497E18 90 1F 00 4C */ stw r0, 0x4c(r31)
/* 80497E1C 80 7E 07 24 */ lwz r3, 0x724(r30)
/* 80497E20 80 83 00 04 */ lwz r4, 4(r3)
/* 80497E24 80 7E 07 28 */ lwz r3, 0x728(r30)
/* 80497E28 C0 23 00 10 */ lfs f1, 0x10(r3)
/* 80497E2C 4B B7 5B A1 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf
/* 80497E30 80 7E 07 24 */ lwz r3, 0x724(r30)
/* 80497E34 4B B7 5E 91 */ bl mDoExt_modelUpdateDL__FP8J3DModel
/* 80497E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497E40 80 03 5F 80 */ lwz r0, 0x5f80(r3)
/* 80497E44 90 1F 00 48 */ stw r0, 0x48(r31)
/* 80497E48 80 03 5F 84 */ lwz r0, 0x5f84(r3)
/* 80497E4C 90 1F 00 4C */ stw r0, 0x4c(r31)
/* 80497E50 38 60 00 01 */ li r3, 1
lbl_80497E54:
/* 80497E54 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80497E58 83 C1 00 08 */ lwz r30, 8(r1)
/* 80497E5C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80497E60 7C 08 03 A6 */ mtlr r0
/* 80497E64 38 21 00 10 */ addi r1, r1, 0x10
/* 80497E68 4E 80 00 20 */ blr
@@ -1,61 +0,0 @@
lbl_80497500:
/* 80497500 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80497504 7C 08 02 A6 */ mflr r0
/* 80497508 90 01 00 24 */ stw r0, 0x24(r1)
/* 8049750C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80497510 93 C1 00 18 */ stw r30, 0x18(r1)
/* 80497514 7C 7E 1B 78 */ mr r30, r3
/* 80497518 7C 9F 23 78 */ mr r31, r4
/* 8049751C 48 00 00 D1 */ bl mode_proc_call__9daTbox2_cFv
/* 80497520 38 1E 05 6C */ addi r0, r30, 0x56c
/* 80497524 90 1F 00 00 */ stw r0, 0(r31)
/* 80497528 7F C3 F3 78 */ mr r3, r30
/* 8049752C 4B FF F5 29 */ bl setBaseMtx__9daTbox2_cFv
/* 80497530 80 7E 0A C8 */ lwz r3, 0xac8(r30)
/* 80497534 28 03 00 00 */ cmplwi r3, 0
/* 80497538 41 82 00 18 */ beq lbl_80497550
/* 8049753C 4B DD 0C 99 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80497540 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80497544 41 82 00 0C */ beq lbl_80497550
/* 80497548 80 7E 0A C8 */ lwz r3, 0xac8(r30)
/* 8049754C 4B BE 44 75 */ bl Move__4dBgWFv
lbl_80497550:
/* 80497550 88 1E 0A BC */ lbz r0, 0xabc(r30)
/* 80497554 1C 80 00 14 */ mulli r4, r0, 0x14
/* 80497558 3C 60 80 4A */ lis r3, l_cyl_info@ha /* 0x80498180@ha */
/* 8049755C 38 03 81 80 */ addi r0, r3, l_cyl_info@l /* 0x80498180@l */
/* 80497560 7C 60 22 14 */ add r3, r0, r4
/* 80497564 C0 03 00 00 */ lfs f0, 0(r3)
/* 80497568 D0 01 00 08 */ stfs f0, 8(r1)
/* 8049756C C0 03 00 04 */ lfs f0, 4(r3)
/* 80497570 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80497574 C0 03 00 08 */ lfs f0, 8(r3)
/* 80497578 D0 01 00 10 */ stfs f0, 0x10(r1)
/* 8049757C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80497580 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80497584 A8 9E 04 E6 */ lha r4, 0x4e6(r30)
/* 80497588 4B B7 4E 55 */ bl mDoMtx_YrotS__FPA4_fs
/* 8049758C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80497590 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80497594 38 81 00 08 */ addi r4, r1, 8
/* 80497598 7C 85 23 78 */ mr r5, r4
/* 8049759C 4B EA F7 D1 */ bl PSMTXMultVec
/* 804975A0 38 61 00 08 */ addi r3, r1, 8
/* 804975A4 38 9E 04 D0 */ addi r4, r30, 0x4d0
/* 804975A8 7C 65 1B 78 */ mr r5, r3
/* 804975AC 4B EA FA E5 */ bl PSVECAdd
/* 804975B0 38 7E 0A A4 */ addi r3, r30, 0xaa4
/* 804975B4 38 81 00 08 */ addi r4, r1, 8
/* 804975B8 4B DD 7C 25 */ bl SetC__8cM3dGCylFRC4cXyz
/* 804975BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 804975C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 804975C4 38 63 23 3C */ addi r3, r3, 0x233c
/* 804975C8 38 9E 09 80 */ addi r4, r30, 0x980
/* 804975CC 4B DC D5 DD */ bl Set__4cCcSFP8cCcD_Obj
/* 804975D0 38 60 00 01 */ li r3, 1
/* 804975D4 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 804975D8 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 804975DC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 804975E0 7C 08 03 A6 */ mtlr r0
/* 804975E4 38 21 00 20 */ addi r1, r1, 0x20
/* 804975E8 4E 80 00 20 */ blr
@@ -1,20 +0,0 @@
lbl_804980F8:
/* 804980F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804980FC 7C 08 02 A6 */ mflr r0
/* 80498100 90 01 00 14 */ stw r0, 0x14(r1)
/* 80498104 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80498108 7C 7F 1B 79 */ or. r31, r3, r3
/* 8049810C 41 82 00 1C */ beq lbl_80498128
/* 80498110 3C A0 80 4A */ lis r5, __vt__10cCcD_GStts@ha /* 0x804983B8@ha */
/* 80498114 38 05 83 B8 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x804983B8@l */
/* 80498118 90 1F 00 00 */ stw r0, 0(r31)
/* 8049811C 7C 80 07 35 */ extsh. r0, r4
/* 80498120 40 81 00 08 */ ble lbl_80498128
/* 80498124 4B E3 6C 19 */ bl __dl__FPv
lbl_80498128:
/* 80498128 7F E3 FB 78 */ mr r3, r31
/* 8049812C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80498130 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80498134 7C 08 03 A6 */ mtlr r0
/* 80498138 38 21 00 10 */ addi r1, r1, 0x10
/* 8049813C 4E 80 00 20 */ blr
@@ -1,26 +0,0 @@
lbl_804971F0:
/* 804971F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804971F4 7C 08 02 A6 */ mflr r0
/* 804971F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 804971FC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80497200 7C 7F 1B 79 */ or. r31, r3, r3
/* 80497204 41 82 00 30 */ beq lbl_80497234
/* 80497208 3C 60 80 4A */ lis r3, __vt__10dCcD_GStts@ha /* 0x804983C4@ha */
/* 8049720C 38 03 83 C4 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x804983C4@l */
/* 80497210 90 1F 00 00 */ stw r0, 0(r31)
/* 80497214 41 82 00 10 */ beq lbl_80497224
/* 80497218 3C 60 80 4A */ lis r3, __vt__10cCcD_GStts@ha /* 0x804983B8@ha */
/* 8049721C 38 03 83 B8 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x804983B8@l */
/* 80497220 90 1F 00 00 */ stw r0, 0(r31)
lbl_80497224:
/* 80497224 7C 80 07 35 */ extsh. r0, r4
/* 80497228 40 81 00 0C */ ble lbl_80497234
/* 8049722C 7F E3 FB 78 */ mr r3, r31
/* 80497230 4B E3 7B 0D */ bl __dl__FPv
lbl_80497234:
/* 80497234 7F E3 FB 78 */ mr r3, r31
/* 80497238 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8049723C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80497240 7C 08 03 A6 */ mtlr r0
/* 80497244 38 21 00 10 */ addi r1, r1, 0x10
/* 80497248 4E 80 00 20 */ blr
@@ -1,20 +0,0 @@
lbl_80496DF4:
/* 80496DF4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80496DF8 7C 08 02 A6 */ mflr r0
/* 80496DFC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80496E00 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80496E04 7C 7F 1B 79 */ or. r31, r3, r3
/* 80496E08 41 82 00 1C */ beq lbl_80496E24
/* 80496E0C 3C A0 80 4A */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80498444@ha */
/* 80496E10 38 05 84 44 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80498444@l */
/* 80496E14 90 1F 00 00 */ stw r0, 0(r31)
/* 80496E18 7C 80 07 35 */ extsh. r0, r4
/* 80496E1C 40 81 00 08 */ ble lbl_80496E24
/* 80496E20 4B E3 7F 1D */ bl __dl__FPv
lbl_80496E24:
/* 80496E24 7F E3 FB 78 */ mr r3, r31
/* 80496E28 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80496E2C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80496E30 7C 08 03 A6 */ mtlr r0
/* 80496E34 38 21 00 10 */ addi r1, r1, 0x10
/* 80496E38 4E 80 00 20 */ blr
@@ -1,30 +0,0 @@
lbl_80497080:
/* 80497080 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80497084 7C 08 02 A6 */ mflr r0
/* 80497088 90 01 00 14 */ stw r0, 0x14(r1)
/* 8049708C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80497090 93 C1 00 08 */ stw r30, 8(r1)
/* 80497094 7C 7E 1B 79 */ or. r30, r3, r3
/* 80497098 7C 9F 23 78 */ mr r31, r4
/* 8049709C 41 82 00 38 */ beq lbl_804970D4
/* 804970A0 3C 60 80 4A */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x804983D0@ha */
/* 804970A4 38 03 83 D0 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x804983D0@l */
/* 804970A8 90 1E 00 0C */ stw r0, 0xc(r30)
/* 804970AC 38 7E 00 14 */ addi r3, r30, 0x14
/* 804970B0 38 80 FF FF */ li r4, -1
/* 804970B4 4B DD 7E 65 */ bl __dt__8cM3dGCirFv
/* 804970B8 7F C3 F3 78 */ mr r3, r30
/* 804970BC 38 80 00 00 */ li r4, 0
/* 804970C0 4B DD 0F F1 */ bl __dt__13cBgS_PolyInfoFv
/* 804970C4 7F E0 07 35 */ extsh. r0, r31
/* 804970C8 40 81 00 0C */ ble lbl_804970D4
/* 804970CC 7F C3 F3 78 */ mr r3, r30
/* 804970D0 4B E3 7C 6D */ bl __dl__FPv
lbl_804970D4:
/* 804970D4 7F C3 F3 78 */ mr r3, r30
/* 804970D8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 804970DC 83 C1 00 08 */ lwz r30, 8(r1)
/* 804970E0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804970E4 7C 08 03 A6 */ mtlr r0
/* 804970E8 38 21 00 10 */ addi r1, r1, 0x10
/* 804970EC 4E 80 00 20 */ blr
@@ -1,30 +0,0 @@
lbl_804970F0:
/* 804970F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804970F4 7C 08 02 A6 */ mflr r0
/* 804970F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 804970FC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80497100 93 C1 00 08 */ stw r30, 8(r1)
/* 80497104 7C 7E 1B 79 */ or. r30, r3, r3
/* 80497108 7C 9F 23 78 */ mr r31, r4
/* 8049710C 41 82 00 38 */ beq lbl_80497144
/* 80497110 3C 80 80 4A */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x804983DC@ha */
/* 80497114 38 84 83 DC */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x804983DC@l */
/* 80497118 90 9E 00 10 */ stw r4, 0x10(r30)
/* 8049711C 38 04 00 0C */ addi r0, r4, 0xc
/* 80497120 90 1E 00 14 */ stw r0, 0x14(r30)
/* 80497124 38 04 00 18 */ addi r0, r4, 0x18
/* 80497128 90 1E 00 24 */ stw r0, 0x24(r30)
/* 8049712C 38 80 00 00 */ li r4, 0
/* 80497130 4B BD EE 65 */ bl __dt__9dBgS_AcchFv
/* 80497134 7F E0 07 35 */ extsh. r0, r31
/* 80497138 40 81 00 0C */ ble lbl_80497144
/* 8049713C 7F C3 F3 78 */ mr r3, r30
/* 80497140 4B E3 7B FD */ bl __dl__FPv
lbl_80497144:
/* 80497144 7F C3 F3 78 */ mr r3, r30
/* 80497148 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8049714C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80497150 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80497154 7C 08 03 A6 */ mtlr r0
/* 80497158 38 21 00 10 */ addi r1, r1, 0x10
/* 8049715C 4E 80 00 20 */ blr
@@ -1,20 +0,0 @@
lbl_804971A8:
/* 804971A8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804971AC 7C 08 02 A6 */ mflr r0
/* 804971B0 90 01 00 14 */ stw r0, 0x14(r1)
/* 804971B4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 804971B8 7C 7F 1B 79 */ or. r31, r3, r3
/* 804971BC 41 82 00 1C */ beq lbl_804971D8
/* 804971C0 3C A0 80 4A */ lis r5, __vt__8cM3dGAab@ha /* 0x8049840C@ha */
/* 804971C4 38 05 84 0C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8049840C@l */
/* 804971C8 90 1F 00 18 */ stw r0, 0x18(r31)
/* 804971CC 7C 80 07 35 */ extsh. r0, r4
/* 804971D0 40 81 00 08 */ ble lbl_804971D8
/* 804971D4 4B E3 7B 69 */ bl __dl__FPv
lbl_804971D8:
/* 804971D8 7F E3 FB 78 */ mr r3, r31
/* 804971DC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 804971E0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804971E4 7C 08 03 A6 */ mtlr r0
/* 804971E8 38 21 00 10 */ addi r1, r1, 0x10
/* 804971EC 4E 80 00 20 */ blr
@@ -1,20 +0,0 @@
lbl_80497160:
/* 80497160 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80497164 7C 08 02 A6 */ mflr r0
/* 80497168 90 01 00 14 */ stw r0, 0x14(r1)
/* 8049716C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80497170 7C 7F 1B 79 */ or. r31, r3, r3
/* 80497174 41 82 00 1C */ beq lbl_80497190
/* 80497178 3C A0 80 4A */ lis r5, __vt__8cM3dGCyl@ha /* 0x80498400@ha */
/* 8049717C 38 05 84 00 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80498400@l */
/* 80497180 90 1F 00 14 */ stw r0, 0x14(r31)
/* 80497184 7C 80 07 35 */ extsh. r0, r4
/* 80497188 40 81 00 08 */ ble lbl_80497190
/* 8049718C 4B E3 7B B1 */ bl __dl__FPv
lbl_80497190:
/* 80497190 7F E3 FB 78 */ mr r3, r31
/* 80497194 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80497198 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8049719C 7C 08 03 A6 */ mtlr r0
/* 804971A0 38 21 00 10 */ addi r1, r1, 0x10
/* 804971A4 4E 80 00 20 */ blr
@@ -1,29 +0,0 @@
lbl_804978E4:
/* 804978E4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804978E8 7C 08 02 A6 */ mflr r0
/* 804978EC 90 01 00 14 */ stw r0, 0x14(r1)
/* 804978F0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 804978F4 93 C1 00 08 */ stw r30, 8(r1)
/* 804978F8 7C 7E 1B 78 */ mr r30, r3
/* 804978FC A8 83 00 FC */ lha r4, 0xfc(r3)
/* 80497900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497904 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497908 38 7F 4F F8 */ addi r3, r31, 0x4ff8
/* 8049790C 4B BB 01 6D */ bl endCheck__16dEvent_manager_cFs
/* 80497910 2C 03 00 00 */ cmpwi r3, 0
/* 80497914 41 82 00 18 */ beq lbl_8049792C
/* 80497918 38 7F 4E C8 */ addi r3, r31, 0x4ec8
/* 8049791C 4B BA AB 4D */ bl reset__14dEvt_control_cFv
/* 80497920 7F C3 F3 78 */ mr r3, r30
/* 80497924 48 00 00 E9 */ bl init_actionOpenWait__9daTbox2_cFv
/* 80497928 48 00 00 0C */ b lbl_80497934
lbl_8049792C:
/* 8049792C 7F C3 F3 78 */ mr r3, r30
/* 80497930 4B FF F9 1D */ bl demoProc__9daTbox2_cFv
lbl_80497934:
/* 80497934 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80497938 83 C1 00 08 */ lwz r30, 8(r1)
/* 8049793C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80497940 7C 08 03 A6 */ mtlr r0
/* 80497944 38 21 00 10 */ addi r1, r1, 0x10
/* 80497948 4E 80 00 20 */ blr
@@ -1,49 +0,0 @@
lbl_80497958:
/* 80497958 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8049795C 7C 08 02 A6 */ mflr r0
/* 80497960 90 01 00 14 */ stw r0, 0x14(r1)
/* 80497964 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80497968 93 C1 00 08 */ stw r30, 8(r1)
/* 8049796C 7C 7E 1B 78 */ mr r30, r3
/* 80497970 A8 83 00 FC */ lha r4, 0xfc(r3)
/* 80497974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497978 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8049797C 38 7F 4F F8 */ addi r3, r31, 0x4ff8
/* 80497980 4B BB 00 F9 */ bl endCheck__16dEvent_manager_cFs
/* 80497984 2C 03 00 00 */ cmpwi r3, 0
/* 80497988 41 82 00 64 */ beq lbl_804979EC
/* 8049798C 3B FF 4E C8 */ addi r31, r31, 0x4ec8
/* 80497990 7F E3 FB 78 */ mr r3, r31
/* 80497994 4B BA AA D5 */ bl reset__14dEvt_control_cFv
/* 80497998 3C 60 80 4A */ lis r3, lit_3763@ha /* 0x804981D0@ha */
/* 8049799C C0 23 81 D0 */ lfs f1, lit_3763@l(r3) /* 0x804981D0@l */
/* 804979A0 4B D1 10 A5 */ bl dKy_set_allcol_ratio__Ff
/* 804979A4 7F E3 FB 78 */ mr r3, r31
/* 804979A8 38 80 00 00 */ li r4, 0
/* 804979AC 4B BA BD 11 */ bl setPtI__14dEvt_control_cFPv
/* 804979B0 88 1E 07 18 */ lbz r0, 0x718(r30)
/* 804979B4 28 00 00 00 */ cmplwi r0, 0
/* 804979B8 41 82 00 28 */ beq lbl_804979E0
/* 804979BC 3C 60 80 4A */ lis r3, lit_3715@ha /* 0x804981C0@ha */
/* 804979C0 C0 03 81 C0 */ lfs f0, lit_3715@l(r3) /* 0x804981C0@l */
/* 804979C4 80 7E 07 28 */ lwz r3, 0x728(r30)
/* 804979C8 D0 03 00 10 */ stfs f0, 0x10(r3)
/* 804979CC 80 7E 07 28 */ lwz r3, 0x728(r30)
/* 804979D0 D0 03 00 0C */ stfs f0, 0xc(r3)
/* 804979D4 7F C3 F3 78 */ mr r3, r30
/* 804979D8 48 00 00 35 */ bl init_actionOpenWait__9daTbox2_cFv
/* 804979DC 48 00 00 18 */ b lbl_804979F4
lbl_804979E0:
/* 804979E0 7F C3 F3 78 */ mr r3, r30
/* 804979E4 4B FF FE E5 */ bl init_actionWait__9daTbox2_cFv
/* 804979E8 48 00 00 0C */ b lbl_804979F4
lbl_804979EC:
/* 804979EC 7F C3 F3 78 */ mr r3, r30
/* 804979F0 4B FF F8 5D */ bl demoProc__9daTbox2_cFv
lbl_804979F4:
/* 804979F4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 804979F8 83 C1 00 08 */ lwz r30, 8(r1)
/* 804979FC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80497A00 7C 08 03 A6 */ mtlr r0
/* 80497A04 38 21 00 10 */ addi r1, r1, 0x10
/* 80497A08 4E 80 00 20 */ blr
@@ -1,116 +0,0 @@
lbl_80497A18:
/* 80497A18 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80497A1C 7C 08 02 A6 */ mflr r0
/* 80497A20 90 01 00 24 */ stw r0, 0x24(r1)
/* 80497A24 39 61 00 20 */ addi r11, r1, 0x20
/* 80497A28 4B EC A7 B1 */ bl _savegpr_28
/* 80497A2C 7C 7E 1B 78 */ mr r30, r3
/* 80497A30 3C 80 80 45 */ lis r4, m_midnaActor__9daPy_py_c@ha /* 0x80451018@ha */
/* 80497A34 83 E4 10 18 */ lwz r31, m_midnaActor__9daPy_py_c@l(r4) /* 0x80451018@l */
/* 80497A38 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497A3C 3B A4 61 C0 */ addi r29, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497A40 83 9D 5D AC */ lwz r28, 0x5dac(r29)
/* 80497A44 A0 03 00 F8 */ lhz r0, 0xf8(r3)
/* 80497A48 28 00 00 03 */ cmplwi r0, 3
/* 80497A4C 40 82 00 D4 */ bne lbl_80497B20
/* 80497A50 A0 1D 4F A0 */ lhz r0, 0x4fa0(r29)
/* 80497A54 60 00 00 04 */ ori r0, r0, 4
/* 80497A58 B0 1D 4F A0 */ sth r0, 0x4fa0(r29)
/* 80497A5C 88 1E 0A BC */ lbz r0, 0xabc(r30)
/* 80497A60 28 00 00 00 */ cmplwi r0, 0
/* 80497A64 41 82 00 60 */ beq lbl_80497AC4
/* 80497A68 80 7D 5D B4 */ lwz r3, 0x5db4(r29)
/* 80497A6C 80 03 05 74 */ lwz r0, 0x574(r3)
/* 80497A70 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
/* 80497A74 41 82 00 50 */ beq lbl_80497AC4
/* 80497A78 7F E3 FB 78 */ mr r3, r31
/* 80497A7C 39 9F 09 D4 */ addi r12, r31, 0x9d4
/* 80497A80 4B EC A6 05 */ bl __ptmf_scall
/* 80497A84 60 00 00 00 */ nop
/* 80497A88 2C 03 00 00 */ cmpwi r3, 0
/* 80497A8C 40 82 00 38 */ bne lbl_80497AC4
/* 80497A90 38 7D 4F F8 */ addi r3, r29, 0x4ff8
/* 80497A94 3C 80 80 4A */ lis r4, l_staff_name@ha /* 0x80498280@ha */
/* 80497A98 38 84 82 80 */ addi r4, r4, l_staff_name@l /* 0x80498280@l */
/* 80497A9C 80 84 00 00 */ lwz r4, 0(r4)
/* 80497AA0 38 A0 00 00 */ li r5, 0
/* 80497AA4 38 C0 00 00 */ li r6, 0
/* 80497AA8 4B BB 00 75 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci
/* 80497AAC 90 7E 0A C4 */ stw r3, 0xac4(r30)
/* 80497AB0 7F C3 F3 78 */ mr r3, r30
/* 80497AB4 4B FF F7 99 */ bl demoProc__9daTbox2_cFv
/* 80497AB8 7F C3 F3 78 */ mr r3, r30
/* 80497ABC 4B FF FE 1D */ bl init_actionNotOpenDemo__9daTbox2_cFv
/* 80497AC0 48 00 00 F8 */ b lbl_80497BB8
lbl_80497AC4:
/* 80497AC4 7F 83 E3 78 */ mr r3, r28
/* 80497AC8 80 1E 00 B0 */ lwz r0, 0xb0(r30)
/* 80497ACC 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80497AD0 81 9C 06 28 */ lwz r12, 0x628(r28)
/* 80497AD4 81 8C 02 14 */ lwz r12, 0x214(r12)
/* 80497AD8 7D 89 03 A6 */ mtctr r12
/* 80497ADC 4E 80 04 21 */ bctrl
/* 80497AE0 98 7E 07 18 */ stb r3, 0x718(r30)
/* 80497AE4 7F C3 F3 78 */ mr r3, r30
/* 80497AE8 48 00 00 E9 */ bl setGetDemoItem__9daTbox2_cFv
/* 80497AEC 38 7D 4F F8 */ addi r3, r29, 0x4ff8
/* 80497AF0 3C 80 80 4A */ lis r4, l_staff_name@ha /* 0x80498280@ha */
/* 80497AF4 38 84 82 80 */ addi r4, r4, l_staff_name@l /* 0x80498280@l */
/* 80497AF8 80 84 00 00 */ lwz r4, 0(r4)
/* 80497AFC 38 A0 00 00 */ li r5, 0
/* 80497B00 38 C0 00 00 */ li r6, 0
/* 80497B04 4B BB 00 19 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci
/* 80497B08 90 7E 0A C4 */ stw r3, 0xac4(r30)
/* 80497B0C 7F C3 F3 78 */ mr r3, r30
/* 80497B10 4B FF F7 3D */ bl demoProc__9daTbox2_cFv
/* 80497B14 7F C3 F3 78 */ mr r3, r30
/* 80497B18 4B FF FE 35 */ bl init_actionOpenDemo__9daTbox2_cFv
/* 80497B1C 48 00 00 9C */ b lbl_80497BB8
lbl_80497B20:
/* 80497B20 48 00 01 41 */ bl boxCheck__9daTbox2_cFv
/* 80497B24 2C 03 00 00 */ cmpwi r3, 0
/* 80497B28 41 82 00 90 */ beq lbl_80497BB8
/* 80497B2C A0 1E 00 FA */ lhz r0, 0xfa(r30)
/* 80497B30 60 00 00 04 */ ori r0, r0, 4
/* 80497B34 B0 1E 00 FA */ sth r0, 0xfa(r30)
/* 80497B38 88 1E 0A BC */ lbz r0, 0xabc(r30)
/* 80497B3C 28 00 00 00 */ cmplwi r0, 0
/* 80497B40 40 82 00 1C */ bne lbl_80497B5C
/* 80497B44 38 7E 00 F4 */ addi r3, r30, 0xf4
/* 80497B48 3C 80 80 4A */ lis r4, d_a_tbox2__stringBase0@ha /* 0x804981E0@ha */
/* 80497B4C 38 84 81 E0 */ addi r4, r4, d_a_tbox2__stringBase0@l /* 0x804981E0@l */
/* 80497B50 38 84 00 2B */ addi r4, r4, 0x2b
/* 80497B54 4B BA B8 D5 */ bl setEventName__11dEvt_info_cFPc
/* 80497B58 48 00 00 60 */ b lbl_80497BB8
lbl_80497B5C:
/* 80497B5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497B60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497B64 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80497B68 80 03 05 74 */ lwz r0, 0x574(r3)
/* 80497B6C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
/* 80497B70 41 82 00 34 */ beq lbl_80497BA4
/* 80497B74 7F E3 FB 78 */ mr r3, r31
/* 80497B78 39 9F 09 D4 */ addi r12, r31, 0x9d4
/* 80497B7C 4B EC A5 09 */ bl __ptmf_scall
/* 80497B80 60 00 00 00 */ nop
/* 80497B84 2C 03 00 00 */ cmpwi r3, 0
/* 80497B88 40 82 00 1C */ bne lbl_80497BA4
/* 80497B8C 38 7E 00 F4 */ addi r3, r30, 0xf4
/* 80497B90 3C 80 80 4A */ lis r4, d_a_tbox2__stringBase0@ha /* 0x804981E0@ha */
/* 80497B94 38 84 81 E0 */ addi r4, r4, d_a_tbox2__stringBase0@l /* 0x804981E0@l */
/* 80497B98 38 84 00 43 */ addi r4, r4, 0x43
/* 80497B9C 4B BA B8 8D */ bl setEventName__11dEvt_info_cFPc
/* 80497BA0 48 00 00 18 */ b lbl_80497BB8
lbl_80497BA4:
/* 80497BA4 38 7E 00 F4 */ addi r3, r30, 0xf4
/* 80497BA8 3C 80 80 4A */ lis r4, d_a_tbox2__stringBase0@ha /* 0x804981E0@ha */
/* 80497BAC 38 84 81 E0 */ addi r4, r4, d_a_tbox2__stringBase0@l /* 0x804981E0@l */
/* 80497BB0 38 84 00 5C */ addi r4, r4, 0x5c
/* 80497BB4 4B BA B8 75 */ bl setEventName__11dEvt_info_cFPc
lbl_80497BB8:
/* 80497BB8 39 61 00 20 */ addi r11, r1, 0x20
/* 80497BBC 4B EC A6 69 */ bl _restgpr_28
/* 80497BC0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80497BC4 7C 08 03 A6 */ mtlr r0
/* 80497BC8 38 21 00 20 */ addi r1, r1, 0x20
/* 80497BCC 4E 80 00 20 */ blr
@@ -1,49 +0,0 @@
lbl_8049780C:
/* 8049780C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80497810 7C 08 02 A6 */ mflr r0
/* 80497814 90 01 00 14 */ stw r0, 0x14(r1)
/* 80497818 3C 80 80 4A */ lis r4, cNullVec__6Z2Calc@ha /* 0x8049825C@ha */
/* 8049781C 38 E4 82 5C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x8049825C@l */
/* 80497820 3C 80 80 4A */ lis r4, struct_80498480+0x1@ha /* 0x80498481@ha */
/* 80497824 38 C4 84 81 */ addi r6, r4, struct_80498480+0x1@l /* 0x80498481@l */
/* 80497828 88 06 00 00 */ lbz r0, 0(r6)
/* 8049782C 7C 00 07 75 */ extsb. r0, r0
/* 80497830 40 82 00 70 */ bne lbl_804978A0
/* 80497834 80 87 00 AC */ lwz r4, 0xac(r7)
/* 80497838 80 07 00 B0 */ lwz r0, 0xb0(r7)
/* 8049783C 90 87 00 DC */ stw r4, 0xdc(r7)
/* 80497840 90 07 00 E0 */ stw r0, 0xe0(r7)
/* 80497844 80 07 00 B4 */ lwz r0, 0xb4(r7)
/* 80497848 90 07 00 E4 */ stw r0, 0xe4(r7)
/* 8049784C 38 A7 00 DC */ addi r5, r7, 0xdc
/* 80497850 80 87 00 B8 */ lwz r4, 0xb8(r7)
/* 80497854 80 07 00 BC */ lwz r0, 0xbc(r7)
/* 80497858 90 85 00 0C */ stw r4, 0xc(r5)
/* 8049785C 90 05 00 10 */ stw r0, 0x10(r5)
/* 80497860 80 07 00 C0 */ lwz r0, 0xc0(r7)
/* 80497864 90 05 00 14 */ stw r0, 0x14(r5)
/* 80497868 80 87 00 C4 */ lwz r4, 0xc4(r7)
/* 8049786C 80 07 00 C8 */ lwz r0, 0xc8(r7)
/* 80497870 90 85 00 18 */ stw r4, 0x18(r5)
/* 80497874 90 05 00 1C */ stw r0, 0x1c(r5)
/* 80497878 80 07 00 CC */ lwz r0, 0xcc(r7)
/* 8049787C 90 05 00 20 */ stw r0, 0x20(r5)
/* 80497880 80 87 00 D0 */ lwz r4, 0xd0(r7)
/* 80497884 80 07 00 D4 */ lwz r0, 0xd4(r7)
/* 80497888 90 85 00 24 */ stw r4, 0x24(r5)
/* 8049788C 90 05 00 28 */ stw r0, 0x28(r5)
/* 80497890 80 07 00 D8 */ lwz r0, 0xd8(r7)
/* 80497894 90 05 00 2C */ stw r0, 0x2c(r5)
/* 80497898 38 00 00 01 */ li r0, 1
/* 8049789C 98 06 00 00 */ stb r0, 0(r6)
lbl_804978A0:
/* 804978A0 88 03 0A BD */ lbz r0, 0xabd(r3)
/* 804978A4 1C 00 00 0C */ mulli r0, r0, 0xc
/* 804978A8 39 87 00 DC */ addi r12, r7, 0xdc
/* 804978AC 7D 8C 02 14 */ add r12, r12, r0
/* 804978B0 4B EC A7 D5 */ bl __ptmf_scall
/* 804978B4 60 00 00 00 */ nop
/* 804978B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804978BC 7C 08 03 A6 */ mtlr r0
/* 804978C0 38 21 00 10 */ addi r1, r1, 0x10
/* 804978C4 4E 80 00 20 */ blr
@@ -1,84 +0,0 @@
lbl_80497C60:
/* 80497C60 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 80497C64 7C 08 02 A6 */ mflr r0
/* 80497C68 90 01 00 54 */ stw r0, 0x54(r1)
/* 80497C6C DB E1 00 40 */ stfd f31, 0x40(r1)
/* 80497C70 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */
/* 80497C74 39 61 00 40 */ addi r11, r1, 0x40
/* 80497C78 4B EC A5 61 */ bl _savegpr_28
/* 80497C7C 7C 7C 1B 78 */ mr r28, r3
/* 80497C80 3C 60 80 4A */ lis r3, l_resInfo@ha /* 0x80498160@ha */
/* 80497C84 3B C3 81 60 */ addi r30, r3, l_resInfo@l /* 0x80498160@l */
/* 80497C88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497C8C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497C90 83 BF 5D AC */ lwz r29, 0x5dac(r31)
/* 80497C94 38 7F 4E 00 */ addi r3, r31, 0x4e00
/* 80497C98 3C 80 80 4A */ lis r4, d_a_tbox2__stringBase0@ha /* 0x804981E0@ha */
/* 80497C9C 38 84 81 E0 */ addi r4, r4, d_a_tbox2__stringBase0@l /* 0x804981E0@l */
/* 80497CA0 38 84 00 74 */ addi r4, r4, 0x74
/* 80497CA4 4B ED 0C F1 */ bl strcmp
/* 80497CA8 2C 03 00 00 */ cmpwi r3, 0
/* 80497CAC 40 82 00 34 */ bne lbl_80497CE0
/* 80497CB0 88 1C 04 E2 */ lbz r0, 0x4e2(r28)
/* 80497CB4 2C 00 00 07 */ cmpwi r0, 7
/* 80497CB8 40 82 00 28 */ bne lbl_80497CE0
/* 80497CBC 7F A3 EB 78 */ mr r3, r29
/* 80497CC0 81 9D 06 28 */ lwz r12, 0x628(r29)
/* 80497CC4 81 8C 01 C8 */ lwz r12, 0x1c8(r12)
/* 80497CC8 7D 89 03 A6 */ mtctr r12
/* 80497CCC 4E 80 04 21 */ bctrl
/* 80497CD0 28 03 00 00 */ cmplwi r3, 0
/* 80497CD4 40 82 00 0C */ bne lbl_80497CE0
/* 80497CD8 38 60 00 00 */ li r3, 0
/* 80497CDC 48 00 00 A4 */ b lbl_80497D80
lbl_80497CE0:
/* 80497CE0 38 61 00 14 */ addi r3, r1, 0x14
/* 80497CE4 38 9D 05 50 */ addi r4, r29, 0x550
/* 80497CE8 38 BC 04 D0 */ addi r5, r28, 0x4d0
/* 80497CEC 4B DC EE 49 */ bl __mi__4cXyzCFRC3Vec
/* 80497CF0 C0 41 00 14 */ lfs f2, 0x14(r1)
/* 80497CF4 D0 41 00 20 */ stfs f2, 0x20(r1)
/* 80497CF8 C0 01 00 18 */ lfs f0, 0x18(r1)
/* 80497CFC D0 01 00 24 */ stfs f0, 0x24(r1)
/* 80497D00 C0 21 00 1C */ lfs f1, 0x1c(r1)
/* 80497D04 D0 21 00 28 */ stfs f1, 0x28(r1)
/* 80497D08 D0 41 00 08 */ stfs f2, 8(r1)
/* 80497D0C C0 1E 00 60 */ lfs f0, 0x60(r30)
/* 80497D10 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80497D14 D0 21 00 10 */ stfs f1, 0x10(r1)
/* 80497D18 38 61 00 08 */ addi r3, r1, 8
/* 80497D1C 4B EA F4 1D */ bl PSVECSquareMag
/* 80497D20 C0 5D 04 D4 */ lfs f2, 0x4d4(r29)
/* 80497D24 C0 1C 04 D4 */ lfs f0, 0x4d4(r28)
/* 80497D28 EC 02 00 28 */ fsubs f0, f2, f0
/* 80497D2C FC 00 02 10 */ fabs f0, f0
/* 80497D30 FF E0 00 18 */ frsp f31, f0
/* 80497D34 C0 1E 00 78 */ lfs f0, 0x78(r30)
/* 80497D38 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80497D3C 40 80 00 40 */ bge lbl_80497D7C
/* 80497D40 7F 83 E3 78 */ mr r3, r28
/* 80497D44 80 9F 5D AC */ lwz r4, 0x5dac(r31)
/* 80497D48 4B B8 2A 55 */ bl fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 80497D4C 2C 03 20 00 */ cmpwi r3, 0x2000
/* 80497D50 40 80 00 2C */ bge lbl_80497D7C
/* 80497D54 7F A3 EB 78 */ mr r3, r29
/* 80497D58 7F 84 E3 78 */ mr r4, r28
/* 80497D5C 4B B8 2A 41 */ bl fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 80497D60 2C 03 20 00 */ cmpwi r3, 0x2000
/* 80497D64 40 80 00 18 */ bge lbl_80497D7C
/* 80497D68 C0 1E 00 7C */ lfs f0, 0x7c(r30)
/* 80497D6C FC 1F 00 40 */ fcmpo cr0, f31, f0
/* 80497D70 40 80 00 0C */ bge lbl_80497D7C
/* 80497D74 38 60 00 01 */ li r3, 1
/* 80497D78 48 00 00 08 */ b lbl_80497D80
lbl_80497D7C:
/* 80497D7C 38 60 00 00 */ li r3, 0
lbl_80497D80:
/* 80497D80 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */
/* 80497D84 CB E1 00 40 */ lfd f31, 0x40(r1)
/* 80497D88 39 61 00 40 */ addi r11, r1, 0x40
/* 80497D8C 4B EC A4 99 */ bl _restgpr_28
/* 80497D90 80 01 00 54 */ lwz r0, 0x54(r1)
/* 80497D94 7C 08 03 A6 */ mtlr r0
/* 80497D98 38 21 00 50 */ addi r1, r1, 0x50
/* 80497D9C 4E 80 00 20 */ blr
@@ -1,152 +0,0 @@
lbl_80496E3C:
/* 80496E3C 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80496E40 7C 08 02 A6 */ mflr r0
/* 80496E44 90 01 00 34 */ stw r0, 0x34(r1)
/* 80496E48 39 61 00 30 */ addi r11, r1, 0x30
/* 80496E4C 4B EC B3 7D */ bl _savegpr_24
/* 80496E50 7C 7A 1B 78 */ mr r26, r3
/* 80496E54 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80496E58 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80496E5C 40 82 01 74 */ bne lbl_80496FD0
/* 80496E60 7F 40 D3 79 */ or. r0, r26, r26
/* 80496E64 41 82 01 60 */ beq lbl_80496FC4
/* 80496E68 7C 19 03 78 */ mr r25, r0
/* 80496E6C 7C 1C 03 78 */ mr r28, r0
/* 80496E70 4B BE 17 B5 */ bl __ct__16dBgS_MoveBgActorFv
/* 80496E74 3C 60 80 4A */ lis r3, __vt__12daTboxBase_c@ha /* 0x80498418@ha */
/* 80496E78 38 03 84 18 */ addi r0, r3, __vt__12daTboxBase_c@l /* 0x80498418@l */
/* 80496E7C 90 1C 05 9C */ stw r0, 0x59c(r28)
/* 80496E80 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
/* 80496E84 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
/* 80496E88 90 1C 05 B8 */ stw r0, 0x5b8(r28)
/* 80496E8C 38 7C 05 BC */ addi r3, r28, 0x5bc
/* 80496E90 4B BE C8 D1 */ bl __ct__10dCcD_GSttsFv
/* 80496E94 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
/* 80496E98 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
/* 80496E9C 90 7C 05 B8 */ stw r3, 0x5b8(r28)
/* 80496EA0 3B E3 00 20 */ addi r31, r3, 0x20
/* 80496EA4 93 FC 05 BC */ stw r31, 0x5bc(r28)
/* 80496EA8 3B 1C 05 DC */ addi r24, r28, 0x5dc
/* 80496EAC 7F 03 C3 78 */ mr r3, r24
/* 80496EB0 4B BE CB 79 */ bl __ct__12dCcD_GObjInfFv
/* 80496EB4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
/* 80496EB8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
/* 80496EBC 90 18 01 20 */ stw r0, 0x120(r24)
/* 80496EC0 3C 60 80 4A */ lis r3, __vt__8cM3dGAab@ha /* 0x8049840C@ha */
/* 80496EC4 38 03 84 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8049840C@l */
/* 80496EC8 90 18 01 1C */ stw r0, 0x11c(r24)
/* 80496ECC 3C 60 80 4A */ lis r3, __vt__8cM3dGCyl@ha /* 0x80498400@ha */
/* 80496ED0 38 03 84 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80498400@l */
/* 80496ED4 90 18 01 38 */ stw r0, 0x138(r24)
/* 80496ED8 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
/* 80496EDC 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
/* 80496EE0 90 78 01 20 */ stw r3, 0x120(r24)
/* 80496EE4 3B C3 00 58 */ addi r30, r3, 0x58
/* 80496EE8 93 D8 01 38 */ stw r30, 0x138(r24)
/* 80496EEC 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
/* 80496EF0 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
/* 80496EF4 90 78 00 3C */ stw r3, 0x3c(r24)
/* 80496EF8 3B A3 00 2C */ addi r29, r3, 0x2c
/* 80496EFC 93 B8 01 20 */ stw r29, 0x120(r24)
/* 80496F00 3B 83 00 84 */ addi r28, r3, 0x84
/* 80496F04 93 98 01 38 */ stw r28, 0x138(r24)
/* 80496F08 3C 60 80 4A */ lis r3, __vt__9daTbox2_c@ha /* 0x80498450@ha */
/* 80496F0C 38 03 84 50 */ addi r0, r3, __vt__9daTbox2_c@l /* 0x80498450@l */
/* 80496F10 90 19 05 9C */ stw r0, 0x59c(r25)
/* 80496F14 3B 19 07 2C */ addi r24, r25, 0x72c
/* 80496F18 7F 03 C3 78 */ mr r3, r24
/* 80496F1C 4B BD F1 85 */ bl __ct__9dBgS_AcchFv
/* 80496F20 3C 60 80 4A */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x804983DC@ha */
/* 80496F24 38 63 83 DC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x804983DC@l */
/* 80496F28 90 78 00 10 */ stw r3, 0x10(r24)
/* 80496F2C 38 03 00 0C */ addi r0, r3, 0xc
/* 80496F30 90 18 00 14 */ stw r0, 0x14(r24)
/* 80496F34 38 03 00 18 */ addi r0, r3, 0x18
/* 80496F38 90 18 00 24 */ stw r0, 0x24(r24)
/* 80496F3C 38 78 00 14 */ addi r3, r24, 0x14
/* 80496F40 4B BE 1F 29 */ bl SetObj__16dBgS_PolyPassChkFv
/* 80496F44 38 79 09 04 */ addi r3, r25, 0x904
/* 80496F48 4B BD EF 65 */ bl __ct__12dBgS_AcchCirFv
/* 80496F4C 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
/* 80496F50 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
/* 80496F54 90 19 09 5C */ stw r0, 0x95c(r25)
/* 80496F58 38 79 09 60 */ addi r3, r25, 0x960
/* 80496F5C 4B BE C8 05 */ bl __ct__10dCcD_GSttsFv
/* 80496F60 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
/* 80496F64 38 03 C2 E4 */ addi r0, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
/* 80496F68 90 19 09 5C */ stw r0, 0x95c(r25)
/* 80496F6C 93 F9 09 60 */ stw r31, 0x960(r25)
/* 80496F70 3B 19 09 80 */ addi r24, r25, 0x980
/* 80496F74 7F 03 C3 78 */ mr r3, r24
/* 80496F78 4B BE CA B1 */ bl __ct__12dCcD_GObjInfFv
/* 80496F7C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
/* 80496F80 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
/* 80496F84 90 18 01 20 */ stw r0, 0x120(r24)
/* 80496F88 3C 60 80 4A */ lis r3, __vt__8cM3dGAab@ha /* 0x8049840C@ha */
/* 80496F8C 38 03 84 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8049840C@l */
/* 80496F90 90 18 01 1C */ stw r0, 0x11c(r24)
/* 80496F94 3C 60 80 4A */ lis r3, __vt__8cM3dGCyl@ha /* 0x80498400@ha */
/* 80496F98 38 03 84 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80498400@l */
/* 80496F9C 90 18 01 38 */ stw r0, 0x138(r24)
/* 80496FA0 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
/* 80496FA4 38 03 35 A4 */ addi r0, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
/* 80496FA8 90 18 01 20 */ stw r0, 0x120(r24)
/* 80496FAC 93 D8 01 38 */ stw r30, 0x138(r24)
/* 80496FB0 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
/* 80496FB4 38 03 C0 50 */ addi r0, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
/* 80496FB8 90 18 00 3C */ stw r0, 0x3c(r24)
/* 80496FBC 93 B8 01 20 */ stw r29, 0x120(r24)
/* 80496FC0 93 98 01 38 */ stw r28, 0x138(r24)
lbl_80496FC4:
/* 80496FC4 80 1A 04 A0 */ lwz r0, 0x4a0(r26)
/* 80496FC8 60 00 00 08 */ ori r0, r0, 8
/* 80496FCC 90 1A 04 A0 */ stw r0, 0x4a0(r26)
lbl_80496FD0:
/* 80496FD0 80 1A 00 B0 */ lwz r0, 0xb0(r26)
/* 80496FD4 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f
/* 80496FD8 98 1A 0A BC */ stb r0, 0xabc(r26)
/* 80496FDC 38 7A 07 1C */ addi r3, r26, 0x71c
/* 80496FE0 3C 80 80 4A */ lis r4, l_arcName@ha /* 0x8049827C@ha */
/* 80496FE4 38 84 82 7C */ addi r4, r4, l_arcName@l /* 0x8049827C@l */
/* 80496FE8 80 84 00 00 */ lwz r4, 0(r4)
/* 80496FEC 4B B9 5E D1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
/* 80496FF0 7C 60 1B 78 */ mr r0, r3
/* 80496FF4 2C 00 00 04 */ cmpwi r0, 4
/* 80496FF8 40 82 00 6C */ bne lbl_80497064
/* 80496FFC 88 1A 0A BC */ lbz r0, 0xabc(r26)
/* 80497000 28 00 00 00 */ cmplwi r0, 0
/* 80497004 40 82 00 0C */ bne lbl_80497010
/* 80497008 3B 60 18 20 */ li r27, 0x1820
/* 8049700C 48 00 00 10 */ b lbl_8049701C
lbl_80497010:
/* 80497010 28 00 00 01 */ cmplwi r0, 1
/* 80497014 40 82 00 08 */ bne lbl_8049701C
/* 80497018 3B 60 20 40 */ li r27, 0x2040
lbl_8049701C:
/* 8049701C 7F 43 D3 78 */ mr r3, r26
/* 80497020 3C 80 80 4A */ lis r4, l_arcName@ha /* 0x8049827C@ha */
/* 80497024 38 84 82 7C */ addi r4, r4, l_arcName@l /* 0x8049827C@l */
/* 80497028 80 84 00 00 */ lwz r4, 0(r4)
/* 8049702C 3C A0 80 4A */ lis r5, l_resInfo@ha /* 0x80498160@ha */
/* 80497030 38 A5 81 60 */ addi r5, r5, l_resInfo@l /* 0x80498160@l */
/* 80497034 54 00 25 36 */ rlwinm r0, r0, 4, 0x14, 0x1b
/* 80497038 7C A5 02 14 */ add r5, r5, r0
/* 8049703C 80 A5 00 08 */ lwz r5, 8(r5)
/* 80497040 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */
/* 80497044 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */
/* 80497048 7F 67 DB 78 */ mr r7, r27
/* 8049704C 39 00 00 00 */ li r8, 0
/* 80497050 4B BE 17 6D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f
/* 80497054 7C 60 1B 78 */ mr r0, r3
/* 80497058 2C 00 00 05 */ cmpwi r0, 5
/* 8049705C 40 82 00 08 */ bne lbl_80497064
/* 80497060 48 00 00 08 */ b lbl_80497068
lbl_80497064:
/* 80497064 7C 03 03 78 */ mr r3, r0
lbl_80497068:
/* 80497068 39 61 00 30 */ addi r11, r1, 0x30
/* 8049706C 4B EC B1 A9 */ bl _restgpr_24
/* 80497070 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80497074 7C 08 03 A6 */ mtlr r0
/* 80497078 38 21 00 30 */ addi r1, r1, 0x30
/* 8049707C 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_8049808C:
/* 8049808C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80498090 7C 08 02 A6 */ mflr r0
/* 80498094 90 01 00 14 */ stw r0, 0x14(r1)
/* 80498098 4B BE 08 45 */ bl MoveBGDelete__16dBgS_MoveBgActorFv
/* 8049809C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804980A0 7C 08 03 A6 */ mtlr r0
/* 804980A4 38 21 00 10 */ addi r1, r1, 0x10
/* 804980A8 4E 80 00 20 */ blr
@@ -1,12 +0,0 @@
lbl_804980CC:
/* 804980CC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804980D0 7C 08 02 A6 */ mflr r0
/* 804980D4 90 01 00 14 */ stw r0, 0x14(r1)
/* 804980D8 81 83 05 9C */ lwz r12, 0x59c(r3)
/* 804980DC 81 8C 00 14 */ lwz r12, 0x14(r12)
/* 804980E0 7D 89 03 A6 */ mtctr r12
/* 804980E4 4E 80 04 21 */ bctrl
/* 804980E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804980EC 7C 08 03 A6 */ mtlr r0
/* 804980F0 38 21 00 10 */ addi r1, r1, 0x10
/* 804980F4 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_804980AC:
/* 804980AC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804980B0 7C 08 02 A6 */ mflr r0
/* 804980B4 90 01 00 14 */ stw r0, 0x14(r1)
/* 804980B8 4B BE 08 99 */ bl MoveBGExecute__16dBgS_MoveBgActorFv
/* 804980BC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804980C0 7C 08 03 A6 */ mtlr r0
/* 804980C4 38 21 00 10 */ addi r1, r1, 0x10
/* 804980C8 4E 80 00 20 */ blr
@@ -1,112 +0,0 @@
lbl_80497ED8:
/* 80497ED8 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80497EDC 7C 08 02 A6 */ mflr r0
/* 80497EE0 90 01 00 34 */ stw r0, 0x34(r1)
/* 80497EE4 39 61 00 30 */ addi r11, r1, 0x30
/* 80497EE8 4B EC A2 E5 */ bl _savegpr_25
/* 80497EEC 7C 7B 1B 78 */ mr r27, r3
/* 80497EF0 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80497EF4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80497EF8 40 82 01 74 */ bne lbl_8049806C
/* 80497EFC 7F 60 DB 79 */ or. r0, r27, r27
/* 80497F00 41 82 01 60 */ beq lbl_80498060
/* 80497F04 7C 1A 03 78 */ mr r26, r0
/* 80497F08 7C 1C 03 78 */ mr r28, r0
/* 80497F0C 4B BE 07 19 */ bl __ct__16dBgS_MoveBgActorFv
/* 80497F10 3C 60 80 4A */ lis r3, __vt__12daTboxBase_c@ha /* 0x80498418@ha */
/* 80497F14 38 03 84 18 */ addi r0, r3, __vt__12daTboxBase_c@l /* 0x80498418@l */
/* 80497F18 90 1C 05 9C */ stw r0, 0x59c(r28)
/* 80497F1C 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
/* 80497F20 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
/* 80497F24 90 1C 05 B8 */ stw r0, 0x5b8(r28)
/* 80497F28 38 7C 05 BC */ addi r3, r28, 0x5bc
/* 80497F2C 4B BE B8 35 */ bl __ct__10dCcD_GSttsFv
/* 80497F30 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
/* 80497F34 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
/* 80497F38 90 7C 05 B8 */ stw r3, 0x5b8(r28)
/* 80497F3C 3B E3 00 20 */ addi r31, r3, 0x20
/* 80497F40 93 FC 05 BC */ stw r31, 0x5bc(r28)
/* 80497F44 3B 3C 05 DC */ addi r25, r28, 0x5dc
/* 80497F48 7F 23 CB 78 */ mr r3, r25
/* 80497F4C 4B BE BA DD */ bl __ct__12dCcD_GObjInfFv
/* 80497F50 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
/* 80497F54 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
/* 80497F58 90 19 01 20 */ stw r0, 0x120(r25)
/* 80497F5C 3C 60 80 4A */ lis r3, __vt__8cM3dGAab@ha /* 0x8049840C@ha */
/* 80497F60 38 03 84 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8049840C@l */
/* 80497F64 90 19 01 1C */ stw r0, 0x11c(r25)
/* 80497F68 3C 60 80 4A */ lis r3, __vt__8cM3dGCyl@ha /* 0x80498400@ha */
/* 80497F6C 38 03 84 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80498400@l */
/* 80497F70 90 19 01 38 */ stw r0, 0x138(r25)
/* 80497F74 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
/* 80497F78 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
/* 80497F7C 90 79 01 20 */ stw r3, 0x120(r25)
/* 80497F80 3B C3 00 58 */ addi r30, r3, 0x58
/* 80497F84 93 D9 01 38 */ stw r30, 0x138(r25)
/* 80497F88 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
/* 80497F8C 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
/* 80497F90 90 79 00 3C */ stw r3, 0x3c(r25)
/* 80497F94 3B A3 00 2C */ addi r29, r3, 0x2c
/* 80497F98 93 B9 01 20 */ stw r29, 0x120(r25)
/* 80497F9C 3B 83 00 84 */ addi r28, r3, 0x84
/* 80497FA0 93 99 01 38 */ stw r28, 0x138(r25)
/* 80497FA4 3C 60 80 4A */ lis r3, __vt__9daTbox2_c@ha /* 0x80498450@ha */
/* 80497FA8 38 03 84 50 */ addi r0, r3, __vt__9daTbox2_c@l /* 0x80498450@l */
/* 80497FAC 90 1A 05 9C */ stw r0, 0x59c(r26)
/* 80497FB0 3B 3A 07 2C */ addi r25, r26, 0x72c
/* 80497FB4 7F 23 CB 78 */ mr r3, r25
/* 80497FB8 4B BD E0 E9 */ bl __ct__9dBgS_AcchFv
/* 80497FBC 3C 60 80 4A */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x804983DC@ha */
/* 80497FC0 38 63 83 DC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x804983DC@l */
/* 80497FC4 90 79 00 10 */ stw r3, 0x10(r25)
/* 80497FC8 38 03 00 0C */ addi r0, r3, 0xc
/* 80497FCC 90 19 00 14 */ stw r0, 0x14(r25)
/* 80497FD0 38 03 00 18 */ addi r0, r3, 0x18
/* 80497FD4 90 19 00 24 */ stw r0, 0x24(r25)
/* 80497FD8 38 79 00 14 */ addi r3, r25, 0x14
/* 80497FDC 4B BE 0E 8D */ bl SetObj__16dBgS_PolyPassChkFv
/* 80497FE0 38 7A 09 04 */ addi r3, r26, 0x904
/* 80497FE4 4B BD DE C9 */ bl __ct__12dBgS_AcchCirFv
/* 80497FE8 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
/* 80497FEC 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
/* 80497FF0 90 1A 09 5C */ stw r0, 0x95c(r26)
/* 80497FF4 38 7A 09 60 */ addi r3, r26, 0x960
/* 80497FF8 4B BE B7 69 */ bl __ct__10dCcD_GSttsFv
/* 80497FFC 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
/* 80498000 38 03 C2 E4 */ addi r0, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
/* 80498004 90 1A 09 5C */ stw r0, 0x95c(r26)
/* 80498008 93 FA 09 60 */ stw r31, 0x960(r26)
/* 8049800C 3B 3A 09 80 */ addi r25, r26, 0x980
/* 80498010 7F 23 CB 78 */ mr r3, r25
/* 80498014 4B BE BA 15 */ bl __ct__12dCcD_GObjInfFv
/* 80498018 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
/* 8049801C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
/* 80498020 90 19 01 20 */ stw r0, 0x120(r25)
/* 80498024 3C 60 80 4A */ lis r3, __vt__8cM3dGAab@ha /* 0x8049840C@ha */
/* 80498028 38 03 84 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8049840C@l */
/* 8049802C 90 19 01 1C */ stw r0, 0x11c(r25)
/* 80498030 3C 60 80 4A */ lis r3, __vt__8cM3dGCyl@ha /* 0x80498400@ha */
/* 80498034 38 03 84 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80498400@l */
/* 80498038 90 19 01 38 */ stw r0, 0x138(r25)
/* 8049803C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
/* 80498040 38 03 35 A4 */ addi r0, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
/* 80498044 90 19 01 20 */ stw r0, 0x120(r25)
/* 80498048 93 D9 01 38 */ stw r30, 0x138(r25)
/* 8049804C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
/* 80498050 38 03 C0 50 */ addi r0, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
/* 80498054 90 19 00 3C */ stw r0, 0x3c(r25)
/* 80498058 93 B9 01 20 */ stw r29, 0x120(r25)
/* 8049805C 93 99 01 38 */ stw r28, 0x138(r25)
lbl_80498060:
/* 80498060 80 1B 04 A0 */ lwz r0, 0x4a0(r27)
/* 80498064 60 00 00 08 */ ori r0, r0, 8
/* 80498068 90 1B 04 A0 */ stw r0, 0x4a0(r27)
lbl_8049806C:
/* 8049806C 7F 63 DB 78 */ mr r3, r27
/* 80498070 4B FF ED CD */ bl create1st__9daTbox2_cFv
/* 80498074 39 61 00 30 */ addi r11, r1, 0x30
/* 80498078 4B EC A1 A1 */ bl _restgpr_25
/* 8049807C 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80498080 7C 08 03 A6 */ mtlr r0
/* 80498084 38 21 00 30 */ addi r1, r1, 0x30
/* 80498088 4E 80 00 20 */ blr
@@ -1,151 +0,0 @@
lbl_8049724C:
/* 8049724C 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80497250 7C 08 02 A6 */ mflr r0
/* 80497254 90 01 00 34 */ stw r0, 0x34(r1)
/* 80497258 39 61 00 30 */ addi r11, r1, 0x30
/* 8049725C 4B EC AF 81 */ bl _savegpr_29
/* 80497260 7C 7D 1B 78 */ mr r29, r3
/* 80497264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8049726C 3B C3 4F F8 */ addi r30, r3, 0x4ff8
/* 80497270 7F C3 F3 78 */ mr r3, r30
/* 80497274 80 9D 0A C4 */ lwz r4, 0xac4(r29)
/* 80497278 3C A0 80 4A */ lis r5, action_table@ha /* 0x804982C8@ha */
/* 8049727C 38 A5 82 C8 */ addi r5, r5, action_table@l /* 0x804982C8@l */
/* 80497280 38 C0 00 04 */ li r6, 4
/* 80497284 38 E0 00 00 */ li r7, 0
/* 80497288 39 00 00 00 */ li r8, 0
/* 8049728C 4B BB 0B 85 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii
/* 80497290 7C 7F 1B 78 */ mr r31, r3
/* 80497294 7F C3 F3 78 */ mr r3, r30
/* 80497298 80 9D 0A C4 */ lwz r4, 0xac4(r29)
/* 8049729C 4B BB 0A B1 */ bl getIsAddvance__16dEvent_manager_cFi
/* 804972A0 2C 03 00 00 */ cmpwi r3, 0
/* 804972A4 41 82 01 48 */ beq lbl_804973EC
/* 804972A8 2C 1F 00 02 */ cmpwi r31, 2
/* 804972AC 41 82 01 40 */ beq lbl_804973EC
/* 804972B0 40 80 00 10 */ bge lbl_804972C0
/* 804972B4 2C 1F 00 01 */ cmpwi r31, 1
/* 804972B8 40 80 00 14 */ bge lbl_804972CC
/* 804972BC 48 00 01 30 */ b lbl_804973EC
lbl_804972C0:
/* 804972C0 2C 1F 00 04 */ cmpwi r31, 4
/* 804972C4 40 80 01 28 */ bge lbl_804973EC
/* 804972C8 48 00 00 64 */ b lbl_8049732C
lbl_804972CC:
/* 804972CC 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
/* 804972D0 7C 03 07 74 */ extsb r3, r0
/* 804972D4 4B B9 5D 99 */ bl dComIfGp_getReverb__Fi
/* 804972D8 7C 67 1B 78 */ mr r7, r3
/* 804972DC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080020@ha */
/* 804972E0 38 03 00 20 */ addi r0, r3, 0x0020 /* 0x00080020@l */
/* 804972E4 90 01 00 10 */ stw r0, 0x10(r1)
/* 804972E8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */
/* 804972EC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */
/* 804972F0 80 63 00 00 */ lwz r3, 0(r3)
/* 804972F4 38 81 00 10 */ addi r4, r1, 0x10
/* 804972F8 38 BD 05 38 */ addi r5, r29, 0x538
/* 804972FC 38 C0 00 00 */ li r6, 0
/* 80497300 3D 00 80 4A */ lis r8, lit_3763@ha /* 0x804981D0@ha */
/* 80497304 C0 28 81 D0 */ lfs f1, lit_3763@l(r8) /* 0x804981D0@l */
/* 80497308 FC 40 08 90 */ fmr f2, f1
/* 8049730C 3D 00 80 4A */ lis r8, lit_4021@ha /* 0x804981D4@ha */
/* 80497310 C0 68 81 D4 */ lfs f3, lit_4021@l(r8) /* 0x804981D4@l */
/* 80497314 FC 80 18 90 */ fmr f4, f3
/* 80497318 39 00 00 00 */ li r8, 0
/* 8049731C 4B E1 46 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 80497320 7F A3 EB 78 */ mr r3, r29
/* 80497324 48 00 01 55 */ bl openInit__9daTbox2_cFv
/* 80497328 48 00 00 C4 */ b lbl_804973EC
lbl_8049732C:
/* 8049732C 88 1D 0A BC */ lbz r0, 0xabc(r29)
/* 80497330 28 00 00 00 */ cmplwi r0, 0
/* 80497334 40 82 00 5C */ bne lbl_80497390
/* 80497338 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
/* 8049733C 7C 03 07 74 */ extsb r3, r0
/* 80497340 4B B9 5D 2D */ bl dComIfGp_getReverb__Fi
/* 80497344 7C 67 1B 78 */ mr r7, r3
/* 80497348 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008001F@ha */
/* 8049734C 38 03 00 1F */ addi r0, r3, 0x001F /* 0x0008001F@l */
/* 80497350 90 01 00 0C */ stw r0, 0xc(r1)
/* 80497354 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */
/* 80497358 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */
/* 8049735C 80 63 00 00 */ lwz r3, 0(r3)
/* 80497360 38 81 00 0C */ addi r4, r1, 0xc
/* 80497364 38 BD 05 38 */ addi r5, r29, 0x538
/* 80497368 38 C0 00 00 */ li r6, 0
/* 8049736C 3D 00 80 4A */ lis r8, lit_3763@ha /* 0x804981D0@ha */
/* 80497370 C0 28 81 D0 */ lfs f1, lit_3763@l(r8) /* 0x804981D0@l */
/* 80497374 FC 40 08 90 */ fmr f2, f1
/* 80497378 3D 00 80 4A */ lis r8, lit_4021@ha /* 0x804981D4@ha */
/* 8049737C C0 68 81 D4 */ lfs f3, lit_4021@l(r8) /* 0x804981D4@l */
/* 80497380 FC 80 18 90 */ fmr f4, f3
/* 80497384 39 00 00 00 */ li r8, 0
/* 80497388 4B E1 45 FD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8049738C 48 00 00 58 */ b lbl_804973E4
lbl_80497390:
/* 80497390 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
/* 80497394 7C 03 07 74 */ extsb r3, r0
/* 80497398 4B B9 5C D5 */ bl dComIfGp_getReverb__Fi
/* 8049739C 7C 67 1B 78 */ mr r7, r3
/* 804973A0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080020@ha */
/* 804973A4 38 03 00 20 */ addi r0, r3, 0x0020 /* 0x00080020@l */
/* 804973A8 90 01 00 08 */ stw r0, 8(r1)
/* 804973AC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */
/* 804973B0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */
/* 804973B4 80 63 00 00 */ lwz r3, 0(r3)
/* 804973B8 38 81 00 08 */ addi r4, r1, 8
/* 804973BC 38 BD 05 38 */ addi r5, r29, 0x538
/* 804973C0 38 C0 00 00 */ li r6, 0
/* 804973C4 3D 00 80 4A */ lis r8, lit_3763@ha /* 0x804981D0@ha */
/* 804973C8 C0 28 81 D0 */ lfs f1, lit_3763@l(r8) /* 0x804981D0@l */
/* 804973CC FC 40 08 90 */ fmr f2, f1
/* 804973D0 3D 00 80 4A */ lis r8, lit_4021@ha /* 0x804981D4@ha */
/* 804973D4 C0 68 81 D4 */ lfs f3, lit_4021@l(r8) /* 0x804981D4@l */
/* 804973D8 FC 80 18 90 */ fmr f4, f3
/* 804973DC 39 00 00 00 */ li r8, 0
/* 804973E0 4B E1 45 A5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
lbl_804973E4:
/* 804973E4 7F A3 EB 78 */ mr r3, r29
/* 804973E8 48 00 00 91 */ bl openInit__9daTbox2_cFv
lbl_804973EC:
/* 804973EC 2C 1F 00 02 */ cmpwi r31, 2
/* 804973F0 41 82 00 6C */ beq lbl_8049745C
/* 804973F4 40 80 00 10 */ bge lbl_80497404
/* 804973F8 2C 1F 00 01 */ cmpwi r31, 1
/* 804973FC 40 80 00 14 */ bge lbl_80497410
/* 80497400 48 00 00 50 */ b lbl_80497450
lbl_80497404:
/* 80497404 2C 1F 00 04 */ cmpwi r31, 4
/* 80497408 40 80 00 48 */ bge lbl_80497450
/* 8049740C 48 00 00 24 */ b lbl_80497430
lbl_80497410:
/* 80497410 80 7D 07 28 */ lwz r3, 0x728(r29)
/* 80497414 4B B7 60 15 */ bl play__14mDoExt_baseAnmFv
/* 80497418 2C 03 00 00 */ cmpwi r3, 0
/* 8049741C 41 82 00 40 */ beq lbl_8049745C
/* 80497420 7F C3 F3 78 */ mr r3, r30
/* 80497424 80 9D 0A C4 */ lwz r4, 0xac4(r29)
/* 80497428 4B BB 0D 55 */ bl cutEnd__16dEvent_manager_cFi
/* 8049742C 48 00 00 30 */ b lbl_8049745C
lbl_80497430:
/* 80497430 80 7D 07 28 */ lwz r3, 0x728(r29)
/* 80497434 4B B7 5F F5 */ bl play__14mDoExt_baseAnmFv
/* 80497438 2C 03 00 00 */ cmpwi r3, 0
/* 8049743C 41 82 00 20 */ beq lbl_8049745C
/* 80497440 7F C3 F3 78 */ mr r3, r30
/* 80497444 80 9D 0A C4 */ lwz r4, 0xac4(r29)
/* 80497448 4B BB 0D 35 */ bl cutEnd__16dEvent_manager_cFi
/* 8049744C 48 00 00 10 */ b lbl_8049745C
lbl_80497450:
/* 80497450 7F C3 F3 78 */ mr r3, r30
/* 80497454 80 9D 0A C4 */ lwz r4, 0xac4(r29)
/* 80497458 4B BB 0D 25 */ bl cutEnd__16dEvent_manager_cFi
lbl_8049745C:
/* 8049745C 38 60 00 00 */ li r3, 0
/* 80497460 39 61 00 30 */ addi r11, r1, 0x30
/* 80497464 4B EC AD C5 */ bl _restgpr_29
/* 80497468 80 01 00 34 */ lwz r0, 0x34(r1)
/* 8049746C 7C 08 03 A6 */ mtlr r0
/* 80497470 38 21 00 30 */ addi r1, r1, 0x30
/* 80497474 4E 80 00 20 */ blr
@@ -1,3 +0,0 @@
lbl_80498148:
/* 80498148 38 63 FF DC */ addi r3, r3, -36
/* 8049814C 4B FF EF A4 */ b __dt__12dBgS_ObjAcchFv
@@ -1,3 +0,0 @@
lbl_80498150:
/* 80498150 38 63 FF EC */ addi r3, r3, -20
/* 80498154 4B FF EF 9C */ b __dt__12dBgS_ObjAcchFv
@@ -1,16 +0,0 @@
lbl_80496A18:
/* 80496A18 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80496A1C 7C 08 02 A6 */ mflr r0
/* 80496A20 90 01 00 14 */ stw r0, 0x14(r1)
/* 80496A24 80 83 07 24 */ lwz r4, 0x724(r3)
/* 80496A28 C0 03 04 EC */ lfs f0, 0x4ec(r3)
/* 80496A2C D0 04 00 18 */ stfs f0, 0x18(r4)
/* 80496A30 C0 03 04 F0 */ lfs f0, 0x4f0(r3)
/* 80496A34 D0 04 00 1C */ stfs f0, 0x1c(r4)
/* 80496A38 C0 03 04 F4 */ lfs f0, 0x4f4(r3)
/* 80496A3C D0 04 00 20 */ stfs f0, 0x20(r4)
/* 80496A40 48 00 00 15 */ bl setBaseMtx__9daTbox2_cFv
/* 80496A44 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80496A48 7C 08 03 A6 */ mtlr r0
/* 80496A4C 38 21 00 10 */ addi r1, r1, 0x10
/* 80496A50 4E 80 00 20 */ blr
@@ -1,4 +0,0 @@
lbl_804978D8:
/* 804978D8 38 00 00 02 */ li r0, 2
/* 804978DC 98 03 0A BD */ stb r0, 0xabd(r3)
/* 804978E0 4E 80 00 20 */ blr
@@ -1,4 +0,0 @@
lbl_8049794C:
/* 8049794C 38 00 00 01 */ li r0, 1
/* 80497950 98 03 0A BD */ stb r0, 0xabd(r3)
/* 80497954 4E 80 00 20 */ blr
@@ -1,4 +0,0 @@
lbl_80497A0C:
/* 80497A0C 38 00 00 00 */ li r0, 0
/* 80497A10 98 03 0A BD */ stb r0, 0xabd(r3)
/* 80497A14 4E 80 00 20 */ blr
@@ -1,4 +0,0 @@
lbl_804978C8:
/* 804978C8 38 00 00 03 */ li r0, 3
/* 804978CC 98 03 0A BD */ stb r0, 0xabd(r3)
/* 804978D0 4E 80 00 20 */ blr
@@ -1,32 +0,0 @@
lbl_80497790:
/* 80497790 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80497794 7C 08 02 A6 */ mflr r0
/* 80497798 90 01 00 14 */ stw r0, 0x14(r1)
/* 8049779C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 804977A0 7C 7F 1B 78 */ mr r31, r3
/* 804977A4 48 00 00 69 */ bl action__9daTbox2_cFv
/* 804977A8 7F E3 FB 78 */ mr r3, r31
/* 804977AC 38 80 00 00 */ li r4, 0
/* 804977B0 4B B8 2F 1D */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz
/* 804977B4 38 7F 07 2C */ addi r3, r31, 0x72c
/* 804977B8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 804977BC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 804977C0 38 84 0F 38 */ addi r4, r4, 0xf38
/* 804977C4 4B BD F2 E9 */ bl CrrPos__9dBgS_AcchFR4dBgS
/* 804977C8 C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
/* 804977CC D0 1F 05 50 */ stfs f0, 0x550(r31)
/* 804977D0 C0 1F 04 D4 */ lfs f0, 0x4d4(r31)
/* 804977D4 D0 1F 05 54 */ stfs f0, 0x554(r31)
/* 804977D8 C0 1F 04 D8 */ lfs f0, 0x4d8(r31)
/* 804977DC D0 1F 05 58 */ stfs f0, 0x558(r31)
/* 804977E0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
/* 804977E4 D0 1F 05 38 */ stfs f0, 0x538(r31)
/* 804977E8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31)
/* 804977EC D0 1F 05 3C */ stfs f0, 0x53c(r31)
/* 804977F0 C0 1F 04 D8 */ lfs f0, 0x4d8(r31)
/* 804977F4 D0 1F 05 40 */ stfs f0, 0x540(r31)
/* 804977F8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 804977FC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80497800 7C 08 03 A6 */ mtlr r0
/* 80497804 38 21 00 10 */ addi r1, r1, 0x10
/* 80497808 4E 80 00 20 */ blr
@@ -1,73 +0,0 @@
lbl_80497678:
/* 80497678 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 8049767C 7C 08 02 A6 */ mflr r0
/* 80497680 90 01 00 34 */ stw r0, 0x34(r1)
/* 80497684 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 80497688 93 C1 00 28 */ stw r30, 0x28(r1)
/* 8049768C 7C 7F 1B 78 */ mr r31, r3
/* 80497690 3B C0 00 00 */ li r30, 0
/* 80497694 38 00 00 01 */ li r0, 1
/* 80497698 98 03 0A BF */ stb r0, 0xabf(r3)
/* 8049769C C0 43 04 A8 */ lfs f2, 0x4a8(r3)
/* 804976A0 D0 41 00 14 */ stfs f2, 0x14(r1)
/* 804976A4 C0 23 04 AC */ lfs f1, 0x4ac(r3)
/* 804976A8 D0 21 00 18 */ stfs f1, 0x18(r1)
/* 804976AC C0 03 04 B0 */ lfs f0, 0x4b0(r3)
/* 804976B0 D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 804976B4 D0 41 00 08 */ stfs f2, 8(r1)
/* 804976B8 D0 21 00 0C */ stfs f1, 0xc(r1)
/* 804976BC D0 01 00 10 */ stfs f0, 0x10(r1)
/* 804976C0 3C 60 80 4A */ lis r3, lit_3717@ha /* 0x804981C8@ha */
/* 804976C4 C0 03 81 C8 */ lfs f0, lit_3717@l(r3) /* 0x804981C8@l */
/* 804976C8 EC 01 00 2A */ fadds f0, f1, f0
/* 804976CC D0 01 00 18 */ stfs f0, 0x18(r1)
/* 804976D0 3C 60 80 4A */ lis r3, lit_3718@ha /* 0x804981CC@ha */
/* 804976D4 C0 03 81 CC */ lfs f0, lit_3718@l(r3) /* 0x804981CC@l */
/* 804976D8 EC 01 00 28 */ fsubs f0, f1, f0
/* 804976DC D0 01 00 0C */ stfs f0, 0xc(r1)
/* 804976E0 38 61 00 14 */ addi r3, r1, 0x14
/* 804976E4 38 81 00 08 */ addi r4, r1, 8
/* 804976E8 7F E5 FB 78 */ mr r5, r31
/* 804976EC 4B B8 65 7D */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c
/* 804976F0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 804976F4 41 82 00 64 */ beq lbl_80497758
/* 804976F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 804976FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497700 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80497704 3C 80 80 3F */ lis r4, mLineCheck__11fopAcM_lc_c@ha /* 0x803F1C48@ha */
/* 80497708 38 84 1C 48 */ addi r4, r4, mLineCheck__11fopAcM_lc_c@l /* 0x803F1C48@l */
/* 8049770C 38 84 00 14 */ addi r4, r4, 0x14
/* 80497710 4B BD D3 AD */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo
/* 80497714 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80497718 41 82 00 40 */ beq lbl_80497758
/* 8049771C 3B C0 00 01 */ li r30, 1
/* 80497720 3C 60 80 3F */ lis r3, mLineCheck__11fopAcM_lc_c@ha /* 0x803F1C48@ha */
/* 80497724 38 63 1C 48 */ addi r3, r3, mLineCheck__11fopAcM_lc_c@l /* 0x803F1C48@l */
/* 80497728 C0 03 00 30 */ lfs f0, 0x30(r3)
/* 8049772C D0 1F 04 A8 */ stfs f0, 0x4a8(r31)
/* 80497730 C0 03 00 34 */ lfs f0, 0x34(r3)
/* 80497734 D0 1F 04 AC */ stfs f0, 0x4ac(r31)
/* 80497738 C0 03 00 38 */ lfs f0, 0x38(r3)
/* 8049773C D0 1F 04 B0 */ stfs f0, 0x4b0(r31)
/* 80497740 C0 1F 04 A8 */ lfs f0, 0x4a8(r31)
/* 80497744 D0 1F 04 D0 */ stfs f0, 0x4d0(r31)
/* 80497748 C0 1F 04 AC */ lfs f0, 0x4ac(r31)
/* 8049774C D0 1F 04 D4 */ stfs f0, 0x4d4(r31)
/* 80497750 C0 1F 04 B0 */ lfs f0, 0x4b0(r31)
/* 80497754 D0 1F 04 D8 */ stfs f0, 0x4d8(r31)
lbl_80497758:
/* 80497758 57 C0 06 3F */ clrlwi. r0, r30, 0x18
/* 8049775C 41 82 00 1C */ beq lbl_80497778
/* 80497760 38 00 00 00 */ li r0, 0
/* 80497764 98 1F 0A BF */ stb r0, 0xabf(r31)
/* 80497768 38 00 00 01 */ li r0, 1
/* 8049776C 98 1F 0A BE */ stb r0, 0xabe(r31)
/* 80497770 7F E3 FB 78 */ mr r3, r31
/* 80497774 48 00 00 1D */ bl mode_exec__9daTbox2_cFv
lbl_80497778:
/* 80497778 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 8049777C 83 C1 00 28 */ lwz r30, 0x28(r1)
/* 80497780 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80497784 7C 08 03 A6 */ mtlr r0
/* 80497788 38 21 00 30 */ addi r1, r1, 0x30
/* 8049778C 4E 80 00 20 */ blr
@@ -1,37 +0,0 @@
lbl_804975EC:
/* 804975EC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804975F0 7C 08 02 A6 */ mflr r0
/* 804975F4 90 01 00 14 */ stw r0, 0x14(r1)
/* 804975F8 3C 80 80 4A */ lis r4, cNullVec__6Z2Calc@ha /* 0x8049825C@ha */
/* 804975FC 38 E4 82 5C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x8049825C@l */
/* 80497600 3C 80 80 4A */ lis r4, struct_80498480+0x0@ha /* 0x80498480@ha */
/* 80497604 38 C4 84 80 */ addi r6, r4, struct_80498480+0x0@l /* 0x80498480@l */
/* 80497608 88 06 00 00 */ lbz r0, 0(r6)
/* 8049760C 7C 00 07 75 */ extsb. r0, r0
/* 80497610 40 82 00 40 */ bne lbl_80497650
/* 80497614 80 87 00 7C */ lwz r4, 0x7c(r7)
/* 80497618 80 07 00 80 */ lwz r0, 0x80(r7)
/* 8049761C 90 87 00 94 */ stw r4, 0x94(r7)
/* 80497620 90 07 00 98 */ stw r0, 0x98(r7)
/* 80497624 80 07 00 84 */ lwz r0, 0x84(r7)
/* 80497628 90 07 00 9C */ stw r0, 0x9c(r7)
/* 8049762C 38 A7 00 94 */ addi r5, r7, 0x94
/* 80497630 80 87 00 88 */ lwz r4, 0x88(r7)
/* 80497634 80 07 00 8C */ lwz r0, 0x8c(r7)
/* 80497638 90 85 00 0C */ stw r4, 0xc(r5)
/* 8049763C 90 05 00 10 */ stw r0, 0x10(r5)
/* 80497640 80 07 00 90 */ lwz r0, 0x90(r7)
/* 80497644 90 05 00 14 */ stw r0, 0x14(r5)
/* 80497648 38 00 00 01 */ li r0, 1
/* 8049764C 98 06 00 00 */ stb r0, 0(r6)
lbl_80497650:
/* 80497650 88 03 0A BE */ lbz r0, 0xabe(r3)
/* 80497654 1C 00 00 0C */ mulli r0, r0, 0xc
/* 80497658 39 87 00 94 */ addi r12, r7, 0x94
/* 8049765C 7D 8C 02 14 */ add r12, r12, r0
/* 80497660 4B EC AA 25 */ bl __ptmf_scall
/* 80497664 60 00 00 00 */ nop
/* 80497668 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8049766C 7C 08 03 A6 */ mtlr r0
/* 80497670 38 21 00 10 */ addi r1, r1, 0x10
/* 80497674 4E 80 00 20 */ blr
@@ -1,37 +0,0 @@
lbl_80497478:
/* 80497478 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8049747C 7C 08 02 A6 */ mflr r0
/* 80497480 90 01 00 14 */ stw r0, 0x14(r1)
/* 80497484 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80497488 7C 7F 1B 78 */ mr r31, r3
/* 8049748C 88 03 07 18 */ lbz r0, 0x718(r3)
/* 80497490 28 00 00 00 */ cmplwi r0, 0
/* 80497494 40 82 00 48 */ bne lbl_804974DC
/* 80497498 80 9F 05 68 */ lwz r4, 0x568(r31)
/* 8049749C 28 04 00 00 */ cmplwi r4, 0
/* 804974A0 41 82 00 14 */ beq lbl_804974B4
/* 804974A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 804974A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 804974AC 38 63 0F 38 */ addi r3, r3, 0xf38
/* 804974B0 4B BD CD A1 */ bl Release__4cBgSFP9dBgW_Base
lbl_804974B4:
/* 804974B4 80 9F 0A C8 */ lwz r4, 0xac8(r31)
/* 804974B8 28 04 00 00 */ cmplwi r4, 0
/* 804974BC 41 82 00 20 */ beq lbl_804974DC
/* 804974C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 804974C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 804974C8 38 63 0F 38 */ addi r3, r3, 0xf38
/* 804974CC 7F E5 FB 78 */ mr r5, r31
/* 804974D0 4B BD D5 39 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c
/* 804974D4 80 7F 0A C8 */ lwz r3, 0xac8(r31)
/* 804974D8 4B BE 44 E9 */ bl Move__4dBgWFv
lbl_804974DC:
/* 804974DC 3C 60 80 4A */ lis r3, lit_3763@ha /* 0x804981D0@ha */
/* 804974E0 C0 03 81 D0 */ lfs f0, lit_3763@l(r3) /* 0x804981D0@l */
/* 804974E4 80 7F 07 28 */ lwz r3, 0x728(r31)
/* 804974E8 D0 03 00 0C */ stfs f0, 0xc(r3)
/* 804974EC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 804974F0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804974F4 7C 08 03 A6 */ mtlr r0
/* 804974F8 38 21 00 10 */ addi r1, r1, 0x10
/* 804974FC 4E 80 00 20 */ blr
@@ -1,26 +0,0 @@
lbl_80496A54:
/* 80496A54 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80496A58 7C 08 02 A6 */ mflr r0
/* 80496A5C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80496A60 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80496A64 7C 7F 1B 78 */ mr r31, r3
/* 80496A68 38 7F 04 D0 */ addi r3, r31, 0x4d0
/* 80496A6C 4B B7 62 F9 */ bl transS__14mDoMtx_stack_cFRC4cXyz
/* 80496A70 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80496A74 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80496A78 A8 9F 04 E6 */ lha r4, 0x4e6(r31)
/* 80496A7C 4B B7 59 B9 */ bl mDoMtx_YrotM__FPA4_fs
/* 80496A80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80496A84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80496A88 80 9F 07 24 */ lwz r4, 0x724(r31)
/* 80496A8C 38 84 00 24 */ addi r4, r4, 0x24
/* 80496A90 4B EA FA 21 */ bl PSMTXCopy
/* 80496A94 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80496A98 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80496A9C 38 9F 05 6C */ addi r4, r31, 0x56c
/* 80496AA0 4B EA FA 11 */ bl PSMTXCopy
/* 80496AA4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80496AA8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80496AAC 7C 08 03 A6 */ mtlr r0
/* 80496AB0 38 21 00 10 */ addi r1, r1, 0x10
/* 80496AB4 4E 80 00 20 */ blr
@@ -1,40 +0,0 @@
lbl_80497BD0:
/* 80497BD0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80497BD4 7C 08 02 A6 */ mflr r0
/* 80497BD8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80497BDC 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80497BE0 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80497BE4 88 03 07 18 */ lbz r0, 0x718(r3)
/* 80497BE8 28 00 00 00 */ cmplwi r0, 0
/* 80497BEC 41 82 00 28 */ beq lbl_80497C14
/* 80497BF0 38 63 04 D0 */ addi r3, r3, 0x4d0
/* 80497BF4 38 A0 00 01 */ li r5, 1
/* 80497BF8 38 C0 FF FF */ li r6, -1
/* 80497BFC 38 E0 FF FF */ li r7, -1
/* 80497C00 39 00 00 00 */ li r8, 0
/* 80497C04 39 20 00 00 */ li r9, 0
/* 80497C08 4B B8 3F E1 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz
/* 80497C0C 7C 64 1B 78 */ mr r4, r3
/* 80497C10 48 00 00 20 */ b lbl_80497C30
lbl_80497C14:
/* 80497C14 38 63 04 D0 */ addi r3, r3, 0x4d0
/* 80497C18 38 A0 FF FF */ li r5, -1
/* 80497C1C 38 C0 FF FF */ li r6, -1
/* 80497C20 38 E0 00 00 */ li r7, 0
/* 80497C24 39 00 00 00 */ li r8, 0
/* 80497C28 4B B8 40 4D */ bl fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz
/* 80497C2C 7C 64 1B 78 */ mr r4, r3
lbl_80497C30:
/* 80497C30 3C 04 00 01 */ addis r0, r4, 1
/* 80497C34 28 00 FF FF */ cmplwi r0, 0xffff
/* 80497C38 41 82 00 14 */ beq lbl_80497C4C
/* 80497C3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80497C40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80497C44 38 63 4E C8 */ addi r3, r3, 0x4ec8
/* 80497C48 4B BA BA A5 */ bl setPtI_Id__14dEvt_control_cFUi
lbl_80497C4C:
/* 80497C4C 38 60 00 01 */ li r3, 1
/* 80497C50 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80497C54 7C 08 03 A6 */ mtlr r0
/* 80497C58 38 21 00 10 */ addi r1, r1, 0x10
/* 80497C5C 4E 80 00 20 */ blr
+4
View File
@@ -28,12 +28,16 @@
#define JUT_LOG(LINE, ...) \
JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__)
#define JUT_CONFIRM(LINE, COND) \
JUTAssertion::setConfirmMessage(JUTAssertion::getSDevice(), __FILE__, LINE, COND, #COND)
#else
#define JUT_ASSERT(...)
#define JUT_ASSERT_REPORT(...)
#define JUT_PANIC(...)
#define JUT_WARN(...)
#define JUT_LOG(...)
#define JUT_CONFIRM(...)
#endif
namespace JUTAssertion {
+3 -3
View File
@@ -1813,7 +1813,7 @@ public:
/* 800DC474 */ int procCoSwimFreezeReturn();
/* 800DC548 */ static BOOL checkEnemyGroup(fopAc_ac_c*);
/* 800DC5A4 */ static BOOL checkSpecialNpc(fopAc_ac_c*);
/* 800DC5DC */ bool checkShieldAttackEmphasys();
/* 800DC5DC */ BOOL checkShieldAttackEmphasys();
/* 800DC678 */ BOOL checkGuardActionChange();
/* 800DC79C */ void stickArrowIncrement(int);
/* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int);
@@ -3262,7 +3262,7 @@ public:
var_r5 = 0;
if (mItemAcKeep.getActor() != NULL &&
mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) {
mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt() != 0) {
var_r5 = 1;
}
@@ -3559,7 +3559,7 @@ private:
/* 0x02854 */ daPy_actorKeep_c mCargoCarryAcKeep;
/* 0x0285C */ daPy_actorKeep_c field_0x285c;
/* 0x02864 */ dMsgFlow_c mMsgFlow;
/* 0x028B0 */ int field_0x28b0[0x10];
/* 0x028B0 */ unsigned int mShieldArrowIDs[16];
/* 0x028F0 */ unsigned int mMsgClassID;
/* 0x028F4 */ int mAtnActorID;
/* 0x028F8 */ int field_0x28f8;
+3 -3
View File
@@ -259,7 +259,7 @@ public:
/* 0xD90 */ u32 field_0xd90;
/* 0xD94 */ u32 field_0xd94;
/* 0xD98 */ u32 field_0xd98;
/* 0xD9C */ profile_method_class* mSubMtd;
/* 0xD9C */ profile_method_class* sub_method;
/* 0xDA0 */ u8 field_0xda0[8];
/* 0xDA8 */ u32 field_0xda8;
/* 0xDAC */ int field_0xdac;
@@ -640,13 +640,13 @@ public:
/* 80155BCC */ virtual void drawOtherMdls();
BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) {
return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[3]);
return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.field_0x0[3]);
}
BOOL chkPlayerInSpeakArea(fopAc_ac_c* i_actor) {
return chkActorInSpeakArea(daPy_getPlayerActorClass(), i_actor);
}
BOOL chkActorInTalkArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) {
return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[1]);
return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.field_0x0[1]);
}
BOOL chkPlayerInTalkArea(fopAc_ac_c* i_actor) {
return chkActorInTalkArea(daPy_getPlayerActorClass(), i_actor);
+1
View File
@@ -396,5 +396,6 @@ int isBomb(u8);
int isArrow(u8);
int addBombCount(u8, u8);
BOOL isBottleItem(u8 item_no);
u8 check_itemno(int i_itemNo);
#endif /* D_D_ITEM_H */
+1
View File
@@ -99,6 +99,7 @@ void OSReportInit(void);
#define ASSERTMSG(exp, msg) (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg)), 0))
#else
#define OS_REPORT(...)
#define OS_REPORT_ERROR(...)
#define OS_PANIC(...)
#define ASSERTMSG(exp, msg) ((void)0)
#endif
+39 -47
View File
@@ -13,10 +13,10 @@ struct actor_method_class {
struct actor_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition mBase;
/* 0x24 */ actor_method_class* mSubMtd;
/* 0x28 */ u32 mStatus;
/* 0x24 */ actor_method_class* sub_method;
/* 0x28 */ u32 status;
/* 0x2C */ u8 mActorType;
/* 0x2D */ u8 mCullType;
/* 0x2D */ u8 cullType;
};
// Unclear what this is. Only appears in 4 profiles (BG,DSHUTTER,PATH,SCENE_EXIT)
@@ -156,8 +156,6 @@ public:
}; // Size = 0x18
struct actor_place {
/* 807E2468 */ // void operator=(actor_place const&);
/* 0x00 */ cXyz pos;
/* 0x0C */ csXyz angle;
/* 0x12 */ s8 roomNo;
@@ -165,65 +163,63 @@ struct actor_place {
};
struct actor_attention_types {
void setFlag(u32 flags) { mFlags |= flags; }
/* 0x00 */ u8 field_0x0[9];
/* 0x0A */ s16 field_0xa;
/* 0x0C */ cXyz mPosition;
/* 0x18 */ u32 mFlags;
/* 0x0C */ cXyz position;
/* 0x18 */ u32 flags;
}; // Size = 0x1C
class dJntCol_c;
struct cull_sphere {
/* 0x0 */ Vec mCenter;
/* 0xC */ f32 mRadius;
/* 0x0 */ Vec center;
/* 0xC */ f32 radius;
};
struct cull_box {
/* 0x0 */ Vec mMin;
/* 0xC */ Vec mMax;
/* 0x0 */ Vec min;
/* 0xC */ Vec max;
};
class fopAc_ac_c : public leafdraw_class {
public:
/* 0x0C0 */ int mAcType;
/* 0x0C4 */ create_tag_class mAcTg;
/* 0x0D8 */ create_tag_class mDwTg;
/* 0x0EC */ profile_method_class* mSubMtd;
/* 0x0F0 */ JKRSolidHeap* mHeap;
/* 0x0F4 */ dEvt_info_c mEvtInfo;
/* 0x10C */ dKy_tevstr_c mTevStr;
/* 0x494 */ u16 mSetID;
/* 0x496 */ u8 mGroup;
/* 0x497 */ s8 mCullType;
/* 0x498 */ u8 mDemoActorId;
/* 0x499 */ s8 mSubtype;
/* 0x49A */ u8 mCarryType;
/* 0x49C */ u32 mStatus;
/* 0x4A0 */ u32 mCondition;
/* 0x4A4 */ u32 mParentPcId;
/* 0x4A8 */ actor_place orig;
/* 0x4BC */ actor_place next;
/* 0x0C0 */ int actor_type;
/* 0x0C4 */ create_tag_class actor_tag;
/* 0x0D8 */ create_tag_class draw_tag;
/* 0x0EC */ profile_method_class* sub_method;
/* 0x0F0 */ JKRSolidHeap* heap;
/* 0x0F4 */ dEvt_info_c eventInfo;
/* 0x10C */ dKy_tevstr_c tevStr;
/* 0x494 */ u16 setID;
/* 0x496 */ u8 group;
/* 0x497 */ u8 cullType;
/* 0x498 */ u8 demoActorID;
/* 0x499 */ s8 subtype;
/* 0x49A */ u8 carryType;
/* 0x49C */ u32 actor_status;
/* 0x4A0 */ u32 actor_condition;
/* 0x4A4 */ u32 parentActorID;
/* 0x4A8 */ actor_place home;
/* 0x4BC */ actor_place old;
/* 0x4D0 */ actor_place current;
/* 0x4E4 */ csXyz shape_angle;
/* 0x4EC */ cXyz mScale;
/* 0x4EC */ cXyz scale;
/* 0x4F8 */ cXyz speed;
/* 0x504 */ MtxP mCullMtx;
/* 0x504 */ MtxP cullMtx;
union {
/* 0x508 */ cull_box mBox;
/* 0x508 */ cull_sphere mSphere;
} mCull;
/* 0x520 */ f32 mCullSizeFar;
/* 0x508 */ cull_box box;
/* 0x508 */ cull_sphere sphere;
} cull;
/* 0x520 */ f32 cullSizeFar;
/* 0x524 */ J3DModel* model;
/* 0x528 */ dJntCol_c* mJntCol;
/* 0x528 */ dJntCol_c* jntCol;
/* 0x52C */ f32 speedF;
/* 0x530 */ f32 mGravity;
/* 0x534 */ f32 mMaxFallSpeed;
/* 0x538 */ cXyz mEyePos;
/* 0x544 */ actor_attention_types mAttentionInfo;
/* 0x530 */ f32 gravity;
/* 0x534 */ f32 maxFallSpeed;
/* 0x538 */ cXyz eyePos;
/* 0x544 */ actor_attention_types attention_info;
/* 0x560 */ s16 field_0x560;
/* 0x562 */ s16 mHealth;
/* 0x562 */ s16 health;
/* 0x564 */ u8 field_0x564;
/* 0x565 */ u8 field_0x565;
/* 0x566 */ u8 field_0x566;
@@ -233,10 +229,6 @@ public:
~fopAc_ac_c();
static u32 stopStatus;
const cXyz& getPosition() const { return current.pos; }
const csXyz& getAngle() const { return current.angle; }
s8 getRoomNo() const { return current.roomNo; }
}; // Size: 0x568
STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x568);
+45 -148
View File
@@ -141,15 +141,15 @@ inline s16 fopAcM_GetName(void* pActor) {
}
inline MtxP fopAcM_GetMtx(const fopAc_ac_c* pActor) {
return pActor->mCullMtx;
return pActor->cullMtx;
}
inline u32 fopAcM_checkStatus(fopAc_ac_c* pActor, u32 status) {
return pActor->mStatus & status;
inline u32 fopAcM_checkStatus(fopAc_ac_c* pActor, u32 actor_status) {
return pActor->actor_status & actor_status;
}
inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) {
return pActor->mStatus & 0x2000;
return pActor->actor_status & 0x2000;
}
enum fopAcM_CARRY {
@@ -163,7 +163,7 @@ enum fopAcM_CARRY {
};
inline u32 fopAcM_CheckCarryType(fopAc_ac_c* actor, fopAcM_CARRY type) {
return actor->mCarryType & type;
return actor->carryType & type;
}
inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) {
@@ -183,7 +183,7 @@ inline void fopAcM_SetParam(void* p_actor, u32 param) {
}
inline void fopAcM_SetJntCol(fopAc_ac_c* i_actorP, dJntCol_c* i_jntColP) {
i_actorP->mJntCol = i_jntColP;
i_actorP->jntCol = i_jntColP;
}
inline s16 fopAcM_GetProfName(const void* pActor) {
@@ -191,15 +191,15 @@ inline s16 fopAcM_GetProfName(const void* pActor) {
}
inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) {
return p_actor->mGroup;
return p_actor->group;
}
inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) {
pActor->mStatus |= flag;
pActor->actor_status |= flag;
}
inline void fopAcM_OffStatus(fopAc_ac_c* pActor, u32 flag) {
pActor->mStatus &= ~flag;
pActor->actor_status &= ~flag;
}
inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) {
@@ -210,40 +210,40 @@ inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) {
return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id);
}
inline cXyz& fopAcM_GetPosition_p(fopAc_ac_c* pActor) {
return pActor->current.pos;
inline cXyz* fopAcM_GetPosition_p(fopAc_ac_c* pActor) {
return &pActor->current.pos;
}
inline cXyz& fopAcM_GetPosition(fopAc_ac_c* pActor) {
return pActor->current.pos;
}
inline cXyz& fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) {
return pActor->next.pos;
inline cXyz* fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) {
return &pActor->old.pos;
}
inline cXyz& fopAcM_GetSpeed_p(fopAc_ac_c* pActor) {
return pActor->speed;
inline cXyz* fopAcM_GetSpeed_p(fopAc_ac_c* pActor) {
return &pActor->speed;
}
inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
return pActor->current.angle;
inline csXyz* fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
return &pActor->current.angle;
}
inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
return pActor->shape_angle;
inline csXyz* fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
return &pActor->shape_angle;
}
inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) {
return p_actor->mCondition & flag;
return p_actor->actor_condition & flag;
}
inline void fopAcM_OnCondition(fopAc_ac_c* p_actor, u32 flag) {
p_actor->mCondition |= flag;
p_actor->actor_condition |= flag;
}
inline void fopAcM_OffCondition(fopAc_ac_c* p_actor, u32 flag) {
p_actor->mCondition &= ~flag;
p_actor->actor_condition &= ~flag;
}
inline BOOL fopAcM_IsActor(void* actor) {
@@ -263,19 +263,19 @@ inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) {
}
inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* pActor) {
return pActor->orig.roomNo;
return pActor->home.roomNo;
}
inline void fopAcM_SetGravity(fopAc_ac_c* actor, f32 gravity) {
actor->mGravity = gravity;
actor->gravity = gravity;
}
inline void fopAcM_SetMaxFallSpeed(fopAc_ac_c* actor, f32 speed) {
actor->mMaxFallSpeed = speed;
actor->maxFallSpeed = speed;
}
inline void fopAcM_SetMtx(fopAc_ac_c* actor, MtxP m) {
actor->mCullMtx = m;
actor->cullMtx = m;
}
inline void fopAcM_SetSpeed(fopAc_ac_c* actor, f32 x, f32 y, f32 z) {
@@ -286,8 +286,8 @@ inline void fopAcM_SetSpeedF(fopAc_ac_c* actor, f32 f) {
actor->speedF = f;
}
inline void fopAcM_SetStatus(fopAc_ac_c* actor, u32 status) {
actor->mStatus = status;
inline void fopAcM_SetStatus(fopAc_ac_c* actor, u32 actor_status) {
actor->actor_status = actor_status;
}
inline void fopAcM_SetModel(fopAc_ac_c* actor, J3DModel* model) {
@@ -307,39 +307,39 @@ inline f32 fopAcM_GetSpeedF(const fopAc_ac_c* p_actor) {
}
inline f32 fopAcM_GetGravity(const fopAc_ac_c* p_actor) {
return p_actor->mGravity;
return p_actor->gravity;
}
inline f32 fopAcM_GetMaxFallSpeed(const fopAc_ac_c* p_actor) {
return p_actor->mMaxFallSpeed;
return p_actor->maxFallSpeed;
}
inline const cXyz& fopAcM_GetSpeed_p(const fopAc_ac_c* p_actor) {
return p_actor->speed;
inline const cXyz* fopAcM_GetSpeed_p(const fopAc_ac_c* p_actor) {
return &p_actor->speed;
}
inline const cXyz& fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) {
return p_actor->current.pos;
inline const cXyz* fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) {
return &p_actor->current.pos;
}
inline dJntCol_c* fopAcM_GetJntCol(fopAc_ac_c* i_actor) {
return i_actor->mJntCol;
return i_actor->jntCol;
}
inline void fopAcM_setCullSizeFar(fopAc_ac_c* i_actor, f32 i_far) {
i_actor->mCullSizeFar = i_far;
i_actor->cullSizeFar = i_far;
}
inline f32 fopAcM_getCullSizeFar(const fopAc_ac_c* i_actor) {
return i_actor->mCullSizeFar;
return i_actor->cullSizeFar;
}
inline void fopAcM_SetCullSize(fopAc_ac_c* i_actor, s8 i_cullsize) {
i_actor->mCullType = i_cullsize;
i_actor->cullType = i_cullsize;
}
inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) {
return i_actor->mCullType;
return i_actor->cullType;
}
inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
@@ -347,11 +347,11 @@ inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
}
inline Vec fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
return i_actor->mCull.mSphere.mCenter;
return i_actor->cull.sphere.center;
}
inline f32 fopAcM_getCullSizeSphereR(const fopAc_ac_c* i_actor) {
return i_actor->mCull.mSphere.mRadius;
return i_actor->cull.sphere.radius;
}
inline void dComIfGs_onSwitch(int i_no, int i_roomNo);
@@ -390,7 +390,7 @@ inline f32 fopAcM_searchActorDistanceY(const fopAc_ac_c* actorA, const fopAc_ac_
}
inline u16 fopAcM_GetSetId(const fopAc_ac_c* p_actor) {
return p_actor->mSetID;
return p_actor->setID;
}
inline void dComIfGs_onActor(int bitNo, int roomNo);
@@ -638,12 +638,12 @@ inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_
inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
mDoAud_seStart(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo));
mDoAud_seStart(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo));
}
inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
i_mDoAud_seStartLevel(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo));
i_mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo));
}
inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
@@ -656,110 +656,7 @@ inline void fopAcM_offActor(fopAc_ac_c* pActor, u32 flag) {
}
inline void fopAcM_OnCarryType(fopAc_ac_c* pActor, fopAcM_CARRY param_2) {
pActor->mCarryType |= param_2;
}
extern "C" {
void fopAcM_initManager__Fv(void);
void fopAcM_CreateAppend__Fv(void);
void fopAcM_DeleteHeap__FP10fopAc_ac_c(void);
void fopAcM_FastCreate__FsPFPv_iPvPv(void);
void fopAcM_Log__FPC10fopAc_ac_cPCc(void);
void fopAcM_SearchByID__FUiPP10fopAc_ac_c(void);
void fopAcM_calcSpeed__FP10fopAc_ac_c(void);
void fopAcM_callCallback__FP10fopAc_ac_cPFP10fopAc_ac_c_iP7JKRHeap(void);
void fopAcM_cancelCarryNow__FP10fopAc_ac_c(void);
void fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
void fopAcM_createDemoItem__FPC4cXyziiPC5csXyziPC4cXyzUc(void);
void fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi(void);
void fopAcM_createItemForDirectGet__FPC4cXyziiPC5csXyzPC4cXyzff(void);
void fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz(void);
void fopAcM_createItemForSimpleDemo__FPC4cXyziiPC5csXyzPC4cXyzff(void);
void fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz(void);
void fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb(void);
void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(void);
void fopAcM_cullingCheck__FPC10fopAc_ac_c(void);
void fopAcM_delete__FP10fopAc_ac_c(void);
void fopAcM_delete__FUi(void);
void fopAcM_effHamonSet__FPUlPC4cXyzff(void);
void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(void);
void fopAcM_entrySolidHeap___FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(void);
void fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv(void);
void fopAcM_fastCreateItem__FPC4cXyziiPC5csXyzPC4cXyzPfPfiiPFPv_i(void);
void fopAcM_fastCreateItem2__FPC4cXyziiiiPC5csXyzPC4cXyz(void);
void fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv(void);
void fopAcM_findObject4EventCB__FP10fopAc_ac_cPv(void);
void fopAcM_findObjectCB__FPC10fopAc_ac_cPv(void);
void gndCheck__11fopAcM_gc_cFPC4cXyz(void);
void fopAcM_getEventPartner__FPC10fopAc_ac_c(void);
void fopAcM_getItemEventPartner__FPC10fopAc_ac_c(void);
void fopAcM_getItemNoFromTableNo__FUc(void);
void fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos(void);
void fopAcM_getPolygonAngle__FPC8cM3dGPlas(void);
void fopAcM_getProcNameString__FPC10fopAc_ac_c(void);
void fopAcM_getTalkEventPartner__FPC10fopAc_ac_c(void);
void fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii(void);
void fopAcM_getWaterY__FPC4cXyzPf(void);
void lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c(void);
void fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs(void);
void fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs(void);
void fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs(void);
void fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs(void);
void fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs(void);
void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(void);
void fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs(void);
void fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs(void);
void fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_orderTalkItemBtnEvent__FUsP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(void);
void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(void);
void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchFromName__FPCcUlUl(void);
void fopAcM_searchFromName4Event__FPCcs(void);
void fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_setCarryNow__FP10fopAc_ac_ci(void);
void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(void);
void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(void);
void fopAcM_setRoomLayer__FPvi(void);
void fopAcM_setStageLayer__FPv(void);
void waterCheck__11fopAcM_wt_cFPC4cXyz(void);
void fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz(void);
void fopAcM_SearchByName__FsPP10fopAc_ac_c(void);
void fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
void fopAcM_SetMin__FP10fopAc_ac_cfff(void);
void fopAcM_SetMax__FP10fopAc_ac_cfff(void);
void fopAcM_setCullSizeSphere__FP10fopAc_ac_cffff(void);
void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(void);
void fopAcM_addAngleY__FP10fopAc_ac_css(void);
void fopAcM_searchActorAngleX__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchActorDistance2__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_rollPlayerCrash__FPC10fopAc_ac_cfUlffif(void);
void fopAcM_checkCullingBox__FPA4_fffffff(void);
void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs(void);
void fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf(void);
void fopAcM_createItemForBoss__FPC4cXyziiPC5csXyzPC4cXyzffi(void);
void fopAcM_createItemForMidBoss__FPC4cXyziiPC5csXyzPC4cXyzii(void);
void fopAcM_createBokkuri__FUsPC4cXyziiiPC4cXyzii(void);
void fopAcM_createWarpHole__FPC4cXyzPC5csXyziUcUcUc(void);
void fopAcM_myRoomSearchEnemy__FSc(void);
void fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc(void);
void fopAcM_otoCheck__FPC10fopAc_ac_cf(void);
void fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_wayBgCheck__FPC10fopAc_ac_cff(void);
void fopAcM_plAngleCheck__FPC10fopAc_ac_cs(void);
void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void);
void fopAcM_riverStream__FP4cXyzPsPff(void);
void fopAcM_carryOffRevise__FP10fopAc_ac_c(void);
void fopAcM_searchFromName4Event__FPCcs(void);
void fopAcM_GetName__FPv(void); // mostly inlined
void fopAcM_GetID__FPCv(void); // mostly inlined
pActor->carryType |= param_2;
}
#endif
+1 -1
View File
@@ -7,7 +7,7 @@ class camera_class;
struct camera_process_profile_definition {
/* 0x00 */ view_process_profile_definition mBase;
/* 0x3C */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x3C */ leafdraw_method_class* sub_method; // Subclass methods
};
static s32 fopCam_Draw(camera_class* param_1);
+3 -3
View File
@@ -7,8 +7,8 @@
class kankyo_class : public leafdraw_class {
public:
/* 0xC0 */ int mBsType;
/* 0xC4 */ create_tag_class mDwTg;
/* 0xD8 */ leafdraw_method_class* mSubMtd;
/* 0xC4 */ create_tag_class draw_tag;
/* 0xD8 */ leafdraw_method_class* sub_method;
/* 0xDC */ cXyz mPos;
/* 0xE8 */ cXyz mScale;
/* 0xF4 */ u32 mParam;
@@ -16,7 +16,7 @@ public:
struct kankyo_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition base;
/* 0x24 */ leafdraw_method_class* mSubMtd;
/* 0x24 */ leafdraw_method_class* sub_method;
}; // Size: 0x28
extern leafdraw_method_class g_fopKy_Method;
+2 -2
View File
@@ -9,8 +9,8 @@ class fopAc_ac_c;
class msg_class : public leafdraw_class {
public:
/* 0xC0 */ int mMsgType;
/* 0xC4 */ create_tag_class mDwTg;
/* 0xD8 */ leafdraw_method_class* mSubMtd;
/* 0xC4 */ create_tag_class draw_tag;
/* 0xD8 */ leafdraw_method_class* sub_method;
/* 0xDC */ fopAc_ac_c* mpActor;
/* 0xE0 */ cXyz mPos;
/* 0xEC */ u32 mMsgID;
+1 -1
View File
@@ -11,7 +11,7 @@ class msg_class;
struct msg_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition mBase;
/* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods
};
struct fopMsg_prm_class {
+1 -1
View File
@@ -12,7 +12,7 @@ public:
struct overlap_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition base;
/* 0x24 */ leafdraw_method_class* mSubMtd;
/* 0x24 */ leafdraw_method_class* sub_method;
}; // Size: 0x28
static s32 fopOvlp_Draw(void* param_1);
+2 -2
View File
@@ -7,7 +7,7 @@
struct view_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition mBase;
/* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods
/* 0x28 */ u8 unk28;
/* 0x29 */ u8 unk29[3]; // pad
/* 0x2C */ u32 unk2C;
@@ -41,7 +41,7 @@ struct view_port_class {
};
struct view_class : public leafdraw_class {
/* 0x0C0 */ leafdraw_method_class* mSubMtd;
/* 0x0C0 */ leafdraw_method_class* sub_method;
/* 0x0C4 */ u8 field_0xc4;
/* 0x0C8 */ f32 mNear;
/* 0x0CC */ f32 mFar;
+1 -1
View File
@@ -23,7 +23,7 @@ typedef struct leafdraw_class {
typedef struct leaf_process_profile_definition {
/* 0x00 */ process_profile_definition mBase;
/* 0x1C */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x1C */ leafdraw_method_class* sub_method; // Subclass methods
/* 0x20 */ s16 mPriority; // mDrawPriority
} leaf_process_profile_definition;
+1 -1
View File
@@ -22,7 +22,7 @@ typedef struct process_node_class {
typedef struct node_process_profile_definition {
/* 0x00 */ process_profile_definition mBase;
/* 0x1C */ process_method_class* mSubMtd; // Subclass methods
/* 0x1C */ process_method_class* sub_method; // Subclass methods
} node_process_profile_definition;
s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData);
+1 -1
View File
@@ -13,7 +13,7 @@ typedef struct process_profile_definition {
/* 0x04 */ u16 mListID;
/* 0x06 */ u16 mListPrio;
/* 0x08 */ s16 mProcName;
/* 0x0C */ process_method_class* mSubMtd; // Subclass methods
/* 0x0C */ process_method_class* sub_method; // Subclass methods
/* 0x10 */ s32 mSize;
/* 0x14 */ s32 mSizeOther;
/* 0x18 */ s32 mParameters;
@@ -12,8 +12,8 @@ public:
u8 getArg1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getArg0() { return fopAcM_GetParam(this); }
u32 getSwNo() { return fopAcM_GetParam(this) >> 0x18; }
u16 getOffEventBit() { return orig.angle.z & 0xFFF; }
u16 getOnEventBit() { return orig.angle.x & 0xFFF; }
u16 getOffEventBit() { return home.angle.z & 0xFFF; }
u16 getOnEventBit() { return home.angle.x & 0xFFF; }
u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; }
void setSceneChangeOK() { mSceneChangeOK = true; }
+2 -1
View File
@@ -7,12 +7,13 @@
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
#include "dolphin/types.h"
class dBgW;
class daTboxBase_c : public dBgS_MoveBgActor {
protected:
virtual BOOL checkSmallTbox() = 0;
/* 0x5A0 */ dCcD_Stts mStts;
/* 0x5DC */ dCcD_Cyl mCyl;
};
+74 -1
View File
@@ -1,6 +1,79 @@
#ifndef D_A_TBOX2_H
#define D_A_TBOX2_H
#include "dolphin/types.h"
#include "rel/d/a/d_a_tbox/d_a_tbox.h"
class daTbox2_c : public daTboxBase_c {
public:
enum Type_e {
TYPE_SMALL_e,
TYPE_BIG_e,
};
enum Mode_e {
MODE_EXEC_WAIT_e,
MODE_EXEC_e,
};
enum Action_e {
ACTION_OPEN_WAIT_e,
ACTION_OPEN_DEMO_e,
ACTION_NOT_OPEN_DEMO_e,
ACTION_WAIT_e,
};
enum EventAct_e {
EVACT_WAIT_e,
EVACT_OPEN_e,
EVACT_APPEAR_e,
EVACT_OPEN_SHORT_e,
};
/* 80496A18 */ void initBaseMtx();
/* 80496A54 */ void setBaseMtx();
/* 80496E3C */ int create1st();
/* 8049724C */ int demoProc();
/* 80497478 */ void openInit();
/* 804975EC */ void mode_proc_call();
/* 80497678 */ void mode_exec_wait();
/* 80497790 */ void mode_exec();
/* 8049780C */ void action();
/* 804978C8 */ void init_actionWait();
/* 804978D4 */ void actionWait();
/* 804978D8 */ void init_actionNotOpenDemo();
/* 804978E4 */ void actionNotOpenDemo();
/* 8049794C */ void init_actionOpenDemo();
/* 80497958 */ void actionOpenDemo();
/* 80497A0C */ void init_actionOpenWait();
/* 80497A18 */ void actionOpenWait();
/* 80497BD0 */ int setGetDemoItem();
/* 80497C60 */ BOOL boxCheck();
/* 80496C20 */ virtual int CreateHeap();
/* 80496AB8 */ virtual int Create();
/* 80497500 */ virtual int Execute(f32 (**)[3][4]);
/* 80497DA0 */ virtual int Draw();
/* 80497E6C */ virtual int Delete();
/* 80498140 */ virtual BOOL checkSmallTbox() { return true; }
u8 getModelType() { return fopAcM_GetParamBit(this, 8, 4); }
u8 getItemNo() { return fopAcM_GetParamBit(this, 0, 8); }
/* 0x718 */ u8 mReturnRupee;
/* 0x71C */ request_of_phase_process_class mPhase;
/* 0x724 */ J3DModel* mpModel;
/* 0x728 */ mDoExt_bckAnm* mpBck;
/* 0x72C */ dBgS_ObjAcch mAcch;
/* 0x904 */ dBgS_AcchCir mAcchCir;
/* 0x944 */ dCcD_Stts mCcStts2;
/* 0x980 */ dCcD_Cyl mCcCyl2;
/* 0xABC */ u8 mModelType;
/* 0xABD */ u8 mAction;
/* 0xABE */ u8 mMode;
/* 0xABF */ bool mNoDraw;
/* 0xAC0 */ u8 field_0xAC0[0xAC4 - 0xAC0];
/* 0xAC4 */ int mStaffIdx;
/* 0xAC8 */ dBgW* mBoxBgW;
};
#endif /* D_A_TBOX2_H */
+1 -1
View File
@@ -177,7 +177,7 @@ public:
#endif
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mScale;
/* 0x08 */ f32 scale;
/* 0x0C */ f32 mWalkSpeed;
/* 0x10 */ f32 mRunSpeed;
/* 0x14 */ f32 mSwimSpeed;
@@ -80,7 +80,7 @@ public:
/* 80B40D24 */ virtual void drawOtherMdls();
int getWrestlerAction() { return mWrestlerAction; }
u8 getType() { return mSubtype & 0x7F; }
u8 getType() { return subtype & 0x7F; }
u8 getWrestlerType() { return getType(); }
static u8 mEvtSeqList[84];
@@ -17,7 +17,7 @@ public:
/* 0x00 */ bool field_0x00;
/* 0x04 */ cXyz mPos;
/* 0x10 */ csXyz mAngle;
/* 0x18 */ cXyz mScale;
/* 0x18 */ cXyz scale;
/* 0x24 */ dPaPo_c field_0x24;
}; // Size: 0x5C
@@ -69,7 +69,7 @@ public:
int prm = fopAcM_GetParam(this) >> 0x1C;
u8 type;
switch (mSubtype) {
switch (subtype) {
case 0:
switch (prm) {
case 1:
@@ -20,7 +20,7 @@ public:
/* 0x0590 */ dBgS_ObjAcch mObjAcch;
/* 0x0768 */ dBgS_AcchCir mAcchCir;
/* 0x07A8 */ dCcD_Stts mStts;
/* 0x07E4 */ Mtx mCullMtx;
/* 0x07E4 */ Mtx cullMtx;
};
#endif /* D_A_OBJ_STONEMARK_H */
@@ -33,12 +33,12 @@ public:
/* 80D310AC */ int execute();
/* 80D31810 */ int draw();
GXLightObj* getLightObj() { return &mTevStr.mLightObj.mLightObj; }
GXLightObj* getLightObj() { return &tevStr.mLightObj.mLightObj; }
J3DModelData* getChainModelData() { return mpChainModelData; }
cXyz* getChainPos() { return mChainPos; }
csXyz* getChainAngle() { return mChainAngle; }
s16* getChainAngleZ() { return mChainRotation; }
cXyz& getJumpAimPos() { return mEyePos; }
cXyz& getJumpAimPos() { return eyePos; }
cXyz& getTopPos() { return mTopPos; }
cXyz& getRoofPos() { return mRoofPos; }
f32 getPullLength() { return mPullLength; }
@@ -26,7 +26,7 @@ public:
s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); }
int getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); }
u32 getSwBit1() { return orig.angle.x & 0xff; }
u32 getSwBit1() { return home.angle.x & 0xff; }
u32 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
u32 getDelEveFlgId() { return fopAcM_GetParamBit(this, 0x10, 0x10); }
@@ -33,7 +33,7 @@ public:
static u8 const M_attr[64];
static u8 ActionTable[72];
int getType() { return mSubtype & 0x7F; }
int getType() { return subtype & 0x7F; }
u8 getPathID() { return fopAcM_GetParam(this); }
bool isPlayerCorrect() { return (s8)(u8)(fopAcM_GetParam(this) >> 8) > 0; }
@@ -8,7 +8,7 @@
class daTagAssist_c : public fopAc_ac_c {
public:
void create_init() {
mAttentionInfo.mFlags = 0;
attention_info.flags = 0;
field_0x570 = -1;
}
@@ -9,7 +9,7 @@ class daTag_Chk_c : public fopAc_ac_c {
public:
/* 8048A6F8 */ s32 execute();
u16 getAreaType() { return orig.angle.z & 0x100; }
u16 getAreaType() { return home.angle.z & 0x100; }
u16 getHeight() { return fopAcM_GetParam(this) & 0xff; }
u8 getSwBit() { return fopAcM_GetParam(this) >> 8; }
u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; }
@@ -18,27 +18,27 @@ public:
fopAcM_SetupActor(this, daTag_Chk_c);
if (getAreaType() == 0) {
mScale.x *= 50.0f;
mScale.y *= 100.0f;
mScale.z *= 50.0f;
scale.x *= 50.0f;
scale.y *= 100.0f;
scale.z *= 50.0f;
mPos1.set(current.pos.x - mScale.x, current.pos.y, current.pos.z - mScale.z);
mPos2.set(current.pos.x + mScale.x, current.pos.y + mScale.y, current.pos.z + mScale.z);
mPos1.set(current.pos.x - scale.x, current.pos.y, current.pos.z - scale.z);
mPos2.set(current.pos.x + scale.x, current.pos.y + scale.y, current.pos.z + scale.z);
} else {
mScale.x *= 100.0f;
mScale.y *= 100.0f;
mScale.z *= 0.0f;
scale.x *= 100.0f;
scale.y *= 100.0f;
scale.z *= 0.0f;
mPos1.set(0.0f, current.pos.y, 0.0f);
mPos2.set(0.0f, current.pos.y + mScale.y, 0.0f);
mPos2.set(0.0f, current.pos.y + scale.y, 0.0f);
}
mAttentionInfo.mPosition = current.pos;
attention_info.position = current.pos;
u16 l_height = getHeight();
l_height != 0xff ? mAttentionInfo.mPosition.y += l_height * 10.0f : mAttentionInfo.mPosition.y += mScale.y * 0.5f;
l_height != 0xff ? attention_info.position.y += l_height * 10.0f : attention_info.position.y += scale.y * 0.5f;
mEyePos = mAttentionInfo.mPosition;
eyePos = attention_info.position;
return cPhs_COMPLEATE_e;
}
private:
@@ -11,7 +11,7 @@ public:
u8 getSwBit() { return fopAcM_GetParam(this) >> 8; }
u8 getMode() { return fopAcM_GetParam(this); }
f32 getExtent() { return mScale.x * 100.0f;}
f32 getExtent() { return scale.x * 100.0f;}
private:
/* 0x568 */ u32 mSwitchNo;
@@ -28,10 +28,10 @@ public:
u8 getBitSW2() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u32 getFlowNodeNo() {
if (orig.angle.x == 0xFFFF) {
if (home.angle.x == 0xFFFF) {
return 0xFFFFFFFF;
} else {
return orig.angle.x & 0xFFFF;
return home.angle.x & 0xFFFF;
}
}
@@ -11,7 +11,7 @@ public:
int create();
void execute();
u16 getMessageNo() { return orig.angle.z; }
u16 getMessageNo() { return home.angle.z; }
private:
/* 0x568 */ u16 mMessageNo;
@@ -71,7 +71,7 @@ public:
int create() {
fopAcM_SetupActor(this, daTagTheBHint_c);
field_0x568 = pow(mScale.x * 100.0f,2.0f);
field_0x568 = pow(scale.x * 100.0f,2.0f);
return cPhs_COMPLEATE_e;
}
@@ -17,7 +17,7 @@ public:
if (field_0x568 < 0) {
return NULL;
} else {
return &mEyePos;
return &eyePos;
}
}
+11 -11
View File
@@ -288,8 +288,8 @@ static int daB_GO_Draw(b_go_class* b_go) {
if ((*(daB_GO_HIO_c*)l_HIO).mDisplayModelImage) {
J3DModel* model = b_go->mpMorf->getModel();
g_env_light.settingTevStruct(0, &b_go->current.pos, &b_go->mTevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &b_go->mTevStr);
g_env_light.settingTevStruct(0, &b_go->current.pos, &b_go->tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &b_go->tevStr);
b_go->mpMorf->entryDL();
}
return 1;
@@ -503,8 +503,8 @@ static void action(b_go_class* b_go) {
b_go->mAngleToPlayer = fopAcM_searchActorAngleY(b_go, (fopAc_ac_c*)dComIfGp_getPlayer(0));
b_go->mDistToPlayer = fopAcM_searchActorDistance(b_go, (fopAc_ac_c*)dComIfGp_getPlayer(0));
b_go->mStatus = b_go->mStatus;
b_go->mAttentionInfo.mFlags = 0;
b_go->actor_status = b_go->actor_status;
b_go->attention_info.flags = 0;
if (b_go->field_0x688[1] == 0) {
if (b_go->field_0x692 != 2) {
@@ -542,7 +542,7 @@ static void action(b_go_class* b_go) {
b_go->speed.z = newSpeed.z;
VECAdd(&b_go->current.pos, &b_go->speed, &b_go->current.pos);
b_go->speed.y += b_go->mGravity;
b_go->speed.y += b_go->gravity;
b_go->mAcch.CrrPos(dComIfG_Bgsp());
}
@@ -608,7 +608,7 @@ static int daB_GO_Delete(b_go_class* b_go) {
data_80604140[0] = 0;
}
if (b_go->mHeap != NULL) {
if (b_go->heap != NULL) {
b_go->mpMorf->stopZelAnime();
}
@@ -705,21 +705,21 @@ static int daB_GO_Create(fopAc_ac_c* i_actor) {
(*(daB_GO_HIO_c*)l_HIO).field_0x4 = -1;
}
b_go->mAttentionInfo.mFlags = 4;
b_go->mCullMtx = b_go->mpMorf->getModel()->getBaseTRMtx();
b_go->attention_info.flags = 4;
b_go->cullMtx = b_go->mpMorf->getModel()->getBaseTRMtx();
fopAcM_SetMin(b_go, -500.0f, -2000.0f, -500.0f);
fopAcM_SetMax(b_go, 500.0f, 2000.0f, 500.0f);
b_go->field_0x562 = 1000;
b_go->field_0x560 = 1000;
b_go->mAcch.Set(&b_go->current.pos, &b_go->next.pos, b_go, 1, &b_go->mAcchCir,
b_go->mAcch.Set(&b_go->current.pos, &b_go->old.pos, b_go, 1, &b_go->mAcchCir,
&b_go->speed, NULL, NULL);
b_go->mAcchCir.SetWall(100.0f, 300.0f);
b_go->mZ2Enemy.init(&b_go->current.pos, &b_go->mEyePos, 3, 1);
b_go->mZ2Enemy.init(&b_go->current.pos, &b_go->eyePos, 3, 1);
b_go->field_0xc9c = &b_go->mZ2Enemy;
b_go->mGravity = -7.0f;
b_go->gravity = -7.0f;
b_go->mActionID = ACT_WAIT;
daB_GO_Execute(b_go);
+14 -14
View File
@@ -296,8 +296,8 @@ static int daB_OH_Draw(b_oh_class* i_this) {
J3DModel* model_p = i_this->mpMorf->getModel();
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr);
g_env_light.setLightTevColorType_MAJI(model_p, &i_this->mTevStr);
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model_p, &i_this->tevStr);
i_this->mpBtk->entry(model_p->getModelData());
i_this->mpBrk->entry(model_p->getModelData());
@@ -934,7 +934,7 @@ static void action(b_oh_class* i_this) {
i_this->mDistToPlayer = fopAcM_searchPlayerDistance(i_this);
fopAcM_OffStatus(i_this, 0);
i_this->mAttentionInfo.mFlags = 0;
i_this->attention_info.flags = 0;
uvar = 0;
bvar = true;
@@ -1006,7 +1006,7 @@ static void action(b_oh_class* i_this) {
}
cLib_addCalcAngleS2(&i_this->current.angle.x, -0xF2C, 4, 100);
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->orig.angle.y, 4, 0x100);
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->home.angle.y, 4, 0x100);
} else if (uvar == 2) {
f32 fvar = i_this->field_0xc8c;
for (int i = i_this->field_0xca8; i < 30; i++) {
@@ -1054,7 +1054,7 @@ static void action(b_oh_class* i_this) {
}
cLib_addCalcAngleS2(&i_this->current.angle.x, 0xA92, 4, 0x200);
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->orig.angle.y, 4, 0x800);
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->home.angle.y, 4, 0x800);
}
i_this->field_0x600 =
@@ -1077,9 +1077,9 @@ static void action(b_oh_class* i_this) {
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->current.pos);
local_90.x = i_this->current.pos.x - boss->orig.pos.x;
local_90.z = i_this->current.pos.z - boss->orig.pos.z;
i_this->orig.angle.y = cM_atan2s(local_90.x, local_90.z);
local_90.x = i_this->current.pos.x - boss->home.pos.x;
local_90.z = i_this->current.pos.z - boss->home.pos.z;
i_this->home.angle.y = cM_atan2s(local_90.x, local_90.z);
cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->current.angle.y, 2, 0x2000);
cLib_addCalcAngleS2(&i_this->shape_angle.x, i_this->current.angle.x, 2, 0x2000);
@@ -1193,14 +1193,14 @@ static void damage_check(b_oh_class* i_this) {
for (int i = 7; i < 15; i++) {
if (i_this->mColliders[i].ChkTgHit()) {
i_this->mAtInfo.mpCollider = i_this->mColliders[i].GetTgHitObj();
i_this->mHealth = 1000;
i_this->health = 1000;
cc_at_check(i_this, &i_this->mAtInfo);
MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i * 2 + 1),
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->mEyePos);
i_dComIfGp_setHitMark(1, i_this, &i_this->mEyePos, NULL, NULL, 0);
mDoAud_seStart(Z2SE_EN_OI_HIT_TENTACLE, &i_this->mEyePos, 0, 0);
mDoMtx_stack_c::multVecZero(&i_this->eyePos);
i_dComIfGp_setHitMark(1, i_this, &i_this->eyePos, NULL, NULL, 0);
mDoAud_seStart(Z2SE_EN_OI_HIT_TENTACLE, &i_this->eyePos, 0, 0);
bvar = true;
i_this->field_0x5f4 = 20;
@@ -1264,7 +1264,7 @@ static int daB_OH_Execute(b_oh_class* i_this) {
}
if (i_this->field_0x5c8 == 0) {
boss = (b_ob_class*)fopAcM_SearchByID(i_this->mParentPcId);
boss = (b_ob_class*)fopAcM_SearchByID(i_this->parentActorID);
}
if (boss == NULL) {
@@ -1475,7 +1475,7 @@ static int daB_OH_Create(fopAc_ac_c* i_this) {
l_HIO.field_0x4 = -1;
}
this_->mHealth = 1000;
this_->health = 1000;
this_->field_0x560 = 1000;
this_->field_0x5cc = cM_rndF(65536.0f);
+4 -4
View File
@@ -37,8 +37,8 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
static int daB_OH2_Draw(b_oh2_class* i_this) {
J3DModel* model = i_this->mpMorf->getModel();
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->mTevStr);
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
i_this->mpBtk->entry(model->getModelData());
i_this->mpBrk->entry(model->getModelData());
@@ -182,7 +182,7 @@ static int daB_OH2_Execute(b_oh2_class* i_this) {
}
if (i_this->field_0x5c8 == 0) {
boss = (b_ob_class*)fopAcM_SearchByID(i_this->mParentPcId);
boss = (b_ob_class*)fopAcM_SearchByID(i_this->parentActorID);
}
if (boss == NULL) {
@@ -214,7 +214,7 @@ static int daB_OH2_IsDelete(b_oh2_class* i_this) {
/* 8061E4F0-8061E540 0008B0 0050+00 1/0 0/0 0/0 .text daB_OH2_Delete__FP11b_oh2_class */
static int daB_OH2_Delete(b_oh2_class* i_this) {
dComIfG_resDelete(&i_this->mPhase, "B_oh");
if (i_this->mHeap != NULL) {
if (i_this->heap != NULL) {
i_this->mpMorf->stopZelAnime();
}
@@ -26,8 +26,8 @@ static int daB_ZANTS_Create(daB_ZANTS_c*);
/* 806529D8-80652AAC 000078 00D4+00 1/1 0/0 0/0 .text draw__11daB_ZANTS_cFv */
int daB_ZANTS_c::draw() {
g_env_light.settingTevStruct(16, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr);
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mpBtkAnm->entry(mpModel->getModelData());
mpBrkAnm->entry(mpModel->getModelData());
@@ -225,7 +225,7 @@ int daB_ZANTS_c::create() {
if (mpBgW && dComIfG_Bgsp().Regist(mpBgW, this)) {
return cPhs_ERROR_e;
}
mAttentionInfo.mFlags = 0;
attention_info.flags = 0;
field_0x588 = 150.0f;
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -500.0f, -500.0f);
+4 -4
View File
@@ -61,7 +61,7 @@ int daAlldie_c::actionTimer() {
/* 804D5938-804D59A0 000198 0068+00 1/1 0/0 0/0 .text actionOrder__10daAlldie_cFv */
int daAlldie_c::actionOrder() {
if (mEvtInfo.checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
mAction = ACT_EVENT;
} else {
fopAcM_orderOtherEventId(this, mEventIdx, getEventNo(), -1, 0, 1);
@@ -89,7 +89,7 @@ int daAlldie_c::actionEvent() {
/* 804D5A44-804D5B10 0002A4 00CC+00 1/1 0/0 0/0 .text actionNext__10daAlldie_cFv */
int daAlldie_c::actionNext() {
if (mEvtInfo.checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
mEventIdx = mNextEventIdx;
s8 roomNo = fopAcM_GetRoomNo(this);
@@ -188,8 +188,8 @@ int daAlldie_c::create() {
mNextEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, mMapToolID);
}
mEvtInfo.setEventId(mEventIdx);
mEvtInfo.setMapToolId(getEventNo());
eventInfo.setEventId(mEventIdx);
eventInfo.setMapToolId(getEventNo());
return cPhs_COMPLEATE_e;
}
+4 -4
View File
@@ -80,14 +80,14 @@ extern actor_process_profile_definition g_profile_ANDSW = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ANDSW, // mProcName
&g_fpcLf_Method.mBase, // mSubMtd
&g_fpcLf_Method.mBase, // sub_method
sizeof(daAndsw_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
&g_fopAc_Method.base, // sub_method
302, // mPriority
&l_daAndsw_Method, // mSubMtd
&l_daAndsw_Method, // sub_method
0x40000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // mCullType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
+8 -8
View File
@@ -35,7 +35,7 @@ extern "C" void isSwitch__10dSv_info_cCFii();
/* 804D5DF8-804D5E04 000078 000C+00 2/2 0/0 0/0 .text getEventNo__10daAndsw2_cFv */
u8 daAndsw2_c::getEventNo() {
return orig.angle.x & 0xFF;
return home.angle.x & 0xFF;
}
/* 804D5E04-804D5E10 000084 000C+00 6/6 0/0 0/0 .text getSwbit__10daAndsw2_cFv */
@@ -55,7 +55,7 @@ u8 daAndsw2_c::getType() {
/* 804D5E28-804D5E34 0000A8 000C+00 1/1 0/0 0/0 .text getTimer__10daAndsw2_cFv */
u8 daAndsw2_c::getTimer() {
return orig.angle.z & 0xFF;
return home.angle.z & 0xFF;
}
/* 804D5E34-804D5E40 0000B4 000C+00 3/3 0/0 0/0 .text getNum__10daAndsw2_cFv */
@@ -76,7 +76,7 @@ u8 daAndsw2_c::getTopSw() {
/* 804D5EB0-804D5EBC 000130 000C+00 1/1 0/0 0/0 .text getSwAns__10daAndsw2_cFv */
u8 daAndsw2_c::getSwAns() {
return (orig.angle.x >> 8) & 0xFF;
return (home.angle.x >> 8) & 0xFF;
}
/* 804D5EBC-804D5F64 00013C 00A8+00 4/4 0/0 0/0 .text chkAllSw2__10daAndsw2_cFv */
@@ -277,7 +277,7 @@ static int daAndsw2_actionTimer(daAndsw2_c* i_this) {
// missing mr / out of order instruction
#ifdef NONMATCHING
static int daAndsw2_actionOrder(daAndsw2_c* i_this) {
if (i_this->mEvtInfo.i_checkCommandDemoAccrpt()) {
if (i_this->eventInfo.i_checkCommandDemoAccrpt()) {
i_this->setActio(daAndsw2_c::ACT_EVENT_e);
dComIfGs_onSwitch(i_this->getSwbit(), fopAcM_GetRoomNo(i_this));
} else if ((i_this->getType() == 1 && !i_this->chkAllSw2()) ||
@@ -404,14 +404,14 @@ extern actor_process_profile_definition g_profile_ANDSW2 = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ANDSW2, // mProcName
&g_fpcLf_Method.mBase, // mSubMtd
&g_fpcLf_Method.mBase, // sub_method
sizeof(daAndsw2_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
&g_fopAc_Method.base, // sub_method
303, // mPriority
&l_daAndsw2_Method, // mSubMtd
&l_daAndsw2_Method, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // mCullType
fopAc_CULLBOX_6_e, // cullType
};
+3 -3
View File
@@ -701,12 +701,12 @@ extern "C" asm void __ct__11J3DLightObjFv() {
daBg_c::~daBg_c() {
int roomNo = fopAcM_GetParam(this);
if (mHeap != NULL && mpBgW != NULL) {
if (heap != NULL && mpBgW != NULL) {
dComIfG_Bgsp().Release(mpBgW);
dStage_roomControl_c::setBgW(roomNo, NULL);
}
if (mHeap != NULL && mpKCol != NULL) {
if (heap != NULL && mpKCol != NULL) {
dComIfG_Bgsp().Release(mpKCol);
dStage_roomControl_c::setBgW(roomNo, NULL);
}
@@ -1007,7 +1007,7 @@ int daBg_c::create() {
if (mHeap == NULL) {
fopAcM_SetupActor(this, daBg_c);
orig.roomNo = roomNo;
home.roomNo = roomNo;
current.roomNo = roomNo;
JKRExpHeap* heap = dStage_roomControl_c::getMemoryBlock(roomNo);
+7 -7
View File
@@ -855,12 +855,12 @@ int daBgObj_c::CreateHeap() {
/* 8045A9E8-8045AAF0 001408 0108+00 1/1 0/0 0/0 .text create1st__9daBgObj_cFv */
int daBgObj_c::create1st() {
if (field_0xcc9 == 0) {
field_0xcca = orig.angle.x;
field_0xccc = orig.angle.z;
field_0xcca = home.angle.x;
field_0xccc = home.angle.z;
field_0xcc9 = 1;
orig.angle.z = 0;
orig.angle.x = 0;
home.angle.z = 0;
home.angle.x = 0;
current.angle.z = 0;
current.angle.x = 0;
shape_angle.z = 0;
@@ -1254,7 +1254,7 @@ int daBgObj_c::actionOrderWait() {
// matches with literals
#ifdef NONMATCHING
int daBgObj_c::actionOrder() {
if (mEvtInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.i_checkCommandDemoAccrpt()) {
setAction(2);
if (field_0xd01 < 5) {
@@ -1392,11 +1392,11 @@ int daBgObj_c::Draw() {
return 1;
}
g_env_light.settingTevStruct(0x20, &current.pos, &mTevStr);
g_env_light.settingTevStruct(0x20, &current.pos, &tevStr);
for (int i = 0; i < 2; i++) {
if (field_0x5a8[field_0xcc8][i] != NULL) {
g_env_light.setLightTevColorType_MAJI(field_0x5a8[field_0xcc8][i], &mTevStr);
g_env_light.setLightTevColorType_MAJI(field_0x5a8[field_0xcc8][i], &tevStr);
}
}
+12 -12
View File
@@ -894,7 +894,7 @@ int daBoomerang_c::draw() {
pushLockList(i);
i--;
} else {
mSight.setSight(&mLockActors[i]->mEyePos, i);
mSight.setSight(&mLockActors[i]->eyePos, i);
}
} else {
@@ -911,7 +911,7 @@ int daBoomerang_c::draw() {
field_0x6d8 = fopAcM_SearchByID(field_0x6d4);
}
if (field_0x6d8 != 0) {
mSight.setSight(&field_0x6d8->mEyePos, 5);
mSight.setSight(&field_0x6d8->eyePos, 5);
} else {
mSight.setSight(NULL, 5);
}
@@ -920,16 +920,16 @@ int daBoomerang_c::draw() {
dComIfGd_set2DXlu((dDlst_base_c*)&mSight);
}
}
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(field_0x568, &mTevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x568, &tevStr);
mDoExt_modelUpdateDL(field_0x568);
daMirror_c::entry(field_0x568);
if (fopAcM_GetParam(this) != 0) {
g_env_light.setLightTevColorType_MAJI(field_0x56c, &mTevStr);
g_env_light.setLightTevColorType_MAJI(field_0x56c, &tevStr);
mDoExt_modelEntryDL(field_0x56c);
daMirror_c::entry(field_0x56c);
} else if (i_dComIfGp_checkPlayerStatus0(0, 0x80000) != 0) {
g_env_light.setLightTevColorType_MAJI(field_0x590, &mTevStr);
g_env_light.setLightTevColorType_MAJI(field_0x590, &tevStr);
mDoExt_modelUpdateDL(field_0x590);
}
return 1;
@@ -970,7 +970,7 @@ void daBoomerang_c::moveLineCallback(fopAc_ac_c* i_actorP) {
if (i == field_0x951) {
field_0x957 = 10;
field_0x9ac = i_actorP->mEyePos;
field_0x9ac = i_actorP->eyePos;
field_0x9c4 = current.pos;
}
}
@@ -1044,7 +1044,7 @@ int daBoomerang_c::setLockActor(fopAc_ac_c* param_0, int param_1) {
}
}
if (param_1 != 0) {
f32 squareDistance = param_0->mEyePos.abs2(current.pos);
f32 squareDistance = param_0->eyePos.abs2(current.pos);
if (squareDistance > field_0x984) {
return 0;
}
@@ -1079,11 +1079,11 @@ void daBoomerang_c::setRoomInfo() {
int roomNo;
if (field_0x980 != -1000000000.0f) {
roomNo = dComIfG_Bgsp().GetRoomId(field_0xd6c);
mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0xd6c);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0xd6c);
} else {
roomNo = dComIfGp_roomControl_getStayNo();
}
mTevStr.mRoomNo = roomNo;
tevStr.mRoomNo = roomNo;
field_0x953 = dComIfGp_getReverb(roomNo);
field_0x9d0.SetRoomId(roomNo);
fopAcM_SetRoomNo(this, roomNo);
@@ -1179,7 +1179,7 @@ void daBoomerang_c::setAimPos() {
}
for (int i = field_0x951; i < mLockCnt; i++, field_0x951++) {
if (mLockActors[i] != NULL) {
field_0x990 = mLockActors[i]->mEyePos;
field_0x990 = mLockActors[i]->eyePos;
return;
}
if (field_0x718[i] != 0) {
@@ -1241,7 +1241,7 @@ void daBoomerang_c::checkBgHit(cXyz* i_start, cXyz* i_end) {
#ifdef NONMATCHING
// Matches with literals
JPABaseEmitter* daBoomerang_c::setEffectTraceMatrix(u32* param_0, u16 param_1) {
*param_0 = dComIfGp_particle_set(*param_0, param_1, &current.pos, &mTevStr);
*param_0 = dComIfGp_particle_set(*param_0, param_1, &current.pos, &tevStr);
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(*param_0);
if (emitter != NULL) {
emitter->setGlobalRTMatrix(field_0x568->getBaseTRMtx());
+8 -8
View File
@@ -211,8 +211,8 @@ int daCrod_c::execute() {
if (fopAcM_GetParam(this) == 6) {
if (player->getIronBallCenterPos() != NULL) {
current.pos = *player->getIronBallCenterPos();
mAttentionInfo.mPosition = current.pos;
mEyePos = current.pos;
attention_info.position = current.pos;
eyePos = current.pos;
}
return 1;
} else {
@@ -322,8 +322,8 @@ int daCrod_c::execute() {
posMove();
if (fopAcM_GetParam(this) == 3) {
mAtCps.SetStartEnd(next.pos, current.pos);
sp50 = current.pos - next.pos;
mAtCps.SetStartEnd(old.pos, current.pos);
sp50 = current.pos - old.pos;
mAtCps.SetAtVec(sp50);
dComIfG_Ccsp()->Set(&mAtCps);
@@ -360,8 +360,8 @@ int daCrod_c::execute() {
}
}
mEyePos = current.pos;
mAttentionInfo.mPosition = current.pos;
eyePos = current.pos;
attention_info.position = current.pos;
daAlink_c::simpleAnmPlay(mpBallBrk);
daAlink_c::simpleAnmPlay(mpBallBtk);
@@ -389,8 +389,8 @@ int daCrod_c::draw() {
return 1;
}
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpBallModel, &mTevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpBallModel, &tevStr);
mDoExt_modelUpdateDL(mpBallModel);
return 1;
}
+1 -1
View File
@@ -18,7 +18,7 @@ static void* s_ks_sub(void* i_actor, void*) {
fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor;
if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == PROC_NPC_KS) {
actor_p->mHealth = 1;
actor_p->health = 1;
}
return NULL;
+2 -2
View File
@@ -84,8 +84,8 @@ static int daDmidna_Execute(daDmidna_c* i_this) {
/* 8045D204-8045D268 0003A4 0064+00 1/1 0/0 0/0 .text draw__10daDmidna_cFv */
int daDmidna_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(model, &mTevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
mDoExt_modelEntryDL(model);
return 1;
}
+22 -21
View File
@@ -71,6 +71,7 @@ extern "C" extern char const* const d_a_do__stringBase0;
// External References:
//
extern "C" void fopAcM_riverStream__FP4cXyzPsPff();
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
@@ -524,7 +525,7 @@ static int daDo_other_bg_check(do_class* i_this, fopAc_ac_c* i_actorP) {
actor_pos.y += FLOAT_LABEL(lit_3816);
dog_pos = dog->current.pos;
dog_pos.y = dog->mEyePos.y;
dog_pos.y = dog->eyePos.y;
lin_chk.Set((cXyz*)&dog_pos, (cXyz*)&actor_pos, dog);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
@@ -724,8 +725,8 @@ static u32 search_food(do_class* i_this) {
do {
// for (int j = 0; j != target_info_count; j++) {
fopAc_ac_c* actorP = target_info[i];
f32 x_pos = actorP->current.pos.x - i_this->mEyePos.x;
f32 z_pos = actorP->current.pos.z - i_this->mEyePos.z;
f32 x_pos = actorP->current.pos.x - i_this->eyePos.x;
f32 z_pos = actorP->current.pos.z - i_this->eyePos.z;
f32 f_pos = JMAFastSqrt(x_pos * x_pos + z_pos * z_pos);
if (f_pos < tmp) {
@@ -1041,7 +1042,7 @@ COMPILER_STRIP_GATE(0x8066EE58, &lit_4138);
#ifdef NONMATCHING
// matches with literals
static void area_check(do_class* i_this) {
cXyz pos_delta = i_this->orig.pos - i_this->current.pos;
cXyz pos_delta = i_this->home.pos - i_this->current.pos;
if (i_this->field_0x5b6 != 255) {
if ((i_this->field_0x5b6 * FLOAT_LABEL(lit_3772) * FLOAT_LABEL(lit_3665)) > pos_delta.abs())
@@ -1293,7 +1294,7 @@ static void do_walk(do_class* i_this) {
switch (i_this->mStayStatus + 1) {
case 12: {
i_this->field_0x5b8 = i_this->orig.pos;
i_this->field_0x5b8 = i_this->home.pos;
i_this->speedF >= l_HIO.mRunSpeed ? i_this->field_0x5e8 = 1.7 : i_this->field_0x5e8 = 4.0;
i_this->field_0x5ec = 1.7;
@@ -1330,7 +1331,7 @@ static void do_walk(do_class* i_this) {
local_5c.z = cM_rndF(100.0f * i_this->field_0x5b6);
MtxPosition(&local_5c, &i_this->field_0x5b8);
i_this->field_0x5b8 += i_this->orig.pos;
i_this->field_0x5b8 += i_this->home.pos;
if (dansa_check(i_this, i_this->field_0x5b8, 0.0) == 0) {
local_5c = i_this->field_0x5b8 - i_this->current.pos;
@@ -2219,12 +2220,12 @@ static void do_swim(do_class* i_this) {
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mAngleYFromPlayer, 16, 0x100);
i_this->speed.y = FLOAT_LABEL(lit_3682);
i_this->mGravity = FLOAT_LABEL(lit_3682);
i_this->gravity = FLOAT_LABEL(lit_3682);
cLib_addCalc2(&i_this->current.pos.y, i_this->field_0x65c - FLOAT_LABEL(lit_4992),
FLOAT_LABEL(lit_3662), FLOAT_LABEL(lit_4027));
pos = i_this->mEyePos;
pos = i_this->eyePos;
pos.y = i_this->field_0x65c;
fopAcM_effHamonSet(&i_this->field_0xbcc, (cXyz*)&pos, FLOAT_LABEL(lit_4993),
@@ -2549,7 +2550,7 @@ static void action(do_class* i_this) {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
i_this->mGravity = FLOAT_LABEL(lit_5948);
i_this->gravity = FLOAT_LABEL(lit_5948);
i_this->mDistFromPlayer = fopAcM_searchPlayerDistance(i_this);
daPy_py_c* player2 = daPy_getPlayerActorClass();
@@ -2559,7 +2560,7 @@ static void action(do_class* i_this) {
}
i_this->mAngleYFromPlayer = fopAcM_searchPlayerAngleY(i_this);
i_this->mEyePosYDistFromPlayer = fabsf(i_this->mEyePos.y - player->current.pos.y);
i_this->mEyePosYDistFromPlayer = fabsf(i_this->eyePos.y - player->current.pos.y);
if (!mDoCPd_c::getHoldR(PAD_1) ||
fabsf(i_this->current.pos.y - player->current.pos.y) > FLOAT_LABEL(lit_3816))
@@ -2696,13 +2697,13 @@ static void action(do_class* i_this) {
}
if (tmp2 != 0 && player->mSpeedF < FLOAT_LABEL(lit_3665)) {
cLib_onBit<u32>(i_this->mAttentionInfo.mFlags, 0x10);
cLib_onBit<u32>(i_this->attention_info.flags, 0x10);
if (do_carry_check(i_this)) {
return;
}
} else {
cLib_offBit<u32>(i_this->mAttentionInfo.mFlags, 0x10);
cLib_offBit<u32>(i_this->attention_info.flags, 0x10);
}
cLib_addCalcAngleS2(&i_this->current.angle.x, 0, 1, 0x400);
@@ -2719,7 +2720,7 @@ static void action(do_class* i_this) {
i_this->speed.x = pos2.x;
i_this->speed.z = pos2.z;
i_this->speed.y += i_this->mGravity;
i_this->speed.y += i_this->gravity;
;
i_this->current.pos += i_this->speed;
@@ -2830,7 +2831,7 @@ static void action(do_class* i_this) {
for (int i = 0; i < 4; i++) {
// wrong
i_this->mMsg.setMsg(dComIfGp_particle_set(
(u32)0, (u16)l_HIO.field_0x1c, &pos, &i_this->mTevStr, (csXyz*)0,
(u32)0, (u16)l_HIO.field_0x1c, &pos, &i_this->tevStr, (csXyz*)0,
(cXyz*)&scc, (u8)0xFF, (dPa_levelEcallBack*)0, (s8)-1, (GXColor*)0,
(GXColor*)0, (cXyz*)0));
}
@@ -2862,11 +2863,11 @@ static void action(do_class* i_this) {
cXyz eyePosDiff;
if (i_this->field_0x624 == 0) {
eyePosDiff = player->mEyePos - i_this->mEyePos;
eyePosDiff = player->eyePos - i_this->eyePos;
} else {
i_this->field_0x624++;
eyePosDiff = i_this->mUnkPos - i_this->mEyePos;
eyePosDiff = i_this->mUnkPos - i_this->eyePos;
}
eyePosDiff.y += i_this->field_0x674.z * FLOAT_LABEL(lit_5952);
@@ -2994,18 +2995,18 @@ static void message(do_class* i_this) {
}
} else {
if (i_dComIfGp_event_runCheck() && i_this->mEvtInfo.checkCommandTalk()) {
if (i_dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) {
i_this->mMsg.init(i_this, i_this->field_0xc08, 0, 0);
i_this->field_0xc06 = 1;
}
if (i_this->field_0xc05 == 2 && i_this->field_0xc08 != -1 && daPy_py_c::i_checkNowWolf()) {
fopAcM_OnStatus(i_this, 0);
cLib_onBit<u32>(i_this->mAttentionInfo.mFlags, 0xa);
i_this->mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e);
cLib_onBit<u32>(i_this->attention_info.flags, 0xa);
i_this->eventInfo.i_onCondition(dEvtCnd_CANTALK_e);
} else {
fopAcM_OffStatus(i_this, 0);
cLib_offBit<u32>(i_this->mAttentionInfo.mFlags, 0xa);
cLib_offBit<u32>(i_this->attention_info.flags, 0xa);
}
}
}
@@ -3041,7 +3042,7 @@ static int daDo_Delete(do_class* i_this) {
u8* tmp = (u8*)struct_8066F2B4 + 2;
*tmp = 0;
}
if (i_this->mHeap) {
if (i_this->heap) {
i_this->mSound.deleteObject();
}
return 1;
+20 -20
View File
@@ -166,8 +166,8 @@ int daDsh_c::CreateHeap() {
/* 8046759C-80467640 00017C 00A4+00 1/0 0/0 0/0 .text Draw__7daDsh_cFv */
int daDsh_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr);
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
@@ -219,7 +219,7 @@ int daDsh_c::callExecute() {
/* 804677D4-804677E4 0003B4 0010+00 1/0 0/0 0/0 .text initOpenWait__7daDsh_cFv */
int daDsh_c::initOpenWait() {
current.pos.y = orig.pos.y;
current.pos.y = home.pos.y;
return 1;
}
@@ -345,9 +345,9 @@ COMPILER_STRIP_GATE(0x80467F1C, &l_heap_size);
int daDsh_c::initOpen() {
mTiltTime = getOpenTiltTime();
speed.y = 0.0f;
mGravity = getOpenAccel();
gravity = getOpenAccel();
cXyz check_pos(orig.pos.x, orig.pos.y + 100.0f, orig.pos.z);
cXyz check_pos(home.pos.x, home.pos.y + 100.0f, home.pos.z);
bool water_check = fopAcM_wt_c::waterCheck(&check_pos);
bool gnd_check = fopAcM_gc_c::gndCheck(&check_pos);
@@ -367,18 +367,18 @@ static daDsh_c::action_c
/* 80467988-80467A64 000568 00DC+00 1/0 0/0 0/0 .text executeOpen__7daDsh_cFv */
int daDsh_c::executeOpen() {
if (mTiltTime != 0) {
current.pos.y = orig.pos.y + cM_rndFX(2.0f);
current.pos.y = home.pos.y + cM_rndFX(2.0f);
} else {
cLib_chaseF(&speed.y, getOpenSpeed(), mGravity);
cLib_chaseF(&speed.y, getOpenSpeed(), gravity);
current.pos.y += speed.y;
f32 closed_y_pos = orig.pos.y - OPEN_SIZE;
f32 closed_y_pos = home.pos.y - OPEN_SIZE;
if (current.pos.y < closed_y_pos) {
current.pos.y = closed_y_pos;
if (speed.y < getOpenBoundSpeed()) {
speed.y *= getOpenBoundRatio();
mGravity = 8.0f;
gravity = 8.0f;
} else {
setAction(&l_closeWaitAction);
}
@@ -390,7 +390,7 @@ int daDsh_c::executeOpen() {
/* 80467A64-80467A80 000644 001C+00 1/0 0/0 0/0 .text initCloseWait__7daDsh_cFv */
int daDsh_c::initCloseWait() {
current.pos.y = orig.pos.y - OPEN_SIZE;
current.pos.y = home.pos.y - OPEN_SIZE;
return 1;
}
@@ -411,7 +411,7 @@ int daDsh_c::executeCloseWait() {
int daDsh_c::initClose() {
mTiltTime = getCloseTiltTime();
speed.y = 0.0f;
mGravity = getCloseAccel();
gravity = getCloseAccel();
return 1;
}
@@ -419,17 +419,17 @@ int daDsh_c::initClose() {
/* 80467B04-80467BE0 0006E4 00DC+00 1/0 0/0 0/0 .text executeClose__7daDsh_cFv */
int daDsh_c::executeClose() {
if (mTiltTime != 0) {
current.pos.y = (orig.pos.y - OPEN_SIZE) + cM_rndFX(2.0f);
current.pos.y = (home.pos.y - OPEN_SIZE) + cM_rndFX(2.0f);
} else {
cLib_chaseF(&speed.y, getCloseSpeed(), mGravity);
cLib_chaseF(&speed.y, getCloseSpeed(), gravity);
current.pos.y += speed.y;
if (current.pos.y > orig.pos.y) {
current.pos.y = orig.pos.y;
if (current.pos.y > home.pos.y) {
current.pos.y = home.pos.y;
if (speed.y > getCloseBoundSpeed()) {
speed.y *= getCloseBoundRatio();
mGravity = 8.0f;
gravity = 8.0f;
} else {
setAction(&l_openWaitAction);
}
@@ -704,16 +704,16 @@ extern actor_process_profile_definition2 g_profile_DSHUTTER = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DSHUTTER, // mProcName
&g_fpcLf_Method.mBase, // mSubMtd
&g_fpcLf_Method.mBase, // sub_method
sizeof(daDsh_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
&g_fopAc_Method.base, // sub_method
296, // mPriority
&l_daDsh_Method, // mSubMtd
&l_daDsh_Method, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // mCullType
fopAc_CULLBOX_0_e, // cullType
},
0,
};
+4 -4
View File
@@ -95,14 +95,14 @@ extern actor_process_profile_definition g_profile_ECONT = {
8, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ECONT, // mProcName
&g_fpcLf_Method.mBase, // mSubMtd
&g_fpcLf_Method.mBase, // sub_method
sizeof(econt_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
&g_fopAc_Method.base, // sub_method
155, // mPriority
&l_daEcont_Method, // mSubMtd
&l_daEcont_Method, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // mCullType
fopAc_CULLBOX_0_e, // cullType
};
+5 -5
View File
@@ -36,7 +36,7 @@ u8 daGuardMng_c::checkMerchantNum() {
void daGuardMng_c::checkAppearTag(daTagGuard_c* i_this) {
cXyz pos;
if ((u8)i_this->getAppearPoint(&pos) != 0) {
pos -= fopAcM_GetPosition_p(dComIfGp_getPlayer(0));
pos -= *fopAcM_GetPosition_p(dComIfGp_getPlayer(0));
f32 pos_abs = pos.abs2();
if (field_0x56c > pos_abs) {
@@ -84,14 +84,14 @@ extern actor_process_profile_definition g_profile_GUARD_MNG = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_GUARD_MNG, // mProcName
&g_fpcLf_Method.mBase, // mSubMtd
&g_fpcLf_Method.mBase, // sub_method
sizeof(daGuardMng_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
&g_fopAc_Method.base, // sub_method
407, // mPriority
&l_daGuardMng_Method, // mSubMtd
&l_daGuardMng_Method, // sub_method
0x40100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // mCullType
fopAc_CULLBOX_0_e, // cullType
};
+4 -4
View File
@@ -90,14 +90,14 @@ extern actor_process_profile_definition g_profile_HITOBJ = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_HITOBJ, // mProcName
&g_fpcLf_Method.mBase, // mSubMtd
&g_fpcLf_Method.mBase, // sub_method
sizeof(hitobj_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
&g_fopAc_Method.base, // sub_method
690, // mPriority
&l_daHitobj_Method, // mSubMtd
&l_daHitobj_Method, // sub_method
0x40000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // mCullType
fopAc_CULLBOX_0_e, // cullType
};
+2 -2
View File
@@ -87,8 +87,8 @@ int daIzumiGate_c::Execute(Mtx** i_mtx) {
/* 80849328-808493CC 000308 00A4+00 1/0 0/0 0/0 .text Draw__13daIzumiGate_cFv */
int daIzumiGate_c::Draw() {
g_env_light.settingTevStruct(16, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr);
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
+29 -29
View File
@@ -377,14 +377,14 @@ static J3DModel* ArcIX_A_crwaku_model[1];
#ifdef NONMATCHING
static void koro2_draw(fshop_class* param_1) {
if (param_1->mScale.x > 5.0f) {
if (param_1->scale.x > 5.0f) {
dComIfGd_setListBG();
}
g_env_light.setLightTevColorType_MAJI(ArcIX_A_crwaku_model[0], &param_1->mTevStr);
g_env_light.setLightTevColorType_MAJI(ArcIX_A_crwaku_model[0], &param_1->tevStr);
mDoExt_modelUpdateDL(ArcIX_A_crwaku_model[0]);
for (s32 iVar1 = 0; iVar1 < (s32)ARRAY_SIZE(param_1->mKoro2); iVar1++) {
if (param_1->mKoro2[iVar1].mpModel != NULL) {
g_env_light.setLightTevColorType_MAJI(param_1->mKoro2[iVar1].mpModel, &param_1->mTevStr);
g_env_light.setLightTevColorType_MAJI(param_1->mKoro2[iVar1].mpModel, &param_1->tevStr);
mDoExt_modelUpdateDL(param_1->mKoro2[iVar1].mpModel);
}
}
@@ -1527,14 +1527,14 @@ static J3DModel* ArcIX_A_crsaka_model[8];
// regalloc
#ifdef NONMATCHING
static int daFshop_Draw(fshop_class* param_0) {
g_env_light.settingTevStruct(0x10, &param_0->current.pos, &param_0->mTevStr);
g_env_light.settingTevStruct(0x10, &param_0->current.pos, &param_0->tevStr);
if (param_0->field_0x4070 != NULL) {
g_env_light.setLightTevColorType_MAJI(param_0->field_0x4070, &param_0->mTevStr);
g_env_light.setLightTevColorType_MAJI(param_0->field_0x4070, &param_0->tevStr);
param_0->field_0x4070->getModelData()->getMaterialNodePointer(0)->getTevKColor(1)->r = 0;
mDoExt_modelUpdateDL(param_0->field_0x4070);
dComIfGd_setSimpleShadow(
&param_0->current.pos, param_0->field_0x40b4.GetGroundH(), 66.6f * param_0->mScale.x,
&param_0->current.pos, param_0->field_0x40b4.GetGroundH(), 66.6f * param_0->scale.x,
param_0->field_0x40b4.m_gnd, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
return 1;
}
@@ -1554,7 +1554,7 @@ static int daFshop_Draw(fshop_class* param_0) {
f32 fVar4 = param_0->mLure[iVar12].field_0x00.x - camera->mLookat.mEye.x;
f32 fVar5 = param_0->mLure[iVar12].field_0x00.z - camera->mLookat.mEye.z;
if (fVar4 * fVar4 + fVar5 * fVar5 > 1200.0f) {
g_env_light.setLightTevColorType_MAJI(param_0->mLure[iVar12].field_0x14, &param_0->mTevStr);
g_env_light.setLightTevColorType_MAJI(param_0->mLure[iVar12].field_0x14, &param_0->tevStr);
mDoExt_modelUpdateDL(param_0->mLure[iVar12].field_0x14);
if (param_0->mLure[iVar12].field_0x24 != 3) {
for (int local_50 = 0; local_50 < 2; local_50++) {
@@ -1565,30 +1565,30 @@ static int daFshop_Draw(fshop_class* param_0) {
}
for (int iVar9 = 0; iVar9 < 3; iVar9++) {
g_env_light.setLightTevColorType_MAJI(param_0->mRod[iVar9].field_0x14, &param_0->mTevStr);
g_env_light.setLightTevColorType_MAJI(param_0->mRod[iVar9].field_0x14, &param_0->tevStr);
mDoExt_modelUpdateDL(param_0->mRod[iVar9].field_0x14);
param_0->mRod[iVar9].line_mat.update(8, rod_color[iVar9], &param_0->mTevStr);
param_0->mRod[iVar9].line_mat.update(8, rod_color[iVar9], &param_0->tevStr);
dComIfGd_set3DlineMat(&param_0->mRod[iVar9].line_mat);
for (int local_54 = 0; local_54 < 6; local_54++) {
dComIfGp_entrySimpleModel(param_0->mRod[iVar9].field_0x18[local_54], cVar11);
}
}
for (int local_58 = 0; local_58 < 2; local_58++) {
g_env_light.setLightTevColorType_MAJI(param_0->mTsubo[local_58].field_0x14, &param_0->mTevStr);
g_env_light.setLightTevColorType_MAJI(param_0->mTsubo[local_58].field_0x14, &param_0->tevStr);
mDoExt_modelUpdateDL(param_0->mTsubo[local_58].field_0x14);
}
param_0->field_0x3f88.update(0xf, 1.2f, l_color, 2, &param_0->mTevStr);
param_0->field_0x3f88.update(0xf, 1.2f, l_color, 2, &param_0->tevStr);
dComIfGd_set3DlineMat(&param_0->field_0x3f88);
g_env_light.setLightTevColorType_MAJI(param_0->field_0x6b30, &param_0->mTevStr);
g_env_light.setLightTevColorType_MAJI(param_0->field_0x6b30, &param_0->tevStr);
mDoExt_modelUpdateDL(param_0->field_0x6b30);
g_env_light.setLightTevColorType_MAJI(param_0->field_0x3ff4, &param_0->mTevStr);
g_env_light.setLightTevColorType_MAJI(param_0->field_0x3ff4, &param_0->tevStr);
mDoExt_modelUpdateDL(param_0->field_0x3ff4);
if (param_0->field_0x4004 != NULL) {
mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f);
MtxP pfVar10 = mDoMtx_stack_c::get();
param_0->field_0x4004->i_setBaseTRMtx(pfVar10);
g_env_light.setLightTevColorType_MAJI(param_0->field_0x4004, &param_0->mTevStr);
g_env_light.setLightTevColorType_MAJI(param_0->field_0x4004, &param_0->tevStr);
mDoExt_modelUpdateDL(param_0->field_0x4004);
}
return 1;
@@ -2095,7 +2095,7 @@ static asm void weed_control(fshop_class* param_0, fs_weed_s* param_1) {
static void stage_copy(fshop_class* param_0, fshop_class* param_1) {
param_0->field_0x4014 = param_1->field_0x4014;
param_0->field_0x4020 = param_1->field_0x4020;
param_0->mScale = param_1->mScale;
param_0->scale = param_1->scale;
}
/* ############################################################################################## */
@@ -2160,7 +2160,7 @@ static void koro2_mtx_set(fshop_class* param_1) {
mDoMtx_stack_c::YrotM(param_1->field_0x4020.y);
mDoMtx_stack_c::XrotM(param_1->field_0x4020.x);
mDoMtx_stack_c::ZrotM(param_1->field_0x4020.z);
mDoMtx_stack_c::scaleM(param_1->mScale.x, param_1->mScale.x, param_1->mScale.x);
mDoMtx_stack_c::scaleM(param_1->scale.x, param_1->scale.x, param_1->scale.x);
mDoMtx_stack_c::push();
mDoMtx_stack_c::scaleM(0.01f, 0.01f, 0.01f);
param_1->mpA_crwaku_model->i_setBaseTRMtx(mDoMtx_stack_c::get());
@@ -2320,7 +2320,7 @@ static u8 data_80870AC4[4];
static void koro2_game(fshop_class* i_this) {
cXyz sp5C;
cXyz sp68;
i_this->mScale.x = 1.0f;
i_this->scale.x = 1.0f;
switch (i_this->field_0x4010) {
case 0:
@@ -2339,7 +2339,7 @@ static void koro2_game(fshop_class* i_this) {
cLib_addCalcAngleS2(&i_this->field_0x4020.x, 0, 2, 0x200);
cLib_addCalcAngleS2(&i_this->field_0x4020.z, 0, 2, 0x200);
case 2:
i_this->mScale.x = 10.0f;
i_this->scale.x = 10.0f;
if (i_this->field_0x4010 == 2) {
static f32 old_stick_x = 0.0f;
@@ -2681,7 +2681,7 @@ static int daFshop_Execute(fshop_class* param_1) {
return;
}
if (param_1->field_0x4070 != NULL) {
param_1->mScale.x = 0.024f;
param_1->scale.x = 0.024f;
cXyz local_cc;
cXyz local_d8;
BOOL bVar5 = FALSE;
@@ -2692,13 +2692,13 @@ static int daFshop_Execute(fshop_class* param_1) {
case 0:
param_1->current.pos = BallStartPos;
param_1->current.pos.y += 4.0f;
param_1->next.pos = param_1->current.pos;
param_1->old.pos = param_1->current.pos;
param_1->field_0x428d = 10;
break;
case 1:
param_1->current.pos = BallStartPos;
param_1->current.pos.y += 4.0f;
param_1->next.pos = param_1->current.pos;
param_1->old.pos = param_1->current.pos;
param_1->speed.zero();
param_1->field_0x0572++;
param_1->field_0x428c = 3;
@@ -2706,7 +2706,7 @@ static int daFshop_Execute(fshop_class* param_1) {
param_1->field_0x428d = 10;
case 2:
bVar5 = TRUE;
param_1->mScale.x = 0.24f;
param_1->scale.x = 0.24f;
break;
}
@@ -2754,11 +2754,11 @@ static int daFshop_Execute(fshop_class* param_1) {
}
}
if (!bVar5) {
iVar9->mHealth = 1;
iVar9->health = 1;
} else if (param_1->field_0x567 == 1) {
iVar9->mHealth = 0;
iVar9->health = 0;
} else {
iVar9->mHealth = 2;
iVar9->health = 2;
}
*(u16*)((u8*)iVar9 + 0x752) = 0x49;
@@ -2781,7 +2781,7 @@ static int daFshop_Execute(fshop_class* param_1) {
}
if (bVar5) {
uVar19->mHealth = 3;
uVar19->health = 3;
*(u16*)((u8*)uVar19 + 0x752) = 0x49;
} else {
*(u16*)((u8*)uVar19 + 0x752) = 0x4c;
@@ -2845,9 +2845,9 @@ static int daFshop_Execute(fshop_class* param_1) {
camera_class* pmVar11 = dComIfGp_getCamera(0);
mDoMtx_stack_c::transS(param_1->current.pos.x, param_1->current.pos.y,
param_1->current.pos.z);
mDoMtx_stack_c::scaleM(param_1->mScale.x, param_1->mScale.x,
param_1->mScale.x);
mDoMtx_stack_c::transM(0.0f, 190.0f * param_1->mScale.x, 0.0f);
mDoMtx_stack_c::scaleM(param_1->scale.x, param_1->scale.x,
param_1->scale.x);
mDoMtx_stack_c::transM(0.0f, 190.0f * param_1->scale.x, 0.0f);
local_cc = pmVar11->mLookat.mEye - param_1->current.pos;
mDoMtx_stack_c::YrotM(cM_atan2s(local_cc.x, local_cc.z));
mDoMtx_stack_c::XrotM(-cM_atan2s(local_cc.y, JMAFastSqrt((local_cc.x * local_cc.x + local_cc.z * local_cc.z))));
+8 -8
View File
@@ -543,7 +543,7 @@ bool daMirror_c::createHeap() {
/* 80871F78-80872018 001438 00A0+00 1/1 0/0 0/0 .text setModelMtx__10daMirror_cFv */
void daMirror_c::setModelMtx() {
field_0x6f8->setBaseScale(mScale);
field_0x6f8->setBaseScale(scale);
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::XrotM(shape_angle.x);
@@ -628,13 +628,13 @@ int daMirror_c::create() {
{-72.5f, 145.0f, 0.0f}, {72.5f, 145.0f, 0.0f},
{72.5f, 0.0f, 0.0f}, {-72.5f, 0.0f, 0.0f},
};
mDoMtx_stack_c::scaleS(mScale);
mDoMtx_stack_c::scaleS(scale);
mDoMtx_stack_c::revConcat(field_0x6f8->getBaseTRMtx());
cMtx_multVecArray(mDoMtx_stack_c::get(), src, mPacket.getQuad(), 4);
mPacket.getViewScale().set(-1.0f, 1.0f, 1.0f);
} else {
if (type == 1) {
mScale *= 10.0f;
scale *= 10.0f;
mPacket.getViewScale().set(1.0,-1.0,1.0);
} else {
if (type == 3) {
@@ -657,7 +657,7 @@ int daMirror_c::create() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::XrotM(shape_angle.x);
mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z);
mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z);
static Vec const data_8087260Cb[4] = {
{-50.0f, 100.0f, 0.0f}, {50.0f, 100.0f, 0.0f},
{50.0f, 0.0f, 0.0f}, {-50.0f, 0.0f, 0.0f},
@@ -670,7 +670,7 @@ int daMirror_c::create() {
static Vec const data_8087263C_a = {
0.0f, 50.0f, 0.0f,
};
mDoMtx_stack_c::multVec(&data_8087263C_a, &mEyePos);
mDoMtx_stack_c::multVec(&data_8087263C_a, &eyePos);
return 4;
}
#else
@@ -725,7 +725,7 @@ int daMirror_c::execute() {
fopAcM_searchActorDistance2(this, player) < 40000.0f)
{
if (fopAcM_seenActorAngleY(this, player) < 0x4000) {
daPy_py_c::setLookPos(&mEyePos);
daPy_py_c::setLookPos(&eyePos);
}
}
return 1;
@@ -748,8 +748,8 @@ static int daMirror_draw(daMirror_c* param_0) {
}
if (param_0->field_0x6f8) {
g_env_light.settingTevStruct(0x10, &param_0->current.pos, &param_0->mTevStr);
g_env_light.setLightTevColorType(param_0->field_0x6f8->mModelData, &param_0->mTevStr);
g_env_light.settingTevStruct(0x10, &param_0->current.pos, &param_0->tevStr);
g_env_light.setLightTevColorType(param_0->field_0x6f8->mModelData, &param_0->tevStr);
mDoExt_modelUpdateDL(param_0->field_0x6f8);
}

Some files were not shown because too many files have changed in this diff Show More