diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-21 16:19:50 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-21 16:19:50 -0600 |
| commit | 0403f6eea90018270f89352febcce7fb6d613938 (patch) | |
| tree | 297e78e7066c9e92c54b4a7b02d887eb17363fd5 /data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc | |
| parent | eb65458b67412cc4fc01eb3a4fb1c37d88829b54 (diff) | |
| parent | bcffcb0c1cd1d9b9a223fa8029f33b4c3c926575 (diff) | |
Merge remote-tracking branch 'Egg/decompile_use_pokeblock'
Diffstat (limited to 'data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc')
| -rw-r--r-- | data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index c56eaf7a0..3bc582c93 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -143,7 +143,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 setvar VAR_0x8004, 9 @@ -430,14 +430,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 5 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate setvar VAR_0x8004, 18 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 21 special sub_81A1780 return |