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

Fix name of a field special

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 15:46:06 -04:00
parent 10ef670608
commit a41b6329e3
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/script_pokemon_util_80BF8FC.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start Special_ChooseMonToDeleteMove thumb_func_start Special_ChooseMonFromParty
Special_ChooseMonToDeleteMove: @ 80BF8FC Special_ChooseMonFromParty: @ 80BF8FC
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
bl ScriptContext2_Enable bl ScriptContext2_Enable
@@ -34,7 +34,7 @@ Special_ChooseMonToDeleteMove: @ 80BF8FC
.align 2, 0 .align 2, 0
_080BF934: .4byte sub_80BF97C _080BF934: .4byte sub_80BF97C
_080BF938: .4byte gTasks _080BF938: .4byte gTasks
thumb_func_end Special_ChooseMonToDeleteMove thumb_func_end Special_ChooseMonFromParty
thumb_func_start sub_80BF93C thumb_func_start sub_80BF93C
sub_80BF93C: @ 80BF93C sub_80BF93C: @ 80BF93C
data/event_scripts.s
+1 -1
View File
@@ -3897,7 +3897,7 @@ EventScript_1A8CAD:: @ 81A8CAD
return return
EventScript_1A8CBD:: @ 81A8CBD EventScript_1A8CBD:: @ 81A8CBD
special Special_ChooseMonToDeleteMove special Special_ChooseMonFromParty
waitstate waitstate
lock lock
faceplayer faceplayer
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+1 -1
View File
@@ -55,7 +55,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
msgbox gUnknown_81A5AD6, MSGBOX_YESNO msgbox gUnknown_81A5AD6, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_16E3BC goto_if eq, EventScript_16E3BC
special Special_ChooseMonToDeleteMove special Special_ChooseMonFromParty
waitstate waitstate
copyvar VAR_0x800A, VAR_0x8004 copyvar VAR_0x800A, VAR_0x8004
compare_var_to_value VAR_0x8004, 6 compare_var_to_value VAR_0x8004, 6
data/maps/FuchsiaCity_House3/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895
EventScript_16D8B0:: @ 816D8B0 EventScript_16D8B0:: @ 816D8B0
msgbox gUnknown_8199421 msgbox gUnknown_8199421
special Special_ChooseMonToDeleteMove special Special_ChooseMonFromParty
waitstate waitstate
compare_var_to_value VAR_0x8004, 6 compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_16D941 goto_if ge, EventScript_16D941
data/maps/LavenderTown_House2/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266
EventScript_16B287:: @ 816B287 EventScript_16B287:: @ 816B287
msgbox gUnknown_8193AA6 msgbox gUnknown_8193AA6
special Special_ChooseMonToDeleteMove special Special_ChooseMonFromParty
waitstate waitstate
compare_var_to_value VAR_0x8004, 6 compare_var_to_value VAR_0x8004, 6
goto_if lt, EventScript_16B2B4 goto_if lt, EventScript_16B2B4
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -1
View File
@@ -55,7 +55,7 @@ EventScript_168DB9:: @ 8168DB9
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_168E3C goto_if eq, EventScript_168E3C
msgbox gUnknown_818D8B2 msgbox gUnknown_818D8B2
special Special_ChooseMonToDeleteMove special Special_ChooseMonFromParty
waitstate waitstate
lock lock
faceplayer faceplayer
data/maps/Route12_FishingHouse/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ EventScript_16FF7F:: @ 816FF7F
goto_if eq, EventScript_16FFF5 goto_if eq, EventScript_16FFF5
special sub_80A096C special sub_80A096C
msgbox gUnknown_819F2DB msgbox gUnknown_819F2DB
special Special_ChooseMonToDeleteMove special Special_ChooseMonFromParty
waitstate waitstate
copyvar VAR_RESULT, VAR_0x8004 copyvar VAR_RESULT, VAR_0x8004
compare_var_to_value VAR_RESULT, 6 compare_var_to_value VAR_RESULT, 6
data/maps/SixIsland_WaterPath_House1/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
goto_if eq, EventScript_1720E5 goto_if eq, EventScript_1720E5
special sub_80A0918 special sub_80A0918
msgbox gUnknown_81A4A3F msgbox gUnknown_81A4A3F
special Special_ChooseMonToDeleteMove special Special_ChooseMonFromParty
waitstate waitstate
copyvar VAR_RESULT, VAR_0x8004 copyvar VAR_RESULT, VAR_0x8004
compare_var_to_value VAR_RESULT, 6 compare_var_to_value VAR_RESULT, 6
data/specials.inc
+1 -1
View File
@@ -168,7 +168,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special sub_807F888 def_special sub_807F888
def_special ChangePokemonNickname def_special ChangePokemonNickname
def_special Special_ChooseMonToDeleteMove def_special Special_ChooseMonFromParty
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75