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/VerdanturfTown/map.json
+4 -4
View File
@@ -137,7 +137,7 @@
"y": 3,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "VerdanturfTown_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
},
{
"type": "sign",
@@ -153,7 +153,7 @@
"y": 3,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "VerdanturfTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -169,7 +169,7 @@
"y": 3,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "VerdanturfTown_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
},
{
"type": "sign",
@@ -177,7 +177,7 @@
"y": 3,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "VerdanturfTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
data/maps/VerdanturfTown/scripts.inc
+2 -2
View File
@@ -12,14 +12,14 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575
faceplayer
goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594
msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT
applymovement 2, VerdanturfTown_Movement_2725A2
applymovement 2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
VerdanturfTown_EventScript_1EB594:: @ 81EB594
msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT
applymovement 2, VerdanturfTown_Movement_2725A2
applymovement 2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end