diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 14:54:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 14:54:43 -0500 |
| commit | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (patch) | |
| tree | 60d1318e686a7e4c9621ee7697c890b3c21cd696 /data/maps | |
| parent | 74fa8075ee4018ba9b7e610212cf7c7777c4edb4 (diff) | |
| parent | 483613e128d8dc5b419ea9ff83c92aa2e4e55042 (diff) | |
Merge pull request #213 from PikalaxALT/script_pokemon_util
script_pokemon_util_80A0058, battle_interface
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PokemonTower_5F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SevenIsland_House_Room1/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SevenIsland_House_Room2/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 71c8cf0ee..a713b044f 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -45,7 +45,7 @@ EventScript_1653C5:: @ 81653C5 OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF lockall fadescreen 3 - special sp000_heal_pokemon + special HealPlayerParty fadescreen 2 msgbox gUnknown_817D450 setvar VAR_0x4001, 1 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 850182c08..38d85f0d1 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -488,7 +488,7 @@ Movement_1694BE:: @ 81694BE step_end EventScript_1694C2:: @ 81694C2 - special sp000_heal_pokemon + special HealPlayerParty msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 85517e241..dee5b5bbd 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -8,7 +8,7 @@ PokemonTower_5F_EventScript_163433:: @ 8163433 PokemonTower_5F_EventScript_16343C:: @ 816343C lockall fadescreen 3 - special sp000_heal_pokemon + special HealPlayerParty fadescreen 2 msgbox gUnknown_817A1FA setvar VAR_0x4001, 1 diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index fd83fa051..f136b8de2 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -128,7 +128,7 @@ EventScript_170A11:: @ 8170A11 EventScript_170A1E:: @ 8170A1E msgbox gUnknown_81A06AB fadescreen 1 - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate return diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index f2928f916..0ca956c55 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -29,7 +29,7 @@ EventScript_170A97:: @ 8170A97 compare_var_to_value VAR_RESULT, 2 call_if eq, EventScript_170B17 closemessage - special sp000_heal_pokemon + special HealPlayerParty applymovement 255, Movement_170B28 waitmovement 0 special LoadPlayerParty diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 142f33ee3..b0074f4b3 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -196,7 +196,7 @@ EventScript_164A53:: @ 8164A53 EventScript_164AA0:: @ 8164AA0 copyvar VAR_0x8005, VAR_RESULT setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 - special sp000_heal_pokemon + special HealPlayerParty msgbox gUnknown_817C8BF setvar VAR_0x8004, 6 special sub_815D9E8 |