diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 424 | ||||
| -rw-r--r-- | include/constants/layouts.h | 2 | ||||
| -rw-r--r-- | include/constants/moves.h | 16 |
3 files changed, 229 insertions, 213 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 4caae39ad..92579cfa4 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -138,8 +138,8 @@ #define FLAG_HIDE_ARTICUNO 0x082 #define FLAG_HIDE_TOWER_ROCKET_2 0x083 #define FLAG_HIDE_TOWER_ROCKET_3 0x084 -#define FLAG_HIDE_POWER_PLANT_VOLTORB_1 0x085 -#define FLAG_HIDE_POWER_PLANT_VOLTORB_2 0x086 +#define FLAG_HIDE_POWER_PLANT_ELECTRODE_1 0x085 +#define FLAG_HIDE_POWER_PLANT_ELECTRODE_2 0x086 #define FLAG_HIDE_SS_ANNE 0x087 #define FLAG_HIDE_FIVE_ISLAND_ROCKETS 0x088 #define FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS 0x089 @@ -573,214 +573,214 @@ #define FLAG_0x22F 0x22F // Story flags -#define FLAG_GOT_POTION_ON_ROUTE_1 0x230 -#define FLAG_GOT_TM34_FROM_SURGE 0x231 -#define FLAG_GOT_FOSSIL_FROM_MT_MOON 0x232 -#define FLAG_HELPED_BILL_IN_SEA_COTTAGE 0x233 -#define FLAG_GOT_SS_TICKET 0x234 -#define FLAG_GOT_SS_TICKET_DUP 0x235 -#define FLAG_GOT_TM42_AT_MEMORIAL_PILLAR 0x236 -#define FLAG_GOT_HM01 0x237 -#define FLAG_GOT_HM02 0x238 -#define FLAG_GOT_HM03 0x239 -#define FLAG_GOT_HM04 0x23A -#define FLAG_GOT_HM05 0x23B -#define FLAG_RESCUED_MR_FUJI 0x23C -#define FLAG_GOT_POKE_FLUTE 0x23D -#define FLAG_0x23E 0x23E -#define FLAG_GOT_TM28_FROM_ROCKET 0x23F -#define FLAG_GOT_OLD_ROD 0x240 -#define FLAG_GOT_BIKE_VOUCHER 0x241 -#define FLAG_0x242 0x242 -#define FLAG_GOT_COIN_CASE 0x243 -#define FLAG_GOT_GOOD_ROD 0x244 -#define FLAG_GOT_TM29_FROM_MR_PSYCHIC 0x245 -#define FLAG_GOT_LAPRAS_FROM_SILPH 0x246 -#define FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL 0x247 -#define FLAG_DID_MIMIEN_TRADE 0x248 -#define FLAG_BOUGHT_MAGIKARP 0x249 -#define FLAG_DID_ZYNX_TRADE 0x24A -#define FLAG_DID_MS_NIDO_TRADE 0x24B -#define FLAG_0x24C 0x24C -#define FLAG_DID_CH_DING_TRADE 0x24D -#define FLAG_GOT_TM38_FROM_BLAINE 0x24E -#define FLAG_OAK_SKIP_22_RIVAL_CHECK 0x24F -#define FLAG_GOT_MASTER_BALL_FROM_SILPH 0x250 -#define FLAG_DID_NINA_TRADE 0x251 -#define FLAG_GOT_ITEMFINDER 0x252 -#define FLAG_WOKE_UP_ROUTE_12_SNORLAX 0x253 -#define FLAG_GOT_TM39_FROM_BROCK 0x254 -#define FLAG_GOT_SUPER_ROD 0x255 -#define FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE 0x256 -#define FLAG_DID_MARC_TRADE 0x257 -#define FLAG_BEAT_RIVAL_IN_OAKS_LAB 0x258 -#define FLAG_GOT_TM06_FROM_KOGA 0x259 -#define FLAG_0x25A 0x25A -#define FLAG_GOT_TM27 0x25B -#define FLAG_0x25C 0x25C -#define FLAG_0x25D 0x25D -#define FLAG_GOT_OLD_AMBER 0x25E -#define FLAG_0x25F 0x25F -#define FLAG_0x260 0x260 -#define FLAG_0x261 0x261 -#define FLAG_0x262 0x262 -#define FLAG_GOT_EEVEE 0x263 -#define FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES 0x264 -#define FLAG_CINNABAR_GYM_QUIZ_1 0x265 -#define FLAG_PENDING_DAYCARE_EGG 0x266 -#define FLAG_CINNABAR_GYM_QUIZ_2 0x267 -#define FLAG_CINNABAR_GYM_QUIZ_3 0x268 -#define FLAG_CINNABAR_GYM_QUIZ_4 0x269 -#define FLAG_CINNABAR_GYM_QUIZ_5 0x26A -#define FLAG_CINNABAR_GYM_QUIZ_6 0x26B -#define FLAG_POKEMON_MANSION_SWITCH_STATE 0x26C -#define FLAG_OPENED_ROCKET_HIDEOUT 0x26D -#define FLAG_GOT_10_COINS_FROM_GAMBLER 0x26E -#define FLAG_GOT_20_COINS_FROM_GAMBLER 0x26F -#define FLAG_GOT_20_COINS_FROM_GAMBLER_2 0x270 -#define FLAG_GOT_BICYCLE 0x271 -#define FLAG_GOT_DOME_FOSSIL 0x272 -#define FLAG_GOT_HELIX_FOSSIL 0x273 -#define FLAG_DID_ESPHERE_TRADE 0x274 -#define FLAG_DID_TANGENY_TRADE 0x275 -#define FLAG_DID_SEELOR_TRADE 0x276 -#define FLAG_0x277 0x277 -#define FLAG_GOT_HITMON_FROM_DOJO 0x278 -#define FLAG_0x279 0x279 -#define FLAG_SILPH_2F_DOOR_1 0x27A -#define FLAG_SILPH_2F_DOOR_2 0x27B -#define FLAG_SILPH_3F_DOOR_1 0x27C -#define FLAG_SILPH_3F_DOOR_2 0x27D -#define FLAG_SILPH_4F_DOOR_1 0x27E -#define FLAG_SILPH_4F_DOOR_2 0x27F -#define FLAG_SILPH_5F_DOOR_1 0x280 -#define FLAG_SILPH_5F_DOOR_2 0x281 -#define FLAG_SILPH_5F_DOOR_3 0x282 -#define FLAG_SILPH_6F_DOOR 0x283 -#define FLAG_SILPH_7F_DOOR_1 0x284 -#define FLAG_SILPH_7F_DOOR_2 0x285 -#define FLAG_SILPH_7F_DOOR_3 0x286 -#define FLAG_SILPH_8F_DOOR 0x287 -#define FLAG_SILPH_9F_DOOR_1 0x288 -#define FLAG_SILPH_9F_DOOR_2 0x289 -#define FLAG_SILPH_9F_DOOR_3 0x28A -#define FLAG_SILPH_9F_DOOR_4 0x28B -#define FLAG_SILPH_10F_DOOR 0x28C -#define FLAG_SILPH_11F_DOOR 0x28D -#define FLAG_0x28E 0x28E -#define FLAG_0x28F 0x28F -#define FLAG_MET_STICKER_LADY 0x290 -#define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291 -#define FLAG_GOT_VS_SEEKER 0x292 -#define FLAG_GOT_TM19_FROM_ERIKA 0x293 -#define FLAG_GOT_TM33_FROM_THIRSTY_GIRL 0x294 -#define FLAG_GOT_TM20_FROM_THIRSTY_GIRL 0x295 -#define FLAG_GOT_TM16_FROM_THIRSTY_GIRL 0x296 -#define FLAG_GOT_TM03_FROM_MISTY 0x297 -#define FLAG_GOT_TM26_FROM_GIOVANNI 0x298 -#define FLAG_0x299 0x299 -#define FLAG_GOT_TM04_FROM_SABRINA 0x29A -#define FLAG_GOT_FAME_CHECKER 0x29B -#define FLAG_GOT_RECORD_SETTING_MAGIKARP 0x29C -#define FLAG_TWO_ISLAND_SHOP_INTRODUCED 0x29D -#define FLAG_TWO_ISLAND_SHOP_EXPANDED_1 0x29E -#define FLAG_TWO_ISLAND_SHOP_EXPANDED_2 0x29F -#define FLAG_TWO_ISLAND_SHOP_EXPANDED_3 0x2A0 -#define FLAG_SEVII_DETOUR_FINISHED 0x2A1 -#define FLAG_VISITED_TWO_ISLAND 0x2A2 -#define FLAG_RESCUED_LOSTELLE 0x2A3 -#define FLAG_0x2A4 0x2A4 -#define FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT 0x2A5 -#define FLAG_GOT_TEA 0x2A6 -#define FLAG_GOT_AURORA_TICKET 0x2A7 -#define FLAG_GOT_MYSTIC_TICKET 0x2A8 -#define FLAG_0x2A9 0x2A9 -#define FLAG_0x2AA 0x2AA -#define FLAG_0x2AB 0x2AB -#define FLAG_0x2AC 0x2AC -#define FLAG_0x2AD 0x2AD -#define FLAG_0x2AE 0x2AE -#define FLAG_0x2AF 0x2AF -#define FLAG_0x2B0 0x2B0 -#define FLAG_0x2B1 0x2B1 -#define FLAG_0x2B2 0x2B2 -#define FLAG_0x2B3 0x2B3 -#define FLAG_0x2B4 0x2B4 -#define FLAG_0x2B5 0x2B5 -#define FLAG_0x2B6 0x2B6 -#define FLAG_0x2B7 0x2B7 -#define FLAG_0x2B8 0x2B8 -#define FLAG_0x2B9 0x2B9 -#define FLAG_0x2BA 0x2BA -#define FLAG_0x2BB 0x2BB -#define FLAG_0x2BC 0x2BC -#define FLAG_0x2BD 0x2BD -#define FLAG_0x2BE 0x2BE -#define FLAG_0x2BF 0x2BF -#define FLAG_0x2C0 0x2C0 -#define FLAG_0x2C1 0x2C1 -#define FLAG_0x2C2 0x2C2 -#define FLAG_0x2C3 0x2C3 -#define FLAG_0x2C4 0x2C4 -#define FLAG_0x2C5 0x2C5 -#define FLAG_0x2C6 0x2C6 -#define FLAG_0x2C7 0x2C7 -#define FLAG_0x2C8 0x2C8 -#define FLAG_0x2C9 0x2C9 -#define FLAG_0x2CA 0x2CA -#define FLAG_0x2CB 0x2CB -#define FLAG_0x2CC 0x2CC -#define FLAG_0x2CD 0x2CD -#define FLAG_0x2CE 0x2CE -#define FLAG_0x2CF 0x2CF -#define FLAG_0x2D0 0x2D0 -#define FLAG_0x2D1 0x2D1 -#define FLAG_0x2D2 0x2D2 -#define FLAG_0x2D3 0x2D3 -#define FLAG_0x2D4 0x2D4 -#define FLAG_0x2D5 0x2D5 -#define FLAG_0x2D6 0x2D6 -#define FLAG_0x2D7 0x2D7 -#define FLAG_0x2D8 0x2D8 -#define FLAG_0x2D9 0x2D9 -#define FLAG_0x2DA 0x2DA -#define FLAG_0x2DB 0x2DB -#define FLAG_0x2DC 0x2DC -#define FLAG_0x2DD 0x2DD -#define FLAG_0x2DE 0x2DE -#define FLAG_0x2DF 0x2DF -#define FLAG_0x2E0 0x2E0 -#define FLAG_0x2E1 0x2E1 -#define FLAG_0x2E2 0x2E2 -#define FLAG_0x2E3 0x2E3 -#define FLAG_FOUGHT_DEOXYS 0x2E4 -#define FLAG_0x2E5 0x2E5 -#define FLAG_0x2E6 0x2E6 -#define FLAG_0x2E7 0x2E7 -#define FLAG_0x2E8 0x2E8 -#define FLAG_0x2E9 0x2E9 -#define FLAG_0x2EA 0x2EA -#define FLAG_0x2EB 0x2EB -#define FLAG_REVIVED_DOME 0x2EC -#define FLAG_REVIVED_HELIX 0x2ED -#define FLAG_REVIVED_AMBER 0x2EE -#define FLAG_0x2EF 0x2EF -#define FLAG_0x2F0 0x2F0 -#define FLAG_0x2F1 0x2F1 -#define FLAG_FOUGHT_LUGIA 0x2F2 -#define FLAG_FOUGHT_HO_OH 0x2F3 -#define FLAG_0x2F4 0x2F4 -#define FLAG_0x2F5 0x2F5 -#define FLAG_0x2F6 0x2F6 -#define FLAG_0x2F7 0x2F7 -#define FLAG_0x2F8 0x2F8 -#define FLAG_0x2F9 0x2F9 -#define FLAG_0x2FA 0x2FA -#define FLAG_0x2FB 0x2FB -#define FLAG_0x2FC 0x2FC -#define FLAG_0x2FD 0x2FD -#define FLAG_0x2FE 0x2FE -#define FLAG_0x2FF 0x2FF +#define FLAG_GOT_POTION_ON_ROUTE_1 0x230 +#define FLAG_GOT_TM34_FROM_SURGE 0x231 +#define FLAG_GOT_FOSSIL_FROM_MT_MOON 0x232 +#define FLAG_HELPED_BILL_IN_SEA_COTTAGE 0x233 +#define FLAG_GOT_SS_TICKET 0x234 +#define FLAG_GOT_SS_TICKET_DUP 0x235 +#define FLAG_GOT_TM42_AT_MEMORIAL_PILLAR 0x236 +#define FLAG_GOT_HM01 0x237 +#define FLAG_GOT_HM02 0x238 +#define FLAG_GOT_HM03 0x239 +#define FLAG_GOT_HM04 0x23A +#define FLAG_GOT_HM05 0x23B +#define FLAG_RESCUED_MR_FUJI 0x23C +#define FLAG_GOT_POKE_FLUTE 0x23D +#define FLAG_0x23E 0x23E +#define FLAG_GOT_TM28_FROM_ROCKET 0x23F +#define FLAG_GOT_OLD_ROD 0x240 +#define FLAG_GOT_BIKE_VOUCHER 0x241 +#define FLAG_0x242 0x242 +#define FLAG_GOT_COIN_CASE 0x243 +#define FLAG_GOT_GOOD_ROD 0x244 +#define FLAG_GOT_TM29_FROM_MR_PSYCHIC 0x245 +#define FLAG_GOT_LAPRAS_FROM_SILPH 0x246 +#define FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL 0x247 +#define FLAG_DID_MIMIEN_TRADE 0x248 +#define FLAG_BOUGHT_MAGIKARP 0x249 +#define FLAG_DID_ZYNX_TRADE 0x24A +#define FLAG_DID_MS_NIDO_TRADE 0x24B +#define FLAG_0x24C 0x24C +#define FLAG_DID_CH_DING_TRADE 0x24D +#define FLAG_GOT_TM38_FROM_BLAINE 0x24E +#define FLAG_OAK_SKIP_22_RIVAL_CHECK 0x24F +#define FLAG_GOT_MASTER_BALL_FROM_SILPH 0x250 +#define FLAG_DID_NINA_TRADE 0x251 +#define FLAG_GOT_ITEMFINDER 0x252 +#define FLAG_WOKE_UP_ROUTE_12_SNORLAX 0x253 +#define FLAG_GOT_TM39_FROM_BROCK 0x254 +#define FLAG_GOT_SUPER_ROD 0x255 +#define FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE 0x256 +#define FLAG_DID_MARC_TRADE 0x257 +#define FLAG_BEAT_RIVAL_IN_OAKS_LAB 0x258 +#define FLAG_GOT_TM06_FROM_KOGA 0x259 +#define FLAG_0x25A 0x25A +#define FLAG_GOT_TM27 0x25B +#define FLAG_0x25C 0x25C +#define FLAG_0x25D 0x25D +#define FLAG_GOT_OLD_AMBER 0x25E +#define FLAG_0x25F 0x25F +#define FLAG_0x260 0x260 +#define FLAG_0x261 0x261 +#define FLAG_0x262 0x262 +#define FLAG_GOT_EEVEE 0x263 +#define FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES 0x264 +#define FLAG_CINNABAR_GYM_QUIZ_1 0x265 +#define FLAG_PENDING_DAYCARE_EGG 0x266 +#define FLAG_CINNABAR_GYM_QUIZ_2 0x267 +#define FLAG_CINNABAR_GYM_QUIZ_3 0x268 +#define FLAG_CINNABAR_GYM_QUIZ_4 0x269 +#define FLAG_CINNABAR_GYM_QUIZ_5 0x26A +#define FLAG_CINNABAR_GYM_QUIZ_6 0x26B +#define FLAG_POKEMON_MANSION_SWITCH_STATE 0x26C +#define FLAG_OPENED_ROCKET_HIDEOUT 0x26D +#define FLAG_GOT_10_COINS_FROM_GAMBLER 0x26E +#define FLAG_GOT_20_COINS_FROM_GAMBLER 0x26F +#define FLAG_GOT_20_COINS_FROM_GAMBLER_2 0x270 +#define FLAG_GOT_BICYCLE 0x271 +#define FLAG_GOT_DOME_FOSSIL 0x272 +#define FLAG_GOT_HELIX_FOSSIL 0x273 +#define FLAG_DID_ESPHERE_TRADE 0x274 +#define FLAG_DID_TANGENY_TRADE 0x275 +#define FLAG_DID_SEELOR_TRADE 0x276 +#define FLAG_0x277 0x277 +#define FLAG_GOT_HITMON_FROM_DOJO 0x278 +#define FLAG_0x279 0x279 +#define FLAG_SILPH_2F_DOOR_1 0x27A +#define FLAG_SILPH_2F_DOOR_2 0x27B +#define FLAG_SILPH_3F_DOOR_1 0x27C +#define FLAG_SILPH_3F_DOOR_2 0x27D +#define FLAG_SILPH_4F_DOOR_1 0x27E +#define FLAG_SILPH_4F_DOOR_2 0x27F +#define FLAG_SILPH_5F_DOOR_1 0x280 +#define FLAG_SILPH_5F_DOOR_2 0x281 +#define FLAG_SILPH_5F_DOOR_3 0x282 +#define FLAG_SILPH_6F_DOOR 0x283 +#define FLAG_SILPH_7F_DOOR_1 0x284 +#define FLAG_SILPH_7F_DOOR_2 0x285 +#define FLAG_SILPH_7F_DOOR_3 0x286 +#define FLAG_SILPH_8F_DOOR 0x287 +#define FLAG_SILPH_9F_DOOR_1 0x288 +#define FLAG_SILPH_9F_DOOR_2 0x289 +#define FLAG_SILPH_9F_DOOR_3 0x28A +#define FLAG_SILPH_9F_DOOR_4 0x28B +#define FLAG_SILPH_10F_DOOR 0x28C +#define FLAG_SILPH_11F_DOOR 0x28D +#define FLAG_0x28E 0x28E +#define FLAG_0x28F 0x28F +#define FLAG_MET_STICKER_LADY 0x290 +#define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291 +#define FLAG_GOT_VS_SEEKER 0x292 +#define FLAG_GOT_TM19_FROM_ERIKA 0x293 +#define FLAG_GOT_TM33_FROM_THIRSTY_GIRL 0x294 +#define FLAG_GOT_TM20_FROM_THIRSTY_GIRL 0x295 +#define FLAG_GOT_TM16_FROM_THIRSTY_GIRL 0x296 +#define FLAG_GOT_TM03_FROM_MISTY 0x297 +#define FLAG_GOT_TM26_FROM_GIOVANNI 0x298 +#define FLAG_0x299 0x299 +#define FLAG_GOT_TM04_FROM_SABRINA 0x29A +#define FLAG_GOT_FAME_CHECKER 0x29B +#define FLAG_GOT_RECORD_SETTING_MAGIKARP 0x29C +#define FLAG_TWO_ISLAND_SHOP_INTRODUCED 0x29D +#define FLAG_TWO_ISLAND_SHOP_EXPANDED_1 0x29E +#define FLAG_TWO_ISLAND_SHOP_EXPANDED_2 0x29F +#define FLAG_TWO_ISLAND_SHOP_EXPANDED_3 0x2A0 +#define FLAG_SEVII_DETOUR_FINISHED 0x2A1 +#define FLAG_VISITED_TWO_ISLAND 0x2A2 +#define FLAG_RESCUED_LOSTELLE 0x2A3 +#define FLAG_0x2A4 0x2A4 +#define FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT 0x2A5 +#define FLAG_GOT_TEA 0x2A6 +#define FLAG_GOT_AURORA_TICKET 0x2A7 +#define FLAG_GOT_MYSTIC_TICKET 0x2A8 +#define FLAG_0x2A9 0x2A9 +#define FLAG_0x2AA 0x2AA +#define FLAG_0x2AB 0x2AB +#define FLAG_0x2AC 0x2AC +#define FLAG_0x2AD 0x2AD +#define FLAG_0x2AE 0x2AE +#define FLAG_0x2AF 0x2AF +#define FLAG_0x2B0 0x2B0 +#define FLAG_0x2B1 0x2B1 +#define FLAG_0x2B2 0x2B2 +#define FLAG_0x2B3 0x2B3 +#define FLAG_0x2B4 0x2B4 +#define FLAG_0x2B5 0x2B5 +#define FLAG_0x2B6 0x2B6 +#define FLAG_0x2B7 0x2B7 +#define FLAG_0x2B8 0x2B8 +#define FLAG_0x2B9 0x2B9 +#define FLAG_0x2BA 0x2BA +#define FLAG_GOT_POWDER_JAR 0x2BB +#define FLAG_FOUGHT_MEWTWO 0x2BC +#define FLAG_FOUGHT_MOLTRES 0x2BD +#define FLAG_FOUGHT_ARTICUNO 0x2BE +#define FLAG_FOUGHT_ZAPDOS 0x2BF +#define FLAG_TUTOR_DOUBLE_EDGE 0x2C0 +#define FLAG_TUTOR_THUNDER_WAVE 0x2C1 +#define FLAG_TUTOR_ROCK_SLIDE 0x2C2 +#define FLAG_TUTOR_EXPLOSION 0x2C3 +#define FLAG_TUTOR_META_PUNCH 0x2C4 +#define FLAG_TUTOR_MEGA_KICK 0x2C5 +#define FLAG_TUTOR_DREAM_EATER 0x2C6 +#define FLAG_TUTOR_SOFT_BOILED 0x2C7 +#define FLAG_TUTOR_SUBSTITUTE 0x2C8 +#define FLAG_TUTOR_SWORDS_DANCE 0x2C9 +#define FLAG_TUTOR_SEISMIC_TOSS 0x2CA +#define FLAG_TUTOR_COUNTER 0x2CB +#define FLAG_TUTOR_METRONOME 0x2CC +#define FLAG_TUTOR_MIMIC 0x2CD +#define FLAG_TUTOR_BODY_SLAM 0x2CE +#define FLAG_VISITED_OAKS_LAB 0x2CF +#define FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 0x2D0 +#define FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 0x2D1 +#define FLAG_STOPPED_SEAFOAM_B3F_CURRENT 0x2D2 +#define FLAG_STOPPED_SEAFOAM_B4F_CURRENT 0x2D3 +#define FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE 0x2D4 +#define FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE 0x2D5 +#define FLAG_UNLOCKED_ROCKET_WAREHOUSE 0x2D6 +#define FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR 0x2D7 +#define FLAG_LEARNED_YES_NAH_CHANSEY 0x2D8 +#define FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 0x2D9 +#define FLAG_GOT_TOGEPI_EGG 0x2DA +#define FLAG_NO_ROOM_FOR_TOGEPI_EGG 0x2DB +#define FLAG_RECOVERED_SAPPHIRE 0x2DC +#define FLAG_GOT_RUBY 0x2DD +#define FLAG_0x2DE 0x2DE +#define FLAG_0x2DF 0x2DF +#define FLAG_0x2E0 0x2E0 +#define FLAG_LEARNED_MOVE_AT_CAPE_BRINK 0x2E1 +#define FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL 0x2E2 +#define FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE 0x2E3 +#define FLAG_FOUGHT_DEOXYS 0x2E4 +#define FLAG_0x2E5 0x2E5 +#define FLAG_0x2E6 0x2E6 +#define FLAG_0x2E7 0x2E7 +#define FLAG_0x2E8 0x2E8 +#define FLAG_0x2E9 0x2E9 +#define FLAG_0x2EA 0x2EA +#define FLAG_0x2EB 0x2EB +#define FLAG_REVIVED_DOME 0x2EC +#define FLAG_REVIVED_HELIX 0x2ED +#define FLAG_REVIVED_AMBER 0x2EE +#define FLAG_GOT_HM06 0x2EF +#define FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN 0x2F0 +#define FLAG_SHOWED_AURORATICKET_TO_CAPTAIN 0x2F1 +#define FLAG_FOUGHT_LUGIA 0x2F2 +#define FLAG_FOUGHT_HO_OH 0x2F3 +#define FLAG_OAK_SAW_DEX_COMPLETION 0x2F4 +#define FLAG_LUGIA_FLEW_AWAY 0x2F5 +#define FLAG_HO_OH_FLEW_AWAY 0x2F6 +#define FLAG_DEOXYS_FLEW_AWAY 0x2F7 +#define FLAG_TALKED_TO_TEA_LADY_AFTER_HOF 0x2F8 +#define FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION 0x2F9 +#define FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE 0x2FA +#define FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER 0x2FB +#define FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER 0x2FC +#define FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE 0x2FD +#define FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE 0x2FE +#define FLAG_OAKS_RATING_IS_VIA_PC 0x2FF // Unused? #define FLAG_0x300 0x300 @@ -1222,7 +1222,7 @@ #define FLAG_0x4AE 0x4AE #define FLAG_0x4AF 0x4AF -// Boss clear flags +// Boss clear flags, 1200 #define FLAG_DEFEATED_BROCK 0x4B0 #define FLAG_DEFEATED_MISTY 0x4B1 #define FLAG_DEFEATED_LT_SURGE 0x4B2 @@ -1308,7 +1308,7 @@ #define FLAG_TRAINER_FLAG_START 0x500 -#define TRAINERS_FLAG_NO 0x2E7 +#define TRAINERS_FLAG_NO 0x2E7 // 743 #define TRAINER_FLAGS_WORDS 0x300 #define SYS_FLAGS (FLAG_TRAINER_FLAG_START + TRAINER_FLAGS_WORDS) // 0x800 diff --git a/include/constants/layouts.h b/include/constants/layouts.h index f4f2a8a29..3d17cd441 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -301,7 +301,7 @@ #define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316 #define LAYOUT_SIX_ISLAND_PATTERN_BUSH 317 #define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318 -#define LAYOUT_UNUSED_LAYOUT_83453C0 319 +#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 319 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1 321 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2 322 diff --git a/include/constants/moves.h b/include/constants/moves.h index 62eacc5f1..f60bf1a73 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -361,4 +361,20 @@ #define MOVES_COUNT 355 +#define MOVETUTOR_MEGA_PUNCH 0 +#define MOVETUTOR_SWORDS_DANCE 1 +#define MOVETUTOR_MEGA_KICK 2 +#define MOVETUTOR_BODY_SLAM 3 +#define MOVETUTOR_DOUBLE_EDGE 4 +#define MOVETUTOR_COUNTER 5 +#define MOVETUTOR_SEISMIC_TOSS 6 +#define MOVETUTOR_MIMIC 7 +#define MOVETUTOR_METRONOME 8 +#define MOVETUTOR_SOFT_BOILED 9 +#define MOVETUTOR_DREAM_EATER 10 +#define MOVETUTOR_THUNDER_WAVE 11 +#define MOVETUTOR_EXPLOSION 12 +#define MOVETUTOR_ROCK_SLIDE 13 +#define MOVETUTOR_SUBSTITUTE 14 + #endif // GUARD_CONSTANTS_MOVES_H |