diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-03 15:05:19 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-03 15:22:04 -0500 |
| commit | 10beeb3c0611b9114a8e5ff6ab0b8c5d7716defe (patch) | |
| tree | 849a489313f516c3e4f51b18969824543debf7a2 /engine | |
| parent | b1dc88b7281e0486cb952c8f8c62dab705eb4b9d (diff) | |
Battle Tower
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/scripting.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 4 |
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 |