Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 05:00:12 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Kermalis 2023-09-09 00:31:17 -04:00
parent 0669da2a4e
commit 00a0876bcc
33 changed files with 579 additions and 670 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/code_809447C.h
View File

@ -2,12 +2,12 @@
#define GUARD_CODE_809447C_H #define GUARD_CODE_809447C_H
// size: 0xC // size: 0xC
struct unkStruct_80928C0 typedef struct unkStruct_80928C0
{ {
u32 unk0; u32 unk0;
s32 unk4; s32 unk4;
u8 unk8; u8 unk8;
u8 unk9; u8 unk9;
}; } unkStruct_80928C0;
#endif #endif // GUARD_CODE_809447C_H

4
include/code_8094F88.h
View File

@ -60,7 +60,7 @@ u32 *sub_8095108(void);
unkStruct_203B48C *sub_8095110(void); unkStruct_203B48C *sub_8095110(void);
void sub_8095118(void); void sub_8095118(void);
s32 FindOpenMailSlot(void); s32 FindOpenMailSlot(void);
bool8 sub_80951BC(unkStruct_203B480 *); bool8 sub_80951BC(unkStruct_203B480 *mail);
bool8 sub_80951FC(unkStruct_203B480 *); bool8 sub_80951FC(unkStruct_203B480 *);
unkStruct_203B480 * GetMailatIndex(u8); unkStruct_203B480 * GetMailatIndex(u8);
void DeleteMailAtIndex(u8); void DeleteMailAtIndex(u8);
@ -76,4 +76,4 @@ s32 GetFirstIndexofMailType(u8);
void sub_8095824(struct unkStruct_8094924 *, unkStruct_203B480 *); void sub_8095824(struct unkStruct_8094924 *, unkStruct_203B480 *);
void sub_8095774(struct unkStruct_8094924 *, unkStruct_203B480 *); void sub_8095774(struct unkStruct_8094924 *, unkStruct_203B480 *);
#endif #endif // GUARD_CODE_8094F88_H

23
include/code_80958E8.h
View File

@ -4,28 +4,27 @@
#include "wonder_mail.h" #include "wonder_mail.h"
#include "constants/mailbox.h" #include "constants/mailbox.h"
struct subStruct_203B490 // size: 0xC
typedef struct subStruct_203B490
{ {
// size: 0xC /* 0x0 */ DungeonLocation dungeon;
DungeonLocation dungeon; /* 0x4 */ u32 seed;
u32 seed;
u32 unk8; u32 unk8;
}; } subStruct_203B490;
struct unkStruct_203B490 // size: 0x32C?
typedef struct unkStruct_203B490
{ {
// size: 0x330?
/* 0x0 */ WonderMail mailboxSlots[NUM_MAILBOX_SLOTS]; /* 0x0 */ WonderMail mailboxSlots[NUM_MAILBOX_SLOTS];
/* 0x50 */ WonderMail pelipperBoardJobs[MAX_ACCEPTED_JOBS]; /* 0x50 */ WonderMail pelipperBoardJobs[MAX_ACCEPTED_JOBS];
/* 0xF0 */ WonderMail jobSlots[MAX_ACCEPTED_JOBS]; /* 0xF0 */ WonderMail jobSlots[MAX_ACCEPTED_JOBS];
u8 unk190[0x28]; u8 unk190[0x28];
u8 unk1B8[0x78]; u8 unk1B8[0x78];
struct subStruct_203B490 unk230[16]; subStruct_203B490 unk230[16];
u8 PKMNNewsReceived[NUM_POKEMON_NEWS]; /* 0x2F0 */ u8 PKMNNewsReceived[NUM_POKEMON_NEWS];
bool8 unk328; bool8 unk328;
}; } unkStruct_203B490;
extern struct unkStruct_203B490 *gUnknown_203B490; extern unkStruct_203B490 *gUnknown_203B490;
#endif // GUARD_CODE_80958E8_H #endif // GUARD_CODE_80958E8_H

4
include/code_80958E8_1.h
View File

@ -3,7 +3,7 @@
#include "wonder_mail.h" #include "wonder_mail.h"
s32 CountJobsinDungeon(u8); s32 CountJobsinDungeon(u8 dungeon);
WonderMail *GetJobSlotInfo(u8); WonderMail *GetJobSlotInfo(u8 index);
#endif // GUARD_CODE_80958E8_1_H #endif // GUARD_CODE_80958E8_1_H

6
include/code_80972F4.h
View File

@ -2,18 +2,18 @@
#define GUARD_CODE_80972F4_H #define GUARD_CODE_80972F4_H
// size: 0x8 // size: 0x8
struct MissionText typedef struct MissionText
{ {
/* 0x0 */ u8 *text; /* 0x0 */ u8 *text;
u8 unk4; u8 unk4;
u8 unk5; u8 unk5;
u8 unk6; u8 unk6;
u8 unk7; u8 unk7;
}; } MissionText;
const u8 *GetCurrentMissionText(s16); const u8 *GetCurrentMissionText(s16);
// TODO: this should probably be bool8 but can't get a match just yet // TODO: this should probably be bool8 but can't get a match just yet
bool32 IsMazeCompleted(s16); bool32 IsMazeCompleted(s16 mazeIndex);
bool8 sub_8097504(s16); bool8 sub_8097504(s16);
const u8 *sub_80975DC(u32); const u8 *sub_80975DC(u32);

55
include/dungeon_pokemon_sprites.h
View File

@ -3,37 +3,40 @@
#include "position.h" #include "position.h"
DungeonPokemonStatusSprite // size: 0x8
typedef struct DungeonPokemonStatusSprite
{ {
u32 status; /* 0x0 */ u32 status;
u32 frame; /* 0x4 */ u32 frame;
}; } DungeonPokemonStatusSprite;
DungeonPokemonSprite // size: 0x40
typedef struct DungeonPokemonSprite
{ {
/* 0x0000 */ u8 exists; /* 0x0 */ u8 exists;
/* 0x0004 */ u32 id; /* 0x4 */ u32 id;
/* 0x0008 */ u16 species; // Or sprite ID? /* 0x8 */ u16 species; // Or sprite ID?
/* 0x000A */ u16 unkA; /* 0xA */ u16 unkA;
/* 0x000C */ u32 status; /* 0xC */ u32 status;
/* 0x0010 */ u8 visible; /* 0x10 */ u8 visible;
/* 0x0011 */ u8 unk11; /* 0x11 */ u8 unk11;
/* 0x0014 */ Position pos; /* 0x14 */ Position pos;
/* 0x0018 */ Position statusOffsets[2]; /* 0x18 */ Position statusOffsets[2];
/* 0x0020 */ u32 unk20; /* 0x20 */ u32 unk20;
/* 0x0024 */ u32 unk24; /* 0x24 */ u32 unk24;
/* 0x0028 */ DungeonPokemonStatusSprite statusSprites[2]; /* 0x28 */ DungeonPokemonStatusSprite statusSprites[2];
/* 0x0038 */ u8 unk38; /* 0x38 */ u8 unk38;
/* 0x003C */ u16 unk3C; /* 0x3C */ u16 unk3C;
/* 0x003E */ u16 unk3E; /* 0x3E */ u16 unk3E;
} } DungeonPokemonSprite;
DungeonPokemonSprites // size: 0x584
typedef struct DungeonPokemonSprites
{ {
u32 frame; /* 0x0 */ u32 frame;
DungeonPokemonSprites sprites[22]; /* 0x4 */ struct DungeonPokemonSprites sprites[22];
}; } DungeonPokemonSprites;
extern DungeonPokemonSprites *gDungeonPokemonSprites; extern DungeonPokemonSprites *gDungeonPokemonSprites;
#endif #endif // GUARD_DUNGEON_POKEMON_SPRITES_H

2
include/friend_area.h
View File

@ -21,7 +21,7 @@ typedef struct unkStruct_8092638
extern bool8 *gFriendAreas; extern bool8 *gFriendAreas;
bool8 *GetBoughtFriendAreas(void); bool8 *GetBoughtFriendAreas(void);
const u8 *GetFriendAreaDescription(u8); const u8 *GetFriendAreaDescription(u8 index);
const u8 *GetFriendAreaName(u8); const u8 *GetFriendAreaName(u8);
s32 GetFriendAreaPrice(u8); s32 GetFriendAreaPrice(u8);
bool8 GetFriendAreaStatus(u8); bool8 GetFriendAreaStatus(u8);

2
include/gulpin_shop.h
View File

@ -36,7 +36,7 @@ typedef struct GulpinShopWork
UnkTextStruct2 unk12C[4]; UnkTextStruct2 unk12C[4];
} GulpinShopWork; } GulpinShopWork;
bool8 CreateGulpinShop(s32, s16, Move *); bool8 CreateGulpinShop(s32 isAsleep, s16 pokeSpecies, Move *moves);
void DestroyGulpinShop(void); void DestroyGulpinShop(void);
bool8 GulpinIsNextMoveLinked(void); bool8 GulpinIsNextMoveLinked(void);

4
include/gulpin_shop_801FB50.h
View File

@ -8,7 +8,7 @@
#include "text.h" #include "text.h"
// size: 0x1E0 // size: 0x1E0
struct unkStruct_203B27C typedef struct unkStruct_203B27C
{ {
/* 0x0 */ bool32 isAsleep; /* 0x0 */ bool32 isAsleep;
/* 0x4 */ s32 state; /* 0x4 */ s32 state;
@ -42,7 +42,7 @@ struct unkStruct_203B27C
u8 unk17A; u8 unk17A;
OpenedFile **unk17C; OpenedFile **unk17C;
UnkTextStruct2 unk180[4]; UnkTextStruct2 unk180[4];
}; } unkStruct_203B27C;
bool8 sub_801FB50(u32); bool8 sub_801FB50(u32);
u32 sub_801FC40(void); u32 sub_801FC40(void);

2
include/kangaskhan_storage1.h
View File

@ -54,7 +54,7 @@ struct KangaskhanStorageWork
UnkTextStruct2 unkEC[4]; UnkTextStruct2 unkEC[4];
}; };
bool8 CreateKangaskhanStorage(u32); bool8 CreateKangaskhanStorage(u32 mode);
void DeleteKangaskhanStorage(void); void DeleteKangaskhanStorage(void);
u32 KangaskhanStorageCallback(void); u32 KangaskhanStorageCallback(void);

4
include/kangaskhan_storage2.h
View File

@ -6,7 +6,7 @@
#include "text.h" #include "text.h"
// size: 0x150 // size: 0x150
struct unkStruct_203B20C typedef struct unkStruct_203B20C
{ {
/* 0x0 */ u32 state; /* 0x0 */ u32 state;
u8 unk4[4]; u8 unk4[4];
@ -30,7 +30,7 @@ struct unkStruct_203B20C
u32 unkE0; u32 unkE0;
u8 fillE4[0xF0 - 0xE4]; u8 fillE4[0xF0 - 0xE4];
UnkTextStruct2 unkF0[4]; UnkTextStruct2 unkF0[4];
}; } unkStruct_203B20C;
bool8 sub_8017E1C(void); bool8 sub_8017E1C(void);
u32 sub_8017E54(void); u32 sub_8017E54(void);

4
include/kecleon_bros2.h
View File

@ -5,14 +5,14 @@
#include "text.h" #include "text.h"
// size: 0xA0 // size: 0xA0
struct unkStruct_203B214 typedef struct unkStruct_203B214
{ {
/* 0x0 */ MenuInputStruct input; /* 0x0 */ MenuInputStruct input;
u32 unk34; u32 unk34;
UnkTextStruct2 *unk38; UnkTextStruct2 *unk38;
UnkTextStruct2 unk3C[4]; UnkTextStruct2 unk3C[4];
u8 unk9C[4]; u8 unk9C[4];
}; } unkStruct_203B214;
bool8 sub_8019E40(u32); bool8 sub_8019E40(u32);
u32 sub_8019EDC(u8); u32 sub_8019EDC(u8);

4
include/kecleon_bros3.h
View File

@ -5,14 +5,14 @@
#include "text.h" #include "text.h"
// size: 0xA0 // size: 0xA0
struct unkStruct_203B21C typedef struct unkStruct_203B21C
{ {
/* 0x0 */ MenuInputStruct input; /* 0x0 */ MenuInputStruct input;
u32 unk34; u32 unk34;
UnkTextStruct2 *unk38; UnkTextStruct2 *unk38;
UnkTextStruct2 unk3C[4]; UnkTextStruct2 unk3C[4];
u8 unk9C[4]; u8 unk9C[4];
}; } unkStruct_203B21C;
u8 sub_801A20C(u32); u8 sub_801A20C(u32);
u32 sub_801A2A8(u8); u32 sub_801A2A8(u8);

4
include/kecleon_bros4.h
View File

@ -6,7 +6,7 @@
#include "text.h" #include "text.h"
// size: 0xF4 // size: 0xF4
struct unkStruct_203B224 typedef struct unkStruct_203B224
{ {
u32 unk0; u32 unk0;
u32 unk4[INVENTORY_SIZE]; u32 unk4[INVENTORY_SIZE];
@ -15,7 +15,7 @@ struct unkStruct_203B224
UnkTextStruct2 *unk8C; UnkTextStruct2 *unk8C;
UnkTextStruct2 unk90[4]; UnkTextStruct2 unk90[4];
u8 unkF0[4]; u8 unkF0[4];
}; } unkStruct_203B224;
bool8 sub_801A5D8(u32, s32, UnkTextStruct2_sub *, u32); bool8 sub_801A5D8(u32, s32, UnkTextStruct2_sub *, u32);
u32 sub_801A6E8(bool8); u32 sub_801A6E8(bool8);

4
include/moves.h
View File

@ -76,8 +76,8 @@ bool8 UnlinkMovesAfter(s32, Move *);
void UnSetMove(s32, Move *); void UnSetMove(s32, Move *);
u8 sub_809287C(Move *); u8 sub_809287C(Move *);
void sub_80928A0(u8 *, Move *, const struct unkStruct_80928C0 *); void sub_80928A0(u8 *, Move *, const unkStruct_80928C0 *);
void sub_80928C0(u8 *, Move *, const struct unkStruct_80928C0 *); void sub_80928C0(u8 *, Move *, const unkStruct_80928C0 *);
void sub_8092AA8(Move *, u16); void sub_8092AA8(Move *, u16);
void sub_8092C84(u8 *, u16); void sub_8092C84(u8 *, u16);
s32 sub_8092DB8(Move *, s32); s32 sub_8092DB8(Move *, s32);

69
include/music.h
View File

@ -1,45 +1,6 @@
#ifndef GUARD_MUSIC_H #ifndef GUARD_MUSIC_H
#define GUARD_MUSIC_H #define GUARD_MUSIC_H
// size: 0x8. PMD keeps its own copy of music players for some reason
struct PMDMusicPlayer
{
u16 unk0;
u16 songIndex;
u16 volume;
bool8 isNotMaxVolume;
};
void InitMusic(void);
void StopBGMusicVSync(void);
void StartBGMusicVSync(void);
bool8 IsValidSong(u32 songIndex);
void StartNewBGM(u16 songIndex);
bool8 IsBGSong(u32 songIndex);
bool8 IsSoundEffect(u32 songIndex);
bool8 IsFanfare(u32 songIndex);
u16 GetMusicPlayerIndex(u16 songIndex);
bool8 IsMusicPlayerPlaying(u16 songIndex);
void StartNewBGM(u16 songIndex);
void FadeInNewBGM(u16 songIndex, u16 speed);
u16 GetCurrentBGSong(void);
void QueueBGM(u16 songIndex);
void StopBGM(void); // stops all BGM, fanfares and SE's
void FadeOutBGM(u16 speed);
void PlayFanfareSE(u16 songIndex, u16 volume);
void StopFanfareSE(u16 songIndex);
void FadeOutFanfareSE(u16 songIndex, u16 speed);
bool8 IsFanfareSEPlaying(u16 songIndex);
void SoundBiasReset(void);
void SoundBiasSet(void);
void UpdateSound(void);
void SoundVSync(void);
void nullsub_18(void);
void nullsub_19(void);
void nullsub_20(u16 songIndex);
#define NUM_FANFARES 19 #define NUM_FANFARES 19
#define FANFARE_START_INDEX 200 #define FANFARE_START_INDEX 200
@ -80,4 +41,34 @@ enum Fanfare_Player_State
FANFARE_PLAYER_STATE_PLAYING = 3, FANFARE_PLAYER_STATE_PLAYING = 3,
}; };
// size: 0x8. PMD keeps its own copy of music players for some reason
typedef struct PMDMusicPlayer
{
u16 unk0;
u16 songIndex;
u16 volume;
bool8 isNotMaxVolume;
} PMDMusicPlayer;
void FadeInNewBGM(u16 songIndex, u16 speed);
void FadeOutBGM(u16 speed);
void FadeOutFanfareSE(u16 songIndex, u16 speed);
u16 GetCurrentBGSong(void);
void InitMusic(void);
bool8 IsFanfareSEPlaying(u16 songIndex);
void nullsub_18(void);
void PlayFanfareSE(u16 songIndex, u16 volume);
void QueueBGM(u16 songIndex);
void SoundVSync(void);
void StartBGMusicVSync(void);
void StartNewBGM(u16 songIndex);
void StopBGM(void); // Stops all BGM, fanfares and SE's
void StopBGMusicVSync(void);
void StopFanfareSE(u16 songIndex);
void UpdateSound(void);
// libagbsyscall
extern void SoundBiasReset(void);
extern void SoundBiasSet(void);
#endif //GUARD_MUSIC_H #endif //GUARD_MUSIC_H

2
include/pokemon.h
View File

@ -202,7 +202,7 @@ void CopyMonsterNametoBuffer(u8 * buffer, s16 index);
void CopyYellowMonsterNametoBuffer(u8 *buffer, s16 index); void CopyYellowMonsterNametoBuffer(u8 *buffer, s16 index);
void PrintColoredPokeNameToBuffer(u8 *buffer, PokemonStruct1 *pokemon, s32 colorNum); void PrintColoredPokeNameToBuffer(u8 *buffer, PokemonStruct1 *pokemon, s32 colorNum);
void sub_808D930(u8 *buffer, s32 index); void sub_808D930(u8 *buffer, s32 index);
void sub_808D9DC(u8 *, PokemonStruct2 *, s32); void sub_808D9DC(u8 *buffer, PokemonStruct2 *, s32 colorNum);
void sub_808DA0C(u8 *, PokemonStruct2 *); void sub_808DA0C(u8 *, PokemonStruct2 *);
void PeekPokemonItem(s16 index_, BulkItem* item); void PeekPokemonItem(s16 index_, BulkItem* item);
void GivePokemonItem(s16 index_, BulkItem* item); void GivePokemonItem(s16 index_, BulkItem* item);

2
include/save.h
View File

@ -53,7 +53,7 @@ struct UnkStruct_203B184 {
/* 0xC */ unkStruct_203B484 *unkC; /* 0xC */ unkStruct_203B484 *unkC;
/* 0x10 */ u32 *unk10; /* 0x10 */ u32 *unk10;
/* 0x14 */ unkStruct_203B48C *unk14; /* 0x14 */ unkStruct_203B48C *unk14;
/* 0x18 */ struct unkStruct_203B490 *mailInfo; /* 0x18 */ unkStruct_203B490 *mailInfo;
/* 0x1C */ struct RescueTeamData *RescueTeamInfo; /* 0x1C */ struct RescueTeamData *RescueTeamInfo;
/* 0x20 */ struct unkStruct_203B494 *unk20; /* 0x20 */ struct unkStruct_203B494 *unk20;
/* 0x24 */ struct ExclusivePokemonData *ExclusivePokemon; /* 0x24 */ struct ExclusivePokemonData *ExclusivePokemon;

4
include/save_read.h
View File

@ -2,11 +2,11 @@
#define GUARD_SAVE_READ_H #define GUARD_SAVE_READ_H
// size: 0x8 // size: 0x8
struct SavePakRead typedef struct SavePakRead
{ {
/* 0x0 */ u32 state; /* 0x0 */ u32 state;
/* 0x4 */ u32 readStatus; /* 0x4 */ u32 readStatus;
}; } SavePakRead;
void PrepareSavePakRead(void); void PrepareSavePakRead(void);
bool8 ReadSavePak(void); bool8 ReadSavePak(void);

60
include/wigglytuff_shop.h
View File

@ -5,34 +5,6 @@
#include "menu.h" #include "menu.h"
#include "text.h" #include "text.h"
// size: 0x138
typedef struct WigglytuffShop
{
bool32 isAsleep;
s32 state;
s32 fallbackState;
s32 friendAreaPrice;
u8 chosenFriendArea;
s16 chosenSpecies;
u32 menuAction1;
u32 menuAction2;
MenuItem unk1C[8];
u16 unk5C[0x8];
MenuStruct unk6C;
/* 0xBC */ OpenedFile *faceFile;
/* 0xC0 */ u8 *faceData;
u16 unkC4;
u16 unkC6;
u8 unkC8;
u8 unkC9;
u8 unkCA;
u8 fillCB;
OpenedFile **unkCC;
UnkTextStruct2 unkD0[4];
u32 unk130;
u32 unk134;
} WigglytuffShop;
enum WigglytuffStates enum WigglytuffStates
{ {
WIGGLYTUFF_INIT = 0, WIGGLYTUFF_INIT = 0,
@ -66,8 +38,36 @@ enum WigglytuffStates
WIGGLYTUFF_CHECK_LEGENDARY = 28, WIGGLYTUFF_CHECK_LEGENDARY = 28,
}; };
bool8 sub_80211AC(u32, u32); // size: 0x138
bool8 sub_8021774(u8, bool8, s32); typedef struct WigglytuffShop
{
bool32 isAsleep;
s32 state;
s32 fallbackState;
s32 friendAreaPrice;
u8 chosenFriendArea;
s16 chosenSpecies;
u32 menuAction1;
u32 menuAction2;
MenuItem unk1C[8];
u16 unk5C[0x8];
MenuStruct unk6C;
/* 0xBC */ OpenedFile *faceFile;
/* 0xC0 */ u8 *faceData;
u16 unkC4;
u16 unkC6;
u8 unkC8;
u8 unkC9;
u8 unkCA;
u8 fillCB;
OpenedFile **unkCC;
UnkTextStruct2 unkD0[4];
u32 unk130;
u32 unk134;
} WigglytuffShop;
bool8 sub_80211AC(u32 mode, u32);
bool8 sub_8021774(u8 friendArea, bool8, s32);
u32 sub_8021274(bool8); u32 sub_8021274(bool8);
u8 sub_802132C(void); u8 sub_802132C(void);
void sub_8021354(bool8); void sub_8021354(bool8);

11
src/code_80958E8.c
View File

@ -19,17 +19,18 @@ extern void ResetPelipperBoardSlot(u8);
extern void ResetJobSlot(u8); extern void ResetJobSlot(u8);
extern bool8 ValidateWonderMail(WonderMail *); extern bool8 ValidateWonderMail(WonderMail *);
EWRAM_DATA_2 struct unkStruct_203B490 *gUnknown_203B490 = {0}; static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = {0};
EWRAM_DATA struct unkStruct_203B490 gUnknown_2039448 = {0};
EWRAM_DATA_2 unkStruct_203B490 *gUnknown_203B490 = {0};
void LoadMailInfo(void) void LoadMailInfo(void)
{ {
gUnknown_203B490 = &gUnknown_2039448; gUnknown_203B490 = &sUnknown_2039448;
} }
struct unkStruct_203B490 *GetMailInfo(void) unkStruct_203B490 *GetMailInfo(void)
{ {
return &gUnknown_2039448; return &sUnknown_2039448;
} }
void InitializeMailJobsNews(void) void InitializeMailJobsNews(void)

8
src/code_80972F4.c
View File

@ -9,7 +9,7 @@
#include "code_80A26CC.h" #include "code_80A26CC.h"
#include "code_80972F4.h" #include "code_80972F4.h"
extern struct MissionText gStoryMissionText[]; extern MissionText gStoryMissionText[];
extern const char gFinalScenarioText[]; extern const char gFinalScenarioText[];
extern const char gMeetNinetalesText[]; extern const char gMeetNinetalesText[];
extern const char gAvoidCaptureText[]; extern const char gAvoidCaptureText[];
@ -32,7 +32,7 @@ bool8 sub_8096F50(WonderMail *mail)
{ {
s32 index; s32 index;
s32 temp2; s32 temp2;
struct subStruct_203B490 *temp; subStruct_203B490 *temp;
temp2 = sub_8096EB0(mail); temp2 = sub_8096EB0(mail);
@ -276,7 +276,7 @@ void sub_8097418(s16 index,u32 param_2)
u8 param_2_u8 = param_2; u8 param_2_u8 = param_2;
if (index_s32 != 0xd) { if (index_s32 != 0xd) {
if ((param_2_u8 != 0) && (sub_800199C(0,0x2c,index_s32,0), index_s32 < 0x1f)) { if ((param_2_u8 != 0) && (sub_800199C(0,0x2c,index_s32,0), index_s32 < 0x1f)) {
struct MissionText *mt = &gStoryMissionText[index_s32]; MissionText *mt = &gStoryMissionText[index_s32];
if (mt->unk4 != 0xFF) { if (mt->unk4 != 0xFF) {
sub_8097FA8(mt->unk4); sub_8097FA8(mt->unk4);
} }
@ -320,7 +320,7 @@ const u8 *GetCurrentMissionText(s16 index)
{ {
if(index < 0x1F) if(index < 0x1F)
{ {
struct MissionText *mt = &gStoryMissionText[index]; MissionText *mt = &gStoryMissionText[index];
return mt->text; return mt->text;
} }
else else

10
src/data/post_office_guide1.h
View File

@ -21,8 +21,6 @@ enum PostOfficeMenuActions
SEND_THANK_YOU_MAIL SEND_THANK_YOU_MAIL
}; };
//
static const u8 sPostOffice[]; static const u8 sPostOffice[];
static const u8 sBulletinBoard[]; static const u8 sBulletinBoard[];
static const u8 sDelivery[]; static const u8 sDelivery[];
@ -45,8 +43,6 @@ ALIGNED(4) static const u8 sDelivery[] = _("Delivery");
ALIGNED(4) static const u8 sBulletinBoard[] = _("Bulletin Board"); ALIGNED(4) static const u8 sBulletinBoard[] = _("Bulletin Board");
ALIGNED(4) static const u8 sPostOffice[] = _("Post Office"); ALIGNED(4) static const u8 sPostOffice[] = _("Post Office");
//
static const u8 sFriendRescueInfo[]; static const u8 sFriendRescueInfo[];
static const u8 sGoRescue[]; static const u8 sGoRescue[];
static const u8 sGetHelp[]; static const u8 sGetHelp[];
@ -69,8 +65,6 @@ ALIGNED(4) static const u8 sGetHelp[] = _("{COLOR_1 YELLOW}Get help{END_COLOR_TE
ALIGNED(4) static const u8 sGoRescue[] = _("{COLOR_1 YELLOW}Go rescue{END_COLOR_TEXT_1} "); ALIGNED(4) static const u8 sGoRescue[] = _("{COLOR_1 YELLOW}Go rescue{END_COLOR_TEXT_1} ");
ALIGNED(4) static const u8 sFriendRescueInfo[] = _("Friend Rescue Info"); ALIGNED(4) static const u8 sFriendRescueInfo[] = _("Friend Rescue Info");
//
static const MenuItem sPostOfficeHelpGoRescueMenu[] = static const MenuItem sPostOfficeHelpGoRescueMenu[] =
{ {
{"Rescue Procedures", RESCUE_PROCEDURES}, {"Rescue Procedures", RESCUE_PROCEDURES},
@ -82,8 +76,6 @@ static const MenuItem sPostOfficeHelpGoRescueMenu[] =
{NULL, EXIT} {NULL, EXIT}
}; };
//
static const MenuItem sPostOfficeHelpGetHelpMenu[] = static const MenuItem sPostOfficeHelpGetHelpMenu[] =
{ {
{"Getting Help", GETTING_HELP}, {"Getting Help", GETTING_HELP},
@ -94,8 +86,6 @@ static const MenuItem sPostOfficeHelpGetHelpMenu[] =
{NULL, EXIT} {NULL, EXIT}
}; };
//
ALIGNED(4) static const u8 sWhatdYouWantToKnow[] = ALIGNED(4) static const u8 sWhatdYouWantToKnow[] =
_(" So{COMMA} what{APOSTROPHE}d you want to\n" _(" So{COMMA} what{APOSTROPHE}d you want to\n"
"know?"); "know?");

4
src/gulpin_shop_801FB50.c
View File

@ -16,7 +16,7 @@
#include "text1.h" #include "text1.h"
#include "text2.h" #include "text2.h"
EWRAM_DATA_2 struct unkStruct_203B27C *gUnknown_203B27C = {0}; EWRAM_DATA_2 unkStruct_203B27C *gUnknown_203B27C = {0};
extern u8 gAvailablePokemonNames[]; // 202DF98 extern u8 gAvailablePokemonNames[]; // 202DF98
extern u8 gUnknown_202DFE8[]; extern u8 gUnknown_202DFE8[];
@ -72,7 +72,7 @@ bool8 sub_801FB50(u32 mode)
ResetUnusedInputStruct(); ResetUnusedInputStruct();
sub_800641C(NULL, TRUE, TRUE); sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B27C = MemoryAlloc(sizeof(struct unkStruct_203B27C), 0x8); gUnknown_203B27C = MemoryAlloc(sizeof(unkStruct_203B27C), 0x8);
gUnknown_203B27C->menuAction2 = 0; gUnknown_203B27C->menuAction2 = 0;
gUnknown_203B27C->menuAction3 = 0; gUnknown_203B27C->menuAction3 = 0;
gUnknown_203B27C->menuAction4 = 0; gUnknown_203B27C->menuAction4 = 0;

4
src/kangaskhan_storage2.c
View File

@ -10,7 +10,7 @@
#include "text1.h" #include "text1.h"
#include "text2.h" #include "text2.h"
EWRAM_DATA_2 struct unkStruct_203B20C *gUnknown_203B20C = {0}; EWRAM_DATA_2 unkStruct_203B20C *gUnknown_203B20C = {0};
extern const u8 *gUnknown_80D4934[]; extern const u8 *gUnknown_80D4934[];
extern const u8 *gUnknown_80D4958[]; extern const u8 *gUnknown_80D4958[];
@ -39,7 +39,7 @@ bool8 sub_8017E1C(void)
{ {
ResetUnusedInputStruct(); ResetUnusedInputStruct();
sub_800641C(NULL, TRUE, TRUE); sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B20C = MemoryAlloc(sizeof(struct unkStruct_203B20C), 8); gUnknown_203B20C = MemoryAlloc(sizeof(unkStruct_203B20C), 8);
gUnknown_203B20C->menuAction1 = 0; gUnknown_203B20C->menuAction1 = 0;
gUnknown_203B20C->menuAction2 = 0; gUnknown_203B20C->menuAction2 = 0;
gUnknown_203B20C->menuAction3 = 0; gUnknown_203B20C->menuAction3 = 0;

4
src/kecleon_bros2.c
View File

@ -9,7 +9,7 @@
#include "text1.h" #include "text1.h"
#include "text2.h" #include "text2.h"
static EWRAM_DATA_2 struct unkStruct_203B214 *gUnknown_203B214 = {0}; static EWRAM_DATA_2 unkStruct_203B214 *gUnknown_203B214 = {0};
static EWRAM_DATA_2 u16 gUnknown_203B218 = {0}; static EWRAM_DATA_2 u16 gUnknown_203B218 = {0};
#include "data/kecleon_bros2.h" #include "data/kecleon_bros2.h"
@ -21,7 +21,7 @@ bool8 sub_8019E40(u32 r0)
if (CountKecleonShopItems() == 0) if (CountKecleonShopItems() == 0)
return FALSE; return FALSE;
gUnknown_203B214 = MemoryAlloc(sizeof(struct unkStruct_203B214), 8); gUnknown_203B214 = MemoryAlloc(sizeof(unkStruct_203B214), 8);
gUnknown_203B214->unk34 = r0; gUnknown_203B214->unk34 = r0;
gUnknown_203B214->unk38 = &gUnknown_203B214->unk3C[gUnknown_203B214->unk34]; gUnknown_203B214->unk38 = &gUnknown_203B214->unk3C[gUnknown_203B214->unk34];
sub_8006518(gUnknown_203B214->unk3C); sub_8006518(gUnknown_203B214->unk3C);

4
src/kecleon_bros3.c
View File

@ -9,7 +9,7 @@
#include "text1.h" #include "text1.h"
#include "text2.h" #include "text2.h"
static EWRAM_DATA_2 struct unkStruct_203B21C *gUnknown_203B21C = {0}; static EWRAM_DATA_2 unkStruct_203B21C *gUnknown_203B21C = {0};
static EWRAM_DATA_2 u16 gUnknown_203B220 = {0}; static EWRAM_DATA_2 u16 gUnknown_203B220 = {0};
#include "data/kecleon_bros3.h" #include "data/kecleon_bros3.h"
@ -21,7 +21,7 @@ u8 sub_801A20C(u32 r0)
if (CountKecleonWareItems() == 0) if (CountKecleonWareItems() == 0)
return 0; return 0;
gUnknown_203B21C = MemoryAlloc(sizeof(struct unkStruct_203B21C), 8); gUnknown_203B21C = MemoryAlloc(sizeof(unkStruct_203B21C), 8);
gUnknown_203B21C->unk34 = r0; gUnknown_203B21C->unk34 = r0;
gUnknown_203B21C->unk38 = &gUnknown_203B21C->unk3C[gUnknown_203B21C->unk34]; gUnknown_203B21C->unk38 = &gUnknown_203B21C->unk3C[gUnknown_203B21C->unk34];
sub_8006518(gUnknown_203B21C->unk3C); sub_8006518(gUnknown_203B21C->unk3C);

6
src/kecleon_bros4.c
View File

@ -13,7 +13,7 @@
extern u8 gUnknown_202DE58[]; extern u8 gUnknown_202DE58[];
static EWRAM_DATA_2 struct unkStruct_203B224 *gUnknown_203B224 = {0}; static EWRAM_DATA_2 unkStruct_203B224 *gUnknown_203B224 = {0};
static EWRAM_DATA_2 u16 gUnknown_203B228 = {0}; static EWRAM_DATA_2 u16 gUnknown_203B228 = {0};
static EWRAM_DATA_2 u16 gUnknown_203B22A = {0}; static EWRAM_DATA_2 u16 gUnknown_203B22A = {0};
@ -30,7 +30,7 @@ bool8 sub_801A5D8(u32 param_1, s32 param_2, UnkTextStruct2_sub *param_3, u32 par
return FALSE; return FALSE;
if (gUnknown_203B224 == NULL) if (gUnknown_203B224 == NULL)
gUnknown_203B224 = MemoryAlloc(sizeof(struct unkStruct_203B224), 8); gUnknown_203B224 = MemoryAlloc(sizeof(unkStruct_203B224), 8);
gUnknown_203B224->unk0 = param_1; gUnknown_203B224->unk0 = param_1;
FillInventoryGaps(); FillInventoryGaps();
@ -425,7 +425,7 @@ static void SortInventoryItems(void)
} }
} }
UNUSED static struct unkStruct_203B224 *sub_801AF98(void) UNUSED static unkStruct_203B224 *sub_801AF98(void)
{ {
return gUnknown_203B224; return gUnknown_203B224;
} }

2
src/mailbox_8095F8C.c
View File

@ -2,7 +2,7 @@
#include "wonder_mail.h" #include "wonder_mail.h"
#include "code_80958E8.h" #include "code_80958E8.h"
extern struct unkStruct_203B490 *gUnknown_203B490; extern unkStruct_203B490 *gUnknown_203B490;
bool8 IsMailSlotEmpty(u8); bool8 IsMailSlotEmpty(u8);
void ResetMailboxSlot(u8); void ResetMailboxSlot(u8);

6
src/moves.c
View File

@ -18,7 +18,7 @@ extern u32 gUnknown_202DE30;
extern u8 gAvailablePokemonNames[]; // 202DF98 extern u8 gAvailablePokemonNames[]; // 202DF98
// data_8107010.s // data_8107010.s
extern const struct unkStruct_80928C0 gUnknown_81098C4; extern const unkStruct_80928C0 gUnknown_81098C4;
extern const u8 gUnknown_81098D0[]; extern const u8 gUnknown_81098D0[];
extern const u8 gUnknown_81098DC[]; extern const u8 gUnknown_81098DC[];
extern const u8 gUnknown_81098E0[]; extern const u8 gUnknown_81098E0[];
@ -72,14 +72,14 @@ u8 sub_809287C(Move *move)
return 50; return 50;
} }
void sub_80928A0(u8 *buffer, Move *move, const struct unkStruct_80928C0 *a2) void sub_80928A0(u8 *buffer, Move *move, const unkStruct_80928C0 *a2)
{ {
Move stack; Move stack;
CopyAndResetMove(&stack, move); CopyAndResetMove(&stack, move);
sub_80928C0(buffer, &stack, a2); sub_80928C0(buffer, &stack, a2);
} }
void sub_80928C0(u8 *buffer, Move *move, const struct unkStruct_80928C0 *param_3) void sub_80928C0(u8 *buffer, Move *move, const unkStruct_80928C0 *param_3)
{ {
u32 uVar2; u32 uVar2;
u32 basePP; u32 basePP;

919
src/music.c
View File

File diff suppressed because it is too large Load Diff

2
src/save.c
View File

@ -57,7 +57,7 @@ extern u32 sub_8097D60(u8 *, u32);
extern u32 sub_8097D98(void* a, s32 b); extern u32 sub_8097D98(void* a, s32 b);
extern void sub_800135C(void); extern void sub_800135C(void);
extern void sub_80958E4(u32 *a, u32 b); extern void sub_80958E4(u32 *a, u32 b);
extern struct unkStruct_203B490 *GetMailInfo(void); extern unkStruct_203B490 *GetMailInfo(void);
extern void InitializeMailJobsNews(void); extern void InitializeMailJobsNews(void);
extern void sub_80972F4(void); extern void sub_80972F4(void);
extern void sub_80974E8(void); extern void sub_80974E8(void);

4
src/save_read.c
View File

@ -4,13 +4,13 @@
#include "save.h" #include "save.h"
#include "save_read.h" #include "save_read.h"
EWRAM_DATA_2 struct SavePakRead *gSavePakRead = {0}; EWRAM_DATA_2 SavePakRead *gSavePakRead = {0};
#include "data/save_read.h" #include "data/save_read.h"
void PrepareSavePakRead(void) void PrepareSavePakRead(void)
{ {
gSavePakRead = MemoryAlloc(sizeof(struct SavePakRead), 5); gSavePakRead = MemoryAlloc(sizeof(SavePakRead), 5);
gSavePakRead->state = 1; gSavePakRead->state = 1;
} }