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

Merge branch 'master' into movement-action

Browse Source
This commit is contained in:
cbt6
2022-08-15 12:54:47 +08:00
committed by GitHub
parent 7233b2ed0a b3c2c7291f
commit 2644dd9c21
286 changed files with 8970 additions and 9432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+9 -18
View File
@@ -14,8 +14,7 @@ PokemonLeague_BrunosRoom_OnResume::
PokemonLeague_BrunosRoom_OnLoad::
call_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_SetDoorOpen
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2
call_if_eq PokemonLeague_BrunosRoom_EventScript_CloseEntry
call_if_eq VAR_MAP_SCENE_POKEMON_LEAGUE, 2, PokemonLeague_BrunosRoom_EventScript_CloseEntry
end
PokemonLeague_BrunosRoom_EventScript_CloseEntry::
@@ -81,14 +80,10 @@ PokemonLeague_BrunosRoom_EventScript_Rematch::
PokemonLeague_BrunosRoom_EventScript_PostBattle::
msgbox PokemonLeague_BrunosRoom_Text_PostBattle
closemessage
compare VAR_FACING, DIR_NORTH
call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
compare VAR_FACING, DIR_SOUTH
call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
compare VAR_FACING, DIR_WEST
call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
compare VAR_FACING, DIR_EAST
call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
call_if_eq VAR_FACING, DIR_NORTH, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
call_if_eq VAR_FACING, DIR_SOUTH, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
call_if_eq VAR_FACING, DIR_WEST, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
call_if_eq VAR_FACING, DIR_EAST, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
release
end
@@ -97,14 +92,10 @@ PokemonLeague_BrunosRoom_EventScript_DefeatedBruno::
call PokemonLeague_EventScript_OpenDoor
msgbox PokemonLeague_BrunosRoom_Text_PostBattle
closemessage
compare VAR_FACING, DIR_NORTH
call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
compare VAR_FACING, DIR_SOUTH
call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
compare VAR_FACING, DIR_WEST
call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
compare VAR_FACING, DIR_EAST
call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
call_if_eq VAR_FACING, DIR_NORTH, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
call_if_eq VAR_FACING, DIR_SOUTH, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
call_if_eq VAR_FACING, DIR_WEST, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
call_if_eq VAR_FACING, DIR_EAST, PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
release
end