diff options
Diffstat (limited to 'data/maps/RustboroCity_PokemonSchool/scripts.inc')
-rw-r--r-- | data/maps/RustboroCity_PokemonSchool/scripts.inc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 467a62b04..dd266e21f 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonSchool_MapScripts:: @ 81579E1 RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2 lockall - msgbox RustboroCity_PokemonSchool_Text_184321, 4 + msgbox RustboroCity_PokemonSchool_Text_184321, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_1579F1 end @@ -22,27 +22,27 @@ RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 end RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50 - msgbox RustboroCity_PokemonSchool_Text_184389, 4 + msgbox RustboroCity_PokemonSchool_Text_184389, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E - msgbox RustboroCity_PokemonSchool_Text_184447, 4 + msgbox RustboroCity_PokemonSchool_Text_184447, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C - msgbox RustboroCity_PokemonSchool_Text_1844EC, 4 + msgbox RustboroCity_PokemonSchool_Text_1844EC, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A - msgbox RustboroCity_PokemonSchool_Text_1845A5, 4 + msgbox RustboroCity_PokemonSchool_Text_1845A5, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88 - msgbox RustboroCity_PokemonSchool_Text_184627, 4 + msgbox RustboroCity_PokemonSchool_Text_184627, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_1579F1 end @@ -51,27 +51,27 @@ RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96 end RustboroCity_PokemonSchool_EventScript_157A98:: @ 8157A98 - msgbox RustboroCity_PokemonSchool_Text_18480E, 2 + msgbox RustboroCity_PokemonSchool_Text_18480E, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_157AA1:: @ 8157AA1 - msgbox RustboroCity_PokemonSchool_Text_18483C, 2 + msgbox RustboroCity_PokemonSchool_Text_18483C, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_157AAA:: @ 8157AAA - msgbox RustboroCity_PokemonSchool_Text_184873, 2 + msgbox RustboroCity_PokemonSchool_Text_184873, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_157AB3:: @ 8157AB3 - msgbox RustboroCity_PokemonSchool_Text_1848D8, 2 + msgbox RustboroCity_PokemonSchool_Text_1848D8, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_157ABC:: @ 8157ABC - msgbox RustboroCity_PokemonSchool_Text_184988, 2 + msgbox RustboroCity_PokemonSchool_Text_184988, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 - msgbox RustboroCity_PokemonSchool_Text_184A17, 3 + msgbox RustboroCity_PokemonSchool_Text_184A17, MSGBOX_SIGN end RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE @@ -82,12 +82,12 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E compare VAR_FACING, 3 call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 - msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 - giveitem_std ITEM_QUICK_CLAW + msgbox RustboroCity_PokemonSchool_Text_1846A2, MSGBOX_DEFAULT + giveitem ITEM_QUICK_CLAW compare VAR_RESULT, 0 - goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release @@ -104,9 +104,9 @@ RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 return RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 - msgbox RustboroCity_PokemonSchool_Text_184737, 4 + msgbox RustboroCity_PokemonSchool_Text_184737, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 release end @@ -134,7 +134,7 @@ RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 walk_up walk_up walk_right - end_movement + step_end RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 walk_right @@ -161,4 +161,4 @@ RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 walk_up walk_left walk_left - end_movement + step_end |