PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert bad rename

This commit is contained in:
Luke Street 2022-08-14 14:42:30 -04:00
parent 85284f7640
commit 16514e942e
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/Kyoto/Audio/DolphinCAudioSys.s
View File

@ -3471,8 +3471,8 @@ __sinit_DolphinCAudioSys_cpp:
.section .sdata2, "a"
.balign 8
.global kkMaxVolume__9CAudioSys
kkMaxVolume__9CAudioSys:
.global kMaxVolume__9CAudioSys
kMaxVolume__9CAudioSys:
# ROM: 0x3FB200
.byte 0x7F

2
asm/MetroidPrime/CActor.s
View File

@ -3522,7 +3522,7 @@ lbl_800559AC:
/* 80055A20 00052980 38 A0 FF FF */ li r5, -1
/* 80055A24 00052984 98 1F 00 B4 */ stb r0, 0xb4(r31)
/* 80055A28 00052988 35 1F 00 DC */ addic. r8, r31, 0xdc
/* 80055A2C 0005298C 88 82 CC 40 */ lbz r4, kkMaxVolume__9CAudioSys@sda21(r2)
/* 80055A2C 0005298C 88 82 CC 40 */ lbz r4, kMaxVolume__9CAudioSys@sda21(r2)
/* 80055A30 00052990 38 60 00 02 */ li r3, 2
/* 80055A34 00052994 88 E1 00 1D */ lbz r7, 0x1d(r1)
/* 80055A38 00052998 38 00 00 00 */ li r0, 0

2
asm/MetroidPrime/CStateManager.s
View File

@ -868,7 +868,7 @@ lbl_80044370:
/* 80044394 000412F4 48 26 E0 5D */ bl GetAudibleFallOff__22CCollisionResponseDataCFv
/* 80044398 000412F8 C0 82 85 68 */ lfs f4, lbl_805AA288@sda21(r2)
/* 8004439C 000412FC 38 C0 00 00 */ li r6, 0
/* 800443A0 00041300 88 A2 CC 40 */ lbz r5, kkMaxVolume__9CAudioSys@sda21(r2)
/* 800443A0 00041300 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2)
/* 800443A4 00041304 38 E0 00 01 */ li r7, 1
/* 800443A8 00041308 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2)
/* 800443AC 0004130C 38 80 00 14 */ li r4, 0x14

4
asm/MetroidPrime/Cameras/CCameraManager.s
View File

@ -3096,7 +3096,7 @@ UpdateSfxListener__14CCameraManagerFR13CStateManager:
/* 8000BA80 000089E0 C0 21 00 78 */ lfs f1, 0x78(r1)
/* 8000BA84 000089E4 C0 01 00 88 */ lfs f0, 0x88(r1)
/* 8000BA88 000089E8 D1 01 00 08 */ stfs f8, 8(r1)
/* 8000BA8C 000089EC 88 E2 CC 40 */ lbz r7, kkMaxVolume__9CAudioSys@sda21(r2)
/* 8000BA8C 000089EC 88 E2 CC 40 */ lbz r7, kMaxVolume__9CAudioSys@sda21(r2)
/* 8000BA90 000089F0 D0 E1 00 0C */ stfs f7, 0xc(r1)
/* 8000BA94 000089F4 D0 C1 00 10 */ stfs f6, 0x10(r1)
/* 8000BA98 000089F8 D0 A1 00 14 */ stfs f5, 0x14(r1)
@ -3613,7 +3613,7 @@ __ct__14CCameraManagerF9TUniqueId:
/* 8000C190 000090F0 38 E1 00 08 */ addi r7, r1, 8
/* 8000C194 000090F4 91 7F 00 80 */ stw r11, 0x80(r31)
/* 8000C198 000090F8 38 60 00 01 */ li r3, 1
/* 8000C19C 000090FC 89 22 CC 40 */ lbz r9, kkMaxVolume__9CAudioSys@sda21(r2)
/* 8000C19C 000090FC 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2)
/* 8000C1A0 00009100 39 00 00 01 */ li r8, 1
/* 8000C1A4 00009104 91 7F 00 84 */ stw r11, 0x84(r31)
/* 8000C1A8 00009108 91 7F 00 88 */ stw r11, 0x88(r31)

2
asm/MetroidPrime/Enemies/CBabygoth.s
View File

@ -692,7 +692,7 @@ lbl_8021D938:
/* 8021D948 0021A8A8 4B E2 F3 AD */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8021D94C 0021A8AC 57 C0 06 3F */ clrlwi. r0, r30, 0x18
/* 8021D950 0021A8B0 41 82 00 2C */ beq lbl_8021D97C
/* 8021D954 0021A8B4 88 A2 CC 40 */ lbz r5, kkMaxVolume__9CAudioSys@sda21(r2)
/* 8021D954 0021A8B4 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2)
/* 8021D958 0021A8B8 7F A4 EB 78 */ mr r4, r29
/* 8021D95C 0021A8BC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2)
/* 8021D960 0021A8C0 38 61 00 2C */ addi r3, r1, 0x2c

2
asm/MetroidPrime/Enemies/CGrenadeLauncher.s
View File

@ -336,7 +336,7 @@ lbl_8022F8D0:
/* 8022F8E0 0022C840 4B E1 D4 15 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8022F8E4 0022C844 A0 9E 03 14 */ lhz r4, 0x314(r30)
/* 8022F8E8 0022C848 38 61 00 28 */ addi r3, r1, 0x28
/* 8022F8EC 0022C84C 88 A2 CC 40 */ lbz r5, kkMaxVolume__9CAudioSys@sda21(r2)
/* 8022F8EC 0022C84C 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2)
/* 8022F8F0 0022C850 38 C0 00 40 */ li r6, 0x40
/* 8022F8F4 0022C854 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2)
/* 8022F8F8 0022C858 38 E0 00 00 */ li r7, 0

4
asm/MetroidPrime/Player/CGrappleArm.s
View File

@ -1303,7 +1303,7 @@ lbl_8011E408:
/* 8011E42C 0011B38C 40 82 00 44 */ bne lbl_8011E470
lbl_8011E430:
/* 8011E430 0011B390 38 01 00 24 */ addi r0, r1, 0x24
/* 8011E434 0011B394 89 22 CC 40 */ lbz r9, kkMaxVolume__9CAudioSys@sda21(r2)
/* 8011E434 0011B394 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2)
/* 8011E438 0011B398 90 01 00 08 */ stw r0, 8(r1)
/* 8011E43C 0011B39C 38 7E 03 4C */ addi r3, r30, 0x34c
/* 8011E440 0011B3A0 38 9E 03 AC */ addi r4, r30, 0x3ac
@ -1368,7 +1368,7 @@ lbl_8011E4FC:
/* 8011E510 0011B470 38 9E 03 AC */ addi r4, r30, 0x3ac
/* 8011E514 0011B474 93 A1 00 0C */ stw r29, 0xc(r1)
/* 8011E518 0011B478 39 41 00 18 */ addi r10, r1, 0x18
/* 8011E51C 0011B47C 89 22 CC 40 */ lbz r9, kkMaxVolume__9CAudioSys@sda21(r2)
/* 8011E51C 0011B47C 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2)
/* 8011E520 0011B480 38 A0 00 00 */ li r5, 0
/* 8011E524 0011B484 93 E1 00 10 */ stw r31, 0x10(r1)
/* 8011E528 0011B488 39 00 00 14 */ li r8, 0x14

4
asm/MetroidPrime/Player/CPlayerGun.s
View File

@ -2320,7 +2320,7 @@ lbl_8003C198:
/* 8003C1B8 00039118 40 82 00 44 */ bne lbl_8003C1FC
lbl_8003C1BC:
/* 8003C1BC 0003911C 38 01 00 24 */ addi r0, r1, 0x24
/* 8003C1C0 00039120 89 22 CC 40 */ lbz r9, kkMaxVolume__9CAudioSys@sda21(r2)
/* 8003C1C0 00039120 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2)
/* 8003C1C4 00039124 90 01 00 08 */ stw r0, 8(r1)
/* 8003C1C8 00039128 38 7E 06 70 */ addi r3, r30, 0x670
/* 8003C1CC 0003912C 38 9E 03 28 */ addi r4, r30, 0x328
@ -2384,7 +2384,7 @@ lbl_8003C284:
/* 8003C298 000391F8 38 9E 03 28 */ addi r4, r30, 0x328
/* 8003C29C 000391FC 93 A1 00 0C */ stw r29, 0xc(r1)
/* 8003C2A0 00039200 39 41 00 18 */ addi r10, r1, 0x18
/* 8003C2A4 00039204 89 22 CC 40 */ lbz r9, kkMaxVolume__9CAudioSys@sda21(r2)
/* 8003C2A4 00039204 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2)
/* 8003C2A8 00039208 38 A0 00 00 */ li r5, 0
/* 8003C2AC 0003920C 93 E1 00 10 */ stw r31, 0x10(r1)
/* 8003C2B0 00039210 39 00 00 14 */ li r8, 0x14

2
asm/MetroidPrime/Weapons/CEnergyProjectile.s
View File

@ -187,7 +187,7 @@ PlayImpactSound__17CEnergyProjectileFRC9CVector3f29EWeaponCollisionResponseTypes
/* 80213CC4 00210C24 48 09 B4 9D */ bl GetAudibleFallOff__17CProjectileWeaponCFv
/* 80213CC8 00210C28 C0 82 B3 10 */ lfs f4, lbl_805AD030@sda21(r2)
/* 80213CCC 00210C2C 38 C0 00 00 */ li r6, 0
/* 80213CD0 00210C30 88 A2 CC 40 */ lbz r5, kkMaxVolume__9CAudioSys@sda21(r2)
/* 80213CD0 00210C30 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2)
/* 80213CD4 00210C34 38 E0 00 01 */ li r7, 1
/* 80213CD8 00210C38 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2)
/* 80213CDC 00210C3C 38 80 00 14 */ li r4, 0x14

2
include/Kyoto/Audio/CAudioSys.hpp
View File

@ -5,7 +5,7 @@
class CAudioSys {
public:
static const u8 kkMaxVolume;
static const u8 kMaxVolume;
};
#endif

2
src/MetroidPrime/CActor.cpp
View File

@ -39,7 +39,7 @@ CActor::CActor(TUniqueId uid, bool active, const rstl::string& name, const CEnti
, xc8_drawnToken(-1)
, xcc_addedToken(-1)
, xd0_damageMag(params.GetThermalMag())
, xd4_maxVol(CAudioSys::kkMaxVolume)
, xd4_maxVol(CAudioSys::kMaxVolume)
, xd8_nonLoopingSfxHandles(CSfxHandle(0))
, xe4_24_nextNonLoopingSfxHandle(0)
, xe4_27_notInSortedLists(true)