From 8834fdd3e24e7904973af4ca160c1badbf5bb31a Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sun, 11 Aug 2019 14:31:39 +0000 Subject: Port m4a from pokeemerald --- include/gba/m4a_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index ff92fcc..b241eb3 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -100,7 +100,7 @@ struct CgbChannel u8 le; u8 sw; u32 fr; - u32 wp; + u32* wp; u32 cp; u32 tp; u32 pp; -- cgit v1.2.3 From cef20f5b34c507dabeaa292617963371faeca2e3 Mon Sep 17 00:00:00 2001 From: shinny Date: Tue, 2 Jun 2020 14:56:12 -0400 Subject: decomp dungeon data getters --- include/dungeon.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 include/dungeon.h (limited to 'include') diff --git a/include/dungeon.h b/include/dungeon.h new file mode 100644 index 0000000..7a9c864 --- /dev/null +++ b/include/dungeon.h @@ -0,0 +1,31 @@ +#ifndef GUARD_DUNGEON_H +#define GUARD_DUNGEON_H + +struct DungeonName +{ + const u8 *name1; + const u8 *name2; +}; + +struct Dungeon +{ + u8 stairDirection; + u8 unk1; + u8 unk2; + s8 unk3; + u8 maxItemCount; + u8 maxPartySize; + u8 levelCondition; + u8 moneyCondition; + u8 unk8; + u8 unk9; + u8 saveBeforeEntering; //whether to quicksave or not before entering + u8 unkB; + s16 unkC; + s16 unkE; +}; + +extern struct Dungeon gDungeons[]; +extern struct DungeonName gDungeonNames[]; + +#endif //GUARD_DUNGEON_H -- cgit v1.2.3 From db15fdd32463da9ef007a068f87f9f81e47cf3a7 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 9 Sep 2020 19:46:02 -0500 Subject: documented some fields thx to PMDe --- include/dungeon.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/dungeon.h b/include/dungeon.h index 7a9c864..663a50f 100644 --- a/include/dungeon.h +++ b/include/dungeon.h @@ -11,7 +11,7 @@ struct Dungeon { u8 stairDirection; u8 unk1; - u8 unk2; + u8 isRecruitable; s8 unk3; u8 maxItemCount; u8 maxPartySize; @@ -20,8 +20,8 @@ struct Dungeon u8 unk8; u8 unk9; u8 saveBeforeEntering; //whether to quicksave or not before entering - u8 unkB; - s16 unkC; + u8 unkB; // Apparently is a HM mask (Fly, Dive, Waterfall, Surf, Water) + s16 timer; s16 unkE; }; -- cgit v1.2.3 From ef3c1e0138a71df58bf6a227df4a1913d7ff7b1d Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 9 Sep 2020 19:47:58 -0500 Subject: oops it's a bool --- include/dungeon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/dungeon.h b/include/dungeon.h index 663a50f..f6eb240 100644 --- a/include/dungeon.h +++ b/include/dungeon.h @@ -11,7 +11,7 @@ struct Dungeon { u8 stairDirection; u8 unk1; - u8 isRecruitable; + bool8 isRecruitable; s8 unk3; u8 maxItemCount; u8 maxPartySize; -- cgit v1.2.3 From 312883043b04f54568c442b8db1a68aa868c852a Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 9 Sep 2020 19:58:33 -0500 Subject: doc'ing more bool stuff from pmde --- include/dungeon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/dungeon.h b/include/dungeon.h index f6eb240..96cc579 100644 --- a/include/dungeon.h +++ b/include/dungeon.h @@ -19,7 +19,7 @@ struct Dungeon u8 moneyCondition; u8 unk8; u8 unk9; - u8 saveBeforeEntering; //whether to quicksave or not before entering + bool8 saveBeforeEntering; //whether to quicksave or not before entering u8 unkB; // Apparently is a HM mask (Fly, Dive, Waterfall, Surf, Water) s16 timer; s16 unkE; -- cgit v1.2.3 From 424db9c41bbe0fa23910606f4c85a5d5db0c19d1 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 16 Sep 2020 00:15:52 -0500 Subject: split out pokemon funcs and decomp another nullsub --- include/pokemon.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 include/pokemon.h (limited to 'include') diff --git a/include/pokemon.h b/include/pokemon.h new file mode 100644 index 0000000..c1da8d5 --- /dev/null +++ b/include/pokemon.h @@ -0,0 +1,51 @@ +#ifdef POKEMON_H +#define POKEMON_H + +struct gPokemon +{ + /* 0x0 */ u32 species; // pointer to string + /* 0x4 */ u32 category; // pointer to string + /* 0x8 */ u8 palette; // between 0 - 12 + /* 0x9 */ u8 size; // between 0x01 - 0x06 + /* 0xA */ u8 unk0; + /* 0xB */ u8 unk1; + /* 0xC */ s32 speed; + /* 0x10 */ u16 dial_sprite; + /* 0x12 */ u8 unk2; + /* 0x13 */ u8 type_1; // between 0x00 - 0x11 + /* 0x14 */ u8 type_2; // between 0x00 - 0x11 + /* 0x15 */ u8 walkable_tiles; // between 0x00 - 0x05 + /* 0x16 */ u8 friend_area; // 0x00 - 0x39 + /* 0x17 */ u8 ability_1; // between 0x00 - 0x4C + /* 0x18 */ u8 ability_2; // between 0x00 - 0x4C + /* 0x19 */ u8 shadow_size; // between 0x0 - 0x2 + /* 0x1A */ u8 unk3; + /* 0x1B */ u8 unk4; + /* 0x1C */ bool8 isMoving; + /* 0x1D */ u8 unk5; + /* 0x1E */ u16 base_hp; + /* 0x20 */ u16 base_exp; + /* 0x22 */ u16 unk6; + /* 0x24 */ u16 base_att; + /* 0x26 */ u16 base_sp_att; + /* 0x28 */ u16 base_def; + /* 0x2A */ u16 base_sp_def; + /* 0x2C */ u16 lowkick_dmg; + /* 0x2E */ u16 sizeorb_dmg; + /* 0x30 */ u8 unk7; + /* 0x31 */ u8 unk8; + /* 0x32 */ u8 unk9; + /* 0x33 */ bool8 unk10; + /* 0x34 */ u16 prior_evolution; + /* 0x36 */ u16 evol_type; + /* 0x38 */ u16 evol_need1; + /* 0x3A */ u16 evol_need2; + /* 0x3C */ u16 dexNum; + /* 0x3E */ u8 internalNum; + /* 0x40 */ u16 base_recruit; + /* 0x42 */ u16 unk11; + /* 0x44 */ u16 alphaNum; + /* 0x46 */ u16 parentNum; +} + +#endif -- cgit v1.2.3 From 190c3562b9df62ab57297c46348f3739563c9868 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 16 Sep 2020 14:00:48 -0500 Subject: decomp a chunk of input --- include/input.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 include/input.h (limited to 'include') diff --git a/include/input.h b/include/input.h new file mode 100644 index 0000000..1ac1bec --- /dev/null +++ b/include/input.h @@ -0,0 +1,44 @@ +struct test +{ + /* 0x0 */ u16 unk0; + /* 0x2 */ u16 unk1; + /* 0x4 */ u16 unk2; + /* 0x6 */ u16 unk3; + /* 0x8 */ u16 unk4; +}; + +struct test3 +{ + /* 0x0 */ u16 unk0; + /* 0x2 */ u16 unk1; + /* 0x4 */ u16 unk2; + /* 0x6 */ u16 unk3; +}; + +struct Input +{ + /* 0x0 */ u16 unk0; + /* 0x2 */ u16 unk1; + /* 0x4 */ u16 unk2; + /* 0x6 */ u16 unk3; + /* 0x8 */ u16 unk4; + /* 0xA */ u16 unk5; + /* 0xC */ u16 unk6; + /* 0xE */ u16 unk7; + /* 0x10 */ u16 unk8; + /* 0x12 */ u16 unk9; + /* 0x14 */ u16 unk10; + /* 0x16 */ u16 unk11; + /* 0x18 */ u16 unk12; + /* 0x1A */ u16 unk13; + /* 0x1C */ u16 unk14; + /* 0x1E */ u16 unk15; + /* 0x20 */ u16 unk16; + /* 0x22 */ u16 unk17[3]; // padding + /* 0x28 */ u8 unk18; + /* 0x29 */ u8 unk19; + /* 0x2A */ u8 unk20; +}; + +void InitInput(void); +void sub_800485C(void); -- cgit v1.2.3 From ff099968a1e6f1e6ce7c4dbd7d6cf041caf33c55 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 16 Sep 2020 17:01:21 -0500 Subject: nonmatching input be GONE. Just one func left --- include/input.h | 71 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 29 deletions(-) (limited to 'include') diff --git a/include/input.h b/include/input.h index 1ac1bec..6c579a8 100644 --- a/include/input.h +++ b/include/input.h @@ -1,44 +1,57 @@ -struct test +struct UnkInputStruct1 { /* 0x0 */ u16 unk0; - /* 0x2 */ u16 unk1; - /* 0x4 */ u16 unk2; - /* 0x6 */ u16 unk3; - /* 0x8 */ u16 unk4; + /* 0x2 */ u16 unk2; + /* 0x4 */ u16 unk4; + /* 0x6 */ u16 unk6; + /* 0x8 */ u16 unk8; + /* 0xA */ u16 unkA; + /* 0xC */ u32 unkC; }; -struct test3 +struct UnkInputStruct2 { /* 0x0 */ u16 unk0; - /* 0x2 */ u16 unk1; - /* 0x4 */ u16 unk2; - /* 0x6 */ u16 unk3; + /* 0x2 */ u16 unk2; + /* 0x4 */ u16 unk4; + /* 0x6 */ u16 unk6; }; struct Input { /* 0x0 */ u16 unk0; - /* 0x2 */ u16 unk1; - /* 0x4 */ u16 unk2; - /* 0x6 */ u16 unk3; - /* 0x8 */ u16 unk4; - /* 0xA */ u16 unk5; - /* 0xC */ u16 unk6; - /* 0xE */ u16 unk7; - /* 0x10 */ u16 unk8; - /* 0x12 */ u16 unk9; - /* 0x14 */ u16 unk10; - /* 0x16 */ u16 unk11; - /* 0x18 */ u16 unk12; - /* 0x1A */ u16 unk13; - /* 0x1C */ u16 unk14; - /* 0x1E */ u16 unk15; - /* 0x20 */ u16 unk16; - /* 0x22 */ u16 unk17[3]; // padding - /* 0x28 */ u8 unk18; - /* 0x29 */ u8 unk19; - /* 0x2A */ u8 unk20; + /* 0x2 */ u16 unk2; + /* 0x4 */ u16 unk4; + /* 0x6 */ u16 unk6; + /* 0x8 */ u16 unk8; + /* 0xA */ u16 unkA; + /* 0xC */ u16 unkC; + /* 0xE */ u16 unkE; + /* 0x10 */ u16 unk10; + /* 0x12 */ u16 unk12; + /* 0x14 */ u16 unk14; + /* 0x16 */ u16 unk16; + /* 0x16 */ u16 unk18; + /* 0x1A */ u16 unk1A; + /* 0x1C */ u16 unk1C; + /* 0x1E */ u16 unk1E; + /* 0x20 */ u32 unk20; + /* 0x24 */ u16 unk24; + /* 0x24 */ u16 unk26; + /* 0x28 */ u8 unk28; + /* 0x29 */ u8 unk29; + /* 0x2A */ u8 unk2A; }; void InitInput(void); void sub_800485C(void); +u8 sub_80048B8(void); +u8 sub_80048BC(void); +u8 sub_80048C0(void); +u8 sub_80048C4(void); +u8 sub_80048C8(void); +u8 sub_80048CC(void); +void sub_80048D0(void); +void sub_80048F8(void); +void sub_8004914(void); + -- cgit v1.2.3 From 977ef7d8aabe3befab5b3cc44210c7d4d8f0010d Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 20 Sep 2020 19:33:21 -0500 Subject: fix guards --- include/input.h | 4 ++++ include/pokemon.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/input.h b/include/input.h index 6c579a8..0032a37 100644 --- a/include/input.h +++ b/include/input.h @@ -1,3 +1,6 @@ +#ifndef GUARD_INPUT_H +#define GUARD_INPUT_H + struct UnkInputStruct1 { /* 0x0 */ u16 unk0; @@ -55,3 +58,4 @@ void sub_80048D0(void); void sub_80048F8(void); void sub_8004914(void); +#endif // GUARD_INPUT_H diff --git a/include/pokemon.h b/include/pokemon.h index c1da8d5..864b611 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,4 +1,4 @@ -#ifdef POKEMON_H +#ifndef POKEMON_H #define POKEMON_H struct gPokemon @@ -46,6 +46,6 @@ struct gPokemon /* 0x42 */ u16 unk11; /* 0x44 */ u16 alphaNum; /* 0x46 */ u16 parentNum; -} +}; -#endif +#endif // POKEMON_H -- cgit v1.2.3 From d5e31c8be0d82746945035f4be7d038d5536efb7 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 21 Sep 2020 01:40:48 -0500 Subject: decomp decomp decomp --- include/file_system.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/file_system.h b/include/file_system.h index 360f7ac..45f6aac 100644 --- a/include/file_system.h +++ b/include/file_system.h @@ -26,6 +26,12 @@ struct SiroArchive u8 *data; }; +struct UnkFileStruct1 +{ + /* 0x0 */ u32 unk0; + /* 0x4 */ u32 unk4; +}; + struct OpenedFile *OpenFile(const char *filename, const struct FileArchive *arc); u8 *GetFileDataPtr(struct OpenedFile *openedFile, int unused); struct OpenedFile *OpenFileAndGetFileDataPtr(const char *filename, const struct FileArchive *arc); -- cgit v1.2.3 From 1bacffd62f81e795b6309f6389ccbe55f2af4ea5 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 21 Sep 2020 12:03:19 -0500 Subject: we already decomped this func so use it from text --- include/text.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 include/text.h (limited to 'include') diff --git a/include/text.h b/include/text.h new file mode 100644 index 0000000..d23ccf7 --- /dev/null +++ b/include/text.h @@ -0,0 +1,28 @@ +#ifndef GUARD_TEXT_H +#define GUARD_TEXT_H + +struct UnkTextStruct1 { + u8 fill00[4]; + u16 unk04; + u8 fill06[2]; + u16 unk08; + u8 fill04[0x3c]; + u8 unk46; +}; + +struct UnkTextStruct2 { + u8 fill00[0x0c]; + s16 unk0c; + u8 fill0e[2]; + s16 unk10; + u8 fill12[0x06]; +}; + +void sub_8006218(void); +u32 xxx_update_some_bg_tiles(u32 a0); +void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, u32 *a3); +void sub_8006554(void *a0, void *a1, void *a2, void *a3, u32 a4, const struct UnkTextStruct2 *a5, u8 a6, u32 a7, u32 *a8, u32 a9); +void sub_800898C(void); +void sub_80089AC(const struct UnkTextStruct2 *a0, void *a1); +void sub_8009388(void); +#endif -- cgit v1.2.3 From cd050a5e7d66e28485a5b4e57ecdfb3d8c5f1e3c Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 23 Sep 2020 22:56:31 -0500 Subject: found more MonsterParameter funcs that weren't in the split and decomped a few of them --- include/pokemon.h | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) (limited to 'include') diff --git a/include/pokemon.h b/include/pokemon.h index 864b611..fba7199 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -3,49 +3,7 @@ struct gPokemon { - /* 0x0 */ u32 species; // pointer to string - /* 0x4 */ u32 category; // pointer to string - /* 0x8 */ u8 palette; // between 0 - 12 - /* 0x9 */ u8 size; // between 0x01 - 0x06 - /* 0xA */ u8 unk0; - /* 0xB */ u8 unk1; - /* 0xC */ s32 speed; - /* 0x10 */ u16 dial_sprite; - /* 0x12 */ u8 unk2; - /* 0x13 */ u8 type_1; // between 0x00 - 0x11 - /* 0x14 */ u8 type_2; // between 0x00 - 0x11 - /* 0x15 */ u8 walkable_tiles; // between 0x00 - 0x05 - /* 0x16 */ u8 friend_area; // 0x00 - 0x39 - /* 0x17 */ u8 ability_1; // between 0x00 - 0x4C - /* 0x18 */ u8 ability_2; // between 0x00 - 0x4C - /* 0x19 */ u8 shadow_size; // between 0x0 - 0x2 - /* 0x1A */ u8 unk3; - /* 0x1B */ u8 unk4; - /* 0x1C */ bool8 isMoving; - /* 0x1D */ u8 unk5; - /* 0x1E */ u16 base_hp; - /* 0x20 */ u16 base_exp; - /* 0x22 */ u16 unk6; - /* 0x24 */ u16 base_att; - /* 0x26 */ u16 base_sp_att; - /* 0x28 */ u16 base_def; - /* 0x2A */ u16 base_sp_def; - /* 0x2C */ u16 lowkick_dmg; - /* 0x2E */ u16 sizeorb_dmg; - /* 0x30 */ u8 unk7; - /* 0x31 */ u8 unk8; - /* 0x32 */ u8 unk9; - /* 0x33 */ bool8 unk10; - /* 0x34 */ u16 prior_evolution; - /* 0x36 */ u16 evol_type; - /* 0x38 */ u16 evol_need1; - /* 0x3A */ u16 evol_need2; - /* 0x3C */ u16 dexNum; - /* 0x3E */ u8 internalNum; - /* 0x40 */ u16 base_recruit; - /* 0x42 */ u16 unk11; - /* 0x44 */ u16 alphaNum; - /* 0x46 */ u16 parentNum; + /* 0x0 */ u8* unk0; }; #endif // POKEMON_H -- cgit v1.2.3 From 96fdd3aae0ba1d923b358128012979a9a1a0eb38 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 1 Oct 2020 13:32:53 -0500 Subject: successful decomp of one pokemon data func and struct.. making headway --- include/pokemon.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/pokemon.h b/include/pokemon.h index fba7199..68164ef 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -3,7 +3,42 @@ struct gPokemon { - /* 0x0 */ u8* unk0; + /* 0x0 */ u8* species; // verified + /* 0x4 */ u8* category; + /* 0x8 */ u8 overworld_sprite; // verified + /* 0x9 */ u8 size; + /* 0x9 */ u8 unkA; + /* 0xB */ u8 unkB; + /* 0xC */ s32 move_speed; + /* 0x10 */ u16 dialogue_sprites; // verified + /* 0x12 */ u8 unk12; //verified + /* 0x13 */ u8 type_1; + /* 0x14 */ u8 type_2; + /* 0x15 */ u8 walkable_tiles; + /* 0x16 */ u8 friend_area; // verified + /* 0x16 */ u8 ability_1; + /* 0x18 */ u8 ability_2; + /* 0x19 */ u8 shadow_size; + /* 0x1A */ u8 unk1A; + /* 0x1B */ u16 unk1B; + /* 0x1D */ u8 unk1D; + /* 0x1E */ u16 base_hp; + /* 0x20 */ u16 base_exp; // verified + /* 0x22 */ u16 unk22; // verified + /* 0x24 */ u16 base_att; + /* 0x26 */ u16 base_spatt; + /* 0x28 */ u16 base_def; + /* 0x2A */ u16 base_spdef; + /* 0x2C */ u16 lowkick_dmg; + /* 0x2E */ u16 sizeorb_dmg; + /* 0x30 */ u16 unk30; + /* 0x32 */ u16 unk32; + /* 0x34 */ u16 unk34; //verified + /* 0x36 */ u16 evolve_type; + /* 0x38 */ u32 evolve_need1; // verified + /* 0x3C */ u16 unk3C; + /* 0x3E */ s16 unk3E; // verified + /* 0x40 */ s16 base_recruit; // verified }; #endif // POKEMON_H -- cgit v1.2.3 From d60e36b6b81b691585c2f231356738af704e0c7b Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 1 Oct 2020 17:40:44 -0500 Subject: decomp a number of pokemon functions --- include/pokemon.h | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/pokemon.h b/include/pokemon.h index 68164ef..0b408e3 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -3,27 +3,28 @@ struct gPokemon { - /* 0x0 */ u8* species; // verified + /* 0x0 */ u8* species; /* 0x4 */ u8* category; - /* 0x8 */ u8 overworld_sprite; // verified + /* 0x8 */ u8 overworld_sprite; /* 0x9 */ u8 size; - /* 0x9 */ u8 unkA; + /* 0xA */ u8 unkA; /* 0xB */ u8 unkB; /* 0xC */ s32 move_speed; - /* 0x10 */ u16 dialogue_sprites; // verified - /* 0x12 */ u8 unk12; //verified + /* 0x10 */ u16 dialogue_sprites; + /* 0x12 */ u8 unk12; /* 0x13 */ u8 type_1; /* 0x14 */ u8 type_2; /* 0x15 */ u8 walkable_tiles; - /* 0x16 */ u8 friend_area; // verified - /* 0x16 */ u8 ability_1; + /* 0x16 */ u8 friend_area; + /* 0x17 */ u8 ability_1; /* 0x18 */ u8 ability_2; /* 0x19 */ u8 shadow_size; /* 0x1A */ u8 unk1A; - /* 0x1B */ u16 unk1B; + /* 0x1B */ u8 unk1B; + /* 0x1C */ bool8 isMoving; /* 0x1D */ u8 unk1D; /* 0x1E */ u16 base_hp; - /* 0x20 */ u16 base_exp; // verified + /* 0x20 */ u16 base_exp; /* 0x22 */ u16 unk22; // verified /* 0x24 */ u16 base_att; /* 0x26 */ u16 base_spatt; @@ -31,14 +32,20 @@ struct gPokemon /* 0x2A */ u16 base_spdef; /* 0x2C */ u16 lowkick_dmg; /* 0x2E */ u16 sizeorb_dmg; - /* 0x30 */ u16 unk30; - /* 0x32 */ u16 unk32; - /* 0x34 */ u16 unk34; //verified + /* 0x30 */ u8 unk30; + /* 0x31 */ u8 unk31; + /* 0x32 */ u8 unk32; + /* 0x33 */ bool8 unk33; + /* 0x34 */ u16 evolve_from; //verified /* 0x36 */ u16 evolve_type; - /* 0x38 */ u32 evolve_need1; // verified - /* 0x3C */ u16 unk3C; - /* 0x3E */ s16 unk3E; // verified + /* 0x38 */ u16 evolve_need1; // verified + /* 0x3A */ u16 evolve_need2; // verified + /* 0x3C */ u16 dexNo; + /* 0x3E */ u16 internalNo; // verified /* 0x40 */ s16 base_recruit; // verified + /* 0x42 */ u16 alphabetNo; + /* 0x44 */ u16 parentNo; + /* 0x46 */ u16 unk46; }; #endif // POKEMON_H -- cgit v1.2.3 From a391aaa3f60cc0658f62c283e02cb8fbbbceb090 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 9 Oct 2020 15:16:49 -0500 Subject: unify save defines and decomp more save stuff --- include/save.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 include/save.h (limited to 'include') diff --git a/include/save.h b/include/save.h new file mode 100644 index 0000000..6d0f568 --- /dev/null +++ b/include/save.h @@ -0,0 +1,34 @@ +struct unkTimeStruct +{ + u16 unk0; + u8 unk2; + u8 unk3; + u8 unk4; +}; + +struct UnkStruct_203B184 { + /* 0x0 */ u32 unk0; + /* 0x4 */ u32 unk4; + /* 0x8 */ u32 unk8; + /* 0xC */ u32 unkC; + /* 0x10 */ u32 unk10; + /* 0x14 */ u32 unk14; + /* 0x18 */ u32 unk18; + /* 0x1C */ u32 unk1C; + /* 0x20 */ u32 unk20; + /* 0x24 */ u32 unk24; + /* 0x28 */ u32 unk28; + /* 0x2C */ u32 unk2C; + /* 0x30 */ struct unkTimeStruct *unk30; + u32 unk34; + u32 unk38; + u32 unk3C; + u32 unk40; + u32 unk44; + u32 unk48; + u8 *unk04C; + u32 unk050; + u32 unk054; + u32 unk058; +}; + -- cgit v1.2.3 From 6c9dd59b5691cd7d5a19c740e8d22779e6a101aa Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 15 Oct 2020 16:56:25 -0500 Subject: nonmatch bc I'm so close on those --- include/code_800558C.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/code_800558C.h b/include/code_800558C.h index e1b3432..ac037c8 100644 --- a/include/code_800558C.h +++ b/include/code_800558C.h @@ -2,5 +2,6 @@ #define GUARD_code_800558C_H extern void *gUnknown_203B078; +void sub_80060EC(void); #endif //GUARD_code_800558C_H -- cgit v1.2.3 From 9b8e49226f827a3314b320426c52164ab33e22f2 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 17 Oct 2020 12:27:49 -0500 Subject: start moving some data into c of personality test --- include/constants/species.h | 448 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 448 insertions(+) create mode 100644 include/constants/species.h (limited to 'include') diff --git a/include/constants/species.h b/include/constants/species.h new file mode 100644 index 0000000..5a187ad --- /dev/null +++ b/include/constants/species.h @@ -0,0 +1,448 @@ +#ifndef GUARD_CONSTANTS_SPECIES_H +#define GUARD_CONSTANTS_SPECIES_H + +#define SPECIES_NONE 0 +#define SPECIES_BULBASAUR 1 +#define SPECIES_IVYSAUR 2 +#define SPECIES_VENUSAUR 3 +#define SPECIES_CHARMANDER 4 +#define SPECIES_CHARMELEON 5 +#define SPECIES_CHARIZARD 6 +#define SPECIES_SQUIRTLE 7 +#define SPECIES_WARTORTLE 8 +#define SPECIES_BLASTOISE 9 +#define SPECIES_CATERPIE 10 +#define SPECIES_METAPOD 11 +#define SPECIES_BUTTERFREE 12 +#define SPECIES_WEEDLE 13 +#define SPECIES_KAKUNA 14 +#define SPECIES_BEEDRILL 15 +#define SPECIES_PIDGEY 16 +#define SPECIES_PIDGEOTTO 17 +#define SPECIES_PIDGEOT 18 +#define SPECIES_RATTATA 19 +#define SPECIES_RATICATE 20 +#define SPECIES_SPEAROW 21 +#define SPECIES_FEAROW 22 +#define SPECIES_EKANS 23 +#define SPECIES_ARBOK 24 +#define SPECIES_PIKACHU 25 +#define SPECIES_RAICHU 26 +#define SPECIES_SANDSHREW 27 +#define SPECIES_SANDSLASH 28 +#define SPECIES_NIDORAN_F 29 +#define SPECIES_NIDORINA 30 +#define SPECIES_NIDOQUEEN 31 +#define SPECIES_NIDORAN_M 32 +#define SPECIES_NIDORINO 33 +#define SPECIES_NIDOKING 34 +#define SPECIES_CLEFAIRY 35 +#define SPECIES_CLEFABLE 36 +#define SPECIES_VULPIX 37 +#define SPECIES_NINETALES 38 +#define SPECIES_JIGGLYPUFF 39 +#define SPECIES_WIGGLYTUFF 40 +#define SPECIES_ZUBAT 41 +#define SPECIES_GOLBAT 42 +#define SPECIES_ODDISH 43 +#define SPECIES_GLOOM 44 +#define SPECIES_VILEPLUME 45 +#define SPECIES_PARAS 46 +#define SPECIES_PARASECT 47 +#define SPECIES_VENONAT 48 +#define SPECIES_VENOMOTH 49 +#define SPECIES_DIGLETT 50 +#define SPECIES_DUGTRIO 51 +#define SPECIES_MEOWTH 52 +#define SPECIES_PERSIAN 53 +#define SPECIES_PSYDUCK 54 +#define SPECIES_GOLDUCK 55 +#define SPECIES_MANKEY 56 +#define SPECIES_PRIMEAPE 57 +#define SPECIES_GROWLITHE 58 +#define SPECIES_ARCANINE 59 +#define SPECIES_POLIWAG 60 +#define SPECIES_POLIWHIRL 61 +#define SPECIES_POLIWRATH 62 +#define SPECIES_ABRA 63 +#define SPECIES_KADABRA 64 +#define SPECIES_ALAKAZAM 65 +#define SPECIES_MACHOP 66 +#define SPECIES_MACHOKE 67 +#define SPECIES_MACHAMP 68 +#define SPECIES_BELLSPROUT 69 +#define SPECIES_WEEPINBELL 70 +#define SPECIES_VICTREEBEL 71 +#define SPECIES_TENTACOOL 72 +#define SPECIES_TENTACRUEL 73 +#define SPECIES_GEODUDE 74 +#define SPECIES_GRAVELER 75 +#define SPECIES_GOLEM 76 +#define SPECIES_PONYTA 77 +#define SPECIES_RAPIDASH 78 +#define SPECIES_SLOWPOKE 79 +#define SPECIES_SLOWBRO 80 +#define SPECIES_MAGNEMITE 81 +#define SPECIES_MAGNETON 82 +#define SPECIES_FARFETCHD 83 +#define SPECIES_DODUO 84 +#define SPECIES_DODRIO 85 +#define SPECIES_SEEL 86 +#define SPECIES_DEWGONG 87 +#define SPECIES_GRIMER 88 +#define SPECIES_MUK 89 +#define SPECIES_SHELLDER 90 +#define SPECIES_CLOYSTER 91 +#define SPECIES_GASTLY 92 +#define SPECIES_HAUNTER 93 +#define SPECIES_GENGAR 94 +#define SPECIES_ONIX 95 +#define SPECIES_DROWZEE 96 +#define SPECIES_HYPNO 97 +#define SPECIES_KRABBY 98 +#define SPECIES_KINGLER 99 +#define SPECIES_VOLTORB 100 +#define SPECIES_ELECTRODE 101 +#define SPECIES_EXEGGCUTE 102 +#define SPECIES_EXEGGUTOR 103 +#define SPECIES_CUBONE 104 +#define SPECIES_MAROWAK 105 +#define SPECIES_HITMONLEE 106 +#define SPECIES_HITMONCHAN 107 +#define SPECIES_LICKITUNG 108 +#define SPECIES_KOFFING 109 +#define SPECIES_WEEZING 110 +#define SPECIES_RHYHORN 111 +#define SPECIES_RHYDON 112 +#define SPECIES_CHANSEY 113 +#define SPECIES_TANGELA 114 +#define SPECIES_KANGASKHAN 115 +#define SPECIES_HORSEA 116 +#define SPECIES_SEADRA 117 +#define SPECIES_GOLDEEN 118 +#define SPECIES_SEAKING 119 +#define SPECIES_STARYU 120 +#define SPECIES_STARMIE 121 +#define SPECIES_MR_MIME 122 +#define SPECIES_SCYTHER 123 +#define SPECIES_JYNX 124 +#define SPECIES_ELECTABUZZ 125 +#define SPECIES_MAGMAR 126 +#define SPECIES_PINSIR 127 +#define SPECIES_TAUROS 128 +#define SPECIES_MAGIKARP 129 +#define SPECIES_GYARADOS 130 +#define SPECIES_LAPRAS 131 +#define SPECIES_DITTO 132 +#define SPECIES_EEVEE 133 +#define SPECIES_VAPOREON 134 +#define SPECIES_JOLTEON 135 +#define SPECIES_FLAREON 136 +#define SPECIES_PORYGON 137 +#define SPECIES_OMANYTE 138 +#define SPECIES_OMASTAR 139 +#define SPECIES_KABUTO 140 +#define SPECIES_KABUTOPS 141 +#define SPECIES_AERODACTYL 142 +#define SPECIES_SNORLAX 143 +#define SPECIES_ARTICUNO 144 +#define SPECIES_ZAPDOS 145 +#define SPECIES_MOLTRES 146 +#define SPECIES_DRATINI 147 +#define SPECIES_DRAGONAIR 148 +#define SPECIES_DRAGONITE 149 +#define SPECIES_MEWTWO 150 +#define SPECIES_MEW 151 +#define SPECIES_CHIKORITA 152 +#define SPECIES_BAYLEEF 153 +#define SPECIES_MEGANIUM 154 +#define SPECIES_CYNDAQUIL 155 +#define SPECIES_QUILAVA 156 +#define SPECIES_TYPHLOSION 157 +#define SPECIES_TOTODILE 158 +#define SPECIES_CROCONAW 159 +#define SPECIES_FERALIGATR 160 +#define SPECIES_SENTRET 161 +#define SPECIES_FURRET 162 +#define SPECIES_HOOTHOOT 163 +#define SPECIES_NOCTOWL 164 +#define SPECIES_LEDYBA 165 +#define SPECIES_LEDIAN 166 +#define SPECIES_SPINARAK 167 +#define SPECIES_ARIADOS 168 +#define SPECIES_CROBAT 169 +#define SPECIES_CHINCHOU 170 +#define SPECIES_LANTURN 171 +#define SPECIES_PICHU 172 +#define SPECIES_CLEFFA 173 +#define SPECIES_IGGLYBUFF 174 +#define SPECIES_TOGEPI 175 +#define SPECIES_TOGETIC 176 +#define SPECIES_NATU 177 +#define SPECIES_XATU 178 +#define SPECIES_MAREEP 179 +#define SPECIES_FLAAFFY 180 +#define SPECIES_AMPHAROS 181 +#define SPECIES_BELLOSSOM 182 +#define SPECIES_MARILL 183 +#define SPECIES_AZUMARILL 184 +#define SPECIES_SUDOWOODO 185 +#define SPECIES_POLITOED 186 +#define SPECIES_HOPPIP 187 +#define SPECIES_SKIPLOOM 188 +#define SPECIES_JUMPLUFF 189 +#define SPECIES_AIPOM 190 +#define SPECIES_SUNKERN 191 +#define SPECIES_SUNFLORA 192 +#define SPECIES_YANMA 193 +#define SPECIES_WOOPER 194 +#define SPECIES_QUAGSIRE 195 +#define SPECIES_ESPEON 196 +#define SPECIES_UMBREON 197 +#define SPECIES_MURKROW 198 +#define SPECIES_SLOWKING 199 +#define SPECIES_MISDREAVUS 200 +#define SPECIES_UNOWN 201 +#define SPECIES_WOBBUFFET 202 +#define SPECIES_GIRAFARIG 203 +#define SPECIES_PINECO 204 +#define SPECIES_FORRETRESS 205 +#define SPECIES_DUNSPARCE 206 +#define SPECIES_GLIGAR 207 +#define SPECIES_STEELIX 208 +#define SPECIES_SNUBBULL 209 +#define SPECIES_GRANBULL 210 +#define SPECIES_QWILFISH 211 +#define SPECIES_SCIZOR 212 +#define SPECIES_SHUCKLE 213 +#define SPECIES_HERACROSS 214 +#define SPECIES_SNEASEL 215 +#define SPECIES_TEDDIURSA 216 +#define SPECIES_URSARING 217 +#define SPECIES_SLUGMA 218 +#define SPECIES_MAGCARGO 219 +#define SPECIES_SWINUB 220 +#define SPECIES_PILOSWINE 221 +#define SPECIES_CORSOLA 222 +#define SPECIES_REMORAID 223 +#define SPECIES_OCTILLERY 224 +#define SPECIES_DELIBIRD 225 +#define SPECIES_MANTINE 226 +#define SPECIES_SKARMORY 227 +#define SPECIES_HOUNDOUR 228 +#define SPECIES_HOUNDOOM 229 +#define SPECIES_KINGDRA 230 +#define SPECIES_PHANPY 231 +#define SPECIES_DONPHAN 232 +#define SPECIES_PORYGON2 233 +#define SPECIES_STANTLER 234 +#define SPECIES_SMEARGLE 235 +#define SPECIES_TYROGUE 236 +#define SPECIES_HITMONTOP 237 +#define SPECIES_SMOOCHUM 238 +#define SPECIES_ELEKID 239 +#define SPECIES_MAGBY 240 +#define SPECIES_MILTANK 241 +#define SPECIES_BLISSEY 242 +#define SPECIES_RAIKOU 243 +#define SPECIES_ENTEI 244 +#define SPECIES_SUICUNE 245 +#define SPECIES_LARVITAR 246 +#define SPECIES_PUPITAR 247 +#define SPECIES_TYRANITAR 248 +#define SPECIES_LUGIA 249 +#define SPECIES_HO_OH 250 +#define SPECIES_CELEBI 251 + +#define SPECIES_OLD_UNOWN_B 252 +#define SPECIES_OLD_UNOWN_C 253 +#define SPECIES_OLD_UNOWN_D 254 +#define SPECIES_OLD_UNOWN_E 255 +#define SPECIES_OLD_UNOWN_F 256 +#define SPECIES_OLD_UNOWN_G 257 +#define SPECIES_OLD_UNOWN_H 258 +#define SPECIES_OLD_UNOWN_I 259 +#define SPECIES_OLD_UNOWN_J 260 +#define SPECIES_OLD_UNOWN_K 261 +#define SPECIES_OLD_UNOWN_L 262 +#define SPECIES_OLD_UNOWN_M 263 +#define SPECIES_OLD_UNOWN_N 264 +#define SPECIES_OLD_UNOWN_O 265 +#define SPECIES_OLD_UNOWN_P 266 +#define SPECIES_OLD_UNOWN_Q 267 +#define SPECIES_OLD_UNOWN_R 268 +#define SPECIES_OLD_UNOWN_S 269 +#define SPECIES_OLD_UNOWN_T 270 +#define SPECIES_OLD_UNOWN_U 271 +#define SPECIES_OLD_UNOWN_V 272 +#define SPECIES_OLD_UNOWN_W 273 +#define SPECIES_OLD_UNOWN_X 274 +#define SPECIES_OLD_UNOWN_Y 275 +#define SPECIES_OLD_UNOWN_Z 276 + +#define SPECIES_TREECKO 277 +#define SPECIES_GROVYLE 278 +#define SPECIES_SCEPTILE 279 +#define SPECIES_TORCHIC 280 +#define SPECIES_COMBUSKEN 281 +#define SPECIES_BLAZIKEN 282 +#define SPECIES_MUDKIP 283 +#define SPECIES_MARSHTOMP 284 +#define SPECIES_SWAMPERT 285 +#define SPECIES_POOCHYENA 286 +#define SPECIES_MIGHTYENA 287 +#define SPECIES_ZIGZAGOON 288 +#define SPECIES_LINOONE 289 +#define SPECIES_WURMPLE 290 +#define SPECIES_SILCOON 291 +#define SPECIES_BEAUTIFLY 292 +#define SPECIES_CASCOON 293 +#define SPECIES_DUSTOX 294 +#define SPECIES_LOTAD 295 +#define SPECIES_LOMBRE 296 +#define SPECIES_LUDICOLO 297 +#define SPECIES_SEEDOT 298 +#define SPECIES_NUZLEAF 299 +#define SPECIES_SHIFTRY 300 +#define SPECIES_NINCADA 301 +#define SPECIES_NINJASK 302 +#define SPECIES_SHEDINJA 303 +#define SPECIES_TAILLOW 304 +#define SPECIES_SWELLOW 305 +#define SPECIES_SHROOMISH 306 +#define SPECIES_BRELOOM 307 +#define SPECIES_SPINDA 308 +#define SPECIES_WINGULL 309 +#define SPECIES_PELIPPER 310 +#define SPECIES_SURSKIT 311 +#define SPECIES_MASQUERAIN 312 +#define SPECIES_WAILMER 313 +#define SPECIES_WAILORD 314 +#define SPECIES_SKITTY 315 +#define SPECIES_DELCATTY 316 +#define SPECIES_KECLEON 317 +#define SPECIES_BALTOY 318 +#define SPECIES_CLAYDOL 319 +#define SPECIES_NOSEPASS 320 +#define SPECIES_TORKOAL 321 +#define SPECIES_SABLEYE 322 +#define SPECIES_BARBOACH 323 +#define SPECIES_WHISCASH 324 +#define SPECIES_LUVDISC 325 +#define SPECIES_CORPHISH 326 +#define SPECIES_CRAWDAUNT 327 +#define SPECIES_FEEBAS 328 +#define SPECIES_MILOTIC 329 +#define SPECIES_CARVANHA 330 +#define SPECIES_SHARPEDO 331 +#define SPECIES_TRAPINCH 332 +#define SPECIES_VIBRAVA 333 +#define SPECIES_FLYGON 334 +#define SPECIES_MAKUHITA 335 +#define SPECIES_HARIYAMA 336 +#define SPECIES_ELECTRIKE 337 +#define SPECIES_MANECTRIC 338 +#define SPECIES_NUMEL 339 +#define SPECIES_CAMERUPT 340 +#define SPECIES_SPHEAL 341 +#define SPECIES_SEALEO 342 +#define SPECIES_WALREIN 343 +#define SPECIES_CACNEA 344 +#define SPECIES_CACTURNE 345 +#define SPECIES_SNORUNT 346 +#define SPECIES_GLALIE 347 +#define SPECIES_LUNATONE 348 +#define SPECIES_SOLROCK 349 +#define SPECIES_AZURILL 350 +#define SPECIES_SPOINK 351 +#define SPECIES_GRUMPIG 352 +#define SPECIES_PLUSLE 353 +#define SPECIES_MINUN 354 +#define SPECIES_MAWILE 355 +#define SPECIES_MEDITITE 356 +#define SPECIES_MEDICHAM 357 +#define SPECIES_SWABLU 358 +#define SPECIES_ALTARIA 359 +#define SPECIES_WYNAUT 360 +#define SPECIES_DUSKULL 361 +#define SPECIES_DUSCLOPS 362 +#define SPECIES_ROSELIA 363 +#define SPECIES_SLAKOTH 364 +#define SPECIES_VIGOROTH 365 +#define SPECIES_SLAKING 366 +#define SPECIES_GULPIN 367 +#define SPECIES_SWALOT 368 +#define SPECIES_TROPIUS 369 +#define SPECIES_WHISMUR 370 +#define SPECIES_LOUDRED 371 +#define SPECIES_EXPLOUD 372 +#define SPECIES_CLAMPERL 373 +#define SPECIES_HUNTAIL 374 +#define SPECIES_GOREBYSS 375 +#define SPECIES_ABSOL 376 +#define SPECIES_SHUPPET 377 +#define SPECIES_BANETTE 378 +#define SPECIES_SEVIPER 379 +#define SPECIES_ZANGOOSE 380 +#define SPECIES_RELICANTH 381 +#define SPECIES_ARON 382 +#define SPECIES_LAIRON 383 +#define SPECIES_AGGRON 384 +#define SPECIES_CASTFORM 385 +#define SPECIES_VOLBEAT 386 +#define SPECIES_ILLUMISE 387 +#define SPECIES_LILEEP 388 +#define SPECIES_CRADILY 389 +#define SPECIES_ANORITH 390 +#define SPECIES_ARMALDO 391 +#define SPECIES_RALTS 392 +#define SPECIES_KIRLIA 393 +#define SPECIES_GARDEVOIR 394 +#define SPECIES_BAGON 395 +#define SPECIES_SHELGON 396 +#define SPECIES_SALAMENCE 397 +#define SPECIES_BELDUM 398 +#define SPECIES_METANG 399 +#define SPECIES_METAGROSS 400 +#define SPECIES_REGIROCK 401 +#define SPECIES_REGICE 402 +#define SPECIES_REGISTEEL 403 +#define SPECIES_KYOGRE 404 +#define SPECIES_GROUDON 405 +#define SPECIES_RAYQUAZA 406 +#define SPECIES_LATIAS 407 +#define SPECIES_LATIOS 408 +#define SPECIES_JIRACHI 409 +#define SPECIES_DEOXYS 410 +#define SPECIES_CHIMECHO 411 +#define SPECIES_EGG 412 + +#define SPECIES_UNOWN_B 413 +#define SPECIES_UNOWN_C 414 +#define SPECIES_UNOWN_D 415 +#define SPECIES_UNOWN_E 416 +#define SPECIES_UNOWN_F 417 +#define SPECIES_UNOWN_G 418 +#define SPECIES_UNOWN_H 419 +#define SPECIES_UNOWN_I 420 +#define SPECIES_UNOWN_J 421 +#define SPECIES_UNOWN_K 422 +#define SPECIES_UNOWN_L 423 +#define SPECIES_UNOWN_M 424 +#define SPECIES_UNOWN_N 425 +#define SPECIES_UNOWN_O 426 +#define SPECIES_UNOWN_P 427 +#define SPECIES_UNOWN_Q 428 +#define SPECIES_UNOWN_R 429 +#define SPECIES_UNOWN_S 430 +#define SPECIES_UNOWN_T 431 +#define SPECIES_UNOWN_U 432 +#define SPECIES_UNOWN_V 433 +#define SPECIES_UNOWN_W 434 +#define SPECIES_UNOWN_X 435 +#define SPECIES_UNOWN_Y 436 +#define SPECIES_UNOWN_Z 437 +#define SPECIES_UNOWN_EMARK 438 +#define SPECIES_UNOWN_QMARK 439 + +#endif // GUARD_CONSTANTS_SPECIES_H -- cgit v1.2.3 From 1b0fc9f3745f119e2ec363bef89e48d6edeeac41 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 18 Oct 2020 18:16:28 -0500 Subject: decomp an evolve func for pokemon --- include/pokemon.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/pokemon.h b/include/pokemon.h index 0b408e3..6c18f7d 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,6 +1,18 @@ #ifndef POKEMON_H #define POKEMON_H +struct EvolveStruct1 +{ + u16 evolve_from; + u16 evolve_type; +}; + +struct EvolveNeeds +{ + u16 evolve_need1; + u16 evolve_need2; +}; + struct gPokemon { /* 0x0 */ u8* species; @@ -36,10 +48,8 @@ struct gPokemon /* 0x31 */ u8 unk31; /* 0x32 */ u8 unk32; /* 0x33 */ bool8 unk33; - /* 0x34 */ u16 evolve_from; //verified - /* 0x36 */ u16 evolve_type; - /* 0x38 */ u16 evolve_need1; // verified - /* 0x3A */ u16 evolve_need2; // verified + /* 0x34 */ struct EvolveStruct1 pre; + /* 0x38 */ struct EvolveNeeds need; /* 0x3C */ u16 dexNo; /* 0x3E */ u16 internalNo; // verified /* 0x40 */ s16 base_recruit; // verified -- cgit v1.2.3 From 184d3819ab381c54821b157770d015c0dce8d82a Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 20 Oct 2020 18:05:01 -0500 Subject: more decomping of funcs --- include/input.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/input.h b/include/input.h index 0032a37..0c4208d 100644 --- a/include/input.h +++ b/include/input.h @@ -44,6 +44,7 @@ struct Input /* 0x28 */ u8 unk28; /* 0x29 */ u8 unk29; /* 0x2A */ u8 unk2A; + /* 0x2B */ u8 padding; }; void InitInput(void); -- cgit v1.2.3 From 24ff70e21e7d9925f48da1ab5ec01df98b33da5e Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 22 Oct 2020 19:09:07 -0500 Subject: start some basic constants for dungeon data --- include/constants/bg_music.h | 6 ++++++ include/constants/weather.h | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 include/constants/bg_music.h create mode 100644 include/constants/weather.h (limited to 'include') diff --git a/include/constants/bg_music.h b/include/constants/bg_music.h new file mode 100644 index 0000000..0e6f416 --- /dev/null +++ b/include/constants/bg_music.h @@ -0,0 +1,6 @@ +#ifndef GUARD_BG_MUSIC_H +#define GUARD_BG_MUSIC_H + +#define MUS_TINY_WOODS 1 + +#endif //GUARD_BG_MUSIC_H diff --git a/include/constants/weather.h b/include/constants/weather.h new file mode 100644 index 0000000..e7225b9 --- /dev/null +++ b/include/constants/weather.h @@ -0,0 +1,14 @@ +#ifndef GUARD_CONSTANTS_WEATHER_H +#define GUARD_CONSTANTS_WEATHER_H + +#define WEATHER_CLEAR 0 +#define WEATHER_SUNNY 1 +#define WEATHER_SANDSTORM 2 +#define WEATHER_CLOUDY` 3 +#define WEATHER_RAIN 4 +#define WEATHER_HAIL 5 +#define WEATHER_FOG 6 +#define WEATHER_SNOW 7 +#define WEATHER_RANDOM 8 + +#endif // GUARD_CONSTANTS_WEATHER_H -- cgit v1.2.3 From acd79365e7f9bd294a09a04e07f00a9eff9bb21c Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 29 Oct 2020 17:37:54 -0500 Subject: fix up constants for species according to datacrystal --- include/constants/species.h | 411 +++++++++++++++++++++----------------------- 1 file changed, 196 insertions(+), 215 deletions(-) (limited to 'include') diff --git a/include/constants/species.h b/include/constants/species.h index 5a187ad..1822200 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -203,83 +203,81 @@ #define SPECIES_SLOWKING 199 #define SPECIES_MISDREAVUS 200 #define SPECIES_UNOWN 201 -#define SPECIES_WOBBUFFET 202 -#define SPECIES_GIRAFARIG 203 -#define SPECIES_PINECO 204 -#define SPECIES_FORRETRESS 205 -#define SPECIES_DUNSPARCE 206 -#define SPECIES_GLIGAR 207 -#define SPECIES_STEELIX 208 -#define SPECIES_SNUBBULL 209 -#define SPECIES_GRANBULL 210 -#define SPECIES_QWILFISH 211 -#define SPECIES_SCIZOR 212 -#define SPECIES_SHUCKLE 213 -#define SPECIES_HERACROSS 214 -#define SPECIES_SNEASEL 215 -#define SPECIES_TEDDIURSA 216 -#define SPECIES_URSARING 217 -#define SPECIES_SLUGMA 218 -#define SPECIES_MAGCARGO 219 -#define SPECIES_SWINUB 220 -#define SPECIES_PILOSWINE 221 -#define SPECIES_CORSOLA 222 -#define SPECIES_REMORAID 223 -#define SPECIES_OCTILLERY 224 -#define SPECIES_DELIBIRD 225 -#define SPECIES_MANTINE 226 -#define SPECIES_SKARMORY 227 -#define SPECIES_HOUNDOUR 228 -#define SPECIES_HOUNDOOM 229 -#define SPECIES_KINGDRA 230 -#define SPECIES_PHANPY 231 -#define SPECIES_DONPHAN 232 -#define SPECIES_PORYGON2 233 -#define SPECIES_STANTLER 234 -#define SPECIES_SMEARGLE 235 -#define SPECIES_TYROGUE 236 -#define SPECIES_HITMONTOP 237 -#define SPECIES_SMOOCHUM 238 -#define SPECIES_ELEKID 239 -#define SPECIES_MAGBY 240 -#define SPECIES_MILTANK 241 -#define SPECIES_BLISSEY 242 -#define SPECIES_RAIKOU 243 -#define SPECIES_ENTEI 244 -#define SPECIES_SUICUNE 245 -#define SPECIES_LARVITAR 246 -#define SPECIES_PUPITAR 247 -#define SPECIES_TYRANITAR 248 -#define SPECIES_LUGIA 249 -#define SPECIES_HO_OH 250 -#define SPECIES_CELEBI 251 - -#define SPECIES_OLD_UNOWN_B 252 -#define SPECIES_OLD_UNOWN_C 253 -#define SPECIES_OLD_UNOWN_D 254 -#define SPECIES_OLD_UNOWN_E 255 -#define SPECIES_OLD_UNOWN_F 256 -#define SPECIES_OLD_UNOWN_G 257 -#define SPECIES_OLD_UNOWN_H 258 -#define SPECIES_OLD_UNOWN_I 259 -#define SPECIES_OLD_UNOWN_J 260 -#define SPECIES_OLD_UNOWN_K 261 -#define SPECIES_OLD_UNOWN_L 262 -#define SPECIES_OLD_UNOWN_M 263 -#define SPECIES_OLD_UNOWN_N 264 -#define SPECIES_OLD_UNOWN_O 265 -#define SPECIES_OLD_UNOWN_P 266 -#define SPECIES_OLD_UNOWN_Q 267 -#define SPECIES_OLD_UNOWN_R 268 -#define SPECIES_OLD_UNOWN_S 269 -#define SPECIES_OLD_UNOWN_T 270 -#define SPECIES_OLD_UNOWN_U 271 -#define SPECIES_OLD_UNOWN_V 272 -#define SPECIES_OLD_UNOWN_W 273 -#define SPECIES_OLD_UNOWN_X 274 -#define SPECIES_OLD_UNOWN_Y 275 -#define SPECIES_OLD_UNOWN_Z 276 - +#define SPECIES_UNOWN_B 202 +#define SPECIES_UNOWN_C 203 +#define SPECIES_UNOWN_D 204 +#define SPECIES_UNOWN_E 205 +#define SPECIES_UNOWN_F 206 +#define SPECIES_UNOWN_G 207 +#define SPECIES_UNOWN_H 208 +#define SPECIES_UNOWN_I 209 +#define SPECIES_UNOWN_J 210 +#define SPECIES_UNOWN_K 211 +#define SPECIES_UNOWN_L 212 +#define SPECIES_UNOWN_M 213 +#define SPECIES_UNOWN_N 214 +#define SPECIES_UNOWN_O 215 +#define SPECIES_UNOWN_P 216 +#define SPECIES_UNOWN_Q 217 +#define SPECIES_UNOWN_R 218 +#define SPECIES_UNOWN_S 219 +#define SPECIES_UNOWN_T 220 +#define SPECIES_UNOWN_U 221 +#define SPECIES_UNOWN_V 222 +#define SPECIES_UNOWN_W 223 +#define SPECIES_UNOWN_X 224 +#define SPECIES_UNOWN_Y 225 +#define SPECIES_UNOWN_Z 226 +#define SPECIES_WOBBUFFET 227 +#define SPECIES_GIRAFARIG 228 +#define SPECIES_PINECO 229 +#define SPECIES_FORRETRESS 230 +#define SPECIES_DUNSPARCE 231 +#define SPECIES_GLIGAR 232 +#define SPECIES_STEELIX 233 +#define SPECIES_SNUBBULL 234 +#define SPECIES_GRANBULL 235 +#define SPECIES_QWILFISH 236 +#define SPECIES_SCIZOR 237 +#define SPECIES_SHUCKLE 238 +#define SPECIES_HERACROSS 239 +#define SPECIES_SNEASEL 240 +#define SPECIES_TEDDIURSA 241 +#define SPECIES_URSARING 242 +#define SPECIES_SLUGMA 243 +#define SPECIES_MAGCARGO 244 +#define SPECIES_SWINUB 245 +#define SPECIES_PILOSWINE 246 +#define SPECIES_CORSOLA 247 +#define SPECIES_REMORAID 248 +#define SPECIES_OCTILLERY 249 +#define SPECIES_DELIBIRD 250 +#define SPECIES_MANTINE 251 +#define SPECIES_SKARMORY 252 +#define SPECIES_HOUNDOUR 253 +#define SPECIES_HOUNDOOM 254 +#define SPECIES_KINGDRA 255 +#define SPECIES_PHANPY 256 +#define SPECIES_DONPHAN 257 +#define SPECIES_PORYGON2 258 +#define SPECIES_STANTLER 259 +#define SPECIES_SMEARGLE 260 +#define SPECIES_TYROGUE 261 +#define SPECIES_HITMONTOP 262 +#define SPECIES_SMOOCHUM 263 +#define SPECIES_ELEKID 264 +#define SPECIES_MAGBY 265 +#define SPECIES_MILTANK 266 +#define SPECIES_BLISSEY 267 +#define SPECIES_RAIKOU 268 +#define SPECIES_ENTEI 269 +#define SPECIES_SUICUNE 270 +#define SPECIES_LARVITAR 271 +#define SPECIES_PUPITAR 272 +#define SPECIES_TYRANITAR 273 +#define SPECIES_LUGIA 274 +#define SPECIES_HO_OH 275 +#define SPECIES_CELEBI 276 #define SPECIES_TREECKO 277 #define SPECIES_GROVYLE 278 #define SPECIES_SCEPTILE 279 @@ -304,145 +302,128 @@ #define SPECIES_SEEDOT 298 #define SPECIES_NUZLEAF 299 #define SPECIES_SHIFTRY 300 -#define SPECIES_NINCADA 301 -#define SPECIES_NINJASK 302 -#define SPECIES_SHEDINJA 303 -#define SPECIES_TAILLOW 304 -#define SPECIES_SWELLOW 305 -#define SPECIES_SHROOMISH 306 -#define SPECIES_BRELOOM 307 -#define SPECIES_SPINDA 308 -#define SPECIES_WINGULL 309 -#define SPECIES_PELIPPER 310 -#define SPECIES_SURSKIT 311 -#define SPECIES_MASQUERAIN 312 -#define SPECIES_WAILMER 313 -#define SPECIES_WAILORD 314 -#define SPECIES_SKITTY 315 -#define SPECIES_DELCATTY 316 -#define SPECIES_KECLEON 317 -#define SPECIES_BALTOY 318 -#define SPECIES_CLAYDOL 319 -#define SPECIES_NOSEPASS 320 -#define SPECIES_TORKOAL 321 -#define SPECIES_SABLEYE 322 -#define SPECIES_BARBOACH 323 -#define SPECIES_WHISCASH 324 -#define SPECIES_LUVDISC 325 -#define SPECIES_CORPHISH 326 -#define SPECIES_CRAWDAUNT 327 -#define SPECIES_FEEBAS 328 -#define SPECIES_MILOTIC 329 -#define SPECIES_CARVANHA 330 -#define SPECIES_SHARPEDO 331 -#define SPECIES_TRAPINCH 332 -#define SPECIES_VIBRAVA 333 -#define SPECIES_FLYGON 334 -#define SPECIES_MAKUHITA 335 -#define SPECIES_HARIYAMA 336 -#define SPECIES_ELECTRIKE 337 -#define SPECIES_MANECTRIC 338 -#define SPECIES_NUMEL 339 -#define SPECIES_CAMERUPT 340 -#define SPECIES_SPHEAL 341 -#define SPECIES_SEALEO 342 -#define SPECIES_WALREIN 343 -#define SPECIES_CACNEA 344 -#define SPECIES_CACTURNE 345 -#define SPECIES_SNORUNT 346 -#define SPECIES_GLALIE 347 -#define SPECIES_LUNATONE 348 -#define SPECIES_SOLROCK 349 -#define SPECIES_AZURILL 350 -#define SPECIES_SPOINK 351 -#define SPECIES_GRUMPIG 352 -#define SPECIES_PLUSLE 353 -#define SPECIES_MINUN 354 -#define SPECIES_MAWILE 355 -#define SPECIES_MEDITITE 356 -#define SPECIES_MEDICHAM 357 +#define SPECIES_TAILLOW 301 +#define SPECIES_SWELLOW 302 +#define SPECIES_WINGULL 303 +#define SPECIES_PELIPPER 304 +#define SPECIES_RALTS 305 +#define SPECIES_KIRLIA 306 +#define SPECIES_GARDEVOIR 307 +#define SPECIES_SURSKIT 308 +#define SPECIES_MASQUERAIN 309 +#define SPECIES_SHROOMISH 310 +#define SPECIES_BRELOOM 311 +#define SPECIES_SLAKOTH 312 +#define SPECIES_VIGOROTH 313 +#define SPECIES_SLAKING 314 +#define SPECIES_NINCADA 315 +#define SPECIES_NINJASK 316 +#define SPECIES_SHEDINJA 317 +#define SPECIES_WHISMUR 318 +#define SPECIES_LOUDRED 319 +#define SPECIES_EXPLOUD 320 +#define SPECIES_MAKUHITA 321 +#define SPECIES_HARIYAMA 322 +#define SPECIES_AZURILL 323 +#define SPECIES_NOSEPASS 324 +#define SPECIES_SKITTY 325 +#define SPECIES_DELCATTY 326 +#define SPECIES_SABLEYE 327 +#define SPECIES_MAWILE 328 +#define SPECIES_ARON 329 +#define SPECIES_LAIRON 330 +#define SPECIES_AGGRON 331 +#define SPECIES_MEDITITE 332 +#define SPECIES_MEDICHAM 333 +#define SPECIES_ELECTRIKE 334 +#define SPECIES_MANECTRIC 335 +#define SPECIES_PLUSLE 336 +#define SPECIES_MINUN 337 +#define SPECIES_VOLBEAT 338 +#define SPECIES_ILLIMISE 339 +#define SPECIES_ROSELIA 340 +#define SPECIES_GULPIN 341 +#define SPECIES_SWALOT 342 +#define SPECIES_CARVANHA 343 +#define SPECIES_SHARPEDO 344 +#define SPECIES_WAILMER 345 +#define SPECIES_WAILORD 346 +#define SPECIES_NUMEL 347 +#define SPECIES_CAMERUPT 348 +#define SPECIES_TORKOAL 349 +#define SPECIES_SPOINK 350 +#define SPECIES_GRUMPIG 351 +#define SPECIES_SPINDA 352 +#define SPECIES_TRAPINCH 353 +#define SPECIES_VIBRAVA 354 +#define SPECIES_FLYGON 355 +#define SPECIES_CACNEA 356 +#define SPECIES_CACTURNE 357 #define SPECIES_SWABLU 358 #define SPECIES_ALTARIA 359 -#define SPECIES_WYNAUT 360 -#define SPECIES_DUSKULL 361 -#define SPECIES_DUSCLOPS 362 -#define SPECIES_ROSELIA 363 -#define SPECIES_SLAKOTH 364 -#define SPECIES_VIGOROTH 365 -#define SPECIES_SLAKING 366 -#define SPECIES_GULPIN 367 -#define SPECIES_SWALOT 368 -#define SPECIES_TROPIUS 369 -#define SPECIES_WHISMUR 370 -#define SPECIES_LOUDRED 371 -#define SPECIES_EXPLOUD 372 -#define SPECIES_CLAMPERL 373 -#define SPECIES_HUNTAIL 374 -#define SPECIES_GOREBYSS 375 -#define SPECIES_ABSOL 376 -#define SPECIES_SHUPPET 377 -#define SPECIES_BANETTE 378 -#define SPECIES_SEVIPER 379 -#define SPECIES_ZANGOOSE 380 -#define SPECIES_RELICANTH 381 -#define SPECIES_ARON 382 -#define SPECIES_LAIRON 383 -#define SPECIES_AGGRON 384 -#define SPECIES_CASTFORM 385 -#define SPECIES_VOLBEAT 386 -#define SPECIES_ILLUMISE 387 -#define SPECIES_LILEEP 388 -#define SPECIES_CRADILY 389 -#define SPECIES_ANORITH 390 -#define SPECIES_ARMALDO 391 -#define SPECIES_RALTS 392 -#define SPECIES_KIRLIA 393 -#define SPECIES_GARDEVOIR 394 -#define SPECIES_BAGON 395 -#define SPECIES_SHELGON 396 -#define SPECIES_SALAMENCE 397 -#define SPECIES_BELDUM 398 -#define SPECIES_METANG 399 -#define SPECIES_METAGROSS 400 -#define SPECIES_REGIROCK 401 -#define SPECIES_REGICE 402 -#define SPECIES_REGISTEEL 403 -#define SPECIES_KYOGRE 404 -#define SPECIES_GROUDON 405 -#define SPECIES_RAYQUAZA 406 -#define SPECIES_LATIAS 407 -#define SPECIES_LATIOS 408 -#define SPECIES_JIRACHI 409 -#define SPECIES_DEOXYS 410 -#define SPECIES_CHIMECHO 411 -#define SPECIES_EGG 412 - -#define SPECIES_UNOWN_B 413 -#define SPECIES_UNOWN_C 414 -#define SPECIES_UNOWN_D 415 -#define SPECIES_UNOWN_E 416 -#define SPECIES_UNOWN_F 417 -#define SPECIES_UNOWN_G 418 -#define SPECIES_UNOWN_H 419 -#define SPECIES_UNOWN_I 420 -#define SPECIES_UNOWN_J 421 -#define SPECIES_UNOWN_K 422 -#define SPECIES_UNOWN_L 423 -#define SPECIES_UNOWN_M 424 -#define SPECIES_UNOWN_N 425 -#define SPECIES_UNOWN_O 426 -#define SPECIES_UNOWN_P 427 -#define SPECIES_UNOWN_Q 428 -#define SPECIES_UNOWN_R 429 -#define SPECIES_UNOWN_S 430 -#define SPECIES_UNOWN_T 431 -#define SPECIES_UNOWN_U 432 -#define SPECIES_UNOWN_V 433 -#define SPECIES_UNOWN_W 434 -#define SPECIES_UNOWN_X 435 -#define SPECIES_UNOWN_Y 436 -#define SPECIES_UNOWN_Z 437 -#define SPECIES_UNOWN_EMARK 438 -#define SPECIES_UNOWN_QMARK 439 +#define SPECIES_ZANGOOSE 360 +#define SPECIES_SEVIPER 361 +#define SPECIES_LUNATONE 362 +#define SPECIES_SOLROCK 363 +#define SPECIES_BARBOACH 364 +#define SPECIES_WHISCASH 365 +#define SPECIES_CORPHISH 366 +#define SPECIES_CRAWDAUNT 367 +#define SPECIES_BALTOY 368 +#define SPECIES_CLAYDOL 369 +#define SPECIES_LILEEP 370 +#define SPECIES_CRADILY 371 +#define SPECIES_ANORITH 372 +#define SPECIES_ARMALDO 373 +#define SPECIES_FEEBAS 374 +#define SPECIES_MILOTIC 375 +#define SPECIES_CASTFORM 376 +#define SPECIES_CASTFORM_SNOWY 377 +#define SPECIES_CASTFORM_SUNNY 378 +#define SPECIES_CASTFORM_RAINY 379 +#define SPECIES_KECLEON 380 +#define SPECIES_SHUPPET 381 +#define SPECIES_BANETTE 382 +#define SPECIES_DUSKULL 383 +#define SPECIES_DUSCLOPS 384 +#define SPECIES_TROPIUS 385 +#define SPECIES_CHIMECHO 386 +#define SPECIES_ABSOL 387 +#define SPECIES_WYNAUT 388 +#define SPECIES_SNORUNT 389 +#define SPECIES_GLALIE 390 +#define SPECIES_SPHEAL 391 +#define SPECIES_SEALEO 392 +#define SPECIES_WALREIN 393 +#define SPECIES_CLAMPERL 394 +#define SPECIES_HUNTAIL 395 +#define SPECIES_GOREBYSS 396 +#define SPECIES_RELICANTH 397 +#define SPECIES_LUVDISC 398 +#define SPECIES_BAGON 399 +#define SPECIES_SHELGON 400 +#define SPECIES_SALAMENCE 401 +#define SPECIES_BELDUM 402 +#define SPECIES_METANG 403 +#define SPECIES_METAGROSS 404 +#define SPECIES_REGIROCK 405 +#define SPECIES_REGICE 406 +#define SPECIES_REGISTEEL 407 +#define SPECIES_LATIAS 408 +#define SPECIES_LATIOS 409 +#define SPECIES_KYOGRE 410 +#define SPECIES_GROUDON 411 +#define SPECIES_RAYQUAZA 412 +#define SPECIES_JIRACHI 413 +#define SPECIES_DEOXYS_NORMAL 414 +#define SPECIES_UNOWN_EMARK 415 +#define SPECIES_UNOWN_QMARK 416 +#define SPECIES_DEOXYS_ATTACK 417 +#define SPECIES_DEOXYS_DEFENSE 418 +#define SPECIES_DEOXYS_SPEED 419 +#define SPECIES_MUNCHLAX 420 +#define SPECIES_DECOY 421 +#define SPECIES_STATUE 422 +#define SPECIES_RAYQUAZA_CUTSCENE 423 #endif // GUARD_CONSTANTS_SPECIES_H -- cgit v1.2.3 From 9d383609e21adfc35004cdf87f9231039c701b23 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 1 Nov 2020 23:23:32 -0600 Subject: some splitting and sync'ing declarations/vars --- include/save.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/save.h b/include/save.h index 6d0f568..c4d8ca6 100644 --- a/include/save.h +++ b/include/save.h @@ -7,17 +7,17 @@ struct unkTimeStruct }; struct UnkStruct_203B184 { - /* 0x0 */ u32 unk0; - /* 0x4 */ u32 unk4; - /* 0x8 */ u32 unk8; - /* 0xC */ u32 unkC; - /* 0x10 */ u32 unk10; - /* 0x14 */ u32 unk14; + /* 0x0 */ u32 *unk0; + /* 0x4 */ u32 *unk4; + /* 0x8 */ u32 *unk8; + /* 0xC */ u32 *unkC; + /* 0x10 */ u32 *unk10; + /* 0x14 */ u32 *unk14; /* 0x18 */ u32 unk18; /* 0x1C */ u32 unk1C; /* 0x20 */ u32 unk20; - /* 0x24 */ u32 unk24; - /* 0x28 */ u32 unk28; + /* 0x24 */ u8 *unk24; + /* 0x28 */ u32 *unk28; /* 0x2C */ u32 unk2C; /* 0x30 */ struct unkTimeStruct *unk30; u32 unk34; -- cgit v1.2.3 From 713221ad1f268814f599ec90c103094ce6d307ef Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 7 Nov 2020 17:50:29 -0600 Subject: forgot to fix the type on this struct --- include/save.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/save.h b/include/save.h index c4d8ca6..f507acc 100644 --- a/include/save.h +++ b/include/save.h @@ -17,7 +17,7 @@ struct UnkStruct_203B184 { /* 0x1C */ u32 unk1C; /* 0x20 */ u32 unk20; /* 0x24 */ u8 *unk24; - /* 0x28 */ u32 *unk28; + /* 0x28 */ u8 *unk28; /* 0x2C */ u32 unk2C; /* 0x30 */ struct unkTimeStruct *unk30; u32 unk34; -- cgit v1.2.3 From 6e33dcb93724d51d7f3db1eac0adbfb3cb4f4128 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 17 Nov 2020 22:20:28 -0600 Subject: more work on music functions --- include/m4a.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 include/m4a.h (limited to 'include') diff --git a/include/m4a.h b/include/m4a.h new file mode 100644 index 0000000..17b8605 --- /dev/null +++ b/include/m4a.h @@ -0,0 +1,25 @@ +#ifndef GUARD_M4A_H +#define GUARD_M4A_H + +#include "gba/m4a_internal.h" + +void m4aSoundVSyncOn(void); +void m4aSoundVSyncOff(void); + +void m4aSoundInit(void); +void m4aSoundMain(void); +void m4aSongNumStart(u16 n); +void m4aSongNumStartOrChange(u16 n); +void m4aSongNumStop(u16 n); +void m4aMPlayAllStop(void); +void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo); +void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed); +void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed); +void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed); +void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo); +void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo); + +extern struct MusicPlayerInfo gUnknown_20008F0; // BGM?? + + +#endif //GUARD_M4A_H -- cgit v1.2.3 From 578522b3d344866c38e6e2e01e6b26ba6a5c0107 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 18 Nov 2020 00:44:35 -0600 Subject: match another function and fix nonmatching --- include/m4a.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/m4a.h b/include/m4a.h index 17b8605..fb05110 100644 --- a/include/m4a.h +++ b/include/m4a.h @@ -18,6 +18,7 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed); void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed); void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo); void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo); +void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume); extern struct MusicPlayerInfo gUnknown_20008F0; // BGM?? -- cgit v1.2.3 From 5f8105180b15f04d48c72df2953d267c87d6148c Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 19 Nov 2020 11:27:18 -0600 Subject: combining and doc'ing of playtime things --- include/save.h | 4 ++-- include/time.h | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 include/time.h (limited to 'include') diff --git a/include/save.h b/include/save.h index f507acc..37309cf 100644 --- a/include/save.h +++ b/include/save.h @@ -9,8 +9,8 @@ struct unkTimeStruct struct UnkStruct_203B184 { /* 0x0 */ u32 *unk0; /* 0x4 */ u32 *unk4; - /* 0x8 */ u32 *unk8; - /* 0xC */ u32 *unkC; + /* 0x8 */ u8 *unk8; + /* 0xC */ u8 *unkC; /* 0x10 */ u32 *unk10; /* 0x14 */ u32 *unk14; /* 0x18 */ u32 unk18; diff --git a/include/time.h b/include/time.h new file mode 100644 index 0000000..b052ea1 --- /dev/null +++ b/include/time.h @@ -0,0 +1,19 @@ +#ifndef TIME_H +#define TIME_H + +struct PlayTimeStruct +{ + s16 unk0; + u8 hours; + u8 minutes; + u8 seconds; +}; + +void sub_8094FB4(struct PlayTimeStruct *Time); +void ResetPlayTime(struct PlayTimeStruct *Time); +struct PlayTimeStruct *sub_8094FA0(void); +void sub_8094F88(void); + + +#endif // TIME_H + -- cgit v1.2.3 From cbfab08a06d7f9deca21b510b1bbdb80c05ea662 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 20 Nov 2020 10:33:21 -0600 Subject: finish docing PlayTime and fix function - Kermalis --- include/time.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/time.h b/include/time.h index b052ea1..9aeb28d 100644 --- a/include/time.h +++ b/include/time.h @@ -3,15 +3,16 @@ struct PlayTimeStruct { - s16 unk0; - u8 hours; + s16 hours; u8 minutes; u8 seconds; + u8 frames; }; -void sub_8094FB4(struct PlayTimeStruct *Time); +void IncrementPlayTime(struct PlayTimeStruct *Time); void ResetPlayTime(struct PlayTimeStruct *Time); struct PlayTimeStruct *sub_8094FA0(void); +void DeconstructPlayTime(struct PlayTimeStruct *r0, u32 *outHours, u32 *outMinutes, u32 *outSeconds); void sub_8094F88(void); -- cgit v1.2.3 From 2582d7a8680e32493403d484c1990e1a63fb2015 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 23 Nov 2020 15:22:16 -0600 Subject: isemi-identified VRAM and split personality test funcs --- include/dungeon.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/dungeon.h b/include/dungeon.h index 96cc579..faf58e5 100644 --- a/include/dungeon.h +++ b/include/dungeon.h @@ -27,5 +27,6 @@ struct Dungeon extern struct Dungeon gDungeons[]; extern struct DungeonName gDungeonNames[]; +const u8 *GetDungeonName1(u8 dungeon); #endif //GUARD_DUNGEON_H -- cgit v1.2.3