diff options
394 files changed, 394 insertions, 394 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 007ccb4c4..178d527b2 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -11,4 +11,4 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 9c49a6e12..6e437485a 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Corridors_1F:: @ 8307374 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 692c5922c..884c1cc0d 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index f48ab2130..3454cac63 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Deck:: @ 8307358 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index fcd5a4706..9894918c6 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -11,4 +11,4 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 4b357b3f6..d1b89c313 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -11,4 +11,4 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 0 - .byte 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 527e8e5bc..fcfc746c1 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Room_B1F:: @ 830741C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index c22d6d10d..e76a52fd7 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 81665db27..042b61164 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 529077f67..c660f4a33 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Rooms_1F:: @ 8307390 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 018f4b2f4..360864803 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index e40484143..12f2c380b 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Underwater1:: @ 8307400 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index ac549db4c..435ee67a3 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Underwater2:: @ 8307470 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index a28a7a77a..30487ab6b 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -11,4 +11,4 @@ AncientTomb:: @ 83074E0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 436466f98..68c4b3a67 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -11,4 +11,4 @@ AquaHideout_1F:: @ 8306FF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index be77d5630..d7ed443d2 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -11,4 +11,4 @@ AquaHideout_B1F:: @ 8307010 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index d575c2c90..22e30f598 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -11,4 +11,4 @@ AquaHideout_B2F:: @ 830702C .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 2043f0146..f21ded0e5 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -11,4 +11,4 @@ BattleTower_BattleRoom:: @ 8307C88 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index cc72d42a7..8d5b0719f 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -11,4 +11,4 @@ BattleTower_Corridor:: @ 8307C6C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index 3cab9f057..05cb41342 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -11,4 +11,4 @@ BattleTower_Elevator:: @ 8307C50 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index c4e8426d3..2a4caadcb 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -11,4 +11,4 @@ BattleTower_Lobby:: @ 8307C34 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 5725a020d..ed95d9358 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -11,4 +11,4 @@ BattleTower_Outside:: @ 8307C18 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 6c0c0282b..20c0aa739 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_1F:: @ 8307198 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 2ca7210bf..45300c02d 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_B1F:: @ 83071B4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index d44586310..fb1bf9e45 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_B2F:: @ 83071D0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index a609cc046..5e6359852 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_B3F:: @ 83071EC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc index ae32a3fbd..00e51495e 100644 --- a/data/maps/CaveOfOrigin_B4F/header.inc +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_B4F:: @ 8307208 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 2d94c3cb8..29c356a24 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_Entrance:: @ 830717C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 51a58c901..5e42b6c1a 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -11,4 +11,4 @@ DesertRuins:: @ 8306E18 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 2e50fc942..f66ffc56b 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -11,4 +11,4 @@ DewfordTown:: @ 830557C .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index d14be9081..cbc2c1504 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -11,4 +11,4 @@ DewfordTown_Gym:: @ 8305B9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 693aad8dd..540fc602c 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -11,4 +11,4 @@ DewfordTown_Hall:: @ 8305BB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index b23156bcf..067ac76f4 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -11,4 +11,4 @@ DewfordTown_House1:: @ 8305B48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 576cd92b4..75af834ff 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -11,4 +11,4 @@ DewfordTown_House2:: @ 8305BD4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 e1e80ce69..84cf5a83e 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 07cbd0d21..90ccaa9d1 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 77e74f68e..d9bc47e23 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -11,4 +11,4 @@ DoubleBattleColosseum:: @ 83079CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 0ea3e5895..b80385735 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -11,4 +11,4 @@ EverGrandeCity:: @ 8305528 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 2120bbd5c..74fc87562 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index f8685ae71..abb715579 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor1:: @ 8306B24 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 870cbdaf0..84e681fd7 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor2:: @ 8306B40 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index f9b05ab51..240d65727 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor3:: @ 8306B5C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 104fe4cc0..3fad2e361 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor4:: @ 8306B78 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index 59efd9330..3496c95be 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor5:: @ 8306B94 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index ab814f3ce..265aac21d 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 7 + .byte MAP_BATTLE_SCENE_DRAKE diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 437b8e46a..6338d9c79 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 6 + .byte MAP_BATTLE_SCENE_GLACIA diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index ab899d0b6..7c960229e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index ca317f6c6..754757686 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 5 + .byte MAP_BATTLE_SCENE_PHOEBE diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 3f499e878..f52bbdaaf 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 8bc65391d..18f3152a6 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index e3e6c7508..03d3fe2c8 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 5ba789a31..271b85dc2 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 4 + .byte MAP_BATTLE_SCENE_SIDNEY diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index a074373b4..3d825ccb9 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -11,4 +11,4 @@ FallarborTown:: @ 83055B4 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index c8e79a55d..d7e0889e3 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -11,4 +11,4 @@ FallarborTown_ContestHall:: @ 8305CEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index e10261315..b96b373c3 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -11,4 +11,4 @@ FallarborTown_ContestLobby:: @ 8305CD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 2d1c63681..8e1881474 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -11,4 +11,4 @@ FallarborTown_House1:: @ 8305D40 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 474f18cb3..7bc6cfb20 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -11,4 +11,4 @@ FallarborTown_House2:: @ 8305D5C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 038efb590..6403e78e3 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -11,4 +11,4 @@ FallarborTown_Mart:: @ 8305CB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 d90786ee1..25a18fc1a 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 f2a2d0c6c..14c591d65 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 681673a28..2411a9b19 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -11,4 +11,4 @@ FieryPath:: @ 8306EF8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 72088ca05..9a4c6b64c 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -11,4 +11,4 @@ FortreeCity:: @ 83054B8 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index abc43114f..0f965f12f 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -11,4 +11,4 @@ FortreeCity_DecorationShop:: @ 8306504 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 80c1cb9ed..58fd694ba 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -11,4 +11,4 @@ FortreeCity_Gym:: @ 8306424 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 6844c97a6..7c2adaebb 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -11,4 +11,4 @@ FortreeCity_House1:: @ 8306408 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 71ede81de..df45e02e2 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -11,4 +11,4 @@ FortreeCity_House2:: @ 8306494 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 246277627..c41ac93ef 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -11,4 +11,4 @@ FortreeCity_House3:: @ 83064B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index ba0aa16b6..7277a3a50 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -11,4 +11,4 @@ FortreeCity_House4:: @ 83064CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index ffc77a3e3..aaebd16f8 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -11,4 +11,4 @@ FortreeCity_House5:: @ 83064E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index d26b0e769..844355731 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -11,4 +11,4 @@ FortreeCity_Mart:: @ 8306478 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 ba1da616f..35b871240 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 ee2c1bca4..4b7a601ed 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index c8572d09b..b94051123 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -11,4 +11,4 @@ GraniteCave_1F:: @ 8306E34 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 68c0f3c7f..5673b1fdc 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -11,4 +11,4 @@ GraniteCave_B1F:: @ 8306E50 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 738980088..240ff2dc0 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -11,4 +11,4 @@ GraniteCave_B2F:: @ 8306E6C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 7b6ea5820..66fcf26af 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -11,4 +11,4 @@ GraniteCave_StevensRoom:: @ 8306E88 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 466658ca6..2c2135be5 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -11,4 +11,4 @@ InsideOfTruck:: @ 8307B38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 205627e8b..4630a79aa 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -11,4 +11,4 @@ IslandCave:: @ 83074C4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index c8dc563df..8f4d866ce 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -11,4 +11,4 @@ JaggedPass:: @ 8306EDC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 29c3dfcf8..4b798b26f 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -11,4 +11,4 @@ LavaridgeTown:: @ 8305598 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 543d73a72..609808f0f 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 4fc005285..df8d98e11 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 09c78bafa..a65cc4358 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 49c155a39..15dd76303 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_House:: @ 8305C44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 4f8779188..fa7d4c92a 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_Mart:: @ 8305C60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 e0bee1062..921a7d90a 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 1a17d7b4d..34bfd1a08 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index be9cdb8f8..3eca23cdf 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -11,4 +11,4 @@ LilycoveCity:: @ 83054D4 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 503db1b0a..ade66a18f 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -11,4 +11,4 @@ LilycoveCity_ContestHall:: @ 83065AC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index b1bd0bf8f..62507b9a0 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -11,4 +11,4 @@ LilycoveCity_ContestLobby:: @ 8306590 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 21f74e491..e60b3ce64 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 4f3b48379..47e8960d4 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 9bb512a84..8571ea102 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 87212df01..f42e93df8 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 b717b1dd3..93799798b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 1297e8839..1ebab31dc 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 8fa6f4fa2..50d1e9585 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 c67c412f5..025b9c83e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 ec78aa1f9..7cc9e86f8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index 79c1c2a0f..e5c3db22e 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -11,4 +11,4 @@ LilycoveCity_EmptyMap:: @ 8306654 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 47a4de691..5d0508895 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -11,4 +11,4 @@ LilycoveCity_Harbor:: @ 8306638 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index d67fd50ad..a4cede932 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -11,4 +11,4 @@ LilycoveCity_House1:: @ 830668C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index aeef9e507..eb9b120e3 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -11,4 +11,4 @@ LilycoveCity_House2:: @ 83066A8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index b56cdf9bf..4bd0a4509 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -11,4 +11,4 @@ LilycoveCity_House3:: @ 83066C4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index bf2850606..c85aa04aa 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -11,4 +11,4 @@ LilycoveCity_House4:: @ 83066E0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 c19473dab..696e823b3 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 de5f7ddad..8fe60bc17 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 12c650b26..d2483b4e5 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -11,4 +11,4 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 5a94e080e..ec56cfc5d 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 2ed2bb057..a46e9e291 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index e12bca1f1..e5eb0eaa7 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -11,4 +11,4 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 0b49616ff..78e14b53b 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -11,4 +11,4 @@ LilycoveCity_UnusedMart:: @ 8306600 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 2e4570a1e..3ca7d6ed9 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -11,4 +11,4 @@ LinkContestRoom1:: @ 83079E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index d0603beca..e368f56a2 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -11,4 +11,4 @@ LinkContestRoom2:: @ 8307AAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index f2b54e921..368f7a8c5 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -11,4 +11,4 @@ LinkContestRoom3:: @ 8307AC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 2d5accdbd..caf0848a4 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -11,4 +11,4 @@ LinkContestRoom4:: @ 8307AE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 7871634dd..5ea615ef4 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -11,4 +11,4 @@ LinkContestRoom5:: @ 8307B00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 61ddc155d..7edebef67 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -11,4 +11,4 @@ LinkContestRoom6:: @ 8307B1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 148df6639..216583a90 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -11,4 +11,4 @@ LittlerootTown:: @ 8305544 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index f4b850f85..e9e62d25a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -11,4 +11,4 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 66b7958db..504504c57 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -11,4 +11,4 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 5689d53fb..cbf0cc22b 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -11,4 +11,4 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 fff38cdfe..c67985a20 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -11,4 +11,4 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 324fa3bb7..d07616c83 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -11,4 +11,4 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index ad6630fd7..b2235e2e5 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -11,4 +11,4 @@ MagmaHideout_1F:: @ 8307588 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index f13e4c11d..2a64f4324 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -11,4 +11,4 @@ MagmaHideout_B1F:: @ 83075A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index ed031c644..adfd83008 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -11,4 +11,4 @@ MagmaHideout_B2F:: @ 83075C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index 5bdb4ac26..73d8c1330 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -11,4 +11,4 @@ MauvilleCity:: @ 8305480 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index fd2750c0c..5d27cb8e7 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -11,4 +11,4 @@ MauvilleCity_BikeShop:: @ 8306168 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index c5ded2c14..436a96c9c 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -11,4 +11,4 @@ MauvilleCity_GameCorner:: @ 83061A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index bbb862021..3dca4129a 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -11,4 +11,4 @@ MauvilleCity_Gym:: @ 830614C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 809d45406..d9e54375d 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -11,4 +11,4 @@ MauvilleCity_House1:: @ 8306184 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 31269c3cc..395e22561 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -11,4 +11,4 @@ MauvilleCity_House2:: @ 83061BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index e7e6eeeaa..3f81ded38 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -11,4 +11,4 @@ MauvilleCity_Mart:: @ 8306210 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 2245b114d..3e3c3f730 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 a4d3f4ff3..48659f5c8 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 f9b93ee19..d86635764 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -11,4 +11,4 @@ MeteorFalls_1F_1R:: @ 8306D70 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index dea9dbfd0..959c46b25 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -11,4 +11,4 @@ MeteorFalls_1F_2R:: @ 8306D8C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index a64b5c369..aeeb6dcfa 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -11,4 +11,4 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 85b8d69c7..878187bcd 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -11,4 +11,4 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index a7f41311c..36615e936 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -11,4 +11,4 @@ MossdeepCity:: @ 83054F0 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 596816e9b..fd57180d1 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 1a5b81fba..f6436c975 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 560ee4e9d..1070a37cd 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -11,4 +11,4 @@ MossdeepCity_Gym:: @ 83067C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index f5d413d81..4c7c76534 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -11,4 +11,4 @@ MossdeepCity_House1:: @ 83067DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index ff1ab5379..a5107efe1 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -11,4 +11,4 @@ MossdeepCity_House2:: @ 83067F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 76a0fffb6..a77e48e40 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -11,4 +11,4 @@ MossdeepCity_House3:: @ 8306868 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 7d4f16f20..91ef8305c 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -11,4 +11,4 @@ MossdeepCity_House4:: @ 83068A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 7e8a4c9a4..dc9f8832a 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -11,4 +11,4 @@ MossdeepCity_Mart:: @ 830684C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 d061f4b0d..1f9a18c11 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 5b0bedaf4..d3ac47ccb 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 c9167bede..3092932b8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 262b57f82..00aebba1b 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index f02432216..5988c50b4 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -11,4 +11,4 @@ MossdeepCity_StevensHouse:: @ 8306884 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 3660719ec..2312d9c92 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -11,4 +11,4 @@ MtChimney:: @ 8306EC0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 1cc4f5b68..15d59a97f 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -11,4 +11,4 @@ MtChimney_CableCarStation:: @ 8306CAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 8ac59ab5f..bbd8c0370 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -11,4 +11,4 @@ MtPyre_1F:: @ 8306F14 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index d0485cea1..c123d076a 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -11,4 +11,4 @@ MtPyre_2F:: @ 8306F30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 2a99e77f0..c201e9377 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -11,4 +11,4 @@ MtPyre_3F:: @ 8306F4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 8e4ce5931..24f3f7d9f 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -11,4 +11,4 @@ MtPyre_4F:: @ 8306F68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 756adc96d..75fae8c1a 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -11,4 +11,4 @@ MtPyre_5F:: @ 8306F84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 734f14e26..7156e17a2 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -11,4 +11,4 @@ MtPyre_6F:: @ 8306FA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index e058ed4d5..5aacc218a 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -11,4 +11,4 @@ MtPyre_Exterior:: @ 8306FBC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 6cc6f5e73..fbefd9aff 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -11,4 +11,4 @@ MtPyre_Summit:: @ 8306FD8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 53bd09029..26c9096ee 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -11,4 +11,4 @@ NewMauville_Entrance:: @ 8307320 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 8d7d27e44..4e9878630 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -11,4 +11,4 @@ NewMauville_Inside:: @ 830733C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 092372be7..6e54fe9f2 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -11,4 +11,4 @@ OldaleTown:: @ 8305560 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 632e40dec..bc402caf7 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -11,4 +11,4 @@ OldaleTown_House1:: @ 8305ABC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index b59f56f1a..0e4c8dea7 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -11,4 +11,4 @@ OldaleTown_House2:: @ 8305AD8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 58e8aba90..ab067341e 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -11,4 +11,4 @@ OldaleTown_Mart:: @ 8305B2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 b2d5af33a..791353439 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 5065e1aa6..7f2eae09e 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 3e65ddaad..ddc0e85ef 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -11,4 +11,4 @@ PacifidlogTown:: @ 83055EC .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 170b80287..fc1c7d068 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House1:: @ 8305E90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 575d19c5d..686f43654 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House2:: @ 8305EAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index bbb0e4711..42c167037 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House3:: @ 8305EC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 61e6e515b..292dee756 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House4:: @ 8305EE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 55dfda7ec..c23aae265 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House5:: @ 8305F00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 3168da669..d14920f48 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 eb19b655d..31a7ad30b 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 1c5ed76ef..04dad7375 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -11,4 +11,4 @@ PetalburgCity:: @ 8305448 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 86d17dd19..ecd2919c2 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -11,4 +11,4 @@ PetalburgCity_Gym:: @ 8305F38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 7610d9d81..660d6955e 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -11,4 +11,4 @@ PetalburgCity_House1:: @ 8305F54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 956064137..5271d69b0 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -11,4 +11,4 @@ PetalburgCity_House2:: @ 8305F70 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index ddbfb54b7..eb8f29262 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -11,4 +11,4 @@ PetalburgCity_Mart:: @ 8305FC4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 5a56f2d4a..42ad35b9d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 dc5e57b82..49c74824b 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 2549ee8ff..d733ffbf8 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -11,4 +11,4 @@ PetalburgCity_WallysHouse:: @ 8305F1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 07ac7c810..3c0014255 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -11,4 +11,4 @@ PetalburgWoods:: @ 8306EA4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index e0c9767db..c5cf670ec 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -11,4 +11,4 @@ RecordCorner:: @ 83079B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 5ecbb7e61..3817bb9ac 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -11,4 +11,4 @@ Route101:: @ 8305608 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index b7af31bb0..008c88849 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -11,4 +11,4 @@ Route102:: @ 8305624 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 9d37b2bc1..7cf973ccf 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -11,4 +11,4 @@ Route103:: @ 8305640 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 9827355ba..a31075c83 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -11,4 +11,4 @@ Route104:: @ 830565C .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 1bcc33bf5..96dd9dc25 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -11,4 +11,4 @@ Route104_MrBrineysHouse:: @ 8306C20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index 8a66e5c7f..ffcb35f23 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -11,4 +11,4 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 4b9c5d509..66dbd5222 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -11,4 +11,4 @@ Route104_Prototype:: @ 8307CF8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 25ff26199..8542522bc 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -11,4 +11,4 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 74367713c..61177480e 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -11,4 +11,4 @@ Route105:: @ 8305678 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index fa564fe9e..1d787957b 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -11,4 +11,4 @@ Route106:: @ 8305694 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index f014b95c7..ed5263877 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -11,4 +11,4 @@ Route107:: @ 83056B0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index b0107dc1d..6df68bcc5 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -11,4 +11,4 @@ Route108:: @ 83056CC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 7481c924c..9a18273b6 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -11,4 +11,4 @@ Route109:: @ 83056E8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index a12faddd2..0f199bb4c 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -11,4 +11,4 @@ Route109_SeashoreHouse:: @ 8307D30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index c6e72efba..112b177ff 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -11,4 +11,4 @@ Route110:: @ 8305704 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index f6b6aa1c9..c8093ca03 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -11,4 +11,4 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 187c13781..3c7464315 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -11,4 +11,4 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index c70e483f1..da8c48b0b 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -11,4 +11,4 @@ Route110_TrickHouseCorridor:: @ 8307D84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 37260e661..933182d35 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -11,4 +11,4 @@ Route110_TrickHouseEnd:: @ 8307D68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index e2ee33d65..01cbcc037 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -11,4 +11,4 @@ Route110_TrickHouseEntrance:: @ 8307D4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 0cdf6e55b..74738ea44 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 03b220e96..eebb3bb25 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 8ac021d4d..83ebe469c 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 11eaffbb4..d96d89745 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 40bc9f4b7..b6cc187b6 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index b527fad03..436cc1d1b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index e9fe01965..32e0f1676 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 48f064cb5..8aef9307f 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index b52dbce16..106adf413 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -11,4 +11,4 @@ Route111:: @ 8305720 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 46ea8ce53..ed8da2358 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -11,4 +11,4 @@ Route111_OldLadysRestStop:: @ 8306C74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index f00b7de29..5e68c7992 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -11,4 +11,4 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 2159d8bd6..f5e3f3133 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -11,4 +11,4 @@ Route112:: @ 830573C .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 8c2cdd9fe..0a657b920 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -11,4 +11,4 @@ Route112_CableCarStation:: @ 8306C90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 33f63b8d5..9208e03a1 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -11,4 +11,4 @@ Route113:: @ 8305758 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 4030fbe93..eb75ddfb6 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -11,4 +11,4 @@ Route113_GlassWorkshop:: @ 8307EB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index ba2b1eb3a..fc57d86aa 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -11,4 +11,4 @@ Route114:: @ 8305774 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 71d084466..658bb33d9 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -11,4 +11,4 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index c47de21a6..c8fa950f4 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -11,4 +11,4 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 27f3c0e46..3b49ab59a 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -11,4 +11,4 @@ Route114_LanettesHouse:: @ 8306D00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index c64340a27..9967224a8 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -11,4 +11,4 @@ Route115:: @ 8305790 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 496723efc..0351d0cf7 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -11,4 +11,4 @@ Route116:: @ 83057AC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 431119c68..d17ce63b5 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -11,4 +11,4 @@ Route116_TunnelersRestHouse:: @ 8306D1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 3543079b0..8ef982ca4 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -11,4 +11,4 @@ Route117:: @ 83057C8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 2f301578e..ac75acc8a 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -11,4 +11,4 @@ Route117_PokemonDayCare:: @ 8306D38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 6e7a41ec2..8daad3bc8 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -11,4 +11,4 @@ Route118:: @ 83057E4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 16efb467d..9a0a12f87 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -11,4 +11,4 @@ Route119:: @ 8305800 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index e822387b8..e4d1c2d0a 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -11,4 +11,4 @@ Route119_House:: @ 8307F28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 a55e96cdc..85db67fad 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -11,4 +11,4 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 0a0431b19..ffda37907 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -11,4 +11,4 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 68a6de88f..921c3fde4 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -11,4 +11,4 @@ Route120:: @ 830581C .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 84cd2c273..e75d8d21f 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -11,4 +11,4 @@ Route121:: @ 8305838 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index ca171c39e..5dc27e7fe 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -11,4 +11,4 @@ Route121_SafariZoneEntrance:: @ 8306D54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 5830203cf..44cc87aa9 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -11,4 +11,4 @@ Route122:: @ 8305854 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index dcb08c4bc..49e6631a9 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -11,4 +11,4 @@ Route123:: @ 8305870 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 2c65fb5e3..ec4a4aab1 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -11,4 +11,4 @@ Route123_BerryMastersHouse:: @ 8307ED4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 45163691a..fccd2efee 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -11,4 +11,4 @@ Route124:: @ 830588C .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 4954a683e..34bd5e673 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -11,4 +11,4 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index bcc72f444..b24645c3d 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -11,4 +11,4 @@ Route125:: @ 83058A8 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 8a7a39f08..81af74622 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -11,4 +11,4 @@ Route126:: @ 83058C4 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 92fbe4caf..ca05331d0 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -11,4 +11,4 @@ Route127:: @ 83058E0 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 0f7f4acc6..135d86d79 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -11,4 +11,4 @@ Route128:: @ 83058FC .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 301c65557..fe0ca1652 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -11,4 +11,4 @@ Route129:: @ 8305918 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 1a7fbc77a..e3f7e75a3 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -11,4 +11,4 @@ Route130:: @ 8305934 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 182bcf1e8..92538ee6e 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -11,4 +11,4 @@ Route131:: @ 8305950 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index dbd2ddfe7..7f73ebbc7 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -11,4 +11,4 @@ Route132:: @ 830596C .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index b6a2c5963..87aa3c84b 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -11,4 +11,4 @@ Route133:: @ 8305988 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index cc4360ef9..f7f6e64fd 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -11,4 +11,4 @@ Route134:: @ 83059A4 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 375d378a6..7b63f0119 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -11,4 +11,4 @@ RustboroCity:: @ 830549C .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index e7b90812e..0dce55062 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -11,4 +11,4 @@ RustboroCity_CuttersHouse:: @ 8306360 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 2d78bb675..b32d57093 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -11,4 +11,4 @@ RustboroCity_DevonCorp_1F:: @ 830622C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 acb411dbb..a6c8da14f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -11,4 +11,4 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 5f2f4c039..c38db5048 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -11,4 +11,4 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 855f43ef8..1565c7d46 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat1_1F:: @ 830630C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 75e2fb114..61c97d1ae 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat1_2F:: @ 8306328 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 3a56357f7..9a8a1f848 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat2_1F:: @ 8306398 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 48afa8234..e39257bfe 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat2_2F:: @ 83063B4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 13a8157d1..2e0d442c7 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat2_3F:: @ 83063D0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 79ef9f54c..bc214630b 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -11,4 +11,4 @@ RustboroCity_Gym:: @ 8306280 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index b389ac45a..af3a17a46 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -11,4 +11,4 @@ RustboroCity_House1:: @ 8306344 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 617f458a0..66e194304 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -11,4 +11,4 @@ RustboroCity_House2:: @ 830637C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index e120a1fd3..d5398d3a0 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -11,4 +11,4 @@ RustboroCity_House3:: @ 83063EC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 7b1d739ed..f2d69e238 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -11,4 +11,4 @@ RustboroCity_Mart:: @ 83062F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 f57900235..dd1d976fe 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 ce1d315c7..c34cd3dd7 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index af51ce0d3..af4dc670a 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -11,4 +11,4 @@ RustboroCity_PokemonSchool:: @ 830629C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index f6d6376f9..b2a9be922 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -11,4 +11,4 @@ RusturfTunnel:: @ 8306DE0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 4e9eb4814..50648d5d8 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -11,4 +11,4 @@ SSTidalCorridor:: @ 8307B54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 14c9bf3b1..6d099c8bb 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -11,4 +11,4 @@ SSTidalLowerDeck:: @ 8307B70 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index f744d00f9..ccf887a67 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -11,4 +11,4 @@ SSTidalRooms:: @ 8307B8C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 7100cac69..11d8af01a 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -11,4 +11,4 @@ SafariZone_Northeast:: @ 8307BC4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 51a3877a0..f1d3ba373 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -11,4 +11,4 @@ SafariZone_Northwest:: @ 8307BA8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index c9e83714c..0c02110fd 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -11,4 +11,4 @@ SafariZone_RestHouse:: @ 8307CDC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 05f0738ab..9248fb679 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -11,4 +11,4 @@ SafariZone_Southeast:: @ 8307BFC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 3eb939d1f..0af533fe7 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -11,4 +11,4 @@ SafariZone_Southwest:: @ 8307BE0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index a600190c3..bf9ae56b0 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -11,4 +11,4 @@ ScorchedSlab:: @ 830756C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index e6e6a195e..d1546c99f 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Entrance:: @ 8307064 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index c9fd33da2..d7ded7e26 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room1:: @ 8307080 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index dd4a9fc65..9ca4ef096 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room2:: @ 830709C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 815f8ec8d..b17c3014d 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room3:: @ 83070B8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index d07c3a6df..6c74fd3cc 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room4:: @ 83070D4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 8991e9d2c..9fd274f4f 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room5:: @ 83070F0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index ad7ca11b9..e44ba4e24 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room6:: @ 830710C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index 053537095..dbf39c935 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room7:: @ 8307128 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index bc76830a8..6ffb91ee2 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room8:: @ 8307144 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index a6636e985..1ff4e0783 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room9:: @ 8307160 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 899686f51..b54bec825 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -11,4 +11,4 @@ SealedChamber_InnerRoom:: @ 8307550 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 6919baa5b..61c2a0da6 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -11,4 +11,4 @@ SealedChamber_OuterRoom:: @ 8307534 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 8785a7728..f71c4beb5 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -11,4 +11,4 @@ SecretBase_BlueCave1:: @ 8307710 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index da39bdd06..158567787 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -11,4 +11,4 @@ SecretBase_BlueCave2:: @ 83077B8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 4077c8bd0..5b7b644f4 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -11,4 +11,4 @@ SecretBase_BlueCave3:: @ 8307860 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 663c65a77..eb49d9372 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -11,4 +11,4 @@ SecretBase_BlueCave4:: @ 8307908 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 00d5d0166..44a2a8f2a 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -11,4 +11,4 @@ SecretBase_BrownCave1:: @ 83076F4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 37230d81b..5f9c5285e 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -11,4 +11,4 @@ SecretBase_BrownCave2:: @ 830779C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index ce551a6ec..f46cac8fb 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -11,4 +11,4 @@ SecretBase_BrownCave3:: @ 8307844 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 29806867f..5fafbccbc 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -11,4 +11,4 @@ SecretBase_BrownCave4:: @ 83078EC .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 33f68514e..3fc42eea8 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -11,4 +11,4 @@ SecretBase_RedCave1:: @ 83076D8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 4bc4b673c..ed8addd52 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -11,4 +11,4 @@ SecretBase_RedCave2:: @ 8307780 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 330592a0b..027067c47 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -11,4 +11,4 @@ SecretBase_RedCave3:: @ 8307828 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 0bddcb964..b44756fba 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -11,4 +11,4 @@ SecretBase_RedCave4:: @ 83078D0 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 27c464fde..e882abdf5 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -11,4 +11,4 @@ SecretBase_Shrub1:: @ 8307764 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 70bbc94d8..4f456a00e 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -11,4 +11,4 @@ SecretBase_Shrub2:: @ 830780C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index ee2297f17..042dfcd24 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -11,4 +11,4 @@ SecretBase_Shrub3:: @ 83078B4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 610767784..9c3759686 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -11,4 +11,4 @@ SecretBase_Shrub4:: @ 830795C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index f0e7ee20a..48feee2e2 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -11,4 +11,4 @@ SecretBase_Tree1:: @ 8307748 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 2267b1781..6ba123707 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -11,4 +11,4 @@ SecretBase_Tree2:: @ 83077F0 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 21faa4f01..a3d1c4adc 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -11,4 +11,4 @@ SecretBase_Tree3:: @ 8307898 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index a226fcf4e..b592d8f7c 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -11,4 +11,4 @@ SecretBase_Tree4:: @ 8307940 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index bc9915684..ea7d42c54 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -11,4 +11,4 @@ SecretBase_YellowCave1:: @ 830772C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 4103bbc98..9171e74d2 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -11,4 +11,4 @@ SecretBase_YellowCave2:: @ 83077D4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index b4b034c26..a688172b5 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -11,4 +11,4 @@ SecretBase_YellowCave3:: @ 830787C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 2011ce06e..0d10b3062 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -11,4 +11,4 @@ SecretBase_YellowCave4:: @ 8307924 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 5c7b34fc3..975453341 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 69736dbbf..56e5d229f 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index b9402bc1f..f95032396 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index caddfe2d3..eaa49b671 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index f53475b1d..a7c0c4209 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 04b028774..90cbc8ac0 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 76681ba57..7c1c7f433 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index e416ffa85..ded368bb5 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -11,4 +11,4 @@ SingleBattleColosseum:: @ 8307978 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index eee96bfd0..36c0099bf 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -11,4 +11,4 @@ SkyPillar_1F:: @ 8307614 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 2d0d3cb6c..3c72b0fd4 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -11,4 +11,4 @@ SkyPillar_2F:: @ 8307630 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index a6f4fad16..4b6b828f9 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -11,4 +11,4 @@ SkyPillar_3F:: @ 830764C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index b053d5890..634ab68b4 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -11,4 +11,4 @@ SkyPillar_4F:: @ 8307668 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 4b8b13339..949dac2a6 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -11,4 +11,4 @@ SkyPillar_5F:: @ 83076A0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 5e1693504..8b1f7bede 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -11,4 +11,4 @@ SkyPillar_Entrance:: @ 83075DC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 9a5052d82..2e2695489 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -11,4 +11,4 @@ SkyPillar_Outside:: @ 83075F8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 008b3c188..01e4c49b8 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -11,4 +11,4 @@ SkyPillar_Top:: @ 83076BC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 07be1cf67..0407148bb 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -11,4 +11,4 @@ SlateportCity:: @ 8305464 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index b74c81097..751ce5ca6 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -11,4 +11,4 @@ SlateportCity_ContestHall:: @ 8306034 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index 7d85f9a3d..35cc213e9 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -11,4 +11,4 @@ SlateportCity_ContestLobby:: @ 8306018 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index c2b41541a..166638e38 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -11,4 +11,4 @@ SlateportCity_Harbor:: @ 83060C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 61bbbcce4..61e6c3437 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -11,4 +11,4 @@ SlateportCity_House1:: @ 8306050 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index edfce41e9..a9a2a6c51 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -11,4 +11,4 @@ SlateportCity_House2:: @ 83060DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 86fbd5a0b..6855a45ed 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -11,4 +11,4 @@ SlateportCity_Mart:: @ 8306130 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 1bbe8972c..348013adf 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -11,4 +11,4 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 4a0b436dc..95c73ffcc 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -11,4 +11,4 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 875c2b19e..815b484cd 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 6f00cd6f6..e14479e1c 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 732e56c5e..253355674 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -11,4 +11,4 @@ SlateportCity_PokemonFanClub:: @ 830606C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 95feada82..b38bd8fa5 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -11,4 +11,4 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 6fcc658ec..9c12526ce 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -11,4 +11,4 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 90c0c056a..b87323ffc 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -11,4 +11,4 @@ SootopolisCity:: @ 830550C .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index ce0a1c296..df1b1d17f 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -11,4 +11,4 @@ SootopolisCity_Gym_1F:: @ 830692C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 07f659c1a..54ac62ce1 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -11,4 +11,4 @@ SootopolisCity_Gym_B1F:: @ 8306948 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 81970aeef..261895970 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House1:: @ 83069B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index ba613b636..7e49a0333 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House2:: @ 83069D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 782f71389..19d25ea53 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House3:: @ 83069F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index 8a2552c71..89f13124f 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House4:: @ 8306A0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index e7c7305e2..cfe70c9da 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House5:: @ 8306A28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 65111731c..6b3dbce40 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House6:: @ 8306A44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index c64500a38..378c638ae 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House7:: @ 8306A60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index 4a5d0b098..80734140d 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House8:: @ 8306A7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 17c871122..bb13d1016 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -11,4 +11,4 @@ SootopolisCity_Mart:: @ 830699C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 07fb05d37..8739812a2 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 07c43669c..fb3f2f8c4 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 100ae8d67..a35ed72a7 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -11,4 +11,4 @@ SouthernIsland_Exterior:: @ 8307CA4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index de07a40f9..5bef25e13 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -11,4 +11,4 @@ SouthernIsland_Interior:: @ 8307CC0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 4637e72bc..d7bdaaac4 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -11,4 +11,4 @@ TradeCenter:: @ 8307994 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 2ed1ddbf8..52c15d1b0 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -11,4 +11,4 @@ Underwater1:: @ 83059C0 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 063b894ab..f0e15d9c3 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -11,4 +11,4 @@ Underwater2:: @ 83059DC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 4c5f4a30d..46244962f 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -11,4 +11,4 @@ Underwater3:: @ 83059F8 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 09ef0835c..060ff9b3a 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -11,4 +11,4 @@ Underwater4:: @ 8305A14 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 491f9518f..dc0bfd8e1 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -11,4 +11,4 @@ Underwater_Route134:: @ 83074FC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index e5c0268a4..604f1acba 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -11,4 +11,4 @@ Underwater_SeafloorCavern:: @ 8307048 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 178841380..dd1c92d47 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -11,4 +11,4 @@ Underwater_SealedChamber:: @ 8307518 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index d993d15d5..7e1228388 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -11,4 +11,4 @@ Underwater_SootopolisCity:: @ 8306DFC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 18ad74604..8db6a3794 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_29:: @ 8307A04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 86e5dc384..5db313070 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_30:: @ 8307A20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 469ecbc57..917a5acea 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_31:: @ 8307A3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 d114d28f4..db6f36bf1 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_32:: @ 8307A58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 946fb76ad..d1dd75a38 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_33:: @ 8307A74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 53daccbef..e2b15dc37 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_34:: @ 8307A90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 344717573..6c012f392 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -11,4 +11,4 @@ VerdanturfTown:: @ 83055D0 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index cc946ecd7..cacdf5f20 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_ContestHall:: @ 8305D94 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index b72fe4018..d8ec51ef3 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 8c4b41c83..fd47e6b5b 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index d3c18ee94..b99ebf511 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_House:: @ 8305E3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index f8f12f7fe..d5d47fc72 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_Mart:: @ 8305DB0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 25491bb01..2238e0e72 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 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 68e894b08..bd6369091 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index d88ecf820..01bfcbde5 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index efff8011d..0a9f56e9b 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -11,4 +11,4 @@ VictoryRoad_1F:: @ 8307224 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 6f789eecd..b7a3455ca 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -11,4 +11,4 @@ VictoryRoad_B1F:: @ 8307240 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index cd128d38a..2cad4acec 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -11,4 +11,4 @@ VictoryRoad_B2F:: @ 830725C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |