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

Sync Cable Club scripts

Browse Source
This commit is contained in:
GriffinR
2020-01-10 16:55:58 -05:00
parent a537577671
commit 0bb7f18b8e
120 changed files with 1142 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cable_club.inc
+575 -623
View File
File diff suppressed because it is too large Load Diff
data/scripts/pkmn_center_nurse.inc
+1 -1
View File
@@ -27,7 +27,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE
waitfieldeffect FLDEFF_POKECENTER_HEAL
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown
waitmovement 0
special sp000_heal_pokemon
special HealPlayerParty
return
EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC
data/scripts/trainer_battle.inc
+4 -4
View File
@@ -27,8 +27,8 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
compare VAR_RESULT, 0
goto_if_ne EventScript_1A4F20
special CheckForAlivePartyMons
compare VAR_RESULT, 0
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_1A4F19
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
@@ -79,8 +79,8 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare VAR_RESULT, 0
goto_if_eq EventScript_1A4FB0
special CheckForAlivePartyMons
compare VAR_RESULT, 0
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_1A4FB1
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
data/scripts/trainer_tower.inc
+1 -1
View File
@@ -241,7 +241,7 @@ EventScript_1C52D7:
end
EventScript_1C52E0:: @ 81C52E0
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 11
special sub_815D9E8
warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7