ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix more text and movements labeled as scripts

Browse Source
This commit is contained in:
GriffinR 2022-10-30 03:24:48 -04:00
parent f439a2dee7
commit 01c71b4ce1
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@ -911,7 +911,7 @@ BattleFrontier_BattleTowerLobby_EventScript_ExitRules::
end
@ Unused
BattleFrontier_BattleTowerLobby_EventScript_DirectYouToBattleRoom:
BattleFrontier_BattleTowerLobby_Text_DirectYouToBattleRoom:
.string "I'll direct you to your BATTLE ROOM now.$"
BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting:

4
data/maps/Route103/scripts.inc
View File

@ -114,7 +114,7 @@ Route103_EventScript_RivalExitFacingNorth::
applymovement LOCALID_RIVAL, Route103_Movement_RivalExitFacingNorth1
waitmovement 0
playse SE_LEDGE
applymovement LOCALID_RIVAL, Route103_EventScript_RivalExitFacingNorth2
applymovement LOCALID_RIVAL, Route103_Movement_RivalExitFacingNorth2
waitmovement 0
goto Route103_EventScript_RivalEnd
end
@ -155,7 +155,7 @@ Route103_Movement_RivalExitFacingNorth1:
walk_down
step_end
Route103_EventScript_RivalExitFacingNorth2:
Route103_Movement_RivalExitFacingNorth2:
jump_2_down
delay_16
walk_down

2
data/maps/Route110_TrickHouseEntrance/scripts.inc
View File

@ -635,7 +635,7 @@ Route110_TrickHousePuzzle7_EventScript_Door::
Route110_TrickHousePuzzle8_EventScript_Door::
goto_if_eq VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0, Route110_TrickHousePuzzle_EventScript_DoorLocked
msgbox Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
msgbox Route110_TrickHousePuzzle8_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE

2
data/maps/Route110_TrickHousePuzzle8/scripts.inc
View File

@ -27,7 +27,7 @@ Route110_TrickHousePuzzle8_EventScript_Leroy::
msgbox Route110_TrickHousePuzzle8_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened::
Route110_TrickHousePuzzle8_Text_WroteSecretCodeLockOpened::
.string "{PLAYER} wrote down the secret code\n"
.string "on the door.\p"
.string "“TRICK MASTER I love.”\n"

8
data/maps/SouthernIsland_Exterior/scripts.inc
View File

@ -33,20 +33,20 @@ SouthernIsland_Exterior_EventScript_AsYouLike::
end
Ferry_EventScript_DepartIslandSouth::
applymovement OBJ_EVENT_ID_PLAYER, Ferry_EventScript_DepartIslandBoardSouth
applymovement OBJ_EVENT_ID_PLAYER, Ferry_Movement_DepartIslandBoardSouth
waitmovement 0
return
Ferry_EventScript_DepartIslandWest::
applymovement OBJ_EVENT_ID_PLAYER, Ferry_EventScript_DepartIslandBoardWest
applymovement OBJ_EVENT_ID_PLAYER, Ferry_Movement_DepartIslandBoardWest
waitmovement 0
return
Ferry_EventScript_DepartIslandBoardSouth:
Ferry_Movement_DepartIslandBoardSouth:
walk_down
step_end
Ferry_EventScript_DepartIslandBoardWest:
Ferry_Movement_DepartIslandBoardWest:
walk_left
walk_in_place_faster_down
step_end