summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-12-29 14:53:57 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-12-29 14:53:57 -0500
commitf0915e2b664f3c045cdea710aeced219396db8bb (patch)
tree791dd3a4cc749f482593f2bd3746f904304430d0 /main.asm
parent47979336e29d7e22d524e35ddc50576874ead009 (diff)
More BankF documentation
Also introduce bit direction constants and setpal macros
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index e36f755f..13ee5769 100755
--- a/main.asm
+++ b/main.asm
@@ -499,7 +499,7 @@ TestBattle:
ld a, %10000000 ; EARTHBADGE
ld [wObtainedBadges], a
- ld hl, W_FLAGS_D733
+ ld hl, wFlags_D733
set 0, [hl]
; Reset the party.
@@ -2534,7 +2534,7 @@ ApplyOutOfBattlePoisonDamage: ; c3de (3:43de)
ld a, $d0
ld [hSpriteIndexOrTextID], a
call DisplayTextID
- callab IsThisPartymonOurPikachu
+ callab IsThisPartymonStarterPikachu_Party
jr nc, .curMonNotPlayerPikachu
ld e, $3
callab PlayPikachuSoundClip