Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-12 20:15:49 -05:00
Code Issues Actions 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
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
// size: 0xC
struct unkStruct_80928C0
typedef struct unkStruct_80928C0
{
u32 unk0;
s32 unk4;
u8 unk8;
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);
void sub_8095118(void);
s32 FindOpenMailSlot(void);
bool8 sub_80951BC(unkStruct_203B480 *);
bool8 sub_80951BC(unkStruct_203B480 *mail);
bool8 sub_80951FC(unkStruct_203B480 *);
unkStruct_203B480 * GetMailatIndex(u8);
void DeleteMailAtIndex(u8);
@@ -76,4 +76,4 @@ s32 GetFirstIndexofMailType(u8);
void sub_8095824(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 "constants/mailbox.h"
struct subStruct_203B490
// size: 0xC
typedef struct subStruct_203B490
{
// size: 0xC
DungeonLocation dungeon;
u32 seed;
/* 0x0 */ DungeonLocation dungeon;
/* 0x4 */ u32 seed;
u32 unk8;
};
} subStruct_203B490;
struct unkStruct_203B490
// size: 0x32C?
typedef struct unkStruct_203B490
{
// size: 0x330?
/* 0x0 */ WonderMail mailboxSlots[NUM_MAILBOX_SLOTS];
/* 0x50 */ WonderMail pelipperBoardJobs[MAX_ACCEPTED_JOBS];
/* 0xF0 */ WonderMail jobSlots[MAX_ACCEPTED_JOBS];
u8 unk190[0x28];
u8 unk1B8[0x78];
struct subStruct_203B490 unk230[16];
u8 PKMNNewsReceived[NUM_POKEMON_NEWS];
subStruct_203B490 unk230[16];
/* 0x2F0 */ u8 PKMNNewsReceived[NUM_POKEMON_NEWS];
bool8 unk328;
};
} unkStruct_203B490;
extern struct unkStruct_203B490 *gUnknown_203B490;
extern unkStruct_203B490 *gUnknown_203B490;
#endif // GUARD_CODE_80958E8_H

4
include/code_80958E8_1.h
View File

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

6
include/code_80972F4.h
View File

@@ -2,18 +2,18 @@
#define GUARD_CODE_80972F4_H
// size: 0x8
struct MissionText
typedef struct MissionText
{
/* 0x0 */ u8 *text;
u8 unk4;
u8 unk5;
u8 unk6;
u8 unk7;
};
} MissionText;
const u8 *GetCurrentMissionText(s16);
// 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);
const u8 *sub_80975DC(u32);

55
include/dungeon_pokemon_sprites.h
View File

@@ -3,37 +3,40 @@
#include "position.h"
DungeonPokemonStatusSprite
// size: 0x8
typedef struct DungeonPokemonStatusSprite
{
u32 status;
u32 frame;
};
/* 0x0 */ u32 status;
/* 0x4 */ u32 frame;
} DungeonPokemonStatusSprite;
DungeonPokemonSprite
// size: 0x40
typedef struct DungeonPokemonSprite
{
/* 0x0000 */ u8 exists;
/* 0x0004 */ u32 id;
/* 0x0008 */ u16 species; // Or sprite ID?
/* 0x000A */ u16 unkA;
/* 0x000C */ u32 status;
/* 0x0010 */ u8 visible;
/* 0x0011 */ u8 unk11;
/* 0x0014 */ Position pos;
/* 0x0018 */ Position statusOffsets[2];
/* 0x0020 */ u32 unk20;
/* 0x0024 */ u32 unk24;
/* 0x0028 */ DungeonPokemonStatusSprite statusSprites[2];
/* 0x0038 */ u8 unk38;
/* 0x003C */ u16 unk3C;
/* 0x003E */ u16 unk3E;
}
/* 0x0 */ u8 exists;
/* 0x4 */ u32 id;
/* 0x8 */ u16 species; // Or sprite ID?
/* 0xA */ u16 unkA;
/* 0xC */ u32 status;
/* 0x10 */ u8 visible;
/* 0x11 */ u8 unk11;
/* 0x14 */ Position pos;
/* 0x18 */ Position statusOffsets[2];
/* 0x20 */ u32 unk20;
/* 0x24 */ u32 unk24;
/* 0x28 */ DungeonPokemonStatusSprite statusSprites[2];
/* 0x38 */ u8 unk38;
/* 0x3C */ u16 unk3C;
/* 0x3E */ u16 unk3E;
} DungeonPokemonSprite;
DungeonPokemonSprites
// size: 0x584
typedef struct DungeonPokemonSprites
{
u32 frame;
DungeonPokemonSprites sprites[22];
};
/* 0x0 */ u32 frame;
/* 0x4 */ struct DungeonPokemonSprites sprites[22];
} DungeonPokemonSprites;
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;
bool8 *GetBoughtFriendAreas(void);
const u8 *GetFriendAreaDescription(u8);
const u8 *GetFriendAreaDescription(u8 index);
const u8 *GetFriendAreaName(u8);
s32 GetFriendAreaPrice(u8);
bool8 GetFriendAreaStatus(u8);

2
include/gulpin_shop.h
View File

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

4
include/gulpin_shop_801FB50.h
View File

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

2
include/kangaskhan_storage1.h
View File

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

4
include/kangaskhan_storage2.h
View File

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

4
include/kecleon_bros2.h
View File

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

4
include/kecleon_bros3.h
View File

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

4
include/kecleon_bros4.h
View File

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

4
include/moves.h
View File

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

69
include/music.h
View File

@@ -1,45 +1,6 @@
#ifndef 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 FANFARE_START_INDEX 200
@@ -80,4 +41,34 @@ enum Fanfare_Player_State
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

2
include/pokemon.h
View File

@@ -202,7 +202,7 @@ void CopyMonsterNametoBuffer(u8 * buffer, s16 index);
void CopyYellowMonsterNametoBuffer(u8 *buffer, s16 index);
void PrintColoredPokeNameToBuffer(u8 *buffer, PokemonStruct1 *pokemon, s32 colorNum);
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 PeekPokemonItem(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;
/* 0x10 */ u32 *unk10;
/* 0x14 */ unkStruct_203B48C *unk14;
/* 0x18 */ struct unkStruct_203B490 *mailInfo;
/* 0x18 */ unkStruct_203B490 *mailInfo;
/* 0x1C */ struct RescueTeamData *RescueTeamInfo;
/* 0x20 */ struct unkStruct_203B494 *unk20;
/* 0x24 */ struct ExclusivePokemonData *ExclusivePokemon;

4
include/save_read.h
View File

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

60
include/wigglytuff_shop.h
View File

@@ -5,34 +5,6 @@
#include "menu.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
{
WIGGLYTUFF_INIT = 0,
@@ -66,8 +38,36 @@ enum WigglytuffStates
WIGGLYTUFF_CHECK_LEGENDARY = 28,
};
bool8 sub_80211AC(u32, u32);
bool8 sub_8021774(u8, bool8, s32);
// 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;
bool8 sub_80211AC(u32 mode, u32);
bool8 sub_8021774(u8 friendArea, bool8, s32);
u32 sub_8021274(bool8);
u8 sub_802132C(void);
void sub_8021354(bool8);