diff options
| -rw-r--r-- | asm/script_pokemon_util_80BF8FC.s | 6 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/FuchsiaCity_House3/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/LavenderTown_House2/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PalletTown_GarysHouse/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route12_FishingHouse/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SixIsland_WaterPath_House1/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 32eb732b8..bf461b039 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -5,8 +5,8 @@ .text - thumb_func_start Special_ChooseMonToDeleteMove -Special_ChooseMonToDeleteMove: @ 80BF8FC + thumb_func_start Special_ChooseMonFromParty +Special_ChooseMonFromParty: @ 80BF8FC push {lr} sub sp, 0x4 bl ScriptContext2_Enable @@ -34,7 +34,7 @@ Special_ChooseMonToDeleteMove: @ 80BF8FC .align 2, 0 _080BF934: .4byte sub_80BF97C _080BF938: .4byte gTasks - thumb_func_end Special_ChooseMonToDeleteMove + thumb_func_end Special_ChooseMonFromParty thumb_func_start sub_80BF93C sub_80BF93C: @ 80BF93C diff --git a/data/event_scripts.s b/data/event_scripts.s index 070c653df..b53e7d03a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3897,7 +3897,7 @@ EventScript_1A8CAD:: @ 81A8CAD return EventScript_1A8CBD:: @ 81A8CBD - special Special_ChooseMonToDeleteMove + special Special_ChooseMonFromParty waitstate lock faceplayer diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index af25aef3b..6cf717fe5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -55,7 +55,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_16E3BC - special Special_ChooseMonToDeleteMove + special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 compare_var_to_value VAR_0x8004, 6 diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 8cf131bcb..f08f9371d 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -12,7 +12,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 EventScript_16D8B0:: @ 816D8B0 msgbox gUnknown_8199421 - special Special_ChooseMonToDeleteMove + special Special_ChooseMonFromParty waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16D941 diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 92873c254..213e84754 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -13,7 +13,7 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 EventScript_16B287:: @ 816B287 msgbox gUnknown_8193AA6 - special Special_ChooseMonToDeleteMove + special Special_ChooseMonFromParty waitstate compare_var_to_value VAR_0x8004, 6 goto_if lt, EventScript_16B2B4 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index af5e6985b..7900d62e8 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -55,7 +55,7 @@ EventScript_168DB9:: @ 8168DB9 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_168E3C msgbox gUnknown_818D8B2 - special Special_ChooseMonToDeleteMove + special Special_ChooseMonFromParty waitstate lock faceplayer diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 5f19babef..927bc3bea 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -41,7 +41,7 @@ EventScript_16FF7F:: @ 816FF7F goto_if eq, EventScript_16FFF5 special sub_80A096C msgbox gUnknown_819F2DB - special Special_ChooseMonToDeleteMove + special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 4cf4bc960..be9e12915 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -14,7 +14,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D goto_if eq, EventScript_1720E5 special sub_80A0918 msgbox gUnknown_81A4A3F - special Special_ChooseMonToDeleteMove + special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 diff --git a/data/specials.inc b/data/specials.inc index 13b113bbe..aa558bbd4 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -168,7 +168,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special sub_807F888 def_special ChangePokemonNickname - def_special Special_ChooseMonToDeleteMove + def_special Special_ChooseMonFromParty def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 |