mirror of
https://github.com/pret/pmd-red.git
synced 2026-09-11 18:45:55 -05:00
Match RockSmashMoveAction + cleans
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#ifndef GUARD_AXDATA_H
|
||||
#define GUARD_AXDATA_H
|
||||
|
||||
#include "file_system.h"
|
||||
#include "structs/str_file_system.h"
|
||||
#include "structs/str_position.h"
|
||||
|
||||
// size: 0x8
|
||||
@@ -83,7 +83,7 @@ typedef struct axmain
|
||||
struct axObject
|
||||
{
|
||||
/* 0x0 */ axdata axdata;
|
||||
/* 0x3C */ OpenedFile *spriteFile; // This might be a unkStruct_202EE8C instead and unkStruct_202EE8C.unk0 might be a OpenedFile* etc. See sub_8010F28
|
||||
/* 0x3C */ OpenedFile *spriteFile; // This might be a unkStruct_202EE8C instead and unkStruct_202EE8C.unk0 might be a OpenedFile* etc. See friend_areas_map_util.AnimateSprites()
|
||||
s16 unk40_maybeAnimTimer;
|
||||
u8 unk42_animId1;
|
||||
u8 unk43_animId2;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef GUARD_STR_202ED28_H
|
||||
#define GUARD_STR_202ED28_H
|
||||
|
||||
#include "structs/sprite_oam.h"
|
||||
#include "structs/str_position.h"
|
||||
|
||||
struct unkStruct_202ED28
|
||||
|
||||
@@ -24,13 +24,13 @@ typedef struct UnkStruct_RunDungeon
|
||||
PokemonStruct1 unk1C;
|
||||
u8 *unk74;
|
||||
Dungeon *unk78;
|
||||
s16 unk7C;
|
||||
s16 unk7C; // Set to 5 if the dungeon was skipped (quicksave read failed)
|
||||
u8 unk7E;
|
||||
DungeonLocation unk80;
|
||||
WonderMailSub unk84;
|
||||
} UnkStruct_RunDungeon;
|
||||
|
||||
// TODO: This func should not be in a structs include file
|
||||
void RunDungeon(UnkStruct_RunDungeon *r8);
|
||||
void RunDungeon_Async(UnkStruct_RunDungeon *r8);
|
||||
|
||||
#endif // GUARD_STR_DUNGEON_8042F6C_H
|
||||
#endif // GUARD_STR_DUNGEON_8042F6C_H
|
||||
|
||||
26
include/structs/str_file_system.h
Normal file
26
include/structs/str_file_system.h
Normal file
@@ -0,0 +1,26 @@
|
||||
#ifndef GUARD_STR_FILE_SYSTEM_H
|
||||
#define GUARD_STR_FILE_SYSTEM_H
|
||||
|
||||
// size: 0x8
|
||||
typedef struct File
|
||||
{
|
||||
/* 0x0 */ char *name;
|
||||
/* 0x4 */ const void *data;
|
||||
} File;
|
||||
|
||||
// size: 0x10
|
||||
typedef struct FileArchive
|
||||
{
|
||||
/* 0x0 */ char magic[8];
|
||||
/* 0x8 */ s32 count;
|
||||
/* 0xC */ const File *entries;
|
||||
} FileArchive;
|
||||
|
||||
// size: 0x8
|
||||
typedef struct OpenedFile
|
||||
{
|
||||
/* 0x0 */ const File *file;
|
||||
/* 0x4 */ const void *data;
|
||||
} OpenedFile;
|
||||
|
||||
#endif // GUARD_STR_FILE_SYSTEM_H
|
||||
@@ -4,28 +4,28 @@
|
||||
// size: 0x48
|
||||
typedef struct Window
|
||||
{
|
||||
s16 x;
|
||||
s16 y;
|
||||
s16 width;
|
||||
s16 height;
|
||||
s16 unk8;
|
||||
s32 type;
|
||||
u32 unk10;
|
||||
u32 unk14;
|
||||
u32 *unk18;
|
||||
u32 *unk1C;
|
||||
s32 unk20;
|
||||
s32 unk24;
|
||||
u32 *unk28; // Somewhere in VRAM
|
||||
s32 unk2C;
|
||||
u32 *unk30; // Somewhere in VRAM?
|
||||
u32 *unk34;
|
||||
s32 unk38;
|
||||
u32 *unk3C;
|
||||
u32 *unk40;
|
||||
u8 unk44;
|
||||
bool8 unk45;
|
||||
u8 unk46;
|
||||
/* 0x0 */ s16 x;
|
||||
/* 0x2 */ s16 y;
|
||||
/* 0x4 */ s16 width;
|
||||
/* 0x6 */ s16 height;
|
||||
/* 0x8 */ s16 unk8;
|
||||
/* 0xC */ s32 type;
|
||||
/* 0x10 */ u32 unk10;
|
||||
/* 0x14 */ u32 unk14;
|
||||
/* 0x18 */ u32 *unk18;
|
||||
/* 0x1C */ u32 *unk1C;
|
||||
/* 0x20 */ s32 unk20;
|
||||
/* 0x24 */ s32 unk24;
|
||||
/* 0x28 */ u32 *unk28; // Somewhere in VRAM
|
||||
/* 0x2C */ s32 unk2C;
|
||||
/* 0x30 */ u32 *unk30; // Somewhere in VRAM?
|
||||
/* 0x34 */ u32 *unk34;
|
||||
/* 0x38 */ s32 unk38;
|
||||
/* 0x3C */ u32 *unk3C;
|
||||
/* 0x40 */ u32 *unk40;
|
||||
/* 0x44 */ u8 unk44;
|
||||
/* 0x45 */ bool8 unk45;
|
||||
/* 0x46 */ u8 unk46;
|
||||
} Window;
|
||||
|
||||
// size: 0x4
|
||||
|
||||
Reference in New Issue
Block a user