pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

match game_status

Browse Source
This commit is contained in:
Alex Bates 2020-08-14 12:47:54 +01:00
parent 357220cf92
commit 652d2ada46
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/common_structs.h
View File

@ -7,21 +7,21 @@
typedef struct {
/* 0x000 */ u32 currentButtons;
/* 0x004 */ u32 altCurrentButtons; /* used for battle when flag 80000 set */
/* 0x008 */ char unk_08[8];
/* 0x008 */ char unk_08[0x8];
/* 0x010 */ u32 pressedButtons; /* 1 for the frame button begins to be held */
/* 0x014 */ u32 altPressedButtons; /* used for battle when flag 80000 set */
/* 0x018 */ char unk_18[8];
/* 0x018 */ char unk_18[0x8];
/* 0x020 */ u32 heldButtons; /* 1 every 4th frame during hold */
/* 0x024 */ u32 altHeldButtons; /* used for battle when flag 80000 set */
/* 0x028 */ char unk_28[8];
/* 0x028 */ char unk_28[0x8];
/* 0x030 */ u32 prevButtons; /* from previous frame */
/* 0x034 */ char unk_34[12];
/* 0x034 */ char unk_34[0xC];
/* 0x040 */ u8 stickX; /* with deadzone */
/* 0x041 */ u8 altStickX; /* used for battle when flag 80000 set */
/* 0x042 */ char unk_42[2];
/* 0x042 */ char unk_42[0x2];
/* 0x044 */ u8 stickY; /* with deadzone */
/* 0x045 */ u8 altStickY; /* used for battle when flag 80000 set */
/* 0x046 */ char unk_46[2];
/* 0x046 */ char unk_46[0x2];
/* 0x048 */ u16 unk_48[4];
/* 0x050 */ u16 unk_50[4];
/* 0x058 */ char unk_58[0x10];
@ -29,12 +29,12 @@ typedef struct {
/* 0x06A */ s8 demoStickX;
/* 0x06B */ s8 demoStickY;
/* 0x06C */ u32* mainScriptID;
/* 0x070 */ u8 isBattle;
/* 0x070 */ s8 isBattle;
/* 0x071 */ u8 demoState; /* 0 = not demo, 1 = map demo, 2 = demo transition */
/* 0x072 */ u8 nextDemoScene;
/* 0x073 */ char unk_73[2];
/* 0x073 */ char unk_73[0x2];
/* 0x075 */ s8 unk_75;
/* 0x076 */ char unk_76[3];
/* 0x076 */ char unk_76[0x3];
/* 0x079 */ s8 unk_79;
/* 0x07A */ s8 musicEnabled;
/* 0x07B */ char unk_7B;
@ -46,22 +46,21 @@ typedef struct {
/* 0x081 */ s8 unk_81;
/* 0x082 */ s8 unk_82;
/* 0x083 */ s8 unk_83;
/* 0x084 */ char unk_84[2];
/* 0x084 */ char unk_84[0x2];
/* 0x086 */ s16 areaID;
/* 0x088 */ s16 prevArea;
/* 0x089 */ char unk_89;
/* 0x08A */ u8 changedArea;
/* 0x08A */ s16 changedArea;
/* 0x08C */ s16 mapID;
/* 0x08E */ s16 entryID;
/* 0x090 */ char unk_90[3];
/* 0x090 */ char unk_90[0x3];
/* 0x094 */ f32 exitAngle;
/* 0x098 */ f32 playerPos[3];
/* 0x0A4 */ f32 playerYaw;
/* 0x0A8 */ s8 unk_A8;
/* 0x0A9 */ char unk_A9;
/* 0x0AA */ s8 unk_AA;
/* 0x0AB */ char unk_AB[1];
/* 0x0AC */ u8 loadMenuState;
/* 0x0AB */ char unk_AB[0x1];
/* 0x0AC */ s8 loadMenuState;
/* 0x0AD */ u8 menuCounter;
/* 0x0AE */ char unk_AE[0x08];
/* 0x0B6 */ s16 boot_alpha;
@ -71,10 +70,8 @@ typedef struct {
/* 0x0BE */ char unk_BE[0x6A];
/* 0x128 */ f32 playerTraceNormal[3];
/* 0x134 */ u16 frameCounter;
/* 0x136 */ s32 nextRNG;
/* 0x13A */ char unk_136[0x2];
/* 0x13C */ s16 unk_13C;
/* 0x13E */ char unk_13E[0x2];
/* 0x138 */ s32 nextRNG;
/* 0x13A */ char unk_13A[0x4];
/* 0x140 */ UNK_PTR shopItemData;
/* 0x144 */ UNK_PTR mapShop;
/* 0x148 */ s16 backgroundFlags;
@ -86,12 +83,13 @@ typedef struct {
/* 0x154 */ UNK_PTR backgroundRaster;
/* 0x158 */ UNK_PTR backgroundPalette;
/* 0x15C */ s16 unk_15C;
/* 0x15E */ char unk_15E[0xA];
/* 0x15E */ char unk_15E[0x2];
/* 0x160 */ s16 savedPos[3];
/* 0x166 */ s8 saveSlot;
/* 0x167 */ u8 loadType; /* 0 = from map, 1 = from main menu */
/* 0x168 */ s32 saveCount;
} game_status;
/* 0x16C */ char unk_16C[0x10];
} game_status; // size = 0x178
typedef enum eItemEntityState {
CollisionWithPlayer=3,
@ -513,8 +511,8 @@ typedef struct {
} script_context; // size = 0x168;
typedef struct {
/* 0x00 */ u32 palette;
/* 0x04 */ u32 raster;
/* 0x00 */ u32 raster;
/* 0x04 */ u32 palette;
/* 0x08 */ u16 startX;
/* 0x0A */ u16 startY;
/* 0x0C */ u16 width;

10
src/code_dc470_len_14c0.c
View File

@ -37,8 +37,8 @@ void read_background_size(bg_header *bg) {
gameStatus->backgroundMaxH = bg->height;
gameStatus->backgroundMinW = bg->startX;
gameStatus->backgroundMinH = bg->startY;
gameStatus->backgroundPalette = bg->palette;
gameStatus->backgroundRaster = bg->raster;
gameStatus->backgroundPalette = bg->palette;
gameStatus->backgroundFlags |= 1;
}
@ -46,10 +46,10 @@ void set_background_size(s16 startX, s16 startY, s16 sizeX, s16 sizeY) {
game_status* gameStatus = *gGameStatusPtr;
gameStatus->backgroundFlags &= ~1;
gameStatus->backgroundMinW = startX;
gameStatus->backgroundMinH = startY;
gameStatus->backgroundMaxW = sizeX;
gameStatus->backgroundMaxH = sizeY;
gameStatus->backgroundMaxW = startX;
gameStatus->backgroundMaxH = startY;
gameStatus->backgroundMinW = sizeX;
gameStatus->backgroundMinH = sizeY;
}
u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) {