From 2230c67818a7ef290aebd3e65437701f39dde4fe Mon Sep 17 00:00:00 2001 From: Ninjdai Date: Fri, 10 Nov 2023 10:15:00 +0100 Subject: [PATCH] Added BudportCity PokeCenter and temporary starter bag in boat --- data/event_scripts.s | 7 +- data/layouts/InsideOfStartBoat_0F/map.bin | 2 +- data/maps/BudportCity/map.json | 7 + .../BudportCity_PokemonCenter_1F/map.json | 99 ++ .../BudportCity_PokemonCenter_1F/scripts.inc | 63 ++ .../BudportCity_PokemonCenter_2F/map.json | 99 ++ .../BudportCity_PokemonCenter_2F/scripts.inc | 19 + data/maps/InsideOfStartBoat_0F/map.json | 14 +- data/maps/InsideOfStartBoat_0F/scripts.inc | 30 + .../maps/OldaleTown_PokemonCenter_1F/map.json | 10 +- data/maps/Route101/map.json | 13 - data/maps/Route101/scripts.inc | 3 +- data/maps/map_groups.json | 5 + data/scripts/debug.inc | 14 +- include/constants/flags.h | 2 +- include/constants/heal_locations.h | 1 + include/constants/map_groups.h | 934 +++++++++--------- src/data/heal_locations.h | 1 + src/data/map_group_count.h | 2 +- src/data/wild_encounters.json | 64 +- src/main_menu.c | 4 +- src/starter_choose.c | 6 +- 22 files changed, 866 insertions(+), 533 deletions(-) create mode 100644 data/maps/BudportCity_PokemonCenter_1F/map.json create mode 100644 data/maps/BudportCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/BudportCity_PokemonCenter_2F/map.json create mode 100644 data/maps/BudportCity_PokemonCenter_2F/scripts.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index 64e44da04..2166cb57a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -103,6 +103,7 @@ gStdScripts:: .4byte Std_MsgboxPokenav @ MSGBOX_POKENAV gStdScripts_End:: + .include "data/maps/BudportCity/scripts.inc" .include "data/maps/PetalburgCity/scripts.inc" .include "data/maps/SlateportCity/scripts.inc" .include "data/maps/MauvilleCity/scripts.inc" @@ -160,6 +161,10 @@ gStdScripts_End:: .include "data/maps/Underwater_Route129/scripts.inc" .include "data/maps/Underwater_Route105/scripts.inc" .include "data/maps/Underwater_Route125/scripts.inc" + + .include "data/maps/BudportCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/BudportCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc" .include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc" .include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc" @@ -1065,5 +1070,3 @@ Common_EventScript_LegendaryFlewAway:: .include "data/maps/InsideOfStartBoat_1F/scripts.inc" .include "data/maps/InsideOfStartBoat_0F/scripts.inc" - - .include "data/maps/BudportCity/scripts.inc" diff --git a/data/layouts/InsideOfStartBoat_0F/map.bin b/data/layouts/InsideOfStartBoat_0F/map.bin index 0eb0bc3b8..7163830c0 100644 --- a/data/layouts/InsideOfStartBoat_0F/map.bin +++ b/data/layouts/InsideOfStartBoat_0F/map.bin @@ -1 +1 @@ -6!!!72222226l22c2222222222222222>))?222222>t22+2222222222222222>22?222222>222222222222222222>222?222222>222222222222222222>222?222222>222222222222222222222222>222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file +6!!!72222226l22c22l2l2l2l2l2222222222>))?222222>t22+22t2t2t2t2t2222222222>22?222222>222222222222222222>222?222222>222222222222222222>222?222222>222222222222222222222222>222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/maps/BudportCity/map.json b/data/maps/BudportCity/map.json index 85edceb09..fd1af472e 100644 --- a/data/maps/BudportCity/map.json +++ b/data/maps/BudportCity/map.json @@ -23,6 +23,13 @@ "elevation": 0, "dest_map": "MAP_INSIDE_OF_START_BOAT_0F", "dest_warp_id": "3" + }, + { + "x": 5, + "y": 21, + "elevation": 0, + "dest_map": "MAP_BUDPORT_CITY_POKEMON_CENTER_1F", + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/BudportCity_PokemonCenter_1F/map.json b/data/maps/BudportCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..7e9afafaf --- /dev/null +++ b/data/maps/BudportCity_PokemonCenter_1F/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_BUDPORT_CITY_POKEMON_CENTER_1F", + "name": "BudportCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKE_CENTER", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": 0, + "object_events": [ + { + "graphics_id": "OBJ_EVENT_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "BudportCity_PokemonCenter_1F_EventScript_Nurse", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "BudportCity_PokemonCenter_1F_EventScript_Gentleman", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_BOY_1", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "BudportCity_PokemonCenter_1F_EventScript_Boy", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "BudportCity_PokemonCenter_1F_EventScript_Girl", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BUDPORT_CITY", + "dest_warp_id": "1" + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BUDPORT_CITY", + "dest_warp_id": "1" + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_BUDPORT_CITY_POKEMON_CENTER_2F", + "dest_warp_id": "0" + } + ], + "coord_events": [ + + ], + "bg_events": [ + + ] +} diff --git a/data/maps/BudportCity_PokemonCenter_1F/scripts.inc b/data/maps/BudportCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..94022d741 --- /dev/null +++ b/data/maps/BudportCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,63 @@ +.set LOCALID_NURSE, 1 + +BudportCity_PokemonCenter_1F_MapScripts:: + map_script MAP_SCRIPT_ON_TRANSITION, BudportCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume + .byte 0 + +BudportCity_PokemonCenter_1F_OnTransition: + setrespawn HEAL_LOCATION_BUDPORT_CITY + call Common_EventScript_UpdateBrineyLocation + end + +BudportCity_PokemonCenter_1F_EventScript_Nurse:: + setvar VAR_0x800B, LOCALID_NURSE + call Common_EventScript_PkmnCenterNurse + waitmessage + waitbuttonpress + release + end + +BudportCity_PokemonCenter_1F_EventScript_Gentleman:: + msgbox BudportCity_PokemonCenter_1F_Text_TrainersCanUsePC, MSGBOX_NPC + end + +BudportCity_PokemonCenter_1F_EventScript_Boy:: + msgbox BudportCity_PokemonCenter_1F_Text_PokemonCentersAreGreat, MSGBOX_NPC + end + +BudportCity_PokemonCenter_1F_EventScript_Girl:: + lock + faceplayer + goto_if_set FLAG_SYS_POKEDEX_GET, BudportCity_PokemonCenter_1F_EventScript_WirelessClubAvailable + msgbox BudportCity_PokemonCenter_1F_Text_WirelessClubNotAvailable, MSGBOX_DEFAULT + release + end + +BudportCity_PokemonCenter_1F_EventScript_WirelessClubAvailable:: + msgbox BudportCity_PokemonCenter_1F_Text_TradedInWirelessClub, MSGBOX_DEFAULT + release + end + +BudportCity_PokemonCenter_1F_Text_TrainersCanUsePC: + .string "That PC in the corner there is\n" + .string "for any POKéMON TRAINER to use.\p" + .string "Naturally, that means you're welcome\n" + .string "to use it, too.$" + +BudportCity_PokemonCenter_1F_Text_PokemonCentersAreGreat: + .string "POKéMON CENTERS are great!\p" + .string "You can use their services as much\n" + .string "as you like, and it's all for free.\l" + .string "You never have to worry!$" + +BudportCity_PokemonCenter_1F_Text_WirelessClubNotAvailable: + .string "The POKéMON WIRELESS CLUB on\n" + .string "the second floor was built recently.\p" + .string "But they say they're still making\n" + .string "adjustments.$" + +BudportCity_PokemonCenter_1F_Text_TradedInWirelessClub: + .string "The POKéMON WIRELESS CLUB on\n" + .string "the second floor was built recently.\p" + .string "I traded POKéMON right away.$" diff --git a/data/maps/BudportCity_PokemonCenter_2F/map.json b/data/maps/BudportCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..50e314240 --- /dev/null +++ b/data/maps/BudportCity_PokemonCenter_2F/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_BUDPORT_CITY_POKEMON_CENTER_2F", + "name": "BudportCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKE_CENTER", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": 0, + "object_events": [ + { + "graphics_id": "OBJ_EVENT_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Common_EventScript_UnionRoomAttendant", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Common_EventScript_WirelessClubAttendant", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Common_EventScript_DirectCornerAttendant", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "CableClub_EventScript_MysteryGiftMan", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_BUDPORT_CITY_POKEMON_CENTER_1F", + "dest_warp_id": "2" + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": "0" + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": "0" + } + ], + "coord_events": [ + + ], + "bg_events": [ + + ] +} diff --git a/data/maps/BudportCity_PokemonCenter_2F/scripts.inc b/data/maps/BudportCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..2ff8c755b --- /dev/null +++ b/data/maps/BudportCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +BudportCity_PokemonCenter_2F_MapScripts:: + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition + .byte 0 + +@ The below 3 are unused and leftover from RS +BudportCity_PokemonCenter_2F_EventScript_Colosseum:: + call CableClub_EventScript_Colosseum + end + +BudportCity_PokemonCenter_2F_EventScript_TradeCenter:: + call CableClub_EventScript_TradeCenter + end + +BudportCity_PokemonCenter_2F_EventScript_RecordCorner:: + call CableClub_EventScript_RecordCorner + end diff --git a/data/maps/InsideOfStartBoat_0F/map.json b/data/maps/InsideOfStartBoat_0F/map.json index 99a7e08c2..56d543583 100644 --- a/data/maps/InsideOfStartBoat_0F/map.json +++ b/data/maps/InsideOfStartBoat_0F/map.json @@ -14,7 +14,19 @@ "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": 0, "object_events": [ - + { + "graphics_id": "OBJ_EVENT_GFX_BIRCHS_BAG", + "x": 20, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "InsideOfStartBoat_0F_EventScript_BirchsBag", + "flag": "FLAG_HIDE_INSIDE_OF_BOAT_BIRCH_STARTERS_BAG" + } ], "warp_events": [ { diff --git a/data/maps/InsideOfStartBoat_0F/scripts.inc b/data/maps/InsideOfStartBoat_0F/scripts.inc index 85577659b..47aa6e6f2 100644 --- a/data/maps/InsideOfStartBoat_0F/scripts.inc +++ b/data/maps/InsideOfStartBoat_0F/scripts.inc @@ -1,2 +1,32 @@ InsideOfStartBoat_0F_MapScripts:: .byte 0 + +InsideOfStartBoat_0F_EventScript_BirchsBag:: + lock + faceplayer + setflag FLAG_SYS_POKEMON_GET + setflag FLAG_RESCUED_BIRCH + fadescreen FADE_TO_BLACK + removeobject LOCALID_ZIGZAGOON + setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + waitmovement 0 + special ChooseStarter + waitstate + //applymovement LOCALID_BIRCH, Route101_Movement_BirchApproachPlayer + //waitmovement 0 + //msgbox Route101_Text_YouSavedMe, MSGBOX_DEFAULT + special HealPlayerParty + //setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE + //clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_INSIDE_OF_BOAT_BIRCH_STARTERS_BAG + //setvar VAR_BIRCH_LAB_STATE, 2 + //setvar VAR_ROUTE101_STATE, 3 + clearflag FLAG_HIDE_MAP_NAME_POPUP + //checkplayergender + //call_if_eq VAR_RESULT, MALE, Route101_EventScript_HideMayInBedroom + //call_if_eq VAR_RESULT, FEMALE, Route101_EventScript_HideBrendanInBedroom + warp MAP_INSIDE_OF_START_BOAT_CABINS, 35, 16 + waitstate + release + end diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index d3f72b849..bb198b520 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_NURSE", @@ -90,6 +90,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 6ede7186c..5ad24fe0d 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -51,19 +51,6 @@ "script": "0x0", "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" }, - { - "graphics_id": "OBJ_EVENT_GFX_BIRCHS_BAG", - "x": 7, - "y": 14, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_BirchsBag", - "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" - }, { "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_1", "x": 10, diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index dd0ef5dce..9ef669181 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -236,7 +236,7 @@ Route101_EventScript_BirchsBag:: special HealPlayerParty setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG + //setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG setvar VAR_BIRCH_LAB_STATE, 2 setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_HIDE_MAP_NAME_POPUP @@ -299,4 +299,3 @@ Route101_Text_WildPokemonInTallGrass: Route101_Text_RouteSign: .string "ROUTE 101\n" .string "{UP_ARROW} OLDALE TOWN$" - diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 8e5db2c2a..813f84c3e 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -1,6 +1,7 @@ { "group_order": [ "gMapGroup_TownsAndRoutes", + "gMapGroup_IndoorBudport", "gMapGroup_IndoorLittleroot", "gMapGroup_IndoorOldale", "gMapGroup_IndoorDewford", @@ -95,6 +96,10 @@ "Underwater_Route125", "BudportCity" ], + "gMapGroup_IndoorBudport": [ + "BudportCity_PokemonCenter_1F", + "BudportCity_PokemonCenter_2F" + ], "gMapGroup_IndoorLittleroot": [ "LittlerootTown_BrendansHouse_1F", "LittlerootTown_BrendansHouse_2F", diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index b29291a7f..e648b71ea 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -15,7 +15,7 @@ Debug_CheatStart:: setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE setflag FLAG_ADVENTURE_STARTED clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG + setflag FLAG_HIDE_INSIDE_OF_BOAT_BIRCH_STARTERS_BAG setvar VAR_BIRCH_LAB_STATE, 2 setvar VAR_ROUTE101_STATE, 3 givemon SPECIES_TREECKO, 20, ITEM_NONE @@ -142,28 +142,28 @@ DebugScript_HatchAnEgg_Text_EmptyParty:: DebugScript_HatchAnEgg_Text_NotAnEgg:: .string "That's not a Pokémon Egg.$" - + DebugScript_ZeroDaycareMons:: msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT releaseall end - + DebugScript_OneDaycareMons:: msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT releaseall end - + DebugScript_DaycareMonsNotCompatible:: msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT releaseall end - + DebugText_DaycareNoPokemon: .string "You have no Pokémon at Daycare.$" - + DebugText_DaycareOnePokemon: .string "You have only one Pokémon at Daycare.$" - + DebugText_DaycarePokemonNotCompatible: .string "Your Pokémon at Daycare can't\nhave babies together!$" diff --git a/include/constants/flags.h b/include/constants/flags.h index 8d98e3aa0..7e38f2b64 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -742,7 +742,7 @@ #define FLAG_UNUSED_0x2BB 0x2BB // Unused Flag // Event Flags -#define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG 0x2BC +#define FLAG_HIDE_INSIDE_OF_BOAT_BIRCH_STARTERS_BAG 0x2BC // New pokemon box #define FLAG_HIDE_APPRENTICE 0x2BD #define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE #define FLAG_HIDE_UNION_ROOM_PLAYER_1 0x2BF diff --git a/include/constants/heal_locations.h b/include/constants/heal_locations.h index d3dd8f1f1..ee48dfde4 100644 --- a/include/constants/heal_locations.h +++ b/include/constants/heal_locations.h @@ -24,5 +24,6 @@ #define HEAL_LOCATION_EVER_GRANDE_CITY_POKEMON_LEAGUE 20 #define HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR 21 #define HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST 22 +#define HEAL_LOCATION_BUDPORT_CITY 23 #endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index f77a56e25..8e35d0f2b 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -65,536 +65,540 @@ #define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8)) #define MAP_BUDPORT_CITY (57 | (0 << 8)) +// gMapGroup_IndoorBudport +#define MAP_BUDPORT_CITY_POKEMON_CENTER_1F (0 | (1 << 8)) +#define MAP_BUDPORT_CITY_POKEMON_CENTER_2F (1 | (1 << 8)) + // gMapGroup_IndoorLittleroot -#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (2 << 8)) +#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (2 << 8)) +#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (2 << 8)) +#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (2 << 8)) +#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (2 << 8)) // gMapGroup_IndoorOldale -#define MAP_OLDALE_TOWN_HOUSE1 (0 | (2 << 8)) -#define MAP_OLDALE_TOWN_HOUSE2 (1 | (2 << 8)) -#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8)) -#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8)) -#define MAP_OLDALE_TOWN_MART (4 | (2 << 8)) +#define MAP_OLDALE_TOWN_HOUSE1 (0 | (3 << 8)) +#define MAP_OLDALE_TOWN_HOUSE2 (1 | (3 << 8)) +#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (3 << 8)) +#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (3 << 8)) +#define MAP_OLDALE_TOWN_MART (4 | (3 << 8)) // gMapGroup_IndoorDewford -#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (3 << 8)) -#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8)) -#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8)) -#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8)) -#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8)) -#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8)) +#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (4 << 8)) +#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (4 << 8)) +#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (4 << 8)) +#define MAP_DEWFORD_TOWN_GYM (3 | (4 << 8)) +#define MAP_DEWFORD_TOWN_HALL (4 | (4 << 8)) +#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (4 << 8)) // gMapGroup_IndoorLavaridge -#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (5 << 8)) +#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (5 << 8)) +#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (5 << 8)) +#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (5 << 8)) +#define MAP_LAVARIDGE_TOWN_MART (4 | (5 << 8)) +#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (5 << 8)) +#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (5 << 8)) // gMapGroup_IndoorFallarbor -#define MAP_FALLARBOR_TOWN_MART (0 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY (1 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR (2 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (4 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (5 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_COZMOS_HOUSE (6 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE (7 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_MART (0 | (6 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY (1 | (6 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR (2 | (6 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (6 << 8)) +#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (4 | (6 << 8)) +#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (5 | (6 << 8)) +#define MAP_FALLARBOR_TOWN_COZMOS_HOUSE (6 | (6 << 8)) +#define MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE (7 | (6 << 8)) // gMapGroup_IndoorVerdanturf -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY (0 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR (1 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_MART (3 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (4 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (5 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (6 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_HOUSE (8 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY (0 | (7 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR (1 | (7 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (7 << 8)) +#define MAP_VERDANTURF_TOWN_MART (3 | (7 << 8)) +#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (4 | (7 << 8)) +#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (5 | (7 << 8)) +#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (6 | (7 << 8)) +#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (7 << 8)) +#define MAP_VERDANTURF_TOWN_HOUSE (8 | (7 << 8)) // gMapGroup_IndoorPacifidlog -#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (8 << 8)) +#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (8 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (8 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (8 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (8 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (8 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (8 << 8)) // gMapGroup_IndoorPetalburg -#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (8 << 8)) -#define MAP_PETALBURG_CITY_GYM (1 | (8 << 8)) -#define MAP_PETALBURG_CITY_HOUSE1 (2 | (8 << 8)) -#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8)) -#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8)) -#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8)) -#define MAP_PETALBURG_CITY_MART (6 | (8 << 8)) +#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (9 << 8)) +#define MAP_PETALBURG_CITY_GYM (1 | (9 << 8)) +#define MAP_PETALBURG_CITY_HOUSE1 (2 | (9 << 8)) +#define MAP_PETALBURG_CITY_HOUSE2 (3 | (9 << 8)) +#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (9 << 8)) +#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (9 << 8)) +#define MAP_PETALBURG_CITY_MART (6 | (9 << 8)) // gMapGroup_IndoorSlateport -#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (9 << 8)) -#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8)) -#define MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE (5 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (9 << 8)) -#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (9 << 8)) -#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HARBOR (9 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE (10 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (9 << 8)) -#define MAP_SLATEPORT_CITY_MART (13 | (9 << 8)) +#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (10 << 8)) +#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (10 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (10 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (10 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (10 << 8)) +#define MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE (5 | (10 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (10 << 8)) +#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (10 << 8)) +#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (10 << 8)) +#define MAP_SLATEPORT_CITY_HARBOR (9 | (10 << 8)) +#define MAP_SLATEPORT_CITY_HOUSE (10 | (10 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (10 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (10 << 8)) +#define MAP_SLATEPORT_CITY_MART (13 | (10 << 8)) // gMapGroup_IndoorMauville -#define MAP_MAUVILLE_CITY_GYM (0 | (10 << 8)) -#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (10 << 8)) -#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (10 << 8)) -#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8)) -#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8)) -#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8)) -#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8)) -#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8)) +#define MAP_MAUVILLE_CITY_GYM (0 | (11 << 8)) +#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (11 << 8)) +#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (11 << 8)) +#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (11 << 8)) +#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (11 << 8)) +#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) +#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) +#define MAP_MAUVILLE_CITY_MART (7 | (11 << 8)) // gMapGroup_IndoorRustboro -#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (11 << 8)) -#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (11 << 8)) -#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (11 << 8)) -#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) -#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8)) -#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (12 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (12 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (12 << 8)) +#define MAP_RUSTBORO_CITY_GYM (3 | (12 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (12 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (12 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (12 << 8)) +#define MAP_RUSTBORO_CITY_MART (7 | (12 << 8)) +#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (12 << 8)) +#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (12 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (12 << 8)) +#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (12 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (12 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (12 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (12 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (12 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (12 << 8)) // gMapGroup_IndoorFortree -#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8)) -#define MAP_FORTREE_CITY_GYM (1 | (12 << 8)) -#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8)) -#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8)) -#define MAP_FORTREE_CITY_MART (4 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8)) -#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE1 (0 | (13 << 8)) +#define MAP_FORTREE_CITY_GYM (1 | (13 << 8)) +#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (13 << 8)) +#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (13 << 8)) +#define MAP_FORTREE_CITY_MART (4 | (13 << 8)) +#define MAP_FORTREE_CITY_HOUSE2 (5 | (13 << 8)) +#define MAP_FORTREE_CITY_HOUSE3 (6 | (13 << 8)) +#define MAP_FORTREE_CITY_HOUSE4 (7 | (13 << 8)) +#define MAP_FORTREE_CITY_HOUSE5 (8 | (13 << 8)) +#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (13 << 8)) // gMapGroup_IndoorLilycove -#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (13 << 8)) -#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (13 << 8)) -#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (13 << 8)) -#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8)) -#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8)) -#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8)) -#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8)) -#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (11 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE1 (12 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE2 (13 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE3 (14 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE4 (15 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (16 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (17 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (18 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (19 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (20 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (21 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8)) +#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (14 << 8)) +#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (14 << 8)) +#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (14 << 8)) +#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (14 << 8)) +#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (14 << 8)) +#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (14 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (14 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (14 << 8)) +#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (14 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8)) +#define MAP_LILYCOVE_CITY_HARBOR (10 | (14 << 8)) +#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (11 | (14 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE1 (12 | (14 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE2 (13 | (14 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE3 (14 | (14 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE4 (15 | (14 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (16 | (14 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (17 | (14 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (18 | (14 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (19 | (14 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (20 | (14 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (21 | (14 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (14 << 8)) // gMapGroup_IndoorMossdeep -#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_GYM (0 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_MART (5 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (15 << 8)) +#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (15 << 8)) // gMapGroup_IndoorSootopolis -#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_MART (4 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (16 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (16 << 8)) // gMapGroup_IndoorEverGrande -#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (17 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (17 << 8)) // gMapGroup_IndoorRoute104 -#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8)) -#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8)) +#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (18 << 8)) +#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (18 << 8)) // gMapGroup_IndoorRoute111 -#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8)) -#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8)) +#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (19 << 8)) +#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (19 << 8)) // gMapGroup_IndoorRoute112 -#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8)) -#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8)) +#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (20 << 8)) +#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (20 << 8)) // gMapGroup_IndoorRoute114 -#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (20 << 8)) -#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8)) -#define MAP_ROUTE114_LANETTES_HOUSE (2 | (20 << 8)) +#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (21 << 8)) +#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (21 << 8)) +#define MAP_ROUTE114_LANETTES_HOUSE (2 | (21 << 8)) // gMapGroup_IndoorRoute116 -#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8)) +#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (22 << 8)) // gMapGroup_IndoorRoute117 -#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8)) +#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (23 << 8)) // gMapGroup_IndoorRoute121 -#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8)) +#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (24 << 8)) // gMapGroup_Dungeons -#define MAP_METEOR_FALLS_1F_1R (0 | (24 << 8)) -#define MAP_METEOR_FALLS_1F_2R (1 | (24 << 8)) -#define MAP_METEOR_FALLS_B1F_1R (2 | (24 << 8)) -#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8)) -#define MAP_RUSTURF_TUNNEL (4 | (24 << 8)) -#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8)) -#define MAP_DESERT_RUINS (6 | (24 << 8)) -#define MAP_GRANITE_CAVE_1F (7 | (24 << 8)) -#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8)) -#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8)) -#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8)) -#define MAP_PETALBURG_WOODS (11 | (24 << 8)) -#define MAP_MT_CHIMNEY (12 | (24 << 8)) -#define MAP_JAGGED_PASS (13 | (24 << 8)) -#define MAP_FIERY_PATH (14 | (24 << 8)) -#define MAP_MT_PYRE_1F (15 | (24 << 8)) -#define MAP_MT_PYRE_2F (16 | (24 << 8)) -#define MAP_MT_PYRE_3F (17 | (24 << 8)) -#define MAP_MT_PYRE_4F (18 | (24 << 8)) -#define MAP_MT_PYRE_5F (19 | (24 << 8)) -#define MAP_MT_PYRE_6F (20 | (24 << 8)) -#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8)) -#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8)) -#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8)) -#define MAP_VICTORY_ROAD_1F (43 | (24 << 8)) -#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8)) -#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8)) -#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8)) -#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8)) -#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8)) -#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8)) -#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8)) -#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8)) -#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8)) -#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8)) -#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8)) -#define MAP_ISLAND_CAVE (67 | (24 << 8)) -#define MAP_ANCIENT_TOMB (68 | (24 << 8)) -#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8)) -#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8)) -#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8)) -#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8)) -#define MAP_SCORCHED_SLAB (73 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 (74 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 (75 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 (76 | (24 << 8)) -#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8)) -#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8)) -#define MAP_SKY_PILLAR_1F (79 | (24 << 8)) -#define MAP_SKY_PILLAR_2F (80 | (24 << 8)) -#define MAP_SKY_PILLAR_3F (81 | (24 << 8)) -#define MAP_SKY_PILLAR_4F (82 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8)) -#define MAP_SKY_PILLAR_5F (84 | (24 << 8)) -#define MAP_SKY_PILLAR_TOP (85 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_1F (86 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_1R (87 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_2R (88 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_1R (89 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_2R (90 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_4F (91 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_3R (92 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_3R (93 | (24 << 8)) -#define MAP_MIRAGE_TOWER_1F (94 | (24 << 8)) -#define MAP_MIRAGE_TOWER_2F (95 | (24 << 8)) -#define MAP_MIRAGE_TOWER_3F (96 | (24 << 8)) -#define MAP_MIRAGE_TOWER_4F (97 | (24 << 8)) -#define MAP_DESERT_UNDERPASS (98 | (24 << 8)) -#define MAP_ARTISAN_CAVE_B1F (99 | (24 << 8)) -#define MAP_ARTISAN_CAVE_1F (100 | (24 << 8)) -#define MAP_UNDERWATER_MARINE_CAVE (101 | (24 << 8)) -#define MAP_MARINE_CAVE_ENTRANCE (102 | (24 << 8)) -#define MAP_MARINE_CAVE_END (103 | (24 << 8)) -#define MAP_TERRA_CAVE_ENTRANCE (104 | (24 << 8)) -#define MAP_TERRA_CAVE_END (105 | (24 << 8)) -#define MAP_ALTERING_CAVE (106 | (24 << 8)) -#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8)) +#define MAP_METEOR_FALLS_1F_1R (0 | (25 << 8)) +#define MAP_METEOR_FALLS_1F_2R (1 | (25 << 8)) +#define MAP_METEOR_FALLS_B1F_1R (2 | (25 << 8)) +#define MAP_METEOR_FALLS_B1F_2R (3 | (25 << 8)) +#define MAP_RUSTURF_TUNNEL (4 | (25 << 8)) +#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (25 << 8)) +#define MAP_DESERT_RUINS (6 | (25 << 8)) +#define MAP_GRANITE_CAVE_1F (7 | (25 << 8)) +#define MAP_GRANITE_CAVE_B1F (8 | (25 << 8)) +#define MAP_GRANITE_CAVE_B2F (9 | (25 << 8)) +#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (25 << 8)) +#define MAP_PETALBURG_WOODS (11 | (25 << 8)) +#define MAP_MT_CHIMNEY (12 | (25 << 8)) +#define MAP_JAGGED_PASS (13 | (25 << 8)) +#define MAP_FIERY_PATH (14 | (25 << 8)) +#define MAP_MT_PYRE_1F (15 | (25 << 8)) +#define MAP_MT_PYRE_2F (16 | (25 << 8)) +#define MAP_MT_PYRE_3F (17 | (25 << 8)) +#define MAP_MT_PYRE_4F (18 | (25 << 8)) +#define MAP_MT_PYRE_5F (19 | (25 << 8)) +#define MAP_MT_PYRE_6F (20 | (25 << 8)) +#define MAP_MT_PYRE_EXTERIOR (21 | (25 << 8)) +#define MAP_MT_PYRE_SUMMIT (22 | (25 << 8)) +#define MAP_AQUA_HIDEOUT_1F (23 | (25 << 8)) +#define MAP_AQUA_HIDEOUT_B1F (24 | (25 << 8)) +#define MAP_AQUA_HIDEOUT_B2F (25 | (25 << 8)) +#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (25 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (25 << 8)) +#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (25 << 8)) +#define MAP_CAVE_OF_ORIGIN_1F (38 | (25 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (25 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (25 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (25 << 8)) +#define MAP_CAVE_OF_ORIGIN_B1F (42 | (25 << 8)) +#define MAP_VICTORY_ROAD_1F (43 | (25 << 8)) +#define MAP_VICTORY_ROAD_B1F (44 | (25 << 8)) +#define MAP_VICTORY_ROAD_B2F (45 | (25 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (25 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (25 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (25 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (25 << 8)) +#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (25 << 8)) +#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (25 << 8)) +#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (25 << 8)) +#define MAP_NEW_MAUVILLE_INSIDE (53 | (25 << 8)) +#define MAP_ABANDONED_SHIP_DECK (54 | (25 << 8)) +#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (25 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (25 << 8)) +#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (25 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (25 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (25 << 8)) +#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (25 << 8)) +#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (25 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (25 << 8)) +#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (25 << 8)) +#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (25 << 8)) +#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (25 << 8)) +#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (25 << 8)) +#define MAP_ISLAND_CAVE (67 | (25 << 8)) +#define MAP_ANCIENT_TOMB (68 | (25 << 8)) +#define MAP_UNDERWATER_ROUTE134 (69 | (25 << 8)) +#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (25 << 8)) +#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (25 << 8)) +#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (25 << 8)) +#define MAP_SCORCHED_SLAB (73 | (25 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 (74 | (25 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 (75 | (25 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 (76 | (25 << 8)) +#define MAP_SKY_PILLAR_ENTRANCE (77 | (25 << 8)) +#define MAP_SKY_PILLAR_OUTSIDE (78 | (25 << 8)) +#define MAP_SKY_PILLAR_1F (79 | (25 << 8)) +#define MAP_SKY_PILLAR_2F (80 | (25 << 8)) +#define MAP_SKY_PILLAR_3F (81 | (25 << 8)) +#define MAP_SKY_PILLAR_4F (82 | (25 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (25 << 8)) +#define MAP_SKY_PILLAR_5F (84 | (25 << 8)) +#define MAP_SKY_PILLAR_TOP (85 | (25 << 8)) +#define MAP_MAGMA_HIDEOUT_1F (86 | (25 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_1R (87 | (25 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_2R (88 | (25 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_1R (89 | (25 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_2R (90 | (25 << 8)) +#define MAP_MAGMA_HIDEOUT_4F (91 | (25 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_3R (92 | (25 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_3R (93 | (25 << 8)) +#define MAP_MIRAGE_TOWER_1F (94 | (25 << 8)) +#define MAP_MIRAGE_TOWER_2F (95 | (25 << 8)) +#define MAP_MIRAGE_TOWER_3F (96 | (25 << 8)) +#define MAP_MIRAGE_TOWER_4F (97 | (25 << 8)) +#define MAP_DESERT_UNDERPASS (98 | (25 << 8)) +#define MAP_ARTISAN_CAVE_B1F (99 | (25 << 8)) +#define MAP_ARTISAN_CAVE_1F (100 | (25 << 8)) +#define MAP_UNDERWATER_MARINE_CAVE (101 | (25 << 8)) +#define MAP_MARINE_CAVE_ENTRANCE (102 | (25 << 8)) +#define MAP_MARINE_CAVE_END (103 | (25 << 8)) +#define MAP_TERRA_CAVE_ENTRANCE (104 | (25 << 8)) +#define MAP_TERRA_CAVE_END (105 | (25 << 8)) +#define MAP_ALTERING_CAVE (106 | (25 << 8)) +#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (25 << 8)) // gMapGroup_IndoorDynamic -#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) -#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) -#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) -#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) -#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) -#define MAP_BATTLE_COLOSSEUM_2P (24 | (25 << 8)) -#define MAP_TRADE_CENTER (25 | (25 << 8)) -#define MAP_RECORD_CORNER (26 | (25 << 8)) -#define MAP_BATTLE_COLOSSEUM_4P (27 | (25 << 8)) -#define MAP_CONTEST_HALL (28 | (25 << 8)) -#define MAP_UNUSED_CONTEST_HALL1 (29 | (25 << 8)) -#define MAP_UNUSED_CONTEST_HALL2 (30 | (25 << 8)) -#define MAP_UNUSED_CONTEST_HALL3 (31 | (25 << 8)) -#define MAP_UNUSED_CONTEST_HALL4 (32 | (25 << 8)) -#define MAP_UNUSED_CONTEST_HALL5 (33 | (25 << 8)) -#define MAP_UNUSED_CONTEST_HALL6 (34 | (25 << 8)) -#define MAP_CONTEST_HALL_BEAUTY (35 | (25 << 8)) -#define MAP_CONTEST_HALL_TOUGH (36 | (25 << 8)) -#define MAP_CONTEST_HALL_COOL (37 | (25 << 8)) -#define MAP_CONTEST_HALL_SMART (38 | (25 << 8)) -#define MAP_CONTEST_HALL_CUTE (39 | (25 << 8)) -#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) -#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) -#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) -#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) -#define MAP_UNION_ROOM (60 | (25 << 8)) -#define MAP_INSIDE_OF_START_BOAT_CABINS (61 | (25 << 8)) -#define MAP_INSIDE_OF_START_BOAT_1F (62 | (25 << 8)) -#define MAP_INSIDE_OF_START_BOAT_0F (63 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE1 (0 | (26 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (26 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (26 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (26 << 8)) +#define MAP_SECRET_BASE_TREE1 (4 | (26 << 8)) +#define MAP_SECRET_BASE_SHRUB1 (5 | (26 << 8)) +#define MAP_SECRET_BASE_RED_CAVE2 (6 | (26 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (26 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (26 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (26 << 8)) +#define MAP_SECRET_BASE_TREE2 (10 | (26 << 8)) +#define MAP_SECRET_BASE_SHRUB2 (11 | (26 << 8)) +#define MAP_SECRET_BASE_RED_CAVE3 (12 | (26 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (26 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (26 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (26 << 8)) +#define MAP_SECRET_BASE_TREE3 (16 | (26 << 8)) +#define MAP_SECRET_BASE_SHRUB3 (17 | (26 << 8)) +#define MAP_SECRET_BASE_RED_CAVE4 (18 | (26 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (26 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (26 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (26 << 8)) +#define MAP_SECRET_BASE_TREE4 (22 | (26 << 8)) +#define MAP_SECRET_BASE_SHRUB4 (23 | (26 << 8)) +#define MAP_BATTLE_COLOSSEUM_2P (24 | (26 << 8)) +#define MAP_TRADE_CENTER (25 | (26 << 8)) +#define MAP_RECORD_CORNER (26 | (26 << 8)) +#define MAP_BATTLE_COLOSSEUM_4P (27 | (26 << 8)) +#define MAP_CONTEST_HALL (28 | (26 << 8)) +#define MAP_UNUSED_CONTEST_HALL1 (29 | (26 << 8)) +#define MAP_UNUSED_CONTEST_HALL2 (30 | (26 << 8)) +#define MAP_UNUSED_CONTEST_HALL3 (31 | (26 << 8)) +#define MAP_UNUSED_CONTEST_HALL4 (32 | (26 << 8)) +#define MAP_UNUSED_CONTEST_HALL5 (33 | (26 << 8)) +#define MAP_UNUSED_CONTEST_HALL6 (34 | (26 << 8)) +#define MAP_CONTEST_HALL_BEAUTY (35 | (26 << 8)) +#define MAP_CONTEST_HALL_TOUGH (36 | (26 << 8)) +#define MAP_CONTEST_HALL_COOL (37 | (26 << 8)) +#define MAP_CONTEST_HALL_SMART (38 | (26 << 8)) +#define MAP_CONTEST_HALL_CUTE (39 | (26 << 8)) +#define MAP_INSIDE_OF_TRUCK (40 | (26 << 8)) +#define MAP_SS_TIDAL_CORRIDOR (41 | (26 << 8)) +#define MAP_SS_TIDAL_LOWER_DECK (42 | (26 << 8)) +#define MAP_SS_TIDAL_ROOMS (43 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (26 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (26 << 8)) +#define MAP_UNION_ROOM (60 | (26 << 8)) +#define MAP_INSIDE_OF_START_BOAT_CABINS (61 | (26 << 8)) +#define MAP_INSIDE_OF_START_BOAT_1F (62 | (26 << 8)) +#define MAP_INSIDE_OF_START_BOAT_0F (63 | (26 << 8)) // gMapGroup_SpecialArea -#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) -#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM (15 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR (16 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (17 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR (26 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL (37 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL (38 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS (39 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) -#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) -#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) -#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) -#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) -#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) -#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) -#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) -#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) -#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) -#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) -#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) -#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) -#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) -#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) -#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) -#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTHWEST (0 | (27 << 8)) +#define MAP_SAFARI_ZONE_NORTH (1 | (27 << 8)) +#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (27 << 8)) +#define MAP_SAFARI_ZONE_SOUTH (3 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (27 << 8)) +#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (27 << 8)) +#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (27 << 8)) +#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (27 << 8)) +#define MAP_SAFARI_ZONE_NORTHEAST (12 | (27 << 8)) +#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM (15 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR (16 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (17 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR (26 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL (37 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL (38 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS (39 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER (42 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (27 << 8)) +#define MAP_BATTLE_FRONTIER_MART (55 | (27 << 8)) +#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (27 << 8)) +#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (27 << 8)) +#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (27 << 8)) +#define MAP_BIRTH_ISLAND_HARBOR (59 | (27 << 8)) +#define MAP_TRAINER_HILL_ENTRANCE (60 | (27 << 8)) +#define MAP_TRAINER_HILL_1F (61 | (27 << 8)) +#define MAP_TRAINER_HILL_2F (62 | (27 << 8)) +#define MAP_TRAINER_HILL_3F (63 | (27 << 8)) +#define MAP_TRAINER_HILL_4F (64 | (27 << 8)) +#define MAP_TRAINER_HILL_ROOF (65 | (27 << 8)) +#define MAP_NAVEL_ROCK_EXTERIOR (66 | (27 << 8)) +#define MAP_NAVEL_ROCK_HARBOR (67 | (27 << 8)) +#define MAP_NAVEL_ROCK_ENTRANCE (68 | (27 << 8)) +#define MAP_NAVEL_ROCK_B1F (69 | (27 << 8)) +#define MAP_NAVEL_ROCK_FORK (70 | (27 << 8)) +#define MAP_NAVEL_ROCK_UP1 (71 | (27 << 8)) +#define MAP_NAVEL_ROCK_UP2 (72 | (27 << 8)) +#define MAP_NAVEL_ROCK_UP3 (73 | (27 << 8)) +#define MAP_NAVEL_ROCK_UP4 (74 | (27 << 8)) +#define MAP_NAVEL_ROCK_TOP (75 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN01 (76 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN02 (77 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN03 (78 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN04 (79 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN05 (80 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN06 (81 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN07 (82 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN08 (83 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN09 (84 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN10 (85 | (27 << 8)) +#define MAP_NAVEL_ROCK_DOWN11 (86 | (27 << 8)) +#define MAP_NAVEL_ROCK_BOTTOM (87 | (27 << 8)) +#define MAP_TRAINER_HILL_ELEVATOR (88 | (27 << 8)) // gMapGroup_IndoorRoute104Prototype -#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) -#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8)) +#define MAP_ROUTE104_PROTOTYPE (0 | (28 << 8)) +#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (28 << 8)) // gMapGroup_IndoorRoute109 -#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8)) +#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (29 << 8)) // gMapGroup_IndoorRoute110 -#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (30 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (30 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (30 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (30 << 8)) // gMapGroup_IndoorRoute113 -#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8)) +#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (31 << 8)) // gMapGroup_IndoorRoute123 -#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8)) +#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (32 << 8)) // gMapGroup_IndoorRoute119 -#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8)) -#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8)) -#define MAP_ROUTE119_HOUSE (2 | (32 << 8)) +#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (33 << 8)) +#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (33 << 8)) +#define MAP_ROUTE119_HOUSE (2 | (33 << 8)) // gMapGroup_IndoorRoute124 -#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) +#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (34 << 8)) -#define MAP_GROUPS_COUNT 34 +#define MAP_GROUPS_COUNT 35 #endif // GUARD_CONSTANTS_MAP_GROUPS_H diff --git a/src/data/heal_locations.h b/src/data/heal_locations.h index 04530a1db..2c51668aa 100644 --- a/src/data/heal_locations.h +++ b/src/data/heal_locations.h @@ -1,5 +1,6 @@ static const struct HealLocation sHealLocations[] = { + [HEAL_LOCATION_BUDPORT_CITY - 1] = {MAP_GROUP(BUDPORT_CITY), MAP_NUM(BUDPORT_CITY), 5, 22}, [HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - 1] = {MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), 4, 2}, [HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F - 1] = {MAP_GROUP(LITTLEROOT_TOWN_MAYS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_2F), 4, 2}, [HEAL_LOCATION_PETALBURG_CITY - 1] = {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), 20, 17}, diff --git a/src/data/map_group_count.h b/src/data/map_group_count.h index d071203c3..541cae16e 100644 --- a/src/data/map_group_count.h +++ b/src/data/map_group_count.h @@ -1 +1 @@ -static const u8 MAP_GROUP_COUNT[] = {58, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 64, 89, 2, 1, 13, 1, 1, 3, 1, 0}; +static const u8 MAP_GROUP_COUNT[] = {58, 2, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 64, 89, 2, 1, 13, 1, 1, 3, 1, 0}; diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 583af271c..3ffc41ae9 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -11495,38 +11495,8 @@ { "map": "MAP_BUDPORT_CITY", "base_label": "gBudportCity0", - "water_mons": { - "encounter_rate": 0, - "mons": [ - { - "min_level": 5, - "max_level": 5, - "species": "SPECIES_ARCEUS_WATER" - }, - { - "min_level": 10, - "max_level": 10, - "species": "SPECIES_TYRANITAR_MEGA" - }, - { - "min_level": 5, - "max_level": 5, - "species": "SPECIES_ABSOL_MEGA" - }, - { - "min_level": 5, - "max_level": 5, - "species": "SPECIES_NONE" - }, - { - "min_level": 5, - "max_level": 5, - "species": "SPECIES_NONE" - } - ] - }, "land_mons": { - "encounter_rate": 0, + "encounter_rate": 20, "mons": [ { "min_level": 5, @@ -11536,7 +11506,7 @@ { "min_level": 10, "max_level": 10, - "species": "SPECIES_ZYGARDE_10" + "species": "SPECIES_RATTATA_ALOLAN" }, { "min_level": 5, @@ -11589,6 +11559,36 @@ "species": "SPECIES_NONE" } ] + }, + "water_mons": { + "encounter_rate": 0, + "mons": [ + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_ARCEUS_WATER" + }, + { + "min_level": 10, + "max_level": 10, + "species": "SPECIES_TYRANITAR_MEGA" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_ABSOL_MEGA" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_NONE" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_NONE" + } + ] } } ] diff --git a/src/main_menu.c b/src/main_menu.c index a5571e014..53aa1228c 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1374,7 +1374,7 @@ static void Task_NewGameBirchSpeechSub_InitPokeBall(u8 taskId) gSprites[spriteId].invisible = FALSE; gSprites[spriteId].data[0] = 0; - CreatePokeballSpriteToReleaseMon(spriteId, gSprites[spriteId].oam.paletteNum, 112, 58, 0, 0, 32, PALETTES_BG, SPECIES_LOTAD); + CreatePokeballSpriteToReleaseMon(spriteId, gSprites[spriteId].oam.paletteNum, 112, 58, 0, 0, 32, PALETTES_BG, SPECIES_WOOLOO); gTasks[taskId].func = Task_NewGameBirchSpeechSub_WaitForLotad; gTasks[sBirchSpeechMainTaskId].tTimer = 0; } @@ -1876,7 +1876,7 @@ static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite *sprite) static u8 NewGameBirchSpeech_CreateLotadSprite(u8 x, u8 y) { - return CreateMonPicSprite_Affine(SPECIES_LOTAD, SHINY_ODDS, 0, MON_PIC_AFFINE_FRONT, x, y, 14, TAG_NONE); + return CreateMonPicSprite_Affine(SPECIES_WOOLOO, SHINY_ODDS, 0, MON_PIC_AFFINE_FRONT, x, y, 14, TAG_NONE); } static void AddBirchSpeechObjects(u8 taskId) diff --git a/src/starter_choose.c b/src/starter_choose.c index 39de696e9..cbba1b455 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -112,9 +112,9 @@ static const u8 sStarterLabelCoords[STARTER_MON_COUNT][2] = static const u16 sStarterMon[STARTER_MON_COUNT] = { - SPECIES_TREECKO, - SPECIES_TORCHIC, - SPECIES_MUDKIP, + SPECIES_CHESPIN, + SPECIES_FENNEKIN, + SPECIES_FROAKIE, }; static const struct BgTemplate sBgTemplates[3] =