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

Merge branch 'master' into event-vars

Browse Source
This commit is contained in:
Phlosioneer
2019-02-25 02:24:20 -05:00
parent 87859a655b a589d4a630
commit 4e5fae0086
201 changed files with 4075 additions and 7997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BattleFrontier_OutsideEast/map.json
+2 -2
View File
@@ -515,7 +515,7 @@
"y": 51,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_OutsideEast_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -523,7 +523,7 @@
"y": 51,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_OutsideEast_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
}
]
}
data/maps/BattleFrontier_OutsideEast/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return