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_ChampionsRoom/scripts.inc
+12 -21
View File
@@ -10,12 +10,9 @@ PokemonLeague_ChampionsRoom_MapScripts::
PokemonLeague_ChampionsRoom_OnResume::
setvar VAR_0x8004, 4
call PokemonLeague_EventScript_DoLightingEffect
compare VAR_STARTER_MON, 2
call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle
compare VAR_STARTER_MON, 1
call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander
call_if_eq VAR_STARTER_MON, 2, PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle
call_if_eq VAR_STARTER_MON, 1, PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur
call_if_eq VAR_STARTER_MON, 0, PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander
end
PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle::
@@ -51,7 +48,7 @@ PokemonLeague_ChampionsRoom_OnFrame::
PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
lockall
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
setflag FLAG_TEMP_2
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter
waitmovement 0
@@ -79,7 +76,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
waitmovement 0
delay 25
specialvar VAR_RESULT, GetStarterSpecies
getspeciesname 0, VAR_RESULT
bufferspeciesname STR_VAR_1, VAR_RESULT
msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterRight
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterLeft
@@ -96,7 +93,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
waitmovement 0
setvar VAR_TEMP_1, 1
warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12
warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 5, 12
waitstate
releaseall
end
@@ -107,21 +104,15 @@ PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd::
end
PokemonLeague_ChampionsRoom_EventScript_Battle::
compare VAR_STARTER_MON, 2
call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle
compare VAR_STARTER_MON, 1
call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleCharmander
call_if_eq VAR_STARTER_MON, 2, PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle
call_if_eq VAR_STARTER_MON, 1, PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur
call_if_eq VAR_STARTER_MON, 0, PokemonLeague_ChampionsRoom_EventScript_BattleCharmander
return
PokemonLeague_ChampionsRoom_EventScript_Rematch::
compare VAR_STARTER_MON, 2
call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle
compare VAR_STARTER_MON, 1
call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchCharmander
call_if_eq VAR_STARTER_MON, 2, PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle
call_if_eq VAR_STARTER_MON, 1, PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur
call_if_eq VAR_STARTER_MON, 0, PokemonLeague_ChampionsRoom_EventScript_RematchCharmander
return
PokemonLeague_ChampionsRoom_EventScript_Intro::