Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-10-07 10:33:37 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

ST WRP PSX re-organise C files (#1185)

Browse Source 
Same as #1181 but on PSX. The imported data falls right at the top of
each new file based on some old assumptions of mine, suggesting we're
probably on the right track.
This commit is contained in:
Luciano Ciccariello 2024-05-26 23:44:33 +01:00 committed by GitHub
parent cd87f4da0a
commit 88f221fb1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 513 additions and 506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
config/splat.us.stwrp.yaml
View File

@ -34,8 +34,9 @@ segments:
- [0x0, .data, header]
- [0xB8, layers, rooms]
- [0x1B8, .data, 6FD0]
- [0xF84, .data, entity_relic_orb]
- [0xFE8, .data, F420]
- [0xF84, .data, e_misc]
- [0xFE8, .data, e_particles]
- [0x1120, .data, e_room_fg]
- [0x11AC, roomdef, g_Rooms]
- [0x1228, layoutobj, D_80181228]
- [0x1250, layoutobj, D_80181250]
@ -74,26 +75,28 @@ segments:
- [0x6E30, .rodata, 6FD0]
- [0x6E70, .rodata, warp] # EntityWarpRoom
- [0x6E90, .rodata, warp] # EntityWarpSmallRocks
- [0x6EA8, .rodata, 861C] # EntityRedDoor
- [0x6EA8, .rodata, e_red_door] # EntityRedDoor
- [0x6EC0, rodata] # CollectGold
- [0x6F10, .rodata, D020]
- [0x6F30, .rodata, D020] # EntityEquipItemDrop
- [0x6F48, .rodata, entity_relic_orb]
- [0x6F80, .rodata, entity_message_box]
- [0x6F94, .rodata, F420] # EntityStageNamePopup
- [0x6F10, .rodata, st_common]
- [0x6F30, .rodata, e_collect] # EntityEquipItemDrop
- [0x6F48, .rodata, e_misc]
- [0x6F94, .rodata, e_stage_name] # EntityStageNamePopup
- [0x6FC8, rodata]
- [0x6FD0, c, st_debug]
- [0x726C, c, e_breakable]
- [0x73A0, c, warp]
- [0x81E8, c, random]
- [0x8218, c, update]
- [0x8514, c, update_stage_entities]
- [0x861C, c]
- [0xD020, c]
- [0xE2CC, c, entity_relic_orb]
- [0xED9C, c, entity_heart_drop]
- [0xEEC4, c, entity_message_box]
- [0xF420, c]
- [0x81E8, c, st_update]
- [0x861C, c, collision]
- [0x9DD8, c, create_entity]
- [0xA950, c, e_red_door]
- [0xB600, c, st_common]
- [0xCAB0, c, e_collect]
- [0xE01C, c, blit_char]
- [0xE2CC, c, e_misc]
- [0x117BC, c, e_stage_name]
- [0x12610, c, e_particles]
- [0x12E54, c, e_room_fg]
- [0x12F40, c, popup]
- [0x13270, c, prim_helpers]
- [0x13AA0, sbss] # bss?
- [0x14768]

2
src/st/entity_red_door.h
View File

@ -1,5 +1,7 @@
#include <game.h>
#include "entity_is_near_player.h"
extern u8 g_eRedDoorUV[3][8];
extern u16 g_eRedDoorTiles[2][8];
void EntityRedDoor(Entity* self) {

1
src/st/libstage.h
View File

@ -9,4 +9,3 @@
#include "init_room_entities.h"
#include "update_room_position.h"
#include "create_entity_from_entity.h"
#include "entity_is_near_player.h"

1
src/st/mad/EDB8.c
View File

@ -47,7 +47,6 @@ void CreateEntitiesToTheLeft(s16 posX) {
#include "../init_room_entities.h"
#include "../update_room_position.h"
#include "../create_entity_from_entity.h"
#include "../entity_is_near_player.h"
#include "../entity_red_door.h"

3
src/st/rwrp/A59C.c
View File

@ -1,10 +1,13 @@
#include "rwrp.h"
INCLUDE_ASM("st/rwrp/nonmatchings/A59C", TestCollisions);
INCLUDE_ASM("st/rwrp/nonmatchings/A59C", func_8018B6B4);
#include "../libstage.h"
#include "../entity_is_near_player.h"
INCLUDE_ASM("st/rwrp/nonmatchings/A59C", func_8018C948);
#include "../entity.h"

3
src/st/wrp/6FD0.c
View File

@ -1028,6 +1028,5 @@ u8* D_80180F70[] = {
D_80180ED8, D_80180EEC, D_80180F08, D_80180F38, D_80180F6C,
};
// *** bss? section start ***
// BSS
extern u16 g_ItemIconSlots[];
// *** bss? section end ***

3
src/st/wrp/blit_char.c Normal file
View File

@ -0,0 +1,3 @@
#include "wrp.h"
#include "../blit_char.h"

5
src/st/wrp/collision.c Normal file
View File

@ -0,0 +1,5 @@
#include "wrp.h"
INCLUDE_ASM("st/wrp/nonmatchings/collision", TestCollisions);
#include "../entity_damage_display.h"

3
src/st/wrp/create_entity.c Normal file
View File

@ -0,0 +1,3 @@
#include "wrp.h"
#include "../libstage.h"

137
src/st/wrp/D020.c → src/st/wrp/e_collect.c
View File

@ -1,8 +1,143 @@
#include "wrp.h"
extern LayoutEntity* D_80180310[];
extern u16 D_80180DC4[];
extern u16 D_80180DF4[];
extern u8* D_80180E08[];
extern s8 c_HeartPrizes[];
extern u8* D_80180E58[];
extern u16 D_80180EB8[];
extern s32 c_GoldPrizes[];
extern u16 g_ItemIconSlots[];
extern u16 UNK_Invincibility0[];
void func_8018CAB0(void) {
s32 temp_v1;
Entity* entity;
entity = g_CurrentEntity;
if (entity->velocityY >= 0) {
temp_v1 =
entity->ext.generic.unk88.S16.unk0 + entity->ext.generic.unk84.unk;
entity->ext.generic.unk84.unk = temp_v1;
entity->velocityX = temp_v1;
if (temp_v1 == 0x10000 || temp_v1 == -0x10000) {
entity->ext.generic.unk88.S16.unk0 =
-entity->ext.generic.unk88.S16.unk0;
}
entity = g_CurrentEntity;
}
if (entity->velocityY < FIX(0.25)) {
entity->velocityY += FIX(0.125);
}
}
void func_8018CB34(u16 arg0) {
Collider collider;
if (g_CurrentEntity->velocityX < 0) {
g_api.CheckCollision(g_CurrentEntity->posX.i.hi,
g_CurrentEntity->posY.i.hi - 7, &collider, 0);
if (collider.effects & EFFECT_NOTHROUGH) {
g_CurrentEntity->velocityY = 0;
}
}
g_api.CheckCollision(g_CurrentEntity->posX.i.hi,
g_CurrentEntity->posY.i.hi + 7, &collider, 0);
if (arg0) {
if (!(collider.effects & EFFECT_NOTHROUGH)) {
MoveEntity();
FallEntity();
return;
}
g_CurrentEntity->velocityX = 0;
g_CurrentEntity->velocityY = 0;
if (collider.effects & EFFECT_QUICKSAND) {
g_CurrentEntity->posY.val += FIX(0.125);
return;
}
g_CurrentEntity->posY.i.hi += collider.unk18;
return;
}
if (!(collider.effects & EFFECT_NOTHROUGH)) {
MoveEntity();
func_8018CAB0();
}
}
#include "../collect_heart.h"
void CollectGold(u16 goldSize) {
s32 *gold, *unk;
u16 goldSizeIndex;
g_api.PlaySfx(NA_SE_PL_COLLECT_GOLD);
gold = &g_Status.gold;
goldSizeIndex = goldSize - 2;
*gold += c_GoldPrizes[goldSizeIndex];
if (*gold > MAX_GOLD) {
*gold = MAX_GOLD;
}
unk = &g_unkGraphicsStruct.BottomCornerTextTimer;
if (*unk) {
g_api.FreePrimitives(g_unkGraphicsStruct.BottomCornerTextPrims);
*unk = 0;
}
BottomCornerText(D_80180E08[goldSizeIndex], 1);
DestroyEntity(g_CurrentEntity);
}
void CollectSubweapon(u16 subWeaponIdx) {
Entity* player = &PLAYER;
u16 subWeapon;
g_api.PlaySfx(NA_SE_PL_IT_PICKUP);
subWeapon = g_Status.subWeapon;
g_Status.subWeapon = D_80180DC4[subWeaponIdx];
if (subWeapon == g_Status.subWeapon) {
subWeapon = 1;
g_CurrentEntity->unk6D[0] = 0x10;
} else {
subWeapon = D_80180DF4[subWeapon];
g_CurrentEntity->unk6D[0] = 0x60;
}
if (subWeapon != 0) {
g_CurrentEntity->params = subWeapon;
g_CurrentEntity->posY.i.hi = player->posY.i.hi + 12;
SetStep(7);
g_CurrentEntity->velocityY = FIX(-2.5);
g_CurrentEntity->animCurFrame = 0;
g_CurrentEntity->ext.generic.unk88.S16.unk2 = 5;
if (player->facingLeft != 1) {
g_CurrentEntity->velocityX = FIX(-2);
return;
}
g_CurrentEntity->velocityX = FIX(2);
return;
}
DestroyEntity(g_CurrentEntity);
}
#include "../collect_heart_vessel.h"
void CollectLifeVessel(void) {
g_api.PlaySfx(NA_SE_PL_COLLECT_HEART);
g_api.func_800FE044(LIFE_VESSEL_INCREASE, 0x8000);
DestroyEntity(g_CurrentEntity);
}
void DestroyCurrentEntity(void) { DestroyEntity(g_CurrentEntity); }
void EntityPrizeDrop(Entity* self) {
Collider collider;
@ -442,5 +577,3 @@ void EntityEquipItemDrop(Entity* self) {
BlinkItem(self, self->ext.equipItemDrop.timer);
}
}
#include "../blit_char.h"

331
src/st/wrp/F420.c → src/st/wrp/e_misc.c
View File

@ -1,5 +1,43 @@
#include "wrp.h"
#include "../entity_relic_orb.h"
void EntityHeartDrop(Entity* self) {
u16 temp_a0;
u16 temp_a0_2;
u16 var_a0;
if (self->step == 0) {
temp_a0 = self->params + 0x118;
self->ext.generic.unkB4 = temp_a0;
if ((D_8003BEEC[temp_a0 >> 3] >> (temp_a0 & 7)) & 1) {
DestroyEntity(self);
return;
}
temp_a0_2 = temp_a0 - 0x118;
var_a0 = ((u16*)D_80180608)[temp_a0_2];
if (var_a0 < 128) {
self->ext.generic.unkB8.unkFuncB8 = EntityPrizeDrop;
} else {
self->ext.generic.unkB8.unkFuncB8 = EntityEquipItemDrop;
var_a0 -= 128;
}
self->params = var_a0 + 0x8000;
} else {
temp_a0_2 = self->ext.generic.unkB4;
if (self->step < 5) {
if (self->hitFlags != 0) {
var_a0 = self->ext.generic.unkB4;
D_8003BEEC[temp_a0_2 >> 3] |= 1 << (var_a0 & 7);
self->step = 5;
}
}
}
self->ext.generic.unkB8.unkFuncB8(self);
}
#include "../entity_message_box.h"
u8 func_8018F420(s16* arg0, u8 facing) {
u8 ret = 0;
Collider collider;
@ -591,10 +629,10 @@ void func_80190614(Entity* self) {
}
}
INCLUDE_ASM("st/wrp/nonmatchings/F420", func_801907EC);
INCLUDE_ASM("st/wrp/nonmatchings/e_misc", func_801907EC);
u16 D_8018107C[] = {0, 1, 3, 4, 1, 2, 4, 5, 3, 4, 6, 7, 4, 5, 7, 8, 0, 0};
INCLUDE_ASM("st/wrp/nonmatchings/F420", func_80190DCC);
INCLUDE_ASM("st/wrp/nonmatchings/e_misc", func_80190DCC);
void ClutLerp(RECT* rect, u16 palIdxA, u16 palIdxB, s32 steps, u16 offset) {
u16 buf[COLORS_PER_PAL];
@ -668,292 +706,3 @@ void func_801916C4(s16 sfxId) {
g_api.func_80134714(sfxId, var_a3, var_a2);
}
}
#include "../entity_stage_name_popup.h"
u16 D_801810A0[] = {
/* 10A0 */ 0x0820,
/* 10A2 */ 0x0840,
/* 10A4 */ 0x0860,
/* 10A6 */ 0x0880,
/* 10A8 */ 0x08C0,
/* 10AA */ 0x0900,
/* 10AC */ 0x0940,
/* 10AE */ 0x0A00,
};
u16 D_801810B0[] = {
0xFFFD, 0xFFFD, 0x0008, 0x0008, 0x00D0, 0x0068, 0x00D8, 0x0070,
0xFFFD, 0xFFFD, 0x0008, 0x0008, 0x00C8, 0x0068, 0x00D0, 0x0070,
0xFFF9, 0xFFF9, 0x0010, 0x000F, 0x00C8, 0x0070, 0x00D8, 0x007F,
0xFFF5, 0xFFF5, 0x0018, 0x0017, 0x0080, 0x0068, 0x0098, 0x007F,
0xFFF5, 0xFFF5, 0x0018, 0x0017, 0x0098, 0x0068, 0x00B0, 0x007F,
0xFFF5, 0xFFF5, 0x0018, 0x0017, 0x00B0, 0x0068, 0x00C8, 0x007F,
};
u32 D_80181110[] = {
/* 1110 */ 0x03030204,
/* 1114 */ 0x05030403,
/* 1118 */ 0x03030603,
/* 111C */ 0x00000000,
};
// The white flying orbs of energy that Alucard summons as part of the Soul
// Steal spell
void EntitySoulStealOrb(Entity* self) {
Primitive* prim;
s32 primIndex;
u16 *temp_d, temp_e;
s32 temp_a, temp_b;
u16 angle;
switch (self->step) {
case 0:
primIndex = g_api.AllocPrimitives(PRIM_GT4, 1);
if (primIndex == -1) {
DestroyEntity(self);
return;
}
InitializeEntity(g_InitializeData0);
g_PrimBuf[primIndex].drawMode = DRAW_HIDE;
self->primIndex = primIndex;
self->animSet = ANIMSET_DRA(0);
self->flags |= FLAG_HAS_PRIMS;
angle = func_8018C160(self, &PLAYER);
temp_a = self->posY.i.hi < 113;
temp_b = temp_a ^ 1;
if (self->posX.i.hi < PLAYER.posX.i.hi) {
temp_b = temp_a;
}
if (temp_b & 0xFFFF) {
self->ext.soulStealOrb.angle = angle - D_801810A0[Random() & 7];
} else {
angle += D_801810A0[Random() & 7];
self->ext.soulStealOrb.angle = angle;
}
self->ext.soulStealOrb.unk80 = 0x400;
self->ext.soulStealOrb.unk7E = 0;
self->hitboxState = 0;
break;
case 1:
self->ext.soulStealOrb.unk82++;
if (self->ext.soulStealOrb.unk82 == 16) {
self->hitboxState = 1;
}
if (self->hitFlags != 0) {
if (g_Player.unk56 == 0) {
g_Player.unk56 = 1;
g_Player.unk58 = 8;
}
DestroyEntity(self);
return;
}
if (self->rotX < 0x100) {
self->rotX = self->rotY += 0x10;
}
if (self->ext.soulStealOrb.unk7E < 0x200) {
self->ext.soulStealOrb.unk7E += 2;
}
if (self->ext.soulStealOrb.unk80 < 0x800) {
self->ext.soulStealOrb.unk80 += 4;
}
self->ext.soulStealOrb.angle = func_8018C1E0(
self->ext.soulStealOrb.unk7E, (u16)self->ext.soulStealOrb.angle,
0xffff & func_8018C160(self, &PLAYER));
UnkEntityFunc0(self->ext.soulStealOrb.angle & 0xFFFF,
self->ext.soulStealOrb.unk80);
MoveEntity(self); // argument pass necessary to match
prim = &g_PrimBuf[self->primIndex];
AnimateEntity(&D_80181110, self);
angle = (float)(u32)self; // !FAKE
prim->tpage = 0x18;
prim->clut = 0x194;
temp_d = &D_801810B0[(u16)((8 * (u16)self->animCurFrame) - 8)];
prim->x0 = prim->x2 = self->posX.i.hi + *(temp_d++);
prim->y0 = prim->y1 = self->posY.i.hi + *(temp_d++);
prim->x1 = prim->x3 = prim->x0 + *(temp_d++);
prim->y2 = prim->y3 = prim->y0 + *(temp_d++);
prim->u0 = prim->u2 = *(temp_d++);
prim->v0 = prim->v1 = *(temp_d++);
prim->u1 = prim->u3 = *(temp_d++);
prim->v2 = prim->v3 = *(temp_d++);
prim->priority = self->zPriority;
prim->drawMode = DRAW_DEFAULT;
break;
}
}
#include "../entity_enemy_blood.h"
u8 D_80181120[] = {0x40, 0x01, 0xFF, 0x00};
u8 D_80181124[] = {0x40, 0x02, 0xFF, 0x00};
u8 D_80181128[] = {0x40, 0x02, 0xFF, 0x00};
u8 D_8018112C[] = {0x40, 0x01, 0xFF, 0x00};
u8 D_80181130[] = {0x40, 0x03, 0xFF, 0x00};
ObjInit2 D_80181134[] = {
{0x0006, 0x01EC, 0x0000, 0x0000, 0x00, 0x10, 0, D_80181120},
{0x000C, 0x01EC, 0x0000, 0x0000, 0x00, 0x10, 0, D_80181128},
{0x000C, 0x0080, 0x0000, 0x0000, 0x00, 0x10, 0, D_8018112C},
{0x0006, 0x01EC, 0x0000, 0x0000, 0x00, 0x10, 0, D_80181124},
{0x000C, 0x01EC, 0x0000, 0x0000, 0x00, 0x10, 0, D_80181130},
{0x000C, 0x0080, 0x0000, 0x0000, 0x00, 0x10, 0, D_8018112C},
};
void EntityRoomForeground(Entity* entity) {
ObjInit2* objInit = &D_80181134[entity->params];
if (entity->step == 0) {
InitializeEntity(g_eInitGeneric2);
entity->animSet = objInit->animSet;
entity->zPriority = objInit->zPriority;
entity->unk5A = objInit->unk4.s;
entity->palette = objInit->palette;
entity->drawFlags = objInit->drawFlags;
entity->drawMode = objInit->drawMode;
if (objInit->unkC != 0) {
entity->flags = objInit->unkC;
}
if (entity->params >= 5) {
entity->rotZ = 0x800;
entity->drawFlags |= 4;
}
}
AnimateEntity(objInit->unk10, entity);
}
void BottomCornerText(u8* str, u8 lower_left) {
u8 toPrint[64];
Primitive* prim;
s32 i;
u32 ch;
u8* chIdx = &toPrint;
u16 textWidth = 0;
// serves two purposes, use #define for dual names
u16 dualVar = 0;
#define charcount dualVar
// Clear out the toPrint array
for (i = 0; i < 64; i++) {
*chIdx++ = 0;
}
// Reset array pointer
chIdx = &toPrint;
while (1) {
i = 0;
// Copy values from the incoming arg0 array to the local array, until we
// get a 0xFF followed by a 0
ch = *str++;
if (ch == 0xFF) {
ch = *str++;
if (ch == 0) {
break;
}
}
*chIdx = ch;
chIdx++;
if (ch != 0) {
charcount++;
textWidth += 8;
} else {
textWidth += 4;
}
}
g_unkGraphicsStruct.BottomCornerTextPrims =
g_api.AllocPrimitives(PRIM_SPRT, charcount + 4);
if (g_unkGraphicsStruct.BottomCornerTextPrims == -1) {
return;
}
#undef charcount
prim = &g_PrimBuf[g_unkGraphicsStruct.BottomCornerTextPrims];
prim->type = 3;
prim->b0 = prim->b1 = prim->b2 = prim->b3 = prim->g0 = prim->g1 = prim->g2 =
prim->g3 = prim->r0 = prim->r1 = prim->r2 = prim->r3 = 0;
if (lower_left) {
prim->b0 = prim->b1 = 0xAF;
} else {
prim->g0 = prim->g1 = 0x5F;
}
#define xpos dualVar
if (lower_left) {
xpos = 7;
textWidth += 4;
} else {
xpos = 0xD4 - textWidth;
}
prim->x0 = prim->x2 = xpos;
prim->x1 = prim->x3 = xpos + textWidth + 0x20;
prim->y0 = prim->y1 = 0xD0;
prim->y2 = prim->y3 = 0xDF;
prim->priority = 0x1EE;
prim->drawMode = 0x11;
prim = prim->next;
prim->tpage = 0x1F;
prim->clut = 0x197;
prim->x0 = xpos - 6;
prim->y0 = 0xCB;
prim->u0 = 0x80;
prim->v0 = 0;
prim->u1 = 0x10;
prim->v1 = 0x18;
prim->priority = 0x1EF;
prim->drawMode = DRAW_DEFAULT;
prim = prim->next;
prim->tpage = 0x1F;
prim->clut = 0x197;
prim->x0 = xpos + textWidth + 0x16;
prim->y0 = 0xCB;
prim->u0 = 0xA8;
prim->v0 = 0;
prim->u1 = 0x10;
prim->v1 = 0x18;
prim->priority = 0x1EF;
prim->drawMode = DRAW_DEFAULT;
prim = prim->next;
prim->type = 4;
prim->y0 = prim->y1 = 0xCD;
prim->tpage = 0x1F;
prim->clut = 0x197;
prim->y2 = prim->y3 = 0xE1;
prim->u0 = prim->u2 = 0x98;
prim->u1 = prim->u3 = 0x9C;
prim->v0 = prim->v1 = 2;
prim->x0 = prim->x2 = xpos + 0xA;
prim->x1 = prim->x3 = xpos + textWidth + 0x18;
prim->v2 = prim->v3 = 0x16;
prim->priority = 0x1EF;
prim->drawMode = DRAW_DEFAULT;
xpos += 0x10;
// Reset array pointer
chIdx = &toPrint;
for (prim = prim->next; prim != NULL;) {
ch = *chIdx++;
if (ch != 0) {
prim->x0 = xpos;
prim->u0 = (ch & 0xF) * 8;
prim->tpage = 0x1E;
prim->clut = 0x196;
prim->v0 = (ch & 0xF0) >> 1;
prim->v1 = 8;
prim->u1 = 8;
prim->priority = 0x1F0;
prim->drawMode = DRAW_DEFAULT;
prim->y0 = 0xD4;
prim = prim->next;
xpos += 8;
} else {
xpos += 4;
}
}
#undef xpos
g_unkGraphicsStruct.BottomCornerTextTimer = 0x130;
}

115
src/st/wrp/e_particles.c Normal file
View File

@ -0,0 +1,115 @@
#include "wrp.h"
u16 D_801810A0[] = {
/* 10A0 */ 0x0820,
/* 10A2 */ 0x0840,
/* 10A4 */ 0x0860,
/* 10A6 */ 0x0880,
/* 10A8 */ 0x08C0,
/* 10AA */ 0x0900,
/* 10AC */ 0x0940,
/* 10AE */ 0x0A00,
};
u16 D_801810B0[] = {
0xFFFD, 0xFFFD, 0x0008, 0x0008, 0x00D0, 0x0068, 0x00D8, 0x0070,
0xFFFD, 0xFFFD, 0x0008, 0x0008, 0x00C8, 0x0068, 0x00D0, 0x0070,
0xFFF9, 0xFFF9, 0x0010, 0x000F, 0x00C8, 0x0070, 0x00D8, 0x007F,
0xFFF5, 0xFFF5, 0x0018, 0x0017, 0x0080, 0x0068, 0x0098, 0x007F,
0xFFF5, 0xFFF5, 0x0018, 0x0017, 0x0098, 0x0068, 0x00B0, 0x007F,
0xFFF5, 0xFFF5, 0x0018, 0x0017, 0x00B0, 0x0068, 0x00C8, 0x007F,
};
u32 D_80181110[] = {
/* 1110 */ 0x03030204,
/* 1114 */ 0x05030403,
/* 1118 */ 0x03030603,
/* 111C */ 0x00000000,
};
// The white flying orbs of energy that Alucard summons as part of the Soul
// Steal spell
void EntitySoulStealOrb(Entity* self) {
Primitive* prim;
s32 primIndex;
u16 *temp_d, temp_e;
s32 temp_a, temp_b;
u16 angle;
switch (self->step) {
case 0:
primIndex = g_api.AllocPrimitives(PRIM_GT4, 1);
if (primIndex == -1) {
DestroyEntity(self);
return;
}
InitializeEntity(g_InitializeData0);
g_PrimBuf[primIndex].drawMode = DRAW_HIDE;
self->primIndex = primIndex;
self->animSet = ANIMSET_DRA(0);
self->flags |= FLAG_HAS_PRIMS;
angle = func_8018C160(self, &PLAYER);
temp_a = self->posY.i.hi < 113;
temp_b = temp_a ^ 1;
if (self->posX.i.hi < PLAYER.posX.i.hi) {
temp_b = temp_a;
}
if (temp_b & 0xFFFF) {
self->ext.soulStealOrb.angle = angle - D_801810A0[Random() & 7];
} else {
angle += D_801810A0[Random() & 7];
self->ext.soulStealOrb.angle = angle;
}
self->ext.soulStealOrb.unk80 = 0x400;
self->ext.soulStealOrb.unk7E = 0;
self->hitboxState = 0;
break;
case 1:
self->ext.soulStealOrb.unk82++;
if (self->ext.soulStealOrb.unk82 == 16) {
self->hitboxState = 1;
}
if (self->hitFlags != 0) {
if (g_Player.unk56 == 0) {
g_Player.unk56 = 1;
g_Player.unk58 = 8;
}
DestroyEntity(self);
return;
}
if (self->rotX < 0x100) {
self->rotX = self->rotY += 0x10;
}
if (self->ext.soulStealOrb.unk7E < 0x200) {
self->ext.soulStealOrb.unk7E += 2;
}
if (self->ext.soulStealOrb.unk80 < 0x800) {
self->ext.soulStealOrb.unk80 += 4;
}
self->ext.soulStealOrb.angle = func_8018C1E0(
self->ext.soulStealOrb.unk7E, (u16)self->ext.soulStealOrb.angle,
0xffff & func_8018C160(self, &PLAYER));
UnkEntityFunc0(self->ext.soulStealOrb.angle & 0xFFFF,
self->ext.soulStealOrb.unk80);
MoveEntity(self); // argument pass necessary to match
prim = &g_PrimBuf[self->primIndex];
AnimateEntity(&D_80181110, self);
angle = (float)(u32)self; // !FAKE
prim->tpage = 0x18;
prim->clut = 0x194;
temp_d = &D_801810B0[(u16)((8 * (u16)self->animCurFrame) - 8)];
prim->x0 = prim->x2 = self->posX.i.hi + *(temp_d++);
prim->y0 = prim->y1 = self->posY.i.hi + *(temp_d++);
prim->x1 = prim->x3 = prim->x0 + *(temp_d++);
prim->y2 = prim->y3 = prim->y0 + *(temp_d++);
prim->u0 = prim->u2 = *(temp_d++);
prim->v0 = prim->v1 = *(temp_d++);
prim->u1 = prim->u3 = *(temp_d++);
prim->v2 = prim->v3 = *(temp_d++);
prim->priority = self->zPriority;
prim->drawMode = DRAW_DEFAULT;
break;
}
}
#include "../entity_enemy_blood.h"

3
src/st/wrp/e_red_door.c Normal file
View File

@ -0,0 +1,3 @@
#include "wrp.h"
#include "../entity_red_door.h"

35
src/st/wrp/e_room_fg.c Normal file
View File

@ -0,0 +1,35 @@
#include "wrp.h"
u8 D_80181120[] = {0x40, 0x01, 0xFF, 0x00};
u8 D_80181124[] = {0x40, 0x02, 0xFF, 0x00};
u8 D_80181128[] = {0x40, 0x02, 0xFF, 0x00};
u8 D_8018112C[] = {0x40, 0x01, 0xFF, 0x00};
u8 D_80181130[] = {0x40, 0x03, 0xFF, 0x00};
ObjInit2 D_80181134[] = {
{0x0006, 0x01EC, 0x0000, 0x0000, 0x00, 0x10, 0, D_80181120},
{0x000C, 0x01EC, 0x0000, 0x0000, 0x00, 0x10, 0, D_80181128},
{0x000C, 0x0080, 0x0000, 0x0000, 0x00, 0x10, 0, D_8018112C},
{0x0006, 0x01EC, 0x0000, 0x0000, 0x00, 0x10, 0, D_80181124},
{0x000C, 0x01EC, 0x0000, 0x0000, 0x00, 0x10, 0, D_80181130},
{0x000C, 0x0080, 0x0000, 0x0000, 0x00, 0x10, 0, D_8018112C},
};
void EntityRoomForeground(Entity* entity) {
ObjInit2* objInit = &D_80181134[entity->params];
if (entity->step == 0) {
InitializeEntity(g_eInitGeneric2);
entity->animSet = objInit->animSet;
entity->zPriority = objInit->zPriority;
entity->unk5A = objInit->unk4.s;
entity->palette = objInit->palette;
entity->drawFlags = objInit->drawFlags;
entity->drawMode = objInit->drawMode;
if (objInit->unkC != 0) {
entity->flags = objInit->unkC;
}
if (entity->params >= 5) {
entity->rotZ = 0x800;
entity->drawFlags |= 4;
}
}
AnimateEntity(objInit->unk10, entity);
}

3
src/st/wrp/e_stage_name.c Normal file
View File

@ -0,0 +1,3 @@
#include "wrp.h"
#include "../entity_stage_name_popup.h"

35
src/st/wrp/entity_heart_drop.c
View File

@ -1,35 +0,0 @@
#include "wrp.h"
void EntityHeartDrop(Entity* self) {
u16 temp_a0;
u16 temp_a0_2;
u16 var_a0;
if (self->step == 0) {
temp_a0 = self->params + 0x118;
self->ext.generic.unkB4 = temp_a0;
if ((D_8003BEEC[temp_a0 >> 3] >> (temp_a0 & 7)) & 1) {
DestroyEntity(self);
return;
}
temp_a0_2 = temp_a0 - 0x118;
var_a0 = ((u16*)D_80180608)[temp_a0_2];
if (var_a0 < 128) {
self->ext.generic.unkB8.unkFuncB8 = EntityPrizeDrop;
} else {
self->ext.generic.unkB8.unkFuncB8 = EntityEquipItemDrop;
var_a0 -= 128;
}
self->params = var_a0 + 0x8000;
} else {
temp_a0_2 = self->ext.generic.unkB4;
if (self->step < 5) {
if (self->hitFlags != 0) {
var_a0 = self->ext.generic.unkB4;
D_8003BEEC[temp_a0_2 >> 3] |= 1 << (var_a0 & 7);
self->step = 5;
}
}
}
self->ext.generic.unkB8.unkFuncB8(self);
}

3
src/st/wrp/entity_message_box.c
View File

@ -1,3 +0,0 @@
#include "wrp.h"
#include "../entity_message_box.h"

3
src/st/wrp/entity_relic_orb.c
View File

@ -1,3 +0,0 @@
#include "wrp.h"
#include "../entity_relic_orb.h"

140
src/st/wrp/popup.c Normal file
View File

@ -0,0 +1,140 @@
#include "wrp.h"
void BottomCornerText(u8* str, u8 lower_left) {
u8 toPrint[64];
Primitive* prim;
s32 i;
u32 ch;
u8* chIdx = &toPrint;
u16 textWidth = 0;
// serves two purposes, use #define for dual names
u16 dualVar = 0;
#define charcount dualVar
// Clear out the toPrint array
for (i = 0; i < 64; i++) {
*chIdx++ = 0;
}
// Reset array pointer
chIdx = &toPrint;
while (1) {
i = 0;
// Copy values from the incoming arg0 array to the local array, until we
// get a 0xFF followed by a 0
ch = *str++;
if (ch == 0xFF) {
ch = *str++;
if (ch == 0) {
break;
}
}
*chIdx = ch;
chIdx++;
if (ch != 0) {
charcount++;
textWidth += 8;
} else {
textWidth += 4;
}
}
g_unkGraphicsStruct.BottomCornerTextPrims =
g_api.AllocPrimitives(PRIM_SPRT, charcount + 4);
if (g_unkGraphicsStruct.BottomCornerTextPrims == -1) {
return;
}
#undef charcount
prim = &g_PrimBuf[g_unkGraphicsStruct.BottomCornerTextPrims];
prim->type = 3;
prim->b0 = prim->b1 = prim->b2 = prim->b3 = prim->g0 = prim->g1 = prim->g2 =
prim->g3 = prim->r0 = prim->r1 = prim->r2 = prim->r3 = 0;
if (lower_left) {
prim->b0 = prim->b1 = 0xAF;
} else {
prim->g0 = prim->g1 = 0x5F;
}
#define xpos dualVar
if (lower_left) {
xpos = 7;
textWidth += 4;
} else {
xpos = 0xD4 - textWidth;
}
prim->x0 = prim->x2 = xpos;
prim->x1 = prim->x3 = xpos + textWidth + 0x20;
prim->y0 = prim->y1 = 0xD0;
prim->y2 = prim->y3 = 0xDF;
prim->priority = 0x1EE;
prim->drawMode = 0x11;
prim = prim->next;
prim->tpage = 0x1F;
prim->clut = 0x197;
prim->x0 = xpos - 6;
prim->y0 = 0xCB;
prim->u0 = 0x80;
prim->v0 = 0;
prim->u1 = 0x10;
prim->v1 = 0x18;
prim->priority = 0x1EF;
prim->drawMode = DRAW_DEFAULT;
prim = prim->next;
prim->tpage = 0x1F;
prim->clut = 0x197;
prim->x0 = xpos + textWidth + 0x16;
prim->y0 = 0xCB;
prim->u0 = 0xA8;
prim->v0 = 0;
prim->u1 = 0x10;
prim->v1 = 0x18;
prim->priority = 0x1EF;
prim->drawMode = DRAW_DEFAULT;
prim = prim->next;
prim->type = 4;
prim->y0 = prim->y1 = 0xCD;
prim->tpage = 0x1F;
prim->clut = 0x197;
prim->y2 = prim->y3 = 0xE1;
prim->u0 = prim->u2 = 0x98;
prim->u1 = prim->u3 = 0x9C;
prim->v0 = prim->v1 = 2;
prim->x0 = prim->x2 = xpos + 0xA;
prim->x1 = prim->x3 = xpos + textWidth + 0x18;
prim->v2 = prim->v3 = 0x16;
prim->priority = 0x1EF;
prim->drawMode = DRAW_DEFAULT;
xpos += 0x10;
// Reset array pointer
chIdx = &toPrint;
for (prim = prim->next; prim != NULL;) {
ch = *chIdx++;
if (ch != 0) {
prim->x0 = xpos;
prim->u0 = (ch & 0xF) * 8;
prim->tpage = 0x1E;
prim->clut = 0x196;
prim->v0 = (ch & 0xF0) >> 1;
prim->v1 = 8;
prim->u1 = 8;
prim->priority = 0x1F0;
prim->drawMode = DRAW_DEFAULT;
prim->y0 = 0xD4;
prim = prim->next;
xpos += 8;
} else {
xpos += 4;
}
}
#undef xpos
g_unkGraphicsStruct.BottomCornerTextTimer = 0x130;
}

3
src/st/wrp/random.c
View File

@ -1,3 +0,0 @@
#include <game.h>
#include "../random.h"

146
src/st/wrp/861C.c → src/st/wrp/st_common.c
View File

@ -1,22 +1,6 @@
#include "wrp.h"
extern s8 c_HeartPrizes[];
extern s32 c_GoldPrizes[];
extern u8* D_80180E08[];
extern u16 D_80180DC4[];
extern u16 D_80180DF4[];
extern u16 g_ItemIconSlots[];
extern u16 UNK_Invincibility0[];
extern s16 D_80180A94[];
extern LayoutEntity* D_80180310[];
INCLUDE_ASM("st/wrp/nonmatchings/861C", TestCollisions);
#include "../entity_damage_display.h"
#include "../libstage.h"
#include "../entity_red_door.h"
#include "../entity.h"
@ -404,134 +388,6 @@ void func_8018C55C(u16* hitSensors, s16 sensorCount) {
}
}
INCLUDE_ASM("st/wrp/nonmatchings/861C", func_8018C6B4);
INCLUDE_ASM("st/wrp/nonmatchings/st_common", func_8018C6B4);
#include "../replace_breakable_with_item_drop.h"
void func_8018CAB0(void) {
s32 temp_v1;
Entity* entity;
entity = g_CurrentEntity;
if (entity->velocityY >= 0) {
temp_v1 =
entity->ext.generic.unk88.S16.unk0 + entity->ext.generic.unk84.unk;
entity->ext.generic.unk84.unk = temp_v1;
entity->velocityX = temp_v1;
if (temp_v1 == 0x10000 || temp_v1 == -0x10000) {
entity->ext.generic.unk88.S16.unk0 =
-entity->ext.generic.unk88.S16.unk0;
}
entity = g_CurrentEntity;
}
if (entity->velocityY < FIX(0.25)) {
entity->velocityY += FIX(0.125);
}
}
void func_8018CB34(u16 arg0) {
Collider collider;
if (g_CurrentEntity->velocityX < 0) {
g_api.CheckCollision(g_CurrentEntity->posX.i.hi,
g_CurrentEntity->posY.i.hi - 7, &collider, 0);
if (collider.effects & EFFECT_NOTHROUGH) {
g_CurrentEntity->velocityY = 0;
}
}
g_api.CheckCollision(g_CurrentEntity->posX.i.hi,
g_CurrentEntity->posY.i.hi + 7, &collider, 0);
if (arg0) {
if (!(collider.effects & EFFECT_NOTHROUGH)) {
MoveEntity();
FallEntity();
return;
}
g_CurrentEntity->velocityX = 0;
g_CurrentEntity->velocityY = 0;
if (collider.effects & EFFECT_QUICKSAND) {
g_CurrentEntity->posY.val += FIX(0.125);
return;
}
g_CurrentEntity->posY.i.hi += collider.unk18;
return;
}
if (!(collider.effects & EFFECT_NOTHROUGH)) {
MoveEntity();
func_8018CAB0();
}
}
#include "../collect_heart.h"
void CollectGold(u16 goldSize) {
s32 *gold, *unk;
u16 goldSizeIndex;
g_api.PlaySfx(NA_SE_PL_COLLECT_GOLD);
gold = &g_Status.gold;
goldSizeIndex = goldSize - 2;
*gold += c_GoldPrizes[goldSizeIndex];
if (*gold > MAX_GOLD) {
*gold = MAX_GOLD;
}
unk = &g_unkGraphicsStruct.BottomCornerTextTimer;
if (*unk) {
g_api.FreePrimitives(g_unkGraphicsStruct.BottomCornerTextPrims);
*unk = 0;
}
BottomCornerText(D_80180E08[goldSizeIndex], 1);
DestroyEntity(g_CurrentEntity);
}
void CollectSubweapon(u16 subWeaponIdx) {
Entity* player = &PLAYER;
u16 subWeapon;
g_api.PlaySfx(NA_SE_PL_IT_PICKUP);
subWeapon = g_Status.subWeapon;
g_Status.subWeapon = D_80180DC4[subWeaponIdx];
if (subWeapon == g_Status.subWeapon) {
subWeapon = 1;
g_CurrentEntity->unk6D[0] = 0x10;
} else {
subWeapon = D_80180DF4[subWeapon];
g_CurrentEntity->unk6D[0] = 0x60;
}
if (subWeapon != 0) {
g_CurrentEntity->params = subWeapon;
g_CurrentEntity->posY.i.hi = player->posY.i.hi + 12;
SetStep(7);
g_CurrentEntity->velocityY = FIX(-2.5);
g_CurrentEntity->animCurFrame = 0;
g_CurrentEntity->ext.generic.unk88.S16.unk2 = 5;
if (player->facingLeft != 1) {
g_CurrentEntity->velocityX = FIX(-2);
return;
}
g_CurrentEntity->velocityX = FIX(2);
return;
}
DestroyEntity(g_CurrentEntity);
}
#include "../collect_heart_vessel.h"
void CollectLifeVessel(void) {
g_api.PlaySfx(NA_SE_PL_COLLECT_HEART);
g_api.func_800FE044(LIFE_VESSEL_INCREASE, 0x8000);
DestroyEntity(g_CurrentEntity);
}
void DestroyCurrentEntity(void) { DestroyEntity(g_CurrentEntity); }

4
src/st/wrp/update_stage_entities.c → src/st/wrp/st_update.c
View File

@ -1,3 +1,7 @@
#include <stage.h>
#include "../random.h"
#include "../update.h"
#include "../update_stage_entities.h"

3
src/st/wrp/update.c
View File

@ -1,3 +0,0 @@
#include <game.h>
#include "../update.h"