Added BudportCity PokeCenter and temporary starter bag in boat

This commit is contained in:
Ninjdai 2023-11-10 10:15:00 +01:00
parent c743e2b7ad
commit 2230c67818
22 changed files with 866 additions and 533 deletions

View File

@ -103,6 +103,7 @@ gStdScripts::
.4byte Std_MsgboxPokenav @ MSGBOX_POKENAV .4byte Std_MsgboxPokenav @ MSGBOX_POKENAV
gStdScripts_End:: gStdScripts_End::
.include "data/maps/BudportCity/scripts.inc"
.include "data/maps/PetalburgCity/scripts.inc" .include "data/maps/PetalburgCity/scripts.inc"
.include "data/maps/SlateportCity/scripts.inc" .include "data/maps/SlateportCity/scripts.inc"
.include "data/maps/MauvilleCity/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_Route129/scripts.inc"
.include "data/maps/Underwater_Route105/scripts.inc" .include "data/maps/Underwater_Route105/scripts.inc"
.include "data/maps/Underwater_Route125/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_1F/scripts.inc"
.include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc" .include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc"
.include "data/maps/LittlerootTown_MaysHouse_1F/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_1F/scripts.inc"
.include "data/maps/InsideOfStartBoat_0F/scripts.inc" .include "data/maps/InsideOfStartBoat_0F/scripts.inc"
.include "data/maps/BudportCity/scripts.inc"

View File

@ -1 +1 @@
6!!!72222226l2<EFBFBD>2c2<EFBFBD>222222222222222>))<06>?222222>t2<74>2+2<>222222222222222>2<>2<EFBFBD>?222222>222222222222222222>222?222222>222222222222222222>222?222222>222222222222222222222222>222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 6!!!72222226l2•2c22l2l2l2l2l2222222222>))Ÿ?222222>t2<74>2+2ž2t2t2t2t2t2222222222>2¦2§?222222>222222222222222222>222?222222>222222222222222222>222?222222>222222222222222222222222>222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222

View File

@ -23,6 +23,13 @@
"elevation": 0, "elevation": 0,
"dest_map": "MAP_INSIDE_OF_START_BOAT_0F", "dest_map": "MAP_INSIDE_OF_START_BOAT_0F",
"dest_warp_id": "3" "dest_warp_id": "3"
},
{
"x": 5,
"y": 21,
"elevation": 0,
"dest_map": "MAP_BUDPORT_CITY_POKEMON_CENTER_1F",
"dest_warp_id": "0"
} }
], ],
"coord_events": [ "coord_events": [

View File

@ -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": [
]
}

View File

@ -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.$"

View File

@ -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": [
]
}

View File

@ -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

View File

@ -14,7 +14,19 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL", "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": 0, "connections": 0,
"object_events": [ "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": [ "warp_events": [
{ {

View File

@ -1,2 +1,32 @@
InsideOfStartBoat_0F_MapScripts:: InsideOfStartBoat_0F_MapScripts::
.byte 0 .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

View File

@ -12,7 +12,7 @@
"allow_running": false, "allow_running": false,
"show_map_name": false, "show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL", "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null, "connections": 0,
"object_events": [ "object_events": [
{ {
"graphics_id": "OBJ_EVENT_GFX_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE",
@ -90,6 +90,10 @@
"dest_warp_id": "0" "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [
"bg_events": []
],
"bg_events": [
]
} }

View File

@ -51,19 +51,6 @@
"script": "0x0", "script": "0x0",
"flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" "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", "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_1",
"x": 10, "x": 10,

View File

@ -236,7 +236,7 @@ Route101_EventScript_BirchsBag::
special HealPlayerParty special HealPlayerParty
setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH 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_BIRCH_LAB_STATE, 2
setvar VAR_ROUTE101_STATE, 3 setvar VAR_ROUTE101_STATE, 3
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
@ -299,4 +299,3 @@ Route101_Text_WildPokemonInTallGrass:
Route101_Text_RouteSign: Route101_Text_RouteSign:
.string "ROUTE 101\n" .string "ROUTE 101\n"
.string "{UP_ARROW} OLDALE TOWN$" .string "{UP_ARROW} OLDALE TOWN$"

View File

@ -1,6 +1,7 @@
{ {
"group_order": [ "group_order": [
"gMapGroup_TownsAndRoutes", "gMapGroup_TownsAndRoutes",
"gMapGroup_IndoorBudport",
"gMapGroup_IndoorLittleroot", "gMapGroup_IndoorLittleroot",
"gMapGroup_IndoorOldale", "gMapGroup_IndoorOldale",
"gMapGroup_IndoorDewford", "gMapGroup_IndoorDewford",
@ -95,6 +96,10 @@
"Underwater_Route125", "Underwater_Route125",
"BudportCity" "BudportCity"
], ],
"gMapGroup_IndoorBudport": [
"BudportCity_PokemonCenter_1F",
"BudportCity_PokemonCenter_2F"
],
"gMapGroup_IndoorLittleroot": [ "gMapGroup_IndoorLittleroot": [
"LittlerootTown_BrendansHouse_1F", "LittlerootTown_BrendansHouse_1F",
"LittlerootTown_BrendansHouse_2F", "LittlerootTown_BrendansHouse_2F",

View File

@ -15,7 +15,7 @@ Debug_CheatStart::
setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
setflag FLAG_ADVENTURE_STARTED setflag FLAG_ADVENTURE_STARTED
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH 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_BIRCH_LAB_STATE, 2
setvar VAR_ROUTE101_STATE, 3 setvar VAR_ROUTE101_STATE, 3
givemon SPECIES_TREECKO, 20, ITEM_NONE givemon SPECIES_TREECKO, 20, ITEM_NONE
@ -142,28 +142,28 @@ DebugScript_HatchAnEgg_Text_EmptyParty::
DebugScript_HatchAnEgg_Text_NotAnEgg:: DebugScript_HatchAnEgg_Text_NotAnEgg::
.string "That's not a Pokémon Egg.$" .string "That's not a Pokémon Egg.$"
DebugScript_ZeroDaycareMons:: DebugScript_ZeroDaycareMons::
msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT
releaseall releaseall
end end
DebugScript_OneDaycareMons:: DebugScript_OneDaycareMons::
msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT
releaseall releaseall
end end
DebugScript_DaycareMonsNotCompatible:: DebugScript_DaycareMonsNotCompatible::
msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT
releaseall releaseall
end end
DebugText_DaycareNoPokemon: DebugText_DaycareNoPokemon:
.string "You have no Pokémon at Daycare.$" .string "You have no Pokémon at Daycare.$"
DebugText_DaycareOnePokemon: DebugText_DaycareOnePokemon:
.string "You have only one Pokémon at Daycare.$" .string "You have only one Pokémon at Daycare.$"
DebugText_DaycarePokemonNotCompatible: DebugText_DaycarePokemonNotCompatible:
.string "Your Pokémon at Daycare can't\nhave babies together!$" .string "Your Pokémon at Daycare can't\nhave babies together!$"

View File

@ -742,7 +742,7 @@
#define FLAG_UNUSED_0x2BB 0x2BB // Unused Flag #define FLAG_UNUSED_0x2BB 0x2BB // Unused Flag
// Event Flags // 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_APPRENTICE 0x2BD
#define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE #define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE
#define FLAG_HIDE_UNION_ROOM_PLAYER_1 0x2BF #define FLAG_HIDE_UNION_ROOM_PLAYER_1 0x2BF

View File

@ -24,5 +24,6 @@
#define HEAL_LOCATION_EVER_GRANDE_CITY_POKEMON_LEAGUE 20 #define HEAL_LOCATION_EVER_GRANDE_CITY_POKEMON_LEAGUE 20
#define HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR 21 #define HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR 21
#define HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST 22 #define HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST 22
#define HEAL_LOCATION_BUDPORT_CITY 23
#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H #endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,6 @@
static const struct HealLocation sHealLocations[] = 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_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_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}, [HEAL_LOCATION_PETALBURG_CITY - 1] = {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), 20, 17},

View File

@ -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};

View File

@ -11495,38 +11495,8 @@
{ {
"map": "MAP_BUDPORT_CITY", "map": "MAP_BUDPORT_CITY",
"base_label": "gBudportCity0", "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": { "land_mons": {
"encounter_rate": 0, "encounter_rate": 20,
"mons": [ "mons": [
{ {
"min_level": 5, "min_level": 5,
@ -11536,7 +11506,7 @@
{ {
"min_level": 10, "min_level": 10,
"max_level": 10, "max_level": 10,
"species": "SPECIES_ZYGARDE_10" "species": "SPECIES_RATTATA_ALOLAN"
}, },
{ {
"min_level": 5, "min_level": 5,
@ -11589,6 +11559,36 @@
"species": "SPECIES_NONE" "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"
}
]
} }
} }
] ]

View File

@ -1374,7 +1374,7 @@ static void Task_NewGameBirchSpeechSub_InitPokeBall(u8 taskId)
gSprites[spriteId].invisible = FALSE; gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].data[0] = 0; 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[taskId].func = Task_NewGameBirchSpeechSub_WaitForLotad;
gTasks[sBirchSpeechMainTaskId].tTimer = 0; gTasks[sBirchSpeechMainTaskId].tTimer = 0;
} }
@ -1876,7 +1876,7 @@ static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite *sprite)
static u8 NewGameBirchSpeech_CreateLotadSprite(u8 x, u8 y) 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) static void AddBirchSpeechObjects(u8 taskId)

View File

@ -112,9 +112,9 @@ static const u8 sStarterLabelCoords[STARTER_MON_COUNT][2] =
static const u16 sStarterMon[STARTER_MON_COUNT] = static const u16 sStarterMon[STARTER_MON_COUNT] =
{ {
SPECIES_TREECKO, SPECIES_CHESPIN,
SPECIES_TORCHIC, SPECIES_FENNEKIN,
SPECIES_MUDKIP, SPECIES_FROAKIE,
}; };
static const struct BgTemplate sBgTemplates[3] = static const struct BgTemplate sBgTemplates[3] =