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/LittlerootTown_BrendansHouse_1F/scripts.inc
+7 -7
View File
@@ -90,11 +90,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D
LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
lockall
playse SE_PIN
applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598
applymovement 4, Common_Movement_ExclamationMark
waitmovement 0
applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A
applymovement 4, Common_Movement_Delay48
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
waitmovement 0
special GetRivalSonDaughterString
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
lockall
setvar VAR_0x8004, 1
setvar VAR_0x8005, 0
applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4
applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft
waitmovement 0
goto LittlerootTown_BrendansHouse_1F_EventScript_292765
end
@@ -146,9 +146,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
addobject 7
delay 30
playse SE_PIN
applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598
applymovement 7, Common_Movement_ExclamationMark
waitmovement 0
applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A
applymovement 7, Common_Movement_Delay48
waitmovement 0
compare VAR_0x8008, 1
call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981
@@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
end
LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
return