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

Dedupe no0 create_entity functions (#1753)

Browse Source
This commit is contained in:
Josh Schreuder 2024-10-07 04:48:57 +11:00 committed by GitHub
parent 30652db2dd
commit fffde1f095
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/splat.us.stno0.yaml
View File

@ -39,6 +39,9 @@ segments:
subalign: 4
subsegments:
- [0x0, data]
- [0x778, data, e_laydef]
- [0x91C, data, e_init]
- [0xC8C, data]
- [0x113C, .data, st_update] # UNK_Invincibility0 data
- [0x1168, .data, collision]
- [0x1528, .data, e_red_door]
@ -71,5 +74,6 @@ segments:
- [0x4E654, c, e_stage_name]
- [0x4F4A8, c, unk_4F4A8]
- [0x5E09C, c, prim_helpers]
- [0x5E8CC, sbss]
- [0x5E8CC, .bss, create_entity]
- [0x5E8DC, sbss]
- [0x5F58C]

19
config/symbols.us.stno0.txt
View File

@ -1,6 +1,6 @@
e_laydef_c = 0x80180778;
g_pStObjLayoutHorizontal = 0x80180778;
g_pStObjLayoutVertical = 0x8018084C;
D_80180A90 = 0x8018091C;
PfnEntityUpdates = 0x80180920;
g_InitializeData0 = 0x80180A70;
g_InitializeEntityData0 = 0x80180A7C;
g_InitDataEnt13 = 0x80180AD0;
@ -62,11 +62,16 @@ UpdateStageEntities = 0x801C3AB4;
HitDetection = 0x801C3BBC;
EntityDamageDisplay = 0x801C4CD4;
CreateEntityFromLayout = 0x801C5378;
CreateEntityWhenInHorizontalRange = 0x801C543C;
FindFirstEntityAbove = 0x801C566C;
FindFirstEntityBelow = 0x801C56B8;
CreateEntitiesAbove = 0x801C5710;
CreateEntitiesBelow = 0x801C580C;
CreateEntityWhenInVerticalRange = 0x801C543C;
CreateEntityWhenInHorizontalRange = 0x801C5554;
FindFirstEntityToTheRight = 0x801C566C;
FindFirstEntityToTheLeft = 0x801C56B8;
CreateEntitiesToTheRight = 0x801C5710;
CreateEntitiesToTheLeft = 0x801C580C;
FindFirstEntityAbove = 0x801C5920;
FindFirstEntityBelow = 0x801C596C;
CreateEntitiesAbove = 0x801C59C4;
CreateEntitiesBelow = 0x801C5AC0;
InitRoomEntities = 0x801C5BD4;
UpdateRoomPosition = 0x801C5D4C;
CreateEntityFromCurrentEntity = 0x801C5E00;

33
src/st/no0/create_entity.c
View File

@ -1,33 +1,2 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#include "common.h"
INCLUDE_ASM("st/no0/nonmatchings/create_entity", CreateEntityFromLayout);
INCLUDE_ASM(
"st/no0/nonmatchings/create_entity", CreateEntityWhenInHorizontalRange);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", func_us_801C5554);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", FindFirstEntityAbove);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", FindFirstEntityBelow);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", CreateEntitiesAbove);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", CreateEntitiesBelow);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", func_us_801C5920);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", func_us_801C596C);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", func_us_801C59C4);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", func_us_801C5AC0);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", InitRoomEntities);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", UpdateRoomPosition);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", CreateEntityFromCurrentEntity);
INCLUDE_ASM("st/no0/nonmatchings/create_entity", CreateEntityFromEntity);
#include "../create_entity.h"