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

Rename UpdateStageEntities (#453)

Browse Source 
I wasn't able to get this to work for MAD for some reason. Splat
wouldn't extract the asm under the new filename.
This commit is contained in:
sozud 2023-08-08 12:12:12 -07:00 committed by GitHub
parent 68270423d2
commit 06e47b59e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ EntityUnkId1B = 0x80190A78;
EntityMovingElevator = 0x80190B64;
Random = 0x80190E4C;
Update = 0x80190E7C;
UpdateStageEntities = 0x80191178;
EntityNumericDamage = 0x80192398;
CreateEntityWhenInVerticalRange = 0x80192B00;
CreateEntityWhenInHorizontalRange = 0x80192C18;

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

@ -27,6 +27,7 @@ EntityFadeToWhite1 = 0x8019697C;
EntityFadeToWhite2 = 0x80196CC8;
Random = 0x80196F90;
Update = 0x80196FC0;
UpdateStageEntities = 0x801972BC;
EntityNumericDamage = 0x801984DC;
CreateEntityFromLayout = 0x80198B80;
CreateEntityWhenInVerticalRange = 0x80198C44;

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

@ -60,6 +60,7 @@ EntityUnkId5E = 0x801C12E8;
EntityWargExplosionPuffOpaque = 0x801C14B8;
Random = 0x801C184C;
Update = 0x801C187C;
UpdateStageEntities = 0x801C1B78;
EntityNumericDamage = 0x801C2D98;
CreateEntityFromLayout = 0x801C343C;
CreateEntityWhenInVerticalRange = 0x801C3500;
@ -136,4 +137,4 @@ EntityBoneScimitarParts = 0x801D615C;
EntityBat = 0x801D6264;
EntityZombie = 0x801D64B0;
EntityZombieSpawner = 0x801D6710;
UNK_Update0 = 0x801D7DD8;
UNK_Update0 = 0x801D7DD8;

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

@ -34,6 +34,7 @@ EntitySmallGaibonProjectile = 0x801B8D84;
EntityLargeGaibonProjectile = 0x801B8E94;
Random = 0x801B90BC;
Update = 0x801B90EC;
UpdateStageEntities = 0x801B93E8;
EntityNumericDamage = 0x801BA608;
CreateEntityFromLayout = 0x801BACAC;
CreateEntityWhenInVerticalRange = 0x801BAD70;

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

@ -67,6 +67,7 @@ EntityLargeGaibonProjectile = 0x801B6BBC;
EntityMariaCutscene = 0x801B7D58;
Random = 0x801B94D4;
Update = 0x801B9504;
UpdateStageEntities = 0x801B9800;
TestCollisions = 0x801B9908;
EntityNumericDamage = 0x801BAA20;
CreateEntityFromLayout = 0x801BB0C4;

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

@ -3,6 +3,7 @@ UNK_Invincibility0 = 0x80180690;
g_Rooms = 0x801811AC;
Random = 0x8018A168;
Update = 0x8018A198;
UpdateStageEntities = 0x8018A494;
CreateEntityWhenInVerticalRange = 0x8018BE1C;
CreateEntityWhenInHorizontalRange = 0x8018BF34;
DestroyEntity = 0x8018D580;

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

@ -27,6 +27,7 @@ EntityDraculaRainAttack = 0x801AF154;
SetGameState = 0x801B0030;
Random = 0x801B186C;
Update = 0x801B189C;
UpdateStageEntities = 0x801B1B98;
EntityNumericDamage = 0x801B2A3C;
CreateEntityFromLayout = 0x801B30E0;
CreateEntityWhenInVerticalRange = 0x801B31A4;
@ -70,4 +71,4 @@ func_801BC5C0 = 0x801BC5C0;
func_801BD8F0 = 0x801BD8F0;
EntityBackgroundVortex = 0x801BE1B4;
g_Dialogue = 0x801C24CC;
UNK_Update0 = 0x801C2584;
UNK_Update0 = 0x801C2584;

2
src/st/cen/10E4C.c
View File

@ -3,7 +3,7 @@
#include "../update.h"
INCLUDE_ASM("asm/us/st/cen/nonmatchings/10E4C", func_80191178);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/10E4C", UpdateStageEntities);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/10E4C", func_80191280);

2
src/st/dre/16F90.c
View File

@ -3,7 +3,7 @@
#include "../update.h"
INCLUDE_ASM("asm/us/st/dre/nonmatchings/16F90", func_801972BC);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/16F90", UpdateStageEntities);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/16F90", func_801973C4);

2
src/st/no3/4184C.c
View File

@ -3,7 +3,7 @@
#include "../update.h"
INCLUDE_ASM("asm/us/st/no3/nonmatchings/4184C", func_801C1B78);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/4184C", UpdateStageEntities);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/4184C", func_801C1C80);

2
src/st/np3/390BC.c
View File

@ -3,7 +3,7 @@
#include "../update.h"
void func_801B93E8(void) {
void UpdateStageEntities(void) {
Entity* entity;
for (entity = &g_Entities[STAGE_ENTITY_START];
entity < &g_Entities[TOTAL_ENTITY_COUNT]; entity++) {

2
src/st/nz0/394D4.c
View File

@ -3,7 +3,7 @@
#include "../update.h"
void func_801B9800(void) {
void UpdateStageEntities(void) {
Entity* entity;
for (entity = &g_Entities[STAGE_ENTITY_START];
entity < &g_Entities[TOTAL_ENTITY_COUNT]; entity++) {

2
src/st/rwrp/A168.c
View File

@ -3,7 +3,7 @@
#include "../update.h"
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/A168", func_8018A494);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/A168", UpdateStageEntities);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/A168", func_8018A59C);

2
src/st/st0/3186C.c
View File

@ -3,7 +3,7 @@
#include "../update.h"
INCLUDE_ASM("asm/us/st/st0/nonmatchings/3186C", func_801B1B98);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/3186C", UpdateStageEntities);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/3186C", func_801B1CA0);

2
src/st/wrp/81E8.c
View File

@ -20,7 +20,7 @@ extern LayoutEntity* g_pStObjLayout[];
#include "../update.h"
void func_80188514(void) {
void UpdateStageEntities(void) {
Entity* entity;
for (entity = &g_Entities[STAGE_ENTITY_START];
entity < &g_Entities[TOTAL_ENTITY_COUNT]; entity++) {

4
src/st/wrp/header.c
View File

@ -15,7 +15,7 @@ s16** g_SpriteBanks[];
void* g_Cluts[];
RoomDef g_TileLayers[];
void* g_EntityGfxs[];
void func_80188514(void);
void UpdateStageEntities(void);
Overlay g_StageOverlay = {
/* 0x00 */ Update,
@ -28,7 +28,7 @@ Overlay g_StageOverlay = {
/* 0x1C */ NULL,
/* 0x20 */ g_TileLayers,
/* 0x24 */ g_EntityGfxs,
/* 0x28 */ func_80188514,
/* 0x28 */ UpdateStageEntities,
/* 0x2C */ 0x00000000,
/* 0x30 */ 0x00000000,
/* 0x34 */ 0x00000000,