From 4be11293e5c7d6bf4a2fc374974545a21a5e3572 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 May 2014 17:27:02 -0700 Subject: Label BCD math predefs. --- engine/battle/b_2.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/battle/b_2.asm') diff --git a/engine/battle/b_2.asm b/engine/battle/b_2.asm index b71ca40d..00510ec7 100755 --- a/engine/battle/b_2.asm +++ b/engine/battle/b_2.asm @@ -120,7 +120,7 @@ PayDayEffect_ ; 2feb8 (b:7eb8) ld [hl], a ld de, $cce7 ld c, $3 - ld a, $b + ld a, $b ; AddBCDPredef call Predef ld hl, CoinsScatteredText ; $7f04 jp PrintText -- cgit v1.2.3 From 40c17c906b2b3f65b3b04b1933b90238a7ac5566 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 26 May 2014 14:04:56 -0700 Subject: Remove most static wram addresses. Use labels instead. For unknown addresses, use "w
". Label overleads are still an issue. --- engine/battle/b_2.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/battle/b_2.asm') diff --git a/engine/battle/b_2.asm b/engine/battle/b_2.asm index 00510ec7..6ec58cc0 100755 --- a/engine/battle/b_2.asm +++ b/engine/battle/b_2.asm @@ -86,13 +86,13 @@ DuplicateBitsTable: ; 2fea8 (b:7ea8) PayDayEffect_ ; 2feb8 (b:7eb8) xor a - ld hl, $cd6d + ld hl, wcd6d ld [hli], a ld a, [$fff3] and a - ld a, [$d022] + ld a, [W_PLAYERMONLEVEL] jr z, .asm_2fec8 ; 0x2fec3 $3 - ld a, [$cff3] + ld a, [W_ENEMYMONLEVEL] .asm_2fec8 add a ld [$ff98], a @@ -118,7 +118,7 @@ PayDayEffect_ ; 2feb8 (b:7eb8) ld a, [$ff99] add b ld [hl], a - ld de, $cce7 + ld de, wcce7 ld c, $3 ld a, $b ; AddBCDPredef call Predef -- cgit v1.2.3 From 53ae0e93fad9f4c3eaef92f102b1eeb531e59d68 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 14 Jun 2014 04:12:40 -0700 Subject: Use monster struct macros in wram. Rename related labels for consistency. --- engine/battle/b_2.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/battle/b_2.asm') diff --git a/engine/battle/b_2.asm b/engine/battle/b_2.asm index 6ec58cc0..3c839cba 100755 --- a/engine/battle/b_2.asm +++ b/engine/battle/b_2.asm @@ -90,9 +90,9 @@ PayDayEffect_ ; 2feb8 (b:7eb8) ld [hli], a ld a, [$fff3] and a - ld a, [W_PLAYERMONLEVEL] + ld a, [wBattleMonLevel] jr z, .asm_2fec8 ; 0x2fec3 $3 - ld a, [W_ENEMYMONLEVEL] + ld a, [wEnemyMonLevel] .asm_2fec8 add a ld [$ff98], a -- cgit v1.2.3 From b36f793667924f868282ce979fabab3e95d642a5 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 13:57:26 -0700 Subject: Use macros for predef calls/jumps instead of static ids. --- engine/battle/b_2.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engine/battle/b_2.asm') diff --git a/engine/battle/b_2.asm b/engine/battle/b_2.asm index 3c839cba..e343f1aa 100755 --- a/engine/battle/b_2.asm +++ b/engine/battle/b_2.asm @@ -120,8 +120,7 @@ PayDayEffect_ ; 2feb8 (b:7eb8) ld [hl], a ld de, wcce7 ld c, $3 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef ld hl, CoinsScatteredText ; $7f04 jp PrintText -- cgit v1.2.3