Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-10-07 02:24:01 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

SFX defines for Karma Coin (#1423)

Browse Source
This commit is contained in:
SynaMax 2024-07-26 08:44:27 -04:00 committed by GitHub
parent c9f6e2b1b3
commit e81fbf3ca1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sfx.h
View File

@ -218,7 +218,7 @@ typedef enum { MONO_SOUND, STEREO_SOUND } soundMode;
#define NA_SE_EN_ZOMBIE_EXPLODE 0x65E #define NA_SE_EN_ZOMBIE_EXPLODE 0x65E
#define NA_SE_EN_GAIBON_FLAME_OUT 0x65E #define NA_SE_EN_GAIBON_FLAME_OUT 0x65E
#define NA_SE_EN_DR_FIREBALL 0x660 #define NA_SE_EN_DR_FIREBALL 0x660
#define SFX_UNK_665 0x665 #define SFX_THUNDER 0x665
#define SFX_UNK_668 0x668 #define SFX_UNK_668 0x668
#define SFX_UNK_669 0x669 #define SFX_UNK_669 0x669
#define NA_SE_EN_AXE_KNIGHT_BREAK_AXE 0x66B #define NA_SE_EN_AXE_KNIGHT_BREAK_AXE 0x66B
@ -243,7 +243,7 @@ typedef enum { MONO_SOUND, STEREO_SOUND } soundMode;
#define SFX_UNK_6A3 0x6A3 #define SFX_UNK_6A3 0x6A3
#define NA_SE_EV_CLOCK_TICK 0x6A1 #define NA_SE_EV_CLOCK_TICK 0x6A1
#define REBOUND_STONE_BOUNCE 0x6A4 #define REBOUND_STONE_BOUNCE 0x6A4
#define NA_SE_PL_COLLECT_GOLD 0x6A9 #define SFX_COLLECT_GOLD 0x6A9
#define SFX_UNK_6AD 0x6AD #define SFX_UNK_6AD 0x6AD
#define NA_SE_EN_SLOGRA_SPEAR_SLASH 0x6C6 #define NA_SE_EN_SLOGRA_SPEAR_SLASH 0x6C6
#define NA_SE_EN_SLOGRA_BEAK_ATTACK 0x6C8 #define NA_SE_EN_SLOGRA_BEAK_ATTACK 0x6C8
@ -364,6 +364,10 @@ typedef enum { MONO_SOUND, STEREO_SOUND } soundMode;
#define SE_WPN_ALUCARD_SWORD_SWING 0x6A8 #define SE_WPN_ALUCARD_SWORD_SWING 0x6A8
#define SE_WPN_PENTAGRAM 0x6E4 #define SE_WPN_PENTAGRAM 0x6E4
#define SFX_KARMA_COIN 0x682
#define SFX_KARMA_COIN_HEADS 0x6B1
#define SFX_KARMA_COIN_END 0x636
// UNUSED SOUNDS // UNUSED SOUNDS
#define SE_UNK_ST0_618 0x618 #define SE_UNK_ST0_618 0x618
#define SE_UNK_MAD_630 0x630 #define SE_UNK_MAD_630 0x630

2
src/dra/7E4BC.c
View File

@ -654,7 +654,7 @@ void EntityHitByLightning(Entity* self) {
} }
self->ext.hitbylightning.unk94 = 0x10; self->ext.hitbylightning.unk94 = 0x10;
PlaySfx(SFX_UNK_69D); PlaySfx(SFX_UNK_69D);
PlaySfx(SFX_UNK_665); PlaySfx(SFX_THUNDER);
self->step++; self->step++;
break; break;
case 1: case 1:

4
src/dra/843B0.c
View File

@ -2242,7 +2242,7 @@ void EntitySubwpnAgunea(Entity* self) {
self->posY.i.hi += ((rand() & 0xF) - 8); self->posY.i.hi += ((rand() & 0xF) - 8);
if (self->ext.et_80128C2C.unk84 == 0) { if (self->ext.et_80128C2C.unk84 == 0) {
CreateEntFactoryFromEntity(self, FACTORY(0, 23), 0); CreateEntFactoryFromEntity(self, FACTORY(0, 23), 0);
PlaySfx(SFX_UNK_665); PlaySfx(SFX_THUNDER);
CreateEntFactoryFromEntity(self, FACTORY(0x200, 61), 0); CreateEntFactoryFromEntity(self, FACTORY(0x200, 61), 0);
self->ext.et_80128C2C.unk84++; self->ext.et_80128C2C.unk84++;
} else { } else {
@ -2262,7 +2262,7 @@ void EntitySubwpnAgunea(Entity* self) {
if (g_Status.hearts >= heartCost) { if (g_Status.hearts >= heartCost) {
g_Status.hearts -= heartCost; g_Status.hearts -= heartCost;
CreateEntFactoryFromEntity(self, FACTORY(0, 23), 0); CreateEntFactoryFromEntity(self, FACTORY(0, 23), 0);
PlaySfx(SFX_UNK_665); PlaySfx(SFX_THUNDER);
CreateEntFactoryFromEntity(self, FACTORY(0x200, 61), 0); CreateEntFactoryFromEntity(self, FACTORY(0x200, 61), 0);
} else { } else {
self->step = 4; self->step = 4;

2
src/st/collect_gold.h
View File

@ -5,7 +5,7 @@ void CollectGold(u16 goldSize) {
#ifdef VERSION_BETA #ifdef VERSION_BETA
g_api.PlaySfx(0x69D); // MAD seems to use its own sfx id set. g_api.PlaySfx(0x69D); // MAD seems to use its own sfx id set.
#else #else
g_api.PlaySfx(NA_SE_PL_COLLECT_GOLD); g_api.PlaySfx(SFX_COLLECT_GOLD);
#endif #endif
goldSize -= 2; goldSize -= 2;
g_Status.gold += c_GoldPrizes[goldSize]; g_Status.gold += c_GoldPrizes[goldSize];

17
src/weapon/w_020.c
View File

@ -2,6 +2,7 @@
// Karma Coin // Karma Coin
#include "weapon_private.h" #include "weapon_private.h"
#include "shared.h" #include "shared.h"
#include "sfx.h"
extern SpriteParts D_90000_8017A040[]; extern SpriteParts D_90000_8017A040[];
extern AnimationFrame D_90000_8017A850[]; extern AnimationFrame D_90000_8017A850[];
@ -91,7 +92,7 @@ void EntityWeaponAttack(Entity* self) {
self->posY.i.hi += sp10.unk18; self->posY.i.hi += sp10.unk18;
self->animFrameDuration = self->animFrameIdx = 0; self->animFrameDuration = self->animFrameIdx = 0;
self->unk4C = D_90000_8017A864; self->unk4C = D_90000_8017A864;
g_api.PlaySfx(0x6A9); g_api.PlaySfx(SFX_COLLECT_GOLD);
self->step += 1; self->step += 1;
return; return;
} }
@ -124,8 +125,8 @@ void EntityWeaponAttack(Entity* self) {
return; return;
case 2: case 2:
if (((self->animFrameIdx % 8) == 5) && (self->animFrameDuration == 1)) { if (((self->animFrameIdx % 8) == 5) && (self->animFrameDuration == 1)) {
g_api.func_80134714( g_api.func_80134714(SFX_COLLECT_GOLD,
0x6A9, D_90000_8017AB44[self->ext.karmacoin.unk84], 0); D_90000_8017AB44[self->ext.karmacoin.unk84], 0);
self->ext.karmacoin.unk84++; self->ext.karmacoin.unk84++;
} }
if (self->animFrameDuration < 0) { if (self->animFrameDuration < 0) {
@ -146,9 +147,9 @@ void EntityWeaponAttack(Entity* self) {
if ((self->animFrameIdx == 1) && (self->animFrameDuration == 0x38)) { if ((self->animFrameIdx == 1) && (self->animFrameDuration == 0x38)) {
// Useless if-statement // Useless if-statement
if (self->unk4C == D_90000_8017A8C8) { if (self->unk4C == D_90000_8017A8C8) {
g_api.PlaySfx(0x682); g_api.PlaySfx(SFX_KARMA_COIN);
} else { } else {
g_api.PlaySfx(0x682); g_api.PlaySfx(SFX_KARMA_COIN);
} }
} }
if (self->animFrameDuration < 0) { if (self->animFrameDuration < 0) {
@ -160,7 +161,7 @@ void EntityWeaponAttack(Entity* self) {
self->zPriority = 0x1B6; self->zPriority = 0x1B6;
self->flags &= ~FLAG_UNK_100000; self->flags &= ~FLAG_UNK_100000;
g_api.func_80118C28(7); g_api.func_80118C28(7);
g_api.PlaySfx(0x665); g_api.PlaySfx(SFX_THUNDER);
SetWeaponProperties(self, 0); SetWeaponProperties(self, 0);
self->step = 4; self->step = 4;
} else { } else {
@ -178,7 +179,7 @@ void EntityWeaponAttack(Entity* self) {
self->ext.karmacoin.timer = 0xE0; self->ext.karmacoin.timer = 0xE0;
self->unk6C = 0x80; self->unk6C = 0x80;
g_api.func_80118C28(8); g_api.func_80118C28(8);
g_api.PlaySfx(0x6B1); g_api.PlaySfx(SFX_KARMA_COIN_HEADS);
prim = &g_PrimBuf[self->primIndex]; prim = &g_PrimBuf[self->primIndex];
prim->r0 = prim->g0 = prim->b0 = 0x5F; prim->r0 = prim->g0 = prim->b0 = 0x5F;
prim->r1 = prim->g1 = prim->b1 = 0x5F; prim->r1 = prim->g1 = prim->b1 = 0x5F;
@ -336,7 +337,7 @@ void EntityWeaponAttack(Entity* self) {
prim = &g_PrimBuf[self->primIndex]; prim = &g_PrimBuf[self->primIndex];
prim = prim->next; prim = prim->next;
prim->drawMode |= DRAW_HIDE; prim->drawMode |= DRAW_HIDE;
g_api.PlaySfx(0x636); g_api.PlaySfx(SFX_KARMA_COIN_END);
self->step += 1; self->step += 1;
} }
break; break;