summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h35
-rw-r--r--include/global.h42
-rw-r--r--include/items.h315
-rw-r--r--include/new_game.h8
-rw-r--r--include/pokemon.h2
-rw-r--r--include/rom4.h10
-rw-r--r--include/species.h2
-rw-r--r--include/vars.h25
8 files changed, 397 insertions, 42 deletions
diff --git a/include/battle.h b/include/battle.h
index 14cbb3a1b..d58b234e3 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -32,4 +32,39 @@ struct Trainer
/*0x24*/ void *party;
};
+struct AI_ThinkingStruct /* 0x2016800 */
+{
+/* 0x00 */ u8 unk0;
+/* 0x01 */ u8 moveConsidered;
+/* 0x02 */ u16 unk2;
+/* 0x04 */ s8 score[4]; // score?
+/* 0x08 */ u32 unk8;
+/* 0x0C */ u32 aiFlags;
+/* 0x10 */ u8 unk10;
+/* 0x11 */ u8 aiLogicId;
+/* 0x12 */ u8 filler12[6];
+/* 0x18 */ u8 unk18[4];
+};
+
+struct SmallBattleStruct1
+{
+ u8 unk1;
+ u8 unk2;
+ u8 unk3;
+ u8 unk4;
+};
+
+struct BattleStruct /* 0x2000000 */
+{
+ u8 filler0[0x1601C];
+ struct SmallBattleStruct1 unk;
+ u8 filler1[0xAB]; // 0x2016020
+ /* 0x160CB */ u8 linkPlayerIndex;
+ u8 filler2[0x734];
+ struct AI_ThinkingStruct ai;
+};
+
+extern struct BattleStruct battle_2000000;
+extern struct AI_ThinkingStruct gAIThinkingSpace;
+
#endif // GUARD_BATTLE_H
diff --git a/include/global.h b/include/global.h
index 30f935521..a5932d175 100644
--- a/include/global.h
+++ b/include/global.h
@@ -28,9 +28,9 @@ enum
};
enum LanguageId {
- LANGUAGE_JAPANESE = 1,
- LANGUAGE_ENGLISH = 2,
- LANGUAGE_GERMAN = 5,
+ LANGUAGE_JAPANESE = 1,
+ LANGUAGE_ENGLISH = 2,
+ LANGUAGE_GERMAN = 5,
};
#define GAME_LANGUAGE (LANGUAGE_ENGLISH)
@@ -359,10 +359,10 @@ extern struct SaveBlock1 gSaveBlock1;
struct Time
{
- /* 0x00 */ s16 days;
- /* 0x02 */ s8 hours;
- /* 0x03 */ s8 minutes;
- /* 0x04 */ s8 seconds;
+ /*0x00*/ s16 days;
+ /*0x02*/ s8 hours;
+ /*0x03*/ s8 minutes;
+ /*0x04*/ s8 seconds;
};
struct Pokedex
@@ -380,10 +380,10 @@ struct Pokedex
struct SaveBlock2_Sub
{
- /*0x0000, 0x00A8*/ u8 filler_000[0x4C8];
- /*0x04C8, 0x0570*/ u16 var_4C8;
- /*0x04CA, 0x0572*/ u16 var_4CA;
- /*0x04CC, 0x0574*/ u8 filler_4CC[0x31C];
+ /*0x0000, 0x00A8*/ u8 filler_000[0x4C8];
+ /*0x04C8, 0x0570*/ u16 var_4C8;
+ /*0x04CA, 0x0572*/ u16 var_4CA;
+ /*0x04CC, 0x0574*/ u8 filler_4CC[0x31C];
};
struct SaveBlock2 /* 0x02024EA4 */
@@ -397,7 +397,7 @@ struct SaveBlock2 /* 0x02024EA4 */
/*0x11*/ u8 playTimeSeconds;
/*0x12*/ u8 playTimeVBlanks;
/*0x13*/ u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A]
- u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST]
+ /*0x14*/ u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST]
u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes
u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO]
u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET]
@@ -412,19 +412,19 @@ struct SaveBlock2 /* 0x02024EA4 */
struct UnkStruct_8054FF8_Substruct
{
- s16 x;
- s16 y;
- u8 field_8;
+ s16 x;
+ s16 y;
+ u8 field_8;
};
struct UnkStruct_8054FF8
{
- u8 a;
- u8 b;
- u8 c;
- u8 d;
- struct UnkStruct_8054FF8_Substruct sub;
- u16 field_C;
+ u8 a;
+ u8 b;
+ u8 c;
+ u8 d;
+ struct UnkStruct_8054FF8_Substruct sub;
+ u16 field_C;
};
extern struct SaveBlock2 gSaveBlock2;
diff --git a/include/items.h b/include/items.h
new file mode 100644
index 000000000..8f6dceb6a
--- /dev/null
+++ b/include/items.h
@@ -0,0 +1,315 @@
+#ifndef GUARD_ITEMS_H
+#define GUARD_ITEMS_H
+
+#define ITEM_NONE 0x000
+#define ITEM_MASTER_BALL 0x001
+#define ITEM_ULTRA_BALL 0x002
+#define ITEM_GREAT_BALL 0x003
+#define ITEM_POKE_BALL 0x004
+#define ITEM_SAFARI_BALL 0x005
+#define ITEM_NET_BALL 0x006
+#define ITEM_DIVE_BALL 0x007
+#define ITEM_NEST_BALL 0x008
+#define ITEM_REPEAT_BALL 0x009
+#define ITEM_TIMER_BALL 0x00a
+#define ITEM_LUXURY_BALL 0x00b
+#define ITEM_PREMIER_BALL 0x00c
+#define ITEM_POTION 0x00d
+#define ITEM_ANTIDOTE 0x00e
+#define ITEM_BURN_HEAL 0x00f
+#define ITEM_ICE_HEAL 0x010
+#define ITEM_AWAKENING 0x011
+#define ITEM_PARALYZE_HEAL 0x012
+#define ITEM_FULL_RESTORE 0x013
+#define ITEM_MAX_POTION 0x014
+#define ITEM_HYPER_POTION 0x015
+#define ITEM_SUPER_POTION 0x016
+#define ITEM_FULL_HEAL 0x017
+#define ITEM_REVIVE 0x018
+#define ITEM_MAX_REVIVE 0x019
+#define ITEM_FRESH_WATER 0x01a
+#define ITEM_SODA_POP 0x01b
+#define ITEM_LEMONADE 0x01c
+#define ITEM_MOOMOO_MILK 0x01d
+#define ITEM_ENERGY_POWDER 0x01e
+#define ITEM_ENERGY_ROOT 0x01f
+#define ITEM_HEAL_POWDER 0x020
+#define ITEM_REVIVAL_HERB 0x021
+#define ITEM_ETHER 0x022
+#define ITEM_MAX_ETHER 0x023
+#define ITEM_ELIXIR 0x024
+#define ITEM_MAX_ELIXIR 0x025
+#define ITEM_LAVA_COOKIE 0x026
+#define ITEM_BLUE_FLUTE 0x027
+#define ITEM_YELLOW_FLUTE 0x028
+#define ITEM_RED_FLUTE 0x029
+#define ITEM_BLACK_FLUTE 0x02a
+#define ITEM_WHITE_FLUTE 0x02b
+#define ITEM_BERRY_JUICE 0x02c
+#define ITEM_SACRED_ASH 0x02d
+#define ITEM_SHOAL_SALT 0x02e
+#define ITEM_SHOAL_SHELL 0x02f
+#define ITEM_RED_SHARD 0x030
+#define ITEM_BLUE_SHARD 0x031
+#define ITEM_YELLOW_SHARD 0x032
+#define ITEM_GREEN_SHARD 0x033
+#define ITEM_HP_UP 0x03f
+#define ITEM_PROTEIN 0x040
+#define ITEM_IRON 0x041
+#define ITEM_CARBOS 0x042
+#define ITEM_CALCIUM 0x043
+#define ITEM_RARE_CANDY 0x044
+#define ITEM_PP_UP 0x045
+#define ITEM_ZINC 0x046
+#define ITEM_PP_MAX 0x047
+#define ITEM_GUARD_SPEC 0x049
+#define ITEM_DIRE_HIT 0x04a
+#define ITEM_X_ATTACK 0x04b
+#define ITEM_X_DEFEND 0x04c
+#define ITEM_X_SPEED 0x04d
+#define ITEM_X_ACCURACY 0x04e
+#define ITEM_X_SPECIAL 0x04f
+#define ITEM_POKE_DOLL 0x050
+#define ITEM_FLUFFY_TAIL 0x051
+#define ITEM_SUPER_REPEL 0x053
+#define ITEM_MAX_REPEL 0x054
+#define ITEM_ESCAPE_ROPE 0x055
+#define ITEM_REPEL 0x056
+#define ITEM_SUN_STONE 0x05d
+#define ITEM_MOON_STONE 0x05e
+#define ITEM_FIRE_STONE 0x05f
+#define ITEM_THUNDER_STONE 0x060
+#define ITEM_WATER_STONE 0x061
+#define ITEM_LEAF_STONE 0x062
+#define ITEM_TINY_MUSHROOM 0x067
+#define ITEM_BIG_MUSHROOM 0x068
+#define ITEM_PEARL 0x06a
+#define ITEM_BIG_PEARL 0x06b
+#define ITEM_STARDUST 0x06c
+#define ITEM_STAR_PIECE 0x06d
+#define ITEM_NUGGET 0x06e
+#define ITEM_HEART_SCALE 0x06f
+#define ITEM_ORANGE_MAIL 0x079
+#define ITEM_HARBOR_MAIL 0x07a
+#define ITEM_GLITTER_MAIL 0x07b
+#define ITEM_MECH_MAIL 0x07c
+#define ITEM_WOOD_MAIL 0x07d
+#define ITEM_WAVE_MAIL 0x07e
+#define ITEM_BEAD_MAIL 0x07f
+#define ITEM_SHADOW_MAIL 0x080
+#define ITEM_TROPIC_MAIL 0x081
+#define ITEM_DREAM_MAIL 0x082
+#define ITEM_FAB_MAIL 0x083
+#define ITEM_RETRO_MAIL 0x084
+#define ITEM_CHERI_BERRY 0x085
+#define ITEM_CHESTO_BERRY 0x086
+#define ITEM_PECHA_BERRY 0x087
+#define ITEM_RAWST_BERRY 0x088
+#define ITEM_ASPEAR_BERRY 0x089
+#define ITEM_LEPPA_BERRY 0x08a
+#define ITEM_ORAN_BERRY 0x08b
+#define ITEM_PERSIM_BERRY 0x08c
+#define ITEM_LUM_BERRY 0x08d
+#define ITEM_SITRUS_BERRY 0x08e
+#define ITEM_FIGY_BERRY 0x08f
+#define ITEM_WIKI_BERRY 0x090
+#define ITEM_MAGO_BERRY 0x091
+#define ITEM_AGUAV_BERRY 0x092
+#define ITEM_IAPAPA_BERRY 0x093
+#define ITEM_RAZZ_BERRY 0x094
+#define ITEM_BLUK_BERRY 0x095
+#define ITEM_NANAB_BERRY 0x096
+#define ITEM_WEPEAR_BERRY 0x097
+#define ITEM_PINAP_BERRY 0x098
+#define ITEM_POMEG_BERRY 0x099
+#define ITEM_KELPSY_BERRY 0x09a
+#define ITEM_QUALOT_BERRY 0x09b
+#define ITEM_HONDEW_BERRY 0x09c
+#define ITEM_GREPA_BERRY 0x09d
+#define ITEM_TAMATO_BERRY 0x09e
+#define ITEM_CORNN_BERRY 0x09f
+#define ITEM_MAGOST_BERRY 0x0a0
+#define ITEM_RABUTA_BERRY 0x0a1
+#define ITEM_NOMEL_BERRY 0x0a2
+#define ITEM_SPELON_BERRY 0x0a3
+#define ITEM_PAMTRE_BERRY 0x0a4
+#define ITEM_WATMEL_BERRY 0x0a5
+#define ITEM_DURIN_BERRY 0x0a6
+#define ITEM_BELUE_BERRY 0x0a7
+#define ITEM_LIECHI_BERRY 0x0a8
+#define ITEM_GANLON_BERRY 0x0a9
+#define ITEM_SALAC_BERRY 0x0aa
+#define ITEM_PETAYA_BERRY 0x0ab
+#define ITEM_APICOT_BERRY 0x0ac
+#define ITEM_LANSAT_BERRY 0x0ad
+#define ITEM_STARF_BERRY 0x0ae
+#define ITEM_ENIGMA_BERRY 0x0af
+#define ITEM_BRIGHT_POWDER 0x0b3
+#define ITEM_WHITE_HERB 0x0b4
+#define ITEM_MACHO_BRACE 0x0b5
+#define ITEM_EXP_SHARE 0x0b6
+#define ITEM_QUICK_CLAW 0x0b7
+#define ITEM_SOOTHE_BELL 0x0b8
+#define ITEM_MENTAL_HERB 0x0b9
+#define ITEM_CHOICE_BAND 0x0ba
+#define ITEM_KINGS_ROCK 0x0bb
+#define ITEM_SILVER_POWDER 0x0bc
+#define ITEM_AMULET_COIN 0x0bd
+#define ITEM_CLEANSE_TAG 0x0be
+#define ITEM_SOUL_DEW 0x0bf
+#define ITEM_DEEP_SEA_TOOTH 0x0c0
+#define ITEM_DEEP_SEA_SCALE 0x0c1
+#define ITEM_SMOKE_BALL 0x0c2
+#define ITEM_EVERSTONE 0x0c3
+#define ITEM_FOCUS_BAND 0x0c4
+#define ITEM_LUCKY_EGG 0x0c5
+#define ITEM_SCOPE_LENS 0x0c6
+#define ITEM_METAL_COAT 0x0c7
+#define ITEM_LEFTOVERS 0x0c8
+#define ITEM_DRAGON_SCALE 0x0c9
+#define ITEM_LIGHT_BALL 0x0ca
+#define ITEM_SOFT_SAND 0x0cb
+#define ITEM_HARD_STONE 0x0cc
+#define ITEM_MIRACLE_SEED 0x0cd
+#define ITEM_BLACK_GLASSES 0x0ce
+#define ITEM_BLACK_BELT 0x0cf
+#define ITEM_MAGNET 0x0d0
+#define ITEM_MYSTIC_WATER 0x0d1
+#define ITEM_SHARP_BEAK 0x0d2
+#define ITEM_POISON_BARB 0x0d3
+#define ITEM_NEVER_MELT_ICE 0x0d4
+#define ITEM_SPELL_TAG 0x0d5
+#define ITEM_TWISTED_SPOON 0x0d6
+#define ITEM_CHARCOAL 0x0d7
+#define ITEM_DRAGON_FANG 0x0d8
+#define ITEM_SILK_SCARF 0x0d9
+#define ITEM_UP_GRADE 0x0da
+#define ITEM_SHELL_BELL 0x0db
+#define ITEM_SEA_INCENSE 0x0dc
+#define ITEM_LAX_INCENSE 0x0dd
+#define ITEM_LUCKY_PUNCH 0x0de
+#define ITEM_METAL_POWDER 0x0df
+#define ITEM_THICK_CLUB 0x0e0
+#define ITEM_STICK 0x0e1
+#define ITEM_RED_SCARF 0x0fe
+#define ITEM_BLUE_SCARF 0x0ff
+#define ITEM_PINK_SCARF 0x100
+#define ITEM_GREEN_SCARF 0x101
+#define ITEM_YELLOW_SCARF 0x102
+#define ITEM_MACH_BIKE 0x103
+#define ITEM_COIN_CASE 0x104
+#define ITEM_ITEMFINDER 0x105
+#define ITEM_OLD_ROD 0x106
+#define ITEM_GOOD_ROD 0x107
+#define ITEM_SUPER_ROD 0x108
+#define ITEM_SS_TICKET 0x109
+#define ITEM_CONTEST_PASS 0x10a
+#define ITEM_WAILMER_PAIL 0x10c
+#define ITEM_DEVON_GOODS 0x10d
+#define ITEM_SOOT_SACK 0x10e
+#define ITEM_BASEMENT_KEY 0x10f
+#define ITEM_ACRO_BIKE 0x110
+#define ITEM_POKEBLOCK_CASE 0x111
+#define ITEM_LETTER 0x112
+#define ITEM_EON_TICKET 0x113
+#define ITEM_RED_ORB 0x114
+#define ITEM_BLUE_ORB 0x115
+#define ITEM_SCANNER 0x116
+#define ITEM_GO_GOGGLES 0x117
+#define ITEM_METEORITE 0x118
+#define ITEM_ROOM_1_KEY 0x119
+#define ITEM_ROOM_2_KEY 0x11a
+#define ITEM_ROOM_4_KEY 0x11b
+#define ITEM_ROOM_6_KEY 0x11c
+#define ITEM_STORAGE_KEY 0x11d
+#define ITEM_ROOT_FOSSIL 0x11e
+#define ITEM_CLAW_FOSSIL 0x11f
+#define ITEM_DEVON_SCOPE 0x120
+#define ITEM_TM01 0x121
+#define ITEM_TM02 0x122
+#define ITEM_TM03 0x123
+#define ITEM_TM04 0x124
+#define ITEM_TM05 0x125
+#define ITEM_TM06 0x126
+#define ITEM_TM07 0x127
+#define ITEM_TM08 0x128
+#define ITEM_TM09 0x129
+#define ITEM_TM10 0x12a
+#define ITEM_TM11 0x12b
+#define ITEM_TM12 0x12c
+#define ITEM_TM13 0x12d
+#define ITEM_TM14 0x12e
+#define ITEM_TM15 0x12f
+#define ITEM_TM16 0x130
+#define ITEM_TM17 0x131
+#define ITEM_TM18 0x132
+#define ITEM_TM19 0x133
+#define ITEM_TM20 0x134
+#define ITEM_TM21 0x135
+#define ITEM_TM22 0x136
+#define ITEM_TM23 0x137
+#define ITEM_TM24 0x138
+#define ITEM_TM25 0x139
+#define ITEM_TM26 0x13a
+#define ITEM_TM27 0x13b
+#define ITEM_TM28 0x13c
+#define ITEM_TM29 0x13d
+#define ITEM_TM30 0x13e
+#define ITEM_TM31 0x13f
+#define ITEM_TM32 0x140
+#define ITEM_TM33 0x141
+#define ITEM_TM34 0x142
+#define ITEM_TM35 0x143
+#define ITEM_TM36 0x144
+#define ITEM_TM37 0x145
+#define ITEM_TM38 0x146
+#define ITEM_TM39 0x147
+#define ITEM_TM40 0x148
+#define ITEM_TM41 0x149
+#define ITEM_TM42 0x14a
+#define ITEM_TM43 0x14b
+#define ITEM_TM44 0x14c
+#define ITEM_TM45 0x14d
+#define ITEM_TM46 0x14e
+#define ITEM_TM47 0x14f
+#define ITEM_TM48 0x150
+#define ITEM_TM49 0x151
+#define ITEM_TM50 0x152
+#define ITEM_HM01 0x153
+#define ITEM_HM02 0x154
+#define ITEM_HM03 0x155
+#define ITEM_HM04 0x156
+#define ITEM_HM05 0x157
+#define ITEM_HM06 0x158
+#define ITEM_HM07 0x159
+#define ITEM_HM08 0x15a
+#define ITEM_OAKS_PARCEL 0x15d
+#define ITEM_POKE_FLUTE 0x15e
+#define ITEM_SECRET_KEY 0x15f
+#define ITEM_BIKE_VOUCHER 0x160
+#define ITEM_GOLD_TEETH 0x161
+#define ITEM_OLD_AMBER 0x162
+#define ITEM_CARD_KEY 0x163
+#define ITEM_LIFT_KEY 0x164
+#define ITEM_HELIX_FOSSIL 0x165
+#define ITEM_DOME_FOSSIL 0x166
+#define ITEM_SILPH_SCOPE 0x167
+#define ITEM_BICYCLE 0x168
+#define ITEM_TOWN_MAP 0x169
+#define ITEM_VS_SEEKER 0x16a
+#define ITEM_FAME_CHECKER 0x16b
+#define ITEM_TM_CASE 0x16c
+#define ITEM_BERRY_POUCH 0x16d
+#define ITEM_TEACHY_TV 0x16e
+#define ITEM_TRI_PASS 0x16f
+#define ITEM_RAINBOW_PASS 0x170
+#define ITEM_TEA 0x171
+#define ITEM_MYSTIC_TICKET 0x172
+#define ITEM_AURORA_TICKET 0x173
+#define ITEM_POWDER_JAR 0x174
+#define ITEM_RUBY 0x175
+#define ITEM_SAPPHIRE 0x176
+#define ITEM_MAGMA_EMBLEM 0x177
+#define ITEM_OLD_SEA_MAP 0x178
+
+#endif // GUARD_ITEMS_H
diff --git a/include/new_game.h b/include/new_game.h
index dce42bf52..62e83f8f0 100644
--- a/include/new_game.h
+++ b/include/new_game.h
@@ -1,14 +1,14 @@
#ifndef GUARD_NEW_GAME_H
#define GUARD_NEW_GAME_H
-void write_word_to_mem(u32 a1, u8 *a2);
-void sub_8052D10(u8 *a1, u8 *a2);
+void write_word_to_mem(u32 var, u8 *dataPtr);
+void copy_word_to_mem(u8 *copyTo, u8 *copyFrom);
void set_player_trainer_id(void);
void SetDefaultOptions(void);
-void sub_8052D78(void);
+void ClearPokedexFlags(void);
void sub_8052DA8(void);
void sub_8052DE4(void);
-void sub_8052E04(void);
+void WarpToTruck(void);
void ClearSav2(void);
void sub_8052E4C(void);
void NewGameInitData(void);
diff --git a/include/pokemon.h b/include/pokemon.h
index b705ab6a1..10eb05757 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -372,6 +372,8 @@ struct PokemonStorage
{
u8 currentBox;
struct BoxPokemon boxes[14][30];
+ u8 boxNames[14][9];
+ u8 unkArray[14];
};
extern struct Pokemon gPlayerParty[6];
diff --git a/include/rom4.h b/include/rom4.h
index a182a0bff..0fe80a82b 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -22,10 +22,10 @@ struct LinkPlayerMapObject {
// sub_8053014
void sub_8053050(void);
// sub_805308C
-void sub_80530AC(void);
-void sav12_xor_increment(u8 index);
-u32 sub_8053108(u8 index);
-// sav12_xor_set
+void ResetGameStats(void);
+void IncrementGameStat(u8 index);
+u32 GetGameStat(u8 index);
+// SetGameStat
// sub_8053154
// sub_8053198
void update_saveblock1_field_object_coords(u8, s16, s16);
@@ -117,7 +117,7 @@ void c2_overworld(void);
// sub_80543DC
// sub_80543E8
void CB2_NewGame(void);
-void c2_whiteout(void);
+void CB2_WhiteOut(void);
void CB2_LoadMap(void);
void CB2_LoadMap2(void);
// sub_8054534
diff --git a/include/species.h b/include/species.h
index 7abc6349b..e91d9050a 100644
--- a/include/species.h
+++ b/include/species.h
@@ -388,6 +388,6 @@
#define SPECIES_JIRACHI 0x199
#define SPECIES_DEOXYS 0x19a
#define SPECIES_CHIMECHO 0x19b
-#define SPECIES_EGG 0x19c
+#define SPECIES_EGG 0x19c
#endif // GUARD_SPECIES_H
diff --git a/include/vars.h b/include/vars.h
index 265f903ba..4661bbd52 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -1,21 +1,24 @@
#ifndef GUARD_VARS_H
#define GUARD_VARS_H
-#define VAR_RECYCLE_GOODS 0x4020
-#define VAR_REPEL_STEP_COUNT 0x4021
+#define VAR_RECYCLE_GOODS 0x4020
+#define VAR_REPEL_STEP_COUNT 0x4021
-#define VAR_FIRST_POKE 0x4023
-#define VAR_MIRAGE_RND_H 0x4024
-#define VAR_MIRAGE_RND_L 0x4025
+#define VAR_FIRST_POKE 0x4023
+#define VAR_MIRAGE_RND_H 0x4024
+#define VAR_MIRAGE_RND_L 0x4025
-#define VAR_RESET_RTC_ENABLE 0x402C
+#define VAR_RESET_RTC_ENABLE 0x402C
-#define VAR_DAYS 0x4040
+#define VAR_DAYS 0x4040
-#define VAR_POKELOT_PRIZE 0x4045
-#define VAR_NATIONAL_DEX 0x4046
+#define VAR_POKELOT_PRIZE 0x4045
+#define VAR_NATIONAL_DEX 0x4046
+#define VAR_SHROOMISH_SIZE_RECORD 0x4047
-#define VAR_POKELOT_RND1 0x404B
-#define VAR_POKELOT_RND2 0x404C
+#define VAR_POKELOT_RND1 0x404B
+#define VAR_POKELOT_RND2 0x404C
+
+#define VAR_BARBOACH_SIZE_RECORD 0x404F
#endif // GUARD_VARS_H