dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-littleroot

Browse Source
This commit is contained in:
GriffinR
2019-11-08 03:07:50 -05:00
committed by GitHub
parent e19b9c9d46 030784dece
commit 9140594b23
130 changed files with 2292 additions and 2302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/field_poison.inc
View File

@@ -16,7 +16,7 @@ EventScript_FieldWhiteOut:: @ 82736D9
special Script_FadeOutMapMusic
waitstate
fadescreen 1
call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter
call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter
special SetCB2WhiteOut
waitstate
end

8
data/scripts/new_game.inc
View File

@@ -166,7 +166,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
setflag FLAG_HIDE_RUSTURF_TUNNEL_BRINEY
setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
@@ -199,8 +199,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
setflag FLAG_HIDE_ROUTE_104_RIVAL
setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE
setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
@@ -237,7 +237,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
setflag FLAG_HIDE_DEOXYS
setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
setflag FLAG_HIDE_SKY_PILLAR_WALLACE
setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT