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

RBO3 create_entity.c dedupe (#1931)

Browse Source
This commit is contained in:
Aleksandr Shabelnikov 2024-11-22 18:56:49 +01:00 committed by GitHub
parent ad98d3dd72
commit e79cb4eb87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/splat.us.borbo3.yaml
View File

@ -84,5 +84,5 @@ segments:
- [0x1E214, c, prim_helpers]
- [0x1EA44, c, e_life_up]
- [0x1F978, .sbss, create_entity]
- [0x1F978, sbss]
- [0x1F988, sbss]
- [0x20630]

15
config/symbols.us.borbo3.txt
View File

@ -46,11 +46,16 @@ UpdateStageEntities = 0x801934C4;
HitDetection = 0x801935CC;
EntityDamageDisplay = 0x801946E4;
CreateEntityFromLayout = 0x80194D88;
CreateEntityWhenInHorizontalRange = 0x80194E4C;
FindFirstEntityAbove = 0x8019507C;
FindFirstEntityBelow = 0x801950C8;
CreateEntitiesAbove = 0x80195120;
CreateEntitiesBelow = 0x8019521C;
CreateEntityWhenInVerticalRange = 0x80194E4C;
CreateEntityWhenInHorizontalRange = 0x80194F64;
FindFirstEntityToTheRight = 0x8019507C;
FindFirstEntityToTheLeft = 0x801950C8;
CreateEntitiesToTheRight = 0x80195120;
CreateEntitiesToTheLeft = 0x8019521C;
FindFirstEntityAbove = 0x80195330;
FindFirstEntityBelow = 0x8019537C;
CreateEntitiesAbove = 0x801953D4;
CreateEntitiesBelow = 0x801954D0;
InitRoomEntities = 0x801955E4;
UpdateRoomPosition = 0x8019575C;
CreateEntityFromCurrentEntity = 0x80195810;

36
src/boss/rbo3/create_entity.c
View File

@ -1,34 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#include "common.h"
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", CreateEntityFromLayout);
INCLUDE_ASM(
"boss/rbo3/nonmatchings/create_entity", CreateEntityWhenInHorizontalRange);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", func_us_80194F64);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", FindFirstEntityAbove);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", FindFirstEntityBelow);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", CreateEntitiesAbove);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", CreateEntitiesBelow);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", func_us_80195330);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", func_us_8019537C);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", func_us_801953D4);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", func_us_801954D0);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", InitRoomEntities);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", UpdateRoomPosition);
INCLUDE_ASM(
"boss/rbo3/nonmatchings/create_entity", CreateEntityFromCurrentEntity);
INCLUDE_ASM("boss/rbo3/nonmatchings/create_entity", CreateEntityFromEntity);
#include "rbo3.h"
#include "../../st/pfn_entity_update.h"
#include "../../st/create_entity.h"