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

RBO3 st_common deduplication (#1842)
Some checks are pending
Format code / format (push) Waiting to run
Details
Build C code / extract-assets (push) Waiting to run
Details
Build C code / build-linux (i686, Debug, clang, custom) (push) Blocked by required conditions
Details
Build C code / build-linux (i686, Debug, clang, lle) (push) Blocked by required conditions
Details
Build C code / build-linux (i686, Debug, gcc, custom) (push) Blocked by required conditions
Details
Build C code / build-linux (i686, Debug, gcc, lle) (push) Blocked by required conditions
Details
Build C code / build-linux (i686, RelWithDebInfo, clang, custom) (push) Blocked by required conditions
Details
Build C code / build-linux (i686, RelWithDebInfo, clang, lle) (push) Blocked by required conditions
Details
Build C code / build-linux (i686, RelWithDebInfo, gcc, custom) (push) Blocked by required conditions
Details
Build C code / build-linux (i686, RelWithDebInfo, gcc, lle) (push) Blocked by required conditions
Details
Build C code / build-linux (x86_64, Debug, clang, custom) (push) Blocked by required conditions
Details
Build C code / build-linux (x86_64, Debug, clang, lle) (push) Blocked by required conditions
Details
Build C code / build-linux (x86_64, Debug, gcc, custom) (push) Blocked by required conditions
Details
Build C code / build-linux (x86_64, Debug, gcc, lle) (push) Blocked by required conditions
Details
Build C code / build-linux (x86_64, RelWithDebInfo, clang, custom) (push) Blocked by required conditions
Details
Build C code / build-linux (x86_64, RelWithDebInfo, clang, lle) (push) Blocked by required conditions
Details
Build C code / build-linux (x86_64, RelWithDebInfo, gcc, custom) (push) Blocked by required conditions
Details
Build C code / build-linux (x86_64, RelWithDebInfo, gcc, lle) (push) Blocked by required conditions
Details
Build C code / build-macos (Debug, custom) (push) Blocked by required conditions
Details
Build C code / build-macos (Debug, lle) (push) Blocked by required conditions
Details
Build C code / build-macos (RelWithDebInfo, custom) (push) Blocked by required conditions
Details
Build C code / build-macos (RelWithDebInfo, lle) (push) Blocked by required conditions
Details
Build C code / build-windows (Debug, custom) (push) Blocked by required conditions
Details
Build C code / build-windows (Debug, lle) (push) Blocked by required conditions
Details
Build C code / build-windows (RelWithDebInfo, custom) (push) Blocked by required conditions
Details
Build C code / build-windows (RelWithDebInfo, lle) (push) Blocked by required conditions
Details
Build Saturn version / build-and-test-saturn (push) Waiting to run
Details
Build Saturn version / function-finder-saturn (push) Waiting to run
Details
Build Debug Module tool / build (push) Waiting to run
Details
Build PSX and PSP version / build-and-test (pspeu, hd) (push) Waiting to run
Details
Build PSX and PSP version / build-and-test (pspeu, pspeu) (push) Waiting to run
Details
Build PSX and PSP version / build-and-test (us, us) (push) Waiting to run
Details
Build PSX and PSP version / generate-progress-report (pspeu, hd) (push) Blocked by required conditions
Details
Build PSX and PSP version / generate-progress-report (pspeu, pspeu) (push) Blocked by required conditions
Details
Build PSX and PSP version / generate-progress-report (us, us) (push) Blocked by required conditions
Details
Build PSX and PSP version / generate-duplicates-report (us, us) (push) Blocked by required conditions
Details
Build PSX and PSP version / generate-duplicates-report-psp (pspeu, pspeu) (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Aleksandr Shabelnikov 2024-10-28 23:21:19 +01:00 committed by GitHub
parent c5046ebf2b
commit 09f48e6f0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,11 +43,12 @@ segments:
- [0x390, data] #e_init
- [0x510, .data, st_debug]
- [0x590, data] # e_breakable
- [0x5F0, data]
- [0x5F0, .data, d_prize_drops]
- [0x5FC, data]
- [0x750, .data, st_update]
- [0x77C, .data, collision]
- [0xB3C, .data, e_red_door] # e_red_door
- [0xB54, data] # st_common
- [0xB54, .data, st_common] # st_common
- [0xD54, data] # e_collect
- [0x1044, data, e_misc]
- [0x1160, .data, e_particles]

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

@ -1,3 +1,6 @@
RBO3_pStObjLayoutHorizontal = 0x801801EC;
RBO3_pStObjLayoutVertical = 0x801802C0;
RBO3_EntityUpdates = 0x80180390;
g_EInitBreakable = 0x80180414;
g_EInitObtainable = 0x80180420;
g_EInitParticle = 0x8018042C;
@ -12,6 +15,7 @@ g_eBreakableHitboxes = 0x801805C0;
g_eBreakableExplosionTypes = 0x801805C8;
g_eBreakableanimSets = 0x801805D0;
g_eBreakableDrawModes = 0x801805E0;
RBO3_PrizeDrops = 0x801805F0;
g_SineTable = 0x80180B54;
c_GoldPrizes = 0x80180EF0;
c_HeartPrizes = 0x80180F80;

4
src/boss/rbo3/d_prize_drops.c Normal file
View File

@ -0,0 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#include "rbo3.h"
u16 OVL_EXPORT(PrizeDrops)[] = {0x010F, 0x020C, 0x0307, 0x0404, 0x0520, 0x00FF};

4
src/boss/rbo3/rbo3.c
View File

@ -141,7 +141,7 @@ void func_us_80191438(Entity* self) {
extern Entity D_8007A958;
extern Entity D_8007C0D8;
extern EInit D_us_80180480;
extern u8 D_us_801805F0[];
extern u8 RBO3_PrizeDrops[];
extern u8 D_us_801805FC[];
extern u8 D_us_8018060C[];
extern u8 D_us_80180618[];
@ -184,7 +184,7 @@ void EntityMedusa(Entity* self) {
case 2:
// n.b.! AnimateEntity is not declared
if (!AnimateEntity(D_us_801805F0, self)) {
if (!AnimateEntity(RBO3_PrizeDrops, self)) {
self->hitboxState = 3;
SetStep(3);
}

2
src/boss/rbo3/rbo3.h
View File

@ -15,6 +15,8 @@ typedef enum {
/* 0x0A */ E_EQUIP_ITEM_DROP = 0xA,
/* 0x0B */ E_RELIC_ORB,
/* 0x11 */ E_MEDUSA,
/* 0x14 */ E_ID_14 = 0x14,
/* 0x15 */ E_GREY_PUFF,
/* 0x18 */ UNK_ENTITY_24 = 24,
/* 0x19 */ UNK_ENTITY_25,
/* 0x1A */ UNK_ENTITY_26,

71
src/boss/rbo3/st_common.c
View File

@ -1,70 +1,3 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#include "common.h"
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", DestroyEntity);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", DestroyEntitiesFromIndex);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", PreventEntityFromRespawning);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", AnimateEntity);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", UnkAnimFunc);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetDistanceToPlayerX);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetDistanceToPlayerY);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetSideToPlayer);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", MoveEntity);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", FallEntity);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", UnkCollisionFunc3);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", UnkCollisionFunc2);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", AllocEntity);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetSineScaled);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetSine);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", SetEntityVelocityFromAngle);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", Ratan2Shifted);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetAngleBetweenEntitiesShifted);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetAnglePointToEntity);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", AdjustValueWithinThreshold);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", UnkEntityFunc0);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", Ratan2);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetAngleBetweenEntities);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", func_us_80197148);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetNormalizedAngle);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", SetStep);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", SetSubStep);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", EntityExplosionSpawn);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", InitializeEntity);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", EntityDummy);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", UnkCollisionFunc);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", CheckFieldCollision);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", GetPlayerCollisionWith);
INCLUDE_ASM("boss/rbo3/nonmatchings/st_common", ReplaceBreakableWithItemDrop);
#include "rbo3.h"
#include "../../st/st_common.h"