port larger heal location changes from poke ruby pr

This commit is contained in:
garak
2018-08-10 10:45:15 -04:00
parent 45b730e474
commit c3512e3b39
26 changed files with 100 additions and 71 deletions

View File

@@ -4,7 +4,7 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
.byte 0
BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
setrespawn 22
setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
end
BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908

View File

@@ -4,7 +4,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
.byte 0
DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E
setrespawn 15
setrespawn HEAL_LOCATION_DEWFORD_TOWN
call DewfordTown_PokemonCenter_1F_EventScript_2718DE
end

View File

@@ -51,7 +51,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
end
EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
setrespawn 1
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
fadescreenspeed 1, 24
special GameClear
waitstate
@@ -59,7 +59,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
end
EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
setrespawn 2
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
fadescreenspeed 1, 24
special GameClear
waitstate

View File

@@ -4,7 +4,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
.byte 0
EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
setrespawn 11
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
checkflag FLAG_0x1CF
call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
end

View File

@@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
.byte 0
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
setrespawn 20
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
setflag FLAG_LANDMARK_POKEMON_LEAGUE
checkflag FLAG_0x107
call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED

View File

@@ -4,7 +4,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
.byte 0
FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
setrespawn 17
setrespawn HEAL_LOCATION_FALLARBOR_TOWN
call FallarborTown_PokemonCenter_1F_EventScript_2718DE
end

View File

@@ -4,7 +4,7 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
.byte 0
FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3
setrespawn 7
setrespawn HEAL_LOCATION_FORTREE_CITY
end
FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7

View File

@@ -24,7 +24,7 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04
end
InsideOfTruck_EventScript_23BF20:: @ 823BF20
setrespawn 1
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
setvar VAR_0x4092, 1
setflag FLAG_0x2F7
setflag FLAG_0x2FA
@@ -37,7 +37,7 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20
end
InsideOfTruck_EventScript_23BF46:: @ 823BF46
setrespawn 2
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
setvar VAR_0x4092, 2
setflag FLAG_0x2F6
setflag FLAG_0x2F9

View File

@@ -4,7 +4,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
.byte 0
LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05
setrespawn 16
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE
end

View File

@@ -4,7 +4,7 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
.byte 0
LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD
setrespawn 8
setrespawn HEAL_LOCATION_LILYCOVE_CITY
goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6
end

View File

@@ -4,7 +4,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
.byte 0
MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
setrespawn 5
setrespawn HEAL_LOCATION_MAUVILLE_CITY
call MauvilleCity_PokemonCenter_1F_EventScript_2718DE
goto MauvilleCity_PokemonCenter_1F_EventScript_210E74
end

View File

@@ -4,7 +4,7 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
.byte 0
MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A
setrespawn 9
setrespawn HEAL_LOCATION_MOSSDEEP_CITY
end
MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E

View File

@@ -4,7 +4,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
.byte 0
OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011
setrespawn 14
setrespawn HEAL_LOCATION_OLDALE_TOWN
call OldaleTown_PokemonCenter_1F_EventScript_2718DE
end

View File

@@ -4,7 +4,7 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
.byte 0
PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2
setrespawn 19
setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN
end
PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6

View File

@@ -4,7 +4,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
.byte 0
PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3
setrespawn 3
setrespawn HEAL_LOCATION_PETALBURG_CITY
call PetalburgCity_PokemonCenter_1F_EventScript_2718DE
end

View File

@@ -4,7 +4,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
.byte 0
RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D
setrespawn 6
setrespawn HEAL_LOCATION_RUSTBORO_CITY
call RustboroCity_PokemonCenter_1F_EventScript_2718DE
end

View File

@@ -123,7 +123,7 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119
end
SSTidalCorridor_EventScript_23C13B:: @ 823C13B
setrespawn 8
setrespawn HEAL_LOCATION_LILYCOVE_CITY
msgbox SSTidalCorridor_Text_23C64F, 4
checkflag FLAG_0x104
call_if 1, SSTidalCorridor_EventScript_23C179
@@ -133,7 +133,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B
end
SSTidalCorridor_EventScript_23C15A:: @ 823C15A
setrespawn 4
setrespawn HEAL_LOCATION_SLATEPORT_CITY
msgbox SSTidalCorridor_Text_23C64F, 4
checkflag FLAG_0x104
call_if 1, SSTidalCorridor_EventScript_23C179

View File

@@ -4,7 +4,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
.byte 0
SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA
setrespawn 4
setrespawn HEAL_LOCATION_SLATEPORT_CITY
call SlateportCity_PokemonCenter_1F_EventScript_2718DE
end

View File

@@ -4,7 +4,7 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
.byte 0
SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC
setrespawn 10
setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY
end
SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500

View File

@@ -4,7 +4,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726
.byte 0
VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731
setrespawn 18
setrespawn HEAL_LOCATION_VERDANTURF_TOWN
call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE
end