dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into porymap-5

Browse Source
This commit is contained in:
GriffinR
2022-10-27 14:16:25 -04:00
committed by GitHub
parent 2b2bf84502 d1178f7f8f
commit f096196c91
100 changed files with 620 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TrainerTower_Lobby/scripts.inc
+2 -2
View File
@@ -72,7 +72,7 @@ TrainerTower_Lobby_EventScript_Enter::
ttower_getchallengestatus
switch VAR_RESULT
case CHALLENGE_STATUS_LOST, TrainerTower_Lobby_EventScript_LostChallenge
case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938
case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_ExitChallengeSpeakToReceptionist
case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd
TrainerTower_Lobby_EventScript_LostChallenge::
@@ -84,7 +84,7 @@ TrainerTower_Lobby_EventScript_LostChallenge::
goto TrainerTower_Lobby_EventScript_ExitChallenge
@ Presumably E-Reader related
TrainerTower_Lobby_EventScript_164938::
TrainerTower_Lobby_EventScript_ExitChallengeSpeakToReceptionist::
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist