mirror of
https://github.com/pret/pmd-red.git
synced 2026-09-11 02:25:57 -05:00
More typedef
This commit is contained in:
@@ -10,18 +10,18 @@ enum
|
||||
NUM_BGS
|
||||
};
|
||||
|
||||
struct BGControlStruct
|
||||
typedef struct BGControlStruct
|
||||
{
|
||||
u16 padding;
|
||||
u16 unk2;
|
||||
s16 hofs;
|
||||
s16 vofs;
|
||||
};
|
||||
} BGControlStruct;
|
||||
|
||||
extern struct BGControlStruct gBG0Control;
|
||||
extern struct BGControlStruct gBG1Control;
|
||||
extern struct BGControlStruct gBG2Control;
|
||||
extern struct BGControlStruct gBG3Control;
|
||||
extern BGControlStruct gBG0Control;
|
||||
extern BGControlStruct gBG1Control;
|
||||
extern BGControlStruct gBG2Control;
|
||||
extern BGControlStruct gBG3Control;
|
||||
extern u16 gBldAlpha;
|
||||
extern u16 gBldCnt;
|
||||
extern bool8 gUnknown_202D7FE;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "text.h"
|
||||
|
||||
// size: 0x1A8
|
||||
struct unkStruct_203B294
|
||||
typedef struct unkStruct_203B294
|
||||
{
|
||||
/* 0x0 */ s32 state;
|
||||
/* 0x4 */ s32 fallbackState;
|
||||
@@ -28,10 +28,10 @@ struct unkStruct_203B294
|
||||
MenuItem unkF8[0x8];
|
||||
u16 unk138[0x8];
|
||||
UnkTextStruct2 unk148[4];
|
||||
};
|
||||
} unkStruct_203B294;
|
||||
|
||||
// size: 0x3FC
|
||||
struct unkStruct_3001B5C
|
||||
typedef struct unkStruct_3001B5C
|
||||
{
|
||||
u8 unk0;
|
||||
u32 unk4;
|
||||
@@ -46,6 +46,6 @@ struct unkStruct_3001B5C
|
||||
UnkTextStruct2 *unk394;
|
||||
UnkTextStruct2 unk398[4];
|
||||
u8 unk3F8[4];
|
||||
};
|
||||
} unkStruct_3001B5C;
|
||||
|
||||
#endif // GUARD_CODE_8023144_H
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef GUARD_GAME_OPTIONS_H
|
||||
#define GUARD_GAME_OPTIONS_H
|
||||
|
||||
struct GameOptions
|
||||
typedef struct GameOptions
|
||||
{
|
||||
// TODO: find where Controls/Touch Screen are in this structure in PMD Blue
|
||||
|
||||
@@ -16,9 +16,9 @@ struct GameOptions
|
||||
/* 0xA */ u8 unkA; // maybe Touch Screen?
|
||||
/* 0xB */ u8 playerGender;
|
||||
/* 0xC */ u8 unkC;
|
||||
};
|
||||
} GameOptions;
|
||||
|
||||
enum DungeonSpeed
|
||||
enum DungeonSpeed
|
||||
{
|
||||
DUNGEON_SPEED_SLOW,
|
||||
DUNGEON_SPEED_FAST,
|
||||
@@ -30,7 +30,6 @@ enum FarOffPals
|
||||
FAROFFPALS_LOCK,
|
||||
};
|
||||
|
||||
|
||||
// GBA has 3 options while DS has 7
|
||||
enum MapOption
|
||||
{
|
||||
@@ -61,9 +60,9 @@ enum windowColor
|
||||
};
|
||||
|
||||
void LoadGameOptions(void);
|
||||
struct GameOptions * GetGameOptions(void);
|
||||
GameOptions * GetGameOptions(void);
|
||||
void InitializeGameOptions(bool8 initializeGender);
|
||||
bool8 GameOptionsNotChange(struct GameOptions *r0);
|
||||
bool8 GameOptionsNotChange(GameOptions *r0);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define GUARD_GROUND_SPRITE_H
|
||||
|
||||
// size: 0xC
|
||||
struct unkStruct_2039DB0
|
||||
typedef struct unkStruct_2039DB0
|
||||
{
|
||||
u16 unk0;
|
||||
s16 unk2;
|
||||
@@ -10,27 +10,29 @@ struct unkStruct_2039DB0
|
||||
u16 unk6;
|
||||
u16 unk8;
|
||||
u16 unkA;
|
||||
};
|
||||
} unkStruct_2039DB0;
|
||||
|
||||
// size: 0xC
|
||||
struct unkStruct_3001B7C_sub0
|
||||
typedef struct unkStruct_3001B7C_sub0
|
||||
{
|
||||
u32 unk0;
|
||||
s32 unk4;
|
||||
u32 unk8;
|
||||
};
|
||||
} unkStruct_3001B7C_sub0;
|
||||
|
||||
// size: 0x4
|
||||
struct unkStruct_3001B7C_sub108
|
||||
typedef struct unkStruct_3001B7C_sub108
|
||||
{
|
||||
u16 unk0;
|
||||
s16 unk2;
|
||||
};
|
||||
} unkStruct_3001B7C_sub108;
|
||||
|
||||
// size: 0x110
|
||||
struct unkStruct_3001B7C
|
||||
typedef struct unkStruct_3001B7C
|
||||
{
|
||||
struct unkStruct_3001B7C_sub0 unk0[22];
|
||||
struct unkStruct_3001B7C_sub108 unk108[2];
|
||||
};
|
||||
unkStruct_3001B7C_sub0 unk0[22];
|
||||
unkStruct_3001B7C_sub108 unk108[2];
|
||||
} unkStruct_3001B7C;
|
||||
|
||||
void GroundSprite_Reset(s16);
|
||||
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#include "main.h"
|
||||
|
||||
// size: 0x8
|
||||
struct unkStruct_202D648
|
||||
typedef struct unkStruct_202D648
|
||||
{
|
||||
s16 unk0;
|
||||
s16 unk2; // Vcount??
|
||||
IntrCallback unk4; // some function... just making it IntrCallback for now
|
||||
};
|
||||
} unkStruct_202D648;
|
||||
|
||||
extern s16 gUnknown_203B0A8;
|
||||
extern s16 gUnknown_203B0AA;
|
||||
@@ -18,6 +18,7 @@ extern s16 gUnknown_203B0AE;
|
||||
|
||||
void nullsub_17(void);
|
||||
void xxx_update_bg_sound_input(void);
|
||||
|
||||
void sub_800BA5C(void);
|
||||
|
||||
#endif // GUARD_CODE_800B5F0_H
|
||||
@@ -58,7 +58,7 @@ struct UnkStruct_203B184 {
|
||||
/* 0x20 */ struct unkStruct_203B494 *unk20;
|
||||
/* 0x24 */ struct ExclusivePokemonData *ExclusivePokemon;
|
||||
/* 0x28 */ bool8 *BoughtFriendAreas;
|
||||
/* 0x2C */ struct GameOptions *gameOptions;
|
||||
/* 0x2C */ GameOptions *gameOptions;
|
||||
/* 0x30 */ struct PlayTimeStruct *playTime;
|
||||
u32 unk34;
|
||||
u32 unk38;
|
||||
|
||||
@@ -74,13 +74,13 @@ typedef struct Dungeon_ax
|
||||
u32 unk10;
|
||||
} Dungeon_ax;
|
||||
|
||||
void AddSprite(SpriteOAM *, s32, UnkSpriteMem *, struct unkStruct_2039DB0 *);
|
||||
void AddSprite(SpriteOAM *, s32, UnkSpriteMem *, unkStruct_2039DB0 *);
|
||||
void BlinkSavingIcon(void);
|
||||
void CopySpritesToOam(void);
|
||||
void InitSprites(void);
|
||||
void ResetSprites(bool8);
|
||||
void SetSavingIconCoords(Position *);
|
||||
void sub_8004E8C(struct unkStruct_2039DB0 *);
|
||||
void sub_8004E8C(unkStruct_2039DB0 *);
|
||||
void sub_8005180(void);
|
||||
void sub_8005304(void);
|
||||
void sub_800533C(ax_pose **, UnkSpriteMem **, axdata1 *, u16 *, bool8);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "text.h"
|
||||
|
||||
// size: 0x138
|
||||
struct WigglytuffShop
|
||||
typedef struct WigglytuffShop
|
||||
{
|
||||
bool32 isAsleep;
|
||||
s32 state;
|
||||
@@ -31,7 +31,7 @@ struct WigglytuffShop
|
||||
UnkTextStruct2 unkD0[4];
|
||||
u32 unk130;
|
||||
u32 unk134;
|
||||
};
|
||||
} WigglytuffShop;
|
||||
|
||||
enum WigglytuffStates
|
||||
{
|
||||
@@ -45,35 +45,35 @@ enum WigglytuffStates
|
||||
FRIEND_AREA_SELECT_BUY = 7,
|
||||
FRIEND_AREA_SELECT_BUY_AGAIN = 8,
|
||||
WIGGLYTUFF_UNK9 = 9,
|
||||
WIGGLYTUFF_UNKA = 0xA,
|
||||
WIGGLYTUFF_UNKB = 0xB,
|
||||
CONFIRM_BUY_FRIEND_AREA = 0xC,
|
||||
WIGGLYTUFF_UNKD = 0xD,
|
||||
WIGGLYTUFF_UNKE = 0xE,
|
||||
FRIEND_AREA_UNLOCKED = 0xF,
|
||||
FRIEND_AREA_INFO = 0x10,
|
||||
BUY_FRIEND_AREA = 0x11,
|
||||
NO_FRIEND_AREAS = 0x12,
|
||||
NOT_ENOUGH_MONEY = 0x13,
|
||||
WIGGLYTUFF_CHECK = 0x14,
|
||||
WIGGLYTUFF_CHECK_AGAIN = 0x15,
|
||||
WIGGLYTUFF_UNK16 = 0x16,
|
||||
WIGGLYTUFF_UNK17 = 0x17,
|
||||
DISPLAY_POKEMON_FRIEND_AREA_INFO = 0x18,
|
||||
WIGGLYTUFF_CHECK_HAS_FRIEND_AREA = 0x19,
|
||||
WIGGLYTUFF_CHECK_POST_GAME = 0x1A,
|
||||
WIGGLYTUFF_CHECK_WONDER_MAIL = 0x1B,
|
||||
WIGGLYTUFF_CHECK_LEGENDARY = 0x1C,
|
||||
WIGGLYTUFF_UNKA = 10,
|
||||
WIGGLYTUFF_UNKB = 11,
|
||||
CONFIRM_BUY_FRIEND_AREA = 12,
|
||||
WIGGLYTUFF_UNKD = 13,
|
||||
WIGGLYTUFF_UNKE = 14,
|
||||
FRIEND_AREA_UNLOCKED = 15,
|
||||
FRIEND_AREA_INFO = 16,
|
||||
BUY_FRIEND_AREA = 17,
|
||||
NO_FRIEND_AREAS = 18,
|
||||
NOT_ENOUGH_MONEY = 19,
|
||||
WIGGLYTUFF_CHECK = 20,
|
||||
WIGGLYTUFF_CHECK_AGAIN = 21,
|
||||
WIGGLYTUFF_UNK16 = 22,
|
||||
WIGGLYTUFF_UNK17 = 23,
|
||||
DISPLAY_POKEMON_FRIEND_AREA_INFO = 24,
|
||||
WIGGLYTUFF_CHECK_HAS_FRIEND_AREA = 25,
|
||||
WIGGLYTUFF_CHECK_POST_GAME = 26,
|
||||
WIGGLYTUFF_CHECK_WONDER_MAIL = 27,
|
||||
WIGGLYTUFF_CHECK_LEGENDARY = 28,
|
||||
};
|
||||
|
||||
bool8 sub_80211AC(u32 mode, u32 param_2);
|
||||
bool8 sub_8021774(u8 friendArea, bool8 param_2, s32 param_3);
|
||||
u32 sub_8021274(bool8 param_1);
|
||||
bool8 sub_80211AC(u32, u32);
|
||||
bool8 sub_8021774(u8, bool8, s32);
|
||||
u32 sub_8021274(bool8);
|
||||
u8 sub_802132C(void);
|
||||
void sub_8021354(bool8 param_1);
|
||||
void sub_8021354(bool8);
|
||||
void sub_80213A0(void);
|
||||
void sub_8021494(void);
|
||||
u32 sub_80217EC(void);
|
||||
void sub_8021830(void);
|
||||
|
||||
#endif // GUARD_WIGGLYTUFF_SHOP_H
|
||||
#endif // GUARD_WIGGLYTUFF_SHOP_H
|
||||
@@ -2,10 +2,10 @@
|
||||
#include "bg_control.h"
|
||||
#include "input.h"
|
||||
|
||||
EWRAM_DATA struct BGControlStruct gBG0Control = {0};
|
||||
EWRAM_DATA struct BGControlStruct gBG1Control = {0};
|
||||
EWRAM_DATA struct BGControlStruct gBG2Control = {0};
|
||||
EWRAM_DATA struct BGControlStruct gBG3Control = {0};
|
||||
EWRAM_DATA BGControlStruct gBG0Control = {0};
|
||||
EWRAM_DATA BGControlStruct gBG1Control = {0};
|
||||
EWRAM_DATA BGControlStruct gBG2Control = {0};
|
||||
EWRAM_DATA BGControlStruct gBG3Control = {0};
|
||||
static EWRAM_DATA u8 sBldAlpha_CoeffA = {0};
|
||||
static EWRAM_DATA u8 sBldAlpha_CoeffB = {0};
|
||||
EWRAM_DATA u16 gBldAlpha;
|
||||
|
||||
@@ -57,7 +57,7 @@ extern u32 gUnknown_203B03C;
|
||||
extern u16 gUnknown_2026E4E;
|
||||
extern s32 gUnknown_2000A80;
|
||||
extern OpenedFile *gTitlePaletteFile;
|
||||
extern struct GameOptions *gGameOptionsRef;
|
||||
extern GameOptions *gGameOptionsRef;
|
||||
|
||||
extern char gPMDBuildVersion[];
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "sprite.h"
|
||||
#include "event_flag.h"
|
||||
|
||||
extern struct GameOptions *gGameOptionsRef;
|
||||
extern GameOptions *gGameOptionsRef;
|
||||
|
||||
// size: 0x4DD8
|
||||
struct UnkBgStruct
|
||||
|
||||
@@ -13,7 +13,7 @@ extern void xxx_call_update_bg_vram();
|
||||
extern void sub_8009908();
|
||||
extern void xxx_call_update_bg_sound_input();
|
||||
|
||||
extern struct GameOptions *gGameOptionsRef;
|
||||
extern GameOptions *gGameOptionsRef;
|
||||
|
||||
void sub_8012A18()
|
||||
{
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
#include "code_80118A4.h"
|
||||
#include "exclusive_pokemon.h"
|
||||
|
||||
IWRAM_DATA struct unkStruct_3001B5C *gUnknown_3001B5C;
|
||||
struct unkStruct_203B294 *gUnknown_203B294;
|
||||
IWRAM_DATA unkStruct_3001B5C *gUnknown_3001B5C;
|
||||
unkStruct_203B294 *gUnknown_203B294;
|
||||
|
||||
extern u32 gUnknown_203B298;
|
||||
extern u16 gUnknown_203B29C;
|
||||
@@ -268,7 +268,7 @@ bool8 sub_8023144(s32 param_1, s32 index, UnkTextStruct2_sub *sub, u32 param_4)
|
||||
return 0;
|
||||
|
||||
if (gUnknown_3001B5C == NULL)
|
||||
gUnknown_3001B5C = MemoryAlloc(sizeof(struct unkStruct_3001B5C), 8);
|
||||
gUnknown_3001B5C = MemoryAlloc(sizeof(unkStruct_3001B5C), 8);
|
||||
|
||||
gUnknown_3001B5C->unk0 = param_1_u8;
|
||||
gUnknown_3001B5C->unk4 = gUnknown_203B298;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "code_8023144.h"
|
||||
#include "text2.h"
|
||||
|
||||
struct unkStruct_203B294 *gUnknown_203B294;
|
||||
unkStruct_203B294 *gUnknown_203B294;
|
||||
extern u8 gAvailablePokemonNames[];
|
||||
extern u8 gUnknown_80DC5EC[];
|
||||
extern u8 HasGummiItem(void);
|
||||
@@ -37,7 +37,7 @@ bool8 sub_80227B8(PokemonStruct1 *pokeStruct)
|
||||
{
|
||||
ResetUnusedInputStruct();
|
||||
sub_800641C(NULL, TRUE, TRUE);
|
||||
gUnknown_203B294 = MemoryAlloc(sizeof(struct unkStruct_203B294), 8);
|
||||
gUnknown_203B294 = MemoryAlloc(sizeof(unkStruct_203B294), 8);
|
||||
gUnknown_203B294->menuAction = 0;
|
||||
gUnknown_203B294->pokeStruct = pokeStruct;
|
||||
if(pokeStruct != NULL)
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "game_options.h"
|
||||
#include "text_util.h"
|
||||
|
||||
extern struct GameOptions *gGameOptionsRef;
|
||||
extern GameOptions *gGameOptionsRef;
|
||||
|
||||
struct unkStruct_80F520C
|
||||
{
|
||||
|
||||
@@ -16,8 +16,8 @@ struct unkStruct_8094CB0
|
||||
|
||||
extern struct WindowBG gWindowBGColors;
|
||||
|
||||
EWRAM_DATA_2 struct GameOptions *gGameOptionsRef = {0};
|
||||
EWRAM_DATA struct GameOptions gGameOptions = {0};
|
||||
EWRAM_DATA_2 GameOptions *gGameOptionsRef = {0};
|
||||
EWRAM_DATA GameOptions gGameOptions = {0};
|
||||
extern void SetWindowBGColor(void);
|
||||
extern void sub_80099F0(u32);
|
||||
|
||||
@@ -26,7 +26,7 @@ void LoadGameOptions(void)
|
||||
gGameOptionsRef = &gGameOptions;
|
||||
}
|
||||
|
||||
struct GameOptions * GetGameOptions(void)
|
||||
GameOptions * GetGameOptions(void)
|
||||
{
|
||||
return &gGameOptions;
|
||||
}
|
||||
@@ -49,7 +49,7 @@ void InitializeGameOptions(bool8 initializeGender)
|
||||
SetWindowBGColor();
|
||||
}
|
||||
|
||||
bool8 GameOptionsNotChange(struct GameOptions *r0)
|
||||
bool8 GameOptionsNotChange(GameOptions *r0)
|
||||
{
|
||||
// NOTE: had to nest to match
|
||||
if(gGameOptionsRef->windowColor == r0->windowColor)
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
#include "memory.h"
|
||||
#include "sprite.h"
|
||||
|
||||
extern struct unkStruct_2039DB0 gUnknown_2039DB0;
|
||||
extern struct unkStruct_2039DB0 gUnknown_2039DC0;
|
||||
extern unkStruct_2039DB0 gUnknown_2039DB0;
|
||||
extern unkStruct_2039DB0 gUnknown_2039DC0;
|
||||
extern u16 gUnknown_2039DCC;
|
||||
extern u16 gUnknown_2039DCE;
|
||||
extern u8 gUnknown_2039DD0;
|
||||
extern u32 gUnknown_2039DD4;
|
||||
extern OpenedFile *gUnknown_203B4B4;
|
||||
extern struct unkStruct_3001B7C *gUnknown_3001B7C;
|
||||
extern unkStruct_3001B7C *gUnknown_3001B7C;
|
||||
|
||||
// dungeon_sbin.s
|
||||
extern const struct FileArchive gDungeonFileArchive;
|
||||
@@ -41,11 +41,11 @@ extern void sub_80A6460(void);
|
||||
void sub_80A62F0(void)
|
||||
{
|
||||
s32 r0;
|
||||
struct unkStruct_3001B7C_sub0 *sub0;
|
||||
struct unkStruct_3001B7C_sub108 *sub108;
|
||||
unkStruct_3001B7C_sub0 *sub0;
|
||||
unkStruct_3001B7C_sub108 *sub108;
|
||||
s32 r6;
|
||||
|
||||
gUnknown_3001B7C = MemoryAlloc(sizeof(struct unkStruct_3001B7C), 6);
|
||||
gUnknown_3001B7C = MemoryAlloc(sizeof(unkStruct_3001B7C), 6);
|
||||
gUnknown_203B4B4 = OpenFileAndGetFileDataPtr(gUnknown_81177CC, &gDungeonFileArchive);
|
||||
|
||||
sub_800DAC0(1);
|
||||
@@ -74,8 +74,8 @@ void sub_80A62F0(void)
|
||||
void GroundSprite_Reset(s16 a0)
|
||||
{
|
||||
s32 uVar2;
|
||||
struct unkStruct_2039DB0 *bee;
|
||||
struct unkStruct_2039DB0 *see;
|
||||
unkStruct_2039DB0 *bee;
|
||||
unkStruct_2039DB0 *see;
|
||||
|
||||
uVar2 = a0;
|
||||
|
||||
@@ -137,7 +137,7 @@ void sub_80A64A4(void)
|
||||
u16 r4;
|
||||
u32 r5;
|
||||
OpenedFile *file;
|
||||
struct unkStruct_3001B7C_sub108 *r7;
|
||||
unkStruct_3001B7C_sub108 *r7;
|
||||
s32 i;
|
||||
s16 r9;
|
||||
u16 sl;
|
||||
|
||||
@@ -14,7 +14,7 @@ struct unkStruct_203B25C
|
||||
// size: 0x11C
|
||||
u32 state;
|
||||
u32 chosenHintIndex;
|
||||
struct GameOptions newOptions;
|
||||
GameOptions newOptions;
|
||||
u32 menuAction;
|
||||
MenuStruct menu;
|
||||
MenuItem menuItems[8];
|
||||
@@ -24,7 +24,7 @@ struct unkStruct_203B25C
|
||||
|
||||
struct unkStruct_203B260
|
||||
{
|
||||
struct GameOptions *optionsMenu;
|
||||
GameOptions *optionsMenu;
|
||||
MenuInputStructSub unk4;
|
||||
MenuInputStruct input;
|
||||
u32 unk44;
|
||||
@@ -32,7 +32,7 @@ struct unkStruct_203B260
|
||||
UnkTextStruct2 unk4C[4];
|
||||
};
|
||||
struct unkStruct_203B260 *gUnknown_203B260;
|
||||
extern struct GameOptions *gGameOptionsRef;
|
||||
extern GameOptions *gGameOptionsRef;
|
||||
extern struct unkStruct_203B25C *gUnknown_203B25C;
|
||||
|
||||
extern const UnkTextStruct2 gUnknown_80DBFB0;
|
||||
@@ -65,7 +65,7 @@ extern void sub_801E0FC();
|
||||
extern void HandleChangeSettingsMenu();
|
||||
extern void sub_801DD84();
|
||||
extern void sub_801DED0();
|
||||
extern bool8 sub_801E198(struct GameOptions *);
|
||||
extern bool8 sub_801E198(GameOptions *);
|
||||
extern void CreateHintDisplayScreen(u32);
|
||||
extern void sub_801E3F0(u32);
|
||||
extern void CreateHintSelectionScreen(u32);
|
||||
@@ -367,7 +367,7 @@ void HandleChangeSettingsMenu(void)
|
||||
}
|
||||
}
|
||||
|
||||
bool8 sub_801E198(struct GameOptions *optionsMenu)
|
||||
bool8 sub_801E198(GameOptions *optionsMenu)
|
||||
{
|
||||
gUnknown_203B260 = MemoryAlloc(sizeof(struct unkStruct_203B260), 8);
|
||||
gUnknown_203B260->optionsMenu = optionsMenu;
|
||||
|
||||
@@ -53,7 +53,7 @@ extern void RedrawPartnerSelectionMenu(void);
|
||||
|
||||
extern u32 sub_80095E4(s16, u32);
|
||||
|
||||
extern struct GameOptions *gGameOptionsRef;
|
||||
extern GameOptions *gGameOptionsRef;
|
||||
|
||||
extern const char gStarterReveal[];
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ struct unkStruct_203B2D8
|
||||
u8 unkA0[4];
|
||||
};
|
||||
extern struct unkStruct_203B2D8 *gUnknown_203B2D8;
|
||||
extern struct GameOptions *gGameOptionsRef;
|
||||
extern GameOptions *gGameOptionsRef;
|
||||
|
||||
const UnkTextStruct2 gUnknown_80DFBD0 =
|
||||
{
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
#include "reg_control.h"
|
||||
#include "sprite.h"
|
||||
|
||||
extern struct unkStruct_202D648 gUnknown_202D608[8];
|
||||
extern struct unkStruct_202D648 gUnknown_202D648[8];
|
||||
extern unkStruct_202D648 gUnknown_202D608[8];
|
||||
extern unkStruct_202D648 gUnknown_202D648[8];
|
||||
|
||||
EWRAM_DATA bool8 gUnknown_203B099;
|
||||
EWRAM_DATA bool8 gUnknown_203B09A;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
EWRAM_DATA_2 u32 gUnknown_203B17C = {0};
|
||||
EWRAM_DATA_2 char *gUnknown_203B180 = {0};
|
||||
EWRAM_DATA_2 struct UnkStruct_203B184 *gUnknown_203B184 = {0};
|
||||
extern struct GameOptions *gGameOptionsRef;
|
||||
extern GameOptions *gGameOptionsRef;
|
||||
|
||||
// size: 0x800
|
||||
struct unk_struct
|
||||
|
||||
@@ -129,7 +129,7 @@ void ResetSprites(bool8 a0)
|
||||
gUnknown_20256A0.unk804 = 0;
|
||||
}
|
||||
|
||||
void sub_8004E8C(struct unkStruct_2039DB0 *a0)
|
||||
void sub_8004E8C(unkStruct_2039DB0 *a0)
|
||||
{
|
||||
a0->unk0 = 0xFFFF;
|
||||
a0->unk2 = -1;
|
||||
@@ -510,7 +510,7 @@ void sub_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks)
|
||||
|
||||
// a2 and a3 are always called with NULL lol
|
||||
#ifdef NONMATCHING // https://decomp.me/scratch/YCfKG
|
||||
void AddSprite(SpriteOAM *a0, s32 a1, UnkSpriteMem *a2, struct unkStruct_2039DB0 *a3)
|
||||
void AddSprite(SpriteOAM *a0, s32 a1, UnkSpriteMem *a2, unkStruct_2039DB0 *a3)
|
||||
{
|
||||
s32 yPos;
|
||||
SpriteOAM *spr;
|
||||
@@ -560,7 +560,7 @@ void AddSprite(SpriteOAM *a0, s32 a1, UnkSpriteMem *a2, struct unkStruct_2039DB0
|
||||
}
|
||||
#else
|
||||
NAKED
|
||||
void AddSprite(SpriteOAM *a0, s32 a1, UnkSpriteMem *a2, struct unkStruct_2039DB0 *a3)
|
||||
void AddSprite(SpriteOAM *a0, s32 a1, UnkSpriteMem *a2, unkStruct_2039DB0 *a3)
|
||||
{
|
||||
asm_unified(
|
||||
"push {r4-r7,lr}\n"
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#include "global.h"
|
||||
#include "reg_control.h"
|
||||
|
||||
extern struct unkStruct_202D648 gUnknown_202D608[8];
|
||||
extern struct unkStruct_202D648 gUnknown_202D648[8];
|
||||
extern unkStruct_202D648 gUnknown_202D608[8];
|
||||
extern unkStruct_202D648 gUnknown_202D648[8];
|
||||
|
||||
// Unused?
|
||||
s32 sub_800B720(s16 a0, IntrCallback a1)
|
||||
{
|
||||
s32 r2;
|
||||
struct unkStruct_202D648 *r3;
|
||||
unkStruct_202D648 *r3;
|
||||
s32 r4;
|
||||
bool8 sp4;
|
||||
s32 spC;
|
||||
@@ -70,7 +70,7 @@ s32 sub_800B720(s16 a0, IntrCallback a1)
|
||||
void sub_800B850(s16 a0)
|
||||
{
|
||||
s32 r2;
|
||||
struct unkStruct_202D648 *r4;
|
||||
unkStruct_202D648 *r4;
|
||||
bool8 r5;
|
||||
s32 r6;
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ struct unkStruct_203B28C
|
||||
};
|
||||
EWRAM_DATA_2 struct unkStruct_203B28C *gUnknown_203B28C = {0};
|
||||
|
||||
EWRAM_DATA_2 struct WigglytuffShop *gWigglytuffShop = {0};
|
||||
EWRAM_DATA_2 WigglytuffShop *gWigglytuffShop = {0};
|
||||
extern u8 *gFriendAreas;
|
||||
|
||||
extern u8 gUnknown_202E628[];
|
||||
@@ -589,7 +589,7 @@ bool8 CreateWigglytuffShop(bool32 isAsleep)
|
||||
|
||||
ResetUnusedInputStruct();
|
||||
sub_800641C(NULL, TRUE, TRUE);
|
||||
gWigglytuffShop = MemoryAlloc(sizeof(struct WigglytuffShop), 8);
|
||||
gWigglytuffShop = MemoryAlloc(sizeof(WigglytuffShop), 8);
|
||||
gWigglytuffShop->menuAction1 = 0;
|
||||
gWigglytuffShop->menuAction2 = 0;
|
||||
gWigglytuffShop->isAsleep = isAsleep;
|
||||
|
||||
@@ -892,10 +892,10 @@ gUnknown_2039DA4: /* 2039DA4 */
|
||||
gUnknown_2039DA8: /* 2039DA8 */
|
||||
.space 0x8
|
||||
|
||||
gUnknown_2039DB0: /* 2039DB0 [struct unkStruct_2039DB0] */
|
||||
gUnknown_2039DB0: /* 2039DB0 [unkStruct_2039DB0] */
|
||||
.space 0x10
|
||||
|
||||
gUnknown_2039DC0: /* 2039DC0 [struct unkStruct_2039DB0] */
|
||||
gUnknown_2039DC0: /* 2039DC0 [unkStruct_2039DB0] */
|
||||
.space 0xC
|
||||
|
||||
gUnknown_2039DCC: /* 2039DCC */
|
||||
|
||||
Reference in New Issue
Block a user