Merge remote-tracking branch 'Egg/decompile_use_pokeblock'

This commit is contained in:
Diegoisawesome
2017-12-21 16:19:50 -06:00
98 changed files with 12920 additions and 14984 deletions
+2 -2
View File
@@ -449,7 +449,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
end
OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
special sp000_heal_pokemon
special HealPlayerParty
special copy_player_party_to_sav1
special copy_bags_and_unk_data_from_save_blocks
copyvar VAR_0x4087, VAR_0x8004
@@ -1031,7 +1031,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4
closemessage
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 6
copyvar VAR_0x4087, VAR_0x8004
call OldaleTown_PokemonCenter_2F_EventScript_277BBE