diff options
Diffstat (limited to 'data/scripts/maps/FallarborTown_ContestLobby.inc')
| -rw-r--r-- | data/scripts/maps/FallarborTown_ContestLobby.inc | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index ed67d922d..11dd6159e 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -7,41 +7,41 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 end FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD - setvar 0x800b, 6 + setvar VAR_SPECIAL_B, 6 setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 - special sub_80C4BF0 + special SetContestTrainerGfxIds call FallarborTown_ContestLobby_EventScript_15FBDB - setvar 0x4088, 2 - warp LinkContestRoom1, 255, 7, 5 + setvar VAR_CONTEST_LOCATION, 2 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall - move 1, FallarborTown_ContestLobby_Movement_153A7C - waitmove 0 - playsfx 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + applymovement 1, FallarborTown_ContestLobby_Movement_153A7C + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView - move 1, FallarborTown_ContestLobby_Movement_153A7F - waitmove 0 - playsfx 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + applymovement 1, FallarborTown_ContestLobby_Movement_153A7F + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView - pause 20 - move 1, FallarborTown_ContestLobby_Movement_153A8C - waitmove 0 - move 255, FallarborTown_ContestLobby_Movement_153A7A - waitmove 0 + delay 20 + applymovement 1, FallarborTown_ContestLobby_Movement_153A8C + waitmovement 0 + applymovement 255, FallarborTown_ContestLobby_Movement_153A7A + waitmovement 0 msgbox FallarborTown_ContestLobby_Text_1A6832, 4 - closebutton - move 1, FallarborTown_ContestLobby_Movement_153A83 - move 255, FallarborTown_ContestLobby_Movement_153A70 - waitmove 0 + closemessage + applymovement 1, FallarborTown_ContestLobby_Movement_153A83 + applymovement 255, FallarborTown_ContestLobby_Movement_153A70 + waitmovement 0 releaseall return @@ -92,8 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E end FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 - checkflag 270 - jumpeq FallarborTown_ContestLobby_EventScript_153AA9 + goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end @@ -108,14 +107,14 @@ FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2 FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB lockall fadescreen 1 - showcontestwinner 2 + drawcontestwinner 2 releaseall end FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow - waitbutton - hidebox 0, 0, 29, 19 + waitbuttonpress + erasebox 0, 0, 29, 19 releaseall end |