diff options
Diffstat (limited to 'data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc')
| -rw-r--r-- | data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index b712826f3..e3073b374 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B - map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_15264B - map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_15268A - map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0 + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_15264B + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_15268A + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0 .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B @@ -59,9 +59,9 @@ LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA lockall - msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172574, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_152720 applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 @@ -71,7 +71,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 walk_up - end_movement + step_end LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall @@ -90,15 +90,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall playse SE_PIN - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782 waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall @@ -111,13 +111,13 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 walk_right walk_right walk_right - end_movement + step_end LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end |