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

Document battle outcome checks in scripts

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 19:03:38 -04:00
parent 7679d53777
commit 8df72e4da6
11 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_specials.s
+3 -3
View File
@@ -176,14 +176,14 @@ _080CA744: .4byte gStringVar1
_080CA748: .4byte gUnknown_8417FCC
thumb_func_end sub_80CA714
thumb_func_start sub_80CA74C
sub_80CA74C: @ 80CA74C
thumb_func_start Special_GetBattleOutcome
Special_GetBattleOutcome: @ 80CA74C
ldr r0, _080CA754 @ =gBattleOutcome
ldrb r0, [r0]
bx lr
.align 2, 0
_080CA754: .4byte gBattleOutcome
thumb_func_end sub_80CA74C
thumb_func_end Special_GetBattleOutcome
thumb_func_start Special_SetHiddenItemFlag
Special_SetHiddenItemFlag: @ 80CA758
data/maps/BirthIsland_Exterior/scripts.inc
+5 -5
View File
@@ -37,7 +37,7 @@ BirthIsland_Exterior_MapScript2_165253:: @ 8165253
end
EventScript_16525D:: @ 816525D
specialvar VAR_RESULT, sub_80CA74C
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 2
@@ -95,12 +95,12 @@ EventScript_1652C0:: @ 81652C0
special sub_807F9D8
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16533A
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_165348
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_165348
setflag FLAG_FOUGHT_DEOXYS
release
data/maps/CeruleanCave_B1F/scripts.inc
+6 -6
View File
@@ -9,8 +9,8 @@ CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9
end
EventScript_1624D3:: @ 81624D3
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
@@ -44,12 +44,12 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
special sub_807F9D8
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_162558
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_162561
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_162561
setflag FLAG_FOUGHT_MEWTWO
release
data/maps/MtEmber_Summit/scripts.inc
+6 -6
View File
@@ -9,8 +9,8 @@ MtEmber_Summit_MapScript2_163B07:: @ 8163B07
end
EventScript_163B11:: @ 8163B11
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
@@ -44,12 +44,12 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
special sub_807F9D8
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_163B96
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163B9F
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163B9F
setflag FLAG_FOUGHT_MOLTRES
release
data/maps/NavelRock_Base/scripts.inc
+6 -6
View File
@@ -26,8 +26,8 @@ NavelRock_Base_MapScript2_165116:: @ 8165116
end
EventScript_165120:: @ 8165120
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 1
return
@@ -68,12 +68,12 @@ NavelRock_Base_EventScript_165134:: @ 8165134
special sub_807F9D8
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1651D9
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1651E7
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1651E7
setflag FLAG_FOUGHT_LUGIA
release
data/maps/NavelRock_Summit/scripts.inc
+6 -6
View File
@@ -29,8 +29,8 @@ NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD
end
EventScript_164FE7:: @ 8164FE7
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 1
return
@@ -73,12 +73,12 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
setvar VAR_LAST_TALKED, 1
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1650B4
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1650C2
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1650C2
setflag FLAG_FOUGHT_HO_OH
releaseall
data/maps/PowerPlant/scripts.inc
+14 -14
View File
@@ -9,8 +9,8 @@ PowerPlant_MapScript1_16376F:: @ 816376F
end
EventScript_163779:: @ 8163779
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
@@ -57,12 +57,12 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
special sub_807F9D8
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16381B
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163824
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163824
setflag FLAG_FOUGHT_ZAPDOS
release
@@ -93,12 +93,12 @@ PowerPlant_EventScript_16382F:: @ 816382F
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_163884
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163884
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163884
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
release
@@ -124,12 +124,12 @@ PowerPlant_EventScript_16388D:: @ 816388D
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1638E2
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1638E2
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1638E2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
release
data/maps/Route12/scripts.inc
+4 -4
View File
@@ -34,12 +34,12 @@ Route12_EventScript_168014:: @ 8168014
setflag FLAG_WOKE_UP_ROUTE_12_SNORLAX
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16808F
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_16808F
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_16808F
release
end
data/maps/Route16/scripts.inc
+4 -4
View File
@@ -52,12 +52,12 @@ Route16_EventScript_168121:: @ 8168121
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_168199
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_168199
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_168199
release
end
data/maps/SeafoamIslands_B4F/scripts.inc
+6 -6
View File
@@ -12,8 +12,8 @@ SeafoamIslands_B4F_MapScript2_163048:: @ 8163048
end
EventScript_163052:: @ 8163052
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
@@ -182,12 +182,12 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
special sub_807F9D8
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16320F
compare_var_to_value VAR_RESULT, 4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163218
compare_var_to_value VAR_RESULT, 5
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163218
setflag FLAG_FOUGHT_ARTICUNO
release
data/specials.inc
+1 -1
View File
@@ -189,7 +189,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA74C
def_special Special_GetBattleOutcome
def_special GetDaycareMonNicknames
def_special GetDaycareState
def_special RejectEggFromDayCare