forked from Xeeynamo/sotn-decomp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Splits RBO3 into logical segments based on other stage overlays. Updates key in `progress.py` to match overlay naming convention.
- Loading branch information
Showing
23 changed files
with
435 additions
and
271 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/blit_char", BlitChar); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/collision", HitDetection); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/collision", EntityDamageDisplay); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // 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_ASM("boss/rbo3/nonmatchings/create_entity", EntityIsNearPlayer); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "rbo3.h" | ||
|
|
||
| extern u8* g_eBreakableAnimations[]; | ||
| extern u8 g_eBreakableHitboxes[]; | ||
| extern u8 g_eBreakableExplosionTypes[]; | ||
| extern u16 g_eBreakableanimSets[]; | ||
| extern u8 g_eBreakableDrawModes[]; | ||
|
|
||
| #include "../../st/e_breakable.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
| #include "rbo3.h" | ||
|
|
||
| #include "../../st/prize_drop_fall.h" | ||
|
|
||
| #include "../../st/prize_drop_fall2.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", CollectHeart); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", CollectGold); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", CollectSubweapon); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", CollectHeartVessel); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", CollectLifeVessel); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", DestroyCurrentEntity); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F54); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F5C); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F64); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F6C); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F74); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F7C); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F84); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F8C); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F94); | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_collect", D_us_80190F9C); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", EntityPrizeDrop); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", EntityExplosion); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", BlinkItem); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_collect", EntityEquipItemDrop); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_life_up", EntityLifeUpSpawn); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_life_up", func_us_8019F2F8); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/e_misc", D_us_80190FDC); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityRelicOrb); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityHeartDrop); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityMessageBox); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", CheckColliderOffsets); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityUnkId13); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityExplosionVariantsSpawner); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityGreyPuffSpawner); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityExplosionVariants); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityGreyPuff); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityOlroxDrool); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", UnkCollisionFunc5); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", UnkCollisionFunc4); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityIntenseExplosion); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", InitializeUnkEntity); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", MakeEntityFromId); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", MakeExplosions); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", EntityBigRedFireball); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", UnkRecursivePrimFunc1); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", UnkRecursivePrimFunc2); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", ClutLerp); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_misc", PlaySfxPositional); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_particles", EntitySoulStealOrb); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_particles", EntityEnemyBlood); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_red_door", EntityRedDoor); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_room_fg", EntityRoomForeground); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_stage_name", StageNamePopupHelper); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/e_stage_name", EntityStageNamePopup); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/popup", BottomCornerText); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_RODATA("boss/rbo3/nonmatchings/prim_helpers", D_us_8019105C); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", UnkPrimHelper); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", UpdateAnimation); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", FindFirstUnkPrim); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", FindFirstUnkPrim2); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", PrimToggleVisibility); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", PrimResetNext); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", UnkPolyFunc2); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", UnkPolyFunc0); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/prim_helpers", PrimDecreaseBrightness); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
|
|
||
| #include "common.h" | ||
| #include "stage.h" | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_80191438); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_8019179C); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_80192020); | ||
|
|
||
| extern u16 D_us_8018048C; | ||
| extern s8 D_us_80180684[]; | ||
| extern u8 D_us_801806B0[]; | ||
|
|
||
| void func_us_801922EC(Entity* self) { | ||
| Entity* prev; | ||
| s32 animCurFrame; | ||
| u8* indexes; | ||
| s8* rect; | ||
|
|
||
| if (!self->step) { | ||
| InitializeEntity(&D_us_8018048C); | ||
| } | ||
|
|
||
| prev = self - 1; | ||
| animCurFrame = prev->animCurFrame; | ||
| self->posX.i.hi = prev->posX.i.hi; | ||
| self->posY.i.hi = prev->posY.i.hi; | ||
| self->facingLeft = prev->facingLeft; | ||
|
|
||
| if (prev->ext.GS_Props.flag) { | ||
| self->hitboxState = 1; | ||
| } else { | ||
| self->hitboxState = 2; | ||
| } | ||
|
|
||
| animCurFrame = prev->animCurFrame; | ||
| indexes = D_us_801806B0; | ||
| rect = D_us_80180684; | ||
| rect += indexes[animCurFrame] * 4; | ||
|
|
||
| self->hitboxOffX = *rect++; | ||
| self->hitboxOffY = *rect++; | ||
| self->hitboxWidth = *rect++; | ||
| self->hitboxHeight = *rect++; | ||
|
|
||
| if (prev->entityId != 0x17) { | ||
| DestroyEntity(self); | ||
| } | ||
| } | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_801923DC); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_80192998); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_80192B38); | ||
|
|
||
| INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_80192D64); | ||
|
|
||
| extern u16 D_us_80180444; | ||
|
|
||
| void func_us_80193050(Entity* self) { | ||
| Primitive* prim; | ||
| s16 primIndex; | ||
| s32 x; | ||
|
|
||
| if (self->step != 0) { | ||
| return; | ||
| } | ||
|
|
||
| InitializeEntity(&D_us_80180444); | ||
| primIndex = g_api.AllocPrimitives(PRIM_GT4, 5); | ||
|
|
||
| if (primIndex == -1) { | ||
| DestroyEntity(self); | ||
| return; | ||
| } | ||
|
|
||
| prim = &g_PrimBuf[primIndex]; | ||
| x = 0; | ||
| self->primIndex = primIndex; | ||
| self->flags |= FLAG_HAS_PRIMS; | ||
|
|
||
| while (prim != NULL) { | ||
| prim->x0 = prim->x2 = x; | ||
| x += 0x3E; | ||
| prim->x1 = prim->x3 = x; | ||
| prim->tpage = 0xF; | ||
| prim->clut = 0xC5; | ||
| prim->u0 = prim->u2 = 0x41; | ||
| prim->u1 = prim->u3 = 0x7F; | ||
| prim->v0 = prim->v1 = 0xA9; | ||
| prim->v2 = prim->v3 = 0xC6; | ||
| prim->y0 = prim->y1 = 0x40; | ||
| prim->y2 = prim->y3 = 0x12; | ||
| prim->priority = 0x10; | ||
| prim->drawMode = DRAW_DEFAULT; | ||
|
|
||
| prim = prim->next; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #ifndef RBO3_H | ||
| #define RBO3_H | ||
|
|
||
| #include <stage.h> | ||
|
|
||
| #define OVL_EXPORT(x) RBO3_##x | ||
|
|
||
| typedef enum { | ||
| /* 0x00 */ E_NONE, | ||
| /* 0x01 */ E_BREAKABLE, | ||
| /* 0x02 */ E_EXPLOSION, | ||
| } EntityIDs; | ||
|
|
||
| #endif // RBO3_H |
Oops, something went wrong.