summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-21 19:03:38 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-21 19:03:38 -0400
commit8df72e4da6223f5d284029cb8503850523978a76 (patch)
treec16c7a671895c7b8054eee8a4771eeaa833a2346
parent7679d537772d63393e9639b41e25516b651026aa (diff)
Document battle outcome checks in scripts
Diffstat
-rw-r--r--asm/field_specials.s6
-rw-r--r--data/maps/BirthIsland_Exterior/scripts.inc10
-rw-r--r--data/maps/CeruleanCave_B1F/scripts.inc12
-rw-r--r--data/maps/MtEmber_Summit/scripts.inc12
-rw-r--r--data/maps/NavelRock_Base/scripts.inc12
-rw-r--r--data/maps/NavelRock_Summit/scripts.inc12
-rw-r--r--data/maps/PowerPlant/scripts.inc28
-rw-r--r--data/maps/Route12/scripts.inc8
-rw-r--r--data/maps/Route16/scripts.inc8
-rw-r--r--data/maps/SeafoamIslands_B4F/scripts.inc12
-rw-r--r--data/specials.inc2
11 files changed, 61 insertions, 61 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s
index 34b6f8b75..1fec988f4 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -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
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index c8a4885f2..47baf3c34 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -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
diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc
index a5e82cfa7..ad68f84bc 100644
--- a/data/maps/CeruleanCave_B1F/scripts.inc
+++ b/data/maps/CeruleanCave_B1F/scripts.inc
@@ -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
diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc
index e433a4665..8287d1d93 100644
--- a/data/maps/MtEmber_Summit/scripts.inc
+++ b/data/maps/MtEmber_Summit/scripts.inc
@@ -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
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
index 1f61d4fbf..98bb6f920 100644
--- a/data/maps/NavelRock_Base/scripts.inc
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -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
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
index ba65881ce..f73aaf1ec 100644
--- a/data/maps/NavelRock_Summit/scripts.inc
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -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
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc
index 5c2903c19..aa6fa42b0 100644
--- a/data/maps/PowerPlant/scripts.inc
+++ b/data/maps/PowerPlant/scripts.inc
@@ -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
diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc
index 61a42972b..446d9047d 100644
--- a/data/maps/Route12/scripts.inc
+++ b/data/maps/Route12/scripts.inc
@@ -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
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
index 012162ac1..b20a716ca 100644
--- a/data/maps/Route16/scripts.inc
+++ b/data/maps/Route16/scripts.inc
@@ -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
diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc
index 3b3951807..3b618448c 100644
--- a/data/maps/SeafoamIslands_B4F/scripts.inc
+++ b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -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
diff --git a/data/specials.inc b/data/specials.inc
index aa558bbd4..9932ef2bd 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 08:43:28 +0000