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

Fix RoomDimensions struct

Browse Source
This commit is contained in:
Luciano Ciccariello 2023-07-06 12:20:53 +01:00
parent 8ea6b1f01e
commit 6fb0937c3c
9 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common.h
View File

@ -23,7 +23,9 @@
#define STRCPY(dst, src) __builtin_memcpy(dst, src, sizeof(src))
#define LOH(x) (*(s16*)&(x))
#define LOHU(x) (*(u16*)&(x))
#define LOW(x) (*(s32*)&(x))
#define LOWU(x) (*(u32*)&(x))
#if defined(HACKS) && !defined(PERMUTER)
#define ALIGNED4 __attribute__((aligned(4)))

5
include/game.h
View File

@ -936,8 +936,7 @@ typedef struct {
typedef struct {
/* 800730A0 0x00 */ s32 unk00;
/* 800730A4 0x04 */ s32 hSize;
/* 800730A8 0x08 */ u16 vSize;
/* 800730AA 0x0A */ u16 _padding06;
/* 800730A8 0x08 */ s32 vSize;
/* 800730AC 0x0C */ s32 unk8;
/* 800730B0 0x10 */ s32 left;
/* 800730B4 0x14 */ s32 top;
@ -947,7 +946,7 @@ typedef struct {
/* 800730C4 0x24 */ s32 y;
/* 800730C8 0x28 */ s32 width;
/* 800730CC 0x2C */ s32 height;
/* 800730D0 0x30 */ s32 _padding30;
/* 800730D0 0x30 */ s32 unk30;
/* 800730D4 0x34 */ s32 D_800730D4;
/* 800730D8 0x38 */ BgLayer bg[MAX_BG_LAYER_COUNT];
} RoomDimensions;

2
src/st/dre/14214.c
View File

@ -265,7 +265,7 @@ void Update(void) {
if ((unk34 & 0x02000000)) {
s16 posY = entity->posY.i.hi + g_Camera.posY.i.hi;
s16 test = (g_CurrentRoom.vSize * 256) + 128;
s16 test = (LOHU(g_CurrentRoom.vSize) * 256) + 128;
if (posY > test) {
DestroyEntity(entity);
continue;

2
src/st/mad/D8C8.c
View File

@ -199,7 +199,7 @@ void Update(void) {
if ((unk34 & 0x02000000)) {
s16 posY = entity->posY.i.hi + g_Camera.posY.i.hi;
s16 test = (g_CurrentRoom.vSize * 256) + 128;
s16 test = (LOHU(g_CurrentRoom.vSize) * 256) + 128;
if (posY > test) {
DestroyEntity(entity);
continue;

2
src/st/no3/3E134.c
View File

@ -354,7 +354,7 @@ void Update(void) {
if ((unk34 & 0x02000000)) {
s16 posY = entity->posY.i.hi + g_Camera.posY.i.hi;
s16 test = (g_CurrentRoom.vSize * 256) + 128;
s16 test = (LOHU(g_CurrentRoom.vSize) * 256) + 128;
if (posY > test) {
DestroyEntity(entity);
continue;

2
src/st/np3/390BC.c
View File

@ -48,7 +48,7 @@ void Update(void) {
if ((unk34 & 0x02000000)) {
s16 posY = entity->posY.i.hi + g_Camera.posY.i.hi;
s16 test = (g_CurrentRoom.vSize * 256) + 128;
s16 test = (LOHU(g_CurrentRoom.vSize) * 256) + 128;
if (posY > test) {
DestroyEntity(entity);
continue;

2
src/st/nz0/36DE4.c
View File

@ -207,7 +207,7 @@ void Update(void) {
if ((unk34 & 0x02000000)) {
s16 posY = entity->posY.i.hi + g_Camera.posY.i.hi;
s16 test = (g_CurrentRoom.vSize * 256) + 128;
s16 test = (LOHU(g_CurrentRoom.vSize) * 256) + 128;
if (posY > test) {
DestroyEntity(entity);
continue;

2
src/st/st0/30030.c
View File

@ -161,7 +161,7 @@ void Update(void) {
if ((unk34 & 0x02000000)) {
s16 posY = entity->posY.i.hi + g_Camera.posY.i.hi;
s16 test = (g_CurrentRoom.vSize * 256) + 128;
s16 test = (LOHU(g_CurrentRoom.vSize) * 256) + 128;
if (posY > test) {
DestroyEntity(entity);
continue;

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

@ -1719,7 +1719,7 @@ void Update(void) {
if ((unk34 & 0x02000000)) {
s16 posY = entity->posY.i.hi + g_Camera.posY.i.hi;
s16 test = (g_CurrentRoom.vSize * 256) + 128;
s16 test = (LOHU(g_CurrentRoom.vSize) * 256) + 128;
if (posY > test) {
DestroyEntity(entity);
continue;