mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-30 16:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix symbol names (#118)

Browse Source 
* checkpoint

* checkpoint

* rename f_pc

* checkpoint

* small symbol rename and fix some fpc symbols

* remove unneeded entries from ldscript

* simplify ok check, update docker container

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-03-15 07:12:44 +01:00
committed by GitHub
parent 3b69d4cba0
commit 80ba3d9fd2
3357 changed files with 59145 additions and 59695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Z2AudioLib/Z2Creature/Z2Creature.h
+61 -61
View File
@@ -22,17 +22,17 @@ class Z2CreatureEnemy : public Z2Creature {};
extern "C" {
void __ct__10Z2CreatureFv(void);
void Z2Creature_NS_deleteObject(void);
void Z2Creature_NS_dtor(void);
void Z2Creature_NS_framework(void);
void Z2Creature_NS_init(void);
void Z2Creature_NS_init_X1_(void);
void Z2Creature_NS_startCreatureVoice(void);
void deleteObject__10Z2CreatureFv(void);
void __dt__10Z2CreatureFv(void);
void framework__10Z2CreatureFUlSc(void);
void init__10Z2CreatureFP3VecP3VecUcUc(void);
void init__10Z2CreatureFP3VecP3VecP3VecUcUcUc(void);
void startCreatureVoice__10Z2CreatureF10JAISoundIDSc(void);
void Z2CreatureCitizen_NS_init(void);
void Z2CreatureCitizen_NS_setMdlType(void);
void init__17Z2CreatureCitizenFP3VecP3VecUcUc(void);
void setMdlType__17Z2CreatureCitizenFScbb(void);
void Z2CreatureEnemy_NS_deleteObject(void);
void deleteObject__15Z2CreatureEnemyFv(void);
void Z2CreatureLink_NS_startLinkSound(void);
void Z2CreatureLink_NS_startLinkSoundLevel(void);
@@ -40,60 +40,60 @@ void deleteKantera__14Z2CreatureLinkFv(void);
void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(void);
void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(void);
void Z2CreatureRide_NS_setLinkRiding(void);
void setLinkRiding__14Z2CreatureRideFb(void);
void func_802C1B7C(void);
void func_802C2C84(void);
void func_802C110C(void);
void func_802C0C6C(void);
void func_802C0B70(void);
void func_802C29D4(void);
void func_802C1F54(void);
void func_802C25EC(void);
void func_802C0720(void);
void func_802C24B0(void);
void func_802C3040(void);
void func_802C1D6C(void);
void func_802C2290(void);
void func_802C2CD4(void);
void func_802C0BE8(void);
void func_802C10B4(void);
void func_802C1C24(void);
void func_802C199C(void);
void func_802C20E8(void);
void func_802C1BE8(void);
void func_802C168C(void);
void func_802C0BAC(void);
void func_802C0E18(void);
void func_802C1CA0(void);
void func_802C2864(void);
void func_802C087C(void);
void func_802C06F4(void);
void func_802C1A14(void);
void func_802C1D10(void);
void func_802C0AF8(void);
void func_802C10D4(void);
void func_802C1094(void);
void func_802C0ED8(void);
void func_802C1B90(void);
void func_802C136C(void);
void func_802C1D4C(void);
void func_802C2578(void);
void func_802C1FB0(void);
void func_802C2670(void);
void func_802C2194(void);
void func_802C1948(void);
void func_802C0C10(void);
void func_802C0D04(void);
void func_802C0618(void);
void func_802C1FFC(void);
void func_802C24D0(void);
void func_802C19D8(void);
void setLinkSearch__15Z2CreatureEnemyFb(void);
void startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc(void);
void startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc(void);
void __dt__17Z2CreatureCitizenFv(void);
void startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc(void);
void startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc(void);
void __ct__12Z2CreatureFMFv(void);
void deleteObject__12Z2CreatureOIFv(void);
void startCreatureSound__10Z2CreatureF10JAISoundIDUlSc(void);
void init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc(void);
void __sinit_Z2Creature_cpp(void);
void playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc(void);
void startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc(void);
void startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc(void);
void startCollisionSE__10Z2CreatureFUlUl(void);
void init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc(void);
void playSumomoBgm__16Z2CreatureSumomoFUl(void);
void startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc(void);
void framework__12Z2CreatureFMFUlSc(void);
void __ct__16Z2CreatureSumomoFv(void);
void startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc(void);
void startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc(void);
void playVoice__17Z2CreatureCitizenFi(void);
void deleteObject__16Z2CreatureSumomoFv(void);
void framework__12Z2CreatureOIFUlSc(void);
void startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc(void);
void stopAnime__10Z2CreatureFv(void);
void startCollisionSE__15Z2CreatureEnemyFUlUl(void);
void __ct__18Z2SoundObjBeeGroupFv(void);
void startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc(void);
void framework__15Z2CreatureEnemyFUlSc(void);
void init__15Z2CreatureEnemyFP3VecP3VecUcUc(void);
void startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc(void);
void setEnemyName__15Z2CreatureEnemyFPCc(void);
void startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc(void);
void init__18Z2SoundObjBeeGroupFP3VecUc(void);
void __ct__12Z2CreatureOIFv(void);
void deleteObject__12Z2CreatureFMFv(void);
void init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec(void);
void startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc(void);
void startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc(void);
void __ct__17Z2CreatureCitizenFv(void);
void deleteObject__17Z2CreatureCitizenFv(void);
void setSoundStarter__10Z2CreatureFP14Z2SoundStarter(void);
void init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc(void);
void startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc(void);
void startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc(void);
void Z2_B_zan_modPitch(void);
void Z2_E_mm_modPitch(void);
void Z2_E_ms_modVol(void);
void Z2_E_sw_modPitch(void);
void Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl(void);
void Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl(void);
void Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl(void);
void Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl(void);
}
#endif // Z2CREATURE_H_
include/Z2AudioLib/Z2Creature/asm/func_802C03C8.s
+3 -3
View File
@@ -7,11 +7,11 @@
/* 802C03E0 002BD320 38 03 B8 C0 */ addi r0, r3, lbl_803CB8C0@l
/* 802C03E4 002BD324 90 1F 00 00 */ stw r0, 0(r31)
/* 802C03E8 002BD328 38 7F 00 08 */ addi r3, r31, 8
/* 802C03EC 002BD32C 4B FF E7 A9 */ bl Z2SoundObjAnime
/* 802C03EC 002BD32C 4B FF E7 A9 */ bl __ct__15Z2SoundObjAnimeFv
/* 802C03F0 002BD330 38 7F 00 50 */ addi r3, r31, 0x50
/* 802C03F4 002BD334 4B FF E4 51 */ bl Z2SoundObjSimple
/* 802C03F4 002BD334 4B FF E4 51 */ bl __ct__16Z2SoundObjSimpleFv
/* 802C03F8 002BD338 38 7F 00 70 */ addi r3, r31, 0x70
/* 802C03FC 002BD33C 4B FF E4 49 */ bl Z2SoundObjSimple
/* 802C03FC 002BD33C 4B FF E4 49 */ bl __ct__16Z2SoundObjSimpleFv
/* 802C0400 002BD340 38 00 00 00 */ li r0, 0
/* 802C0404 002BD344 90 1F 00 04 */ stw r0, 4(r31)
/* 802C0408 002BD348 7F E3 FB 78 */ mr r3, r31
include/Z2AudioLib/Z2Creature/asm/func_802C05B0.s
+1 -1
View File
@@ -8,7 +8,7 @@
/* 802C05CC 002BD50C 7D 3F 4B 78 */ mr r31, r9
/* 802C05D0 002BD510 7C E6 3B 78 */ mr r6, r7
/* 802C05D4 002BD514 7D 07 43 78 */ mr r7, r8
/* 802C05D8 002BD518 4B FF FF 59 */ bl Z2Creature_NS_init
/* 802C05D8 002BD518 4B FF FF 59 */ bl init__10Z2CreatureFP3VecP3VecUcUc
/* 802C05DC 002BD51C 28 1E 00 00 */ cmplwi r30, 0
/* 802C05E0 002BD520 41 82 00 20 */ beq lbl_802C0600
/* 802C05E4 002BD524 38 7D 00 70 */ addi r3, r29, 0x70
include/Z2AudioLib/Z2Creature/asm/func_802C0628.s
+1 -1
View File
@@ -2,7 +2,7 @@
/* 802C062C 002BD56C 7C 08 02 A6 */ mflr r0
/* 802C0630 002BD570 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C0634 002BD574 38 63 00 08 */ addi r3, r3, 8
/* 802C0638 002BD578 4B FF E5 C5 */ bl Z2SoundObjAnime_NS_initAnime
/* 802C0638 002BD578 4B FF E5 C5 */ bl initAnime__15Z2SoundObjAnimeFPvbff
/* 802C063C 002BD57C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C0640 002BD580 7C 08 03 A6 */ mtlr r0
/* 802C0644 002BD584 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2Creature/asm/func_802C06D0.s
+1 -1
View File
@@ -2,7 +2,7 @@
/* 802C06D4 002BD614 7C 08 02 A6 */ mflr r0
/* 802C06D8 002BD618 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C06DC 002BD61C 38 63 00 08 */ addi r3, r3, 8
/* 802C06E0 002BD620 4B FF E7 F5 */ bl Z2SoundObjAnime_NS_updateAnime
/* 802C06E0 002BD620 4B FF E7 F5 */ bl updateAnime__15Z2SoundObjAnimeFff
/* 802C06E4 002BD624 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C06E8 002BD628 7C 08 03 A6 */ mtlr r0
/* 802C06EC 002BD62C 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2Creature/asm/func_802C0720.s
+1 -1
View File
@@ -78,7 +78,7 @@ lbl_802C07C8:
/* 802C0848 002BD788 38 63 00 48 */ addi r3, r3, 0x48
/* 802C084C 002BD78C FC 20 F8 90 */ fmr f1, f31
/* 802C0850 002BD790 38 80 00 00 */ li r4, 0
/* 802C0854 002BD794 4B FE 25 B9 */ bl JAISoundParamsMove_NS_movePitch
/* 802C0854 002BD794 4B FE 25 B9 */ bl movePitch__18JAISoundParamsMoveFfUl
lbl_802C0858:
/* 802C0858 002BD798 7F E3 FB 78 */ mr r3, r31
lbl_802C085C:
include/Z2AudioLib/Z2Creature/asm/func_802C087C.s
+1 -1
View File
@@ -92,7 +92,7 @@ lbl_802C0988:
/* 802C09D8 002BD918 38 63 00 48 */ addi r3, r3, 0x48
/* 802C09DC 002BD91C FC 20 F0 90 */ fmr f1, f30
/* 802C09E0 002BD920 38 80 00 00 */ li r4, 0
/* 802C09E4 002BD924 4B FE 24 29 */ bl JAISoundParamsMove_NS_movePitch
/* 802C09E4 002BD924 4B FE 24 29 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C09E8 002BD928 48 00 00 38 */ b lbl_802C0A20
lbl_802C09EC:
/* 802C09EC 002BD92C 28 00 00 98 */ cmplwi r0, 0x98
include/Z2AudioLib/Z2Creature/asm/func_802C0A4C.s
+1 -1
View File
@@ -22,7 +22,7 @@ lbl_802C0A94:
/* 802C0A9C 002BD9DC 40 80 00 1C */ bge lbl_802C0AB8
lbl_802C0AA0:
/* 802C0AA0 002BD9E0 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13)
/* 802C0AA4 002BD9E4 48 00 C4 E5 */ bl Z2SpeechMgr2_NS_isMidnaSpeak
/* 802C0AA4 002BD9E4 48 00 C4 E5 */ bl isMidnaSpeak__12Z2SpeechMgr2Fv
/* 802C0AA8 002BD9E8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802C0AAC 002BD9EC 41 82 00 0C */ beq lbl_802C0AB8
/* 802C0AB0 002BD9F0 38 60 00 00 */ li r3, 0
include/Z2AudioLib/Z2Creature/asm/func_802C0BE8.s
+1 -1
View File
@@ -3,7 +3,7 @@
/* 802C0BF0 002BDB30 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C0BF4 002BDB34 38 C0 00 00 */ li r6, 0
/* 802C0BF8 002BDB38 38 63 00 08 */ addi r3, r3, 8
/* 802C0BFC 002BDB3C 4B FF D8 A9 */ bl Z2SoundObjBase_NS_startCollisionSE
/* 802C0BFC 002BDB3C 4B FF D8 A9 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase
/* 802C0C00 002BDB40 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C0C04 002BDB44 7C 08 03 A6 */ mtlr r0
/* 802C0C08 002BDB48 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2Creature/asm/func_802C0C6C.s
+1 -1
View File
@@ -17,7 +17,7 @@
lbl_802C0CAC:
/* 802C0CAC 002BDBEC 7F C3 F3 78 */ mr r3, r30
/* 802C0CB0 002BDBF0 38 80 00 00 */ li r4, 0
/* 802C0CB4 002BDBF4 4B FF F7 6D */ bl Z2Creature_NS_dtor
/* 802C0CB4 002BDBF4 4B FF F7 6D */ bl __dt__10Z2CreatureFv
/* 802C0CB8 002BDBF8 7F E0 07 35 */ extsh. r0, r31
/* 802C0CBC 002BDBFC 40 81 00 0C */ ble lbl_802C0CC8
/* 802C0CC0 002BDC00 7F C3 F3 78 */ mr r3, r30
include/Z2AudioLib/Z2Creature/asm/func_802C0CE4.s
+1 -1
View File
@@ -1,7 +1,7 @@
/* 802C0CE4 002BDC24 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C0CE8 002BDC28 7C 08 02 A6 */ mflr r0
/* 802C0CEC 002BDC2C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C0CF0 002BDC30 4B FF F8 41 */ bl Z2Creature_NS_init
/* 802C0CF0 002BDC30 4B FF F8 41 */ bl init__10Z2CreatureFP3VecP3VecUcUc
/* 802C0CF4 002BDC34 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C0CF8 002BDC38 7C 08 03 A6 */ mtlr r0
/* 802C0CFC 002BDC3C 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2Creature/asm/func_802C0D04.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 802C0D28 002BDC68 4B FE AC 39 */ bl decrCrowdSize__7Z2SeMgrFv
lbl_802C0D2C:
/* 802C0D2C 002BDC6C 7F E3 FB 78 */ mr r3, r31
/* 802C0D30 002BDC70 4B FF F7 B9 */ bl Z2Creature_NS_deleteObject
/* 802C0D30 002BDC70 4B FF F7 B9 */ bl deleteObject__10Z2CreatureFv
/* 802C0D34 002BDC74 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802C0D38 002BDC78 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C0D3C 002BDC7C 7C 08 03 A6 */ mtlr r0
include/Z2AudioLib/Z2Creature/asm/func_802C0ED8.s
+1 -1
View File
@@ -28,7 +28,7 @@ lbl_802C0F34:
/* 802C0F3C 002BDE7C 7F C3 F3 78 */ mr r3, r30
/* 802C0F40 002BDE80 38 81 00 08 */ addi r4, r1, 8
/* 802C0F44 002BDE84 38 A0 FF FF */ li r5, -1
/* 802C0F48 002BDE88 4B FF FB 05 */ bl Z2Creature_NS_startCreatureVoice
/* 802C0F48 002BDE88 4B FF FB 05 */ bl startCreatureVoice__10Z2CreatureF10JAISoundIDSc
/* 802C0F4C 002BDE8C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 802C0F50 002BDE90 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 802C0F54 002BDE94 80 01 00 24 */ lwz r0, 0x24(r1)
include/Z2AudioLib/Z2Creature/asm/func_802C1094.s
+1 -1
View File
@@ -1,7 +1,7 @@
/* 802C1094 002BDFD4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C1098 002BDFD8 7C 08 02 A6 */ mflr r0
/* 802C109C 002BDFDC 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C10A0 002BDFE0 4B FF F4 91 */ bl Z2Creature_NS_init
/* 802C10A0 002BDFE0 4B FF F4 91 */ bl init__10Z2CreatureFP3VecP3VecUcUc
/* 802C10A4 002BDFE4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C10A8 002BDFE8 7C 08 03 A6 */ mtlr r0
/* 802C10AC 002BDFEC 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2Creature/asm/func_802C10B4.s
+1 -1
View File
@@ -1,7 +1,7 @@
/* 802C10B4 002BDFF4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C10B8 002BDFF8 7C 08 02 A6 */ mflr r0
/* 802C10BC 002BDFFC 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C10C0 002BE000 4B FF F4 F1 */ bl Z2Creature_NS_init_X1_
/* 802C10C0 002BE000 4B FF F4 F1 */ bl init__10Z2CreatureFP3VecP3VecP3VecUcUcUc
/* 802C10C4 002BE004 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C10C8 002BE008 7C 08 03 A6 */ mtlr r0
/* 802C10CC 002BE00C 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2Creature/asm/func_802C10D4.s
+1 -1
View File
@@ -8,7 +8,7 @@
/* 802C10F0 002BE030 38 06 00 01 */ addi r0, r6, 1
/* 802C10F4 002BE034 98 03 00 A1 */ stb r0, 0xa1(r3)
lbl_802C10F8:
/* 802C10F8 002BE038 4B FF F5 55 */ bl Z2Creature_NS_framework
/* 802C10F8 002BE038 4B FF F5 55 */ bl framework__10Z2CreatureFUlSc
/* 802C10FC 002BE03C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C1100 002BE040 7C 08 03 A6 */ mtlr r0
/* 802C1104 002BE044 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2Creature/asm/func_802C110C.s
+6 -6
View File
@@ -103,16 +103,16 @@ lbl_802C11E8:
/* 802C1298 002BE1D8 38 63 00 48 */ addi r3, r3, 0x48
/* 802C129C 002BE1DC FC 20 F0 90 */ fmr f1, f30
/* 802C12A0 002BE1E0 38 80 00 00 */ li r4, 0
/* 802C12A4 002BE1E4 4B FE 1B 69 */ bl JAISoundParamsMove_NS_movePitch
/* 802C12A4 002BE1E4 4B FE 1B 69 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C12A8 002BE1E8 48 00 00 4C */ b lbl_802C12F4
/* 802C12AC 002BE1EC A0 9D 00 24 */ lhz r4, 0x24(r29)
/* 802C12B0 002BE1F0 48 00 1B A5 */ bl Z2_E_ms_modVol
/* 802C12B0 002BE1F0 48 00 1B A5 */ bl Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl
/* 802C12B4 002BE1F4 48 00 00 40 */ b lbl_802C12F4
/* 802C12B8 002BE1F8 7F 84 E3 78 */ mr r4, r28
/* 802C12BC 002BE1FC 48 00 1B 25 */ bl Z2_E_sw_modPitch
/* 802C12BC 002BE1FC 48 00 1B 25 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl
/* 802C12C0 002BE200 48 00 00 34 */ b lbl_802C12F4
/* 802C12C4 002BE204 A0 9D 00 24 */ lhz r4, 0x24(r29)
/* 802C12C8 002BE208 48 00 1B D5 */ bl Z2_E_mm_modPitch
/* 802C12C8 002BE208 48 00 1B D5 */ bl Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl
/* 802C12CC 002BE20C 48 00 00 28 */ b lbl_802C12F4
/* 802C12D0 002BE210 80 7E 00 00 */ lwz r3, 0(r30)
/* 802C12D4 002BE214 3C 03 FF F9 */ addis r0, r3, 0xfff9
@@ -122,7 +122,7 @@ lbl_802C11E8:
/* 802C12E4 002BE224 98 1D 00 A3 */ stb r0, 0xa3(r29)
/* 802C12E8 002BE228 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C12EC 002BE22C 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13)
/* 802C12F0 002BE230 4B FF 38 0D */ bl Z2SeqMgr_NS_setBattleLastHit
/* 802C12F0 002BE230 4B FF 38 0D */ bl setBattleLastHit__8Z2SeqMgrFUc
lbl_802C12F4:
/* 802C12F4 002BE234 80 9E 00 00 */ lwz r4, 0(r30)
/* 802C12F8 002BE238 3C 60 00 07 */ lis r3, 0x00070460@ha
@@ -137,7 +137,7 @@ lbl_802C12F4:
lbl_802C131C:
/* 802C131C 002BE25C 7F E3 FB 78 */ mr r3, r31
/* 802C1320 002BE260 A0 9D 00 24 */ lhz r4, 0x24(r29)
/* 802C1324 002BE264 48 00 1B C1 */ bl Z2_B_zan_modPitch
/* 802C1324 002BE264 48 00 1B C1 */ bl Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl
/* 802C1328 002BE268 48 00 00 18 */ b lbl_802C1340
lbl_802C132C:
/* 802C132C 002BE26C A0 1D 00 24 */ lhz r0, 0x24(r29)
include/Z2AudioLib/Z2Creature/asm/func_802C136C.s
+8 -8
View File
@@ -18,22 +18,22 @@
/* 802C13B0 002BE2F0 80 9C 00 04 */ lwz r4, 4(r28)
/* 802C13B4 002BE2F4 38 A1 00 0C */ addi r5, r1, 0xc
/* 802C13B8 002BE2F8 38 C0 00 00 */ li r6, 0
/* 802C13BC 002BE2FC 4B FF C5 71 */ bl Z2Audience_NS_convertAbsToRel
/* 802C13BC 002BE2FC 4B FF C5 71 */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci
/* 802C13C0 002BE300 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13)
/* 802C13C4 002BE304 38 81 00 0C */ addi r4, r1, 0xc
/* 802C13C8 002BE308 C0 22 C2 50 */ lfs f1, lbl_80455C50-_SDA2_BASE_(r2)
/* 802C13CC 002BE30C 38 A0 00 00 */ li r5, 0
/* 802C13D0 002BE310 4B FF C5 8D */ bl Z2Audience_NS_calcRelPosVolume
/* 802C13D0 002BE310 4B FF C5 8D */ bl calcRelPosVolume__10Z2AudienceFRC3Vecfi
/* 802C13D4 002BE314 FF E0 08 90 */ fmr f31, f1
/* 802C13D8 002BE318 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13)
/* 802C13DC 002BE31C 38 81 00 0C */ addi r4, r1, 0xc
/* 802C13E0 002BE320 38 A0 00 00 */ li r5, 0
/* 802C13E4 002BE324 4B FF C6 61 */ bl Z2Audience_NS_calcRelPosPan
/* 802C13E4 002BE324 4B FF C6 61 */ bl calcRelPosPan__10Z2AudienceFRC3Veci
/* 802C13E8 002BE328 FF C0 08 90 */ fmr f30, f1
/* 802C13EC 002BE32C 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13)
/* 802C13F0 002BE330 38 81 00 0C */ addi r4, r1, 0xc
/* 802C13F4 002BE334 38 A0 00 00 */ li r5, 0
/* 802C13F8 002BE338 4B FF C7 4D */ bl Z2Audience_NS_calcRelPosDolby
/* 802C13F8 002BE338 4B FF C7 4D */ bl calcRelPosDolby__10Z2AudienceFRC3Veci
/* 802C13FC 002BE33C FC 60 08 90 */ fmr f3, f1
/* 802C1400 002BE340 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C1404 002BE344 7C 64 1B 78 */ mr r4, r3
@@ -41,7 +41,7 @@
/* 802C140C 002BE34C FC 20 F8 90 */ fmr f1, f31
/* 802C1410 002BE350 38 C0 00 00 */ li r6, 0
/* 802C1414 002BE354 FC 40 F0 90 */ fmr f2, f30
/* 802C1418 002BE358 4B FF 2B D5 */ bl Z2SeqMgr_NS_setChildTrackVolume
/* 802C1418 002BE358 4B FF 2B D5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff
/* 802C141C 002BE35C 38 60 00 00 */ li r3, 0
/* 802C1420 002BE360 48 00 02 44 */ b lbl_802C1664
lbl_802C1424:
@@ -94,7 +94,7 @@ lbl_802C146C:
/* 802C14D4 002BE414 48 00 01 8C */ b lbl_802C1660
lbl_802C14D8:
/* 802C14D8 002BE418 7F C4 F3 78 */ mr r4, r30
/* 802C14DC 002BE41C 48 00 19 05 */ bl Z2_E_sw_modPitch
/* 802C14DC 002BE41C 48 00 19 05 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl
/* 802C14E0 002BE420 48 00 01 80 */ b lbl_802C1660
lbl_802C14E4:
/* 802C14E4 002BE424 28 1F 00 00 */ cmplwi r31, 0
@@ -143,7 +143,7 @@ lbl_802C14E4:
/* 802C1590 002BE4D0 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1594 002BE4D4 FC 20 F8 90 */ fmr f1, f31
/* 802C1598 002BE4D8 38 80 00 00 */ li r4, 0
/* 802C159C 002BE4DC 4B FE 18 71 */ bl JAISoundParamsMove_NS_movePitch
/* 802C159C 002BE4DC 4B FE 18 71 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C15A0 002BE4E0 48 00 00 C0 */ b lbl_802C1660
lbl_802C15A4:
/* 802C15A4 002BE4E4 28 1F 00 00 */ cmplwi r31, 0
@@ -192,7 +192,7 @@ lbl_802C15A4:
/* 802C1650 002BE590 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1654 002BE594 FC 20 F8 90 */ fmr f1, f31
/* 802C1658 002BE598 38 80 00 00 */ li r4, 0
/* 802C165C 002BE59C 4B FE 17 B1 */ bl JAISoundParamsMove_NS_movePitch
/* 802C165C 002BE59C 4B FE 17 B1 */ bl movePitch__18JAISoundParamsMoveFfUl
lbl_802C1660:
/* 802C1660 002BE5A0 7F E3 FB 78 */ mr r3, r31
lbl_802C1664:
include/Z2AudioLib/Z2Creature/asm/func_802C168C.s
+6 -6
View File
@@ -159,7 +159,7 @@ lbl_802C1854:
/* 802C18B4 002BE7F4 98 1E 00 A3 */ stb r0, 0xa3(r30)
/* 802C18B8 002BE7F8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C18BC 002BE7FC 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13)
/* 802C18C0 002BE800 4B FF 32 3D */ bl Z2SeqMgr_NS_setBattleLastHit
/* 802C18C0 002BE800 4B FF 32 3D */ bl setBattleLastHit__8Z2SeqMgrFUc
/* 802C18C4 002BE804 48 00 00 4C */ b lbl_802C1910
/* 802C18C8 002BE808 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C18CC 002BE80C 3C 03 FF F9 */ addis r0, r3, 0xfff9
@@ -169,16 +169,16 @@ lbl_802C1854:
/* 802C18DC 002BE81C 98 1E 00 A3 */ stb r0, 0xa3(r30)
/* 802C18E0 002BE820 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C18E4 002BE824 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13)
/* 802C18E8 002BE828 4B FF 32 15 */ bl Z2SeqMgr_NS_setBattleLastHit
/* 802C18E8 002BE828 4B FF 32 15 */ bl setBattleLastHit__8Z2SeqMgrFUc
/* 802C18EC 002BE82C 48 00 00 24 */ b lbl_802C1910
/* 802C18F0 002BE830 A0 9E 00 6C */ lhz r4, 0x6c(r30)
/* 802C18F4 002BE834 48 00 15 61 */ bl Z2_E_ms_modVol
/* 802C18F4 002BE834 48 00 15 61 */ bl Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl
/* 802C18F8 002BE838 48 00 00 18 */ b lbl_802C1910
/* 802C18FC 002BE83C A0 9E 00 6C */ lhz r4, 0x6c(r30)
/* 802C1900 002BE840 48 00 14 E1 */ bl Z2_E_sw_modPitch
/* 802C1900 002BE840 48 00 14 E1 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl
/* 802C1904 002BE844 48 00 00 0C */ b lbl_802C1910
/* 802C1908 002BE848 A0 9E 00 6C */ lhz r4, 0x6c(r30)
/* 802C190C 002BE84C 48 00 15 91 */ bl Z2_E_mm_modPitch
/* 802C190C 002BE84C 48 00 15 91 */ bl Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl
lbl_802C1910:
/* 802C1910 002BE850 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C1914 002BE854 3C 03 FF F9 */ addis r0, r3, 0xfff9
@@ -186,7 +186,7 @@ lbl_802C1910:
/* 802C191C 002BE85C 40 82 00 10 */ bne lbl_802C192C
/* 802C1920 002BE860 7F A3 EB 78 */ mr r3, r29
/* 802C1924 002BE864 A0 9E 00 6C */ lhz r4, 0x6c(r30)
/* 802C1928 002BE868 48 00 15 BD */ bl Z2_B_zan_modPitch
/* 802C1928 002BE868 48 00 15 BD */ bl Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl
lbl_802C192C:
/* 802C192C 002BE86C 7F A3 EB 78 */ mr r3, r29
/* 802C1930 002BE870 39 61 00 40 */ addi r11, r1, 0x40
include/Z2AudioLib/Z2Creature/asm/func_802C1A14.s
+8 -8
View File
@@ -18,12 +18,12 @@ lbl_802C1A50:
/* 802C1A54 002BE994 98 1D 00 A3 */ stb r0, 0xa3(r29)
/* 802C1A58 002BE998 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C1A5C 002BE99C 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13)
/* 802C1A60 002BE9A0 4B FF 30 9D */ bl Z2SeqMgr_NS_setBattleLastHit
/* 802C1A60 002BE9A0 4B FF 30 9D */ bl setBattleLastHit__8Z2SeqMgrFUc
/* 802C1A64 002BE9A4 38 7D 00 08 */ addi r3, r29, 8
/* 802C1A68 002BE9A8 7F C4 F3 78 */ mr r4, r30
/* 802C1A6C 002BE9AC 7F E5 FB 78 */ mr r5, r31
/* 802C1A70 002BE9B0 38 C0 00 00 */ li r6, 0
/* 802C1A74 002BE9B4 4B FF CA 31 */ bl Z2SoundObjBase_NS_startCollisionSE
/* 802C1A74 002BE9B4 4B FF CA 31 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase
/* 802C1A78 002BE9B8 48 00 00 EC */ b lbl_802C1B64
lbl_802C1A7C:
/* 802C1A7C 002BE9BC 80 1D 00 94 */ lwz r0, 0x94(r29)
@@ -41,7 +41,7 @@ lbl_802C1AA0:
/* 802C1AA4 002BE9E4 7F C4 F3 78 */ mr r4, r30
/* 802C1AA8 002BE9E8 7F E5 FB 78 */ mr r5, r31
/* 802C1AAC 002BE9EC 38 C0 00 00 */ li r6, 0
/* 802C1AB0 002BE9F0 4B FF C9 F5 */ bl Z2SoundObjBase_NS_startCollisionSE
/* 802C1AB0 002BE9F0 4B FF C9 F5 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase
/* 802C1AB4 002BE9F4 48 00 00 B0 */ b lbl_802C1B64
lbl_802C1AB8:
/* 802C1AB8 002BE9F8 38 1F FF E2 */ addi r0, r31, -30
@@ -55,7 +55,7 @@ lbl_802C1AB8:
/* 802C1AD8 002BEA18 4E 80 04 20 */ bctr
/* 802C1ADC 002BEA1C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C1AE0 002BEA20 38 80 00 02 */ li r4, 2
/* 802C1AE4 002BEA24 4B FF 2D 61 */ bl Z2SeqMgr_NS_setBattleSeqState
/* 802C1AE4 002BEA24 4B FF 2D 61 */ bl setBattleSeqState__8Z2SeqMgrFUc
/* 802C1AE8 002BEA28 48 00 00 68 */ b lbl_802C1B50
/* 802C1AEC 002BEA2C 38 00 00 01 */ li r0, 1
/* 802C1AF0 002BEA30 98 1D 00 A3 */ stb r0, 0xa3(r29)
@@ -69,7 +69,7 @@ lbl_802C1B0C:
/* 802C1B0C 002BEA4C 38 80 00 14 */ li r4, 0x14
lbl_802C1B10:
/* 802C1B10 002BEA50 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C1B14 002BEA54 4B FF 2F E9 */ bl Z2SeqMgr_NS_setBattleLastHit
/* 802C1B14 002BEA54 4B FF 2F E9 */ bl setBattleLastHit__8Z2SeqMgrFUc
/* 802C1B18 002BEA58 48 00 00 38 */ b lbl_802C1B50
/* 802C1B1C 002BEA5C 28 04 00 2B */ cmplwi r4, 0x2b
/* 802C1B20 002BEA60 40 82 00 1C */ bne lbl_802C1B3C
@@ -77,20 +77,20 @@ lbl_802C1B10:
/* 802C1B28 002BEA68 98 1D 00 A3 */ stb r0, 0xa3(r29)
/* 802C1B2C 002BEA6C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C1B30 002BEA70 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13)
/* 802C1B34 002BEA74 4B FF 2F C9 */ bl Z2SeqMgr_NS_setBattleLastHit
/* 802C1B34 002BEA74 4B FF 2F C9 */ bl setBattleLastHit__8Z2SeqMgrFUc
/* 802C1B38 002BEA78 48 00 00 18 */ b lbl_802C1B50
lbl_802C1B3C:
/* 802C1B3C 002BEA7C 28 04 00 16 */ cmplwi r4, 0x16
/* 802C1B40 002BEA80 40 82 00 10 */ bne lbl_802C1B50
/* 802C1B44 002BEA84 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802C1B48 002BEA88 38 80 00 02 */ li r4, 2
/* 802C1B4C 002BEA8C 4B FF 2C F9 */ bl Z2SeqMgr_NS_setBattleSeqState
/* 802C1B4C 002BEA8C 4B FF 2C F9 */ bl setBattleSeqState__8Z2SeqMgrFUc
lbl_802C1B50:
/* 802C1B50 002BEA90 38 7D 00 08 */ addi r3, r29, 8
/* 802C1B54 002BEA94 7F C4 F3 78 */ mr r4, r30
/* 802C1B58 002BEA98 7F E5 FB 78 */ mr r5, r31
/* 802C1B5C 002BEA9C 38 C0 00 00 */ li r6, 0
/* 802C1B60 002BEAA0 4B FF C9 45 */ bl Z2SoundObjBase_NS_startCollisionSE
/* 802C1B60 002BEAA0 4B FF C9 45 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase
lbl_802C1B64:
/* 802C1B64 002BEAA4 39 61 00 20 */ addi r11, r1, 0x20
/* 802C1B68 002BEAA8 48 0A 06 C1 */ bl _restgpr_29
include/Z2AudioLib/Z2Creature/asm/func_802C1CA0.s
+1 -1
View File
@@ -23,7 +23,7 @@ lbl_802C1CD4:
/* 802C1CF0 002BEC30 4B FE DB 95 */ bl subBgmStop__8Z2SeqMgrFv
lbl_802C1CF4:
/* 802C1CF4 002BEC34 7F E3 FB 78 */ mr r3, r31
/* 802C1CF8 002BEC38 4B FF E7 F1 */ bl Z2Creature_NS_deleteObject
/* 802C1CF8 002BEC38 4B FF E7 F1 */ bl deleteObject__10Z2CreatureFv
/* 802C1CFC 002BEC3C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 802C1D00 002BEC40 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802C1D04 002BEC44 7C 08 03 A6 */ mtlr r0
include/Z2AudioLib/Z2Creature/asm/func_802C1F54.s
+5 -5
View File
@@ -3,18 +3,18 @@
/* 802C1F5C 002BEE9C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C1F60 002BEEA0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C1F64 002BEEA4 7C 7F 1B 78 */ mr r31, r3
/* 802C1F68 002BEEA8 4B FF EF FD */ bl Z2CreatureEnemy
/* 802C1F68 002BEEA8 4B FF EF FD */ bl __ct__15Z2CreatureEnemyFv
/* 802C1F6C 002BEEAC 3C 60 80 3D */ lis r3, lbl_803CB7E0@ha
/* 802C1F70 002BEEB0 38 03 B7 E0 */ addi r0, r3, lbl_803CB7E0@l
/* 802C1F74 002BEEB4 90 1F 00 00 */ stw r0, 0(r31)
/* 802C1F78 002BEEB8 38 7F 00 A4 */ addi r3, r31, 0xa4
/* 802C1F7C 002BEEBC 4B FF C8 C9 */ bl Z2SoundObjSimple
/* 802C1F7C 002BEEBC 4B FF C8 C9 */ bl __ct__16Z2SoundObjSimpleFv
/* 802C1F80 002BEEC0 38 7F 00 C4 */ addi r3, r31, 0xc4
/* 802C1F84 002BEEC4 4B FF C8 C1 */ bl Z2SoundObjSimple
/* 802C1F84 002BEEC4 4B FF C8 C1 */ bl __ct__16Z2SoundObjSimpleFv
/* 802C1F88 002BEEC8 38 7F 00 E4 */ addi r3, r31, 0xe4
/* 802C1F8C 002BEECC 4B FF C8 B9 */ bl Z2SoundObjSimple
/* 802C1F8C 002BEECC 4B FF C8 B9 */ bl __ct__16Z2SoundObjSimpleFv
/* 802C1F90 002BEED0 38 7F 01 04 */ addi r3, r31, 0x104
/* 802C1F94 002BEED4 4B FF C8 B1 */ bl Z2SoundObjSimple
/* 802C1F94 002BEED4 4B FF C8 B1 */ bl __ct__16Z2SoundObjSimpleFv
/* 802C1F98 002BEED8 7F E3 FB 78 */ mr r3, r31
/* 802C1F9C 002BEEDC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802C1FA0 002BEEE0 80 01 00 14 */ lwz r0, 0x14(r1)
include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s
+1 -1
View File
@@ -3,7 +3,7 @@
/* 802C1FB8 002BEEF8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C1FBC 002BEEFC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C1FC0 002BEF00 7C 7F 1B 78 */ mr r31, r3
/* 802C1FC4 002BEF04 4B FF F0 01 */ bl Z2CreatureEnemy_NS_deleteObject
/* 802C1FC4 002BEF04 4B FF F0 01 */ bl deleteObject__15Z2CreatureEnemyFv
/* 802C1FC8 002BEF08 38 7F 00 A4 */ addi r3, r31, 0xa4
/* 802C1FCC 002BEF0C 4B FF C0 2D */ bl deleteObject__14Z2SoundObjBaseFv
/* 802C1FD0 002BEF10 38 7F 00 C4 */ addi r3, r31, 0xc4
include/Z2AudioLib/Z2Creature/asm/func_802C1FFC.s
+1 -1
View File
@@ -14,7 +14,7 @@
/* 802C2030 002BEF70 8B C1 00 47 */ lbz r30, 0x47(r1)
/* 802C2034 002BEF74 8B E1 00 4B */ lbz r31, 0x4b(r1)
/* 802C2038 002BEF78 7D 46 53 78 */ mr r6, r10
/* 802C203C 002BEF7C 4B FF E4 F5 */ bl Z2Creature_NS_init
/* 802C203C 002BEF7C 4B FF E4 F5 */ bl init__10Z2CreatureFP3VecP3VecUcUc
/* 802C2040 002BEF80 28 18 00 00 */ cmplwi r24, 0
/* 802C2044 002BEF84 41 82 00 20 */ beq lbl_802C2064
/* 802C2048 002BEF88 38 77 00 A4 */ addi r3, r23, 0xa4
include/Z2AudioLib/Z2Creature/asm/func_802C20E8.s
+1 -1
View File
@@ -6,7 +6,7 @@
/* 802C20FC 002BF03C 7C 7D 1B 78 */ mr r29, r3
/* 802C2100 002BF040 7C 9E 23 78 */ mr r30, r4
/* 802C2104 002BF044 7C BF 2B 78 */ mr r31, r5
/* 802C2108 002BF048 4B FF E5 45 */ bl Z2Creature_NS_framework
/* 802C2108 002BF048 4B FF E5 45 */ bl framework__10Z2CreatureFUlSc
/* 802C210C 002BF04C 38 7D 00 A4 */ addi r3, r29, 0xa4
/* 802C2110 002BF050 7F C4 F3 78 */ mr r4, r30
/* 802C2114 002BF054 7F E5 FB 78 */ mr r5, r31
include/Z2AudioLib/Z2Creature/asm/func_802C2290.s
+2 -2
View File
@@ -60,7 +60,7 @@ lbl_802C2364:
/* 802C2368 002BF2A8 38 63 00 48 */ addi r3, r3, 0x48
/* 802C236C 002BF2AC FC 20 F8 90 */ fmr f1, f31
/* 802C2370 002BF2B0 38 80 00 03 */ li r4, 3
/* 802C2374 002BF2B4 4B FE 0A 99 */ bl JAISoundParamsMove_NS_movePitch
/* 802C2374 002BF2B4 4B FE 0A 99 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C2378 002BF2B8 7F E3 FB 78 */ mr r3, r31
/* 802C237C 002BF2BC 48 00 01 18 */ b lbl_802C2494
lbl_802C2380:
@@ -109,7 +109,7 @@ lbl_802C2414:
/* 802C2418 002BF358 38 63 00 48 */ addi r3, r3, 0x48
/* 802C241C 002BF35C FC 20 F8 90 */ fmr f1, f31
/* 802C2420 002BF360 38 80 00 03 */ li r4, 3
/* 802C2424 002BF364 4B FE 09 E9 */ bl JAISoundParamsMove_NS_movePitch
/* 802C2424 002BF364 4B FE 09 E9 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C2428 002BF368 7F E3 FB 78 */ mr r3, r31
/* 802C242C 002BF36C 48 00 00 68 */ b lbl_802C2494
lbl_802C2430:
include/Z2AudioLib/Z2Creature/asm/func_802C24B0.s
+1 -1
View File
@@ -1,7 +1,7 @@
/* 802C24B0 002BF3F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C24B4 002BF3F4 7C 08 02 A6 */ mflr r0
/* 802C24B8 002BF3F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C24BC 002BF3FC 4B FF E0 F5 */ bl Z2Creature_NS_init_X1_
/* 802C24BC 002BF3FC 4B FF E0 F5 */ bl init__10Z2CreatureFP3VecP3VecP3VecUcUcUc
/* 802C24C0 002BF400 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C24C4 002BF404 7C 08 03 A6 */ mtlr r0
/* 802C24C8 002BF408 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2Creature/asm/func_802C2578.s
+11 -11
View File
@@ -3,26 +3,26 @@
/* 802C2580 002BF4C0 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C2584 002BF4C4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C2588 002BF4C8 7C 7F 1B 78 */ mr r31, r3
/* 802C258C 002BF4CC 4B FF E9 D9 */ bl Z2CreatureEnemy
/* 802C258C 002BF4CC 4B FF E9 D9 */ bl __ct__15Z2CreatureEnemyFv
/* 802C2590 002BF4D0 3C 60 80 3D */ lis r3, lbl_803CB780@ha
/* 802C2594 002BF4D4 38 03 B7 80 */ addi r0, r3, lbl_803CB780@l
/* 802C2598 002BF4D8 90 1F 00 00 */ stw r0, 0(r31)
/* 802C259C 002BF4DC 38 7F 00 A4 */ addi r3, r31, 0xa4
/* 802C25A0 002BF4E0 4B FF C2 A5 */ bl Z2SoundObjSimple
/* 802C25A0 002BF4E0 4B FF C2 A5 */ bl __ct__16Z2SoundObjSimpleFv
/* 802C25A4 002BF4E4 38 7F 00 C4 */ addi r3, r31, 0xc4
/* 802C25A8 002BF4E8 4B FF C2 9D */ bl Z2SoundObjSimple
/* 802C25A8 002BF4E8 4B FF C2 9D */ bl __ct__16Z2SoundObjSimpleFv
/* 802C25AC 002BF4EC 38 7F 00 E4 */ addi r3, r31, 0xe4
/* 802C25B0 002BF4F0 4B FF C2 95 */ bl Z2SoundObjSimple
/* 802C25B0 002BF4F0 4B FF C2 95 */ bl __ct__16Z2SoundObjSimpleFv
/* 802C25B4 002BF4F4 38 7F 01 04 */ addi r3, r31, 0x104
/* 802C25B8 002BF4F8 3C 80 80 2C */ lis r4, Z2SoundObjSimple@ha
/* 802C25BC 002BF4FC 38 84 E8 44 */ addi r4, r4, Z2SoundObjSimple@l
/*.global Z2SoundObjSimple_NS_dtor*/
/* 802C25C0 002BF500 3C A0 80 16 */ lis r5, Z2SoundObjSimple_NS_dtor@ha
/*.global Z2SoundObjSimple_NS_dtor*/
/* 802C25C4 002BF504 38 A5 BA 3C */ addi r5, r5, Z2SoundObjSimple_NS_dtor@l
/* 802C25B8 002BF4F8 3C 80 80 2C */ lis r4, __ct__16Z2SoundObjSimpleFv@ha
/* 802C25BC 002BF4FC 38 84 E8 44 */ addi r4, r4, __ct__16Z2SoundObjSimpleFv@l
/*.global __dt__16Z2SoundObjSimpleFv*/
/* 802C25C0 002BF500 3C A0 80 16 */ lis r5, __dt__16Z2SoundObjSimpleFv@ha
/*.global __dt__16Z2SoundObjSimpleFv*/
/* 802C25C4 002BF504 38 A5 BA 3C */ addi r5, r5, __dt__16Z2SoundObjSimpleFv@l
/* 802C25C8 002BF508 38 C0 00 20 */ li r6, 0x20
/* 802C25CC 002BF50C 38 E0 00 08 */ li r7, 8
/* 802C25D0 002BF510 48 09 F7 91 */ bl func_80361D60
/* 802C25D0 002BF510 48 09 F7 91 */ bl __construct_array
/* 802C25D4 002BF514 7F E3 FB 78 */ mr r3, r31
/* 802C25D8 002BF518 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802C25DC 002BF51C 80 01 00 14 */ lwz r0, 0x14(r1)
include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s
+1 -1
View File
@@ -3,7 +3,7 @@
/* 802C25F4 002BF534 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C25F8 002BF538 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C25FC 002BF53C 7C 7F 1B 78 */ mr r31, r3
/* 802C2600 002BF540 4B FF E9 C5 */ bl Z2CreatureEnemy_NS_deleteObject
/* 802C2600 002BF540 4B FF E9 C5 */ bl deleteObject__15Z2CreatureEnemyFv
/* 802C2604 002BF544 38 7F 00 A4 */ addi r3, r31, 0xa4
/* 802C2608 002BF548 4B FF B9 F1 */ bl deleteObject__14Z2SoundObjBaseFv
/* 802C260C 002BF54C 38 7F 00 C4 */ addi r3, r31, 0xc4
include/Z2AudioLib/Z2Creature/asm/func_802C2670.s
+1 -1
View File
@@ -17,7 +17,7 @@
/* 802C26B0 002BF5F0 83 E1 00 5C */ lwz r31, 0x5c(r1)
/* 802C26B4 002BF5F4 38 C0 00 01 */ li r6, 1
/* 802C26B8 002BF5F8 38 E0 00 01 */ li r7, 1
/* 802C26BC 002BF5FC 4B FF DE 75 */ bl Z2Creature_NS_init
/* 802C26BC 002BF5FC 4B FF DE 75 */ bl init__10Z2CreatureFP3VecP3VecUcUc
/* 802C26C0 002BF600 28 15 00 00 */ cmplwi r21, 0
/* 802C26C4 002BF604 41 82 00 20 */ beq lbl_802C26E4
/* 802C26C8 002BF608 38 74 00 A4 */ addi r3, r20, 0xa4
include/Z2AudioLib/Z2Creature/asm/func_802C2864.s
+1 -1
View File
@@ -6,7 +6,7 @@
/* 802C2878 002BF7B8 7C 7D 1B 78 */ mr r29, r3
/* 802C287C 002BF7BC 7C 9E 23 78 */ mr r30, r4
/* 802C2880 002BF7C0 7C BF 2B 78 */ mr r31, r5
/* 802C2884 002BF7C4 4B FF DD C9 */ bl Z2Creature_NS_framework
/* 802C2884 002BF7C4 4B FF DD C9 */ bl framework__10Z2CreatureFUlSc
/* 802C2888 002BF7C8 38 7D 00 A4 */ addi r3, r29, 0xa4
/* 802C288C 002BF7CC 7F C4 F3 78 */ mr r4, r30
/* 802C2890 002BF7D0 7F E5 FB 78 */ mr r5, r31
include/Z2AudioLib/Z2Creature/asm/func_802C29D4.s
+4 -4
View File
@@ -97,7 +97,7 @@
/* 802C2B54 002BFA94 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2B58 002BFA98 FC 20 F0 90 */ fmr f1, f30
/* 802C2B5C 002BFA9C 38 80 00 00 */ li r4, 0
/* 802C2B60 002BFAA0 4B FE 02 AD */ bl JAISoundParamsMove_NS_movePitch
/* 802C2B60 002BFAA0 4B FE 02 AD */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C2B64 002BFAA4 48 00 00 0C */ b lbl_802C2B70
lbl_802C2B68:
/* 802C2B68 002BFAA8 38 60 00 00 */ li r3, 0
@@ -116,7 +116,7 @@ lbl_802C2B70:
/* 802C2B98 002BFAD8 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2B9C 002BFADC FC 20 F0 90 */ fmr f1, f30
/* 802C2BA0 002BFAE0 38 80 00 00 */ li r4, 0
/* 802C2BA4 002BFAE4 4B FE 02 69 */ bl JAISoundParamsMove_NS_movePitch
/* 802C2BA4 002BFAE4 4B FE 02 69 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C2BA8 002BFAE8 48 00 00 0C */ b lbl_802C2BB4
lbl_802C2BAC:
/* 802C2BAC 002BFAEC 38 60 00 00 */ li r3, 0
@@ -135,7 +135,7 @@ lbl_802C2BB4:
/* 802C2BDC 002BFB1C 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2BE0 002BFB20 FC 20 F0 90 */ fmr f1, f30
/* 802C2BE4 002BFB24 38 80 00 00 */ li r4, 0
/* 802C2BE8 002BFB28 4B FE 02 25 */ bl JAISoundParamsMove_NS_movePitch
/* 802C2BE8 002BFB28 4B FE 02 25 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C2BEC 002BFB2C 48 00 00 0C */ b lbl_802C2BF8
lbl_802C2BF0:
/* 802C2BF0 002BFB30 38 60 00 00 */ li r3, 0
@@ -154,7 +154,7 @@ lbl_802C2BF8:
/* 802C2C20 002BFB60 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2C24 002BFB64 FC 20 F0 90 */ fmr f1, f30
/* 802C2C28 002BFB68 38 80 00 00 */ li r4, 0
/* 802C2C2C 002BFB6C 4B FE 01 E1 */ bl JAISoundParamsMove_NS_movePitch
/* 802C2C2C 002BFB6C 4B FE 01 E1 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C2C30 002BFB70 7F E3 FB 78 */ mr r3, r31
/* 802C2C34 002BFB74 48 00 00 28 */ b lbl_802C2C5C
lbl_802C2C38:
include/Z2AudioLib/Z2Creature/asm/func_802C2CD4.s
+1 -1
View File
@@ -52,7 +52,7 @@
/* 802C2DA0 002BFCE0 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2DA4 002BFCE4 FC 20 F0 90 */ fmr f1, f30
/* 802C2DA8 002BFCE8 38 80 00 00 */ li r4, 0
/* 802C2DAC 002BFCEC 4B FE 00 61 */ bl JAISoundParamsMove_NS_movePitch
/* 802C2DAC 002BFCEC 4B FE 00 61 */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C2DB0 002BFCF0 7F E3 FB 78 */ mr r3, r31
/* 802C2DB4 002BFCF4 48 00 00 08 */ b lbl_802C2DBC
lbl_802C2DB8:
include/Z2AudioLib/Z2Creature/asm/func_802C2DE0.s
+1 -1
View File
@@ -26,7 +26,7 @@ lbl_802C2E34:
/* 802C2E34 002BFD74 80 63 00 00 */ lwz r3, 0(r3)
/* 802C2E38 002BFD78 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2E3C 002BFD7C 38 80 00 00 */ li r4, 0
/* 802C2E40 002BFD80 4B FD FF CD */ bl JAISoundParamsMove_NS_movePitch
/* 802C2E40 002BFD80 4B FD FF CD */ bl movePitch__18JAISoundParamsMoveFfUl
lbl_802C2E44:
/* 802C2E44 002BFD84 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C2E48 002BFD88 7C 08 03 A6 */ mtlr r0
include/Z2AudioLib/Z2Creature/asm/func_802C2E9C.s
+1 -1
View File
@@ -11,7 +11,7 @@
/* 802C2EC4 002BFE04 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2EC8 002BFE08 C0 22 C2 64 */ lfs f1, lbl_80455C64-_SDA2_BASE_(r2)
/* 802C2ECC 002BFE0C 38 80 00 00 */ li r4, 0
/* 802C2ED0 002BFE10 4B FD FF 3D */ bl JAISoundParamsMove_NS_movePitch
/* 802C2ED0 002BFE10 4B FD FF 3D */ bl movePitch__18JAISoundParamsMoveFfUl
lbl_802C2ED4:
/* 802C2ED4 002BFE14 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C2ED8 002BFE18 7C 08 03 A6 */ mtlr r0
include/Z2AudioLib/Z2Creature/asm/func_802C2EE4.s
+1 -1
View File
@@ -72,7 +72,7 @@ lbl_802C2FF0:
/* 802C2FF4 002BFF34 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2FF8 002BFF38 FC 20 F8 90 */ fmr f1, f31
/* 802C2FFC 002BFF3C 38 80 00 00 */ li r4, 0
/* 802C3000 002BFF40 4B FD FE 0D */ bl JAISoundParamsMove_NS_movePitch
/* 802C3000 002BFF40 4B FD FE 0D */ bl movePitch__18JAISoundParamsMoveFfUl
/* 802C3004 002BFF44 80 7E 00 00 */ lwz r3, 0(r30)
/* 802C3008 002BFF48 38 63 00 48 */ addi r3, r3, 0x48
/* 802C300C 002BFF4C FC 20 F0 90 */ fmr f1, f30