summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/scripting.asm2
-rw-r--r--engine/specials.asm4
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 5a3895038..9458efb3e 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2339,7 +2339,7 @@ Script_giveitem: ; 0x977ca
; quantity (SingleByteParam)
call GetScriptByte
- cp -1
+ cp ITEM_FROM_MEM
jr nz, .ok ; 0x977cf $3
ld a, [ScriptVar]
.ok
diff --git a/engine/specials.asm b/engine/specials.asm
index ef53daedc..0dc12a542 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -139,7 +139,7 @@ SpecialsPointers:: ; c029
add_special Function1700b0
add_special Function1700ba
add_special Function170114
- add_special Function170215
+ add_special BattleTowerBattle
add_special Function1704e1
add_special Function17021d
add_special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
@@ -154,7 +154,7 @@ SpecialsPointers:: ; c029
add_special Function4925b
add_special SpecialOmanyteChamber
add_special Function11c1ab
- add_special Function170687
+ add_special BattleTowerAction
add_special Special_DisplayUnownWords
add_special Special_Menu_ChallengeExplanationCancel
add_special Function17d2b6