finish decompiling pokedex
This commit is contained in:
-5073
File diff suppressed because it is too large
Load Diff
+6
-4
@@ -171,6 +171,8 @@ struct Time
|
|||||||
/*0x04*/ s8 seconds;
|
/*0x04*/ s8 seconds;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define DEX_FLAGS_NO ((POKEMON_SLOTS_NUMBER / 8) + ((POKEMON_SLOTS_NUMBER % 8) ? 1 : 0))
|
||||||
|
|
||||||
struct Pokedex
|
struct Pokedex
|
||||||
{
|
{
|
||||||
/*0x00*/ u8 order;
|
/*0x00*/ u8 order;
|
||||||
@@ -180,8 +182,8 @@ struct Pokedex
|
|||||||
/*0x04*/ u32 unownPersonality; // set when you first see Unown
|
/*0x04*/ u32 unownPersonality; // set when you first see Unown
|
||||||
/*0x08*/ u32 spindaPersonality; // set when you first see Spinda
|
/*0x08*/ u32 spindaPersonality; // set when you first see Spinda
|
||||||
/*0x0C*/ u32 unknown3;
|
/*0x0C*/ u32 unknown3;
|
||||||
/*0x10*/ u8 owned[52];
|
/*0x10*/ u8 owned[DEX_FLAGS_NO];
|
||||||
/*0x44*/ u8 seen[52];
|
/*0x44*/ u8 seen[DEX_FLAGS_NO];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct PokemonJumpResults // possibly used in the game itself?
|
struct PokemonJumpResults // possibly used in the game itself?
|
||||||
@@ -657,7 +659,7 @@ struct SaveBlock1
|
|||||||
/*0x690*/ struct ItemSlot bagPocket_TMHM[64];
|
/*0x690*/ struct ItemSlot bagPocket_TMHM[64];
|
||||||
/*0x790*/ struct ItemSlot bagPocket_Berries[46];
|
/*0x790*/ struct ItemSlot bagPocket_Berries[46];
|
||||||
/*0x848*/ struct Pokeblock pokeblocks[POKEBLOCKS_COUNT];
|
/*0x848*/ struct Pokeblock pokeblocks[POKEBLOCKS_COUNT];
|
||||||
/*0x988*/ u8 seen1[52];
|
/*0x988*/ u8 seen1[DEX_FLAGS_NO];
|
||||||
/*0x9BC*/ u16 berryBlenderRecords[3];
|
/*0x9BC*/ u16 berryBlenderRecords[3];
|
||||||
/*0x9C2*/ u8 field_9C2[6];
|
/*0x9C2*/ u8 field_9C2[6];
|
||||||
/*0x9C8*/ u16 trainerRematchStepCounter;
|
/*0x9C8*/ u16 trainerRematchStepCounter;
|
||||||
@@ -713,7 +715,7 @@ struct SaveBlock1
|
|||||||
/*0x322C*/ u8 field_322C[1276];
|
/*0x322C*/ u8 field_322C[1276];
|
||||||
/*0x3728*/ struct RamScript ramScript;
|
/*0x3728*/ struct RamScript ramScript;
|
||||||
/*0x3B14*/ struct RecordMixingGift recordMixingGift;
|
/*0x3B14*/ struct RecordMixingGift recordMixingGift;
|
||||||
/*0x3B24*/ u8 seen2[52];
|
/*0x3B24*/ u8 seen2[DEX_FLAGS_NO];
|
||||||
/*0x3B58*/ LilycoveLady lilycoveLady;
|
/*0x3B58*/ LilycoveLady lilycoveLady;
|
||||||
/*0x3B88*/ u8 filler_3B88[0x10];
|
/*0x3B88*/ u8 filler_3B88[0x10];
|
||||||
/*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20];
|
/*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20];
|
||||||
|
|||||||
@@ -2667,6 +2667,11 @@ extern const u8 gUnknown_08DC3198[];
|
|||||||
extern const u8 gUnknown_08DC2E6C[];
|
extern const u8 gUnknown_08DC2E6C[];
|
||||||
extern const u8 gUnknown_08DC2F5C[];
|
extern const u8 gUnknown_08DC2F5C[];
|
||||||
extern const u8 gUnknown_08DC2FEC[];
|
extern const u8 gUnknown_08DC2FEC[];
|
||||||
|
extern const u16 gPokedexCaughtScreenFade_Pal[];
|
||||||
|
extern const u8 gPokedexSearchMenu_Gfx[];
|
||||||
|
extern const u8 gPokedexSearch2_Tilemap[];
|
||||||
|
extern const u8 gPokedexSearch1_Tilemap[];
|
||||||
|
extern const u16 gPokedexSearchMenu_Pal[];
|
||||||
|
|
||||||
// berry tag screen
|
// berry tag screen
|
||||||
extern const u8 gUnknown_08D9BB44[];
|
extern const u8 gUnknown_08D9BB44[];
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define GUARD_POKEDEX_H
|
#define GUARD_POKEDEX_H
|
||||||
|
|
||||||
void ResetPokedex(void);
|
void ResetPokedex(void);
|
||||||
void CopyMonCategoryText(u16 species, u8 *dst);
|
void CopyMonCategoryText(u32 species, u8 *dst);
|
||||||
u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
|
u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
|
||||||
u16 GetNationalPokedexCount(u8);
|
u16 GetNationalPokedexCount(u8);
|
||||||
u16 GetHoennPokedexCount(u8);
|
u16 GetHoennPokedexCount(u8);
|
||||||
|
|||||||
@@ -370,6 +370,18 @@ extern const u8 gText_CantBeUsedOnPkmn[];
|
|||||||
|
|
||||||
extern const u8 gText_CryOf[];
|
extern const u8 gText_CryOf[];
|
||||||
extern const u8 gText_SizeComparedTo[];
|
extern const u8 gText_SizeComparedTo[];
|
||||||
|
extern const u8 gText_PokedexRegistration[];
|
||||||
|
extern const u8 gText_UnkCtrlF908Clear01[];
|
||||||
|
extern const u8 sText_TenDashes2[];
|
||||||
|
extern const u8 gText_5MarksPokemon[];
|
||||||
|
extern const u8 gText_UnkHeight[];
|
||||||
|
extern const u8 gText_UnkWeight[];
|
||||||
|
extern const u8 gText_HTHeight[];
|
||||||
|
extern const u8 gText_WTWeight[];
|
||||||
|
extern const u8 gText_SearchingPleaseWait[];
|
||||||
|
extern const u8 gText_SearchCompleted[];
|
||||||
|
extern const u8 gUnknown_085E8785[];
|
||||||
|
extern const u8 gText_SelectorArrow[];
|
||||||
|
|
||||||
//birch dex rating text
|
//birch dex rating text
|
||||||
extern const u8 gBirchDexRatingText_LessThan10[];
|
extern const u8 gBirchDexRatingText_LessThan10[];
|
||||||
|
|||||||
@@ -125,7 +125,6 @@ SECTIONS {
|
|||||||
src/scanline_effect.o(.text);
|
src/scanline_effect.o(.text);
|
||||||
src/option_menu.o(.text);
|
src/option_menu.o(.text);
|
||||||
src/pokedex.o(.text);
|
src/pokedex.o(.text);
|
||||||
asm/pokedex.o(.text);
|
|
||||||
asm/trainer_card.o(.text);
|
asm/trainer_card.o(.text);
|
||||||
src/pokemon_storage_system.o(.text);
|
src/pokemon_storage_system.o(.text);
|
||||||
asm/pokemon_storage_system.o(.text);
|
asm/pokemon_storage_system.o(.text);
|
||||||
|
|||||||
+2725
-568
File diff suppressed because it is too large
Load Diff
+1
-11
@@ -306,17 +306,7 @@ gFieldEffectArguments: @ 2038C08
|
|||||||
|
|
||||||
.align 2
|
.align 2
|
||||||
|
|
||||||
gUnknown_02039B4C: @ 2039B4C
|
.include "src/pokedex.o"
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_02039B50: @ 2039B50
|
|
||||||
.space 0x2
|
|
||||||
|
|
||||||
gUnknown_02039B52: @ 2039B52
|
|
||||||
.space 0x2
|
|
||||||
|
|
||||||
gUnknown_02039B54: @ 2039B54
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_02039B58: @ 2039B58
|
gUnknown_02039B58: @ 2039B58
|
||||||
.space 0x14
|
.space 0x14
|
||||||
|
|||||||
Reference in New Issue
Block a user