mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-08 18:43:50 -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/d/d_lib/asm/CSTControl_NS_getAngleStick.s
-4
View File
@@ -1,4 +0,0 @@
/* 8003218C 0002F0CC 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 80032190 0002F0D0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l
/* 80032194 0002F0D4 A8 63 00 1C */ lha r3, 0x1c(r3)
/* 80032198 0002F0D8 4E 80 00 20 */ blr
include/d/d_lib/asm/CSTControl_NS_getValueStick.s
-4
View File
@@ -1,4 +0,0 @@
/* 8003217C 0002F0BC 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 80032180 0002F0C0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l
/* 80032184 0002F0C4 C0 23 00 18 */ lfs f1, 0x18(r3)
/* 80032188 0002F0C8 4E 80 00 20 */ blr
include/d/d_lib/asm/STControl.s
-17
View File
@@ -1,17 +0,0 @@
/* 80032044 0002EF84 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80032048 0002EF88 7C 08 02 A6 */ mflr r0
/* 8003204C 0002EF8C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80032050 0002EF90 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80032054 0002EF94 7C 7F 1B 78 */ mr r31, r3
/* 80032058 0002EF98 3D 40 80 3A */ lis r10, lbl_803A7260@ha
/* 8003205C 0002EF9C 38 0A 72 60 */ addi r0, r10, lbl_803A7260@l
/* 80032060 0002EFA0 90 03 00 00 */ stw r0, 0(r3)
/* 80032064 0002EFA4 48 00 00 25 */ bl setWaitParm__9STControlFssssffss
/* 80032068 0002EFA8 7F E3 FB 78 */ mr r3, r31
/* 8003206C 0002EFAC 48 00 00 41 */ bl init__9STControlFv
/* 80032070 0002EFB0 7F E3 FB 78 */ mr r3, r31
/* 80032074 0002EFB4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80032078 0002EFB8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8003207C 0002EFBC 7C 08 03 A6 */ mtlr r0
/* 80032080 0002EFC0 38 21 00 10 */ addi r1, r1, 0x10
/* 80032084 0002EFC4 4E 80 00 20 */ blr
include/d/d_lib/asm/STControl_NS_Xinit.s
-12
View File
@@ -1,12 +0,0 @@
/* 800320FC 0002F03C 38 00 00 00 */ li r0, 0
/* 80032100 0002F040 B0 03 00 0E */ sth r0, 0xe(r3)
/* 80032104 0002F044 88 03 00 0C */ lbz r0, 0xc(r3)
/* 80032108 0002F048 54 00 06 3A */ rlwinm r0, r0, 0, 0x18, 0x1d
/* 8003210C 0002F04C 98 03 00 0C */ stb r0, 0xc(r3)
/* 80032110 0002F050 A8 03 00 12 */ lha r0, 0x12(r3)
/* 80032114 0002F054 B0 03 00 18 */ sth r0, 0x18(r3)
/* 80032118 0002F058 A8 03 00 1C */ lha r0, 0x1c(r3)
/* 8003211C 0002F05C B0 03 00 1E */ sth r0, 0x1e(r3)
/* 80032120 0002F060 A8 03 00 28 */ lha r0, 0x28(r3)
/* 80032124 0002F064 B0 03 00 2A */ sth r0, 0x2a(r3)
/* 80032128 0002F068 4E 80 00 20 */ blr
include/d/d_lib/asm/STControl_NS_checkDownTrigger.s
-34
View File
@@ -1,34 +0,0 @@
/* 800325A0 0002F4E0 A8 03 00 10 */ lha r0, 0x10(r3)
/* 800325A4 0002F4E4 2C 00 00 00 */ cmpwi r0, 0
/* 800325A8 0002F4E8 40 82 00 6C */ bne lbl_80032614
/* 800325AC 0002F4EC 88 03 00 0C */ lbz r0, 0xc(r3)
/* 800325B0 0002F4F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 800325B4 0002F4F4 41 82 00 60 */ beq lbl_80032614
/* 800325B8 0002F4F8 A8 83 00 1A */ lha r4, 0x1a(r3)
/* 800325BC 0002F4FC A8 03 00 2C */ lha r0, 0x2c(r3)
/* 800325C0 0002F500 7C 04 02 14 */ add r0, r4, r0
/* 800325C4 0002F504 B0 03 00 10 */ sth r0, 0x10(r3)
/* 800325C8 0002F508 38 00 00 00 */ li r0, 0
/* 800325CC 0002F50C B0 03 00 2C */ sth r0, 0x2c(r3)
/* 800325D0 0002F510 A8 83 00 20 */ lha r4, 0x20(r3)
/* 800325D4 0002F514 2C 04 00 00 */ cmpwi r4, 0
/* 800325D8 0002F518 40 82 00 2C */ bne lbl_80032604
/* 800325DC 0002F51C A8 83 00 16 */ lha r4, 0x16(r3)
/* 800325E0 0002F520 A8 03 00 1A */ lha r0, 0x1a(r3)
/* 800325E4 0002F524 7C 04 00 50 */ subf r0, r4, r0
/* 800325E8 0002F528 B0 03 00 1A */ sth r0, 0x1a(r3)
/* 800325EC 0002F52C A8 03 00 1A */ lha r0, 0x1a(r3)
/* 800325F0 0002F530 A8 83 00 14 */ lha r4, 0x14(r3)
/* 800325F4 0002F534 7C 00 20 00 */ cmpw r0, r4
/* 800325F8 0002F538 40 80 00 14 */ bge lbl_8003260C
/* 800325FC 0002F53C B0 83 00 1A */ sth r4, 0x1a(r3)
/* 80032600 0002F540 48 00 00 0C */ b lbl_8003260C
lbl_80032604:
/* 80032604 0002F544 38 04 FF FF */ addi r0, r4, -1
/* 80032608 0002F548 B0 03 00 20 */ sth r0, 0x20(r3)
lbl_8003260C:
/* 8003260C 0002F54C 38 60 00 01 */ li r3, 1
/* 80032610 0002F550 4E 80 00 20 */ blr
lbl_80032614:
/* 80032614 0002F554 38 60 00 00 */ li r3, 0
/* 80032618 0002F558 4E 80 00 20 */ blr
include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s
-34
View File
@@ -1,34 +0,0 @@
/* 8003242C 0002F36C A8 03 00 0E */ lha r0, 0xe(r3)
/* 80032430 0002F370 2C 00 00 00 */ cmpwi r0, 0
/* 80032434 0002F374 40 82 00 6C */ bne lbl_800324A0
/* 80032438 0002F378 88 03 00 0C */ lbz r0, 0xc(r3)
/* 8003243C 0002F37C 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 80032440 0002F380 41 82 00 60 */ beq lbl_800324A0
/* 80032444 0002F384 A8 83 00 18 */ lha r4, 0x18(r3)
/* 80032448 0002F388 A8 03 00 2A */ lha r0, 0x2a(r3)
/* 8003244C 0002F38C 7C 04 02 14 */ add r0, r4, r0
/* 80032450 0002F390 B0 03 00 0E */ sth r0, 0xe(r3)
/* 80032454 0002F394 38 00 00 00 */ li r0, 0
/* 80032458 0002F398 B0 03 00 2A */ sth r0, 0x2a(r3)
/* 8003245C 0002F39C A8 83 00 1E */ lha r4, 0x1e(r3)
/* 80032460 0002F3A0 2C 04 00 00 */ cmpwi r4, 0
/* 80032464 0002F3A4 40 82 00 2C */ bne lbl_80032490
/* 80032468 0002F3A8 A8 83 00 16 */ lha r4, 0x16(r3)
/* 8003246C 0002F3AC A8 03 00 18 */ lha r0, 0x18(r3)
/* 80032470 0002F3B0 7C 04 00 50 */ subf r0, r4, r0
/* 80032474 0002F3B4 B0 03 00 18 */ sth r0, 0x18(r3)
/* 80032478 0002F3B8 A8 03 00 18 */ lha r0, 0x18(r3)
/* 8003247C 0002F3BC A8 83 00 14 */ lha r4, 0x14(r3)
/* 80032480 0002F3C0 7C 00 20 00 */ cmpw r0, r4
/* 80032484 0002F3C4 40 80 00 14 */ bge lbl_80032498
/* 80032488 0002F3C8 B0 83 00 18 */ sth r4, 0x18(r3)
/* 8003248C 0002F3CC 48 00 00 0C */ b lbl_80032498
lbl_80032490:
/* 80032490 0002F3D0 38 04 FF FF */ addi r0, r4, -1
/* 80032494 0002F3D4 B0 03 00 1E */ sth r0, 0x1e(r3)
lbl_80032498:
/* 80032498 0002F3D8 38 60 00 01 */ li r3, 1
/* 8003249C 0002F3DC 4E 80 00 20 */ blr
lbl_800324A0:
/* 800324A0 0002F3E0 38 60 00 00 */ li r3, 0
/* 800324A4 0002F3E4 4E 80 00 20 */ blr
include/d/d_lib/asm/STControl_NS_checkRightTrigger.s
-34
View File
@@ -1,34 +0,0 @@
/* 800324A8 0002F3E8 A8 03 00 0E */ lha r0, 0xe(r3)
/* 800324AC 0002F3EC 2C 00 00 00 */ cmpwi r0, 0
/* 800324B0 0002F3F0 40 82 00 6C */ bne lbl_8003251C
/* 800324B4 0002F3F4 88 03 00 0C */ lbz r0, 0xc(r3)
/* 800324B8 0002F3F8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
/* 800324BC 0002F3FC 41 82 00 60 */ beq lbl_8003251C
/* 800324C0 0002F400 A8 83 00 18 */ lha r4, 0x18(r3)
/* 800324C4 0002F404 A8 03 00 2A */ lha r0, 0x2a(r3)
/* 800324C8 0002F408 7C 04 02 14 */ add r0, r4, r0
/* 800324CC 0002F40C B0 03 00 0E */ sth r0, 0xe(r3)
/* 800324D0 0002F410 38 00 00 00 */ li r0, 0
/* 800324D4 0002F414 B0 03 00 2A */ sth r0, 0x2a(r3)
/* 800324D8 0002F418 A8 83 00 1E */ lha r4, 0x1e(r3)
/* 800324DC 0002F41C 2C 04 00 00 */ cmpwi r4, 0
/* 800324E0 0002F420 40 82 00 2C */ bne lbl_8003250C
/* 800324E4 0002F424 A8 83 00 16 */ lha r4, 0x16(r3)
/* 800324E8 0002F428 A8 03 00 18 */ lha r0, 0x18(r3)
/* 800324EC 0002F42C 7C 04 00 50 */ subf r0, r4, r0
/* 800324F0 0002F430 B0 03 00 18 */ sth r0, 0x18(r3)
/* 800324F4 0002F434 A8 03 00 18 */ lha r0, 0x18(r3)
/* 800324F8 0002F438 A8 83 00 14 */ lha r4, 0x14(r3)
/* 800324FC 0002F43C 7C 00 20 00 */ cmpw r0, r4
/* 80032500 0002F440 40 80 00 14 */ bge lbl_80032514
/* 80032504 0002F444 B0 83 00 18 */ sth r4, 0x18(r3)
/* 80032508 0002F448 48 00 00 0C */ b lbl_80032514
lbl_8003250C:
/* 8003250C 0002F44C 38 04 FF FF */ addi r0, r4, -1
/* 80032510 0002F450 B0 03 00 1E */ sth r0, 0x1e(r3)
lbl_80032514:
/* 80032514 0002F454 38 60 00 01 */ li r3, 1
/* 80032518 0002F458 4E 80 00 20 */ blr
lbl_8003251C:
/* 8003251C 0002F45C 38 60 00 00 */ li r3, 0
/* 80032520 0002F460 4E 80 00 20 */ blr
include/d/d_lib/asm/STControl_NS_checkUpTrigger.s
-34
View File
@@ -1,34 +0,0 @@
/* 80032524 0002F464 A8 03 00 10 */ lha r0, 0x10(r3)
/* 80032528 0002F468 2C 00 00 00 */ cmpwi r0, 0
/* 8003252C 0002F46C 40 82 00 6C */ bne lbl_80032598
/* 80032530 0002F470 88 03 00 0C */ lbz r0, 0xc(r3)
/* 80032534 0002F474 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d
/* 80032538 0002F478 41 82 00 60 */ beq lbl_80032598
/* 8003253C 0002F47C A8 83 00 1A */ lha r4, 0x1a(r3)
/* 80032540 0002F480 A8 03 00 2C */ lha r0, 0x2c(r3)
/* 80032544 0002F484 7C 04 02 14 */ add r0, r4, r0
/* 80032548 0002F488 B0 03 00 10 */ sth r0, 0x10(r3)
/* 8003254C 0002F48C 38 00 00 00 */ li r0, 0
/* 80032550 0002F490 B0 03 00 2C */ sth r0, 0x2c(r3)
/* 80032554 0002F494 A8 83 00 20 */ lha r4, 0x20(r3)
/* 80032558 0002F498 2C 04 00 00 */ cmpwi r4, 0
/* 8003255C 0002F49C 40 82 00 2C */ bne lbl_80032588
/* 80032560 0002F4A0 A8 83 00 16 */ lha r4, 0x16(r3)
/* 80032564 0002F4A4 A8 03 00 1A */ lha r0, 0x1a(r3)
/* 80032568 0002F4A8 7C 04 00 50 */ subf r0, r4, r0
/* 8003256C 0002F4AC B0 03 00 1A */ sth r0, 0x1a(r3)
/* 80032570 0002F4B0 A8 03 00 1A */ lha r0, 0x1a(r3)
/* 80032574 0002F4B4 A8 83 00 14 */ lha r4, 0x14(r3)
/* 80032578 0002F4B8 7C 00 20 00 */ cmpw r0, r4
/* 8003257C 0002F4BC 40 80 00 14 */ bge lbl_80032590
/* 80032580 0002F4C0 B0 83 00 1A */ sth r4, 0x1a(r3)
/* 80032584 0002F4C4 48 00 00 0C */ b lbl_80032590
lbl_80032588:
/* 80032588 0002F4C8 38 04 FF FF */ addi r0, r4, -1
/* 8003258C 0002F4CC B0 03 00 20 */ sth r0, 0x20(r3)
lbl_80032590:
/* 80032590 0002F4D0 38 60 00 01 */ li r3, 1
/* 80032594 0002F4D4 4E 80 00 20 */ blr
lbl_80032598:
/* 80032598 0002F4D8 38 60 00 00 */ li r3, 0
/* 8003259C 0002F4DC 4E 80 00 20 */ blr
include/d/d_lib/asm/STControl_NS_init.s
-20
View File
@@ -1,20 +0,0 @@
/* 800320AC 0002EFEC 38 80 00 00 */ li r4, 0
/* 800320B0 0002EFF0 B0 83 00 0E */ sth r4, 0xe(r3)
/* 800320B4 0002EFF4 B0 83 00 10 */ sth r4, 0x10(r3)
/* 800320B8 0002EFF8 98 83 00 0D */ stb r4, 0xd(r3)
/* 800320BC 0002EFFC 98 83 00 0C */ stb r4, 0xc(r3)
/* 800320C0 0002F000 B0 83 00 22 */ sth r4, 0x22(r3)
/* 800320C4 0002F004 A8 03 00 12 */ lha r0, 0x12(r3)
/* 800320C8 0002F008 B0 03 00 18 */ sth r0, 0x18(r3)
/* 800320CC 0002F00C A8 03 00 12 */ lha r0, 0x12(r3)
/* 800320D0 0002F010 B0 03 00 1A */ sth r0, 0x1a(r3)
/* 800320D4 0002F014 A8 03 00 1C */ lha r0, 0x1c(r3)
/* 800320D8 0002F018 B0 03 00 1E */ sth r0, 0x1e(r3)
/* 800320DC 0002F01C A8 03 00 1C */ lha r0, 0x1c(r3)
/* 800320E0 0002F020 B0 03 00 20 */ sth r0, 0x20(r3)
/* 800320E4 0002F024 B0 83 00 28 */ sth r4, 0x28(r3)
/* 800320E8 0002F028 A8 03 00 28 */ lha r0, 0x28(r3)
/* 800320EC 0002F02C B0 03 00 2A */ sth r0, 0x2a(r3)
/* 800320F0 0002F030 A8 03 00 28 */ lha r0, 0x28(r3)
/* 800320F4 0002F034 B0 03 00 2C */ sth r0, 0x2c(r3)
/* 800320F8 0002F038 4E 80 00 20 */ blr
include/d/d_lib/asm/STControl_NS_setWaitParm.s
-9
View File
@@ -1,9 +0,0 @@
/* 80032088 0002EFC8 B0 83 00 12 */ sth r4, 0x12(r3)
/* 8003208C 0002EFCC B0 A3 00 14 */ sth r5, 0x14(r3)
/* 80032090 0002EFD0 B0 C3 00 16 */ sth r6, 0x16(r3)
/* 80032094 0002EFD4 B0 E3 00 1C */ sth r7, 0x1c(r3)
/* 80032098 0002EFD8 D0 23 00 04 */ stfs f1, 4(r3)
/* 8003209C 0002EFDC D0 43 00 08 */ stfs f2, 8(r3)
/* 800320A0 0002EFE0 B1 03 00 24 */ sth r8, 0x24(r3)
/* 800320A4 0002EFE4 B1 23 00 26 */ sth r9, 0x26(r3)
/* 800320A8 0002EFE8 4E 80 00 20 */ blr
include/d/d_lib/asm/getAngleStick.s
-4
View File
@@ -1,4 +0,0 @@
/* 8003216C 0002F0AC 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 80032170 0002F0B0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l
/* 80032174 0002F0B4 A8 63 00 0C */ lha r3, 0xc(r3)
/* 80032178 0002F0B8 4E 80 00 20 */ blr
include/d/d_lib/asm/getValueStick.s
-4
View File
@@ -1,4 +0,0 @@
/* 8003215C 0002F09C 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 80032160 0002F0A0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l
/* 80032164 0002F0A4 C0 23 00 08 */ lfs f1, 8(r3)
/* 80032168 0002F0A8 4E 80 00 20 */ blr