From 96168b95d2c70375a77243da759c2a4b54e80707 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sun, 3 Jan 2021 23:36:02 -0600
Subject: Add labels for some addresses

---
 src/engine/effect_functions.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/engine/effect_functions.asm')

diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index b381661..0fc94d4 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -877,7 +877,7 @@ HandleDefendingPokemonAttackSelection: ; 2c391 (b:4391)
 	db 2 ; number of items
 	db SYM_CURSOR_R ; cursor tile number
 	db SYM_SPACE ; tile behind cursor
-	dw $0000 ; function pointer if non-0
+	dw NULL ; function pointer if non-0
 ; 0x2c3fc
 
 ; loads in hl the pointer to attack's name.
@@ -1244,7 +1244,7 @@ HandleColorChangeScreen: ; 2c588 (b:4588)
 	db MAX_PLAY_AREA_POKEMON ; number of items
 	db SYM_CURSOR_R ; cursor tile number
 	db SYM_SPACE ; tile behind cursor
-	dw $0000 ; function pointer if non-0
+	dw NULL ; function pointer if non-0
 ; 0x2c5be
 
 .DrawScreen: ; 2c5be (b:45be)
@@ -1444,7 +1444,7 @@ PlayAreaSelectionMenuParameters: ; 2c6e0 (b:46e0)
 	db MAX_PLAY_AREA_POKEMON ; number of items
 	db SYM_CURSOR_R ; cursor tile number
 	db SYM_SPACE ; tile behind cursor
-	dw $0000 ; function pointer if non-0
+	dw NULL ; function pointer if non-0
 ; 0x2c6e8
 
 BenchSelectionMenuParameters: ; 2c6e8 (b:46e8)
@@ -1453,7 +1453,7 @@ BenchSelectionMenuParameters: ; 2c6e8 (b:46e8)
 	db MAX_PLAY_AREA_POKEMON ; number of items
 	db SYM_CURSOR_R ; cursor tile number
 	db SYM_SPACE ; tile behind cursor
-	dw $0000 ; function pointer if non-0
+	dw NULL ; function pointer if non-0
 ; 0x2c6f0
 
 SpitPoison_AIEffect: ; 2c6f0 (b:46f0)
-- 
cgit v1.2.3


From c8c78a2213f23ca6425feea875be596c8019e8eb Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sat, 9 Jan 2021 23:57:21 -0600
Subject: Add Script_Sam

---
 src/engine/effect_functions.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/engine/effect_functions.asm')

diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 0fc94d4..1394815 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -495,7 +495,7 @@ ApplyAndAnimateHPRecovery: ; 2c221 (b:4221)
 	ld e, a
 	ld a, 0
 	adc d
-	ld d, a 
+	ld d, a
 	; de = damage dealt + current HP
 	; bc = max HP of card
 	call CompareDEtoBC
@@ -9097,7 +9097,7 @@ MorphEffect: ; 2eff6 (b:6ff6)
 .successful
 	ld a, DUELVARS_ARENA_CARD_STAGE
 	call GetTurnDuelistVariable
-	or a 
+	or a
 	jr z, .skip_discard_stage_below
 
 ; if this is a stage 1 Pokemon (in case it's used
-- 
cgit v1.2.3