Merge branch 'master' into event-vars

This commit is contained in:
Phlosioneer
2019-02-25 02:24:20 -05:00
201 changed files with 4075 additions and 7997 deletions

View File

@@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
playfanfare MUS_ME_TAMA
playse SE_TAMA
special sub_80B0534
applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 150
removeobject 7
@@ -50,10 +50,10 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
waitmovement 0
msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
delay 30
applymovement 6, MagmaHideout_4F_Movement_27259E
applymovement 6, Common_Movement_FacePlayer
waitmovement 0
msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT
closemessage