diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index b869adf1ba..ec962c71d9 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -578,10 +578,10 @@ _080F5D58: adds r0, r5, 0 movs r1, 0 bl VarSet - bl sub_8076D5C + bl SetContinueGameWarpStatusToDynamicWarp movs r0, 0x1 bl TrySavingData - bl sav2_gender2_inplace_and_xFE + bl ClearContinueGameWarpStatus2 adds r0, r5, 0 adds r1, r4, 0 bl VarSet @@ -5598,7 +5598,7 @@ _080F874C: movs r3, 0x1 negs r3, r3 movs r0, 0 - bl saved_warp2_set + bl SetDynamicWarp bl ScriptContext2_Disable bl EnableBothScriptContexts _080F877E: diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 94caeb6978..c98364ccc6 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -101,3 +101,7 @@ map \map .space 2 .endm + + .macro map_header_flags allow_bike:req, allow_escape_rope:req, allow_run:req, show_map_name:req + .byte ((\show_map_name & 1) << 3) | ((\allow_run & 1) << 2) | ((\allow_escape_rope & 1) << 1) | \allow_bike + .endm diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index b90c9701eb..e6751247bf 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -15686,7 +15686,7 @@ _0801EB04: lsls r0, 24 cmp r0, 0 bne _0801EBC2 - bl sub_8076D5C + bl SetContinueGameWarpStatusToDynamicWarp movs r0, 0 bl TrySavingData ldr r0, =gUnknown_02022C84 @@ -15713,7 +15713,7 @@ _0801EB40: bne _0801EBC2 movs r0, 0x37 bl PlaySE - bl sav2_gender2_inplace_and_xFE + bl ClearContinueGameWarpStatus2 ldr r0, =gUnknown_02022C84 ldr r1, [r0] movs r0, 0xA @@ -20568,7 +20568,7 @@ _080211EC: beq _080211F8 b _08021302 _080211F8: - bl sub_81971D0 + bl InitStandardTextBoxWindows bl sub_8197200 adds r0, r5, 0 bl sub_8022588 @@ -39128,7 +39128,7 @@ _0802A7CE: movs r1, 0 movs r2, 0 bl ChangeBgY - bl sub_81971D0 + bl InitStandardTextBoxWindows bl sub_8197200 movs r1, 0x82 lsls r1, 5 diff --git a/asm/trade.s b/asm/trade.s index e8ce288104..b833240dd7 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -1,6 +1,6 @@ .include "asm/macros.inc" .include "constants/gba_constants.inc" - .include "constants/misc_constants.inc" + .include "constants/global.inc" .syntax unified @@ -2399,7 +2399,7 @@ _08078726: bne _08078766 adds r0, r4, 0 movs r1, 0x2 - ldr r2, =gSpeciesNames + 303 * POKEMON_NAME_LENGTH @ SPECIES_SHEDINJA + ldr r2, =gSpeciesNames + 303 * 11 @ SPECIES_SHEDINJA * POKEMON_NAME_LENGTH + 1 bl SetMonData _08078766: adds r4, 0x64 @@ -13851,7 +13851,7 @@ _0807EDCE: movs r0, 0x2 bl sub_801B990 _0807EDF6: - bl sub_8076D5C + bl SetContinueGameWarpStatusToDynamicWarp bl sub_8153380 ldr r1, =gMain movs r2, 0x87 @@ -13884,7 +13884,7 @@ _0807EE38: lsrs r1, r0, 24 cmp r1, 0 beq _0807EE5C - bl sav2_gender2_inplace_and_xFE + bl ClearContinueGameWarpStatus2 ldr r0, =gMain movs r1, 0x87 lsls r1, 3 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 10e4d6d8fe..d0f26e0e15 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -4971,7 +4971,7 @@ _080C5204: b _080C52C8 _080C5214: str r4, [r0] - bl sav1_map_get_name + bl GetCurrentRegionMapSectionId lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3A @@ -7780,7 +7780,7 @@ sub_80C6974: @ 80C6974 adds r1, r6 ldrb r1, [r1, 0xC] bl StartSpriteAnim - bl sav1_map_get_name + bl GetCurrentRegionMapSectionId lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3A diff --git a/constants/constants.inc b/constants/constants.inc index 38887dd28d..7c74c8e87c 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "constants/misc_constants.inc" + .include "constants/global.inc" .include "constants/contest_constants.inc" .include "constants/pokemon_data_constants.inc" .include "constants/berry_constants.inc" diff --git a/constants/misc_constants.inc b/constants/global.inc similarity index 93% rename from constants/misc_constants.inc rename to constants/global.inc index 5fa58cfe84..621ba2af89 100644 --- a/constants/misc_constants.inc +++ b/constants/global.inc @@ -3,9 +3,6 @@ .set NULL, 0 - .set POKEMON_NAME_LENGTH, 11 - .set MOVE_NAME_LENGTH, 13 - .set SPRITE_SIZE_8x8, (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_16x16, (OAM_SIZE_1 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_32x32, (OAM_SIZE_2 >> 28) | (OAM_SQUARE >> 14) diff --git a/data/event_scripts.s b/data/event_scripts.s index 92b0d504d4..6a3a2f2f62 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,3 +1,4 @@ +#include "constants/global.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/event_objects.h" @@ -1792,9 +1793,9 @@ Route110_EventScript_271ED7:: @ 8271ED7 Route119_EventScript_271ED7:: @ 8271ED7 RustboroCity_EventScript_271ED7:: @ 8271ED7 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq RustboroCity_EventScript_271EEF - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq RustboroCity_EventScript_271EF5 end @@ -1810,9 +1811,9 @@ LavaridgeTown_EventScript_271EFB:: @ 8271EFB Route110_EventScript_271EFB:: @ 8271EFB Route119_EventScript_271EFB:: @ 8271EFB checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq LavaridgeTown_EventScript_271F13 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq LavaridgeTown_EventScript_271F19 end @@ -1826,9 +1827,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19 EventScript_271F1F:: @ 8271F1F checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq EventScript_271F37 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq EventScript_271F3D end diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc index acd390ada8..bf6a188ccf 100644 --- a/data/layouts/Route111_NoMirageTower/layout.inc +++ b/data/layouts/Route111_NoMirageTower/layout.inc @@ -12,3 +12,4 @@ Route111_NoMirageTower_Layout:: .4byte Route111_NoMirageTower_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 21573c079d..3102e0614d 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -10,6 +10,6 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 0ffb5d1f70..b9f5e809c0 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Corridors_1F: @ 84844C4 .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 5e4eb1dd68..98f23c223a 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Corridors_B1F: @ 84844FC .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index a9f8945d9b..394c93ec95 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Deck: @ 84844A8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index 6645c9d960..dcf42db40c 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 5cc5bf0adc..f279a52ab7 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 7 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 4e6212d017..3ac0c5f38a 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Room_B1F: @ 848456C .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 8e004365e3..71f856bc06 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Rooms2_1F: @ 8484588 .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 2f64a63151..943e57b77d 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 9ee2f40bc4..b37456c281 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Rooms_1F: @ 84844E0 .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index d6f656e3bc..f5ec64f2b7 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Rooms_B1F: @ 8484518 .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index 82fbdc0e94..e5119887a7 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Underwater1: @ 8484550 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index c26d65df02..de7e871d0b 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -10,6 +10,6 @@ AbandonedShip_Underwater2: @ 84845C0 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 4796b37ff4..fe88dbca0c 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -10,6 +10,6 @@ AlteringCave: @ 8484A58 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index a314ad3baa..5bfe546145 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -10,6 +10,6 @@ AncientTomb: @ 8484630 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index c632eb2048..dd4e120437 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -10,6 +10,6 @@ AquaHideout_1F: @ 8484144 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index ba017fb565..bc65150d61 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -10,6 +10,6 @@ AquaHideout_B1F: @ 8484160 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index ea15240b9d..d4bf343288 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -10,6 +10,6 @@ AquaHideout_B2F: @ 848417C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 455941160d..90e59a51e1 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index b4e2e712e4..776465f16e 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 7abe192b68..ab97ae84d5 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index a69128ee78..c53a2851b4 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -10,6 +10,6 @@ ArtisanCave_1F: @ 84849B0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index aba179fc64..f76fe69382 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -10,6 +10,6 @@ ArtisanCave_B1F: @ 8484994 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 8332c42360..12962e7dec 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index c6f06631c1..cec596b2da 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC return diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 2ed587f6eb..d4935ea9ef 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 5c02e0c8a5..3523eaf63f 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleArenaLobby: @ 848544C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 3f1eb25b20..7d2119ebee 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index ab0736581e..d92c6cbf41 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -20,9 +20,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA return diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 940ba24e6e..25883e9ed5 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 5d1a7eb82f..451192a452 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index e35435b275..59b5b15e4a 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index cef72bc09a..960fef2eb4 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 794dd9d1e3..8c22a9bc97 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -8,9 +8,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB setvar VAR_0x8004, 5 special CallFrontierUtilFunc checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B setvar VAR_0x8004, 9 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index d56a2a23d5..92329c6ef5 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index 3dc5d23cce..4cae9ed0c7 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index d63d3b2682..2715ade5c7 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index c09c9e61c7..529bcd0c33 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 return diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index ff8af8ca85..f2866b9b0d 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 060013cce1..19d06e0be6 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 574d0cbab0..07d7305798 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index 239c317211..e591be668f 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index dcb088c272..d49bb07d5d 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 1ee69c0778..506a31496b 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 68ca305469..3f5607922d 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index 5e0afedb5f..9743a7c365 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index ccaa1cbca6..831a39d2a5 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index a92f009dd0..ef5c8409f8 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 6da3143043..91d454fbe4 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 28de39cad9..d58e1fe81e 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 797022beb4..5aa95a63e8 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 90ae26c25e..34a8fae84e 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index bd2d38b378..8d920a8c8b 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 94e46b1968..66255315f4 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index fa1e08fafa..f8d9ff8538 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index e16e2a7003..989bffe9b6 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 727322b941..23a792934b 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -10,6 +10,6 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index a4cf64a781..58caac9039 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge1: @ 84855B8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index c363d54bf9..effcc53bda 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge2: @ 84855F0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index e5649a3695..d6867551e8 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge3: @ 848560C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index a9da9677cf..912cc41ff6 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge4: @ 8485628 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index 7f1142f2d0..a6febc0c86 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge5: @ 8485660 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index e07dd297f6..151890a147 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge6: @ 848567C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 22797d04e4..061d2102c8 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge7: @ 8485698 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 5494c964fd..e1b319e1d5 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge8: @ 84856D0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 5248720c75..916feb5699 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Lounge9: @ 84856EC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 4b3e7f79ad..7dcfb9d33e 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -10,6 +10,6 @@ BattleFrontier_Mart: @ 8485740 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index a30a148c25..b67df4029b 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -10,6 +10,6 @@ BattleFrontier_OutsideEast: @ 84852C4 .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index a42ac30ff2..312c1961ab 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -10,6 +10,6 @@ BattleFrontier_OutsideWest: @ 84851AC .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index a136e803da..dcf26742c0 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 4cd607aefa..6bcff1234b 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 6fcb187edf..03d9e36222 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -10,6 +10,6 @@ BattleFrontier_RankingHall: @ 848559C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 88f806e83f..099ab38e14 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -10,6 +10,6 @@ BattleFrontier_ReceptionGate: @ 84856B4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index 0fbbb55e33..fe55f82726 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -10,6 +10,6 @@ BattleFrontier_ScottsHouse: @ 8485644 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index bcbc06c90b..d9105ed4aa 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare01: @ 8484F60 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 24255ea1a2..cebb14906e 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare02: @ 8484F7C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 21e15dc82c..389cd65387 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare03: @ 8484F98 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index fae10152a5..3b09fce2e6 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare04: @ 8484FB4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index 17e05fc199..ec6eff68c6 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare05: @ 8484FD0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 9a1543a337..7890c30886 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare06: @ 8484FEC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 78d3cf7f49..7f1bb51f1e 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare07: @ 8485008 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index de960bab0c..a5d6415198 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare08: @ 8485024 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 96b2beb370..d396c65a66 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare09: @ 8485040 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 37901889fc..254c24708d 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare10: @ 848505C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index c188ecb869..765b74a0ad 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare11: @ 8485078 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index 11e6c7b989..e81801a353 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare12: @ 8485094 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 2f5746143d..356063c357 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare13: @ 84850B0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 5926a9d2ac..76ae3925cd 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare14: @ 84850CC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index e65db912d7..57e45e1b2b 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare15: @ 84850E8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index f8f97b671f..24aa3edcc2 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -10,6 +10,6 @@ BattlePyramidSquare16: @ 8485104 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index dabad3a713..c6b02f600b 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -10,6 +10,6 @@ BirthIsland_Exterior: @ 8485794 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index f2493d7386..82b752f90f 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -10,6 +10,6 @@ BirthIsland_Harbor: @ 84857B0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 384d08bd7f..f051c230cd 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -10,6 +10,6 @@ CaveOfOrigin_1F: @ 84842E8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index d8dab3bea9..7b70ba43f2 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -10,6 +10,6 @@ CaveOfOrigin_B1F: @ 8484358 .byte WEATHER_FOG_1 .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 14 + map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index d42f912da8..af622019a2 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -10,6 +10,6 @@ CaveOfOrigin_Entrance: @ 84842CC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index b8edb52bca..6b928bb3cc 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -10,6 +10,6 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 8d0f838923..0088131dc8 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -10,6 +10,6 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .byte WEATHER_FOG_1 .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 00e07549e0..75bd4189ea 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -10,6 +10,6 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .byte WEATHER_FOG_1 .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 16e2ce55af..c717661f4d 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -10,6 +10,6 @@ DesertRuins: @ 8483F68 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index c4f3a05c70..757d81e73e 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -10,6 +10,6 @@ DesertUnderpass: @ 8484978 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index c905fd6068..9314f753fb 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -10,6 +10,6 @@ DewfordTown: @ 84825EC .byte WEATHER_SUNNY .byte MAP_TYPE_TOWN .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 4463cc40e5..783a7eacc6 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -10,6 +10,6 @@ DewfordTown_Gym: @ 8482C60 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 1ba44b49de..600b027631 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -10,6 +10,6 @@ DewfordTown_Hall: @ 8482C7C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 219c70fc3a..cfaaaa698f 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -10,6 +10,6 @@ DewfordTown_House1: @ 8482C0C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 248b7a9902..2f9a36cf8f 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -10,6 +10,6 @@ DewfordTown_House2: @ 8482C98 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 6813134f93..ae98bd680b 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 43485dcad2..bb46a43d04 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 6bfc003936..032ef58ab3 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -10,6 +10,6 @@ DoubleBattleColosseum: @ 8484D84 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 2bebe5d125..b1ee8e3a43 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -10,6 +10,6 @@ EverGrandeCity: @ 8482598 .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 03ab762db4..bd2ab305f3 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 8da9ae7125..149c54cd8b 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 closemessage playse SE_DOOR checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_228BFD checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index fedc35c76a..da5c8fa476 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_DRAKE diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index dd23d11efd..0773a613ec 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GLACIA diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index b055ba8b17..d554ff768b 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_Hall1: @ 8483C58 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index a80a688e0b..646478a25d 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_Hall2: @ 8483C74 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index 18a9d90dcd..d7beaf36e4 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_Hall3: @ 8483C90 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 1aeb8e6a2d..8cf1eea6e9 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_Hall4: @ 8483CAC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index dd82e6b569..38279720eb 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_Hall5: @ 8483CC8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index c575b2f08f..865f90b91a 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_HallOfFame: @ 8483D00 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 9b9bdb5d61..ddb9ade89d 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 setvar VAR_TEMP_1, 1 call EverGrandeCity_HallOfFame_EventScript_2717C1 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5 end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 64bcaec0da..eb0d77d7bd 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_PHOEBE diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 46af6f51e1..2923564720 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 163663bb98..ec9f3e5425 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index c6a86baa50..90a42edea2 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 61370c18d4..4d9ee7f460 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index ce3356a954..b19db5fbb2 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -10,6 +10,6 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_SIDNEY diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index 0c2053b8bd..f32f0c30b5 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -10,6 +10,6 @@ FallarborTown: @ 8482624 .byte WEATHER_SUNNY .byte MAP_TYPE_TOWN .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 81dbad44ac..3435512f25 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -10,6 +10,6 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index a7bf0ae62f..dff1d26e02 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -10,9 +10,9 @@ FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 return diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 4e9484d11b..4b45ea55dd 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -10,6 +10,6 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 416d700d04..2465f36c8b 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -10,6 +10,6 @@ FallarborTown_BattleTentLobby: @ 8482D94 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index aa182e2ed8..d5362b8c5c 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -10,6 +10,6 @@ FallarborTown_House1: @ 8482E20 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index c8c22eacf3..7cb16bbf36 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -10,6 +10,6 @@ FallarborTown_House2: @ 8482E3C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 3119638bf6..65c5caaa60 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -10,6 +10,6 @@ FallarborTown_Mart: @ 8482D78 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 65df98a81e..b30b4874f1 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 5308b4e098..b818368bfa 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index e06051d7e1..af762d8329 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -10,6 +10,6 @@ FarawayIsland_Entrance: @ 848575C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index b45ac71c36..c37bacece6 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -10,6 +10,6 @@ FarawayIsland_Interior: @ 8485778 .byte WEATHER_SHADE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 3c9f51bc12..20278028f7 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -10,6 +10,6 @@ FieryPath: @ 8484048 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 3f671fb6c9..0bfccda3ce 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -10,6 +10,6 @@ FortreeCity: @ 8482528 .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 651b374887..4a640a8ada 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -10,6 +10,6 @@ FortreeCity_DecorationShop: @ 848361C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 54a45633dc..68f02747fc 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -10,6 +10,6 @@ FortreeCity_Gym: @ 848353C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 1c106b8f54..1b52dd7259 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -10,6 +10,6 @@ FortreeCity_House1: @ 8483520 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 1e20a0227e..02b76c3941 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -10,6 +10,6 @@ FortreeCity_House2: @ 84835AC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index f2d53219a1..1b039c24e8 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -10,6 +10,6 @@ FortreeCity_House3: @ 84835C8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index efc5f06bed..e675e063b2 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -10,6 +10,6 @@ FortreeCity_House4: @ 84835E4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index c4d07f46be..bac2fff5ba 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -10,6 +10,6 @@ FortreeCity_House5: @ 8483600 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 5179187bec..37af953ab8 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -10,6 +10,6 @@ FortreeCity_Mart: @ 8483590 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 9f2b78dd4c..f2fdf37695 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index ccfc5bd09b..1ad4484d92 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 4a754207b3..7578523b26 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -10,6 +10,6 @@ GraniteCave_1F: @ 8483F84 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index beb7fdb83a..64187397c9 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -10,6 +10,6 @@ GraniteCave_B1F: @ 8483FA0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 0eb017bc42..4fd519156d 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -10,6 +10,6 @@ GraniteCave_B2F: @ 8483FBC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 78df1ff837..0bd8e41b20 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -10,6 +10,6 @@ GraniteCave_StevensRoom: @ 8483FD8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 51f499ee46..52ea777a9d 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -10,6 +10,6 @@ InsideOfTruck: @ 8484EF0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 53bdc073ac..858975d7af 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 lockall setflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq InsideOfTruck_EventScript_23BF20 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq InsideOfTruck_EventScript_23BF46 end diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index a56a3e4d0b..767df72f02 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -10,6 +10,6 @@ IslandCave: @ 8484614 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 797760e918..f53bfbe652 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -10,6 +10,6 @@ JaggedPass: @ 848402C .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 006896453f..6ea1e048ce 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -10,6 +10,6 @@ LavaridgeTown: @ 8482608 .byte WEATHER_SUNNY .byte MAP_TYPE_TOWN .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index f210a9d114..8d7ab36db5 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -53,18 +53,18 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551 call_if_ne LavaridgeTown_EventScript_1EA65C delay 20 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LavaridgeTown_EventScript_1EA630 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LavaridgeTown_EventScript_1EA635 compare VAR_0x8008, 9 call_if_eq LavaridgeTown_EventScript_1EA6A1 compare VAR_0x8008, 9 call_if_ne LavaridgeTown_EventScript_1EA6AC checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq LavaridgeTown_EventScript_1EA5B5 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq LavaridgeTown_EventScript_1EA5DA end diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 6ea20174ca..86882ed341 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -10,6 +10,6 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .byte WEATHER_FOG_1 .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 579c1dd3ee..b393e3693c 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -10,6 +10,6 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .byte WEATHER_FOG_1 .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 418632b28e..596d13482d 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -10,6 +10,6 @@ LavaridgeTown_HerbShop: @ 8482CB4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 9a350db799..11bb01e136 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -10,6 +10,6 @@ LavaridgeTown_House: @ 8482D08 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 30683052be..1c3ce0cafe 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -10,6 +10,6 @@ LavaridgeTown_Mart: @ 8482D24 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index e657a688a4..0f18f64e9e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 3d40c93cfd..d66d90b733 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index dafbfaccd0..cf3ebf2f5e 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -10,6 +10,6 @@ LilycoveCity: @ 8482544 .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 515754f8c7..20baacc898 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -231,9 +231,9 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE lock faceplayer checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq LilycoveCity_EventScript_1E2DF8 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq LilycoveCity_EventScript_1E2E6B end diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 2049fd74c3..eb07c7d59b 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -10,6 +10,6 @@ LilycoveCity_ContestHall: @ 84836C4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 6aba3e4163..605d594d3c 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -10,6 +10,6 @@ LilycoveCity_ContestLobby: @ 84836A8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index a2737b05bc..0322b01e1e 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 112a6e8d71..92ccdc1b3b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 0c8cc574d9..eb728241b0 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -10,6 +10,6 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index cd6ded7d68..73ba491c32 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -10,6 +10,6 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index bae2b837d4..949b23403b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 88ca3ece3a..01f94ac14e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 1753be637e..bc62df7d66 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index c9b0870fa3..94a8d29c64 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 62d836d567..6c8070d803 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 7f970b4634..e818c894fa 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -10,6 +10,6 @@ LilycoveCity_Harbor: @ 8483750 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 4cc0a80614..ecae303728 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -10,6 +10,6 @@ LilycoveCity_House1: @ 8483788 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 988b7fa4cf..f3b0098808 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -10,6 +10,6 @@ LilycoveCity_House2: @ 84837A4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 41f01234c2..9126bb8fc5 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -10,6 +10,6 @@ LilycoveCity_House3: @ 84837C0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 656e60bf3c..6ddb9a5f72 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -10,6 +10,6 @@ LilycoveCity_House4: @ 84837DC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 0d6faebe8e..b0aef9efae 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 641859ac60..c58b692257 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 6a0ddfebcf..cdd8668ad9 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -10,6 +10,6 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index c040d77153..bcca0354dd 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index e9c27fd816..26c0789d63 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 78102855c5..aba9dcb3cf 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -10,6 +10,6 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 0384e495fc..f1cbaf5508 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -10,6 +10,6 @@ LilycoveCity_UnusedMart: @ 8483718 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 9aa0c9cc77..2465a86804 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -10,6 +10,6 @@ LinkContestRoom1: @ 8484DA0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 342ed7d0bd..f9274e58b6 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -10,6 +10,6 @@ LinkContestRoom2: @ 8484E64 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index ff29d7e872..1b445db4b7 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -10,6 +10,6 @@ LinkContestRoom3: @ 8484E80 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 025e5971e0..20720be06c 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -10,6 +10,6 @@ LinkContestRoom4: @ 8484E9C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 7c145d0e40..f2e9c6c55b 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -10,6 +10,6 @@ LinkContestRoom5: @ 8484EB8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 939d56426c..225a99e465 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -10,6 +10,6 @@ LinkContestRoom6: @ 8484ED4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index db13d6def4..a94244f95e 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -10,6 +10,6 @@ LittlerootTown: @ 84825B4 .byte WEATHER_SUNNY .byte MAP_TYPE_TOWN .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 9f589d2e4b..c0147fedd8 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -68,9 +68,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92 clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setobjectmovementtype 4, 8 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E7EB1 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E7EB9 return @@ -381,9 +381,9 @@ LittlerootTown_EventScript_1E815A:: @ 81E815A LittlerootTown_EventScript_1E8163:: @ 81E8163 lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E817D - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E8186 releaseall end @@ -399,9 +399,9 @@ LittlerootTown_EventScript_1E8186:: @ 81E8186 LittlerootTown_EventScript_1E818F:: @ 81E818F lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E81A9 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E81B2 releaseall end @@ -454,27 +454,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205 LittlerootTown_EventScript_1E8211:: @ 81E8211 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E8297 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E82A2 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E8281 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT closemessage checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E82AD - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E82F0 call LittlerootTown_EventScript_1E8693 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E8405 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E8448 goto LittlerootTown_EventScript_1E8686 end @@ -889,9 +889,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D lock faceplayer checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E8281 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 applymovement 4, LittlerootTown_Movement_2725A6 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 6224e7a509..edae81a87e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -10,6 +10,6 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index ec7eb66cee..4c9e566d0f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -10,6 +10,6 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 096f35c1e2..1093e5277a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -247,9 +247,9 @@ LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 EventScript_PlayerPCMale:: @ 81F860D lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C end diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 7681d9a83e..768c7d1b43 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -10,6 +10,6 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 9e5d0c8070..8729bedeb3 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -10,6 +10,6 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index e0cb7dfe70..4d6661ad77 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -251,9 +251,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 lockall goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED end @@ -271,9 +271,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E waitmovement 0 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F setflag FLAG_0x125 releaseall @@ -300,9 +300,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A EventScript_PlayerPCFemale:: @ 81F9553 lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 3e55729a88..49ab947271 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -10,6 +10,6 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 3534047ae7..b5dc7d060a 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -171,9 +171,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 waitmovement 0 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C playse SE_PC_ON waitse @@ -533,9 +533,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F setvar VAR_0x4084, 5 setflag FLAG_0x074 @@ -605,9 +605,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC compare VAR_0x40D3, 2 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 release end @@ -622,9 +622,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C release end @@ -639,9 +639,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 release end @@ -656,9 +656,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 release end diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 851f562788..897f4f4fdf 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -10,6 +10,6 @@ MagmaHideout_1F: @ 8484828 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index d8118281f1..cafe144d8d 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -10,6 +10,6 @@ MagmaHideout_2F_1R: @ 8484844 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 1de48fb62e..1493ae0769 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -10,6 +10,6 @@ MagmaHideout_2F_2R: @ 8484860 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index b374192781..5e1ccdcda3 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -10,6 +10,6 @@ MagmaHideout_2F_3R: @ 84848EC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index d5347ed254..492fb8a7e6 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -10,6 +10,6 @@ MagmaHideout_3F_1R: @ 848487C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index 45cda066b5..e1cd32f9ce 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -10,6 +10,6 @@ MagmaHideout_3F_2R: @ 8484898 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index 347ec1897c..b21df5e70d 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -10,6 +10,6 @@ MagmaHideout_3F_3R: @ 84848D0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index f11c5eadd3..e10a780f7a 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -10,6 +10,6 @@ MagmaHideout_4F: @ 84848B4 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 36bff96d68..5a3c1106bd 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -10,6 +10,6 @@ MarineCave_End: @ 8484A04 .byte WEATHER_FOG_1 .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 14 + map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 9feb17fe2b..338da988ae 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -10,6 +10,6 @@ MarineCave_Entrance: @ 84849E8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 14 + map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index f6aadf1ff6..aa107e460b 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -10,6 +10,6 @@ MauvilleCity: @ 84824F0 .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index baa4f18d57..d4434e8ba0 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -10,6 +10,6 @@ MauvilleCity_BikeShop: @ 8483280 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 45fd23da08..5c7399ae6e 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -10,6 +10,6 @@ MauvilleCity_GameCorner: @ 84832B8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index 736b491db8..cd38ec176e 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -10,6 +10,6 @@ MauvilleCity_Gym: @ 8483264 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 6a29041cc6..261e0e45bb 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -10,6 +10,6 @@ MauvilleCity_House1: @ 848329C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 3fc04798e6..3a584fe41c 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -10,6 +10,6 @@ MauvilleCity_House2: @ 84832D4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 3722f45653..b3d85a0c66 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -10,6 +10,6 @@ MauvilleCity_Mart: @ 8483328 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 659176f800..207dfb5263 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 462fdc47dc..00bf23b830 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index abf0e85c5e..85ba8dd6b2 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -10,6 +10,6 @@ MeteorFalls_1F_1R: @ 8483EC0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index a0d0741216..79b56a254a 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -10,6 +10,6 @@ MeteorFalls_1F_2R: @ 8483EDC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 078998891c..0d1edf89e3 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -10,6 +10,6 @@ MeteorFalls_B1F_1R: @ 8483EF8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index dabf884b42..ed9fe8bebb 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -10,6 +10,6 @@ MeteorFalls_B1F_2R: @ 8483F14 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 7236159f32..28b265d446 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -10,6 +10,6 @@ MeteorFalls_StevensCave: @ 8484A74 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 584ed3f7ff..59ce7edbf2 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -10,6 +10,6 @@ MirageTower_1F: @ 8484908 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index 03f762758b..efb9705383 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -10,6 +10,6 @@ MirageTower_2F: @ 8484924 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index 3930ca2ba4..7362c553e3 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -10,6 +10,6 @@ MirageTower_3F: @ 8484940 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index 505e671eb8..842b12bb68 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -10,6 +10,6 @@ MirageTower_4F: @ 848495C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index f5196d035e..641faf0f79 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -10,6 +10,6 @@ MossdeepCity: @ 8482560 .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 302f13d7e0..d32f3a3062 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -10,6 +10,6 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 86e796c525..856f76166e 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -10,6 +10,6 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 1b325fc9af..12421b7872 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -10,6 +10,6 @@ MossdeepCity_Gym: @ 84838BC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 25b8f5558b..365120f528 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -10,6 +10,6 @@ MossdeepCity_House1: @ 84838D8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 718ed1f1ab..76673969a0 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -10,6 +10,6 @@ MossdeepCity_House2: @ 84838F4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 53aeb0a29f..0d5be2fede 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -10,6 +10,6 @@ MossdeepCity_House3: @ 8483964 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 41cbc6a7ac..ba90597579 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -10,6 +10,6 @@ MossdeepCity_House4: @ 848399C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 659c7e1333..7de6cb5de6 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -10,6 +10,6 @@ MossdeepCity_Mart: @ 8483948 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 75f151c518..b97b7108d7 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 5a98563b8c..263511ce97 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index a0dd1e0501..5e99c584ad 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -10,6 +10,6 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 7f6c20a663..3f4eab34e5 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -10,6 +10,6 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index c4b106589e..e55bc07f7f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -349,9 +349,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A closemessage clearflag FLAG_0x075 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 68da469654..693801b86e 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -10,6 +10,6 @@ MossdeepCity_StevensHouse: @ 8483980 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 04bfa4a450..9cd0659030 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -10,6 +10,6 @@ MtChimney: @ 8484010 .byte WEATHER_ASH .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index e12bfbacb7..0f858f9c1e 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -10,6 +10,6 @@ MtChimney_CableCarStation: @ 8483DFC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 241f3dff38..f60532fa2c 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -10,6 +10,6 @@ MtPyre_1F: @ 8484064 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index a542638a77..1abca71436 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -10,6 +10,6 @@ MtPyre_2F: @ 8484080 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index b09729f813..3f54a36701 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -10,6 +10,6 @@ MtPyre_3F: @ 848409C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index bee0a548f4..1c41c3a6d7 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -10,6 +10,6 @@ MtPyre_4F: @ 84840B8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index d17d642628..17c8eddcd8 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -10,6 +10,6 @@ MtPyre_5F: @ 84840D4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index a783fc7c38..4e80828207 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -10,6 +10,6 @@ MtPyre_6F: @ 84840F0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index b9b2575e8a..3b703a41e2 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -10,6 +10,6 @@ MtPyre_Exterior: @ 848410C .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index d1a65792fd..29a28e99b7 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -10,6 +10,6 @@ MtPyre_Summit: @ 8484128 .byte WEATHER_FOG_1 .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 59e9a3f594..cf56d8fb48 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -10,6 +10,6 @@ NavelRock_B1F: @ 84858C8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index 0711b5b815..d6f9b9d5a0 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -10,6 +10,6 @@ NavelRock_Bottom: @ 8485AC0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index fd5b2c0f39..2dc18c232d 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -10,6 +10,6 @@ NavelRock_Down01: @ 848598C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 7827fe4cb3..731e4e2fb7 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -10,6 +10,6 @@ NavelRock_Down02: @ 84859A8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 4652974821..fdf22dbc3f 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -10,6 +10,6 @@ NavelRock_Down03: @ 84859C4 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index 7ee2eee47b..7f93253b17 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -10,6 +10,6 @@ NavelRock_Down04: @ 84859E0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 3f41991959..602f440e0d 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -10,6 +10,6 @@ NavelRock_Down05: @ 84859FC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index 189c269691..c3ec1fe559 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -10,6 +10,6 @@ NavelRock_Down06: @ 8485A18 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 378b7bbd29..f3a5ab3f34 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -10,6 +10,6 @@ NavelRock_Down07: @ 8485A34 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index 7ad3e736a6..3a6f28081a 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -10,6 +10,6 @@ NavelRock_Down08: @ 8485A50 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 60cec1da89..f132b9f669 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -10,6 +10,6 @@ NavelRock_Down09: @ 8485A6C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index 08b2d975b5..3ee4d62cec 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -10,6 +10,6 @@ NavelRock_Down10: @ 8485A88 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 8182f1c418..ef2ad00b7c 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -10,6 +10,6 @@ NavelRock_Down11: @ 8485AA4 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index a0ec2bdc20..dbc28a7816 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -10,6 +10,6 @@ NavelRock_Entrance: @ 84858AC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 582fd9cbc1..e13422c260 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -10,6 +10,6 @@ NavelRock_Exterior: @ 8485874 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 53c0fdaed6..49087db7e2 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -10,6 +10,6 @@ NavelRock_Fork: @ 84858E4 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 79b1dbafb6..1df05a2bc3 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -10,6 +10,6 @@ NavelRock_Harbor: @ 8485890 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 9c0a7b1c0b..e99a64054e 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -10,6 +10,6 @@ NavelRock_Top: @ 8485970 .byte WEATHER_SHADE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index 3fa05854eb..33266d8f0b 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -10,6 +10,6 @@ NavelRock_Up1: @ 8485900 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index 62fed7dc3b..f93dc31ed6 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -10,6 +10,6 @@ NavelRock_Up2: @ 848591C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index 723329d92f..d816e58f1a 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -10,6 +10,6 @@ NavelRock_Up3: @ 8485938 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 33501a6783..583c672b43 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -10,6 +10,6 @@ NavelRock_Up4: @ 8485954 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 092cf841fc..a8a1df2968 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -10,6 +10,6 @@ NewMauville_Entrance: @ 8484470 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 3f8d3192ed..57966d38fe 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -10,6 +10,6 @@ NewMauville_Inside: @ 848448C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 8d94687a6b..83f3624dcc 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -10,6 +10,6 @@ OldaleTown: @ 84825D0 .byte WEATHER_SUNNY .byte MAP_TYPE_TOWN .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 96863ceed3..a246adc4ff 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -255,9 +255,9 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 OldaleTown_EventScript_1E90E6:: @ 81E90E6 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq OldaleTown_EventScript_1E90FE - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq OldaleTown_EventScript_1E910C end diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 934cb22b03..6444d83c48 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -10,6 +10,6 @@ OldaleTown_House1: @ 8482B80 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 55a6fd8a30..0df8e3c0e3 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -10,6 +10,6 @@ OldaleTown_House2: @ 8482B9C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 4727f0da96..df506157b2 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -10,6 +10,6 @@ OldaleTown_Mart: @ 8482BF0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index cdd572a957..250f5d1644 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 24cf90aab5..1562c900f8 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 5b572682b9..786fa9d713 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -10,6 +10,6 @@ PacifidlogTown: @ 848265C .byte WEATHER_SUNNY .byte MAP_TYPE_TOWN .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 511692df1d..a4f350e069 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -10,6 +10,6 @@ PacifidlogTown_House1: @ 8482F8C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 04d6853232..8a3e0ada4e 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -10,6 +10,6 @@ PacifidlogTown_House2: @ 8482FA8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 48f4617978..ed538fa8b0 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -10,6 +10,6 @@ PacifidlogTown_House3: @ 8482FC4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index a1edad163b..7108a0104d 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -10,6 +10,6 @@ PacifidlogTown_House4: @ 8482FE0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 850b4864b4..07da6a24dc 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -10,6 +10,6 @@ PacifidlogTown_House5: @ 8482FFC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index b301336540..9db47a72be 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index db6f8b3df8..e16d7b5e53 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 4dae59652d..6a4f82bfa2 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -10,6 +10,6 @@ PetalburgCity: @ 84824B8 .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index e320638943..626f37c3d7 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -10,6 +10,6 @@ PetalburgCity_Gym: @ 8483034 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 85bc3e460d..058d2ae6b9 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -10,6 +10,6 @@ PetalburgCity_House1: @ 8483050 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index f7f16748f0..d8ceeafbe6 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -10,6 +10,6 @@ PetalburgCity_House2: @ 848306C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 624c8b6a1f..757430cab1 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -10,6 +10,6 @@ PetalburgCity_Mart: @ 84830C0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 2a05feb291..61b328753f 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 473e3c7363..c6cacfc3a0 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 91ee3622bc..04b7236660 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -10,6 +10,6 @@ PetalburgCity_WallysHouse: @ 8483018 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 94b5bdfd1b..e25f6f7507 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -10,6 +10,6 @@ PetalburgWoods: @ 8483FF4 .byte WEATHER_SHADE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 9029f306f5..c0864092b9 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -10,6 +10,6 @@ RecordCorner: @ 8484D68 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 64836245fc..5a98f7e22f 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -10,6 +10,6 @@ Route101: @ 8482678 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index deea27e74c..e7f5f0af6b 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -238,9 +238,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setvar VAR_0x4060, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq Route101_EventScript_1EBE85 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq Route101_EventScript_1EBE89 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index dc2b3240a6..7a0fcacdab 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -10,6 +10,6 @@ Route102: @ 8482694 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index c7510701e8..b614f32eb0 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -10,6 +10,6 @@ Route103: @ 84826B0 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 6b793286ed..463db7b495 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -20,9 +20,9 @@ Route103_EventScript_1EC3AE:: @ 81EC3AE Route103_EventScript_1EC3C1:: @ 81EC3C1 lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route103_EventScript_1EC3DA - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route103_EventScript_1EC434 end diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index df6f0d34a6..101e690d5c 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -10,6 +10,6 @@ Route104: @ 84826CC .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 2dfb42d749..1b3adf2a24 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -72,9 +72,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 Route104_EventScript_1ECD11:: @ 81ECD11 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route104_EventScript_1ECD29 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route104_EventScript_1ECD2E return @@ -88,9 +88,9 @@ Route104_EventScript_1ECD2E:: @ 81ECD2E Route104_EventScript_1ECD33:: @ 81ECD33 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route104_EventScript_1ECD4B - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route104_EventScript_1ECE6F end diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 139efeb74d..c52a076de3 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -10,6 +10,6 @@ Route104_MrBrineysHouse: @ 8483D70 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index cd34cd3f4c..eaf0735503 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -10,6 +10,6 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index ea0b1390a9..0de3a4b478 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -10,6 +10,6 @@ Route104_Prototype: @ 8485AF8 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index fce17ef009..e72f9a6060 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -10,6 +10,6 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 59ea4f3dfd..5c6b2fc153 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -10,6 +10,6 @@ Route105: @ 84826E8 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 9292cae39e..f0f032b8b5 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -10,6 +10,6 @@ Route106: @ 8482704 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index e038ea7057..a4ec264ead 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -10,6 +10,6 @@ Route107: @ 8482720 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index a6314172f2..106fe3135e 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -10,6 +10,6 @@ Route108: @ 848273C .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 489ea8789a..045f422567 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -10,6 +10,6 @@ Route109: @ 8482758 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 1f6f067cad..68dc54b777 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -10,6 +10,6 @@ Route109_SeashoreHouse: @ 8485B30 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index c1dd037899..14194cd37b 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -10,6 +10,6 @@ Route110: @ 8482774 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index ba7bced217..4e96a592c8 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -379,9 +379,9 @@ Route110_EventScript_1EF763:: @ 81EF763 Route110_EventScript_1EF76E:: @ 81EF76E lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq Route110_EventScript_1EF7E1 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq Route110_EventScript_1EF7E6 applymovement 28, Route110_Movement_2725AA waitmovement 0 @@ -397,9 +397,9 @@ Route110_EventScript_1EF76E:: @ 81EF76E compare VAR_0x8008, 3 call_if_eq Route110_EventScript_1EF964 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route110_EventScript_1EF7EB - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route110_EventScript_1EF865 releaseall end diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index d98361dd3d..50f4b763ff 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -10,6 +10,6 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 1 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 24baeb0427..4e09eeef32 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -10,6 +10,6 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 1 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 9d9cf23edf..6657162b76 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -10,6 +10,6 @@ Route110_TrickHouseCorridor: @ 8485B84 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 3ea5a8eb86..52a39914fe 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -10,6 +10,6 @@ Route110_TrickHouseEnd: @ 8485B68 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 8e202e650d..4e651e5f97 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -10,6 +10,6 @@ Route110_TrickHouseEntrance: @ 8485B4C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 593b807ce1..de4ff3ed2e 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -10,6 +10,6 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index e632dbca98..8a2b708ea4 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -10,6 +10,6 @@ Route110_TrickHousePuzzle2: @ 8485BBC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 77e2e4a38a..37a517f72f 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -10,6 +10,6 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 9ad6159f31..993f002d70 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -10,6 +10,6 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 910638d825..b22b21bcef 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -10,6 +10,6 @@ Route110_TrickHousePuzzle5: @ 8485C10 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index ab6c752cb2..e10fd78b23 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -10,6 +10,6 @@ Route110_TrickHousePuzzle6: @ 8485C2C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 68a7098fbe..40f43f9d84 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -10,6 +10,6 @@ Route110_TrickHousePuzzle7: @ 8485C48 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index a330e3c1f7..1755152924 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -10,6 +10,6 @@ Route110_TrickHousePuzzle8: @ 8485C64 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 449498ed49..cb975e74a3 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -10,6 +10,6 @@ Route111: @ 8482790 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 6b8763fd70..ad6a165720 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -53,9 +53,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87 Route111_EventScript_1F0DC2:: @ 81F0DC2 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route111_EventScript_1F0DDA - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route111_EventScript_1F0DE0 return diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 70bbe3777f..a3c2a0161a 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -10,6 +10,6 @@ Route111_OldLadysRestStop: @ 8483DC4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index dea0352e68..12e4080890 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -10,6 +10,6 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 5961e48c2e..70e0f2d65a 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -10,6 +10,6 @@ Route112: @ 84827AC .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 8e1dbc8079..fd9038c12f 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -10,6 +10,6 @@ Route112_CableCarStation: @ 8483DE0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index e1b0827129..deaacca366 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -10,6 +10,6 @@ Route113: @ 84827C8 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 9f31f510f0..44a87e5efe 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -10,6 +10,6 @@ Route113_GlassWorkshop: @ 8485CB8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index c0920ada92..318efdbaf9 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -10,6 +10,6 @@ Route114: @ 84827E4 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index a1ad307e41..ca042d6b4e 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -10,6 +10,6 @@ Route114_FossilManiacsHouse: @ 8483E18 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index 2506956710..be53b84cea 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -10,6 +10,6 @@ Route114_FossilManiacsTunnel: @ 8483E34 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 8ba9dd58cd..51023a8006 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -10,6 +10,6 @@ Route114_LanettesHouse: @ 8483E50 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 5da7c89903..70e831aeec 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -10,6 +10,6 @@ Route115: @ 8482800 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index d0f4bfedf4..e97885bc78 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -10,6 +10,6 @@ Route116: @ 848281C .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index ce7de5c71d..1c3abde780 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -10,6 +10,6 @@ Route116_TunnelersRestHouse: @ 8483E6C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index c720839deb..1d5eda074a 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -10,6 +10,6 @@ Route117: @ 8482838 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index d8fb67ce9d..ba48de2288 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -10,6 +10,6 @@ Route117_PokemonDayCare: @ 8483E88 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 826281c095..e0b5416432 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -10,6 +10,6 @@ Route118: @ 8482854 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index cb9b211d98..7181f6b0d5 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -10,6 +10,6 @@ Route119: @ 8482870 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 229db6da53..978067ddf6 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -42,9 +42,9 @@ Route119_EventScript_1F4488:: @ 81F4488 lockall addobject 25 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq Route119_EventScript_1F4501 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq Route119_EventScript_1F4506 delay 65 compare VAR_TEMP_1, 1 @@ -62,9 +62,9 @@ Route119_EventScript_1F4488:: @ 81F4488 addobject 16 delay 30 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route119_EventScript_1F450B - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route119_EventScript_1F4585 releaseall end diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index e06dc31477..334b858ecc 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -10,6 +10,6 @@ Route119_House: @ 8485D28 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index ce15e7ea7b..e5e7abbc98 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -10,6 +10,6 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index eb8d25cd0a..c81f9731c7 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -10,6 +10,6 @@ Route119_WeatherInstitute_2F: @ 8485D0C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index a3b062bcaa..626b57a94d 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -10,6 +10,6 @@ Route120: @ 848288C .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 5f744afafd..3f070c2ec0 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -10,6 +10,6 @@ Route121: @ 84828A8 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 3617aa5b01..fa645a6934 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -10,6 +10,6 @@ Route121_SafariZoneEntrance: @ 8483EA4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 7e6dc55c26..eddd1a2347 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -10,6 +10,6 @@ Route122: @ 84828C4 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 9eba6be87f..a215c35923 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -10,6 +10,6 @@ Route123: @ 84828E0 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 009b6fa98f..163625aaed 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -10,6 +10,6 @@ Route123_BerryMastersHouse: @ 8485CD4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 43aab1b68a..c9ae442b7a 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -10,6 +10,6 @@ Route124: @ 84828FC .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 777edeff27..db9097ce54 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -10,6 +10,6 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 8cf6f85310..12ea805319 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -10,6 +10,6 @@ Route125: @ 8482918 .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 3e489dffd2..86225727fa 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -10,6 +10,6 @@ Route126: @ 8482934 .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 950e11df7b..b237a42ab1 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -10,6 +10,6 @@ Route127: @ 8482950 .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 6065e257ca..2875033e97 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -10,6 +10,6 @@ Route128: @ 848296C .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 1bc9ac5f0b..645cc7d92e 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -10,6 +10,6 @@ Route129: @ 8482988 .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index bff8b4e40d..4c03656acc 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -10,6 +10,6 @@ Route130: @ 84829A4 .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 3e6bf34b36..e84799fd4d 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -10,6 +10,6 @@ Route131: @ 84829C0 .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 4e292a92b6..50630af030 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -10,6 +10,6 @@ Route132: @ 84829DC .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 26428b3dc6..ed6b7d2cea 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -10,6 +10,6 @@ Route133: @ 84829F8 .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index d1df504edd..8204e2815d 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -10,6 +10,6 @@ Route134: @ 8482A14 .byte WEATHER_SUNNY .byte MAP_TYPE_6 .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 6e7bb70d4a..0cbd55b24d 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -10,6 +10,6 @@ RustboroCity: @ 848250C .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 941f731614..345faa51ca 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -677,9 +677,9 @@ RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 Route104_EventScript_1E0DD1:: @ 81E0DD1 RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq RustboroCity_EventScript_1E0DE9 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq RustboroCity_EventScript_1E0DEE return @@ -821,9 +821,9 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq RustboroCity_EventScript_1E100B - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq RustboroCity_EventScript_1E1114 end diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 40742887b4..8ffdf2c7b6 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -10,6 +10,6 @@ RustboroCity_CuttersHouse: @ 8483478 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index d86b8537c0..a6f55163bc 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -10,6 +10,6 @@ RustboroCity_DevonCorp_1F: @ 8483344 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index b0da75514b..bb548c44e5 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -10,6 +10,6 @@ RustboroCity_DevonCorp_2F: @ 8483360 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 21a33d5b8b..d37f055a51 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -10,6 +10,6 @@ RustboroCity_DevonCorp_3F: @ 848337C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index b2a4da3172..9d3a63c8c6 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -10,6 +10,6 @@ RustboroCity_Flat1_1F: @ 8483424 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 5a9a5a1332..ce47b6cb41 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -10,6 +10,6 @@ RustboroCity_Flat1_2F: @ 8483440 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 8df5659360..dc2a68edf5 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -10,6 +10,6 @@ RustboroCity_Flat2_1F: @ 84834B0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 92161bb4d8..1d117d3166 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -10,6 +10,6 @@ RustboroCity_Flat2_2F: @ 84834CC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index fafca84e7f..037ca68211 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -10,6 +10,6 @@ RustboroCity_Flat2_3F: @ 84834E8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 8c07e3637c..72dc7ee47e 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -10,6 +10,6 @@ RustboroCity_Gym: @ 8483398 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 94ae5e1e41..cff9064e93 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -10,6 +10,6 @@ RustboroCity_House1: @ 848345C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 51a6f79844..1de4f0e368 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -10,6 +10,6 @@ RustboroCity_House2: @ 8483494 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 89e62cf507..c1a0312e37 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -10,6 +10,6 @@ RustboroCity_House3: @ 8483504 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 766c1cb0c4..bb41aab1dd 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -10,6 +10,6 @@ RustboroCity_Mart: @ 8483408 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 17f717230a..4c5c500740 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index e7a1999cc8..8e70f4c809 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 909e85c691..9b14670424 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -10,6 +10,6 @@ RustboroCity_PokemonSchool: @ 84833B4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 4dc4e2797e..70a4776816 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -10,6 +10,6 @@ RusturfTunnel: @ 8483F30 .byte WEATHER_FOG_1 .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 9c1f2bab2c..37128821c2 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -10,6 +10,6 @@ SSTidalCorridor: @ 8484F0C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 6db9d2415d..f86d3ac06c 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -10,6 +10,6 @@ SSTidalLowerDeck: @ 8484F28 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index a5788a49f8..0d1f4db63f 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -10,6 +10,6 @@ SSTidalRooms: @ 8484F44 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 3e667fafce..ebcb62f9a3 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -10,6 +10,6 @@ SafariZone_North: @ 8485158 .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 7342546118..9db5fd596f 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -10,6 +10,6 @@ SafariZone_Northeast: @ 848528C .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 786316fcd6..ca59f45e79 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -10,6 +10,6 @@ SafariZone_Northwest: @ 848513C .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 1f02725b0b..fbb6f4d058 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -10,6 +10,6 @@ SafariZone_RestHouse: @ 8485270 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 5c60a541b7..1567935d26 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -10,6 +10,6 @@ SafariZone_South: @ 8485190 .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 54f2c505ac..55ff682323 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -10,6 +10,6 @@ SafariZone_Southeast: @ 84852A8 .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 332d2f9a4a..189fa09b87 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -10,6 +10,6 @@ SafariZone_Southwest: @ 8485174 .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 1de3fd4139..84c09df3fa 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -10,6 +10,6 @@ ScorchedSlab: @ 84846BC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 417467ac57..8e62470ac1 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Entrance: @ 84841B4 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index e259b065bf..9b84e5d960 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room1: @ 84841D0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 6331b3b185..b7d4e47d78 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room2: @ 84841EC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index a91ef42ef1..b5a032b603 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room3: @ 8484208 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 7385a41fba..75b51c3436 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room4: @ 8484224 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index aa2b0dc56e..6b053fc71c 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room5: @ 8484240 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 2f76c9b8f4..d1346acd86 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room6: @ 848425C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index 3640bb597a..b5b4aca03b 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room7: @ 8484278 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 66e6523f02..0ada4ab71a 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room8: @ 8484294 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 2f08ec83a0..4d2be9474a 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -10,6 +10,6 @@ SeafloorCavern_Room9: @ 84842B0 .byte WEATHER_FOG_1 .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 14 + map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 541842c26f..5fa5dccc9c 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -10,6 +10,6 @@ SealedChamber_InnerRoom: @ 84846A0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 5fa6728d85..3930e818dd 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -10,6 +10,6 @@ SealedChamber_OuterRoom: @ 8484684 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index f75acd84a6..60eeeab322 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -10,6 +10,6 @@ SecretBase_BlueCave1: @ 8484AC8 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 6b80b45bb1..348a5cd021 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -10,6 +10,6 @@ SecretBase_BlueCave2: @ 8484B70 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 19a4afdfda..26ab5ef93a 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -10,6 +10,6 @@ SecretBase_BlueCave3: @ 8484C18 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 3a51deec48..5e253d51e8 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -10,6 +10,6 @@ SecretBase_BlueCave4: @ 8484CC0 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 7a79eab3e3..ab531bf5cb 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -10,6 +10,6 @@ SecretBase_BrownCave1: @ 8484AAC .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 5f0e61f8c6..464bcd059a 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -10,6 +10,6 @@ SecretBase_BrownCave2: @ 8484B54 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index bd88bf1d3f..923b2c4be8 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -10,6 +10,6 @@ SecretBase_BrownCave3: @ 8484BFC .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 8183eee678..6d61f06a72 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -10,6 +10,6 @@ SecretBase_BrownCave4: @ 8484CA4 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 774e8471ea..82fc8c4e30 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -10,6 +10,6 @@ SecretBase_RedCave1: @ 8484A90 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 2137748afc..e4a2176d71 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -10,6 +10,6 @@ SecretBase_RedCave2: @ 8484B38 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 04b0ae23a0..9317921e20 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -10,6 +10,6 @@ SecretBase_RedCave3: @ 8484BE0 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 94c8605a02..62fd094a45 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -10,6 +10,6 @@ SecretBase_RedCave4: @ 8484C88 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 85e94f1581..4807cc4852 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -10,6 +10,6 @@ SecretBase_Shrub1: @ 8484B1C .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 7beeb3d8b0..56df5fd2f2 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -10,6 +10,6 @@ SecretBase_Shrub2: @ 8484BC4 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 18b1f132ac..3b5ade8f3b 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -10,6 +10,6 @@ SecretBase_Shrub3: @ 8484C6C .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 72c5724f6f..816b963cb5 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -10,6 +10,6 @@ SecretBase_Shrub4: @ 8484D14 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index a9a3416964..f1ed545a5a 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -10,6 +10,6 @@ SecretBase_Tree1: @ 8484B00 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 86898ed155..2d8c2652cf 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -10,6 +10,6 @@ SecretBase_Tree2: @ 8484BA8 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 6ef9407965..e4f703d211 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -10,6 +10,6 @@ SecretBase_Tree3: @ 8484C50 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 2a2523a074..7cf8ef0249 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -10,6 +10,6 @@ SecretBase_Tree4: @ 8484CF8 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index d15eacc36e..9bc1b071eb 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -10,6 +10,6 @@ SecretBase_YellowCave1: @ 8484AE4 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index a1afc748a2..60c0f49f0f 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -10,6 +10,6 @@ SecretBase_YellowCave2: @ 8484B8C .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 798754531a..b82555cf42 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -10,6 +10,6 @@ SecretBase_YellowCave3: @ 8484C34 .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 89921f1d4d..d7056f380c 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -10,6 +10,6 @@ SecretBase_YellowCave4: @ 8484CDC .byte WEATHER_NONE .byte MAP_TYPE_SECRET_BASE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 507ad70549..c4d7d39e9f 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -10,6 +10,6 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 1d334424b1..f9983a781e 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -10,6 +10,6 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 98614de643..656df81888 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -10,6 +10,6 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 05b77a442b..58669c0c6a 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -10,6 +10,6 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index b1ab8a459e..7f21d0a22d 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -10,6 +10,6 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 0c8380b794..21ea185eaa 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -10,6 +10,6 @@ ShoalCave_LowTideLowerRoom: @ 848441C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 8a977c94ec..7d7089f854 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -10,6 +10,6 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index fe4b69f968..ac5f23b1e1 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -10,6 +10,6 @@ SingleBattleColosseum: @ 8484D30 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 842ec79cda..9f76317d8d 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -10,6 +10,6 @@ SkyPillar_1F: @ 8484764 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index e018869b9d..8335107025 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -10,6 +10,6 @@ SkyPillar_2F: @ 8484780 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index e3b2c3c40c..5381079f63 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -10,6 +10,6 @@ SkyPillar_3F: @ 848479C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 23addaa769..ff91215e06 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -10,6 +10,6 @@ SkyPillar_4F: @ 84847B8 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 46830945d5..06618c7667 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -10,6 +10,6 @@ SkyPillar_5F: @ 84847F0 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index bafe1880a4..434b1f85a1 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -10,6 +10,6 @@ SkyPillar_Entrance: @ 848472C .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 5e7ff153cc..3ca072c808 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -10,6 +10,6 @@ SkyPillar_Outside: @ 8484748 .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index d4afb6ad16..07dbd38bb4 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -10,6 +10,6 @@ SkyPillar_Top: @ 848480C .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 12 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 335a1a0947..b8454f6560 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -10,6 +10,6 @@ SlateportCity: @ 84824D4 .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 0b6c6bd39a..e9044f1e9c 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -10,6 +10,6 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 74c64d0f2b..9df0e0a6a5 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -10,9 +10,9 @@ SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 return diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 926a367eeb..0a273edef0 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -10,6 +10,6 @@ SlateportCity_BattleTentCorridor: @ 8483130 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index d4689afde9..6bbbbf45fb 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -10,6 +10,6 @@ SlateportCity_BattleTentLobby: @ 8483114 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 5a31901a37..922f84f1a7 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -10,6 +10,6 @@ SlateportCity_Harbor: @ 84831D8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 06e2689cdd..1e48dfb549 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -10,6 +10,6 @@ SlateportCity_House1: @ 8483168 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 5612c6df05..6028d12fba 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -10,6 +10,6 @@ SlateportCity_House2: @ 84831F4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 764b8e9b5b..2d53ac8c39 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -10,6 +10,6 @@ SlateportCity_Mart: @ 8483248 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 40b265c1d8..b75a12f600 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -10,6 +10,6 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 857443db14..a571c2372e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -10,6 +10,6 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 0c4696d863..37f19272d8 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 8026aaf415..1cac2f35ed 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ SlateportCity_PokemonCenter_2F: @ 848322C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 90b17f14a9..b3b0dc8995 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -10,6 +10,6 @@ SlateportCity_PokemonFanClub: @ 8483184 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 48d1845174..e702530ef6 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -10,6 +10,6 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index b868e843af..8139d7604c 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -10,6 +10,6 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index e635b6f807..1b6832fbe9 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -10,6 +10,6 @@ SootopolisCity: @ 848257C .byte WEATHER_SUNNY .byte MAP_TYPE_CITY .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 8b5c93c0d0..1d71e09232 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -10,6 +10,6 @@ SootopolisCity_Gym_1F: @ 8483A28 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 84caedcf87..c06afbc1b3 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -10,6 +10,6 @@ SootopolisCity_Gym_B1F: @ 8483A44 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 0b4eae6199..f7621f917b 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -10,6 +10,6 @@ SootopolisCity_House1: @ 8483AB4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index a0d8b4fb49..c329627185 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -10,6 +10,6 @@ SootopolisCity_House2: @ 8483AD0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 015f6fe6c5..bd90fabc00 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -10,6 +10,6 @@ SootopolisCity_House3: @ 8483AEC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index 21c8c9235c..f715682877 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -10,6 +10,6 @@ SootopolisCity_House4: @ 8483B08 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 60fa216ca0..d3d90fb055 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -10,6 +10,6 @@ SootopolisCity_House5: @ 8483B24 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 112aa8a6d3..e3daef4ed2 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -10,6 +10,6 @@ SootopolisCity_House6: @ 8483B40 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index a016164191..db988ed22c 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -10,6 +10,6 @@ SootopolisCity_House7: @ 8483B5C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index b89221bacb..47f68b58fe 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -10,6 +10,6 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 4bdd9ef8d9..131540c7ac 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -10,6 +10,6 @@ SootopolisCity_Mart: @ 8483A98 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index be2d37eb62..153be53cba 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -10,6 +10,6 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index 6635dc3d7d..e0355b0745 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -10,6 +10,6 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index c66b725fd9..75da1fc474 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 3a2844f4ed..f9e1c51896 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index f6153e13ff..4aa0eff1a3 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -10,6 +10,6 @@ SouthernIsland_Exterior: @ 8485238 .byte WEATHER_NONE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index e674840cfb..b1238c4f75 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -10,6 +10,6 @@ SouthernIsland_Interior: @ 8485254 .byte WEATHER_SHADE .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 13b38c835e..31675c9054 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -34,9 +34,9 @@ SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq SouthernIsland_Interior_EventScript_242AB8 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq SouthernIsland_Interior_EventScript_242ABE end diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index b69a9b5011..8ba9f7d456 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -10,6 +10,6 @@ TerraCave_End: @ 8484A3C .byte WEATHER_FOG_1 .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 14 + map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 88ef9d3efe..b75c867993 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -10,6 +10,6 @@ TerraCave_Entrance: @ 8484A20 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 947cdbde26..9b621cb026 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -10,6 +10,6 @@ TradeCenter: @ 8484D4C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index b21e67e69a..3c6b581191 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -10,6 +10,6 @@ TrainerHill_1F: @ 84857E8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index e2a02834e0..d8343060c7 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -10,6 +10,6 @@ TrainerHill_2F: @ 8485804 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index c7513cc96b..db82eb277f 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -10,6 +10,6 @@ TrainerHill_3F: @ 8485820 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index f25ce4e976..d699f53d57 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -10,6 +10,6 @@ TrainerHill_4F: @ 848583C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 0d4e95af31..936b7712dd 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -10,6 +10,6 @@ TrainerHill_Elevator: @ 8485ADC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 8e8eb4b919..79d6c8b961 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -10,6 +10,6 @@ TrainerHill_Entrance: @ 84857CC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index d4d431dc59..9f0b0dd3ba 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -10,6 +10,6 @@ TrainerHill_Roof: @ 8485858 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 4 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index bf5589117d..7cf9542992 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -10,6 +10,6 @@ Underwater1: @ 8482A30 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 5bd5b037b9..a4c14ab289 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -10,6 +10,6 @@ Underwater2: @ 8482A4C .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 064a732a5f..4e91eb687d 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -10,6 +10,6 @@ Underwater3: @ 8482A68 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 7752479de1..804fb1d14a 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -10,6 +10,6 @@ Underwater4: @ 8482A84 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index dda2f54b19..8ad3b5ba28 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -10,6 +10,6 @@ Underwater5: @ 8482AA0 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 17769c3317..4e978a1e7f 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -10,6 +10,6 @@ Underwater6: @ 8482ABC .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index f5bc3bfa35..132eb867ee 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -10,6 +10,6 @@ Underwater7: @ 8482AD8 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 7232ba916c..88fe213abd 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -10,6 +10,6 @@ Underwater_MarineCave: @ 84849CC .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 71332ec787..591dffa534 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -10,6 +10,6 @@ Underwater_Route134: @ 848464C .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index bc2efc58e5..08eac747cf 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -10,6 +10,6 @@ Underwater_SeafloorCavern: @ 8484198 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 0c6e945750..94fcc6ba74 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -10,6 +10,6 @@ Underwater_SealedChamber: @ 8484668 .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index c4f55b1ef4..1611026e01 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -10,6 +10,6 @@ Underwater_SootopolisCity: @ 8483F4C .byte WEATHER_BUBBLES .byte MAP_TYPE_UNDERWATER .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 29608287d4..29fd3cc3fa 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -10,6 +10,6 @@ UnionRoom: @ 8485120 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 3241622ac7..a3777fd80e 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -10,6 +10,6 @@ UnknownMap_25_29: @ 8484DBC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index c1188df548..a4184b85dc 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -10,6 +10,6 @@ UnknownMap_25_30: @ 8484DD8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 68eb31bc6c..ec4838bd5e 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -10,6 +10,6 @@ UnknownMap_25_31: @ 8484DF4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index c8d16cd09c..39e9820933 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -10,6 +10,6 @@ UnknownMap_25_32: @ 8484E10 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 45f9543dfa..87f8b0c1ee 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -10,6 +10,6 @@ UnknownMap_25_33: @ 8484E2C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 0b612b27c4..c053c5e199 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -10,6 +10,6 @@ UnknownMap_25_34: @ 8484E48 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index efb82a9075..fe88972dfe 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -442,9 +442,9 @@ LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4 return diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index e07566710e..053a587129 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -10,6 +10,6 @@ VerdanturfTown: @ 8482640 .byte WEATHER_SUNNY .byte MAP_TYPE_TOWN .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 30daf14ca6..8a95c60a30 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index e6a61184ee..52aed76181 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -10,9 +10,9 @@ VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 return diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index e75e2f0035..5aa6fcc464 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 5852d60f4d..3f3eb1ae6f 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index dfb4b0d05a..43148f8efa 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 7f223d09ae..5c3e26d09c 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_House: @ 8482F38 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 4846b25e32..0441f81477 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_Mart: @ 8482EAC .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 9ae2edb7fe..e1d7d3fa8b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index a2a5a929e1..933a3da18e 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 1887b78804..573fe6f76e 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -10,6 +10,6 @@ VerdanturfTown_WandasHouse: @ 8482F00 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 0 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 56b800a29d..950f26aa5d 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -10,6 +10,6 @@ VictoryRoad_1F: @ 8484374 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 6650653ef5..d89408de9d 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -10,6 +10,6 @@ VictoryRoad_B1F: @ 8484390 .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index c89256b339..462898c2b3 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -10,6 +10,6 @@ VictoryRoad_B2F: @ 84843AC .byte WEATHER_NONE .byte MAP_TYPE_UNDERGROUND .2byte 0 - .byte 15 + map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index f9c6cf24ea..166134abf9 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F playse SE_KAIDAN removeobject VAR_0x8008 @@ -438,9 +438,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86 compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 diff --git a/include/constants/global.h b/include/constants/global.h new file mode 100644 index 0000000000..ff28d6a4bf --- /dev/null +++ b/include/constants/global.h @@ -0,0 +1,77 @@ +#ifndef GUARD_CONSTANTS_GLOBAL_H +#define GUARD_CONSTANTS_GLOBAL_H +// Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen. +// In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen. +// In Gen 4 only, migrated Pokemon with Diamond, Pearl, or Platinum's ID show as "----------". +// Gen 5 and up read Diamond, Pearl, or Platinum's ID as "Sinnoh". +// In Gen 4 and up, migrated Pokemon with HeartGold or SoulSilver's ID show the otherwise unused "Johto" string. +#define VERSION_SAPPHIRE 1 +#define VERSION_RUBY 2 +#define VERSION_EMERALD 3 +#define VERSION_FIRE_RED 4 +#define VERSION_LEAF_GREEN 5 +#define VERSION_HEART_GOLD 7 +#define VERSION_SOUL_SILVER 8 +#define VERSION_DIAMOND 10 +#define VERSION_PEARL 11 +#define VERSION_PLATINUM 12 +#define VERSION_GAMECUBE 15 + +#define LANGUAGE_JAPANESE 1 +#define LANGUAGE_ENGLISH 2 +#define LANGUAGE_FRENCH 3 +#define LANGUAGE_ITALIAN 4 +#define LANGUAGE_GERMAN 5 +#define LANGUAGE_KOREAN 6 // 6 goes unused but the theory is it was meant to be Korean +#define LANGUAGE_SPANISH 7 + +#define GAME_VERSION (VERSION_EMERALD) +#define GAME_LANGUAGE (LANGUAGE_ENGLISH) + +// capacities of various saveblock objects +#define DAYCARE_MON_COUNT 2 +#define POKEBLOCKS_COUNT 40 +#define EVENT_OBJECTS_COUNT 16 +#define BERRY_TREES_COUNT 128 +#define FLAGS_COUNT 300 +#define VARS_COUNT 256 +#define MAIL_COUNT 16 +#define SECRET_BASES_COUNT 20 +#define TV_SHOWS_COUNT 25 +#define POKE_NEWS_COUNT 16 +#define PC_ITEMS_COUNT 50 +#define BAG_ITEMS_COUNT 30 +#define BAG_KEYITEMS_COUNT 30 +#define BAG_POKEBALLS_COUNT 16 +#define BAG_TMHM_COUNT 64 +#define BAG_BERRIES_COUNT 46 +#define EVENT_OBJECT_TEMPLATES_COUNT 64 + +#define PYRAMID_BAG_ITEMS_COUNT 10 +#define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. + +// string lengths +#define ITEM_NAME_LENGTH 14 +#define POKEMON_NAME_LENGTH 10 +#define PLAYER_NAME_LENGTH 7 +#define MAIL_WORDS_COUNT 9 +#define MOVE_NAME_LENGTH 12 + +#define MALE 0 +#define FEMALE 1 + +#define OPTIONS_BUTTON_MODE_NORMAL 0 +#define OPTIONS_BUTTON_MODE_LR 1 +#define OPTIONS_BUTTON_MODE_L_EQUALS_A 2 + +#define OPTIONS_TEXT_SPEED_SLOW 0 +#define OPTIONS_TEXT_SPEED_MID 1 +#define OPTIONS_TEXT_SPEED_FAST 2 + +#define OPTIONS_SOUND_MONO 0 +#define OPTIONS_SOUND_STEREO 1 + +#define OPTIONS_BATTLE_STYLE_SHIFT 0 +#define OPTIONS_BATTLE_STYLE_SET 1 + +#endif // GUARD_CONSTANTS_GLOBAL_H diff --git a/include/constants/songs.h b/include/constants/songs.h index 58a8e725cd..a459edd241 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -536,6 +536,6 @@ #define PH_NURSE_HELD 608 #define PH_NURSE_SOLO 609 -#define MUS_ROUTE_118 0x7FFF // What is this for? +#define MUS_ROUTE_118 0x7FFF // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic(). #endif // GUARD_CONSTANTS_SONGS_H diff --git a/include/data2.h b/include/data2.h index 268dc9ac84..37ce5bf20d 100644 --- a/include/data2.h +++ b/include/data2.h @@ -1,8 +1,6 @@ #ifndef GUARD_DATA2_H #define GUARD_DATA2_H -#define MOVE_NAME_LENGTH 12 - struct MonCoords { // This would use a bitfield, but some function diff --git a/include/global.h b/include/global.h index f930bedd7b..ef188e29c9 100644 --- a/include/global.h +++ b/include/global.h @@ -4,6 +4,7 @@ #include #include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" +#include "constants/global.h" // Prevent cross-jump optimization. #define BLOCK_CROSS_JUMP asm(""); @@ -99,100 +100,6 @@ f; \ }) -// Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen. -// In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen. -// In Gen 4 only, migrated Pokemon with Diamond, Pearl, or Platinum's ID show as "----------". -// Gen 5 and up read Diamond, Pearl, or Platinum's ID as "Sinnoh". -// In Gen 4 and up, migrated Pokemon with HeartGold or SoulSilver's ID show the otherwise unused "Johto" string. -enum -{ - VERSION_SAPPHIRE = 1, - VERSION_RUBY = 2, - VERSION_EMERALD = 3, - VERSION_FIRE_RED = 4, - VERSION_LEAF_GREEN = 5, - VERSION_HEART_GOLD = 7, - VERSION_SOUL_SILVER = 8, - VERSION_DIAMOND = 10, - VERSION_PEARL = 11, - VERSION_PLATINUM = 12, - VERSION_GAMECUBE = 15, -}; - -enum LanguageId -{ - LANGUAGE_JAPANESE = 1, - LANGUAGE_ENGLISH = 2, - LANGUAGE_FRENCH = 3, - LANGUAGE_ITALIAN = 4, - LANGUAGE_GERMAN = 5, - // 6 goes unused but the theory is it was meant to be Korean - LANGUAGE_SPANISH = 7, -}; - -#define GAME_VERSION (VERSION_EMERALD) -#define GAME_LANGUAGE (LANGUAGE_ENGLISH) - -// capacities of various saveblock objects -#define DAYCARE_MON_COUNT 2 -#define POKEBLOCKS_COUNT 40 -#define EVENT_OBJECTS_COUNT 16 -#define BERRY_TREES_COUNT 128 -#define FLAGS_COUNT 300 -#define VARS_COUNT 256 -#define MAIL_COUNT 16 -#define SECRET_BASES_COUNT 20 -#define TV_SHOWS_COUNT 25 -#define POKE_NEWS_COUNT 16 -#define PC_ITEMS_COUNT 50 -#define BAG_ITEMS_COUNT 30 -#define BAG_KEYITEMS_COUNT 30 -#define BAG_POKEBALLS_COUNT 16 -#define BAG_TMHM_COUNT 64 -#define BAG_BERRIES_COUNT 46 -#define EVENT_OBJECT_TEMPLATES_COUNT 64 - -#define PYRAMID_BAG_ITEMS_COUNT 10 -#define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. - -// string lengths -#define ITEM_NAME_LENGTH 14 -#define POKEMON_NAME_LENGTH 10 -#define PLAYER_NAME_LENGTH 7 -#define MAIL_WORDS_COUNT 9 - -enum -{ - MALE, - FEMALE -}; - -enum -{ - OPTIONS_BUTTON_MODE_NORMAL, - OPTIONS_BUTTON_MODE_LR, - OPTIONS_BUTTON_MODE_L_EQUALS_A -}; - -enum -{ - OPTIONS_TEXT_SPEED_SLOW, - OPTIONS_TEXT_SPEED_MID, - OPTIONS_TEXT_SPEED_FAST -}; - -enum -{ - OPTIONS_SOUND_MONO, - OPTIONS_SOUND_STEREO -}; - -enum -{ - OPTIONS_BATTLE_STYLE_SHIFT, - OPTIONS_BATTLE_STYLE_SET -}; - struct Coords8 { s8 x; @@ -527,7 +434,7 @@ struct SaveBlock2 { /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x08*/ u8 playerGender; // MALE, FEMALE - /*0x09*/ u8 specialSaveWarp; + /*0x09*/ u8 specialSaveWarpFlags; /*0x0A*/ u8 playerTrainerId[4]; /*0x0E*/ u16 playTimeHours; /*0x10*/ u8 playTimeMinutes; @@ -895,10 +802,10 @@ struct SaveBlock1 { /*0x00*/ struct Coords16 pos; /*0x04*/ struct WarpData location; - /*0x0C*/ struct WarpData warp1; - /*0x14*/ struct WarpData warp2; - /*0x1C*/ struct WarpData lastHealLocation; - /*0x24*/ struct WarpData warp4; + /*0x0C*/ struct WarpData continueGameWarp; + /*0x14*/ struct WarpData dynamicWarp; + /*0x1C*/ struct WarpData lastHealLocation; // used by white-out and teleport + /*0x24*/ struct WarpData escapeWarp; // used by Dig and Escape Rope /*0x2C*/ u16 savedMusic; /*0x2E*/ u8 weather; /*0x2F*/ u8 weatherCycleStage; diff --git a/include/load_save.h b/include/load_save.h index c64a1179ba..bf50bffd75 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -15,11 +15,11 @@ void ClearSav2(void); void ClearSav1(void); void SetSaveBlocksPointers(u16 offset); void MoveSaveBlocks_ResetHeap(void); -u32 GetSecretBase2Field_9(void); -void ClearSecretBase2Field_9(void); -void SetSecretBase2Field_9(void); -void sub_8076D5C(void); -void sav2_gender2_inplace_and_xFE(void); +u32 UseContinueGameWarp(void); +void ClearContinueGameWarpStatus(void); +void SetContinueGameWarpStatus(void); +void SetContinueGameWarpStatusToDynamicWarp(void); +void ClearContinueGameWarpStatus2(void); void SavePlayerParty(void); void LoadPlayerParty(void); void SaveEventObjects(void); diff --git a/include/menu.h b/include/menu.h index 9b2341e583..aca4624687 100644 --- a/include/menu.h +++ b/include/menu.h @@ -20,7 +20,8 @@ struct MenuAction extern const u16 gUnknown_0860F074[]; -void sub_81971D0(void); +void FreeAllOverworldWindowBuffers(void); +void InitStandardTextBoxWindows(void); void sub_8197200(void); u16 RunTextPrintersAndIsPrinter0Active(void); void sub_81973A4(void); diff --git a/include/overworld.h b/include/overworld.h index 1f53662b37..f62a5136da 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -46,28 +46,25 @@ void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y); void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); -void set_warp2_warp3_to_neg_1(void); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); struct MapHeader const *const GetDestinationWarpMapHeader(void); void WarpIntoMap(void); -void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId); -void saved_warp2_set(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId); -void saved_warp2_set_2(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused); -void sub_8084CCC(u8 a1); -void Overworld_SetWarpDestToLastHealLoc(void); -void Overworld_SetHealLocationWarp(u8 healLocationId); -void sub_8084D5C(s16 a1, s16 a2); -void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -void sub_8084E14(void); +void SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetWarpDestinationToMapWarp(s8 mapGroup, s8 mapNum, s8 warpId); +void SetDynamicWarp(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId); +void SetDynamicWarpWithCoords(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetWarpDestinationToDynamicWarp(u8 unused); +void SetWarpDestinationToHealLocation(u8 a1); +void SetWarpDestinationToLastHealLocation(void); +void SetLastHealLocationWarp(u8 healLocationId); +void sub_8084D5C(s16 x, s16 y); +void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetWarpDestinationToEscapeWarp(void); void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -void SetFixedHoleWarpAsDestination(s16 x, s16 y); -void warp1_set_to_sav1w(void); -void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -void sub_8084F6C(u8 a1); -void sub_8084FAC(int unused); +void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); +void SetContinueGameWarpToHealLocation(u8 a1); +void SetContinueGameWarpToDynamicWarp(int unused); const struct MapConnection *GetMapConnection(u8 dir); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); @@ -78,7 +75,7 @@ bool32 Overworld_IsBikingAllowed(void); void SetDefaultFlashLevel(void); void Overworld_SetFlashLevel(s32 flashLevel); u8 Overworld_GetFlashLevel(void); -void sub_8085524(u16 mapLayoutId); +void SetCurrentMapLayout(u16 mapLayoutId); void sub_8085540(u8 var); u8 sub_808554C(void); u16 GetLocationMusic(struct WarpData *warp); @@ -97,15 +94,15 @@ void Overworld_FadeOutMapMusic(void); void UpdateAmbientCry(s16 *state, u16 *delayCounter); u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByWarpData(struct WarpData *warp); -u8 Overworld_GetMapTypeOfSaveblockLocation(void); +u8 GetCurrentMapType(void); u8 GetLastUsedWarpMapType(void); bool8 is_map_type_1_2_3_5_or_6(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeIsIndoors(u8 mapType); -u8 sav1_saved_warp2_map_get_name(void); -u8 sav1_map_get_name(void); +u8 GetSavedWarpRegionMapSectionId(void); +u8 GetCurrentRegionMapSectionId(void); u8 GetCurrentMapBattleScene(void); -void overworld_free_bg_tilemaps(void); +void CleanupOverworldWindowsAndTilemaps(void); bool32 is_c1_link_related_active(void); void CB1_Overworld(void); void CB2_OverworldBasic(void); diff --git a/include/save_location.h b/include/save_location.h index 71dbd3fd85..c330124ad6 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -1,6 +1,12 @@ #ifndef GUARD_SAVE_LOCATION_H #define GUARD_SAVE_LOCATION_H +// specialSaveWarp flags +#define CONTINUE_GAME_WARP (1 << 0) +#define POKECENTER_SAVEWARP (1 << 1) +#define LOBBY_SAVEWARP (1 << 2) +#define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3) + void TrySetMapSaveWarpStatus(void); void sub_81AFDA0(void); void sub_81AFDD0(void); diff --git a/src/battle_arena.c b/src/battle_arena.c index 14f86c8829..fb95e64d49 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -784,7 +784,7 @@ static void sub_81A58B4(void) if (!isCurrent) gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] = 0; - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; } diff --git a/src/battle_dome.c b/src/battle_dome.c index cd946c7451..696bebb91f 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -2388,7 +2388,7 @@ static void sub_818E9CC(void) if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860D0EC[battleMode][lvlMode])) gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = 0; - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; } diff --git a/src/battle_factory.c b/src/battle_factory.c index 4194086955..0445d5deaf 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -202,7 +202,7 @@ static void sub_81A5E94(void) for (i = 0; i < 3; i++) gUnknown_03006298[i] |= 0xFFFF; - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; } diff --git a/src/battle_palace.c b/src/battle_palace.c index 4033712b62..fb8cc0729a 100644 --- a/src/battle_palace.c +++ b/src/battle_palace.c @@ -69,7 +69,7 @@ static void sub_8195980(void) if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860DE98[battleMode][lvlMode])) gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = 0; - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; } diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 12f631155f..50baf48fd2 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -365,7 +365,7 @@ static void sub_81C4F44(u8 taskId) { if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); gFieldCallback2 = hm_add_c3_without_phase_2; sub_81C4F98(3, CB2_ReturnToField); DestroyTask(taskId); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 14c662723e..41b9d1c4e4 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10685,7 +10685,7 @@ static void atkEF_handleballthrow(void) ballMultiplier = 10; break; case ITEM_DIVE_BALL: - if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER) + if (GetCurrentMapType() == MAP_TYPE_UNDERWATER) ballMultiplier = 35; else ballMultiplier = 10; diff --git a/src/battle_setup.c b/src/battle_setup.c index ab6b090be8..74187a6aeb 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -347,7 +347,7 @@ static void Task_BattleStart(u8 taskId) case 1: if (IsBattleTransitionDone() == TRUE) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_InitBattle); RestartWildEncounterImmunitySteps(); ClearPoisonStepCounter(); diff --git a/src/battle_tent.c b/src/battle_tent.c index c358deaa57..de4d9d374a 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -100,7 +100,7 @@ static void sub_81B99D4(void) gSaveBlock2Ptr->frontier.field_CA8 = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); } static void sub_81B9A28(void) @@ -162,7 +162,7 @@ static void sub_81B9BA0(void) gSaveBlock2Ptr->frontier.field_CA8 = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); } static void sub_81B9BF4(void) @@ -217,7 +217,7 @@ static void sub_81B9D28(void) gSaveBlock2Ptr->frontier.field_CA8 = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); } static void sub_81B9D7C(void) diff --git a/src/battle_tower.c b/src/battle_tower.c index 2bb2e50f53..3140cf612c 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1163,7 +1163,7 @@ static void sub_8161F94(void) gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] = 0; ValidateBattleTowerRecordChecksums(); - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; } diff --git a/src/cable_club.c b/src/cable_club.c index 56154d5bfe..372329c14b 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -845,7 +845,7 @@ static void sub_80B32B4(u8 taskId) PlayMapChosenOrBattleBGM(MUS_BATTLE20); sub_80B3260(gSpecialVar_0x8004); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); gTrainerBattleOpponent_A = 0x800; SetMainCallback2(CB2_InitBattle); gMain.savedCallback = sub_80B360C; @@ -911,7 +911,7 @@ static void sub_80B33BC(u8 taskId) gLinkPlayers[0].linkType = 0x2211; sub_80B3260(gSpecialVar_0x8004); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); gTrainerBattleOpponent_A = 0x800; SetMainCallback2(CB2_InitBattle); gMain.savedCallback = sub_80B360C; @@ -1008,7 +1008,7 @@ void sub_80B36EC(void) LoadPlayerParty(); SavePlayerBag(); } - copy_saved_warp2_bank_and_enter_x_to_warp1(0x7F); + SetWarpDestinationToDynamicWarp(0x7F); } void sub_80B371C(void) diff --git a/src/decoration.c b/src/decoration.c index addca69540..438f2cbd1a 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1131,7 +1131,7 @@ void sub_8127ACC(u8 taskId) void sub_8127B04(u8 taskId) { DrawWholeMapView(); - Overworld_SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, gTasks[taskId].data[3], gTasks[taskId].data[4]); + SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, gTasks[taskId].data[3], gTasks[taskId].data[4]); WarpIntoMap(); } diff --git a/src/easy_chat.c b/src/easy_chat.c index c4bc02e422..c84895df51 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -364,7 +364,7 @@ void easy_chat_input_maybe(void) default: return; } - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); sub_811A20C(gSpecialVar_0x8004, words, CB2_ReturnToFieldContinueScript, sizeParam); } @@ -383,7 +383,7 @@ static void sub_811A7E4(void) { lilycoveLady = &gSaveBlock1Ptr->lilycoveLady; lilycoveLady->quiz.unk_016 = -1; - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); sub_811A8F0(); } return; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index a7b3e30b04..c2e57f8b51 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -379,7 +379,7 @@ static void AddHatchedMonToParty(u8 id) caughtLvl = 0; SetMonData(mon, MON_DATA_MET_LEVEL, &caughtLvl); - mapNameID = sav1_map_get_name(); + mapNameID = GetCurrentRegionMapSectionId(); SetMonData(mon, MON_DATA_MET_LOCATION, &mapNameID); MonRestorePP(mon); @@ -471,7 +471,7 @@ static void Task_EggHatch(u8 taskID) { if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_EggHatch_0); gFieldCallback = sub_80AF168; DestroyTask(taskID); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 3774ef2b30..bac0417dca 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -28,6 +28,7 @@ #include "wild_encounter.h" #include "constants/bg_event_constants.h" #include "constants/map_types.h" +#include "constants/maps.h" #include "constants/songs.h" extern bool32 sub_8196034(void); @@ -818,19 +819,19 @@ static void sub_809CEB0(struct MapHeader *unused, s8 warpEventId, struct MapPosi warpEvent = &gMapHeader.events->warps[warpEventId]; } - if (warpEvent->mapNum == 0x7F) + if (warpEvent->mapNum == MAP_NUM(NONE)) { - copy_saved_warp2_bank_and_enter_x_to_warp1(warpEvent->warpId); + SetWarpDestinationToDynamicWarp(warpEvent->warpId); } else { const struct MapHeader *mapHeader; - warp1_set_2(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId); + SetWarpDestinationToMapWarp(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId); sub_8084D5C(position->x, position->y); mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum); - if (mapHeader->events->warps[warpEvent->warpId].mapNum == 0x7F) - saved_warp2_set(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId); + if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(NONE)) + SetDynamicWarp(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId); } } diff --git a/src/field_effect.c b/src/field_effect.c index 9a65a444bd..75104d426e 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2171,7 +2171,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE) { SetEventObjectDirection(eventObject, task->data[15]); - sub_8084E14(); + SetWarpDestinationToEscapeWarp(); WarpIntoMap(); gFieldCallback = mapldr_080859D4; SetMainCallback2(CB2_LoadMap); @@ -2332,7 +2332,7 @@ static void TeleportFieldEffectTask4(struct Task *task) if (BGMusicStopped() == TRUE) { - Overworld_SetWarpDestToLastHealLoc(); + SetWarpDestinationToLastHealLocation(); WarpIntoMap(); SetMainCallback2(CB2_LoadMap); gFieldCallback = mapldr_08085D88; @@ -2443,7 +2443,7 @@ static void sub_80B8410(struct Task *task) bool8 FldEff_FieldMoveShowMon(void) { u8 taskId; - if (is_map_type_1_2_3_5_or_6(Overworld_GetMapTypeOfSaveblockLocation()) == TRUE) + if (is_map_type_1_2_3_5_or_6(GetCurrentMapType()) == TRUE) { taskId = CreateTask(sub_80B8554, 0xff); } else diff --git a/src/field_message_box.c b/src/field_message_box.c index 46da9e9e51..5e23b5f6bd 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -8,21 +8,21 @@ extern bool32 sub_8196094(void); extern void sub_8196080(u8*); -EWRAM_DATA u8 gUnknown_020375BC = 0; +static EWRAM_DATA u8 sFieldMessageBoxMode = 0; -void textbox_fdecode_auto_and_task_add(u8*, int); -void textbox_auto_and_task_add(void); +static void textbox_fdecode_auto_and_task_add(u8*, bool32); +static void textbox_auto_and_task_add(void); -void sub_8098128(void) +void InitFieldMessageBox(void) { - gUnknown_020375BC = 0; + sFieldMessageBoxMode = 0; gTextFlags.canABSpeedUpPrint = 0; gTextFlags.useAlternateDownArrow = 0; gTextFlags.autoScroll = 0; gTextFlags.forceMidTextSpeed = 0; } -void sub_8098154(u8 taskId) +static void sub_8098154(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -39,18 +39,18 @@ void sub_8098154(u8 taskId) case 2: if (RunTextPrintersAndIsPrinter0Active() != 1) { - gUnknown_020375BC = 0; + sFieldMessageBoxMode = 0; DestroyTask(taskId); } } } -void task_add_textbox(void) +static void task_add_textbox(void) { CreateTask(sub_8098154, 0x50); } -void task_del_textbox(void) +static void task_del_textbox(void) { u8 taskId = FindTaskIdByFunc(sub_8098154); if (taskId != 0xFF) @@ -59,10 +59,10 @@ void task_del_textbox(void) bool8 ShowFieldMessage(u8 *str) { - if (gUnknown_020375BC != 0) + if (sFieldMessageBoxMode != 0) return FALSE; textbox_fdecode_auto_and_task_add(str, 1); - gUnknown_020375BC = 2; + sFieldMessageBoxMode = 2; return TRUE; } @@ -70,57 +70,57 @@ void sub_8098214(u8 taskId) { if (!sub_8196094()) { - gUnknown_020375BC = 0; + sFieldMessageBoxMode = 0; DestroyTask(taskId); } } bool8 sub_8098238(u8 *str) { - if (gUnknown_020375BC != 0) + if (sFieldMessageBoxMode != 0) return FALSE; StringExpandPlaceholders(gStringVar4, str); CreateTask(sub_8098214, 0); sub_8196080(str); - gUnknown_020375BC = 2; + sFieldMessageBoxMode = 2; return TRUE; } bool8 ShowFieldAutoScrollMessage(u8 *str) { - if (gUnknown_020375BC != 0) + if (sFieldMessageBoxMode != 0) return FALSE; - gUnknown_020375BC = 3; + sFieldMessageBoxMode = 3; textbox_fdecode_auto_and_task_add(str, 0); return TRUE; } bool8 sub_80982A0(u8 *str) { - gUnknown_020375BC = 3; + sFieldMessageBoxMode = 3; textbox_fdecode_auto_and_task_add(str, 1); return TRUE; } bool8 sub_80982B8(void) { - if (gUnknown_020375BC != 0) + if (sFieldMessageBoxMode != 0) return FALSE; - gUnknown_020375BC = 2; + sFieldMessageBoxMode = 2; textbox_auto_and_task_add(); return TRUE; } -void textbox_fdecode_auto_and_task_add(u8* str, int a) +static void textbox_fdecode_auto_and_task_add(u8* str, bool32 allowSkippingDelayWithButtonPress) { StringExpandPlaceholders(gStringVar4, str); - AddTextPrinterForMessage(a); + AddTextPrinterForMessage(allowSkippingDelayWithButtonPress); task_add_textbox(); } -void textbox_auto_and_task_add(void) +static void textbox_auto_and_task_add(void) { - AddTextPrinterForMessage(1); + AddTextPrinterForMessage(TRUE); task_add_textbox(); } @@ -128,17 +128,17 @@ void HideFieldMessageBox(void) { task_del_textbox(); sub_8197434(0, 1); - gUnknown_020375BC = 0; + sFieldMessageBoxMode = 0; } u8 GetFieldMessageBoxMode(void) { - return gUnknown_020375BC; + return sFieldMessageBoxMode; } bool8 IsFieldMessageBoxHidden(void) { - if (gUnknown_020375BC == 0) + if (sFieldMessageBoxMode == 0) return TRUE; return FALSE; } @@ -147,11 +147,11 @@ void sub_8098358(void) { task_del_textbox(); NewMenuHelpers_DrawStdWindowFrame(0, 1); - gUnknown_020375BC = 0; + sFieldMessageBoxMode = 0; } void sub_8098374(void) { task_del_textbox(); - gUnknown_020375BC = 0; + sFieldMessageBoxMode = 0; } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index a6b7e7c248..62a3d0335a 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -89,7 +89,7 @@ static void palette_bg_faded_fill_black(void) void pal_fill_for_maplights(void) { u8 previousMapType = GetLastUsedWarpMapType(); - switch (GetMapPairFadeFromType(previousMapType, Overworld_GetMapTypeOfSaveblockLocation())) + switch (GetMapPairFadeFromType(previousMapType, GetCurrentMapType())) { case 0: palette_bg_faded_fill_black(); @@ -115,7 +115,7 @@ void pal_fill_black(void) void WarpFadeScreen(void) { - u8 currentMapType = Overworld_GetMapTypeOfSaveblockLocation(); + u8 currentMapType = GetCurrentMapType(); switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType)) { case 0: diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 1cabf63d69..3675cf0d89 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -1,7 +1,12 @@ #include "global.h" #include "event_data.h" #include "event_object_movement.h" +#include "field_camera.h" +#include "field_screen_effect.h" +#include "field_specials.h" +#include "fieldmap.h" #include "main.h" +#include "overworld.h" #include "palette.h" #include "script.h" #include "script_movement.h" @@ -13,14 +18,6 @@ #define SECONDS(value) ((signed) (60.0 * value + 0.5)) -extern u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); // should be in field_specials.h -extern void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -extern bool32 CountSSTidalStep(u16); -extern void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused); -extern void sp13E_warp_to_last_warp(void); -extern void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId); -extern void sub_80AF8B8(void); - // porthole states enum { @@ -30,20 +27,13 @@ enum EXIT_PORTHOLE, }; -extern void SetCameraPanning(s16 x, s16 y); -extern void SetCameraPanningCallback(void ( *callback)()); -extern void InstallCameraPanAheadCallback(); -extern void pal_fill_black(void); -extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); -extern void DrawWholeMapView(); - //. rodata static const s8 gTruckCamera_HorizontalTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0}; const u8 gUnknown_0858E8AB[] = {0x18, 0xFE}; const u8 gUnknown_0858E8AD[] = {0x17, 0xFE}; // .text -void Task_Truck3(u8); +static void Task_Truck3(u8); s16 GetTruckCameraBobbingY(int a1) { @@ -121,7 +111,7 @@ void Task_Truck2(u8 taskId) } } -void Task_Truck3(u8 taskId) +static void Task_Truck3(u8 taskId) { s16 *data = gTasks[taskId].data; s16 cameraXpan; @@ -256,7 +246,7 @@ bool8 sub_80FB59C(void) } else { - Overworld_SetWarpDestination(mapGroup, mapNum, -1, x, y); + SetWarpDestination(mapGroup, mapNum, -1, x, y); return TRUE; } } @@ -312,7 +302,7 @@ void Task_HandlePorthole(u8 taskId) case EXIT_PORTHOLE: // exit porthole. FlagClear(0x4001); FlagClear(0x4000); - copy_saved_warp2_bank_and_enter_x_to_warp1(0); + SetWarpDestinationToDynamicWarp(0); sp13E_warp_to_last_warp(); DestroyTask(taskId); break; @@ -349,7 +339,7 @@ void sub_80FB7A4(void) FlagSet(FLAG_SYS_CRUISE_MODE); FlagSet(0x4001); FlagSet(0x4000); - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); sub_80FB59C(); sub_80AF8B8(); } diff --git a/src/field_specials.c b/src/field_specials.c index 5e1c86dfe2..4e9a5c0f75 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -945,11 +945,11 @@ void CableCarWarp(void) { if (gSpecialVar_0x8004 != 0) { - Overworld_SetWarpDestination(MAP_GROUP(ROUTE112_CABLE_CAR_STATION), MAP_NUM(ROUTE112_CABLE_CAR_STATION), -1, 6, 4); + SetWarpDestination(MAP_GROUP(ROUTE112_CABLE_CAR_STATION), MAP_NUM(ROUTE112_CABLE_CAR_STATION), -1, 6, 4); } else { - Overworld_SetWarpDestination(MAP_GROUP(MT_CHIMNEY_CABLE_CAR_STATION), MAP_NUM(MT_CHIMNEY_CABLE_CAR_STATION), -1, 6, 4); + SetWarpDestination(MAP_GROUP(MT_CHIMNEY_CABLE_CAR_STATION), MAP_NUM(MT_CHIMNEY_CABLE_CAR_STATION), -1, 6, 4); } } @@ -1725,7 +1725,7 @@ const u16 gUnknown_085B2C06[][3] = void SetDepartmentStoreFloorVar(void) { u8 deptStoreFloor; - switch (gSaveBlock1Ptr->warp2.mapNum) + switch (gSaveBlock1Ptr->dynamicWarp.mapNum) { case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_1F): deptStoreFloor = 4; @@ -1757,9 +1757,9 @@ u16 sub_81399F4(void) gUnknown_0203AB60 = 0; gUnknown_0203AB62 = 0; - if (gSaveBlock1Ptr->warp2.mapGroup == 13) + if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(LILYCOVE_CITY_DEPARTMENT_STORE_1F)) { - switch (gSaveBlock1Ptr->warp2.mapNum) + switch (gSaveBlock1Ptr->dynamicWarp.mapNum) { case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_5F): gUnknown_0203AB60 = 0; @@ -3813,7 +3813,7 @@ void sub_813B9A0(void) { if (gSaveBlock1Ptr->lastHealLocation.mapGroup == MAP_GROUP(DEWFORD_TOWN) && gSaveBlock1Ptr->lastHealLocation.mapNum == MAP_NUM(DEWFORD_TOWN)) { - Overworld_SetHealLocationWarp(3); + SetLastHealLocationWarp(3); } } diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 69d198c842..f3bd76cbf6 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -156,7 +156,7 @@ static bool8 sub_8137304(void) { u8 i; u8 v0 = GetLastUsedWarpMapType(); - u8 v1 = Overworld_GetMapTypeOfSaveblockLocation(); + u8 v1 = GetCurrentMapType(); for (i = 0; gUnknown_085B27C8[i].unk0; i++) { diff --git a/src/frontier_util.c b/src/frontier_util.c index c722230cd6..40b1edbe33 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -2407,9 +2407,9 @@ void sub_81A4C30(void) i = gPlayerPartyCount; LoadPlayerParty(); - sub_8076D5C(); + SetContinueGameWarpStatusToDynamicWarp(); TrySavingData(SAVE_LINK); - sav2_gender2_inplace_and_xFE(); + ClearContinueGameWarpStatus2(); gPlayerPartyCount = i; for (i = 0; i < PARTY_SIZE; i++) diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 34d62149a1..3f217b7828 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -1299,7 +1299,7 @@ static bool8 sub_8175024(void) CopyBgTilemapBufferToVram(3); break; case 3: - sub_81971D0(); + InitStandardTextBoxWindows(); sub_8197200(); break; case 4: diff --git a/src/item_use.c b/src/item_use.c index 9e0a4819bd..35004d7745 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -627,7 +627,7 @@ void sub_80FDC00(u8 taskId) { if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); OpenPokeblockCase(0, CB2_ReturnToField); DestroyTask(taskId); } diff --git a/src/load_save.c b/src/load_save.c index 9636264287..a7593d007e 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -1,13 +1,14 @@ #include "global.h" -#include "gba/flash_internal.h" +#include "alloc.h" +#include "item.h" #include "load_save.h" #include "main.h" +#include "overworld.h" #include "pokemon.h" #include "pokemon_storage_system.h" #include "random.h" -#include "alloc.h" -#include "item.h" -#include "overworld.h" +#include "save_location.h" +#include "gba/flash_internal.h" #include "decoration_inventory.h" static void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey); @@ -136,30 +137,30 @@ void MoveSaveBlocks_ResetHeap(void) gSaveBlock2Ptr->encryptionKey = encryptionKey; } -u32 GetSecretBase2Field_9(void) +u32 UseContinueGameWarp(void) { - return gSaveBlock2Ptr->specialSaveWarp & 1; + return gSaveBlock2Ptr->specialSaveWarpFlags & CONTINUE_GAME_WARP; } -void ClearSecretBase2Field_9(void) +void ClearContinueGameWarpStatus(void) { - gSaveBlock2Ptr->specialSaveWarp &= ~1; + gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP; } -void SetSecretBase2Field_9(void) +void SetContinueGameWarpStatus(void) { - gSaveBlock2Ptr->specialSaveWarp |= 1; + gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP; } -void sub_8076D5C(void) +void SetContinueGameWarpStatusToDynamicWarp(void) { - sub_8084FAC(0); - gSaveBlock2Ptr->specialSaveWarp |= 1; + SetContinueGameWarpToDynamicWarp(0); + gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP; } -void sav2_gender2_inplace_and_xFE(void) +void ClearContinueGameWarpStatus2(void) { - gSaveBlock2Ptr->specialSaveWarp &= ~1; + gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP; } void SavePlayerParty(void) diff --git a/src/menu.c b/src/menu.c index 8c3c61ea76..f1b35b42e7 100644 --- a/src/menu.c +++ b/src/menu.c @@ -48,8 +48,8 @@ struct Menu bool8 APressMuted; }; -static EWRAM_DATA u8 gStartMenuWindowId = 0; -static EWRAM_DATA u8 gUnknown_0203CD8D = 0; +static EWRAM_DATA u8 sStartMenuWindowId = 0; +static EWRAM_DATA u8 sMapNamePopupWindowId = 0; static EWRAM_DATA struct Menu gUnknown_0203CD90 = {0}; static EWRAM_DATA u16 gUnknown_0203CD9C = 0; static EWRAM_DATA u8 gUnknown_0203CD9E = 0; @@ -63,7 +63,7 @@ static EWRAM_DATA void *gUnknown_0203CDAC[0x20] = {NULL}; const u16 gUnknown_0860F074[] = INCBIN_U16("graphics/interface/860F074.gbapal"); static const u8 gUnknown_0860F094[] = { 8, 4, 1 }; -static const struct WindowTemplate gUnknown_0860F098[] = +static const struct WindowTemplate sStandardTextBox_WindowTemplates[] = { { .bg = 0, @@ -77,7 +77,7 @@ static const struct WindowTemplate gUnknown_0860F098[] = DUMMY_WIN_TEMPLATE }; -static const struct WindowTemplate gUnknown_0860F0A8 = +static const struct WindowTemplate sYesNo_WindowTemplates = { .bg = 0, .tilemapLeft = 21, @@ -137,14 +137,14 @@ extern u8 sub_8199134(s8, s8); extern void sub_8198C78(void); extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId); -void sub_81971D0(void) +void InitStandardTextBoxWindows(void) { - InitWindows(gUnknown_0860F098); - gStartMenuWindowId = 0xFF; - gUnknown_0203CD8D = 0xFF; + InitWindows(sStandardTextBox_WindowTemplates); + sStartMenuWindowId = 0xFF; + sMapNamePopupWindowId = 0xFF; } -void sub_81971F4(void) +void FreeAllOverworldWindowBuffers(void) { FreeAllWindowBuffers(); } @@ -460,12 +460,12 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback) void DisplayYesNoMenu(void) { - CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0); + CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0); } void sub_8197948(u8 initialCursorPos) { - CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos); + CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos); } u32 GetPlayerTextSpeed(void) @@ -486,22 +486,22 @@ u8 GetPlayerTextSpeedDelay(void) u8 sub_81979C4(u8 a1) { - if (gStartMenuWindowId == 0xFF) - gStartMenuWindowId = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139); - return gStartMenuWindowId; + if (sStartMenuWindowId == 0xFF) + sStartMenuWindowId = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139); + return sStartMenuWindowId; } u8 GetStartMenuWindowId(void) { - return gStartMenuWindowId; + return sStartMenuWindowId; } void RemoveStartMenuWindow(void) { - if (gStartMenuWindowId != 0xFF) + if (sStartMenuWindowId != 0xFF) { - RemoveWindow(gStartMenuWindowId); - gStartMenuWindowId = 0xFF; + RemoveWindow(sStartMenuWindowId); + sStartMenuWindowId = 0xFF; } } @@ -517,22 +517,22 @@ u16 sub_8197A38(void) u8 AddMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D == 0xFF) - gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107); - return gUnknown_0203CD8D; + if (sMapNamePopupWindowId == 0xFF) + sMapNamePopupWindowId = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107); + return sMapNamePopupWindowId; } u8 GetMapNamePopUpWindowId(void) { - return gUnknown_0203CD8D; + return sMapNamePopupWindowId; } void RemoveMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D != 0xFF) + if (sMapNamePopupWindowId != 0xFF) { - RemoveWindow(gUnknown_0203CD8D); - gUnknown_0203CD8D = 0xFF; + RemoveWindow(sMapNamePopupWindowId); + sMapNamePopupWindowId = 0xFF; } } diff --git a/src/mirage_tower.c b/src/mirage_tower.c index bfaea4c5e7..a8dd5d9de8 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -625,7 +625,7 @@ static void DoMirageTowerDisintegration(u8 taskId) SetGpuRegBits(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2)); SetGpuRegBits(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0)); SetBgAttribute(0, BG_ATTR_PRIORITY, 0); - sub_81971D0(); + InitStandardTextBoxWindows(); break; case 7: ShowBg(0); diff --git a/src/naming_screen.c b/src/naming_screen.c index e6d146b853..c310ceb9fb 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -362,7 +362,7 @@ static void NamingScreen_InitBGs(void) ChangeBgX(3, 0, 0); ChangeBgY(3, 0, 0); - sub_81971D0(); + InitStandardTextBoxWindows(); sub_8197200(); for (i = 0; i < 5; i++) diff --git a/src/new_game.c b/src/new_game.c index 4804b28f33..8ecd48bc7a 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -27,6 +27,7 @@ #include "pokedex.h" #include "apprentice.h" #include "frontier_util.h" +#include "constants/maps.h" extern u16 gSaveFileStatus; extern u8 gUnknown_030060B0; @@ -135,7 +136,7 @@ static void ClearFrontierRecord(void) static void WarpToTruck(void) { - Overworld_SetWarpDestination(25, 40, -1, -1, -1); // inside of truck + SetWarpDestination(MAP_GROUP(INSIDE_OF_TRUCK), MAP_NUM(INSIDE_OF_TRUCK), -1, -1, -1); WarpIntoMap(); } @@ -168,7 +169,7 @@ void NewGameInitData(void) ClearFrontierRecord(); ClearSav1(); ClearMailData(); - gSaveBlock2Ptr->specialSaveWarp = 0; + gSaveBlock2Ptr->specialSaveWarpFlags = 0; gSaveBlock2Ptr->field_A8 = 0; InitPlayerTrainerId(); PlayTimeCounter_Reset(); diff --git a/src/overworld.c b/src/overworld.c index 2aad688615..217b4c27e0 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -57,8 +57,10 @@ #include "constants/abilities.h" #include "constants/map_types.h" #include "constants/maps.h" +#include "constants/region_map_sections.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/weather.h" // event scripts extern const u8 EventScript_WhiteOut[]; @@ -114,7 +116,6 @@ extern void c2_change_map(void); extern void sub_81D5DF8(void); extern void sub_80EB218(void); extern void sub_80AF3C8(void); -extern void sub_81971F4(void); extern void sub_808B578(void); extern void sub_80AF314(void); extern void sub_80AF214(void); @@ -134,7 +135,7 @@ extern void sub_81AA2F8(void); extern void sub_8195E10(void); extern void sub_80EDB44(void); extern void sub_81D64C0(void); -extern void sub_8098128(void); +extern void InitFieldMessageBox(void); extern void copy_map_tileset1_to_vram(const struct MapLayout *); extern void copy_map_tileset2_to_vram(const struct MapLayout *); extern void FieldUpdateBgTilemapScroll(void); @@ -339,7 +340,7 @@ const struct UCoords32 gDirectionToVectors[] = }, }; -static const struct BgTemplate gUnknown_08339DAC[] = +static const struct BgTemplate sOverworldBgTemplates[] = { { .bg = 0, @@ -433,7 +434,7 @@ void DoWhiteOut(void) SetMoney(&gSaveBlock1Ptr->money, GetMoney(&gSaveBlock1Ptr->money) / 2); HealPlayerParty(); Overworld_ResetStateAfterWhiteOut(); - Overworld_SetWarpDestToLastHealLoc(); + SetWarpDestinationToLastHealLocation(); WarpIntoMap(); } @@ -615,7 +616,7 @@ void ApplyCurrentWarp(void) gFixedHoleWarp = sDummyWarpData; } -void set_warp2_warp3_to_neg_1(void) +static void ClearDiveAndHoleWarps(void) { gFixedDiveWarp = sDummyWarpData; gFixedHoleWarp = sDummyWarpData; @@ -696,68 +697,66 @@ void WarpIntoMap(void) SetPlayerCoordsFromWarp(); } -void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) +void SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) { SetWarpData(&sWarpDestination, mapGroup, mapNum, warpId, x, y); } -void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId) +void SetWarpDestinationToMapWarp(s8 mapGroup, s8 mapNum, s8 warpId) { - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, -1, -1); + SetWarpDestination(mapGroup, mapNum, warpId, -1, -1); } -void saved_warp2_set(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId) +void SetDynamicWarp(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId) { - SetWarpData(&gSaveBlock1Ptr->warp2, mapGroup, mapNum, warpId, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y); + SetWarpData(&gSaveBlock1Ptr->dynamicWarp, mapGroup, mapNum, warpId, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y); } -void saved_warp2_set_2(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) +void SetDynamicWarpWithCoords(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) { - SetWarpData(&gSaveBlock1Ptr->warp2, mapGroup, mapNum, warpId, x, y); + SetWarpData(&gSaveBlock1Ptr->dynamicWarp, mapGroup, mapNum, warpId, x, y); } -void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused) +void SetWarpDestinationToDynamicWarp(u8 unusedWarpId) { - sWarpDestination = gSaveBlock1Ptr->warp2; + sWarpDestination = gSaveBlock1Ptr->dynamicWarp; } -void sub_8084CCC(u8 a1) +void SetWarpDestinationToHealLocation(u8 healLocationId) { - const struct HealLocation *warp = GetHealLocation(a1); - + const struct HealLocation *warp = GetHealLocation(healLocationId); if (warp) - Overworld_SetWarpDestination(warp->group, warp->map, -1, warp->x, warp->y); + SetWarpDestination(warp->group, warp->map, -1, warp->x, warp->y); } -void Overworld_SetWarpDestToLastHealLoc(void) +void SetWarpDestinationToLastHealLocation(void) { sWarpDestination = gSaveBlock1Ptr->lastHealLocation; } -void Overworld_SetHealLocationWarp(u8 healLocationId) +void SetLastHealLocationWarp(u8 healLocationId) { const struct HealLocation *healLocation = GetHealLocation(healLocationId); - - if (healLocation != NULL) + if (healLocation) SetWarpData(&gSaveBlock1Ptr->lastHealLocation, healLocation->group, healLocation->map, -1, healLocation->x, healLocation->y); } -void sub_8084D5C(s16 a1, s16 a2) +void sub_8084D5C(s16 x, s16 y) { - u8 currMapType = Overworld_GetMapTypeOfSaveblockLocation(); + u8 currMapType = GetCurrentMapType(); u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum); if (is_map_type_1_2_3_5_or_6(currMapType) && is_map_type_1_2_3_5_or_6(destMapType) != TRUE) - sub_8084DD4(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, a1 - 7, a2 - 6); + SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 6); } -void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) +void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) { - SetWarpData(&gSaveBlock1Ptr->warp4, mapGroup, mapNum, warpId, x, y); + SetWarpData(&gSaveBlock1Ptr->escapeWarp, mapGroup, mapNum, warpId, x, y); } -void sub_8084E14(void) +void SetWarpDestinationToEscapeWarp(void) { - sWarpDestination = gSaveBlock1Ptr->warp4; + sWarpDestination = gSaveBlock1Ptr->escapeWarp; } void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) @@ -765,7 +764,7 @@ void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) SetWarpData(&gFixedDiveWarp, mapGroup, mapNum, warpId, x, y); } -static void SetFixedDiveWarpAsDestination(void) +static void SetWarpDestinationToDiveWarp(void) { sWarpDestination = gFixedDiveWarp; } @@ -775,34 +774,34 @@ void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) SetWarpData(&gFixedHoleWarp, mapGroup, mapNum, warpId, x, y); } -void SetFixedHoleWarpAsDestination(s16 x, s16 y) +void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y) { if (IsDummyWarp(&gFixedHoleWarp) == TRUE) sWarpDestination = gLastUsedWarp; else - Overworld_SetWarpDestination(gFixedHoleWarp.mapGroup, gFixedHoleWarp.mapNum, -1, x, y); + SetWarpDestination(gFixedHoleWarp.mapGroup, gFixedHoleWarp.mapNum, -1, x, y); } -void warp1_set_to_sav1w(void) +static void SetWarpDestinationToContinueGameWarp(void) { - sWarpDestination = gSaveBlock1Ptr->warp1; + sWarpDestination = gSaveBlock1Ptr->continueGameWarp; } -void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) +void SetContinueGameWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) { - SetWarpData(&gSaveBlock1Ptr->warp1, mapGroup, mapNum, warpId, x, y); + SetWarpData(&gSaveBlock1Ptr->continueGameWarp, mapGroup, mapNum, warpId, x, y); } -void sub_8084F6C(u8 a1) +void SetContinueGameWarpToHealLocation(u8 healLocationId) { - const struct HealLocation *warp = GetHealLocation(a1); + const struct HealLocation *warp = GetHealLocation(healLocationId); if (warp) - SetWarpData(&gSaveBlock1Ptr->warp1, warp->group, warp->map, -1, warp->x, warp->y); + SetWarpData(&gSaveBlock1Ptr->continueGameWarp, warp->group, warp->map, -1, warp->x, warp->y); } -void sub_8084FAC(int unused) +void SetContinueGameWarpToDynamicWarp(int unused) { - gSaveBlock1Ptr->warp1 = gSaveBlock1Ptr->warp2; + gSaveBlock1Ptr->continueGameWarp = gSaveBlock1Ptr->dynamicWarp; } const struct MapConnection *GetMapConnection(u8 dir) @@ -827,14 +826,14 @@ static bool8 SetDiveWarp(u8 dir, u16 x, u16 y) if (connection != NULL) { - Overworld_SetWarpDestination(connection->mapGroup, connection->mapNum, -1, x, y); + SetWarpDestination(connection->mapGroup, connection->mapNum, -1, x, y); } else { mapheader_run_script_with_tag_x6(); if (IsDummyWarp(&gFixedDiveWarp)) return FALSE; - SetFixedDiveWarpAsDestination(); + SetWarpDestinationToDiveWarp(); } return TRUE; } @@ -853,7 +852,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) { s32 paletteIndex; - Overworld_SetWarpDestination(mapGroup, mapNum, -1, -1, -1); + SetWarpDestination(mapGroup, mapNum, -1, -1, -1); if (gMapHeader.regionMapSectionId != 0x3A) sub_8085810(); @@ -885,7 +884,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) ResetFieldTasksArgs(); mapheader_run_script_with_tag_x5(); - if (gMapHeader.regionMapSectionId != 0x3A || gMapHeader.regionMapSectionId != sLastMapSectionId) + if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER || gMapHeader.regionMapSectionId != sLastMapSectionId) ShowMapNamePopup(); } @@ -964,7 +963,7 @@ void StoreInitialPlayerAvatarState(void) static struct InitialPlayerAvatarState *GetInitialPlayerAvatarState(void) { struct InitialPlayerAvatarState playerStruct; - u8 mapType = Overworld_GetMapTypeOfSaveblockLocation(); + u8 mapType = GetCurrentMapType(); u16 metatileBehavior = GetCenterScreenMetatileBehavior(); u8 transitionFlags = GetAdjustedInitialTransitionFlags(&gInitialPlayerAvatarState, metatileBehavior, mapType); playerStruct.transitionFlags = transitionFlags; @@ -1051,7 +1050,7 @@ u8 Overworld_GetFlashLevel(void) return gSaveBlock1Ptr->flashLevel; } -void sub_8085524(u16 mapLayoutId) +void SetCurrentMapLayout(u16 mapLayoutId) { gSaveBlock1Ptr->mapLayoutId = mapLayoutId; gMapHeader.mapLayout = GetMapLayout(); @@ -1160,11 +1159,11 @@ u16 GetCurrLocationDefaultMusic(void) // Play the desert music only when the sandstorm is active on Route 111. if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE111) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE111) - && GetSav1Weather() == 8) + && GetSav1Weather() == WEATHER_SANDSTORM) return MUS_ASHROAD; music = GetLocationMusic(&gSaveBlock1Ptr->location); - if (music != 0x7FFF) + if (music != MUS_ROUTE_118) { return music; } @@ -1180,7 +1179,7 @@ u16 GetCurrLocationDefaultMusic(void) u16 GetWarpDestinationMusic(void) { u16 music = GetLocationMusic(&sWarpDestination); - if (music != 0x7FFF) + if (music != MUS_ROUTE_118) { return music; } @@ -1207,7 +1206,7 @@ void Overworld_PlaySpecialMapMusic(void) { if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; - else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER) + else if (GetCurrentMapType() == MAP_TYPE_UNDERWATER) music = MUS_DEEPDEEP; else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) music = MUS_NAMINORI; @@ -1285,8 +1284,8 @@ void TryFadeOutOldMapMusic(void) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SOOTOPOLIS_CITY) && sWarpDestination.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY) && sWarpDestination.mapNum == MAP_NUM(SOOTOPOLIS_CITY) - && sWarpDestination.x == 0x1D - && sWarpDestination.y == 0x35) + && sWarpDestination.x == 29 + && sWarpDestination.y == 53) return; FadeOutMapMusic(GetMapMusicFadeoutSpeed()); } @@ -1388,7 +1387,7 @@ u8 GetMapTypeByWarpData(struct WarpData *warp) return GetMapTypeByGroupAndId(warp->mapGroup, warp->mapNum); } -u8 Overworld_GetMapTypeOfSaveblockLocation(void) +u8 GetCurrentMapType(void) { return GetMapTypeByWarpData(&gSaveBlock1Ptr->location); } @@ -1430,12 +1429,12 @@ bool8 Overworld_MapTypeIsIndoors(u8 mapType) return FALSE; } -u8 sav1_saved_warp2_map_get_name(void) +u8 GetSavedWarpRegionMapSectionId(void) { - return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->warp2.mapGroup, gSaveBlock1Ptr->warp2.mapNum)->regionMapSectionId; + return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->dynamicWarp.mapGroup, gSaveBlock1Ptr->dynamicWarp.mapNum)->regionMapSectionId; } -u8 sav1_map_get_name(void) +u8 GetCurrentRegionMapSectionId(void) { return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum)->regionMapSectionId; } @@ -1445,30 +1444,30 @@ u8 GetCurrentMapBattleScene(void) return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum)->battleType; } -static void overworld_bg_setup(void) +static void InitOverworldBgs(void) { - InitBgsFromTemplates(0, gUnknown_08339DAC, ARRAY_COUNT(gUnknown_08339DAC)); + InitBgsFromTemplates(0, sOverworldBgTemplates, ARRAY_COUNT(sOverworldBgTemplates)); SetBgAttribute(1, BG_ATTR_MOSAIC, 1); SetBgAttribute(2, BG_ATTR_MOSAIC, 1); SetBgAttribute(3, BG_ATTR_MOSAIC, 1); - gBGTilemapBuffers2 = AllocZeroed(0x800); - gBGTilemapBuffers1 = AllocZeroed(0x800); - gBGTilemapBuffers3 = AllocZeroed(0x800); + gBGTilemapBuffers2 = AllocZeroed(BG_SCREEN_SIZE); + gBGTilemapBuffers1 = AllocZeroed(BG_SCREEN_SIZE); + gBGTilemapBuffers3 = AllocZeroed(BG_SCREEN_SIZE); SetBgTilemapBuffer(1, gBGTilemapBuffers2); SetBgTilemapBuffer(2, gBGTilemapBuffers1); SetBgTilemapBuffer(3, gBGTilemapBuffers3); - sub_81971D0(); + InitStandardTextBoxWindows(); } -void overworld_free_bg_tilemaps(void) +void CleanupOverworldWindowsAndTilemaps(void) { ClearMirageTowerPulseBlendEffect(); - sub_81971F4(); - if (gBGTilemapBuffers3 != NULL) + FreeAllOverworldWindowBuffers(); + if (gBGTilemapBuffers3) FREE_AND_SET_NULL(gBGTilemapBuffers3); - if (gBGTilemapBuffers1 != NULL) + if (gBGTilemapBuffers1) FREE_AND_SET_NULL(gBGTilemapBuffers1); - if (gBGTilemapBuffers2 != NULL) + if (gBGTilemapBuffers2) FREE_AND_SET_NULL(gBGTilemapBuffers2); } @@ -1762,7 +1761,7 @@ void CB2_ContinueSavedGame(void) sub_81A3908(); LoadSaveblockMapHeader(); - set_warp2_warp3_to_neg_1(); + ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); if (gMapHeader.mapLayoutId == 0x169) sub_81AA2F8(); @@ -1785,10 +1784,10 @@ void CB2_ContinueSavedGame(void) ScriptContext1_Init(); ScriptContext2_Disable(); sub_8195E10(); - if (GetSecretBase2Field_9() == 1) + if (UseContinueGameWarp() == TRUE) { - ClearSecretBase2Field_9(); - warp1_set_to_sav1w(); + ClearContinueGameWarpStatus(); + SetWarpDestinationToContinueGameWarp(); WarpIntoMap(); sub_80EDB44(); SetMainCallback2(CB2_LoadMap); @@ -1861,7 +1860,7 @@ static bool32 map_loading_iteration_3(u8 *state) switch (*state) { case 0: - overworld_bg_setup(); + InitOverworldBgs(); ScriptContext1_Init(); ScriptContext2_Disable(); sub_80867C8(); @@ -2147,8 +2146,8 @@ static void InitOverworldGraphicsRegisters(void) clear_scheduled_bg_copies_to_vram(); reset_temp_tile_data_buffers(); SetGpuReg(REG_OFFSET_MOSAIC, 0); - SetGpuReg(REG_OFFSET_WININ, 0x1F1F); - SetGpuReg(REG_OFFSET_WINOUT, 0x101); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WINOBJ_BG0); SetGpuReg(REG_OFFSET_WIN0H, 0xFF); SetGpuReg(REG_OFFSET_WIN0V, 0xFF); SetGpuReg(REG_OFFSET_WIN1H, 0xFFFF); @@ -2156,7 +2155,7 @@ static void InitOverworldGraphicsRegisters(void) SetGpuReg(REG_OFFSET_BLDCNT, gUnknown_82EC7C4[1] | gUnknown_82EC7C4[2] | gUnknown_82EC7C4[3] | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(13, 7)); - overworld_bg_setup(); + InitOverworldBgs(); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); schedule_bg_copy_tilemap_to_vram(3); @@ -2174,7 +2173,7 @@ static void InitOverworldGraphicsRegisters(void) ShowBg(1); ShowBg(2); ShowBg(3); - sub_8098128(); + InitFieldMessageBox(); } static void sub_8086988(u32 a1) diff --git a/src/party_menu.c b/src/party_menu.c index 256a167866..961acfc97c 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -4721,7 +4721,7 @@ static void CursorCb_FieldMove(u8 taskId) gUnknown_0203CEC4->data[0] = fieldMove; break; case FIELD_MOVE_DIG: - mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->warp4.mapGroup, gSaveBlock1Ptr->warp4.mapNum); + mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum); sub_81245DC(gStringVar1, mapHeader->regionMapSectionId); StringExpandPlaceholders(gStringVar4, gText_EscapeFromHere); sub_81B5674(taskId); @@ -7249,7 +7249,7 @@ static void sub_81B9424(u8 taskId) { if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); InitPartyMenu(2, 0, 11, 0, 0, sub_81B1370, sub_81B9470); DestroyTask(taskId); } @@ -7276,7 +7276,7 @@ static void sub_81B94D0(u8 taskId) { if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); InitPartyMenu(3, 0, 11, 0, 0, sub_81B1370, sub_81B9390); DestroyTask(taskId); } @@ -7293,7 +7293,7 @@ static void sub_81B953C(u8 taskId) { if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); InitPartyMenu(7, 0, 11, 0, 0, sub_81B1370, sub_81B9588); DestroyTask(taskId); } @@ -7336,7 +7336,7 @@ static void sub_81B9640(u8 taskId) { if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); InitPartyMenu(12, 0, 0, 0, 0, sub_81B1370, sub_81B9390); DestroyTask(taskId); } diff --git a/src/player_pc.c b/src/player_pc.c index b7380cee3d..474cecaf53 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -491,7 +491,7 @@ static void Task_ItemStorage_Deposit(u8 taskId) { if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); sub_81AAC14(); DestroyTask(taskId); } @@ -723,7 +723,7 @@ static void Mailbox_FadeAndReadMail(u8 taskId) if (!gPaletteFade.active) { sub_81D1EC0(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); ReadMail(&(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos]), Mailbox_ReturnToFieldFromReadMail, TRUE); DestroyTask(taskId); } @@ -823,7 +823,7 @@ static void Mailbox_DoGiveMailPokeMenu(u8 taskId) if (!gPaletteFade.active) { sub_81D1EC0(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); sub_81B8448(); DestroyTask(taskId); } diff --git a/src/pokemon.c b/src/pokemon.c index 8bde37ff9d..28dcc04a8f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2567,7 +2567,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, SetBoxMonData(boxMon, MON_DATA_SPECIES, &species); SetBoxMonData(boxMon, MON_DATA_EXP, &gExperienceTables[gBaseStats[species].growthRate][level]); SetBoxMonData(boxMon, MON_DATA_FRIENDSHIP, &gBaseStats[species].friendship); - value = sav1_map_get_name(); + value = GetCurrentRegionMapSectionId(); SetBoxMonData(boxMon, MON_DATA_MET_LOCATION, &value); SetBoxMonData(boxMon, MON_DATA_MET_LEVEL, &level); SetBoxMonData(boxMon, MON_DATA_MET_GAME, &gGameVersion); @@ -5174,7 +5174,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) friendship++; - if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) + if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; } if (friendship < 0) @@ -5200,7 +5200,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) friendship++; - if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) + if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; } if (friendship < 0) @@ -5225,7 +5225,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) friendship++; - if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) + if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; } if (friendship < 0) @@ -5873,7 +5873,7 @@ void AdjustFriendship(struct Pokemon *mon, u8 event) { if (GetMonData(mon, MON_DATA_POKEBALL, 0) == ITEM_LUXURY_BALL) friendship++; - if (GetMonData(mon, MON_DATA_MET_LOCATION, 0) == sav1_map_get_name()) + if (GetMonData(mon, MON_DATA_MET_LOCATION, 0) == GetCurrentRegionMapSectionId()) friendship++; } if (friendship < 0) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 91a1a5fd03..36ed78a546 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1759,7 +1759,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) case 4: if (!gPaletteFade.active) { - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); Cb2_EnterPSS(task->data[2]); RemoveWindow(task->data[15]); DestroyTask(taskId); diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index fe5e1089e5..3cbf6ecd29 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -34,12 +34,12 @@ int GameClear(void) if (GetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME) == 0) SetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME, (gSaveBlock2Ptr->playTimeHours << 16) | (gSaveBlock2Ptr->playTimeMinutes << 8) | gSaveBlock2Ptr->playTimeSeconds); - SetSecretBase2Field_9(); + SetContinueGameWarpStatus(); if (gSaveBlock2Ptr->playerGender == MALE) - sub_8084F6C(HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F); + SetContinueGameWarpToHealLocation(HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F); else - sub_8084F6C(HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F); + SetContinueGameWarpToHealLocation(HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F); ribbonGet = FALSE; diff --git a/src/record_mixing.c b/src/record_mixing.c index 2b497c82b8..e3764c4906 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1481,14 +1481,14 @@ static void sub_80E7FF8(u8 taskId) task->data[0] = 6; break; case 2: - sub_8076D5C(); + SetContinueGameWarpStatusToDynamicWarp(); sub_8153430(); task->data[0] ++; break; case 3: if (sub_8153474()) { - sav2_gender2_inplace_and_xFE(); + ClearContinueGameWarpStatus2(); task->data[0] = 4; task->data[1] = 0; } diff --git a/src/region_map.c b/src/region_map.c index 4752d96f05..ff0c191673 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -25,6 +25,7 @@ #include "constants/region_map_sections.h" #include "heal_location.h" #include "constants/heal_locations.h" +#include "constants/map_types.h" #define MAP_WIDTH 28 #define MAP_HEIGHT 15 @@ -864,7 +865,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) u16 y; u16 dimensionScale; u16 xOnMap; - struct WarpData *storedWarp; + struct WarpData *warp; if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SS_TIDAL_CORRIDOR) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(SS_TIDAL_CORRIDOR) @@ -878,11 +879,11 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) switch (GetMapTypeByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum)) { default: - case 1: - case 2: - case 3: - case 5: - case 6: + case MAP_TYPE_TOWN: + case MAP_TYPE_CITY: + case MAP_TYPE_ROUTE: + case MAP_TYPE_UNDERWATER: + case MAP_TYPE_6: gRegionMap->mapSecId = gMapHeader.regionMapSectionId; gRegionMap->playerIsInCave = FALSE; mapWidth = gMapHeader.mapLayout->width; @@ -894,17 +895,17 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) gRegionMap->playerIsInCave = TRUE; } break; - case 4: - case 7: + case MAP_TYPE_UNDERGROUND: + case MAP_TYPE_7: if (gMapHeader.flags & 0x02) { - mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->warp4.mapGroup, gSaveBlock1Ptr->warp4.mapNum); + mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; gRegionMap->playerIsInCave = TRUE; mapWidth = mapHeader->mapLayout->width; mapHeight = mapHeader->mapLayout->height; - x = gSaveBlock1Ptr->warp4.x; - y = gSaveBlock1Ptr->warp4.y; + x = gSaveBlock1Ptr->escapeWarp.x; + y = gSaveBlock1Ptr->escapeWarp.y; } else { @@ -916,27 +917,26 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) y = 1; } break; - case 9: - mapHeader = Overworld_GetMapHeaderByGroupAndId((u16)gSaveBlock1Ptr->warp2.mapGroup, (u16)gSaveBlock1Ptr->warp2.mapNum); + case MAP_TYPE_SECRET_BASE: + mapHeader = Overworld_GetMapHeaderByGroupAndId((u16)gSaveBlock1Ptr->dynamicWarp.mapGroup, (u16)gSaveBlock1Ptr->dynamicWarp.mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; gRegionMap->playerIsInCave = TRUE; mapWidth = mapHeader->mapLayout->width; mapHeight = mapHeader->mapLayout->height; - x = gSaveBlock1Ptr->warp2.x; - y = gSaveBlock1Ptr->warp2.y; + x = gSaveBlock1Ptr->dynamicWarp.x; + y = gSaveBlock1Ptr->dynamicWarp.y; break; - case 8: - + case MAP_TYPE_INDOOR: gRegionMap->mapSecId = gMapHeader.regionMapSectionId; if (gRegionMap->mapSecId != MAPSEC_DYNAMIC) { - storedWarp = &gSaveBlock1Ptr->warp4; - mapHeader = Overworld_GetMapHeaderByGroupAndId(storedWarp->mapGroup, storedWarp->mapNum); + warp = &gSaveBlock1Ptr->escapeWarp; + mapHeader = Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum); } else { - storedWarp = &gSaveBlock1Ptr->warp2; - mapHeader = Overworld_GetMapHeaderByGroupAndId(storedWarp->mapGroup, storedWarp->mapNum); + warp = &gSaveBlock1Ptr->dynamicWarp; + mapHeader = Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; } if (RegionMap_IsPlayerInCave(gRegionMap->mapSecId)) @@ -949,8 +949,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) } mapWidth = mapHeader->mapLayout->width; mapHeight = mapHeader->mapLayout->height; - x = storedWarp->x; - y = storedWarp->y; + x = warp->x; + y = warp->y; break; } @@ -1902,25 +1902,25 @@ static void sub_8124E0C(void) switch (sFlyMap->regionMap.mapSecId) { case MAPSEC_SOUTHERN_ISLAND: - sub_8084CCC(HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR); + SetWarpDestinationToHealLocation(HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR); break; case MAPSEC_BATTLE_FRONTIER: - sub_8084CCC(HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST); + SetWarpDestinationToHealLocation(HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST); break; case MAPSEC_LITTLEROOT_TOWN: - sub_8084CCC(gSaveBlock2Ptr->playerGender == MALE ? HEAL_LOCATION_LITTLEROOT_TOWN_1 : HEAL_LOCATION_LITTLEROOT_TOWN_2); + SetWarpDestinationToHealLocation(gSaveBlock2Ptr->playerGender == MALE ? HEAL_LOCATION_LITTLEROOT_TOWN_1 : HEAL_LOCATION_LITTLEROOT_TOWN_2); break; case MAPSEC_EVER_GRANDE_CITY: - sub_8084CCC(FlagGet(FLAG_LANDMARK_POKEMON_LEAGUE) && sFlyMap->regionMap.posWithinMapSec == 0 ? HEAL_LOCATION_EVER_GRANDE_CITY_2 : HEAL_LOCATION_EVER_GRANDE_CITY_1); + SetWarpDestinationToHealLocation(FlagGet(FLAG_LANDMARK_POKEMON_LEAGUE) && sFlyMap->regionMap.posWithinMapSec == 0 ? HEAL_LOCATION_EVER_GRANDE_CITY_2 : HEAL_LOCATION_EVER_GRANDE_CITY_1); break; default: if (sMapHealLocations[sFlyMap->regionMap.mapSecId][2] != 0) { - sub_8084CCC(sMapHealLocations[sFlyMap->regionMap.mapSecId][2]); + SetWarpDestinationToHealLocation(sMapHealLocations[sFlyMap->regionMap.mapSecId][2]); } else { - warp1_set_2(sMapHealLocations[sFlyMap->regionMap.mapSecId][0], sMapHealLocations[sFlyMap->regionMap.mapSecId][1], -1); + SetWarpDestinationToMapWarp(sMapHealLocations[sFlyMap->regionMap.mapSecId][0], sMapHealLocations[sFlyMap->regionMap.mapSecId][1], -1); } break; } diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 066f7695c7..d3c6ec6d1d 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1315,7 +1315,7 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id) if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_00.unk_01_2 != 3) { - if (!(gSaveBlock2Ptr->specialSaveWarp & 0x80)) + if (!(gSaveBlock2Ptr->specialSaveWarpFlags & 0x80)) return 1; else if (structPtr->unk.field_0.unk_00.unk_00_7) return 0; @@ -1633,8 +1633,8 @@ void sub_8014210(u16 battleFlags) void sub_8014290(u16 arg0, u16 x, u16 y) { VarSet(VAR_0x4087, arg0); - Overworld_SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); - saved_warp2_set_2(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); + SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); + SetDynamicWarpWithCoords(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); WarpIntoMap(); } @@ -1645,7 +1645,7 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) gFieldLinkPlayerCount = GetLinkPlayerCount(); gUnknown_03005DB4 = GetMultiplayerId(); SetCableClubWarp(); - Overworld_SetWarpDestination(mapGroup, mapNum, -1, x, y); + SetWarpDestination(mapGroup, mapNum, -1, x, y); WarpIntoMap(); } @@ -1697,12 +1697,12 @@ void sub_801440C(u8 taskId) { case 65: case 81: - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); gMain.savedCallback = sub_801AC54; sub_81B8518(3); break; case 1: - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); sub_80143E4(gBlockSendBuffer, TRUE); HealPlayerParty(); SavePlayerParty(); @@ -1711,7 +1711,7 @@ void sub_801440C(u8 taskId) SetMainCallback2(sub_8014384); break; case 2: - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); HealPlayerParty(); SavePlayerParty(); LoadPlayerBag(); @@ -1720,7 +1720,7 @@ void sub_801440C(u8 taskId) SetMainCallback2(sub_8014384); break; case 3: - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); HealPlayerParty(); SavePlayerParty(); LoadPlayerBag(); @@ -1730,18 +1730,18 @@ void sub_801440C(u8 taskId) break; case 4: sub_80143E4(gBlockSendBuffer, TRUE); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); sub_8014304(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, 3); SetMainCallback2(sub_8014384); break; case 15: sub_80143E4(gBlockSendBuffer, TRUE); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); sub_8014304(MAP_GROUP(RECORD_CORNER), MAP_NUM(RECORD_CORNER), 8, 9, 4); SetMainCallback2(sub_8014384); break; case 68: - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); CreateTask(sub_8013F90, 0); break; case 5: diff --git a/src/save.c b/src/save.c index 905f075fb2..b234c230d3 100644 --- a/src/save.c +++ b/src/save.c @@ -923,7 +923,7 @@ void sub_8153688(u8 taskId) break; case 3: if (taskData[2] == 0) - sub_8076D5C(); + SetContinueGameWarpStatusToDynamicWarp(); sub_8153380(); taskData[0] = 4; break; @@ -946,7 +946,7 @@ void sub_8153688(u8 taskId) break; case 7: if (taskData[2] == 0) - sav2_gender2_inplace_and_xFE(); + ClearContinueGameWarpStatus2(); sub_800ADF8(); taskData[0] = 8; break; diff --git a/src/save_location.c b/src/save_location.c index d49afa7369..2443b3161b 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -2,11 +2,6 @@ #include "save_location.h" #include "constants/maps.h" -// specialSaveWarp flags -#define POKECENTER_SAVEWARP (1 << 1) -#define LOBBY_SAVEWARP (1 << 2) -#define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3) - static bool32 IsCurMapInLocationList(const u16 *list) { s32 i; @@ -94,26 +89,26 @@ static bool32 sub_81AFCEC(void) static void TrySetPokeCenterWarpStatus(void) { if (IsCurMapPokeCenter() == FALSE) - gSaveBlock2Ptr->specialSaveWarp &= ~(POKECENTER_SAVEWARP); + gSaveBlock2Ptr->specialSaveWarpFlags &= ~(POKECENTER_SAVEWARP); else - gSaveBlock2Ptr->specialSaveWarp |= POKECENTER_SAVEWARP; + gSaveBlock2Ptr->specialSaveWarpFlags |= POKECENTER_SAVEWARP; } static void TrySetReloadWarpStatus(void) { if (!IsCurMapReloadLocation()) - gSaveBlock2Ptr->specialSaveWarp &= ~(LOBBY_SAVEWARP); + gSaveBlock2Ptr->specialSaveWarpFlags &= ~(LOBBY_SAVEWARP); else - gSaveBlock2Ptr->specialSaveWarp |= LOBBY_SAVEWARP; + gSaveBlock2Ptr->specialSaveWarpFlags |= LOBBY_SAVEWARP; } // this function definitely sets a warp status, but because the list is empty, it's unknown what this does yet. static void sub_81AFD5C(void) { if (!sub_81AFCEC()) - gSaveBlock2Ptr->specialSaveWarp &= ~(UNK_SPECIAL_SAVE_WARP_FLAG_3); + gSaveBlock2Ptr->specialSaveWarpFlags &= ~(UNK_SPECIAL_SAVE_WARP_FLAG_3); else - gSaveBlock2Ptr->specialSaveWarp |= UNK_SPECIAL_SAVE_WARP_FLAG_3; + gSaveBlock2Ptr->specialSaveWarpFlags |= UNK_SPECIAL_SAVE_WARP_FLAG_3; } void TrySetMapSaveWarpStatus(void) @@ -136,5 +131,5 @@ void sub_81AFDA0(void) void sub_81AFDD0(void) { - gSaveBlock2Ptr->specialSaveWarp |= 0x80; + gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80; } diff --git a/src/scrcmd.c b/src/scrcmd.c index ab3af019d8..39df1117d8 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -735,7 +735,7 @@ bool8 ScrCmd_setmaplayoutindex(struct ScriptContext *ctx) { u16 value = VarGet(ScriptReadHalfword(ctx)); - sub_8085524(value); + SetCurrentMapLayout(value); return FALSE; } @@ -747,7 +747,7 @@ bool8 ScrCmd_warp(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); + SetWarpDestination(mapGroup, mapNum, warpId, x, y); sub_80AF734(); ResetInitialPlayerAvatarState(); return TRUE; @@ -761,7 +761,7 @@ bool8 ScrCmd_warpsilent(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); + SetWarpDestination(mapGroup, mapNum, warpId, x, y); sp13E_warp_to_last_warp(); ResetInitialPlayerAvatarState(); return TRUE; @@ -775,7 +775,7 @@ bool8 ScrCmd_warpdoor(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); + SetWarpDestination(mapGroup, mapNum, warpId, x, y); sub_80AF7D0(); ResetInitialPlayerAvatarState(); return TRUE; @@ -790,9 +790,9 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) PlayerGetDestCoords(&x, &y); if (mapGroup == 0xFF && mapNum == 0xFF) - SetFixedHoleWarpAsDestination(x - 7, y - 7); + SetWarpDestinationToFixedHoleWarp(x - 7, y - 7); else - Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); + SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); sp13F_fall_to_last_warp(); ResetInitialPlayerAvatarState(); return TRUE; @@ -806,7 +806,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); + SetWarpDestination(mapGroup, mapNum, warpId, x, y); sub_80AF848(); ResetInitialPlayerAvatarState(); return TRUE; @@ -820,7 +820,7 @@ bool8 ScrCmd_warpD7(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); + SetWarpDestination(mapGroup, mapNum, warpId, x, y); sub_80AF87C(); ResetInitialPlayerAvatarState(); return TRUE; @@ -834,7 +834,7 @@ bool8 ScrCmd_setwarp(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); + SetWarpDestination(mapGroup, mapNum, warpId, x, y); return FALSE; } @@ -846,7 +846,7 @@ bool8 ScrCmd_setdynamicwarp(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - saved_warp2_set_2(0, mapGroup, mapNum, warpId, x, y); + SetDynamicWarpWithCoords(0, mapGroup, mapNum, warpId, x, y); return FALSE; } @@ -882,7 +882,7 @@ bool8 ScrCmd_setescapewarp(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - sub_8084DD4(mapGroup, mapNum, warpId, x, y); + SetEscapeWarp(mapGroup, mapNum, warpId, x, y); return FALSE; } @@ -1998,7 +1998,7 @@ bool8 ScrCmd_setrespawn(struct ScriptContext *ctx) { u16 healLocationId = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetHealLocationWarp(healLocationId); + SetLastHealLocationWarp(healLocationId); return FALSE; } @@ -2235,7 +2235,7 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); + SetWarpDestination(mapGroup, mapNum, warpId, x, y); sub_808D074(GetPlayerFacingDirection()); sub_80B0244(); ResetInitialPlayerAvatarState(); @@ -2289,7 +2289,7 @@ bool8 ScrCmd_warpE0(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); + SetWarpDestination(mapGroup, mapNum, warpId, x, y); sub_80AF79C(); ResetInitialPlayerAvatarState(); return TRUE; diff --git a/src/secret_base.c b/src/secret_base.c index 7e7b10a9a8..15d6d17803 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -366,7 +366,7 @@ void sub_80E8F9C(void) s8 idx; idx = sCurSecretBaseId / 10 * 4; - warp1_set_2(MAP_GROUP(SECRET_BASE_RED_CAVE1), gUnknown_0858CFE8[idx], gUnknown_0858CFE8[idx + 1]); + SetWarpDestinationToMapWarp(MAP_GROUP(SECRET_BASE_RED_CAVE1), gUnknown_0858CFE8[idx], gUnknown_0858CFE8[idx + 1]); } void sub_80E8FD0(u8 taskId) @@ -400,7 +400,7 @@ void sub_80E9068(void) { CreateTask(sub_80E8FD0, 0); FadeScreen(1, 0); - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); } bool8 sub_80E909C(void) @@ -445,7 +445,7 @@ void sub_80E916C(u8 taskId) if (!gPaletteFade.active) { idx = sCurSecretBaseId / 10 * 4; - Overworld_SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, gUnknown_0858CFE8[idx + 2], gUnknown_0858CFE8[idx + 3]); + SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, gUnknown_0858CFE8[idx + 2], gUnknown_0858CFE8[idx + 3]); WarpIntoMap(); gFieldCallback = sub_80E9108; SetMainCallback2(CB2_LoadMap); @@ -643,7 +643,7 @@ void sub_80E96A4(u8 taskId) } break; case 2: - copy_saved_warp2_bank_and_enter_x_to_warp1(0x7e); + SetWarpDestinationToDynamicWarp(0x7e); WarpIntoMap(); gFieldCallback = mapldr_default; SetMainCallback2(CB2_LoadMap); diff --git a/src/start_menu.c b/src/start_menu.c index ad7b4b6ccc..0f608b1d20 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -623,7 +623,7 @@ static bool8 StartMenuPokedexCallback(void) IncrementGameStat(GAME_STAT_CHECKED_POKEDEX); PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_Pokedex); return TRUE; @@ -638,7 +638,7 @@ static bool8 StartMenuPokemonCallback(void) { PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PartyMenuFromStartMenu); // Display party menu return TRUE; @@ -653,7 +653,7 @@ static bool8 StartMenuBagCallback(void) { PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_BagMenuFromStartMenu); // Display bag menu return TRUE; @@ -668,7 +668,7 @@ static bool8 StartMenuPokeNavCallback(void) { PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PokeNav); // Display PokeNav return TRUE; @@ -683,7 +683,7 @@ static bool8 StartMenuPlayerNameCallback(void) { PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); if (is_c1_link_related_active() || InUnionRoom()) { @@ -722,7 +722,7 @@ static bool8 StartMenuOptionCallback(void) { PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_InitOptionMenu); // Display option menu gMain.savedCallback = CB2_ReturnToFieldWithOpenMenu; @@ -754,7 +754,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) if (!gPaletteFade.active) { PlayRainSoundEffect(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); TrainerCard_ShowLinkCard(gUnknown_03005DB4, CB2_ReturnToFieldWithOpenMenu); return TRUE; @@ -784,7 +784,7 @@ static bool8 StartMenuBattlePyramidBagCallback(void) { PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); - overworld_free_bg_tilemaps(); + CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PyramidBagMenuFromStartMenu); return TRUE; @@ -1285,14 +1285,14 @@ static void sub_80A0550(u8 taskId) } break; case 1: - sub_8076D5C(); + SetContinueGameWarpStatusToDynamicWarp(); sub_8153430(); *step = 2; break; case 2: if (sub_8153474()) { - sav2_gender2_inplace_and_xFE(); + ClearContinueGameWarpStatus2(); *step = 3; gSoftResetDisabled = 0; }