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_OutsideWest/map.json
+2 -2
View File
@@ -444,7 +444,7 @@
"y": 51,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_OutsideWest_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
},
{
"type": "sign",
@@ -452,7 +452,7 @@
"y": 51,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_OutsideWest_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
}
]
}
data/maps/BattleFrontier_OutsideWest/scripts.inc
+8 -8
View File
@@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
closemessage
applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
waitmovement 0
delay 30
hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
faceplayer
message BattleFrontier_OutsideWest_Text_23DA60
waitmessage
applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0
applymovement 18, Common_Movement_FaceAwayPlayer
waitmovement 0
waitbuttonpress
release
@@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
end
BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8
applymovement 9, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT
applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4
applymovement 10, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT
closemessage
delay 25
applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6
applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6
applymovement 9, Common_Movement_WalkInPlaceUp
applymovement 10, Common_Movement_WalkInPlaceUp
waitmovement 0
release
end
@@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
end
BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6
applymovement 14, Common_Movement_WalkInPlaceUp
waitmovement 0
return
@@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7
faceplayer
msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT
closemessage
applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2
applymovement 23, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end