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

move / fix bunch of stuff (#133) 

* fix some class structures / d_event wip

* d_event wip

* move gamepad stuff

* move m_Do_main

* move d_bomb / partial m_Do_reset

* format

* remove asm

* add Z2SoundID enum

* move some Z2 classes

* fix

* move more Z2 stuff

* fix fopAc_ac_c more
This commit is contained in:
TakaRikka 2021-06-12 15:22:36 -07:00 committed by GitHub
parent 5be309a186
commit 4448c08ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
132 changed files with 6755 additions and 3217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFRC10JAISoundID.s
View File

@ -1,4 +0,0 @@
lbl_802B995C:
/* 802B995C 80 04 00 00 */ lwz r0, 0(r4)
/* 802B9960 90 03 00 00 */ stw r0, 0(r3)
/* 802B9964 4E 80 00 20 */ blr

13
asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeMgrFv.s
View File

@ -1,13 +0,0 @@
lbl_802AEB04:
/* 802AEB04 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802AEB08 7C 08 02 A6 */ mflr r0
/* 802AEB0C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802AEB10 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802AEB14 7C 7F 1B 78 */ mr r31, r3
/* 802AEB18 48 00 01 A5 */ bl resetMultiSePos__12Z2MultiSeMgrFv
/* 802AEB1C 7F E3 FB 78 */ mr r3, r31
/* 802AEB20 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802AEB24 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802AEB28 7C 08 03 A6 */ mtlr r0
/* 802AEB2C 38 21 00 10 */ addi r1, r1, 0x10
/* 802AEB30 4E 80 00 20 */ blr

17
asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeObjFv.s
View File

@ -1,17 +0,0 @@
lbl_802AB710:
/* 802AB710 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802AB714 7C 08 02 A6 */ mflr r0
/* 802AB718 90 01 00 14 */ stw r0, 0x14(r1)
/* 802AB71C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802AB720 7C 7F 1B 78 */ mr r31, r3
/* 802AB724 48 00 33 E1 */ bl __ct__12Z2MultiSeMgrFv
/* 802AB728 38 00 FF FF */ li r0, -1
/* 802AB72C 90 1F 00 1C */ stw r0, 0x1c(r31)
/* 802AB730 38 00 00 00 */ li r0, 0
/* 802AB734 98 1F 00 20 */ stb r0, 0x20(r31)
/* 802AB738 7F E3 FB 78 */ mr r3, r31
/* 802AB73C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802AB740 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802AB744 7C 08 03 A6 */ mtlr r0
/* 802AB748 38 21 00 10 */ addi r1, r1, 0x10
/* 802AB74C 4E 80 00 20 */ blr

17
asm/Z2AudioLib/Z2SeMgr/__dt__12Z2MultiSeMgrFv.s
View File

@ -1,17 +0,0 @@
lbl_802AEB34:
/* 802AEB34 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802AEB38 7C 08 02 A6 */ mflr r0
/* 802AEB3C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802AEB40 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802AEB44 7C 7F 1B 79 */ or. r31, r3, r3
/* 802AEB48 41 82 00 10 */ beq lbl_802AEB58
/* 802AEB4C 7C 80 07 35 */ extsh. r0, r4
/* 802AEB50 40 81 00 08 */ ble lbl_802AEB58
/* 802AEB54 48 02 01 E9 */ bl __dl__FPv
lbl_802AEB58:
/* 802AEB58 7F E3 FB 78 */ mr r3, r31
/* 802AEB5C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802AEB60 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802AEB64 7C 08 03 A6 */ mtlr r0
/* 802AEB68 38 21 00 10 */ addi r1, r1, 0x10
/* 802AEB6C 4E 80 00 20 */ blr

10
asm/Z2AudioLib/Z2SeMgr/decrCrowdSize__7Z2SeMgrFv.s
View File

@ -1,10 +0,0 @@
lbl_802AB960:
/* 802AB960 88 83 03 CC */ lbz r4, 0x3cc(r3)
/* 802AB964 38 04 FF FF */ addi r0, r4, -1
/* 802AB968 98 03 03 CC */ stb r0, 0x3cc(r3)
/* 802AB96C 88 03 03 CC */ lbz r0, 0x3cc(r3)
/* 802AB970 28 00 00 64 */ cmplwi r0, 0x64
/* 802AB974 4C 81 00 20 */ blelr
/* 802AB978 38 00 00 00 */ li r0, 0
/* 802AB97C 98 03 03 CC */ stb r0, 0x3cc(r3)
/* 802AB980 4E 80 00 20 */ blr

10
asm/Z2AudioLib/Z2SeMgr/incrCrowdSize__7Z2SeMgrFv.s
View File

@ -1,10 +0,0 @@
lbl_802AB93C:
/* 802AB93C 88 83 03 CC */ lbz r4, 0x3cc(r3)
/* 802AB940 38 04 00 01 */ addi r0, r4, 1
/* 802AB944 98 03 03 CC */ stb r0, 0x3cc(r3)
/* 802AB948 88 03 03 CC */ lbz r0, 0x3cc(r3)
/* 802AB94C 28 00 00 64 */ cmplwi r0, 0x64
/* 802AB950 4C 81 00 20 */ blelr
/* 802AB954 38 00 00 64 */ li r0, 0x64
/* 802AB958 98 03 03 CC */ stb r0, 0x3cc(r3)
/* 802AB95C 4E 80 00 20 */ blr

11
asm/Z2AudioLib/Z2SeMgr/resetModY__7Z2SeMgrFv.s
View File

@ -1,11 +0,0 @@
lbl_802AB80C:
/* 802AB80C 38 80 00 00 */ li r4, 0
/* 802AB810 7C 85 23 78 */ mr r5, r4
/* 802AB814 38 00 00 08 */ li r0, 8
/* 802AB818 7C 09 03 A6 */ mtctr r0
lbl_802AB81C:
/* 802AB81C 38 04 03 A0 */ addi r0, r4, 0x3a0
/* 802AB820 7C A3 01 2E */ stwx r5, r3, r0
/* 802AB824 38 84 00 04 */ addi r4, r4, 4
/* 802AB828 42 00 FF F4 */ bdnz lbl_802AB81C
/* 802AB82C 4E 80 00 20 */ blr

10
asm/Z2AudioLib/Z2SeMgr/resetMultiSePos__12Z2MultiSeMgrFv.s
View File

@ -1,10 +0,0 @@
lbl_802AECBC:
/* 802AECBC 38 00 FF FF */ li r0, -1
/* 802AECC0 98 03 00 18 */ stb r0, 0x18(r3)
/* 802AECC4 C0 02 BE 78 */ lfs f0, lit_4040(r2)
/* 802AECC8 D0 03 00 08 */ stfs f0, 8(r3)
/* 802AECCC D0 03 00 0C */ stfs f0, 0xc(r3)
/* 802AECD0 D0 03 00 10 */ stfs f0, 0x10(r3)
/* 802AECD4 D0 03 00 14 */ stfs f0, 0x14(r3)
/* 802AECD8 D0 03 00 04 */ stfs f0, 4(r3)
/* 802AECDC 4E 80 00 20 */ blr

15
asm/Z2AudioLib/Z2SoundHandles/__ct__14Z2SoundHandlesFv.s
View File

@ -1,15 +0,0 @@
lbl_802AB07C:
/* 802AB07C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802AB080 7C 08 02 A6 */ mflr r0
/* 802AB084 90 01 00 14 */ stw r0, 0x14(r1)
/* 802AB088 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802AB08C 7C 7F 1B 78 */ mr r31, r3
/* 802AB090 48 03 0E 85 */ bl initiate__10JSUPtrListFv
/* 802AB094 38 00 00 00 */ li r0, 0
/* 802AB098 98 1F 00 0C */ stb r0, 0xc(r31)
/* 802AB09C 7F E3 FB 78 */ mr r3, r31
/* 802AB0A0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802AB0A4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802AB0A8 7C 08 03 A6 */ mtlr r0
/* 802AB0AC 38 21 00 10 */ addi r1, r1, 0x10
/* 802AB0B0 4E 80 00 20 */ blr

28
asm/Z2AudioLib/Z2SoundHandles/__dt__14Z2SoundHandlesFv.s
View File

@ -1,28 +0,0 @@
lbl_802AB0B4:
/* 802AB0B4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802AB0B8 7C 08 02 A6 */ mflr r0
/* 802AB0BC 90 01 00 14 */ stw r0, 0x14(r1)
/* 802AB0C0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802AB0C4 93 C1 00 08 */ stw r30, 8(r1)
/* 802AB0C8 7C 7E 1B 79 */ or. r30, r3, r3
/* 802AB0CC 7C 9F 23 78 */ mr r31, r4
/* 802AB0D0 41 82 00 2C */ beq lbl_802AB0FC
/* 802AB0D4 48 00 00 4D */ bl deleteHandlesPool__14Z2SoundHandlesFv
/* 802AB0D8 28 1E 00 00 */ cmplwi r30, 0
/* 802AB0DC 41 82 00 10 */ beq lbl_802AB0EC
/* 802AB0E0 7F C3 F3 78 */ mr r3, r30
/* 802AB0E4 38 80 00 00 */ li r4, 0
/* 802AB0E8 48 03 0D C5 */ bl __dt__10JSUPtrListFv
lbl_802AB0EC:
/* 802AB0EC 7F E0 07 35 */ extsh. r0, r31
/* 802AB0F0 40 81 00 0C */ ble lbl_802AB0FC
/* 802AB0F4 7F C3 F3 78 */ mr r3, r30
/* 802AB0F8 48 02 3C 45 */ bl __dl__FPv
lbl_802AB0FC:
/* 802AB0FC 7F C3 F3 78 */ mr r3, r30
/* 802AB100 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802AB104 83 C1 00 08 */ lwz r30, 8(r1)
/* 802AB108 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802AB10C 7C 08 03 A6 */ mtlr r0
/* 802AB110 38 21 00 10 */ addi r1, r1, 0x10
/* 802AB114 4E 80 00 20 */ blr

24
asm/Z2AudioLib/Z2SoundHandles/getHandleSoundID__14Z2SoundHandlesF10JAISoundID.s
View File

@ -1,24 +0,0 @@
lbl_802AB254:
/* 802AB254 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802AB258 80 A3 00 00 */ lwz r5, 0(r3)
/* 802AB25C 80 04 00 00 */ lwz r0, 0(r4)
/* 802AB260 48 00 00 2C */ b lbl_802AB28C
lbl_802AB264:
/* 802AB264 80 65 00 00 */ lwz r3, 0(r5)
/* 802AB268 80 83 00 00 */ lwz r4, 0(r3)
/* 802AB26C 28 04 00 00 */ cmplwi r4, 0
/* 802AB270 41 82 00 18 */ beq lbl_802AB288
/* 802AB274 80 84 00 18 */ lwz r4, 0x18(r4)
/* 802AB278 90 81 00 08 */ stw r4, 8(r1)
/* 802AB27C 7C 04 00 40 */ cmplw r4, r0
/* 802AB280 40 82 00 08 */ bne lbl_802AB288
/* 802AB284 48 00 00 14 */ b lbl_802AB298
lbl_802AB288:
/* 802AB288 80 A5 00 0C */ lwz r5, 0xc(r5)
lbl_802AB28C:
/* 802AB28C 28 05 00 00 */ cmplwi r5, 0
/* 802AB290 40 82 FF D4 */ bne lbl_802AB264
/* 802AB294 38 60 00 00 */ li r3, 0
lbl_802AB298:
/* 802AB298 38 21 00 10 */ addi r1, r1, 0x10
/* 802AB29C 4E 80 00 20 */ blr

18
asm/Z2AudioLib/Z2SoundHandles/getHandleUserData__14Z2SoundHandlesFUl.s
View File

@ -1,18 +0,0 @@
lbl_802AB2A0:
/* 802AB2A0 80 C3 00 00 */ lwz r6, 0(r3)
/* 802AB2A4 48 00 00 24 */ b lbl_802AB2C8
lbl_802AB2A8:
/* 802AB2A8 80 66 00 00 */ lwz r3, 0(r6)
/* 802AB2AC 80 A3 00 00 */ lwz r5, 0(r3)
/* 802AB2B0 28 05 00 00 */ cmplwi r5, 0
/* 802AB2B4 41 82 00 10 */ beq lbl_802AB2C4
/* 802AB2B8 80 05 00 20 */ lwz r0, 0x20(r5)
/* 802AB2BC 7C 04 00 40 */ cmplw r4, r0
/* 802AB2C0 4D 82 00 20 */ beqlr
lbl_802AB2C4:
/* 802AB2C4 80 C6 00 0C */ lwz r6, 0xc(r6)
lbl_802AB2C8:
/* 802AB2C8 28 06 00 00 */ cmplwi r6, 0
/* 802AB2CC 40 82 FF DC */ bne lbl_802AB2A8
/* 802AB2D0 38 60 00 00 */ li r3, 0
/* 802AB2D4 4E 80 00 20 */ blr

17
asm/Z2AudioLib/Z2SoundHandles/isActive__14Z2SoundHandlesCFv.s
View File

@ -1,17 +0,0 @@
lbl_802AB504:
/* 802AB504 80 83 00 00 */ lwz r4, 0(r3)
/* 802AB508 48 00 00 20 */ b lbl_802AB528
lbl_802AB50C:
/* 802AB50C 80 64 00 00 */ lwz r3, 0(r4)
/* 802AB510 80 03 00 00 */ lwz r0, 0(r3)
/* 802AB514 28 00 00 00 */ cmplwi r0, 0
/* 802AB518 41 82 00 0C */ beq lbl_802AB524
/* 802AB51C 38 60 00 01 */ li r3, 1
/* 802AB520 4E 80 00 20 */ blr
lbl_802AB524:
/* 802AB524 80 84 00 0C */ lwz r4, 0xc(r4)
lbl_802AB528:
/* 802AB528 28 04 00 00 */ cmplwi r4, 0
/* 802AB52C 40 82 FF E0 */ bne lbl_802AB50C
/* 802AB530 38 60 00 00 */ li r3, 0
/* 802AB534 4E 80 00 20 */ blr

29
asm/Z2AudioLib/Z2SoundHandles/stopAllSounds__14Z2SoundHandlesFUl.s
View File

@ -1,29 +0,0 @@
lbl_802AB4A0:
/* 802AB4A0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802AB4A4 7C 08 02 A6 */ mflr r0
/* 802AB4A8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802AB4AC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802AB4B0 93 C1 00 08 */ stw r30, 8(r1)
/* 802AB4B4 7C 9E 23 78 */ mr r30, r4
/* 802AB4B8 83 E3 00 00 */ lwz r31, 0(r3)
/* 802AB4BC 48 00 00 28 */ b lbl_802AB4E4
lbl_802AB4C0:
/* 802AB4C0 80 7F 00 00 */ lwz r3, 0(r31)
/* 802AB4C4 28 03 00 00 */ cmplwi r3, 0
/* 802AB4C8 41 82 00 18 */ beq lbl_802AB4E0
/* 802AB4CC 80 63 00 00 */ lwz r3, 0(r3)
/* 802AB4D0 28 03 00 00 */ cmplwi r3, 0
/* 802AB4D4 41 82 00 0C */ beq lbl_802AB4E0
/* 802AB4D8 7F C4 F3 78 */ mr r4, r30
/* 802AB4DC 4B FF 70 01 */ bl stop__8JAISoundFUl
lbl_802AB4E0:
/* 802AB4E0 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802AB4E4:
/* 802AB4E4 28 1F 00 00 */ cmplwi r31, 0
/* 802AB4E8 40 82 FF D8 */ bne lbl_802AB4C0
/* 802AB4EC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802AB4F0 83 C1 00 08 */ lwz r30, 8(r1)
/* 802AB4F4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802AB4F8 7C 08 03 A6 */ mtlr r0
/* 802AB4FC 38 21 00 10 */ addi r1, r1, 0x10
/* 802AB500 4E 80 00 20 */ blr

24
asm/Z2AudioLib/Z2SoundObjMgr/deleteEnemyAll__13Z2SoundObjMgrFv.s
View File

@ -1,24 +0,0 @@
lbl_802C013C:
/* 802C013C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C0140 7C 08 02 A6 */ mflr r0
/* 802C0144 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C0148 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C014C 7C 7F 1B 78 */ mr r31, r3
/* 802C0150 48 00 00 20 */ b lbl_802C0170
lbl_802C0154:
/* 802C0154 80 63 00 00 */ lwz r3, 0(r3)
/* 802C0158 28 03 00 00 */ cmplwi r3, 0
/* 802C015C 41 82 00 14 */ beq lbl_802C0170
/* 802C0160 81 83 00 00 */ lwz r12, 0(r3)
/* 802C0164 81 8C 00 08 */ lwz r12, 8(r12)
/* 802C0168 7D 89 03 A6 */ mtctr r12
/* 802C016C 4E 80 04 21 */ bctrl
lbl_802C0170:
/* 802C0170 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C0174 28 03 00 00 */ cmplwi r3, 0
/* 802C0178 40 82 FF DC */ bne lbl_802C0154
/* 802C017C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802C0180 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C0184 7C 08 03 A6 */ mtlr r0
/* 802C0188 38 21 00 10 */ addi r1, r1, 0x10
/* 802C018C 4E 80 00 20 */ blr

38
asm/Z2AudioLib/Z2SoundObjMgr/setGhostEnemyState__13Z2SoundObjMgrFUc.s
View File

@ -1,38 +0,0 @@
lbl_802BFFEC:
/* 802BFFEC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802BFFF0 7C 08 02 A6 */ mflr r0
/* 802BFFF4 90 01 00 14 */ stw r0, 0x14(r1)
/* 802BFFF8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802BFFFC 93 C1 00 08 */ stw r30, 8(r1)
/* 802C0000 7C 7E 1B 78 */ mr r30, r3
/* 802C0004 7C 9F 23 78 */ mr r31, r4
/* 802C0008 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 802C000C 28 00 00 20 */ cmplwi r0, 0x20
/* 802C0010 40 82 00 24 */ bne lbl_802C0034
/* 802C0014 88 7E 00 1A */ lbz r3, 0x1a(r30)
/* 802C0018 88 1E 00 16 */ lbz r0, 0x16(r30)
/* 802C001C 7C 03 00 40 */ cmplw r3, r0
/* 802C0020 41 80 00 2C */ blt lbl_802C004C
/* 802C0024 80 6D 86 04 */ lwz r3, data_80450B84(r13)
/* 802C0028 38 80 00 01 */ li r4, 1
/* 802C002C 4B FF 43 B5 */ bl setBattleGhostMute__8Z2SeqMgrFb
/* 802C0030 48 00 00 1C */ b lbl_802C004C
lbl_802C0034:
/* 802C0034 88 1E 00 1A */ lbz r0, 0x1a(r30)
/* 802C0038 28 00 00 00 */ cmplwi r0, 0
/* 802C003C 40 82 00 10 */ bne lbl_802C004C
/* 802C0040 38 00 00 00 */ li r0, 0
/* 802C0044 98 1E 00 19 */ stb r0, 0x19(r30)
/* 802C0048 48 00 00 14 */ b lbl_802C005C
lbl_802C004C:
/* 802C004C 88 1E 00 19 */ lbz r0, 0x19(r30)
/* 802C0050 54 00 07 FE */ clrlwi r0, r0, 0x1f
/* 802C0054 7C 1F 02 14 */ add r0, r31, r0
/* 802C0058 98 1E 00 19 */ stb r0, 0x19(r30)
lbl_802C005C:
/* 802C005C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802C0060 83 C1 00 08 */ lwz r30, 8(r1)
/* 802C0064 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C0068 7C 08 03 A6 */ mtlr r0
/* 802C006C 38 21 00 10 */ addi r1, r1, 0x10
/* 802C0070 4E 80 00 20 */ blr

23
asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s
View File

@ -1,23 +0,0 @@
lbl_802BDEF0:
/* 802BDEF0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802BDEF4 7C 08 02 A6 */ mflr r0
/* 802BDEF8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802BDEFC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802BDF00 7C 7F 1B 78 */ mr r31, r3
/* 802BDF04 4B FE D1 79 */ bl __ct__14Z2SoundHandlesFv
/* 802BDF08 3C 60 80 3D */ lis r3, __vt__14Z2SoundObjBase@ha /* 0x803CAD50@ha */
/* 802BDF0C 38 03 AD 50 */ addi r0, r3, __vt__14Z2SoundObjBase@l /* 0x803CAD50@l */
/* 802BDF10 90 1F 00 10 */ stw r0, 0x10(r31)
/* 802BDF14 38 60 00 00 */ li r3, 0
/* 802BDF18 90 7F 00 18 */ stw r3, 0x18(r31)
/* 802BDF1C 98 7F 00 1F */ stb r3, 0x1f(r31)
/* 802BDF20 80 0D 85 F4 */ lwz r0, data_80450B74(r13)
/* 802BDF24 90 1F 00 14 */ stw r0, 0x14(r31)
/* 802BDF28 B0 7F 00 1C */ sth r3, 0x1c(r31)
/* 802BDF2C 98 7F 00 1E */ stb r3, 0x1e(r31)
/* 802BDF30 7F E3 FB 78 */ mr r3, r31
/* 802BDF34 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802BDF38 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802BDF3C 7C 08 03 A6 */ mtlr r0
/* 802BDF40 38 21 00 10 */ addi r1, r1, 0x10
/* 802BDF44 4E 80 00 20 */ blr

28
asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s
View File

@ -1,28 +0,0 @@
lbl_802BDF48:
/* 802BDF48 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802BDF4C 7C 08 02 A6 */ mflr r0
/* 802BDF50 90 01 00 14 */ stw r0, 0x14(r1)
/* 802BDF54 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802BDF58 93 C1 00 08 */ stw r30, 8(r1)
/* 802BDF5C 7C 7E 1B 79 */ or. r30, r3, r3
/* 802BDF60 7C 9F 23 78 */ mr r31, r4
/* 802BDF64 41 82 00 30 */ beq lbl_802BDF94
/* 802BDF68 3C 80 80 3D */ lis r4, __vt__14Z2SoundObjBase@ha /* 0x803CAD50@ha */
/* 802BDF6C 38 04 AD 50 */ addi r0, r4, __vt__14Z2SoundObjBase@l /* 0x803CAD50@l */
/* 802BDF70 90 1E 00 10 */ stw r0, 0x10(r30)
/* 802BDF74 48 00 00 85 */ bl deleteObject__14Z2SoundObjBaseFv
/* 802BDF78 7F C3 F3 78 */ mr r3, r30
/* 802BDF7C 38 80 00 00 */ li r4, 0
/* 802BDF80 4B FE D1 35 */ bl __dt__14Z2SoundHandlesFv
/* 802BDF84 7F E0 07 35 */ extsh. r0, r31
/* 802BDF88 40 81 00 0C */ ble lbl_802BDF94
/* 802BDF8C 7F C3 F3 78 */ mr r3, r30
/* 802BDF90 48 01 0D AD */ bl __dl__FPv
lbl_802BDF94:
/* 802BDF94 7F C3 F3 78 */ mr r3, r30
/* 802BDF98 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802BDF9C 83 C1 00 08 */ lwz r30, 8(r1)
/* 802BDFA0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802BDFA4 7C 08 03 A6 */ mtlr r0
/* 802BDFA8 38 21 00 10 */ addi r1, r1, 0x10
/* 802BDFAC 4E 80 00 20 */ blr

16
asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s
View File

@ -1,16 +0,0 @@
lbl_802BE038:
/* 802BE038 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802BE03C 7C 08 02 A6 */ mflr r0
/* 802BE040 90 01 00 14 */ stw r0, 0x14(r1)
/* 802BE044 88 03 00 1F */ lbz r0, 0x1f(r3)
/* 802BE048 28 00 00 00 */ cmplwi r0, 0
/* 802BE04C 41 82 00 14 */ beq lbl_802BE060
/* 802BE050 B0 83 00 1C */ sth r4, 0x1c(r3)
/* 802BE054 98 A3 00 1E */ stb r5, 0x1e(r3)
/* 802BE058 80 83 00 18 */ lwz r4, 0x18(r3)
/* 802BE05C 4B FE D4 DD */ bl func_802AB538
lbl_802BE060:
/* 802BE060 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802BE064 7C 08 03 A6 */ mtlr r0
/* 802BE068 38 21 00 10 */ addi r1, r1, 0x10
/* 802BE06C 4E 80 00 20 */ blr

19
asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s
View File

@ -1,19 +0,0 @@
lbl_802BDFB0:
/* 802BDFB0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802BDFB4 7C 08 02 A6 */ mflr r0
/* 802BDFB8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802BDFBC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802BDFC0 93 C1 00 08 */ stw r30, 8(r1)
/* 802BDFC4 7C 7E 1B 78 */ mr r30, r3
/* 802BDFC8 7C 9F 23 78 */ mr r31, r4
/* 802BDFCC 7C A4 2B 78 */ mr r4, r5
/* 802BDFD0 4B FE D1 49 */ bl initHandlesPool__14Z2SoundHandlesFUc
/* 802BDFD4 93 FE 00 18 */ stw r31, 0x18(r30)
/* 802BDFD8 38 00 00 01 */ li r0, 1
/* 802BDFDC 98 1E 00 1F */ stb r0, 0x1f(r30)
/* 802BDFE0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802BDFE4 83 C1 00 08 */ lwz r30, 8(r1)
/* 802BDFE8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802BDFEC 7C 08 03 A6 */ mtlr r0
/* 802BDFF0 38 21 00 10 */ addi r1, r1, 0x10
/* 802BDFF4 4E 80 00 20 */ blr

9
asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s
View File

@ -1,9 +0,0 @@
lbl_802BE880:
/* 802BE880 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802BE884 7C 08 02 A6 */ mflr r0
/* 802BE888 90 01 00 14 */ stw r0, 0x14(r1)
/* 802BE88C 4B FF F7 25 */ bl init__14Z2SoundObjBaseFP3VecUc
/* 802BE890 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802BE894 7C 08 03 A6 */ mtlr r0
/* 802BE898 38 21 00 10 */ addi r1, r1, 0x10
/* 802BE89C 4E 80 00 20 */ blr

12
asm/d/d_bomb/checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c.s
View File

@ -1,12 +0,0 @@
lbl_80031FCC:
/* 80031FCC 38 80 00 00 */ li r4, 0
/* 80031FD0 A8 03 00 08 */ lha r0, 8(r3)
/* 80031FD4 2C 00 02 21 */ cmpwi r0, 0x221
/* 80031FD8 40 82 00 14 */ bne lbl_80031FEC
/* 80031FDC 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80031FE0 28 00 00 04 */ cmplwi r0, 4
/* 80031FE4 40 82 00 08 */ bne lbl_80031FEC
/* 80031FE8 38 80 00 01 */ li r4, 1
lbl_80031FEC:
/* 80031FEC 7C 83 23 78 */ mr r3, r4
/* 80031FF0 4E 80 00 20 */ blr

12
asm/d/d_bomb/checkInsectBombMove__7dBomb_cFP10fopAc_ac_c.s
View File

@ -1,12 +0,0 @@
lbl_8003201C:
/* 8003201C 38 80 00 00 */ li r4, 0
/* 80032020 A8 03 00 08 */ lha r0, 8(r3)
/* 80032024 2C 00 02 21 */ cmpwi r0, 0x221
/* 80032028 40 82 00 14 */ bne lbl_8003203C
/* 8003202C 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80032030 28 00 00 07 */ cmplwi r0, 7
/* 80032034 40 82 00 08 */ bne lbl_8003203C
/* 80032038 38 80 00 01 */ li r4, 1
lbl_8003203C:
/* 8003203C 7C 83 23 78 */ mr r3, r4
/* 80032040 4E 80 00 20 */ blr

17
asm/d/d_bomb/checkStateCarry__7dBomb_cFv.s
View File

@ -1,17 +0,0 @@
lbl_80031F94:
/* 80031F94 38 80 00 00 */ li r4, 0
/* 80031F98 80 A3 04 9C */ lwz r5, 0x49c(r3)
/* 80031F9C 54 A0 04 A5 */ rlwinm. r0, r5, 0, 0x12, 0x12
/* 80031FA0 40 82 00 20 */ bne lbl_80031FC0
/* 80031FA4 54 A0 02 D7 */ rlwinm. r0, r5, 0, 0xb, 0xb
/* 80031FA8 40 82 00 18 */ bne lbl_80031FC0
/* 80031FAC 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80031FB0 28 00 00 02 */ cmplwi r0, 2
/* 80031FB4 41 82 00 0C */ beq lbl_80031FC0
/* 80031FB8 28 00 00 01 */ cmplwi r0, 1
/* 80031FBC 40 82 00 08 */ bne lbl_80031FC4
lbl_80031FC0:
/* 80031FC0 38 80 00 01 */ li r4, 1
lbl_80031FC4:
/* 80031FC4 7C 83 23 78 */ mr r3, r4
/* 80031FC8 4E 80 00 20 */ blr

12
asm/d/d_bomb/checkWaterBomb__7dBomb_cFP10fopAc_ac_c.s
View File

@ -1,12 +0,0 @@
lbl_80031FF4:
/* 80031FF4 38 80 00 00 */ li r4, 0
/* 80031FF8 A8 03 00 08 */ lha r0, 8(r3)
/* 80031FFC 2C 00 02 21 */ cmpwi r0, 0x221
/* 80032000 40 82 00 14 */ bne lbl_80032014
/* 80032004 80 03 0B 4C */ lwz r0, 0xb4c(r3)
/* 80032008 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
/* 8003200C 41 82 00 08 */ beq lbl_80032014
/* 80032010 38 80 00 01 */ li r4, 1
lbl_80032014:
/* 80032014 7C 83 23 78 */ mr r3, r4
/* 80032018 4E 80 00 20 */ blr

15
asm/d/event/d_event/__ct__11dEvt_info_cFv.s
View File

@ -1,15 +0,0 @@
lbl_800433F0:
/* 800433F0 3C 80 80 3A */ lis r4, __vt__11dEvt_info_c@ha /* 0x803A35D0@ha */
/* 800433F4 38 04 35 D0 */ addi r0, r4, __vt__11dEvt_info_c@l /* 0x803A35D0@l */
/* 800433F8 90 03 00 00 */ stw r0, 0(r3)
/* 800433FC 38 80 00 00 */ li r4, 0
/* 80043400 B0 83 00 04 */ sth r4, 4(r3)
/* 80043404 38 00 00 02 */ li r0, 2
/* 80043408 B0 03 00 06 */ sth r0, 6(r3)
/* 8004340C 38 00 FF FF */ li r0, -1
/* 80043410 B0 03 00 08 */ sth r0, 8(r3)
/* 80043414 38 00 00 FF */ li r0, 0xff
/* 80043418 98 03 00 0A */ stb r0, 0xa(r3)
/* 8004341C 90 83 00 0C */ stw r4, 0xc(r3)
/* 80043420 98 83 00 0B */ stb r4, 0xb(r3)
/* 80043424 4E 80 00 20 */ blr

22
asm/d/event/d_event/__ct__14dEvt_control_cFv.s
View File

@ -1,22 +0,0 @@
lbl_80041580:
/* 80041580 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80041584 7C 08 02 A6 */ mflr r0
/* 80041588 90 01 00 14 */ stw r0, 0x14(r1)
/* 8004158C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80041590 7C 7F 1B 78 */ mr r31, r3
/* 80041594 38 7F 00 04 */ addi r3, r31, 4
/* 80041598 3C 80 80 04 */ lis r4, __ct__12dEvt_order_cFv@ha /* 0x800415D4@ha */
/* 8004159C 38 84 15 D4 */ addi r4, r4, __ct__12dEvt_order_cFv@l /* 0x800415D4@l */
/* 800415A0 3C A0 80 03 */ lis r5, __dt__12dEvt_order_cFv@ha /* 0x80030154@ha */
/* 800415A4 38 A5 01 54 */ addi r5, r5, __dt__12dEvt_order_cFv@l /* 0x80030154@l */
/* 800415A8 38 C0 00 18 */ li r6, 0x18
/* 800415AC 38 E0 00 08 */ li r7, 8
/* 800415B0 48 32 07 B1 */ bl __construct_array
/* 800415B4 7F E3 FB 78 */ mr r3, r31
/* 800415B8 48 00 1C 31 */ bl remove__14dEvt_control_cFv
/* 800415BC 7F E3 FB 78 */ mr r3, r31
/* 800415C0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800415C4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800415C8 7C 08 03 A6 */ mtlr r0
/* 800415CC 38 21 00 10 */ addi r1, r1, 0x10
/* 800415D0 4E 80 00 20 */ blr

4
asm/d/event/d_event/beforeProc__11dEvt_info_cFv.s
View File

@ -1,4 +0,0 @@
lbl_800434CC:
/* 800434CC 38 00 00 02 */ li r0, 2
/* 800434D0 B0 03 00 06 */ sth r0, 6(r3)
/* 800434D4 4E 80 00 20 */ blr

15
asm/d/event/d_event/clearSkipSystem__14dEvt_control_cFv.s
View File

@ -1,15 +0,0 @@
lbl_800425B4:
/* 800425B4 38 80 00 00 */ li r4, 0
/* 800425B8 90 83 01 00 */ stw r4, 0x100(r3)
/* 800425BC 38 00 FF FF */ li r0, -1
/* 800425C0 90 03 01 04 */ stw r0, 0x104(r3)
/* 800425C4 90 83 01 0C */ stw r4, 0x10c(r3)
/* 800425C8 90 83 01 08 */ stw r4, 0x108(r3)
/* 800425CC A0 03 00 DA */ lhz r0, 0xda(r3)
/* 800425D0 54 00 07 BF */ clrlwi. r0, r0, 0x1e
/* 800425D4 40 82 00 08 */ bne lbl_800425DC
/* 800425D8 90 83 01 10 */ stw r4, 0x110(r3)
lbl_800425DC:
/* 800425DC 38 00 00 00 */ li r0, 0
/* 800425E0 98 03 01 14 */ stb r0, 0x114(r3)
/* 800425E4 4E 80 00 20 */ blr

12
asm/d/event/d_event/getPId__14dEvt_control_cFPv.s
View File

@ -1,12 +0,0 @@
lbl_800432C8:
/* 800432C8 28 04 00 00 */ cmplwi r4, 0
/* 800432CC 40 82 00 0C */ bne lbl_800432D8
/* 800432D0 38 60 FF FF */ li r3, -1
/* 800432D4 4E 80 00 20 */ blr
lbl_800432D8:
/* 800432D8 41 82 00 0C */ beq lbl_800432E4
/* 800432DC 80 64 00 04 */ lwz r3, 4(r4)
/* 800432E0 4E 80 00 20 */ blr
lbl_800432E4:
/* 800432E4 38 60 FF FF */ li r3, -1
/* 800432E8 4E 80 00 20 */ blr

3
asm/d/event/d_event/getSkipEventName__14dEvt_control_cFv.s
View File

@ -1,3 +0,0 @@
lbl_8004290C:
/* 8004290C 38 63 01 14 */ addi r3, r3, 0x114
/* 80042910 4E 80 00 20 */ blr

3
asm/d/event/d_event/getStageEventDt__14dEvt_control_cFv.s
View File

@ -1,3 +0,0 @@
lbl_80043278:
/* 80043278 80 63 00 F4 */ lwz r3, 0xf4(r3)
/* 8004327C 4E 80 00 20 */ blr

10
asm/d/event/d_event/offSkipFade__14dEvt_control_cFv.s
View File

@ -1,10 +0,0 @@
lbl_800429B4:
/* 800429B4 80 03 01 10 */ lwz r0, 0x110(r3)
/* 800429B8 2C 00 00 00 */ cmpwi r0, 0
/* 800429BC 41 82 00 0C */ beq lbl_800429C8
/* 800429C0 38 00 00 00 */ li r0, 0
/* 800429C4 90 03 01 10 */ stw r0, 0x110(r3)
lbl_800429C8:
/* 800429C8 38 00 00 00 */ li r0, 0
/* 800429CC 90 03 01 10 */ stw r0, 0x110(r3)
/* 800429D0 4E 80 00 20 */ blr

4
asm/d/event/d_event/onSkipFade__14dEvt_control_cFv.s
View File

@ -1,4 +0,0 @@
lbl_800429A8:
/* 800429A8 38 00 00 01 */ li r0, 1
/* 800429AC 90 03 01 10 */ stw r0, 0x110(r3)
/* 800429B0 4E 80 00 20 */ blr

32
asm/d/event/d_event/potentialCheck__14dEvt_control_cFP12dEvt_order_c.s
View File

@ -1,32 +0,0 @@
lbl_80041FA0:
/* 80041FA0 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80041FA4 7C 08 02 A6 */ mflr r0
/* 80041FA8 90 01 00 24 */ stw r0, 0x24(r1)
/* 80041FAC 39 61 00 20 */ addi r11, r1, 0x20
/* 80041FB0 48 32 02 2D */ bl _savegpr_29
/* 80041FB4 7C 7D 1B 78 */ mr r29, r3
/* 80041FB8 7C 9E 23 78 */ mr r30, r4
/* 80041FBC 83 E4 00 08 */ lwz r31, 8(r4)
/* 80041FC0 4B FF F9 75 */ bl beforeFlagProc__14dEvt_control_cFP12dEvt_order_c
/* 80041FC4 2C 03 00 00 */ cmpwi r3, 0
/* 80041FC8 40 82 00 0C */ bne lbl_80041FD4
/* 80041FCC 38 60 00 00 */ li r3, 0
/* 80041FD0 48 00 00 2C */ b lbl_80041FFC
lbl_80041FD4:
/* 80041FD4 38 00 00 02 */ li r0, 2
/* 80041FD8 B0 1F 00 F8 */ sth r0, 0xf8(r31)
/* 80041FDC 98 1D 00 E4 */ stb r0, 0xe4(r29)
/* 80041FE0 7F A3 EB 78 */ mr r3, r29
/* 80041FE4 7F C4 F3 78 */ mr r4, r30
/* 80041FE8 4B FF F8 1D */ bl setParam__14dEvt_control_cFP12dEvt_order_c
/* 80041FEC 7F A3 EB 78 */ mr r3, r29
/* 80041FF0 7F C4 F3 78 */ mr r4, r30
/* 80041FF4 4B FF F9 71 */ bl afterFlagProc__14dEvt_control_cFP12dEvt_order_c
/* 80041FF8 38 60 00 01 */ li r3, 1
lbl_80041FFC:
/* 80041FFC 39 61 00 20 */ addi r11, r1, 0x20
/* 80042000 48 32 02 29 */ bl _restgpr_29
/* 80042004 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80042008 7C 08 03 A6 */ mtlr r0
/* 8004200C 38 21 00 20 */ addi r1, r1, 0x20
/* 80042010 4E 80 00 20 */ blr

37
asm/d/event/d_event/remove__14dEvt_control_cFv.s
View File

@ -1,37 +0,0 @@
lbl_800431E8:
/* 800431E8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800431EC 7C 08 02 A6 */ mflr r0
/* 800431F0 90 01 00 14 */ stw r0, 0x14(r1)
/* 800431F4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800431F8 7C 7F 1B 78 */ mr r31, r3
/* 800431FC 38 80 00 00 */ li r4, 0
/* 80043200 98 83 00 E4 */ stb r4, 0xe4(r3)
/* 80043204 98 83 00 E5 */ stb r4, 0xe5(r3)
/* 80043208 98 83 00 E2 */ stb r4, 0xe2(r3)
/* 8004320C 98 83 00 E9 */ stb r4, 0xe9(r3)
/* 80043210 98 83 00 E6 */ stb r4, 0xe6(r3)
/* 80043214 98 83 00 E7 */ stb r4, 0xe7(r3)
/* 80043218 C0 02 84 CC */ lfs f0, lit_5095(r2)
/* 8004321C D0 03 00 F0 */ stfs f0, 0xf0(r3)
/* 80043220 38 00 00 FF */ li r0, 0xff
/* 80043224 98 03 00 EA */ stb r0, 0xea(r3)
/* 80043228 98 03 00 EB */ stb r0, 0xeb(r3)
/* 8004322C 98 03 00 EC */ stb r0, 0xec(r3)
/* 80043230 90 83 00 F4 */ stw r4, 0xf4(r3)
/* 80043234 B0 03 00 E0 */ sth r0, 0xe0(r3)
/* 80043238 98 83 00 ED */ stb r4, 0xed(r3)
/* 8004323C 98 03 00 EE */ stb r0, 0xee(r3)
/* 80043240 B0 83 00 D8 */ sth r4, 0xd8(r3)
/* 80043244 B0 83 00 DA */ sth r4, 0xda(r3)
/* 80043248 90 83 00 F8 */ stw r4, 0xf8(r3)
/* 8004324C 4B FF F3 69 */ bl clearSkipSystem__14dEvt_control_cFv
/* 80043250 38 00 00 00 */ li r0, 0
/* 80043254 98 1F 01 28 */ stb r0, 0x128(r31)
/* 80043258 98 1F 01 29 */ stb r0, 0x129(r31)
/* 8004325C 38 00 FF FF */ li r0, -1
/* 80043260 90 1F 01 2C */ stw r0, 0x12c(r31)
/* 80043264 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80043268 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8004326C 7C 08 03 A6 */ mtlr r0
/* 80043270 38 21 00 10 */ addi r1, r1, 0x10
/* 80043274 4E 80 00 20 */ blr

10
asm/d/event/d_event/runningEventID__14dEvt_control_cFs.s
View File

@ -1,10 +0,0 @@
lbl_8004360C:
/* 8004360C 7C 85 07 34 */ extsh r5, r4
/* 80043610 A8 03 00 E0 */ lha r0, 0xe0(r3)
/* 80043614 7C 05 00 00 */ cmpw r5, r0
/* 80043618 40 82 00 0C */ bne lbl_80043624
/* 8004361C A8 63 00 DE */ lha r3, 0xde(r3)
/* 80043620 4E 80 00 20 */ blr
lbl_80043624:
/* 80043624 7C 83 23 78 */ mr r3, r4
/* 80043628 4E 80 00 20 */ blr

19
asm/d/event/d_event/sceneChange__14dEvt_control_cFi.s
View File

@ -1,19 +0,0 @@
lbl_80043280:
/* 80043280 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80043284 7C 08 02 A6 */ mflr r0
/* 80043288 90 01 00 14 */ stw r0, 0x14(r1)
/* 8004328C 7C 66 1B 78 */ mr r6, r3
/* 80043290 7C 83 23 78 */ mr r3, r4
/* 80043294 80 06 01 2C */ lwz r0, 0x12c(r6)
/* 80043298 7C 04 07 74 */ extsb r4, r0
/* 8004329C 38 A0 FF FF */ li r5, -1
/* 800432A0 88 C6 01 29 */ lbz r6, 0x129(r6)
/* 800432A4 C0 22 84 CC */ lfs f1, lit_5095(r2)
/* 800432A8 38 E0 00 00 */ li r7, 0
/* 800432AC 39 00 00 00 */ li r8, 0
/* 800432B0 39 20 FF FF */ li r9, -1
/* 800432B4 4B FE 40 3D */ bl dStage_changeScene4Event__FiScibfUlsi
/* 800432B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800432BC 7C 08 03 A6 */ mtlr r0
/* 800432C0 38 21 00 10 */ addi r1, r1, 0x10
/* 800432C4 4E 80 00 20 */ blr

13
asm/d/event/d_event/setPt1__14dEvt_control_cFPv.s
View File

@ -1,13 +0,0 @@
lbl_8004362C:
/* 8004362C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80043630 7C 08 02 A6 */ mflr r0
/* 80043634 90 01 00 14 */ stw r0, 0x14(r1)
/* 80043638 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8004363C 7C 7F 1B 78 */ mr r31, r3
/* 80043640 4B FF FC 89 */ bl getPId__14dEvt_control_cFPv
/* 80043644 90 7F 00 C4 */ stw r3, 0xc4(r31)
/* 80043648 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8004364C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80043650 7C 08 03 A6 */ mtlr r0
/* 80043654 38 21 00 10 */ addi r1, r1, 0x10
/* 80043658 4E 80 00 20 */ blr

13
asm/d/event/d_event/setPt2__14dEvt_control_cFPv.s
View File

@ -1,13 +0,0 @@
lbl_8004365C:
/* 8004365C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80043660 7C 08 02 A6 */ mflr r0
/* 80043664 90 01 00 14 */ stw r0, 0x14(r1)
/* 80043668 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8004366C 7C 7F 1B 78 */ mr r31, r3
/* 80043670 4B FF FC 59 */ bl getPId__14dEvt_control_cFPv
/* 80043674 90 7F 00 C8 */ stw r3, 0xc8(r31)
/* 80043678 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8004367C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80043680 7C 08 03 A6 */ mtlr r0
/* 80043684 38 21 00 10 */ addi r1, r1, 0x10
/* 80043688 4E 80 00 20 */ blr

13
asm/d/event/d_event/setPtD__14dEvt_control_cFPv.s
View File

@ -1,13 +0,0 @@
lbl_800436F4:
/* 800436F4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800436F8 7C 08 02 A6 */ mflr r0
/* 800436FC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80043700 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80043704 7C 7F 1B 78 */ mr r31, r3
/* 80043708 4B FF FB C1 */ bl getPId__14dEvt_control_cFPv
/* 8004370C 90 7F 00 D4 */ stw r3, 0xd4(r31)
/* 80043710 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80043714 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80043718 7C 08 03 A6 */ mtlr r0
/* 8004371C 38 21 00 10 */ addi r1, r1, 0x10
/* 80043720 4E 80 00 20 */ blr

13
asm/d/event/d_event/setPtI__14dEvt_control_cFPv.s
View File

@ -1,13 +0,0 @@
lbl_800436BC:
/* 800436BC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800436C0 7C 08 02 A6 */ mflr r0
/* 800436C4 90 01 00 14 */ stw r0, 0x14(r1)
/* 800436C8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800436CC 7C 7F 1B 78 */ mr r31, r3
/* 800436D0 4B FF FB F9 */ bl getPId__14dEvt_control_cFPv
/* 800436D4 90 7F 00 D0 */ stw r3, 0xd0(r31)
/* 800436D8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800436DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800436E0 7C 08 03 A6 */ mtlr r0
/* 800436E4 38 21 00 10 */ addi r1, r1, 0x10
/* 800436E8 4E 80 00 20 */ blr

13
asm/d/event/d_event/setPtT__14dEvt_control_cFPv.s
View File

@ -1,13 +0,0 @@
lbl_8004368C:
/* 8004368C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80043690 7C 08 02 A6 */ mflr r0
/* 80043694 90 01 00 14 */ stw r0, 0x14(r1)
/* 80043698 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8004369C 7C 7F 1B 78 */ mr r31, r3
/* 800436A0 4B FF FC 29 */ bl getPId__14dEvt_control_cFPv
/* 800436A4 90 7F 00 CC */ stw r3, 0xcc(r31)
/* 800436A8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800436AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800436B0 7C 08 03 A6 */ mtlr r0
/* 800436B4 38 21 00 10 */ addi r1, r1, 0x10
/* 800436B8 4E 80 00 20 */ blr

18
asm/d/event/d_event/setSkipProc__14dEvt_control_cFPvPFPvi_ii.s
View File

@ -1,18 +0,0 @@
lbl_80042914:
/* 80042914 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80042918 7C 08 02 A6 */ mflr r0
/* 8004291C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80042920 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80042924 93 C1 00 08 */ stw r30, 8(r1)
/* 80042928 7C 7E 1B 78 */ mr r30, r3
/* 8004292C 7C DF 33 78 */ mr r31, r6
/* 80042930 90 A3 01 00 */ stw r5, 0x100(r3)
/* 80042934 48 00 09 95 */ bl getPId__14dEvt_control_cFPv
/* 80042938 90 7E 01 04 */ stw r3, 0x104(r30)
/* 8004293C 93 FE 01 0C */ stw r31, 0x10c(r30)
/* 80042940 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80042944 83 C1 00 08 */ lwz r30, 8(r1)
/* 80042948 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8004294C 7C 08 03 A6 */ mtlr r0
/* 80042950 38 21 00 10 */ addi r1, r1, 0x10
/* 80042954 4E 80 00 20 */ blr

21
asm/d/event/d_event/setSkipZev__14dEvt_control_cFPvPc.s
View File

@ -1,21 +0,0 @@
lbl_80042958:
/* 80042958 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8004295C 7C 08 02 A6 */ mflr r0
/* 80042960 90 01 00 14 */ stw r0, 0x14(r1)
/* 80042964 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80042968 93 C1 00 08 */ stw r30, 8(r1)
/* 8004296C 7C 7E 1B 78 */ mr r30, r3
/* 80042970 7C BF 2B 78 */ mr r31, r5
/* 80042974 3C A0 80 04 */ lis r5, dEv_defaultSkipZev__FPvi@ha /* 0x8004261C@ha */
/* 80042978 38 A5 26 1C */ addi r5, r5, dEv_defaultSkipZev__FPvi@l /* 0x8004261C@l */
/* 8004297C 38 C0 00 01 */ li r6, 1
/* 80042980 4B FF FF 95 */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii
/* 80042984 38 7E 01 14 */ addi r3, r30, 0x114
/* 80042988 7F E4 FB 78 */ mr r4, r31
/* 8004298C 48 32 61 A1 */ bl strcpy
/* 80042990 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80042994 83 C1 00 08 */ lwz r30, 8(r1)
/* 80042998 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8004299C 7C 08 03 A6 */ mtlr r0
/* 800429A0 38 21 00 10 */ addi r1, r1, 0x10
/* 800429A4 4E 80 00 20 */ blr

12
asm/d/event/d_event_data/flagMaxCheck__11dEvDtFlag_cFi.s
View File

@ -1,12 +0,0 @@
lbl_80043E30:
/* 80043E30 2C 04 FF FF */ cmpwi r4, -1
/* 80043E34 40 82 00 0C */ bne lbl_80043E40
/* 80043E38 38 60 00 01 */ li r3, 1
/* 80043E3C 4E 80 00 20 */ blr
lbl_80043E40:
/* 80043E40 38 00 28 00 */ li r0, 0x2800
/* 80043E44 7C 85 FE 70 */ srawi r5, r4, 0x1f
/* 80043E48 54 03 0F FE */ srwi r3, r0, 0x1f
/* 80043E4C 7C 00 20 10 */ subfc r0, r0, r4
/* 80043E50 7C 65 19 14 */ adde r3, r5, r3
/* 80043E54 4E 80 00 20 */ blr

10
asm/d/event/d_event_data/init__11dEvDtFlag_cFv.s
View File

@ -1,10 +0,0 @@
lbl_80043E58:
/* 80043E58 38 80 00 00 */ li r4, 0
/* 80043E5C 7C 85 23 78 */ mr r5, r4
/* 80043E60 38 00 01 40 */ li r0, 0x140
/* 80043E64 7C 09 03 A6 */ mtctr r0
lbl_80043E68:
/* 80043E68 7C A3 21 2E */ stwx r5, r3, r4
/* 80043E6C 38 84 00 04 */ addi r4, r4, 4
/* 80043E70 42 00 FF F8 */ bdnz lbl_80043E68
/* 80043E74 4E 80 00 20 */ blr

13
asm/d/event/d_event_manager/__ct__11dEvDtBase_cFv.s
View File

@ -1,13 +0,0 @@
lbl_800466E0:
/* 800466E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800466E4 7C 08 02 A6 */ mflr r0
/* 800466E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 800466EC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800466F0 7C 7F 1B 78 */ mr r31, r3
/* 800466F4 4B FF FA 45 */ bl init__11dEvDtBase_cFv
/* 800466F8 7F E3 FB 78 */ mr r3, r31
/* 800466FC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80046700 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80046704 7C 08 03 A6 */ mtlr r0
/* 80046708 38 21 00 10 */ addi r1, r1, 0x10
/* 8004670C 4E 80 00 20 */ blr

23
asm/d/event/d_event_manager/__ct__16dEvent_manager_cFv.s
View File

@ -1,23 +0,0 @@
lbl_80046688:
/* 80046688 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8004668C 7C 08 02 A6 */ mflr r0
/* 80046690 90 01 00 14 */ stw r0, 0x14(r1)
/* 80046694 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80046698 7C 7F 1B 78 */ mr r31, r3
/* 8004669C 3C 80 80 04 */ lis r4, __ct__11dEvDtBase_cFv@ha /* 0x800466E0@ha */
/* 800466A0 38 84 66 E0 */ addi r4, r4, __ct__11dEvDtBase_cFv@l /* 0x800466E0@l */
/* 800466A4 3C A0 80 03 */ lis r5, __dt__11dEvDtBase_cFv@ha /* 0x80030190@ha */
/* 800466A8 38 A5 01 90 */ addi r5, r5, __dt__11dEvDtBase_cFv@l /* 0x80030190@l */
/* 800466AC 38 C0 00 24 */ li r6, 0x24
/* 800466B0 38 E0 00 0B */ li r7, 0xb
/* 800466B4 48 31 B6 AD */ bl __construct_array
/* 800466B8 38 00 FF FF */ li r0, -1
/* 800466BC 90 1F 01 90 */ stw r0, 0x190(r31)
/* 800466C0 38 00 00 00 */ li r0, 0
/* 800466C4 98 1F 06 BC */ stb r0, 0x6bc(r31)
/* 800466C8 7F E3 FB 78 */ mr r3, r31
/* 800466CC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800466D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800466D4 7C 08 03 A6 */ mtlr r0
/* 800466D8 38 21 00 10 */ addi r1, r1, 0x10
/* 800466DC 4E 80 00 20 */ blr

6
asm/d/event/d_event_manager/init__18dEvent_exception_cFv.s
View File

@ -1,6 +0,0 @@
lbl_800463DC:
/* 800463DC 38 00 FF FF */ li r0, -1
/* 800463E0 90 03 00 00 */ stw r0, 0(r3)
/* 800463E4 38 00 00 00 */ li r0, 0
/* 800463E8 90 03 00 08 */ stw r0, 8(r3)
/* 800463EC 4E 80 00 20 */ blr

28
asm/d/event/d_event_manager/remove__16dEvent_manager_cFv.s
View File

@ -1,28 +0,0 @@
lbl_80046C0C:
/* 80046C0C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80046C10 7C 08 02 A6 */ mflr r0
/* 80046C14 90 01 00 24 */ stw r0, 0x24(r1)
/* 80046C18 39 61 00 20 */ addi r11, r1, 0x20
/* 80046C1C 48 31 B5 C1 */ bl _savegpr_29
/* 80046C20 7C 7D 1B 78 */ mr r29, r3
/* 80046C24 3B C0 00 00 */ li r30, 0
/* 80046C28 3B E0 00 00 */ li r31, 0
lbl_80046C2C:
/* 80046C2C 7C 7D FA 14 */ add r3, r29, r31
/* 80046C30 4B FF F5 09 */ bl init__11dEvDtBase_cFv
/* 80046C34 3B DE 00 01 */ addi r30, r30, 1
/* 80046C38 2C 1E 00 0B */ cmpwi r30, 0xb
/* 80046C3C 3B FF 00 24 */ addi r31, r31, 0x24
/* 80046C40 41 80 FF EC */ blt lbl_80046C2C
/* 80046C44 38 00 00 00 */ li r0, 0
/* 80046C48 90 1D 01 8C */ stw r0, 0x18c(r29)
/* 80046C4C 38 7D 01 90 */ addi r3, r29, 0x190
/* 80046C50 4B FF F7 8D */ bl init__18dEvent_exception_cFv
/* 80046C54 38 7D 01 BC */ addi r3, r29, 0x1bc
/* 80046C58 4B FF D2 01 */ bl init__11dEvDtFlag_cFv
/* 80046C5C 39 61 00 20 */ addi r11, r1, 0x20
/* 80046C60 48 31 B5 C9 */ bl _restgpr_29
/* 80046C64 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80046C68 7C 08 03 A6 */ mtlr r0
/* 80046C6C 38 21 00 20 */ addi r1, r1, 0x20
/* 80046C70 4E 80 00 20 */ blr

30
asm/d/event/d_event_manager/roomFinish__16dEvent_manager_cFi.s
View File

@ -1,30 +0,0 @@
lbl_800469EC:
/* 800469EC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800469F0 7C 08 02 A6 */ mflr r0
/* 800469F4 90 01 00 24 */ stw r0, 0x24(r1)
/* 800469F8 39 61 00 20 */ addi r11, r1, 0x20
/* 800469FC 48 31 B7 DD */ bl _savegpr_28
/* 80046A00 7C 7C 1B 78 */ mr r28, r3
/* 80046A04 7C 9D 23 78 */ mr r29, r4
/* 80046A08 3B C0 00 04 */ li r30, 4
/* 80046A0C 3B E0 00 90 */ li r31, 0x90
lbl_80046A10:
/* 80046A10 7C 7C FA 14 */ add r3, r28, r31
/* 80046A14 80 03 00 00 */ lwz r0, 0(r3)
/* 80046A18 28 00 00 00 */ cmplwi r0, 0
/* 80046A1C 41 82 00 14 */ beq lbl_80046A30
/* 80046A20 80 03 00 20 */ lwz r0, 0x20(r3)
/* 80046A24 7C 1D 00 00 */ cmpw r29, r0
/* 80046A28 40 82 00 08 */ bne lbl_80046A30
/* 80046A2C 4B FF F7 0D */ bl init__11dEvDtBase_cFv
lbl_80046A30:
/* 80046A30 3B DE 00 01 */ addi r30, r30, 1
/* 80046A34 2C 1E 00 09 */ cmpwi r30, 9
/* 80046A38 3B FF 00 24 */ addi r31, r31, 0x24
/* 80046A3C 40 81 FF D4 */ ble lbl_80046A10
/* 80046A40 39 61 00 20 */ addi r11, r1, 0x20
/* 80046A44 48 31 B7 E1 */ bl _restgpr_28
/* 80046A48 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80046A4C 7C 08 03 A6 */ mtlr r0
/* 80046A50 38 21 00 20 */ addi r1, r1, 0x20
/* 80046A54 4E 80 00 20 */ blr

6
asm/d/menu/d_menu_window/dMw_A_TRIGGER__Fv.s
View File

@ -1,6 +0,0 @@
lbl_801FA03C:
/* 801FA03C 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801FA040 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801FA044 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801FA048 54 03 C7 FE */ rlwinm r3, r0, 0x18, 0x1f, 0x1f
/* 801FA04C 4E 80 00 20 */ blr

6
asm/d/menu/d_menu_window/dMw_B_TRIGGER__Fv.s
View File

@ -1,6 +0,0 @@
lbl_801FA050:
/* 801FA050 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801FA054 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801FA058 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801FA05C 54 03 BF FE */ rlwinm r3, r0, 0x17, 0x1f, 0x1f
/* 801FA060 4E 80 00 20 */ blr

6
asm/d/menu/d_menu_window/dMw_DOWN_TRIGGER__Fv.s
View File

@ -1,6 +0,0 @@
lbl_801F9F98:
/* 801F9F98 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801F9F9C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801F9FA0 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801F9FA4 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f
/* 801F9FA8 4E 80 00 20 */ blr

21
asm/d/menu/d_menu_window/dMw_LEFT_TRIGGER__Fv.s
View File

@ -1,21 +0,0 @@
lbl_801F9FAC:
/* 801F9FAC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801F9FB0 7C 08 02 A6 */ mflr r0
/* 801F9FB4 90 01 00 14 */ stw r0, 0x14(r1)
/* 801F9FB8 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801F9FBC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801F9FC0 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801F9FC4 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 801F9FC8 41 82 00 18 */ beq lbl_801F9FE0
/* 801F9FCC 4B FF FF B9 */ bl dMw_UP_TRIGGER__Fv
/* 801F9FD0 2C 03 00 00 */ cmpwi r3, 0
/* 801F9FD4 40 82 00 0C */ bne lbl_801F9FE0
/* 801F9FD8 38 60 00 01 */ li r3, 1
/* 801F9FDC 48 00 00 08 */ b lbl_801F9FE4
lbl_801F9FE0:
/* 801F9FE0 38 60 00 00 */ li r3, 0
lbl_801F9FE4:
/* 801F9FE4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801F9FE8 7C 08 03 A6 */ mtlr r0
/* 801F9FEC 38 21 00 10 */ addi r1, r1, 0x10
/* 801F9FF0 4E 80 00 20 */ blr

21
asm/d/menu/d_menu_window/dMw_RIGHT_TRIGGER__Fv.s
View File

@ -1,21 +0,0 @@
lbl_801F9FF4:
/* 801F9FF4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801F9FF8 7C 08 02 A6 */ mflr r0
/* 801F9FFC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801FA000 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801FA004 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801FA008 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801FA00C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
/* 801FA010 41 82 00 18 */ beq lbl_801FA028
/* 801FA014 4B FF FF 71 */ bl dMw_UP_TRIGGER__Fv
/* 801FA018 2C 03 00 00 */ cmpwi r3, 0
/* 801FA01C 40 82 00 0C */ bne lbl_801FA028
/* 801FA020 38 60 00 01 */ li r3, 1
/* 801FA024 48 00 00 08 */ b lbl_801FA02C
lbl_801FA028:
/* 801FA028 38 60 00 00 */ li r3, 0
lbl_801FA02C:
/* 801FA02C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801FA030 7C 08 03 A6 */ mtlr r0
/* 801FA034 38 21 00 10 */ addi r1, r1, 0x10
/* 801FA038 4E 80 00 20 */ blr

6
asm/d/menu/d_menu_window/dMw_START_TRIGGER__Fv.s
View File

@ -1,6 +0,0 @@
lbl_801FA078:
/* 801FA078 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801FA07C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801FA080 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801FA084 54 03 A7 FE */ rlwinm r3, r0, 0x14, 0x1f, 0x1f
/* 801FA088 4E 80 00 20 */ blr

6
asm/d/menu/d_menu_window/dMw_UP_TRIGGER__Fv.s
View File

@ -1,6 +0,0 @@
lbl_801F9F84:
/* 801F9F84 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801F9F88 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801F9F8C 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801F9F90 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f
/* 801F9F94 4E 80 00 20 */ blr

6
asm/d/menu/d_menu_window/dMw_Z_TRIGGER__Fv.s
View File

@ -1,6 +0,0 @@
lbl_801FA064:
/* 801FA064 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801FA068 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801FA06C 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801FA070 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f
/* 801FA074 4E 80 00 20 */ blr

12
asm/d/menu/d_menu_window/dMw_isMenuRing__Fv.s
View File

@ -1,12 +0,0 @@
lbl_801FA114:
/* 801FA114 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801FA118 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801FA11C 80 63 00 24 */ lwz r3, 0x24(r3)
/* 801FA120 28 03 00 00 */ cmplwi r3, 0
/* 801FA124 41 82 00 10 */ beq lbl_801FA134
/* 801FA128 88 03 01 47 */ lbz r0, 0x147(r3)
/* 801FA12C 54 03 07 FE */ clrlwi r3, r0, 0x1f
/* 801FA130 4E 80 00 20 */ blr
lbl_801FA134:
/* 801FA134 38 60 00 00 */ li r3, 0
/* 801FA138 4E 80 00 20 */ blr

10
asm/d/menu/d_menu_window/dMw_offMenuRing__Fv.s
View File

@ -1,10 +0,0 @@
lbl_801FA0F0:
/* 801FA0F0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801FA0F4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801FA0F8 80 63 00 24 */ lwz r3, 0x24(r3)
/* 801FA0FC 28 03 00 00 */ cmplwi r3, 0
/* 801FA100 4D 82 00 20 */ beqlr
/* 801FA104 88 03 01 47 */ lbz r0, 0x147(r3)
/* 801FA108 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e
/* 801FA10C 98 03 01 47 */ stb r0, 0x147(r3)
/* 801FA110 4E 80 00 20 */ blr

9
asm/d/menu/d_menu_window/dMw_offPauseWindow__Fv.s
View File

@ -1,9 +0,0 @@
lbl_801FA0AC:
/* 801FA0AC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801FA0B0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801FA0B4 80 63 00 24 */ lwz r3, 0x24(r3)
/* 801FA0B8 28 03 00 00 */ cmplwi r3, 0
/* 801FA0BC 4D 82 00 20 */ beqlr
/* 801FA0C0 38 00 00 00 */ li r0, 0
/* 801FA0C4 98 03 01 54 */ stb r0, 0x154(r3)
/* 801FA0C8 4E 80 00 20 */ blr

10
asm/d/menu/d_menu_window/dMw_onMenuRing__Fv.s
View File

@ -1,10 +0,0 @@
lbl_801FA0CC:
/* 801FA0CC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801FA0D0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801FA0D4 80 63 00 24 */ lwz r3, 0x24(r3)
/* 801FA0D8 28 03 00 00 */ cmplwi r3, 0
/* 801FA0DC 4D 82 00 20 */ beqlr
/* 801FA0E0 88 03 01 47 */ lbz r0, 0x147(r3)
/* 801FA0E4 60 00 00 01 */ ori r0, r0, 1
/* 801FA0E8 98 03 01 47 */ stb r0, 0x147(r3)
/* 801FA0EC 4E 80 00 20 */ blr

9
asm/d/menu/d_menu_window/dMw_onPauseWindow__Fv.s
View File

@ -1,9 +0,0 @@
lbl_801FA08C:
/* 801FA08C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801FA090 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801FA094 80 63 00 24 */ lwz r3, 0x24(r3)
/* 801FA098 28 03 00 00 */ cmplwi r3, 0
/* 801FA09C 4D 82 00 20 */ beqlr
/* 801FA0A0 38 00 00 01 */ li r0, 1
/* 801FA0A4 98 03 01 54 */ stb r0, 0x154(r3)
/* 801FA0A8 4E 80 00 20 */ blr

8
asm/d/menu/d_menu_window/ring_open_init__5dMw_cFUc.s
View File

@ -1,8 +0,0 @@
lbl_801FA220:
/* 801FA220 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801FA224 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801FA228 88 03 00 B9 */ lbz r0, 0xb9(r3)
/* 801FA22C 98 03 00 BA */ stb r0, 0xba(r3)
/* 801FA230 38 00 00 02 */ li r0, 2
/* 801FA234 98 03 00 B9 */ stb r0, 0xb9(r3)
/* 801FA238 4E 80 00 20 */ blr

15
asm/m_Do/m_Do_Reset/destroyVideo__Fv.s
View File

@ -1,15 +0,0 @@
lbl_800155DC:
/* 800155DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800155E0 7C 08 02 A6 */ mflr r0
/* 800155E4 90 01 00 14 */ stw r0, 0x14(r1)
/* 800155E8 48 2C F6 C5 */ bl destroyManager__8JUTVideoFv
/* 800155EC 38 60 00 00 */ li r3, 0
/* 800155F0 48 34 6F BD */ bl GXSetDrawDoneCallback
/* 800155F4 38 60 00 01 */ li r3, 1
/* 800155F8 48 33 82 49 */ bl VISetBlack
/* 800155FC 48 33 80 99 */ bl VIFlush
/* 80015600 48 33 73 C5 */ bl VIWaitForRetrace
/* 80015604 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80015608 7C 08 03 A6 */ mtlr r0
/* 8001560C 38 21 00 10 */ addi r1, r1, 0x10
/* 80015610 4E 80 00 20 */ blr

11
asm/m_Do/m_Do_controller_pad/recalibrate__8mDoCPd_cFv.s
View File

@ -1,11 +0,0 @@
lbl_80007D74:
/* 80007D74 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80007D78 7C 08 02 A6 */ mflr r0
/* 80007D7C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80007D80 48 2D 92 A5 */ bl clearForReset__10JUTGamePadFv
/* 80007D84 3C 60 F0 00 */ lis r3, 0xf000
/* 80007D88 48 2D 9C 51 */ bl setEnabled__Q210JUTGamePad7CRumbleFUl
/* 80007D8C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80007D90 7C 08 03 A6 */ mtlr r0
/* 80007D94 38 21 00 10 */ addi r1, r1, 0x10
/* 80007D98 4E 80 00 20 */ blr

28
asm/m_Do/m_Do_main/CheckHeap1__9HeapCheckFv.s
View File

@ -1,28 +0,0 @@
lbl_80005728:
/* 80005728 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8000572C 7C 08 02 A6 */ mflr r0
/* 80005730 90 01 00 14 */ stw r0, 0x14(r1)
/* 80005734 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80005738 93 C1 00 08 */ stw r30, 8(r1)
/* 8000573C 7C 7E 1B 78 */ mr r30, r3
/* 80005740 80 63 00 08 */ lwz r3, 8(r3)
/* 80005744 48 2C A6 21 */ bl getTotalUsedSize__10JKRExpHeapCFv
/* 80005748 7C 7F 1B 78 */ mr r31, r3
/* 8000574C 80 7E 00 08 */ lwz r3, 8(r30)
/* 80005750 48 2C 8F DD */ bl getFreeSize__7JKRHeapFv
/* 80005754 80 1E 00 0C */ lwz r0, 0xc(r30)
/* 80005758 7C 00 F8 00 */ cmpw r0, r31
/* 8000575C 40 80 00 08 */ bge lbl_80005764
/* 80005760 93 FE 00 0C */ stw r31, 0xc(r30)
lbl_80005764:
/* 80005764 80 1E 00 10 */ lwz r0, 0x10(r30)
/* 80005768 7C 00 18 00 */ cmpw r0, r3
/* 8000576C 40 81 00 08 */ ble lbl_80005774
/* 80005770 90 7E 00 10 */ stw r3, 0x10(r30)
lbl_80005774:
/* 80005774 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80005778 83 C1 00 08 */ lwz r30, 8(r1)
/* 8000577C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80005780 7C 08 03 A6 */ mtlr r0
/* 80005784 38 21 00 10 */ addi r1, r1, 0x10
/* 80005788 4E 80 00 20 */ blr

25
asm/m_Do/m_Do_main/countUsed__FP10JKRExpHeap.s
View File

@ -1,25 +0,0 @@
lbl_80005848:
/* 80005848 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8000584C 7C 08 02 A6 */ mflr r0
/* 80005850 90 01 00 14 */ stw r0, 0x14(r1)
/* 80005854 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80005858 93 C1 00 08 */ stw r30, 8(r1)
/* 8000585C 7C 7E 1B 78 */ mr r30, r3
/* 80005860 48 33 B4 65 */ bl OSDisableScheduler
/* 80005864 3B E0 00 00 */ li r31, 0
/* 80005868 80 7E 00 80 */ lwz r3, 0x80(r30)
/* 8000586C 48 00 00 0C */ b lbl_80005878
lbl_80005870:
/* 80005870 80 63 00 0C */ lwz r3, 0xc(r3)
/* 80005874 3B FF 00 01 */ addi r31, r31, 1
lbl_80005878:
/* 80005878 28 03 00 00 */ cmplwi r3, 0
/* 8000587C 40 82 FF F4 */ bne lbl_80005870
/* 80005880 48 33 B4 85 */ bl OSEnableScheduler
/* 80005884 7F E3 FB 78 */ mr r3, r31
/* 80005888 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8000588C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80005890 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80005894 7C 08 03 A6 */ mtlr r0
/* 80005898 38 21 00 10 */ addi r1, r1, 0x10
/* 8000589C 4E 80 00 20 */ blr

56
asm/m_Do/m_Do_main/debug__Fv.s
View File

@ -1,56 +0,0 @@
lbl_800061C8:
/* 800061C8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800061CC 7C 08 02 A6 */ mflr r0
/* 800061D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 800061D4 88 0D 80 00 */ lbz r0, data_80450580(r13)
/* 800061D8 7C 00 07 75 */ extsb. r0, r0
/* 800061DC 41 82 00 A0 */ beq lbl_8000627C
/* 800061E0 88 0D 85 9A */ lbz r0, struct_80450B18+0x2(r13)
/* 800061E4 28 00 00 00 */ cmplwi r0, 0
/* 800061E8 41 82 00 0C */ beq lbl_800061F4
/* 800061EC 38 60 00 02 */ li r3, 2
/* 800061F0 4B FF F5 9D */ bl CheckHeap__FUl
lbl_800061F4:
/* 800061F4 3C 60 80 3E */ lis r3, m_gamePad__8mDoCPd_c@ha /* 0x803DD2D8@ha */
/* 800061F8 38 63 D2 D8 */ addi r3, r3, m_gamePad__8mDoCPd_c@l /* 0x803DD2D8@l */
/* 800061FC 80 63 00 08 */ lwz r3, 8(r3)
/* 80006200 80 03 00 18 */ lwz r0, 0x18(r3)
/* 80006204 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a
/* 80006208 28 00 00 20 */ cmplwi r0, 0x20
/* 8000620C 40 82 00 1C */ bne lbl_80006228
/* 80006210 80 03 00 1C */ lwz r0, 0x1c(r3)
/* 80006214 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
/* 80006218 41 82 00 10 */ beq lbl_80006228
/* 8000621C 88 0D 85 98 */ lbz r0, struct_80450B18+0x0(r13)
/* 80006220 68 00 00 01 */ xori r0, r0, 1
/* 80006224 98 0D 85 98 */ stb r0, struct_80450B18+0x0(r13)
lbl_80006228:
/* 80006228 88 0D 85 98 */ lbz r0, struct_80450B18+0x0(r13)
/* 8000622C 28 00 00 00 */ cmplwi r0, 0
/* 80006230 41 82 00 44 */ beq lbl_80006274
/* 80006234 80 03 00 18 */ lwz r0, 0x18(r3)
/* 80006238 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a
/* 8000623C 28 00 00 40 */ cmplwi r0, 0x40
/* 80006240 40 82 00 30 */ bne lbl_80006270
/* 80006244 80 03 00 1C */ lwz r0, 0x1c(r3)
/* 80006248 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
/* 8000624C 41 82 00 24 */ beq lbl_80006270
/* 80006250 88 6D 80 08 */ lbz r3, data_80450588(r13)
/* 80006254 28 03 00 05 */ cmplwi r3, 5
/* 80006258 40 80 00 10 */ bge lbl_80006268
/* 8000625C 38 03 00 01 */ addi r0, r3, 1
/* 80006260 98 0D 80 08 */ stb r0, data_80450588(r13)
/* 80006264 48 00 00 0C */ b lbl_80006270
lbl_80006268:
/* 80006268 38 00 00 01 */ li r0, 1
/* 8000626C 98 0D 80 08 */ stb r0, data_80450588(r13)
lbl_80006270:
/* 80006270 4B FF F8 69 */ bl debugDisplay__Fv
lbl_80006274:
/* 80006274 38 60 00 02 */ li r3, 2
/* 80006278 4B FF FA D5 */ bl Debug_console__FUl
lbl_8000627C:
/* 8000627C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80006280 7C 08 03 A6 */ mtlr r0
/* 80006284 38 21 00 10 */ addi r1, r1, 0x10
/* 80006288 4E 80 00 20 */ blr

10
asm/m_Do/m_Do_main/getUsedCount__9HeapCheckCFv.s
View File

@ -1,10 +0,0 @@
lbl_800058A0:
/* 800058A0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800058A4 7C 08 02 A6 */ mflr r0
/* 800058A8 90 01 00 14 */ stw r0, 0x14(r1)
/* 800058AC 80 63 00 08 */ lwz r3, 8(r3)
/* 800058B0 4B FF FF 99 */ bl countUsed__FP10JKRExpHeap
/* 800058B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800058B8 7C 08 03 A6 */ mtlr r0
/* 800058BC 38 21 00 10 */ addi r1, r1, 0x10
/* 800058C0 4E 80 00 20 */ blr

134
asm/m_Do/m_Do_main/heapDisplay__9HeapCheckCFv.s
View File

@ -1,134 +0,0 @@
lbl_800058C4:
/* 800058C4 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800058C8 7C 08 02 A6 */ mflr r0
/* 800058CC 90 01 00 24 */ stw r0, 0x24(r1)
/* 800058D0 39 61 00 20 */ addi r11, r1, 0x20
/* 800058D4 48 35 C8 FD */ bl _savegpr_26
/* 800058D8 7C 7D 1B 78 */ mr r29, r3
/* 800058DC 80 63 00 08 */ lwz r3, 8(r3)
/* 800058E0 80 83 00 38 */ lwz r4, 0x38(r3)
/* 800058E4 7C 9A 23 78 */ mr r26, r4
/* 800058E8 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 800058EC 7F E0 20 50 */ subf r31, r0, r4
/* 800058F0 48 2C A4 75 */ bl getTotalUsedSize__10JKRExpHeapCFv
/* 800058F4 7C 7E 1B 78 */ mr r30, r3
/* 800058F8 80 7D 00 08 */ lwz r3, 8(r29)
/* 800058FC 48 2C 8E 89 */ bl getTotalFreeSize__7JKRHeapFv
/* 80005900 7C 7B 1B 78 */ mr r27, r3
/* 80005904 80 7D 00 08 */ lwz r3, 8(r29)
/* 80005908 48 2C 8E 25 */ bl getFreeSize__7JKRHeapFv
/* 8000590C 7C 7C 1B 78 */ mr r28, r3
/* 80005910 38 60 00 64 */ li r3, 0x64
/* 80005914 38 80 00 D4 */ li r4, 0xd4
/* 80005918 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 8000591C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005920 38 A5 00 3C */ addi r5, r5, 0x3c
/* 80005924 80 DD 00 00 */ lwz r6, 0(r29)
/* 80005928 4C C6 31 82 */ crclr 6
/* 8000592C 48 2D AC 05 */ bl JUTReport__FiiPCce
/* 80005930 38 60 00 64 */ li r3, 0x64
/* 80005934 38 80 00 E3 */ li r4, 0xe3
/* 80005938 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 8000593C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005940 38 A5 00 45 */ addi r5, r5, 0x45
/* 80005944 7F 46 D3 78 */ mr r6, r26
/* 80005948 4C C6 31 82 */ crclr 6
/* 8000594C 48 2D AB E5 */ bl JUTReport__FiiPCce
/* 80005950 38 60 00 64 */ li r3, 0x64
/* 80005954 38 80 00 F0 */ li r4, 0xf0
/* 80005958 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 8000595C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005960 38 A5 00 5B */ addi r5, r5, 0x5b
/* 80005964 80 DD 00 1C */ lwz r6, 0x1c(r29)
/* 80005968 4C C6 31 82 */ crclr 6
/* 8000596C 48 2D AB C5 */ bl JUTReport__FiiPCce
/* 80005970 38 60 00 64 */ li r3, 0x64
/* 80005974 38 80 00 FD */ li r4, 0xfd
/* 80005978 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 8000597C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005980 38 A5 00 71 */ addi r5, r5, 0x71
/* 80005984 7C DF D8 50 */ subf r6, r31, r27
/* 80005988 4C C6 31 82 */ crclr 6
/* 8000598C 48 2D AB A5 */ bl JUTReport__FiiPCce
/* 80005990 38 60 00 64 */ li r3, 0x64
/* 80005994 38 80 01 0A */ li r4, 0x10a
/* 80005998 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 8000599C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 800059A0 38 A5 00 87 */ addi r5, r5, 0x87
/* 800059A4 7C DF E0 50 */ subf r6, r31, r28
/* 800059A8 4C C6 31 82 */ crclr 6
/* 800059AC 48 2D AB 85 */ bl JUTReport__FiiPCce
/* 800059B0 38 60 00 64 */ li r3, 0x64
/* 800059B4 38 80 01 17 */ li r4, 0x117
/* 800059B8 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 800059BC 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 800059C0 38 A5 00 9D */ addi r5, r5, 0x9d
/* 800059C4 7F C6 F3 78 */ mr r6, r30
/* 800059C8 4C C6 31 82 */ crclr 6
/* 800059CC 48 2D AB 65 */ bl JUTReport__FiiPCce
/* 800059D0 38 60 00 64 */ li r3, 0x64
/* 800059D4 38 80 01 24 */ li r4, 0x124
/* 800059D8 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 800059DC 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 800059E0 38 A5 00 B3 */ addi r5, r5, 0xb3
/* 800059E4 1C DE 00 64 */ mulli r6, r30, 0x64
/* 800059E8 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 800059EC 7C C6 03 D6 */ divw r6, r6, r0
/* 800059F0 4C C6 31 82 */ crclr 6
/* 800059F4 48 2D AB 3D */ bl JUTReport__FiiPCce
/* 800059F8 38 60 00 64 */ li r3, 0x64
/* 800059FC 38 80 01 31 */ li r4, 0x131
/* 80005A00 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 80005A04 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005A08 38 A5 00 CF */ addi r5, r5, 0xcf
/* 80005A0C 80 DD 00 0C */ lwz r6, 0xc(r29)
/* 80005A10 4C C6 31 82 */ crclr 6
/* 80005A14 48 2D AB 1D */ bl JUTReport__FiiPCce
/* 80005A18 38 60 00 64 */ li r3, 0x64
/* 80005A1C 38 80 01 3E */ li r4, 0x13e
/* 80005A20 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 80005A24 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005A28 38 A5 00 E5 */ addi r5, r5, 0xe5
/* 80005A2C 80 1D 00 0C */ lwz r0, 0xc(r29)
/* 80005A30 1C C0 00 64 */ mulli r6, r0, 0x64
/* 80005A34 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 80005A38 7C C6 03 D6 */ divw r6, r6, r0
/* 80005A3C 4C C6 31 82 */ crclr 6
/* 80005A40 48 2D AA F1 */ bl JUTReport__FiiPCce
/* 80005A44 38 60 00 64 */ li r3, 0x64
/* 80005A48 38 80 01 4B */ li r4, 0x14b
/* 80005A4C 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 80005A50 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005A54 38 A5 01 01 */ addi r5, r5, 0x101
/* 80005A58 80 1D 00 10 */ lwz r0, 0x10(r29)
/* 80005A5C 7C DF 00 50 */ subf r6, r31, r0
/* 80005A60 4C C6 31 82 */ crclr 6
/* 80005A64 48 2D AA CD */ bl JUTReport__FiiPCce
/* 80005A68 38 60 00 64 */ li r3, 0x64
/* 80005A6C 38 80 01 58 */ li r4, 0x158
/* 80005A70 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 80005A74 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005A78 38 A5 01 17 */ addi r5, r5, 0x117
/* 80005A7C 80 1D 00 10 */ lwz r0, 0x10(r29)
/* 80005A80 7C 1F 00 50 */ subf r0, r31, r0
/* 80005A84 1C C0 00 64 */ mulli r6, r0, 0x64
/* 80005A88 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 80005A8C 7C C6 03 D6 */ divw r6, r6, r0
/* 80005A90 4C C6 31 82 */ crclr 6
/* 80005A94 48 2D AA 9D */ bl JUTReport__FiiPCce
/* 80005A98 80 7D 00 08 */ lwz r3, 8(r29)
/* 80005A9C 4B FF FD AD */ bl countUsed__FP10JKRExpHeap
/* 80005AA0 7C 66 1B 78 */ mr r6, r3
/* 80005AA4 38 60 00 64 */ li r3, 0x64
/* 80005AA8 38 80 01 65 */ li r4, 0x165
/* 80005AAC 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 80005AB0 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005AB4 38 A5 01 33 */ addi r5, r5, 0x133
/* 80005AB8 4C C6 31 82 */ crclr 6
/* 80005ABC 48 2D AA 75 */ bl JUTReport__FiiPCce
/* 80005AC0 39 61 00 20 */ addi r11, r1, 0x20
/* 80005AC4 48 35 C7 59 */ bl _restgpr_26
/* 80005AC8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80005ACC 7C 08 03 A6 */ mtlr r0
/* 80005AD0 38 21 00 20 */ addi r1, r1, 0x20
/* 80005AD4 4E 80 00 20 */ blr

30
asm/m_Do/m_Do_main/version_check__Fv.s
View File

@ -1,30 +0,0 @@
lbl_800056C0:
/* 800056C0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800056C4 7C 08 02 A6 */ mflr r0
/* 800056C8 90 01 00 14 */ stw r0, 0x14(r1)
/* 800056CC 3C 60 80 37 */ lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 800056D0 38 63 39 A0 */ addi r3, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 800056D4 7C 64 1B 78 */ mr r4, r3
/* 800056D8 48 36 32 BD */ bl strcmp
/* 800056DC 2C 03 00 00 */ cmpwi r3, 0
/* 800056E0 40 82 00 20 */ bne lbl_80005700
/* 800056E4 3C 60 80 37 */ lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 800056E8 38 63 39 A0 */ addi r3, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 800056EC 38 63 00 0A */ addi r3, r3, 0xa
/* 800056F0 7C 64 1B 78 */ mr r4, r3
/* 800056F4 48 36 32 A1 */ bl strcmp
/* 800056F8 2C 03 00 00 */ cmpwi r3, 0
/* 800056FC 41 82 00 1C */ beq lbl_80005718
lbl_80005700:
/* 80005700 3C 60 80 37 */ lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 80005704 38 63 39 A0 */ addi r3, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 80005708 38 63 00 11 */ addi r3, r3, 0x11
/* 8000570C 4C C6 31 82 */ crclr 6
/* 80005710 48 00 14 FD */ bl OSReport_Error
lbl_80005714:
/* 80005714 48 00 00 00 */ b lbl_80005714
lbl_80005718:
/* 80005718 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8000571C 7C 08 03 A6 */ mtlr r0
/* 80005720 38 21 00 10 */ addi r1, r1, 0x10
/* 80005724 4E 80 00 20 */ blr

23
include/JSystem/J3DGraphBase/J3DStruct.h
View File

@ -1,6 +1,29 @@
#ifndef J3DSTRUCT_H
#define J3DSTRUCT_H
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/gx/GXTexture.h"
#include "dolphin/types.h"
struct J3DLightInfo {
/* 803256C4 */ void operator=(J3DLightInfo const&);
/* 0x00 */ cXyz mLightPosition;
/* 0x0C */ cXyz mLightDirection;
/* 0x18 */ _GXColor mColor;
/* 0x1C */ f32 mA0;
/* 0x20 */ f32 mA1;
/* 0x24 */ f32 mA2;
/* 0x28 */ f32 mK0;
/* 0x2C */ f32 mK1;
/* 0x30 */ f32 mK2;
}; // Size = 0x34
struct J3DLightObj {
/* 80018C0C */ J3DLightObj();
/* 0x00 */ J3DLightInfo mInfo;
/* 0x34 */ u8 field_0x34[64];
}; // Size = 0x74
#endif /* J3DSTRUCT_H */

20
include/JSystem/JAudio2/JAISound.h
View File

@ -8,8 +8,9 @@
class JAISoundID {
public:
operator u32() const { return this->mId; }
void operator=(JAISoundID const&);
JAISoundID(u32 pId) : mId(pId) {}
JAISoundID(u32 pId);
JAISoundID(JAISoundID const& other);
@ -62,7 +63,7 @@ public:
/* 802A26B8 */ void calc_JAISound_();
/* 802A29DC */ void initTrack_JAISound_(JASTrack*);
JAISoundID getID() const { return JAISoundID((u32)this->sound_id); }
JAISoundID getID() const;
u32 getUserData() const { return user_data; }
// TODO: do proper struct later
@ -167,4 +168,19 @@ private:
JAISound* mSound;
};
class JAISoundHandles {
public:
JAISoundHandles(JAISoundHandle* pHandle, int param_1) {
mSoundHandle = pHandle;
field_0x04 = param_1;
};
void getHandleSoundID(JAISoundID);
void getFreeHandle();
private:
JAISoundHandle* mSoundHandle;
int field_0x04;
};
#endif /* JAISOUND_H */

92
include/JSystem/JGeometry.h
View File

@ -20,6 +20,98 @@ struct TVec3<f32> {
};
*/
template <typename T>
struct TVec2 {
TVec2() {}
TVec2(T x, T y) { set(x, y); }
void set(T x, T y) {
this->x = x;
this->y = y;
}
void set(const TVec2& other) {
x = other.x;
y = other.y;
}
void setMin(const TVec2<f32>& min) {
if (min.x <= x)
x = min.x;
if (min.y <= y)
y = min.y;
}
void setMax(const TVec2<f32>& max) {
if (x <= max.x)
x = max.x;
if (y <= max.y)
y = max.y;
}
void add(const TVec2<T>& other) {
x += other.x;
y += other.y;
}
bool isAbove(const TVec2<T>& other) const {
return (other.x <= x) && (other.y <= y) ? true : false;
}
T x;
T y;
};
template <class T>
struct TBox {
TBox() : i(), f() {}
TBox(const TBox& other) : i(other.f), f(other.y) {}
T i, f;
};
// clang-format off
template<> struct TBox<TVec2<f32> > {
f32 getWidth() const { return f.x - i.x; }
f32 getHeight() const { return f.y - i.y; }
inline void operator= (const TBox<TVec2<f32> >& rhs) {
// ???
*(u32*)&i.x = *(u32*)&rhs.i.x;
*(u32*)&i.y = *(u32*)&rhs.i.y;
*(u32*)&f.x = *(u32*)&rhs.f.x;
*(u32*)&f.y = *(u32*)&rhs.f.y;
}
bool isValid() const { return f.isAbove(i); }
void addPos(const TVec2<f32>& pos) {
i.add(pos);
f.add(pos);
}
bool intersect(const TBox<TVec2<f32> >& other) {
i.setMax(other.i);
f.setMin(other.f);
return isValid();
}
TVec2<f32> i, f;
};
template <typename T>
struct TBox2 : TBox<TVec2<T> > {
TBox2() {}
TBox2(f32 x0, f32 y0, f32 x1, f32 y1) { set(x0, y0, x1, y1); }
inline const TBox2& operator=(const TBox2& rhs) { *(TBox<TVec2<T> >*)this = rhs; }
void set(const TBox2& other) { set(other.i, other.f); }
void set(const TVec2<f32>& i, const TVec2<f32> f) { this->i.set(i), this->f.set(f); }
void set(f32 x0, f32 y0, f32 x1, f32 y1) { i.set(x0, y0); f.set(x1, y1); }
};
// clang-format on
} // namespace JGeometry
#endif

52
include/SSystem/SComponent/c_API_controller_pad.h
View File

@ -4,32 +4,32 @@
#include "dolphin/types.h"
struct interface_of_controller_pad {
f32 mMainStickPosX;
f32 mMainStickPosY;
f32 mMainStickValue;
s16 mMainStickAngle;
u8 field_0xe;
u8 field_0xf;
f32 mCStickPosX;
f32 mCStickPosY;
f32 mCStickValue;
s16 mCStickAngle;
u8 field_0x1e;
u8 field_0x1f;
f32 mAnalogA;
f32 mAnalogB;
f32 mTriggerLeft;
f32 mTriggerRight;
u32 mButtonFlags;
u32 mPressedButtonFlags;
s8 mGamepadErrorFlags;
u8 field_0x39;
u8 field_0x3a;
u8 field_0x3b;
u8 field_0x3c;
u8 field_0x3d;
u8 field_0x3e;
u8 field_0x3f;
/* 0x00 */ f32 mMainStickPosX;
/* 0x04 */ f32 mMainStickPosY;
/* 0x08 */ f32 mMainStickValue;
/* 0x0C */ s16 mMainStickAngle;
/* 0x0E */ u8 field_0xe;
/* 0x0F */ u8 field_0xf;
/* 0x10 */ f32 mCStickPosX;
/* 0x14 */ f32 mCStickPosY;
/* 0x18 */ f32 mCStickValue;
/* 0x1C */ s16 mCStickAngle;
/* 0x1E */ u8 field_0x1e;
/* 0x1F */ u8 field_0x1f;
/* 0x20 */ f32 mAnalogA;
/* 0x24 */ f32 mAnalogB;
/* 0x28 */ f32 mTriggerLeft;
/* 0x2C */ f32 mTriggerRight;
/* 0x30 */ u32 mButtonFlags;
/* 0x34 */ u32 mPressedButtonFlags;
/* 0x38 */ s8 mGamepadErrorFlags;
/* 0x39 */ u8 mHoldLockL;
/* 0x3A */ u8 mTrigLockL;
/* 0x3B */ u8 mHoldLockR;
/* 0x3C */ u8 mTrigLockR;
/* 0x3D */ u8 field_0x3d;
/* 0x3E */ u8 field_0x3e;
/* 0x3F */ u8 field_0x3f;
};
void cAPICPad_recalibrate(void);

37
include/Z2AudioLib/Z2AudioMgr.h
View File

@ -1,6 +1,43 @@
#ifndef Z2AUDIOMGR_H
#define Z2AUDIOMGR_H
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "Z2AudioLib/Z2SeMgr.h"
#include "Z2AudioLib/Z2SeqMgr.h"
#include "Z2AudioLib/Z2SoundStarter.h"
#include "Z2AudioLib/Z2StatusMgr.h"
#include "dolphin/types.h"
class Z2AudioMgr {
public:
Z2AudioMgr();
void init(JKRSolidHeap*, u32, void*, JKRArchive*);
void setOutputMode(u32);
void zeldaGFrameWork();
void gframeProcess();
void resetProcess(u32, bool);
void resetRecover();
void hasReset() const;
void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
static Z2AudioMgr* mAudioMgrPtr;
private:
/* 0x0000 */ Z2SeMgr mSeMgr;
/* 0x03D0 */ Z2SeqMgr mSeqMgr;
/* 0x04A4 */ Z2SceneMgr mSceneMgr;
/* 0x04C4 */ Z2StatusMgr mStatusMgr;
/* 0x04F4 */ // Z2SoundObjMgr mSoundObjMgr;
/* 0x051C */ // JASAudioReseter mAudioReseter;
/* 0x052C */ Z2SoundStarter mSoundStarter;
/* 0x0530 */ // Z2SoundMgr mSoundMgr;
/* 0x0D40 */ // JAISoundInfo mSoundInfo;
/* 0x0D4C */ // Z2Audience mAudience;
/* 0x0F2C */ // Z2SpeechMgr2 mSpeechMgr;
/* 0x1370 */ // Z2FxLineMgr mFxLineMgr;
};
#endif /* Z2AUDIOMGR_H */

25
include/Z2AudioLib/Z2Creature.h
View File

@ -53,12 +53,12 @@ public:
void setLinkSwordType(s32, s32);
void setLinkShieldType(s32, s32);
void setLinkBootsType(s32);
void deleteObject();
virtual void deleteObject();
void init(Vec*, Vec*, Vec*);
void initKantera(Vec*);
void deleteKantera(void);
void setKanteraState(u8);
void framework(u32, s8);
virtual void framework(u32, s8);
void setSinkDepth(s8);
void setRiding(bool);
void setMagnetized(bool);
@ -68,7 +68,7 @@ public:
void startLinkVoice(JAISoundID, s8);
void startLinkVoiceLevel(JAISoundID, s8);
void startLinkSwordSound(JAISoundID, u32, s8);
void startCollisionSE(u32, u32);
virtual void startCollisionSE(u32, u32);
int startHitItemSE(u32, u32, Z2SoundObjBase*, float);
void setResumeAttack(bool);
@ -106,4 +106,23 @@ private:
/* 0x99 */ u8 padding[3];
};
class Z2CreatureEnemy : public Z2Creature {
public:
virtual void test(); // temp to build OK, remove later
/* 802C0F64 */ Z2CreatureEnemy();
/* 802C0FC4 */ virtual void deleteObject();
/* 802C1094 */ void init(Vec*, Vec*, u8, u8);
/* 802C10B4 */ void init(Vec*, Vec*, Vec*, u8, u8, u8);
/* 802C10D4 */ virtual void framework(u32, s8);
/* 802C110C */ virtual void startCreatureSound(JAISoundID, u32, s8);
/* 802C136C */ virtual void startCreatureSoundLevel(JAISoundID, u32, s8);
/* 802C168C */ virtual void startCreatureVoice(JAISoundID, s8);
/* 802C1948 */ virtual void startCreatureVoiceLevel(JAISoundID, s8);
/* 802C199C */ virtual void startCreatureExtraSound(JAISoundID, u32, s8);
/* 802C19D8 */ virtual void startCreatureExtraSoundLevel(JAISoundID, u32, s8);
/* 802C1A14 */ virtual void startCollisionSE(u32, u32);
/* 802C1B7C */ void setLinkSearch(bool);
/* 802C1B90 */ void setEnemyName(char const*);
};
#endif /* Z2CREATURE_H */

50
include/Z2AudioLib/Z2SceneMgr.h
View File

@ -1,6 +1,56 @@
#ifndef Z2SCENEMGR_H
#define Z2SCENEMGR_H
#include "JSystem/JAudio2/JAISound.h"
#include "dolphin/types.h"
class Z2SceneMgr {
public:
Z2SceneMgr();
void setInDarkness(bool);
void setSceneExist(bool);
void setFadeOutStart(u8);
void setFadeInStart(u8);
void setSceneName(char*, s32, s32);
void sceneChange(JAISoundID, u8, u8, u8, u8, u8, bool);
void framework();
void load1stDynamicWave();
void _load1stWaveInner_1();
void _load1stWaveInner_2();
void check1stDynamicWave();
void load2ndDynamicWave();
void sceneBgmStart();
void loadStaticWaves();
bool checkFirstWaves();
void eraseSeWave(u32);
void eraseBgmWave(u32);
void getWaveLoadStatus(u32, u32);
void loadSeWave(u32);
void loadBgmWave(u32);
private:
/* 0x00 */ long BGM_ID;
/* 0x04 */ int sceneNum;
/* 0x08 */ int timer;
/* 0x0C */ s8 roomNum;
/* 0x0D */ u8 SeWave_1;
/* 0x0E */ u8 SeWaveToErase_1;
/* 0x0F */ u8 SeWave_2;
/* 0x10 */ u8 SeWaveToErase_2;
/* 0x11 */ u8 BgmWave_1;
/* 0x12 */ u8 BgmWaveToErase_1;
/* 0x13 */ u8 BgmWave_2;
/* 0x14 */ u8 BgmWaveToErase_2;
/* 0x15 */ u8 SeWave_3;
/* 0x16 */ u8 SeWaveToErase_3;
/* 0x17 */ u8 field_0x17;
/* 0x18 */ u8 field_0x18;
/* 0x19 */ u8 field_0x19;
/* 0x1A */ u8 field_0x1a;
/* 0x1B */ u8 field_0x1b;
/* 0x1C */ bool inGame;
/* 0x1D */ bool sceneExist;
/* 0x1E */ bool inDarkness;
}; // Size = 0x20
#endif /* Z2SCENEMGR_H */

4179
include/Z2AudioLib/Z2SeMgr.h
View File

File diff suppressed because it is too large Load Diff

99
include/Z2AudioLib/Z2SeqMgr.h
View File

@ -1,6 +1,105 @@
#ifndef Z2SEQMGR_H
#define Z2SEQMGR_H
#include "JSystem/JAudio2/JAISound.h"
#include "dolphin/types.h"
// move TTransition / Z2SoundFader ?
struct TTransition {
/* 0x0 */ float field_0x0;
/* 0x4 */ float field_0x4;
/* 0x8 */ u32 mCount;
}; // Size = 0xC
struct Z2SoundFader {
/* 0x0 */ float mIntensity;
/* 0x4 */ TTransition mTransition;
}; // Size = 0x10
class Z2SeqMgr {
public:
Z2SeqMgr();
void bgmStart(u32, u32, s32);
void bgmStop(u32, s32);
void subBgmStart(u32);
void subBgmStop();
void subBgmStopInner();
void bgmStreamPrepare(u32);
int bgmStreamCheckReady();
void bgmStreamPlay();
void bgmStreamStop(u32);
void changeBgmStatus(s32);
void changeSubBgmStatus(s32);
void onVariantBgmJumpEnd(bool);
void changeFishingBgm(s32);
void talkInBgm();
void talkOutBgm();
void menuInBgm();
void menuOutBgm();
void fanfareFramework();
void stopWolfHowlSong();
void setHeightVolMod(bool, u32);
void setTimeProcVolMod(bool, u32);
void processBgmFramework();
void checkBgmIDPlaying(u32);
void getChildTrackVolume(JAISoundHandle*, int);
void setChildTrackVolume(JAISoundHandle*, int, float, u32, float, float);
void resetBattleBgmParams();
void setBattleBgmOff(bool);
void setBattleSearched(bool);
void setBattleDistIgnore(bool);
void setBattleGhostMute(bool);
void setBattleDistState(u8);
void setBattleSeqState(u8);
void setBattleLastHit(u8);
void battleBgmFramework();
void startBattleBgm(bool);
void stopBattleBgm(u8, u8);
void fieldBgmStart();
void fieldRidingMute();
void onFieldBgmJumpStart();
void onFieldBgmJumpEnd();
void fieldBgmFramework();
void mbossBgmMuteProcess();
void bgmSetSwordUsing(s32);
void bgmNowBattle(float);
void taktModeMute();
void taktModeMuteOff();
void setFieldBgmPlay(bool);
private:
/* 0x00 */ JAISoundHandle mMainBgmHandle;
/* 0x04 */ JAISoundHandle mSubBgmHandle;
/* 0x08 */ JAISoundHandle field_0x08;
/* 0x0C */ JAISoundHandle field_0x0c;
/* 0x10 */ JAISoundID field_0x10;
/* 0x14 */ Z2SoundFader field_0x14;
/* 0x24 */ Z2SoundFader field_0x24;
/* 0x34 */ Z2SoundFader field_0x34;
/* 0x44 */ Z2SoundFader field_0x44;
/* 0x54 */ Z2SoundFader field_0x54;
/* 0x64 */ Z2SoundFader field_0x64;
/* 0x74 */ Z2SoundFader field_0x74;
/* 0x84 */ Z2SoundFader field_0x84;
/* 0x94 */ Z2SoundFader field_0x94;
/* 0xA4 */ Z2SoundFader field_0xa4;
/* 0xB4 */ float mTwilightGateVolume;
/* 0xB8 */ u16 field_0xb8;
/* 0xBA */ u8 field_0xba;
/* 0xBB */ u8 field_0xbb;
/* 0xBC */ u8 field_0xbc;
/* 0xBD */ u8 field_0xbd;
/* 0xBE */ u8 field_0xbe;
/* 0xBF */ u8 field_0xbf;
/* 0xC0 */ u8 field_0xc0;
/* 0xC1 */ u8 field_0xc1;
/* 0xC2 */ u8 field_0xc2;
/* 0xC3 */ u8 field_0xc3;
/* 0xC4 */ u8 field_0xc4;
/* 0xC8 */ float field_0xc8;
/* 0xCC */ float field_0xcc;
/* 0xD0 */ u8 mFlags;
}; // Size = 0xD4
#endif /* Z2SEQMGR_H */

33
include/Z2AudioLib/Z2SoundObjMgr.h
View File

@ -1,6 +1,39 @@
#ifndef Z2SOUNDOBJMGR_H
#define Z2SOUNDOBJMGR_H
#include "JSystem/JSupport/JSUList.h"
#include "Z2AudioLib/Z2Creature.h"
#include "dolphin/types.h"
class Z2SoundObjMgr : protected JSUList<Z2CreatureEnemy> {
public:
Z2SoundObjMgr();
void setForceBattleArea(bool, u16, u16, u16);
void searchEnemy();
void setGhostEnemyState(u8);
void getEnemyID(char const*, JSULink<Z2CreatureEnemy>*);
void setBattleInit();
void checkBattleFinish();
void deleteEnemyAll();
void removeEnemy(JSULink<Z2CreatureEnemy>*);
bool isTwilightBattle();
bool isForceBattle() { return mForceBattle; }
private:
/* 0x0C */ u8 field_0xc[2];
/* 0x0E */ u16 field_0xe;
/* 0x10 */ u16 field_0x10;
/* 0x12 */ u16 field_0x12;
/* 0x14 */ u8 field_0x14;
/* 0x15 */ u8 mEnemyNumNear;
/* 0x16 */ u8 field_0x16;
/* 0x17 */ u8 mEnemyNumVeryFar;
/* 0x18 */ u8 field_0x18;
/* 0x19 */ u8 mGhostEnemyState;
/* 0x1A */ bool field_0x1a;
/* 0x1B */ bool mTwilightBattle;
/* 0x1C */ bool mForceBattle;
}; // Size = 0x20
#endif /* Z2SOUNDOBJMGR_H */

33
include/Z2AudioLib/Z2StatusMgr.h
View File

@ -23,23 +23,20 @@ struct Z2StatusMgr {
//! @todo there are a number of inlines only called from rels: see CHN_debug
u8 mHour;
u8 mMinute;
u8 mWeekday;
u8 field_0x03;
s16 mTime;
u8 field_0x6[2];
void* mEventBit;
bool mIsMenuIn;
u8 field_0xd[3];
u32 mCameraMapInfo;
u32 field_0x14;
float mUnderwaterDepth;
float mCameraInWaterDepthRatio;
Vec mPolygonPosition;
u8 mDemoStatus;
u8 mHeartGaugeOn;
u8 padding[2];
};
/* 0x00 */ u8 mHour;
/* 0x01 */ u8 mMinute;
/* 0x02 */ u8 mWeekday;
/* 0x03 */ u8 field_0x03;
/* 0x04 */ s16 mTime;
/* 0x08 */ void* mEventBit;
/* 0x0C */ bool mIsMenuIn;
/* 0x10 */ u32 mCameraMapInfo;
/* 0x14 */ u32 field_0x14;
/* 0x18 */ float mUnderwaterDepth;
/* 0x1C */ float mCameraInWaterDepthRatio;
/* 0x20 */ Vec mPolygonPosition;
/* 0x2C */ u8 mDemoStatus;
/* 0x2D */ u8 mHeartGaugeOn;
}; // Size = 0x30
#endif /* Z2STATUSMGR_H */

4
include/d/a/d_a_alink.h
View File

@ -2909,7 +2909,7 @@ public:
private:
/* 0x0000 */ fopAc_ac_c mActor;
/* 0x0538 */ u8 field_0x538[0xD1C];
/* 0x0570 */ u8 field_0x570[0xCE4];
/* 0x1254 */ daPy_actorKeep_c mZeldaActorKeep;
};
@ -2932,7 +2932,7 @@ public:
private:
/* 0x0000 */ fopAc_ac_c mActor;
/* 0x0538 */ u8 field_0x538[0x35C];
/* 0x0570 */ u8 field_0x570[0x324];
/* 0x0894 */ u32 mStateFlg1;
/* 0x0898 */ u32 mEndResetStateFlg0;
};

5
include/d/a/d_a_player.h
View File

@ -126,9 +126,6 @@ private:
class daPy_py_c : public fopAc_ac_c {
public:
/* 0x0538 */ u8 field_0x538[0x32];
/* 0x056A */ u8 field_0x56a;
/* 0x056B */ u8 field_0x56b[5];
/* 0x0570 */ int mNoResetFlg0;
/* 0x0574 */ int mNoResetFlg1;
/* 0x0578 */ int mNoResetFlg2;
@ -390,7 +387,7 @@ public:
inline bool getSumouCameraMode() const {
bool sumouCameraMode = false;
if (field_0x56a != 0 && field_0x56a < 0x26) {
if (field_0x560[0xA] != 0 && field_0x560[0xA] < 0x26) {
sumouCameraMode = true;
}
return sumouCameraMode;

5
include/d/bg/d_bg_s_lin_chk.h
View File

@ -43,4 +43,9 @@ class dBgS_ObjLinChk : dBgS_LinChk {
/* 80077FB8 */ ~dBgS_ObjLinChk();
};
class dBgS_BombLinChk : dBgS_LinChk {
/* 80078104 */ dBgS_BombLinChk();
/* 80078160 */ ~dBgS_BombLinChk();
};
#endif /* D_BG_D_BG_S_LIN_CHK_H */

28
include/d/com/d_com_inf_game.h
View File

@ -137,9 +137,7 @@ public:
/* 0x03F8C */ dStage_roomControl_c* mRoomControl;
/* 0x03F90 */ dEvt_control_c mEvent;
/* 0x040C0 */ dEvent_manager_c mEvtManager;
/* 0x0477C */ u8 field_0x477C[4];
/* 0x04780 */ dAttention_c mAttention;
/* 0x04C88 */ u8 field_0x4c88[0x14];
/* 0x04C9C */ dVibration_c mVibration;
/* 0x04D2C */ u8 field_0x4d2c[4];
/* 0x04D30 */ JKRArchive* mFieldMapArchive2;
@ -258,18 +256,18 @@ public:
/* 0x04F07 */ u8 mCStickStatusForce;
/* 0x04F08 */ u8 mSButtonStatusForce;
/* 0x04F09 */ u8 mZStatusForce;
/* 0x04F0A */ u8 mRSetFlag; // related to RStatus
/* 0x04F0B */ u8 mASetFlag; // related to AStatus
/* 0x04F0A */ u8 mRSetFlag;
/* 0x04F0B */ u8 mASetFlag;
/* 0x04F0C */ u8 field_0x4f0c;
/* 0x04F0D */ u8 mNunSetFlag; // related to NunStatus
/* 0x04F0E */ u8 mBottleSetFlag; // related to BottleStatus
/* 0x04F0F */ u8 mRemoConSetFlag; // related to RemoConStatus
/* 0x04F0D */ u8 mNunSetFlag;
/* 0x04F0E */ u8 mBottleSetFlag;
/* 0x04F0F */ u8 mRemoConSetFlag;
/* 0x04F10 */ u8 field_0x4f10[2];
/* 0x04F12 */ u8 mDoSetFlag; // related to DoStatus
/* 0x04F13 */ u8 m3DSetFlag; // related to 3DStatus
/* 0x04F14 */ u8 mCStickSetFlag; // related to CStickStatus
/* 0x04F15 */ u8 mSButtonSetFlag; // related to SButtonStatus
/* 0x04F16 */ u8 mZSetFlag; // related to ZStatus
/* 0x04F12 */ u8 mDoSetFlag;
/* 0x04F13 */ u8 m3DSetFlag;
/* 0x04F14 */ u8 mCStickSetFlag;
/* 0x04F15 */ u8 mSButtonSetFlag;
/* 0x04F16 */ u8 mZSetFlag;
/* 0x04F17 */ u8 mRSetFlagForce;
/* 0x04F18 */ u8 mASetFlagForce;
/* 0x04F19 */ u8 field_0x4f19;
@ -288,14 +286,14 @@ public:
/* 0x04F27 */ u8 mXSetFlagForce;
/* 0x04F28 */ u8 mYStatus;
/* 0x04F29 */ u8 mYStatusForce;
/* 0x04F2A */ u8 mYSetFlag; // related to YStatus
/* 0x04F2A */ u8 mYSetFlag;
/* 0x04F2B */ u8 mYSetFlagForce;
/* 0x04F2C */ u8 mNunZStatus;
/* 0x04F2D */ u8 mNunZSetFlag; // related to NunZStatus
/* 0x04F2D */ u8 mNunZSetFlag;
/* 0x04F2E */ u8 field_0x4fc6; // related to NunZStatusForce
/* 0x04F2F */ u8 field_0x4fc7; // related to NunZStatusForce
/* 0x04F30 */ u8 mNunCStatus;
/* 0x04F31 */ u8 mNunCSetFlag; // related to NunCStatus
/* 0x04F31 */ u8 mNunCSetFlag;
/* 0x04F32 */ u8 field_0x4fca; // related to NunCStatusForce
/* 0x04F33 */ u8 field_0x4fcb; // related to NunCStatusForce
/* 0x04F34 */ u8 mSelectItem[8];

164
include/d/d_attention.h
View File

@ -25,10 +25,10 @@ private:
class dAttCatch_c {
public:
/* 8007398C */ void convPId(unsigned int);
/* 800739BC */ void init();
/* 800739DC */ void proc();
/* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
void convPId(unsigned int);
void init();
void proc();
void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
private:
void* field_0x0;
@ -38,8 +38,9 @@ private:
u8 field_0xd;
u8 field_0xe;
u8 field_0xf;
void* field_0x10;
};
u32 field_0x10;
u8 mChangeItem;
}; // Size = 0x14
class dAttParam_c {
public:
@ -47,26 +48,29 @@ public:
/* 80070110 */ ~dAttParam_c();
private:
u8 field_0x0;
u8 field_0x1;
u8 field_0x2;
u8 field_0x3;
u8 field_0x4;
u8 field_0x5;
u8 field_0x6;
u8 field_0x7;
u8 field_0x8;
u8 field_0x9;
u8 field_0xa;
u8 field_0xb;
u8 field_0xc;
u8 field_0xd;
u8 field_0xe;
u8 field_0xf;
u8 field_0x10;
u8 field_0x11;
u8 field_0x12;
};
/* 0x00 */ void* vtable;
/* 0x04 */ u8 field_0x4;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u16 mFlag;
/* 0x08 */ float field_0x8;
/* 0x0C */ float field_0xc;
/* 0x10 */ float field_0x10;
/* 0x14 */ float field_0x14;
/* 0x18 */ float field_0x18;
/* 0x1C */ float field_0x1c;
/* 0x20 */ float field_0x20;
/* 0x24 */ float field_0x24;
/* 0x28 */ float field_0x28;
/* 0x2C */ float field_0x2c;
/* 0x30 */ float field_0x30;
/* 0x34 */ float field_0x34;
/* 0x38 */ u8 field_0x38;
/* 0x39 */ u8 field_0x39;
/* 0x3C */ float field_0x3c;
/* 0x40 */ float field_0x40;
/* 0x44 */ u32 field_0x44;
/* 0x48 */ u32 field_0x48;
}; // Size = 0x4C
class dAttLook_c {
public:
@ -79,7 +83,8 @@ private:
u32 field_0x0;
u32 field_0x4;
float field_0x8;
};
u32 field_0xc;
}; // Size = 0x10
#pragma pack(push, 1)
class dAttList_c {
@ -96,7 +101,6 @@ private:
};
#pragma pack(pop)
#pragma pack(push, 1)
class dAttDraw_c {
public:
/* 8003054C */ ~dAttDraw_c();
@ -123,7 +127,7 @@ public:
/* 0x11C */ mDoExt_bpkAnm bpkAnm2;
/* 0x134 */ mDoExt_brkAnm brkAnm3;
/* 0x14C */ mDoExt_btkAnm btkAnm2;
/* 0x164 */ u8 field_0x164[0xC];
/* 0x164 */ cXyz field_0x164;
/* 0x170 */ u8 field_0x170;
/* 0x171 */ u8 field_0x171;
/* 0x172 */ u8 field_0x172;
@ -131,7 +135,6 @@ public:
/* 0x174 */ u8 field_0x174;
/* 0x175 */ u8 field_0x175;
};
#pragma pack(pop)
class dAttDraw_CallBack_c {
public:
@ -187,58 +190,53 @@ public:
static u32 chk_type_tbl;
static u32 chk_type_num;
private:
u8 field_0x0[4];
u32 field_0x4;
dAttDraw_CallBack_c dattdraw_callback;
u32 field_0xc;
u32 field_0x10;
u8 field_0x14[8];
cXyz field_0x1c;
/* 0x028 */ dAttDraw_c attention_draw[2];
int field_0x318;
cXyz field_0x31c;
u8 field_0x328[12];
u32 field_0x334;
/* 0x0338 */ dAttList_c attention_list1[8];
int* field_0x3d8;
int* field_0x3dc;
/* 0x03E0 */ dAttList_c attention_list2[4];
int* field_0x430;
int field_0x434;
/* 0x0438 */ dAttList_c attention_list3[4];
int* field_0x488;
int field_0x48c;
dAttHint_c attention_hint;
dAttCatch_c attention_catch;
u8 field_0x4b0[4];
dAttLook_c attention_look;
u8 field_0x4c0;
u8 field_0x4c1;
u8 field_0x4c2;
u8 field_0x4c3;
int* field_0x4c4;
u8 field_0x4c8;
u8 field_0x4c9;
u8 field_0x4ca;
u8 field_0x4cb;
u8 field_0x4cc;
u8 field_0x4cd;
u8 field_0x4ce;
u8 field_0x4cf;
/* 0x04D0 */ dAttParam_c attention_param;
u8 field_0x4e3;
u8 field_0x4e4;
u8 field_0x4e5;
int* field_0x4e6;
u8 field_0x4ea;
u8 field_0x4eb;
u8 field_0x4ec;
u8 field_0x4ed;
u8 field_0x4ee;
u8 field_0x4ef;
u8 field_0x4f0[0x18];
/* 0x0508 */ void* vtable;
};
public:
/* 0x000 */ fopAc_ac_c* field_0x0;
/* 0x004 */ u32 field_0x4;
/* 0x008 */ dAttDraw_CallBack_c dattdraw_callback;
/* 0x00C */ u32 field_0xc;
/* 0x010 */ u32 field_0x10;
/* 0x014 */ u8 field_0x14[4];
/* 0x018 */ JKRSolidHeap* heap;
/* 0x01C */ cXyz field_0x1c;
/* 0x028 */ dAttDraw_c draw[2];
/* 0x318 */ int field_0x318;
/* 0x31C */ cXyz field_0x31c;
/* 0x328 */ u8 field_0x328;
/* 0x329 */ u8 field_0x329;
/* 0x32A */ u8 field_0x32a;
/* 0x32B */ u8 field_0x32b;
/* 0x32C */ u8 field_0x32c;
/* 0x32D */ u8 field_0x32d;
/* 0x32E */ u8 field_0x32e;
/* 0x32F */ u8 field_0x32f;
/* 0x330 */ u8 field_0x330;
/* 0x331 */ u8 field_0x331;
/* 0x332 */ u8 field_0x332;
/* 0x333 */ u8 field_0x333;
/* 0x334 */ u32 mFlags;
/* 0x338 */ dAttList_c mLockOnList[8];
/* 0x3D8 */ int mLockonCount;
/* 0x3DC */ int field_0x3dc;
/* 0x3E0 */ dAttList_c mActionList[4];
/* 0x430 */ int mActionCount;
/* 0x434 */ int field_0x434;
/* 0x438 */ dAttList_c attention_list3[4];
/* 0x488 */ int mCheckObjectCount;
/* 0x48C */ int field_0x48c;
/* 0x490 */ dAttHint_c mZHintTarget;
/* 0x49C */ dAttCatch_c mCatghTarget;
/* 0x4B4 */ dAttLook_c mLookTarget;
/* 0x4C4 */ int field_0x4c4;
/* 0x4C8 */ u8 field_0x4c8;
/* 0x4C9 */ u8 field_0x4c9;
/* 0x4CA */ u8 field_0x4ca;
/* 0x4CB */ u8 field_0x4cb;
/* 0x4CC */ u8 field_0x4cc;
/* 0x4CD */ u8 field_0x4cd;
/* 0x4CE */ u8 field_0x4ce;
/* 0x4CF */ u8 field_0x4cf;
/* 0x4D0 */ dAttParam_c attention_param;
}; // Size = 0x51C
#endif /* D_D_ATTENTION_H */

42
include/d/d_bomb.h
View File

@ -1,6 +1,46 @@
#ifndef D_D_BOMB_H
#define D_D_BOMB_H
#include "dolphin/types.h"
#include "Z2AudioLib/Z2SoundObject.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "d/kankyo/d_kankyo.h"
#include "f_op/f_op_actor.h"
class daNbomb_c {
public:
enum daNbomb_FLG0 { WATER_BOMB = 16 };
u32 checkStateFlg0(daNbomb_FLG0 flag) const { return mStateFlg0 & flag; }
u32 checkWaterBomb() const { return checkStateFlg0(WATER_BOMB); }
/* 0x000 */ fopAc_ac_c mActor;
/* 0x570 */ u8 field_0x570[8];
/* 0x578 */ dBgS_Acch mAcch;
/* 0x750 */ dBgS_AcchCir mAcchCir;
/* 0x790 */ dCcD_Stts mStts;
/* 0x7CC */ dCcD_Sph mSph1;
/* 0x904 */ dCcD_Sph mSph2;
/* 0xA3C */ u8 field_0xa3c[0x64];
/* 0xAA0 */ dBgS_BombLinChk mLinChk;
/* 0xB10 */ cBgS_PolyInfo mPolyInfo;
/* 0xB20 */ Z2SoundObjSimple mSoundObj;
/* 0xB40 */ u8 field_0xb40[0xC];
/* 0xB4C */ u32 mStateFlg0;
/* 0xB50 */ u8 field_0xb50;
/* 0xB51 */ u8 field_0xb51[0x3];
/* 0xB54 */ u8 field_0xb54;
/* 0xB55 */ u8 field_0xb55[0xB];
/* 0xB60 */ LIGHT_INFLUENCE field_0xb60;
/* 0xB80 */ WIND_INFLUENCE field_0xb80;
};
class dBomb_c : public daNbomb_c {
public:
bool checkStateCarry();
bool checkFlowerBombWait(fopAc_ac_c*);
bool checkWaterBomb(fopAc_ac_c*);
bool checkInsectBombMove(fopAc_ac_c*);
};
#endif /* D_D_BOMB_H */

2
include/d/d_jnt_col.h
View File

@ -8,6 +8,8 @@
class dJntColData_c {};
class fopAc_ac_c;
class dJntCol_c {
public:
/* 80035C8C */ dJntCol_c();

348
include/d/event/d_event.h
View File

@ -4,275 +4,94 @@
#include "d/a/d_a_itembase.h"
#include "d/a/d_a_player.h"
#include "d/d_stage.h"
#include "d/event/d_event_manager.h"
#include "d/save/d_save.h"
#include "dolphin/types.h"
#pragma pack(push, 1)
class dEvt_order_c {
public:
/* 80030154 */ ~dEvt_order_c();
/* 800415D4 */ dEvt_order_c();
~dEvt_order_c();
dEvt_order_c();
private:
u8 field_0x0;
u8 field_0x1;
u8 field_0x2;
u8 field_0x3;
u8 field_0x4;
u8 field_0x5;
u8 field_0x6;
u8 field_0x7;
u8 field_0x8;
u8 field_0x9;
u8 field_0xa;
u8 field_0xb;
u8 field_0xc;
u8 field_0xd;
u8 field_0xe;
u8 field_0xf;
u8 field_0x10;
u8 field_0x11;
u8 field_0x12;
u8 field_0x13;
u8 field_0x14;
u8 field_0x15;
u8 field_0x16;
u8 field_0x17;
u8 field_0x18;
u8 field_0x19;
u8 field_0x1a;
u8 field_0x1b;
u8 field_0x1c;
u8 field_0x1d;
u8 field_0x1e;
u8 field_0x1f;
u8 field_0x20;
u8 field_0x21;
u8 field_0x22;
u8 field_0x23;
u8 field_0x24;
u8 field_0x25;
u8 field_0x26;
u8 field_0x27;
u8 field_0x28;
u8 field_0x29;
u8 field_0x2a;
u8 field_0x2b;
u8 field_0x2c;
u8 field_0x2d;
u8 field_0x2e;
u8 field_0x2f;
u8 field_0x30;
u8 field_0x31;
u8 field_0x32;
u8 field_0x33;
u8 field_0x34;
u8 field_0x35;
u8 field_0x36;
u8 field_0x37;
u8 field_0x38;
u8 field_0x39;
u8 field_0x3a;
u8 field_0x3b;
u8 field_0x3c;
u8 field_0x3d;
u8 field_0x3e;
u8 field_0x3f;
u8 field_0x40;
u8 field_0x41;
u8 field_0x42;
u8 field_0x43;
u8 field_0x44;
u8 field_0x45;
u8 field_0x46;
u8 field_0x47;
u8 field_0x48;
u8 field_0x49;
u8 field_0x4a;
u8 field_0x4b;
u8 field_0x4c;
u8 field_0x4d;
u8 field_0x4e;
u8 field_0x4f;
u8 field_0x50;
u8 field_0x51;
u8 field_0x52;
u8 field_0x53;
u8 field_0x54;
u8 field_0x55;
u8 field_0x56;
u8 field_0x57;
u8 field_0x58;
u8 field_0x59;
u8 field_0x5a;
u8 field_0x5b;
u8 field_0x5c;
u8 field_0x5d;
u8 field_0x5e;
u8 field_0x5f;
u8 field_0x60;
u8 field_0x61;
u8 field_0x62;
u8 field_0x63;
u8 field_0x64;
u8 field_0x65;
u8 field_0x66;
u8 field_0x67;
u8 field_0x68;
u8 field_0x69;
u8 field_0x6a;
u8 field_0x6b;
u8 field_0x6c;
u8 field_0x6d;
u8 field_0x6e;
u8 field_0x6f;
u8 field_0x70;
u8 field_0x71;
u8 field_0x72;
u8 field_0x73;
u8 field_0x74;
u8 field_0x75;
u8 field_0x76;
u8 field_0x77;
u8 field_0x78;
u8 field_0x79;
u8 field_0x7a;
u8 field_0x7b;
u8 field_0x7c;
u8 field_0x7d;
u8 field_0x7e;
u8 field_0x7f;
u8 field_0x80;
u8 field_0x81;
u8 field_0x82;
u8 field_0x83;
u8 field_0x84;
u8 field_0x85;
u8 field_0x86;
u8 field_0x87;
u8 field_0x88;
u8 field_0x89;
u8 field_0x8a;
u8 field_0x8b;
u8 field_0x8c;
u8 field_0x8d;
u8 field_0x8e;
u8 field_0x8f;
u8 field_0x90;
u8 field_0x91;
u8 field_0x92;
u8 field_0x93;
u8 field_0x94;
u8 field_0x95;
u8 field_0x96;
u8 field_0x97;
u8 field_0x98;
u8 field_0x99;
u8 field_0x9a;
u8 field_0x9b;
u8 field_0x9c;
u8 field_0x9d;
u8 field_0x9e;
u8 field_0x9f;
u8 field_0xa0;
u8 field_0xa1;
u8 field_0xa2;
u8 field_0xa3;
u8 field_0xa4;
u8 field_0xa5;
u8 field_0xa6;
u8 field_0xa7;
u8 field_0xa8;
u8 field_0xa9;
u8 field_0xaa;
u8 field_0xab;
u8 field_0xac;
u8 field_0xad;
u8 field_0xae;
u8 field_0xaf;
u8 field_0xb0;
u8 field_0xb1;
u8 field_0xb2;
u8 field_0xb3;
u8 field_0xb4;
u8 field_0xb5;
u8 field_0xb6;
u8 field_0xb7;
u8 field_0xb8;
u8 field_0xb9;
u8 field_0xba;
u8 field_0xbb;
u8 field_0xbc;
u8 field_0xbd;
u8 field_0xbe;
};
#pragma pack(pop)
/* 0x00 */ u16 mEventType;
/* 0x02 */ u16 mFlag;
/* 0x04 */ s16 field_0x04;
/* 0x08 */ fopAc_ac_c* mActor1;
/* 0x0C */ fopAc_ac_c* mActor2;
/* 0x10 */ s16 mEventId;
/* 0x12 */ s16 mPriority;
/* 0x14 */ u8 mNextOrderIdx;
/* 0x15 */ u8 mEventInfoIdx;
}; // Size = 0x18
typedef int (*SkipFunc)(void*, int);
#pragma pack(push, 1)
class dEvt_control_c {
public:
/* 80041580 */ dEvt_control_c();
/* 800415D8 */ void orderOld(u16, u16, u16, u16, void*, void*, void const*);
/* 80041668 */ void order(u16, u16, u16, u16, void*, void*, s16, u8);
/* 80041804 */ void setParam(dEvt_order_c*);
/* 80041934 */ void beforeFlagProc(dEvt_order_c*);
/* 80041964 */ void afterFlagProc(dEvt_order_c*);
/* 800419A8 */ void commonCheck(dEvt_order_c*, u16, u16);
/* 80041A20 */ void talkCheck(dEvt_order_c*);
/* 80041B58 */ void talkXyCheck(dEvt_order_c*);
/* 80041C90 */ void catchCheck(dEvt_order_c*);
/* 80041D34 */ void talkEnd();
/* 80041DDC */ void demoCheck(dEvt_order_c*);
/* 80041F18 */ void demoEnd();
/* 80041FA0 */ void potentialCheck(dEvt_order_c*);
/* 80042014 */ void doorCheck(dEvt_order_c*);
/* 8004212C */ void itemCheck(dEvt_order_c*);
/* 800421C0 */ void endProc();
/* 80042254 */ void change();
/* 800422C0 */ void entry();
/* 80042518 */ void reset(void*);
/* 80042468 */ void reset();
/* 800425B4 */ void clearSkipSystem();
/* 8004290C */ void getSkipEventName();
/* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
/* 80042958 */ void setSkipZev(void*, char*);
/* 800429A8 */ void onSkipFade();
/* 800429B4 */ void offSkipFade();
/* 800429D4 */ void skipper();
/* 80042BBC */ void Step();
/* 80042FA8 */ void moveApproval(void*);
/* 8004316C */ void compulsory(void*, char const*, u16);
/* 800431E8 */ void remove();
/* 80043278 */ void getStageEventDt();
/* 80043280 */ void sceneChange(int);
/* 800432C8 */ void getPId(void*);
/* 800432EC */ void convPId(unsigned int);
/* 8004331C */ void getStbDemoData(char*);
/* 80043500 */ void searchMapEventData(u8, s32);
/* 800434D8 */ void searchMapEventData(u8);
/* 8004360C */ void runningEventID(s16);
/* 8004362C */ void setPt1(void*);
/* 8004365C */ void setPt2(void*);
/* 8004368C */ void setPtT(void*);
/* 800436BC */ void setPtI(void*);
/* 800436EC */ void setPtI_Id(unsigned int);
/* 800436F4 */ void setPtD(void*);
/* 80043724 */ void setGtItm(u8);
dEvt_control_c();
void orderOld(u16, u16, u16, u16, void*, void*, void const*);
void order(u16, u16, u16, u16, void*, void*, s16, u8);
void setParam(dEvt_order_c*);
s32 beforeFlagProc(dEvt_order_c*);
void afterFlagProc(dEvt_order_c*);
void commonCheck(dEvt_order_c*, u16, u16);
void talkCheck(dEvt_order_c*);
void talkXyCheck(dEvt_order_c*);
void catchCheck(dEvt_order_c*);
void talkEnd();
void demoCheck(dEvt_order_c*);
void demoEnd();
s32 potentialCheck(dEvt_order_c*);
void doorCheck(dEvt_order_c*);
void itemCheck(dEvt_order_c*);
void endProc();
void change();
void entry();
void reset(void*);
void reset();
void clearSkipSystem();
char* getSkipEventName();
void setSkipProc(void*, SkipFunc, int);
void setSkipZev(void*, char*);
void onSkipFade();
void offSkipFade();
void skipper();
void Step();
void moveApproval(void*);
void compulsory(void*, char const*, u16);
void remove();
void* getStageEventDt(); // ret type probably wrong, fix later
void sceneChange(int);
u32 getPId(void*);
void convPId(unsigned int);
void getStbDemoData(char*);
void searchMapEventData(u8, s32);
void searchMapEventData(u8);
s16 runningEventID(s16);
void setPt1(void*);
void setPt2(void*);
void setPtT(void*);
void setPtI(void*);
void setPtI_Id(unsigned int);
void setPtD(void*);
void setGtItm(u8);
private:
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
public:
/* 0x000 */ u8 field_0x0[4];
/* 0x004 */ dEvt_order_c event_order;
/* 0x0C4 */ int mPt1;
/* 0x0C8 */ int mPt2;
/* 0x0CC */ int mPtT;
/* 0x0D0 */ int mPtI;
/* 0x0D4 */ int mPtd;
/* 0x004 */ dEvt_order_c mOrder[8];
/* 0x0C4 */ u32 mPt1;
/* 0x0C8 */ u32 mPt2;
/* 0x0CC */ u32 mPtT;
/* 0x0D0 */ u32 mPtI;
/* 0x0D4 */ u32 mPtd;
/* 0x0D8 */ u16 mEventFlag;
/* 0x0DA */ u16 mFlag2;
/* 0x0DC */ u16 mHindFlag;
/* 0x0DE */ u16 field_0xde;
/* 0x0E0 */ u16 field_0xe0;
/* 0x0E2 */ u8 field_0xe2;
/* 0x0DE */ s16 mSpecifiedEvent; // name maybe wrong
/* 0x0E0 */ s16 field_0xe0;
/* 0x0E2 */ u8 mNum;
/* 0x0E3 */ u8 field_0xe3;
/* 0x0E4 */ u8 mMode;
/* 0x0E5 */ u8 field_0xe5;
@ -287,15 +106,18 @@ private:
/* 0x0EE */ u8 mPreItemNo;
/* 0x0EF */ u8 mGtItm;
/* 0x0F0 */ float mCullRate;
/* 0x0F4 */ int mStageEventDt;
/* 0x0F8 */ int mChangeOK;
/* 0x0FC */ u8 field_0xfc[20];
/* 0x110 */ bool mSkipFade;
/* 0x114 */ char mSkipEventName[0x14];
/* 0x0F4 */ void* mStageEventDt;
/* 0x0F8 */ void* mChangeOK;
/* 0x0FC */ u8 field_0xfc[4];
/* 0x100 */ SkipFunc mSkipFunc;
/* 0x104 */ u32 field_0x104;
/* 0x108 */ u32 field_0x108;
/* 0x10C */ u32 field_0x10c;
/* 0x110 */ int mSkipFade;
/* 0x114 */ char mSkipEventName[20];
/* 0x128 */ u8 mCompulsory;
/* 0x129 */ u8 field_0x129;
/* 0x129 */ bool field_0x129;
/* 0x12C */ int field_0x12c;
};
#pragma pack(pop)
}; // Size = 0x130
#endif /* D_EVENT_D_EVENT_H */

128
include/d/event/d_event_data.h
View File

@ -5,59 +5,111 @@
#include "d/save/d_save.h"
#include "dolphin/types.h"
struct dEvDtStaff_c {
/* 80043FD8 */ void specialProc_WaitStart(int);
/* 8004403C */ void specialProc_WaitProc(int);
/* 80044080 */ void specialProc();
/* 80044134 */ void init();
/* 80044170 */ void advanceCut(int);
/* 80044190 */ void specialProcLight();
/* 80044324 */ void specialProcMessage();
/* 80044A58 */ void specialProcSound();
/* 80044CB8 */ void specialProcCreate();
/* 80044EE4 */ void specialProcDirector();
/* 80045878 */ void specialProcPackage();
/* 80045AFC */ void specialProcTimekeeper();
/* 80045C34 */ void specialProcEffect();
struct event_binary_data_header {};
struct dEvDtData_c {};
class dEvDtCut_c {
public:
void startCheck();
private:
/* 0x00 */ u8 field_0x0[0x20];
/* 0x20 */ u32 mTagID;
/* 0x28 */ int field_0x28[3];
/* 0x34 */ u32 mFlagId;
/* 0x38 */ u32 mDataTop;
/* 0x3C */ u32 mNext;
};
struct dEvDtEvent_c {
/* 80043E78 */ void finishCheck();
/* 80043EFC */ void forceFinish();
/* 80043F70 */ void specialStaffProc(dEvDtStaff_c*);
class dEvDtStaff_c {
public:
void specialProc_WaitStart(int);
void specialProc_WaitProc(int);
void specialProc();
void init();
void advanceCut(int);
void specialProcLight();
void specialProcMessage();
void specialProcSound();
void specialProcCreate();
void specialProcDirector();
void specialProcPackage();
void specialProcTimekeeper();
void specialProcEffect();
private:
/* 0x00 */ u8 field_0x00[4];
/* 0x04 */ void* field_0x04;
/* 0x08 */ u32 field_0x08;
/* 0x0C */ int field_0x0c;
/* 0x10 */ u32 field_0x10;
/* 0x14 */ u8 field_0x14[0xC];
/* 0x20 */ u32 mTagID;
/* 0x24 */ u32 field_0x24;
/* 0x28 */ u8 field_0x28[4];
/* 0x2C */ int mType;
/* 0x30 */ u32 mStartCut;
/* 0x34 */ u8 field_0x34[2];
/* 0x36 */ s16 field_0x36;
/* 0x38 */ int mCurrentCut;
/* 0x3C */ u32 field_0x3c;
/* 0x40 */ u8 field_0x40;
/* 0x41 */ u8 field_0x41;
/* 0x42 */ s16 field_0x42;
/* 0x44 */ s16 mSoundWait;
/* 0x46 */ u8 field_0x46[4];
/* 0x4A */ int field_0x4a;
};
class dEvDtEvent_c {
public:
void finishCheck();
void forceFinish();
void specialStaffProc(dEvDtStaff_c*);
/* 0x00 */ s32 mEventNum;
};
class dEvDtFlag_c {
public:
/* 80043D60 */ void flagCheck(int);
/* 80043DC8 */ void flagSet(int);
/* 80043E30 */ void flagMaxCheck(int);
/* 80043E58 */ void init();
dEvDtFlag_c() {}
void flagCheck(int);
void flagSet(int);
bool flagMaxCheck(int);
void init();
#define FlagMax 0x2800
private:
u8 field_0x0[320];
};
u32 mFlags[320];
}; // Size = 0x500
#pragma pack(push, 1)
class dEvDtBase_c {
public:
dEvDtBase_c();
~dEvDtBase_c();
/* 80046138 */ void init();
/* 8004616C */ void init(char*, int);
/* 8004628C */ void advanceCut(dEvDtEvent_c*);
/* 800462FC */ void advanceCutLocal(dEvDtStaff_c*);
void init();
void init(char*, int);
void advanceCut(dEvDtEvent_c*);
void advanceCutLocal(dEvDtStaff_c*);
event_binary_data_header* getHeaderP() { return mHeaderP; }
s32 getEventNum() { return mEventP->mEventNum; }
s32 roomNo() { return mRoomNo; }
private:
u32 field_0x0;
u32 field_0x4;
u32 field_0x8;
u32 field_0xc;
u32 field_0x10;
u32 field_0x14;
u32 field_0x18;
u32 field_0x1c;
u32 field_0x20;
};
/* 0x00 */ event_binary_data_header* mHeaderP;
/* 0x04 */ dEvDtEvent_c* mEventP;
/* 0x08 */ dEvDtStaff_c* mStaffP;
/* 0x0C */ dEvDtCut_c* mCutP;
/* 0x10 */ dEvDtData_c* mDataP;
/* 0x14 */ float* mFDataP;
/* 0x18 */ s32* mIDataP;
/* 0x1C */ char* mSDataP;
/* 0x20 */ s32 mRoomNo;
}; // Size = 0x24
#pragma pack(pop)
#endif /* D_EVENT_D_EVENT_DATA_H */

132
include/d/event/d_event_manager.h
View File

@ -4,87 +4,81 @@
#include "d/event/d_event_data.h"
#include "dolphin/types.h"
struct dEvDtData_c {};
#pragma pack(push, 1)
class dEvent_exception_c {
public:
/* 800463DC */ void init();
/* 800463F0 */ void setStartDemo(int);
/* 80046480 */ void getEventName();
dEvent_exception_c() { mEventInfoIdx = -1; }
void init();
void setStartDemo(int);
void getEventName();
private:
u32 field_0x0;
u32 mEventInfoIdx;
u8 field_0x4;
u8 field_0x5;
u8 field_0x6;
u8 field_0x7;
u32 field_0x8;
u32 mState;
};
#pragma pack(pop)
#pragma pack(push, 1)
struct dEvent_manager_c {
/* 800465E8 */ void getSubstance(dEvDtData_c*, int);
/* 80046688 */ dEvent_manager_c();
/* 80046710 */ void create();
/* 80046800 */ void setObjectArchive(char*);
/* 80046888 */ void demoInit();
/* 80046904 */ void roomInit(int);
/* 800469EC */ void roomFinish(int);
/* 80046A58 */ void orderStartDemo();
/* 80046C0C */ void remove();
/* 80046CB8 */ void startProc(dEvDtEvent_c*);
/* 80046DA0 */ void closeProc(dEvDtEvent_c*);
/* 80046DAC */ void endProc(s16, int);
/* 80046E64 */ void Sequencer();
/* 800473FC */ void Experts();
/* 800474BC */ void getEventData(s16);
/* 80047454 */ void getEventData(s16, int);
/* 80047514 */ void getEventIdx(char const*, u8, s32);
/* 80047698 */ void getEventIdx(fopAc_ac_c*, u8);
/* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8);
/* 80047930 */ void isMapToolCamera(u8, s32);
/* 80047984 */ void order(s16);
/* 800479F8 */ void startCheck(s16);
/* 80047A38 */ void startCheckOld(char const*);
/* 80047A78 */ void endCheck(s16);
/* 80047ADC */ void endCheckOld(char const*);
/* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int);
/* 80047D4C */ void getIsAddvance(int);
/* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int);
/* 80047F5C */ void getMyNowCutName(int);
/* 80047FC8 */ void getMyDataP(int, char const*, int);
/* 800480EC */ void getMySubstanceP(int, char const*, int);
/* 80048144 */ void getMySubstanceNum(int, char const*);
/* 8004817C */ void cutEnd(int);
/* 800481F4 */ void getEventPrio(fopAc_ac_c*, s16);
/* 800482CC */ void issueStaff(char const*);
/* 80048348 */ void cancelStaff(char const*);
/* 800483C4 */ void setGoal(cXyz*);
/* 800483E0 */ void getGoal();
/* 800483E8 */ void getRunEventName();
/* 80048520 */ void specialCast_Shutter(s16, int);
/* 80048618 */ void specialCast(char const*, int);
/* 800487F0 */ void ChkPresentEnd();
/* 8004882C */ void checkStartDemo();
class dEvent_manager_c {
public:
void getSubstance(dEvDtData_c*, int);
dEvent_manager_c();
void create();
void setObjectArchive(char*);
void demoInit();
void roomInit(int);
void roomFinish(int);
void orderStartDemo();
void remove();
void startProc(dEvDtEvent_c*);
void closeProc(dEvDtEvent_c*);
void endProc(s16, int);
void Sequencer();
void Experts();
void getEventData(s16);
dEvDtEvent_c* getEventData(s16, int);
void getEventIdx(char const*, u8, s32);
void getEventIdx(fopAc_ac_c*, u8);
void getEventIdx(fopAc_ac_c*, char const*, u8);
void isMapToolCamera(u8, s32);
void order(s16);
void startCheck(s16);
void startCheckOld(char const*);
void endCheck(s16);
void endCheckOld(char const*);
void getMyStaffId(char const*, fopAc_ac_c*, int);
void getIsAddvance(int);
void getMyActIdx(int, char const* const*, int, int, int);
void getMyNowCutName(int);
void getMyDataP(int, char const*, int);
void getMySubstanceP(int, char const*, int);
void getMySubstanceNum(int, char const*);
void cutEnd(int);
void getEventPrio(fopAc_ac_c*, s16);
void issueStaff(char const*);
void cancelStaff(char const*);
void setGoal(cXyz*);
void getGoal();
void getRunEventName();
void specialCast_Shutter(s16, int);
void specialCast(char const*, int);
void ChkPresentEnd();
void checkStartDemo();
/* 0x0000 */ dEvDtBase_c event_data_base[11];
/* 0x018C */ u32 field_0x18c;
/* 0x0190 */ u32 field_0x190;
/* 0x0194 */ u8 field_0x194[0x8];
/* 0x019C */ cXyz goal;
/* 0x01A8 */ u8 field_0x1A8[4];
private:
/* 0x0000 */ dEvDtBase_c mEventList[11];
/* 0x018C */ s32 mCameraPlay;
/* 0x0190 */ dEvent_exception_c mEventException;
/* 0x019C */ cXyz mGoal;
/* 0x01A8 */ u8 field_0x1a8[2];
/* 0x01AA */ u16 field_0x1aa;
/* 0x01AC */ u8 field_0x1ac[0x8];
/* 0x01B4 */ dEvent_exception_c event_exception;
/* 0x01C0 */ cXyz position;
/* 0x01CC */ u8 field_0x1cc[0x14];
/* 0x01E0 */ dEvDtFlag_c event_data_flag;
/* 0x0320 */ u8 field_0x320[0x35C];
/* 0x067C */ void* vtable;
/* 0x0680 */ u8 field_0x680[0x3C];
/* 0x01AC */ u8 field_0x1ac[4];
/* 0x01B0 */ u32 field_0x1b0;
/* 0x01B4 */ u32 field_0x1b4;
/* 0x01B8 */ u32 field_0x1b8;
/* 0x01BC */ dEvDtFlag_c mFlags;
/* 0x06BC */ bool mDataLoaded;
};
#pragma pack(pop)
#endif /* D_EVENT_D_EVENT_MANAGER_H */

45
include/d/kankyo/d_kankyo.h
View File

@ -1,6 +1,7 @@
#ifndef D_KANKYO_D_KANKYO_H
#define D_KANKYO_D_KANKYO_H
#include "JSystem/J3DGraphBase/J3DStruct.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/gx/GXTexture.h"
#include "dolphin/types.h"
@ -16,4 +17,48 @@ struct LIGHT_INFLUENCE {
/* 0x1C */ int field_0x1c;
};
struct WIND_INFLUENCE {
/* 0x00 */ cXyz field_0x00;
/* 0x0C */ cXyz field_0x0c;
/* 0x18 */ u8 field_0x18[0xC];
/* 0x24 */ int field_0x24;
/* 0x28 */ u8 field_0x28;
/* 0x29 */ u8 field_0x29;
};
class dKy_tevstr_c {
public:
private:
/* 0x000 */ J3DLightObj field_0x000;
/* 0x074 */ J3DLightObj field_0x074[6];
/* 0x32C */ cXyz field_0x32c;
/* 0x338 */ cXyz field_0x338;
/* 0x344 */ f32 field_0x344;
/* 0x348 */ int field_0x348;
/* 0x34C */ int field_0x34c;
/* 0x350 */ int field_0x350;
/* 0x354 */ int field_0x354;
/* 0x358 */ int field_0x358;
/* 0x35C */ int field_0x35c;
/* 0x360 */ int field_0x360;
/* 0x364 */ int field_0x364;
/* 0x368 */ f32 field_0x368;
/* 0x36C */ f32 field_0x36c;
/* 0x370 */ f32 field_0x370;
/* 0x374 */ f32 field_0x374;
/* 0x378 */ u16 field_0x378;
/* 0x37A */ u8 field_0x37a;
/* 0x37B */ u8 field_0x37b;
/* 0x37C */ u8 field_0x37c;
/* 0x37D */ u8 field_0x37d;
/* 0x37E */ u8 field_0x37e;
/* 0x37F */ u8 field_0x37f;
/* 0x380 */ u8 field_0x380;
/* 0x381 */ u8 field_0x381;
/* 0x382 */ u8 field_0x382;
/* 0x383 */ u8 field_0x383;
/* 0x384 */ u8 field_0x384;
/* 0x385 */ u8 field_0x385;
}; // Size = 0x388?
#endif /* D_KANKYO_D_KANKYO_H */

169
include/d/menu/d_menu_window.h
View File

@ -1,6 +1,175 @@
#ifndef D_MENU_D_MENU_WINDOW_H
#define D_MENU_D_MENU_WINDOW_H
#include "d/meter/d_meter2_info.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_controller_pad.h"
struct STControl;
struct CSTControl;
class dDlst_base_c;
class dMenu_Ring_c;
class dMenu_Collect2D_c;
class dMenu_Dmap_c;
class dMenu_Fmap_c;
class dMenu_save_c;
class dMenu_Option_c;
class dMenu_Letter_c;
class dMenu_Fishing_c;
class dMenu_Skill_c;
class dMenu_Insect_c;
class dMw_c {
public:
/* 801FA13C */ void key_wait_init(u8);
/* 801FA220 */ void ring_open_init(u8);
/* 801FA23C */ void ring_move_init(u8);
/* 801FA240 */ void ring_close_init(u8);
/* 801FA244 */ void collect_open_init(u8);
/* 801FA2D0 */ void collect_move_init(u8);
/* 801FA46C */ void collect_close_init(u8);
/* 801FA538 */ void fmap_open_init(u8);
/* 801FA55C */ void fmap_move_init(u8);
/* 801FA560 */ void fmap_close_init(u8);
/* 801FA564 */ void dmap_open_init(u8);
/* 801FA588 */ void dmap_move_init(u8);
/* 801FA58C */ void dmap_close_init(u8);
/* 801FA590 */ void collect_save_open_init(u8);
/* 801FA5E4 */ void collect_save_move_init(u8);
/* 801FA5E8 */ void collect_save_close_init(u8);
/* 801FA608 */ void collect_option_open_init(u8);
/* 801FA65C */ void collect_option_move_init(u8);
/* 801FA660 */ void collect_option_close_init(u8);
/* 801FA680 */ void collect_letter_open_init(u8);
/* 801FA6DC */ void collect_letter_move_init(u8);
/* 801FA6E0 */ void collect_letter_close_init(u8);
/* 801FA738 */ void collect_fishing_open_init(u8);
/* 801FA794 */ void collect_fishing_move_init(u8);
/* 801FA798 */ void collect_fishing_close_init(u8);
/* 801FA7F0 */ void collect_skill_open_init(u8);
/* 801FA84C */ void collect_skill_move_init(u8);
/* 801FA850 */ void collect_skill_close_init(u8);
/* 801FA8A8 */ void collect_insect_open_init(u8);
/* 801FA908 */ void collect_insect_move_init(u8);
/* 801FA90C */ void collect_insect_close_init(u8);
/* 801FA964 */ void insect_open_init(u8);
/* 801FA9E8 */ void insect_open2_init(u8);
/* 801FA9EC */ void insect_move_init(u8);
/* 801FA9F0 */ void insect_close_init(u8);
/* 801FAA48 */ void key_wait_proc();
/* 801FAFDC */ void ring_open_proc();
/* 801FB01C */ void ring_move_proc();
/* 801FB064 */ void ring_close_proc();
/* 801FB0B8 */ void collect_open_proc();
/* 801FB110 */ void collect_move_proc();
/* 801FB1A0 */ void collect_close_proc();
/* 801FB240 */ void fmap_open_proc();
/* 801FB298 */ void fmap_move_proc();
/* 801FB36C */ void fmap_close_proc();
/* 801FB3AC */ void dmap_open_proc();
/* 801FB404 */ void dmap_move_proc();
/* 801FB5DC */ void dmap_close_proc();
/* 801FB61C */ void collect_save_open_proc();
/* 801FB67C */ void collect_save_move_proc();
/* 801FB6D8 */ void collect_save_close_proc();
/* 801FB73C */ void collect_option_open_proc();
/* 801FB7AC */ void collect_option_move_proc();
/* 801FB800 */ void collect_option_close_proc();
/* 801FB81C */ void collect_letter_open_proc();
/* 801FB8AC */ void collect_letter_move_proc();
/* 801FB900 */ void collect_letter_close_proc();
/* 801FB91C */ void collect_fishing_open_proc();
/* 801FB9AC */ void collect_fishing_move_proc();
/* 801FBA00 */ void collect_fishing_close_proc();
/* 801FBA1C */ void collect_skill_open_proc();
/* 801FBAAC */ void collect_skill_move_proc();
/* 801FBB00 */ void collect_skill_close_proc();
/* 801FBB1C */ void collect_insect_open_proc();
/* 801FBBAC */ void collect_insect_move_proc();
/* 801FBC00 */ void collect_insect_close_proc();
/* 801FBC1C */ void insect_open_proc();
/* 801FBC78 */ void insect_open2_proc();
/* 801FBD08 */ void insect_move_proc();
/* 801FBD64 */ void insect_close_proc();
/* 801FBD80 */ void dMw_capture_create();
/* 801FBE14 */ void dMw_capture_delete();
/* 801FBE94 */ void dMw_ring_create(u8);
/* 801FBF60 */ void dMw_ring_delete();
/* 801FBFF8 */ void dMw_collect_create();
/* 801FC090 */ void dMw_collect_delete(bool);
/* 801FC0FC */ void dMw_fmap_create();
/* 801FC264 */ void dMw_fmap_delete(bool);
/* 801FC350 */ void dMw_dmap_create();
/* 801FC46C */ void dMw_dmap_delete(bool);
/* 801FC520 */ void dMw_save_create();
/* 801FC5D0 */ void dMw_save_delete();
/* 801FC668 */ void dMw_option_create();
/* 801FC70C */ void dMw_option_delete();
/* 801FC7BC */ void dMw_letter_create();
/* 801FC85C */ void dMw_letter_delete();
/* 801FC904 */ void dMw_fishing_create();
/* 801FC9A4 */ void dMw_fishing_delete();
/* 801FCA4C */ void dMw_skill_create();
/* 801FCAEC */ void dMw_skill_delete();
/* 801FCB94 */ void dMw_insect_create(u8);
/* 801FCC44 */ void dMw_insect_delete();
/* 801FCCEC */ void dMw_onButtonBit(u8);
/* 801FCCFC */ void dMw_offButtonBit(u8);
/* 801FCD0C */ void dMw_isButtonBit(u8);
/* 801FCD24 */ void dMw_isPush_S_Button();
/* 801FCDD8 */ void isPauseReady();
/* 801FCE08 */ void dMw_fade_out();
/* 801FCE78 */ void dMw_fade_in();
/* 801FCEE8 */ void checkCStickTrigger();
/* 801FCF84 */ void isEventCheck();
/* 801FD094 */ void markMemSize();
/* 801FD0D4 */ void checkMemSize();
/* 801FD140 */ void _create();
/* 801FD2D8 */ void _execute();
/* 801FD450 */ void _draw();
/* 801FD67C */ void _delete();
void onPauseWindow() { mPauseWindow = true; }
void offPauseWindow() { mPauseWindow = false; }
void onShowFlag() { mShowFlag |= 1; }
void offShowFlag() { mShowFlag &= ~1; }
bool isShowFlag() { return mShowFlag & 1 != 0; }
private:
u8 field_0x0[0x100];
/* 0x100 */ void* field_0x100;
/* 0x104 */ STControl* mpStick;
/* 0x108 */ CSTControl* mpCStick;
/* 0x10C */ dDlst_base_c* field_0x10c;
/* 0x110 */ dMenu_Ring_c* mRing;
/* 0x114 */ dMenu_Collect2D_c* mCollect2D;
/* 0x118 */ dMenu_Dmap_c* mDmap;
/* 0x11C */ dMenu_Fmap_c* mFmap;
/* 0x120 */ dMenu_save_c* mSave;
/* 0x124 */ dMenu_Option_c* mOption;
/* 0x128 */ dMenu_Letter_c* mLetter;
/* 0x12C */ dMenu_Fishing_c* mFishing;
/* 0x130 */ dMenu_Skill_c* mSkill;
/* 0x134 */ dMenu_Insect_c* mInsect;
/* 0x138 */ int field_0x138;
/* 0x13C */ u8 field_0x13c[8];
/* 0x144 */ u8 field_0x144;
/* 0x145 */ u8 mButtons;
/* 0x146 */ u8 field_0x146;
/* 0x147 */ u8 mShowFlag;
/* 0x148 */ u8 field_0x148;
/* 0x149 */ u8 field_0x149;
/* 0x14A */ u8 field_0x14A;
/* 0x14B */ u8 field_0x14B;
/* 0x14C */ u8 field_0x14C;
/* 0x14D */ u8 field_0x14D;
/* 0x14E */ u8 field_0x14E;
/* 0x14F */ u8 field_0x14F;
/* 0x150 */ u8 field_0x150;
/* 0x151 */ u8 field_0x151;
/* 0x152 */ u8 field_0x152;
/* 0x153 */ u8 field_0x153;
/* 0x154 */ bool mPauseWindow;
};
#endif /* D_MENU_D_MENU_WINDOW_H */

34
include/d/meter/d_meter2_info.h
View File

@ -3,6 +3,7 @@
#include "JSystem/JUtility/JUTTexture.h"
#include "d/d_resorce.h"
#include "d/menu/d_menu_window.h"
#include "d/msg/d_msg_flow.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
@ -14,11 +15,16 @@ struct dSv_event_flag_c {
struct dMsgObject_c {
/* 802384C4 */ void setLetterNameID(u16);
/* 802379AC */ void setKillMessageFlag();
/* 8023822C */ void getStatus();
};
class dMeterMap_c {
public:
/* 8020D900 */ bool isMapOpenCheck();
/* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo();
/* 8020D874 */ void setDispPosInsideFlg_SE_On();
/* 8020D8BC */ void setDispPosOutsideFlg_SE_On();
};
struct J2DPicture {};
@ -41,9 +47,12 @@ struct dItem_data {
struct CPaneMgr {};
class dMeter2_c {};
class dMw_c;
class dMw_c {};
class dMeter2_c {
public:
/* 8021F6EC */ void emphasisButtonDelete();
};
class dMeter2Info_c {
public:
@ -98,8 +107,13 @@ public:
void setMiniGameCount(s8);
void setSaveStageName(const char*);
void setWindowStatus(u8 status) {
unk186 = mWindowStatus;
mWindowStatus = status;
}
u8& getDirectUseItem() { return mDirectUseItem; }
dMeterMap_c* getMeterMapClass() { return mMeterMap; }
dMw_c* getMenuWindowClass() { return mMenuWindowClass; }
void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; }
private:
@ -187,12 +201,20 @@ private:
extern dMeter2Info_c g_meter2_info;
inline dMeterMap_c* dMeter2Info_getMeterMapClass() {
return g_meter2_info.getMeterMapClass();
}
inline void dMeter2Info_Initialize() {
g_meter2_info.init();
}
inline dMeterMap_c* dMeter2Info_getMeterMapClass() {
return g_meter2_info.getMeterMapClass();
}
inline dMw_c* dMeter2Info_getMenuWindowClass() {
return g_meter2_info.getMenuWindowClass();
}
inline void dMeter2Info_setWindowStatus(u8 status) {
g_meter2_info.setWindowStatus(status);
}
#endif /* D_METER_D_METER2_INFO_H */

2
include/d/particle/d_particle_copoly.h
View File

@ -4,7 +4,7 @@
#include "d/bg/d_bg_s_acch.h"
#include "dolphin/types.h"
struct dKy_tevstr_c {};
struct dKy_tevstr_c;
class dPaPo_c {
public:

84
include/f_op/f_op_actor.h
View File

@ -3,30 +3,85 @@
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "d/kankyo/d_kankyo.h"
#include "dolphin/mtx/mtx.h"
#include "f_pc/f_pc_leaf.h"
struct JKRSolidHeap;
class dEvt_info_c {
public:
dEvt_info_c();
virtual ~dEvt_info_c();
void setEventName(char*);
void getEventName();
void beforeProc();
void onCondition(u16);
void offCondition(u16);
bool checkCommandCatch();
bool checkCommandDoor();
bool checkCommandDemoAccrpt();
void setCommand(u16 command) { mCommand = command; }
void setMapToolId(u8 id) { mMapToolId = id; }
void setEventId(s16 id) { mEventId = id; }
void setCondition(u16 condition) { mCondition = condition; }
void setArchiveName(char* name) { mArchiveName = name; }
u8 getMapToolId() { return mMapToolId; }
s16 getEventId() { return mEventId; }
u8 getIdx() { return mIndex; }
char* getArchiveName() { return mArchiveName; }
bool chkCondition(u16 condition) { return mCondition == condition; }
bool checkCommandTalk() { return mCommand == 1; }
bool checkCommandItem() { return mCommand == 4; }
private:
/* 0x04 */ u16 mCommand;
/* 0x06 */ u16 mCondition;
/* 0x08 */ s16 mEventId;
/* 0x0A */ u8 mMapToolId;
public:
/* 0x0B */ u8 mIndex;
/* 0x0C */ char* mArchiveName;
/* 0x10 */ void* field_0x10;
/* 0x14 */ void* field_0x14;
}; // Size = 0x18
struct actor_place {
cXyz mPosition;
csXyz mAngle;
u8 mRoomNo;
u8 field_0x13;
};
struct actor_attention_types {
/* 0x00 */ u32 mDistance1;
/* 0x04 */ u32 mDistance2;
/* 0x08 */ u32 mDistance3;
/* 0x0C */ cXyz mPosition;
/* 0x18 */ u32 mFlags;
}; // Size = 0x1C
class dJntCol_c;
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* unk_0x0F0;
/* 0x0F4 */ u8 unk_0x0F4[0x496 - 0xF4];
/* 0x496 */ u8 unk_0x496;
/* 0x497 */ u8 unk_0x497[0x499 - 0x497];
/* 0x499 */ s8 unk_0x499;
/* 0x49A */ u8 unk_0x49A[0x4A8 - 0x49A];
/* 0x0F0 */ JKRSolidHeap* mHeap;
/* 0x0F4 */ dEvt_info_c mEvtInfo;
/* 0x10C */ dKy_tevstr_c mTevStr;
/* 0x494 */ s16 mSetID;
/* 0x496 */ u8 mGroup;
/* 0x497 */ u8 mCullType;
/* 0x498 */ u8 mDemoActorId;
/* 0x499 */ s8 mSubtype;
/* 0x49C */ u32 mStatus;
/* 0x4A0 */ u32 mCondition;
/* 0x4A4 */ u32 mParentPcId;
/* 0x4A8 */ actor_place mOrig;
/* 0x4BC */ actor_place mNext;
/* 0x4D0 */ actor_place mCurrent;
@ -44,18 +99,23 @@ public:
/* 0x514 */ f32 mRadius;
} mSphere;
} mCull;
/* 0x520 */ u8 unk_0x520[0xC];
/* 0x520 */ float mCullSizeFar;
/* 0x524 */ void* field_0x524; // possibly J3DModel*
/* 0x528 */ dJntCol_c* mJntCol;
/* 0x52C */ f32 mSpeedF;
/* 0x530 */ f32 mGravity;
/* 0x534 */ f32 mMaxFallSpeed;
/* 0x538 */ cXyz mEyePos;
/* 0x544 */ actor_attention_types mAttentionInfo;
/* 0x560 */ u8 field_0x560[0x10]; // not 100% sure on this
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
fopAc_ac_c();
~fopAc_ac_c();
static u8 stopStatus[4];
static u32 stopStatus;
const cXyz& getPosition() const { return mCurrent.mPosition; }
const csXyz& getAngle() const { return mCurrent.mAngle; }
}; // Size: unknown
}; // Size: 0x570?
#endif

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