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

PSP WRP EntityWarpSmallRocks (#1279)

Browse Source
This commit is contained in:
sozud 2024-06-08 04:22:10 -07:00 committed by GitHub
parent b9328aa9b3
commit 1d212a3f4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 81 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/splat.pspeu.stwrp.yaml
View File

@ -63,7 +63,6 @@ segments:
- [0xD1B8, c, wrp/e_breakable]
- [0xD338, c, wrp/st_debug]
- [0xD6A8, c, wrp_psp/warp]
- [0xE980, data] # D_psp_09246000
- [0xEA00, .data, wrp_psp/wrp_data_EA00] # g_eRedDoorUV
- [0xEAD0, data] # D_psp_09246150
- [0xEB00, data] # D_psp_09246180

82
src/st/wrp_psp/warp.c
View File

@ -2,4 +2,84 @@
INCLUDE_ASM("st/wrp_psp/psp/wrp_psp/warp", EntityWarpRoom);
INCLUDE_ASM("st/wrp_psp/psp/wrp_psp/warp", EntityWarpSmallRocks);
extern u16 D_801804C4[];
extern u32 D_80180648;
#define SE_WARP_DEBRIS 0x644
void EntityWarpSmallRocks(Entity* entity) {
s32 x;
s32 y;
s32 rotation;
s16 angle;
switch (entity->step) {
case 0:
InitializeEntity(D_801804C4);
entity->drawFlags = FLAG_DRAW_ROTZ;
entity->rotZ = Random() * 0x10;
entity->animCurFrame = (Random() % 5) + 1;
if (D_80180648) {
entity->posY.i.hi = (Random() & 0x1F) + 0x90;
entity->step = 4;
break;
}
case 1:
if (D_80180648) {
entity->ext.warpRoom.unk88 = Random() & 0x3F;
entity->velocityY = FIX(-4);
entity->step++;
}
break;
case 2:
if (entity->ext.warpRoom.unk88) {
entity->ext.warpRoom.unk88--;
} else {
MoveEntity();
entity->velocityY += FIX(0.25);
if (entity->velocityY > FIX(-1.0f)) {
entity->drawFlags = FLAG_DRAW_ROTX | FLAG_DRAW_ROTY;
entity->rotX = entity->rotY = 0x100;
entity->step++;
}
}
break;
case 3:
x = 0x80 - entity->posX.i.hi;
y = 0x80 - entity->posY.i.hi;
angle = ratan2(y, x);
entity->velocityX = rcos(angle) << 5;
entity->velocityY = rsin(angle) << 5;
MoveEntity();
rotation = x * x + y * y;
rotation = SquareRoot0(rotation);
rotation *= 2;
if (rotation > 0x100) {
rotation = 0x100;
}
entity->rotX = entity->rotY = rotation;
if (rotation < 8) {
DestroyEntity(entity);
}
break;
case 4:
angle = entity->rotZ += 0x20;
entity->velocityY = rsin(angle) * 4;
if (D_80180648 == 0) {
entity->ext.warpRoom.unk88 = 0x10;
entity->step++;
}
break;
case 5:
if (--entity->ext.warpRoom.unk88 == 0) {
func_801916C4(SE_WARP_DEBRIS);
}
MoveEntity();
entity->velocityY += FIX(0.1875);
y = entity->posY.i.hi + g_Tilemap.scrollY.i.hi + 5;
if (y > 208) {
entity->posY.i.hi = 203 - g_Tilemap.scrollY.i.hi;
entity->step = 1;
}
break;
}
}