encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Start Z2SceneMgr and Various Fixes (#11)

Browse Source 
* Start Z2SceneMgr

* Various Fixes After Merge

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
jdflyer
2020-12-02 20:35:32 -05:00
committed by GitHub
co-authored by Pheenoh
parent 6e9b833ef7
commit 539608859b
39 changed files with 3808 additions and 3579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/Z2AudioLib/Z2SeqMgr.s
+6 -6
View File
@@ -193,7 +193,7 @@ lbl_802AF148:
/* 802AF158 002AC098 98 03 00 1C */ stb r0, 0x1c(r3)
/* 802AF15C 002AC09C 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13)
/* 802AF160 002AC0A0 38 80 00 00 */ li r4, 0
/* 802AF164 002AC0A4 48 00 77 7D */ bl Z2SceneMgr_NS_setSceneExist
/* 802AF164 002AC0A4 48 00 77 7D */ bl setSceneExist__10Z2SceneMgrFb
/* 802AF168 002AC0A8 7F 83 E3 78 */ mr r3, r28
/* 802AF16C 002AC0AC 38 80 00 01 */ li r4, 1
/* 802AF170 002AC0B0 48 00 4F F5 */ bl Z2SeqMgr_NS_setBattleBgmOff
@@ -1012,7 +1012,7 @@ lbl_802AFCA8:
lbl_802AFCC8:
/* 802AFCC8 002ACC08 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13)
/* 802AFCCC 002ACC0C 38 80 00 01 */ li r4, 1
/* 802AFCD0 002ACC10 48 00 6C 11 */ bl Z2SceneMgr_NS_setSceneExist
/* 802AFCD0 002ACC10 48 00 6C 11 */ bl setSceneExist__10Z2SceneMgrFb
/* 802AFCD4 002ACC14 48 00 01 00 */ b lbl_802AFDD4
lbl_802AFCD8:
/* 802AFCD8 002ACC18 80 7F 00 00 */ lwz r3, 0(r31)
@@ -5502,7 +5502,7 @@ lbl_802B3DC4:
lbl_802B3DF8:
/* 802B3DF8 002B0D38 38 64 00 48 */ addi r3, r4, 0x48
/* 802B3DFC 002B0D3C 38 80 00 00 */ li r4, 0
/* 802B3E00 002B0D40 4B FE EF B5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802B3E00 002B0D40 4B FE EF B5 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802B3E04:
/* 802B3E04 002B0D44 80 7F 00 04 */ lwz r3, 4(r31)
/* 802B3E08 002B0D48 28 03 00 00 */ cmplwi r3, 0
@@ -5513,7 +5513,7 @@ lbl_802B3E04:
/* 802B3E1C 002B0D5C C0 1F 00 64 */ lfs f0, 0x64(r31)
/* 802B3E20 002B0D60 EC 21 00 32 */ fmuls f1, f1, f0
/* 802B3E24 002B0D64 38 80 00 00 */ li r4, 0
/* 802B3E28 002B0D68 4B FE EF 8D */ bl JAISoundParamsMove_NS_moveVolume
/* 802B3E28 002B0D68 4B FE EF 8D */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802B3E2C:
/* 802B3E2C 002B0D6C 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 802B3E30 002B0D70 28 03 00 00 */ cmplwi r3, 0
@@ -5524,7 +5524,7 @@ lbl_802B3E2C:
/* 802B3E44 002B0D84 C0 1F 00 44 */ lfs f0, 0x44(r31)
/* 802B3E48 002B0D88 EC 21 00 32 */ fmuls f1, f1, f0
/* 802B3E4C 002B0D8C 38 80 00 00 */ li r4, 0
/* 802B3E50 002B0D90 4B FE EF 65 */ bl JAISoundParamsMove_NS_moveVolume
/* 802B3E50 002B0D90 4B FE EF 65 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802B3E54:
/* 802B3E54 002B0D94 C0 1F 00 94 */ lfs f0, 0x94(r31)
/* 802B3E58 002B0D98 38 00 00 1E */ li r0, 0x1e
@@ -5702,7 +5702,7 @@ lbl_802B40B0:
/* 802B40B0 002B0FF0 7F E3 FB 78 */ mr r3, r31
/* 802B40B4 002B0FF4 FC 20 E8 90 */ fmr f1, f29
/* 802B40B8 002B0FF8 7F C4 F3 78 */ mr r4, r30
/* 802B40BC 002B0FFC 4B FE EC F9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802B40BC 002B0FFC 4B FE EC F9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802B40C0 002B1000 C0 02 BF B4 */ lfs f0, lbl_804559B4-_SDA2_BASE_(r2)
/* 802B40C4 002B1004 FC 00 F0 00 */ fcmpu cr0, f0, f30
/* 802B40C8 002B1008 41 82 00 14 */ beq lbl_802B40DC