mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-18 05:38:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Z2AudioLib misc decomp (#75)

Browse Source 
* Z2SoundHandles: decomp portions

* start decomping: Z2SpeechMgr2, Z2SoundHandles

* Z2SoundHandles::stopAllSounds(): ok

* Z2SoundHandles::getHandleUserData(): ok

* Z2SoundInfo: header

* Z2SoundObjBase::framework(): ok

* Z2SoundObjBase::Z2SoundObjBase(), Z2SoundObjBase::init(): ok

* Z2SoundObjBase::~Z2SoundObjBase(): ok

* Z2SoundObjBase::stopOK(): ok

* Z2SoundObjBase::stopOK, incomplete Z2SoundObjBase::dispose()

* clang-format

* Z2SoundObjBase::dispose(): ok

* JAISound::operator->(): null assert

* JAIAudience: stub

* Z2SoundObject::{init, deleteObject, isAlive}: ok

* Z2SeMgr: elaborate struct (and decl JAISoundHandles to support this)

* start subclassing Z2SoundObjBase; nonmatching Z2SoundObjSimple::init()

* Z2SeMGr::{incrCrowdSize, decrCrowdSize}: ok

* Z2MultiSeMgr::resetMultiSePos(): ok

* Z2WolfHowlMgr.h: decls

* Z2SoundStarter: move to decls and fix postprocess.py symbol pass

* Z2AudioArcLoader: decls

* Z2SoundObjMgr: ok some fns
- deleteEnemyAll()
- isTwilightBattle()
- setGhostEnemyState()

additionally elaborates parts of the Z2Creature hierarchy

* delete unused .s files and add tool to find them (only runs on linux)

* run clang-format

* postprocess.py: comment out debugging

* add python step to ok-check workflow

* address review comments

* address review comments

Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>

Co-authored-by: Pheenoh <pheenoh@gmail.com>
Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>
This commit is contained in:
Erin Moon
2021-01-21 22:16:51 -06:00
committed by GitHub
parent afb426c60c
commit a072e71c33
595 changed files with 1228 additions and 9009 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_controller_pad/asm/mDoCPd_c_NS_recalibrate.s
-10
View File
@@ -1,10 +0,0 @@
/* 80007D74 00004CB4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80007D78 00004CB8 7C 08 02 A6 */ mflr r0
/* 80007D7C 00004CBC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80007D80 00004CC0 48 2D 92 A5 */ bl clearForReset__10JUTGamePadFv
/* 80007D84 00004CC4 3C 60 F0 00 */ lis r3, 0xf000
/* 80007D88 00004CC8 48 2D 9C 51 */ bl setEnabled__Q210JUTGamePad7CRumbleFUl
/* 80007D8C 00004CCC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80007D90 00004CD0 7C 08 03 A6 */ mtlr r0
/* 80007D94 00004CD4 38 21 00 10 */ addi r1, r1, 0x10
/* 80007D98 00004CD8 4E 80 00 20 */ blr
include/m_Do/m_Do_main/asm/func_80005848.s
-24
View File
@@ -1,24 +0,0 @@
/* 80005848 00002788 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8000584C 0000278C 7C 08 02 A6 */ mflr r0
/* 80005850 00002790 90 01 00 14 */ stw r0, 0x14(r1)
/* 80005854 00002794 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80005858 00002798 93 C1 00 08 */ stw r30, 8(r1)
/* 8000585C 0000279C 7C 7E 1B 78 */ mr r30, r3
/* 80005860 000027A0 48 33 B4 65 */ bl OSDisableScheduler
/* 80005864 000027A4 3B E0 00 00 */ li r31, 0
/* 80005868 000027A8 80 7E 00 80 */ lwz r3, 0x80(r30)
/* 8000586C 000027AC 48 00 00 0C */ b lbl_80005878
lbl_80005870:
/* 80005870 000027B0 80 63 00 0C */ lwz r3, 0xc(r3)
/* 80005874 000027B4 3B FF 00 01 */ addi r31, r31, 1
lbl_80005878:
/* 80005878 000027B8 28 03 00 00 */ cmplwi r3, 0
/* 8000587C 000027BC 40 82 FF F4 */ bne lbl_80005870
/* 80005880 000027C0 48 33 B4 85 */ bl OSEnableScheduler
/* 80005884 000027C4 7F E3 FB 78 */ mr r3, r31
/* 80005888 000027C8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8000588C 000027CC 83 C1 00 08 */ lwz r30, 8(r1)
/* 80005890 000027D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80005894 000027D4 7C 08 03 A6 */ mtlr r0
/* 80005898 000027D8 38 21 00 10 */ addi r1, r1, 0x10
/* 8000589C 000027DC 4E 80 00 20 */ blr
include/m_Do/m_Do_main/asm/func_800058C4.s
-133
View File
@@ -1,133 +0,0 @@
/* 800058C4 00002804 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800058C8 00002808 7C 08 02 A6 */ mflr r0
/* 800058CC 0000280C 90 01 00 24 */ stw r0, 0x24(r1)
/* 800058D0 00002810 39 61 00 20 */ addi r11, r1, 0x20
/* 800058D4 00002814 48 35 C8 FD */ bl _savegpr_26
/* 800058D8 00002818 7C 7D 1B 78 */ mr r29, r3
/* 800058DC 0000281C 80 63 00 08 */ lwz r3, 8(r3)
/* 800058E0 00002820 80 83 00 38 */ lwz r4, 0x38(r3)
/* 800058E4 00002824 7C 9A 23 78 */ mr r26, r4
/* 800058E8 00002828 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 800058EC 0000282C 7F E0 20 50 */ subf r31, r0, r4
/* 800058F0 00002830 48 2C A4 75 */ bl getTotalUsedSize__10JKRExpHeapCFv
/* 800058F4 00002834 7C 7E 1B 78 */ mr r30, r3
/* 800058F8 00002838 80 7D 00 08 */ lwz r3, 8(r29)
/* 800058FC 0000283C 48 2C 8E 89 */ bl getTotalFreeSize__7JKRHeapCFv
/* 80005900 00002840 7C 7B 1B 78 */ mr r27, r3
/* 80005904 00002844 80 7D 00 08 */ lwz r3, 8(r29)
/* 80005908 00002848 48 2C 8E 25 */ bl getFreeSize__7JKRHeapCFv
/* 8000590C 0000284C 7C 7C 1B 78 */ mr r28, r3
/* 80005910 00002850 38 60 00 64 */ li r3, 0x64
/* 80005914 00002854 38 80 00 D4 */ li r4, 0xd4
/* 80005918 00002858 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 8000591C 0000285C 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005920 00002860 38 A5 00 3C */ addi r5, r5, 0x3c
/* 80005924 00002864 80 DD 00 00 */ lwz r6, 0(r29)
/* 80005928 00002868 4C C6 31 82 */ crclr 6
/* 8000592C 0000286C 48 2D AC 05 */ bl JUTReport__FiiPCce
/* 80005930 00002870 38 60 00 64 */ li r3, 0x64
/* 80005934 00002874 38 80 00 E3 */ li r4, 0xe3
/* 80005938 00002878 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 8000593C 0000287C 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005940 00002880 38 A5 00 45 */ addi r5, r5, 0x45
/* 80005944 00002884 7F 46 D3 78 */ mr r6, r26
/* 80005948 00002888 4C C6 31 82 */ crclr 6
/* 8000594C 0000288C 48 2D AB E5 */ bl JUTReport__FiiPCce
/* 80005950 00002890 38 60 00 64 */ li r3, 0x64
/* 80005954 00002894 38 80 00 F0 */ li r4, 0xf0
/* 80005958 00002898 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 8000595C 0000289C 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005960 000028A0 38 A5 00 5B */ addi r5, r5, 0x5b
/* 80005964 000028A4 80 DD 00 1C */ lwz r6, 0x1c(r29)
/* 80005968 000028A8 4C C6 31 82 */ crclr 6
/* 8000596C 000028AC 48 2D AB C5 */ bl JUTReport__FiiPCce
/* 80005970 000028B0 38 60 00 64 */ li r3, 0x64
/* 80005974 000028B4 38 80 00 FD */ li r4, 0xfd
/* 80005978 000028B8 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 8000597C 000028BC 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005980 000028C0 38 A5 00 71 */ addi r5, r5, 0x71
/* 80005984 000028C4 7C DF D8 50 */ subf r6, r31, r27
/* 80005988 000028C8 4C C6 31 82 */ crclr 6
/* 8000598C 000028CC 48 2D AB A5 */ bl JUTReport__FiiPCce
/* 80005990 000028D0 38 60 00 64 */ li r3, 0x64
/* 80005994 000028D4 38 80 01 0A */ li r4, 0x10a
/* 80005998 000028D8 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 8000599C 000028DC 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 800059A0 000028E0 38 A5 00 87 */ addi r5, r5, 0x87
/* 800059A4 000028E4 7C DF E0 50 */ subf r6, r31, r28
/* 800059A8 000028E8 4C C6 31 82 */ crclr 6
/* 800059AC 000028EC 48 2D AB 85 */ bl JUTReport__FiiPCce
/* 800059B0 000028F0 38 60 00 64 */ li r3, 0x64
/* 800059B4 000028F4 38 80 01 17 */ li r4, 0x117
/* 800059B8 000028F8 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 800059BC 000028FC 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 800059C0 00002900 38 A5 00 9D */ addi r5, r5, 0x9d
/* 800059C4 00002904 7F C6 F3 78 */ mr r6, r30
/* 800059C8 00002908 4C C6 31 82 */ crclr 6
/* 800059CC 0000290C 48 2D AB 65 */ bl JUTReport__FiiPCce
/* 800059D0 00002910 38 60 00 64 */ li r3, 0x64
/* 800059D4 00002914 38 80 01 24 */ li r4, 0x124
/* 800059D8 00002918 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 800059DC 0000291C 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 800059E0 00002920 38 A5 00 B3 */ addi r5, r5, 0xb3
/* 800059E4 00002924 1C DE 00 64 */ mulli r6, r30, 0x64
/* 800059E8 00002928 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 800059EC 0000292C 7C C6 03 D6 */ divw r6, r6, r0
/* 800059F0 00002930 4C C6 31 82 */ crclr 6
/* 800059F4 00002934 48 2D AB 3D */ bl JUTReport__FiiPCce
/* 800059F8 00002938 38 60 00 64 */ li r3, 0x64
/* 800059FC 0000293C 38 80 01 31 */ li r4, 0x131
/* 80005A00 00002940 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 80005A04 00002944 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005A08 00002948 38 A5 00 CF */ addi r5, r5, 0xcf
/* 80005A0C 0000294C 80 DD 00 0C */ lwz r6, 0xc(r29)
/* 80005A10 00002950 4C C6 31 82 */ crclr 6
/* 80005A14 00002954 48 2D AB 1D */ bl JUTReport__FiiPCce
/* 80005A18 00002958 38 60 00 64 */ li r3, 0x64
/* 80005A1C 0000295C 38 80 01 3E */ li r4, 0x13e
/* 80005A20 00002960 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 80005A24 00002964 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005A28 00002968 38 A5 00 E5 */ addi r5, r5, 0xe5
/* 80005A2C 0000296C 80 1D 00 0C */ lwz r0, 0xc(r29)
/* 80005A30 00002970 1C C0 00 64 */ mulli r6, r0, 0x64
/* 80005A34 00002974 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 80005A38 00002978 7C C6 03 D6 */ divw r6, r6, r0
/* 80005A3C 0000297C 4C C6 31 82 */ crclr 6
/* 80005A40 00002980 48 2D AA F1 */ bl JUTReport__FiiPCce
/* 80005A44 00002984 38 60 00 64 */ li r3, 0x64
/* 80005A48 00002988 38 80 01 4B */ li r4, 0x14b
/* 80005A4C 0000298C 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 80005A50 00002990 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005A54 00002994 38 A5 01 01 */ addi r5, r5, 0x101
/* 80005A58 00002998 80 1D 00 10 */ lwz r0, 0x10(r29)
/* 80005A5C 0000299C 7C DF 00 50 */ subf r6, r31, r0
/* 80005A60 000029A0 4C C6 31 82 */ crclr 6
/* 80005A64 000029A4 48 2D AA CD */ bl JUTReport__FiiPCce
/* 80005A68 000029A8 38 60 00 64 */ li r3, 0x64
/* 80005A6C 000029AC 38 80 01 58 */ li r4, 0x158
/* 80005A70 000029B0 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 80005A74 000029B4 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005A78 000029B8 38 A5 01 17 */ addi r5, r5, 0x117
/* 80005A7C 000029BC 80 1D 00 10 */ lwz r0, 0x10(r29)
/* 80005A80 000029C0 7C 1F 00 50 */ subf r0, r31, r0
/* 80005A84 000029C4 1C C0 00 64 */ mulli r6, r0, 0x64
/* 80005A88 000029C8 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 80005A8C 000029CC 7C C6 03 D6 */ divw r6, r6, r0
/* 80005A90 000029D0 4C C6 31 82 */ crclr 6
/* 80005A94 000029D4 48 2D AA 9D */ bl JUTReport__FiiPCce
/* 80005A98 000029D8 80 7D 00 08 */ lwz r3, 8(r29)
/* 80005A9C 000029DC 4B FF FD AD */ bl countUsed__FP10JKRExpHeap
/* 80005AA0 000029E0 7C 66 1B 78 */ mr r6, r3
/* 80005AA4 000029E4 38 60 00 64 */ li r3, 0x64
/* 80005AA8 000029E8 38 80 01 65 */ li r4, 0x165
/* 80005AAC 000029EC 3C A0 80 37 */ lis r5, lbl_803739A0@ha
/* 80005AB0 000029F0 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l
/* 80005AB4 000029F4 38 A5 01 33 */ addi r5, r5, 0x133
/* 80005AB8 000029F8 4C C6 31 82 */ crclr 6
/* 80005ABC 000029FC 48 2D AA 75 */ bl JUTReport__FiiPCce
/* 80005AC0 00002A00 39 61 00 20 */ addi r11, r1, 0x20
/* 80005AC4 00002A04 48 35 C7 59 */ bl _restgpr_26
/* 80005AC8 00002A08 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80005ACC 00002A0C 7C 08 03 A6 */ mtlr r0
/* 80005AD0 00002A10 38 21 00 20 */ addi r1, r1, 0x20
/* 80005AD4 00002A14 4E 80 00 20 */ blr
include/m_Do/m_Do_main/asm/func_800061C8.s
-55
View File
@@ -1,55 +0,0 @@
/* 800061C8 00003108 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800061CC 0000310C 7C 08 02 A6 */ mflr r0
/* 800061D0 00003110 90 01 00 14 */ stw r0, 0x14(r1)
/* 800061D4 00003114 88 0D 80 00 */ lbz r0, lbl_80450580-_SDA_BASE_(r13)
/* 800061D8 00003118 7C 00 07 75 */ extsb. r0, r0
/* 800061DC 0000311C 41 82 00 A0 */ beq lbl_8000627C
/* 800061E0 00003120 88 0D 85 9A */ lbz r0, lbl_80450B1A-_SDA_BASE_(r13)
/* 800061E4 00003124 28 00 00 00 */ cmplwi r0, 0
/* 800061E8 00003128 41 82 00 0C */ beq lbl_800061F4
/* 800061EC 0000312C 38 60 00 02 */ li r3, 2
/* 800061F0 00003130 4B FF F5 9D */ bl CheckHeap__FUl
lbl_800061F4:
/* 800061F4 00003134 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 800061F8 00003138 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 800061FC 0000313C 80 63 00 08 */ lwz r3, 8(r3)
/* 80006200 00003140 80 03 00 18 */ lwz r0, 0x18(r3)
/* 80006204 00003144 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a
/* 80006208 00003148 28 00 00 20 */ cmplwi r0, 0x20
/* 8000620C 0000314C 40 82 00 1C */ bne lbl_80006228
/* 80006210 00003150 80 03 00 1C */ lwz r0, 0x1c(r3)
/* 80006214 00003154 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
/* 80006218 00003158 41 82 00 10 */ beq lbl_80006228
/* 8000621C 0000315C 88 0D 85 98 */ lbz r0, lbl_80450B18-_SDA_BASE_(r13)
/* 80006220 00003160 68 00 00 01 */ xori r0, r0, 1
/* 80006224 00003164 98 0D 85 98 */ stb r0, lbl_80450B18-_SDA_BASE_(r13)
lbl_80006228:
/* 80006228 00003168 88 0D 85 98 */ lbz r0, lbl_80450B18-_SDA_BASE_(r13)
/* 8000622C 0000316C 28 00 00 00 */ cmplwi r0, 0
/* 80006230 00003170 41 82 00 44 */ beq lbl_80006274
/* 80006234 00003174 80 03 00 18 */ lwz r0, 0x18(r3)
/* 80006238 00003178 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a
/* 8000623C 0000317C 28 00 00 40 */ cmplwi r0, 0x40
/* 80006240 00003180 40 82 00 30 */ bne lbl_80006270
/* 80006244 00003184 80 03 00 1C */ lwz r0, 0x1c(r3)
/* 80006248 00003188 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
/* 8000624C 0000318C 41 82 00 24 */ beq lbl_80006270
/* 80006250 00003190 88 6D 80 08 */ lbz r3, lbl_80450588-_SDA_BASE_(r13)
/* 80006254 00003194 28 03 00 05 */ cmplwi r3, 5
/* 80006258 00003198 40 80 00 10 */ bge lbl_80006268
/* 8000625C 0000319C 38 03 00 01 */ addi r0, r3, 1
/* 80006260 000031A0 98 0D 80 08 */ stb r0, lbl_80450588-_SDA_BASE_(r13)
/* 80006264 000031A4 48 00 00 0C */ b lbl_80006270
lbl_80006268:
/* 80006268 000031A8 38 00 00 01 */ li r0, 1
/* 8000626C 000031AC 98 0D 80 08 */ stb r0, lbl_80450588-_SDA_BASE_(r13)
lbl_80006270:
/* 80006270 000031B0 4B FF F8 69 */ bl debugDisplay__Fv
lbl_80006274:
/* 80006274 000031B4 38 60 00 02 */ li r3, 2
/* 80006278 000031B8 4B FF FA D5 */ bl Debug_console__FUl
lbl_8000627C:
/* 8000627C 000031BC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80006280 000031C0 7C 08 03 A6 */ mtlr r0
/* 80006284 000031C4 38 21 00 10 */ addi r1, r1, 0x10
/* 80006288 000031C8 4E 80 00 20 */ blr