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/Route110_TrickHouseEntrance/scripts.inc
+17 -17
View File
@@ -236,9 +236,9 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
playse SE_PIN
applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
waitmovement 0
compare VAR_0x4044, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE
@@ -326,21 +326,21 @@ Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48
Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT
closemessage
applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
applymovement 1, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
applymovement 1, Route110_TrickHouseEntrance_Movement_272598
applymovement 1, Common_Movement_ExclamationMark
waitmovement 0
applymovement 1, Route110_TrickHouseEntrance_Movement_27259A
applymovement 1, Common_Movement_Delay48
waitmovement 0
msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT
applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
releaseall
end
Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
applymovement 1, Common_Movement_FacePlayer
waitmovement 0
msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT
compare VAR_0x4044, 1
@@ -364,7 +364,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
call_if_eq Common_EventScript_BagIsFull
msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
releaseall
end
@@ -374,7 +374,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
call_if_eq Common_EventScript_BagIsFull
msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
releaseall
end
@@ -384,7 +384,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
call_if_eq Common_EventScript_BagIsFull
msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
releaseall
end
@@ -394,7 +394,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
call_if_eq Common_EventScript_BagIsFull
msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
releaseall
end
@@ -404,7 +404,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
call_if_eq Common_EventScript_BagIsFull
msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
releaseall
end
@@ -414,7 +414,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
call_if_eq Common_EventScript_BagIsFull
msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
releaseall
end
@@ -424,7 +424,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
call_if_eq Common_EventScript_BagIsFull
msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
releaseall
end
@@ -432,20 +432,20 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
applymovement 1, Common_Movement_FacePlayer
waitmovement 0
msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT
call Route110_TrickHouseEntrance_EventScript_26A070
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_272071
call_if_eq Common_EventScript_NoRoomLeftForAnother
msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT
releaseall
end