Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-23 13:09:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Document DestroyCurrentEntity function

Browse Source
This commit is contained in:
Luciano Ciccariello 2023-03-13 23:54:57 +00:00
parent 77eb21410f
commit f111118597
12 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/symbols.stmad.txt
View File

@ -63,6 +63,7 @@ EntityDummy = 0x80192DA8;
ReplaceBreakableWithItemDrop = 0x80193394;
CollectHeartVessel = 0x801938FC;
CollectLifeVessel = 0x8019394C;
DestroyCurrentEntity = 0x8019399C;
EntityPriceDrop = 0x801939E0;
EntityExplosion = 0x80194218;
EntityInventoryDrop = 0x801943EC;

1
config/symbols.us.stdre.txt
View File

@ -25,6 +25,7 @@ func_801A2018 = 0x801A2018;
Random = 0x80196F90;
EntityBreakable = 0x80191D00;
EntityExplosion = 0x8019C63C;
DestroyCurrentEntity = 0x8019BDA0;
EntityPriceDrop = 0x8019BDC8;
EntityNumericDamage = 0x801984DC;
EntityRedDoor = 0x80199770;

2
config/symbols.us.stno3.txt
View File

@ -30,7 +30,9 @@ InitializeEntity = 0x801C5974;
EntityDummy = 0x801C5A70;
ReplaceBreakableWithItemDrop = 0x801C605C;
CollectGold = 0x801C6374;
CollectLifeVessel = 0x801C660C;
CollectHeartVessel = 0x801C6568;
DestroyCurrentEntity = 0x801C665C;
EntityPriceDrop = 0x801C6684;
EntityExplosion = 0x801C6EF8;
EntityInventoryDrop = 0x801C7098;

3
config/symbols.us.stnp3.txt
View File

@ -38,6 +38,9 @@ AllocEntity = 0x801BCD44;
InitializeEntity = 0x801BD1E4;
EntityDummy = 0x801BD2E0;
ReplaceBreakableWithItemDrop = 0x801BD8CC;
CollectHeartVessel = 0x801BDDD8;
CollectLifeVessel = 0x801BDE7C;
DestroyCurrentEntity = 0x801BDECC;
EntityPriceDrop = 0x801BDEF4;
EntityExplosion = 0x801BE768;
EntityInventoryDrop = 0x801BE908;

1
config/symbols.us.stnz0.txt
View File

@ -24,6 +24,7 @@ CollectHeart = 0x801BDF7C;
CollectGold = 0x801BDFFC;
CollectHeartVessel = 0x801BE1F0;
CollectLifeVessel = 0x801BE294;
DestroyCurrentEntity = 0x801BE2E4;
EntityPriceDrop = 0x801BE30C;
EntityExplosion = 0x801BEB80;
EntityInventoryDrop = 0x801BED20;

1
config/symbols.us.stwrp.txt
View File

@ -89,6 +89,7 @@ CollectHeart = 0x8018CC90;
CollectGold = 0x8018CD10;
CollectHeartVessel = 0x8018CF04;
CollectLifeVessel = 0x8018CFA8;
DestroyCurrentEntity = 0x8018CFF8;
EntityPriceDrop = 0x8018D020;
EntityExplosion = 0x8018D894;
EntityInventoryDrop = 0x8018DA34;

2
src/st/dre/14214.c
View File

@ -891,7 +891,7 @@ void CollectLifeVessel(void) {
DestroyEntity(g_CurrentEntity);
}
void func_8019BDA0(void) { DestroyEntity(g_CurrentEntity); }
void DestroyCurrentEntity(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/us/st/dre/nonmatchings/14214", EntityPriceDrop);

2
src/st/mad/D8C8.c
View File

@ -984,7 +984,7 @@ void CollectLifeVessel(void) {
DestroyEntity(g_CurrentEntity);
}
void func_8019399C(void) { DestroyEntity(g_CurrentEntity); }
void DestroyCurrentEntity(void) { DestroyEntity(g_CurrentEntity); }
Entity* func_801939C4(void) {
g_CurrentEntity->step = 3;

4
src/st/no3/3E134.c
View File

@ -1004,13 +1004,13 @@ void CollectHeartVessel(void) {
DestroyEntity(g_CurrentEntity);
}
void func_801C660C(void) {
void CollectLifeVessel(void) {
g_api.PlaySfx(NA_SE_PL_COLLECT_HEART);
g_api.func_800FE044(5, 0x8000);
DestroyEntity(g_CurrentEntity);
}
void func_801C665C(void) { DestroyEntity(g_CurrentEntity); }
void DestroyCurrentEntity(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityPriceDrop);

23
src/st/np3/3246C.c
View File

@ -934,11 +934,28 @@ INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDBE4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDCC0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDDD8);
void CollectHeartVessel(void) {
if (g_CurrentPlayableCharacter != PLAYER_ALUCARD) {
g_api.PlaySfx(NA_SE_PL_COLLECT_HEART);
D_80097BA0.hearts += HEART_VESSEL_RICHTER;
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDE7C);
if (D_80097BA0.heartsMax < D_80097BA0.hearts) {
D_80097BA0.hearts = D_80097BA0.heartsMax;
}
} else {
g_api.PlaySfx(NA_SE_PL_COLLECT_HEART);
g_api.func_800FE044(HEART_VESSEL_INCREASE, 0x4000);
}
DestroyEntity(g_CurrentEntity);
}
void func_801BDECC(void) { DestroyEntity(g_CurrentEntity); }
void CollectLifeVessel(void) {
g_api.PlaySfx(NA_SE_PL_COLLECT_HEART);
g_api.func_800FE044(5, 0x8000);
DestroyEntity(g_CurrentEntity);
}
void DestroyCurrentEntity(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityPriceDrop);

2
src/st/nz0/30958.c
View File

@ -1849,7 +1849,7 @@ void CollectLifeVessel(void) {
DestroyEntity(g_CurrentEntity);
}
void func_801BE2E4(void) { DestroyEntity(g_CurrentEntity); }
void DestroyCurrentEntity(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityPriceDrop);

2
src/st/wrp/6FD0.c
View File

@ -2794,7 +2794,7 @@ void CollectLifeVessel(void) {
DestroyEntity(g_CurrentEntity);
}
void func_8018CFF8(void) { DestroyEntity(g_CurrentEntity); }
void DestroyCurrentEntity(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityPriceDrop);