dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
parent db8a5c6c2b f8cef9a6a8
commit 949509aade
82 changed files with 3472 additions and 6562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/FallarborTown_BattleTentCorridor/scripts.inc
+20 -16
View File
@@ -1,21 +1,21 @@
FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_OnFrame
.byte 0
FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD
map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7
FallarborTown_BattleTentCorridor_OnFrame: @ 82006AD
map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_EnterCorridor
.2byte 0
FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7
FallarborTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 82006B7
lockall
setvar VAR_TEMP_0, 1
applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB
applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB
applymovement 1, FallarborTown_BattleTentCorridor_Movement_WalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_WalkToDoor
waitmovement 0
opendoor 2, 1
waitdooranim
applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701
applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700
applymovement 1, FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_PlayerEnterDoor
waitmovement 0
closedoor 2, 1
waitdooranim
@@ -25,40 +25,44 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7
releaseall
end
FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB
FallarborTown_BattleTentCorridor_Movement_WalkToDoor: @ 82006FB
walk_up
walk_up
walk_up
walk_up
step_end
FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700
FallarborTown_BattleTentCorridor_Movement_PlayerEnterDoor: @ 8200700
walk_up
FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701
FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor: @ 8200701
walk_up
set_invisible
step_end
FallarborTown_BattleTentCorridor_Text_200704: @ 8200704
@ Leftover text from when this was a Contest Hall in R/S
@ Unused
FallarborTown_ContestHall_Text_DoAllRightInPreliminary: @ 8200704
.string "We do all right in the preliminary round,\n"
.string "but we can never win the appeals…\p"
.string "Maybe it means I have to watch what\n"
.string "other contestants are doing…$"
FallarborTown_BattleTentCorridor_Text_200791: @ 8200791
@ Unused
FallarborTown_ContestHall_Text_MonAllTheseRibbons: @ 8200791
.string "See!\n"
.string "My POKéMON won all these RIBBONS!\p"
.string "Have your POKéMON earned any RIBBONS?\n"
.string "You can check them on your POKéNAV.$"
FallarborTown_BattleTentCorridor_Text_200802: @ 8200802
@ Unused
FallarborTown_ContestHall_Text_CantWinEverywhere: @ 8200802
.string "I can't beat GYM LEADERS…\p"
.string "I can't win any CONTESTS…\p"
.string "I've been here, there, and everywhere,\n"
.string "and it's all for naught…$"
FallarborTown_BattleTentCorridor_Text_200876: @ 8200876
@ Unused
FallarborTown_ContestHall_Text_SuperRankStage: @ 8200876
.string "POKéMON CONTESTS\n"
.string "SUPER RANK STAGE!$"