ref: ad46a9359b8bdd9a529aeeea55a80505b70d6586
parent: 6349efabe45f6ede59fffd54df88858fe82009e2
author: yenatch <[email protected]>
date: Fri Jan 11 10:08:28 EST 2013
make some labels saner
--- a/constants.asm
+++ b/constants.asm
@@ -3287,8 +3287,6 @@
MOVE_PP EQU 5
MOVE_CHANCE EQU 6
-; base stats
-BASE_STATS_LENGTH EQU 32
; stat constants
NUM_STATS EQU 6
--- a/main.asm
+++ b/main.asm
@@ -1945,17 +1945,17 @@
rst $10
; Egg doesn't have base stats
- ld a, [CurBattleSpecies]
+ ld a, [CurSpecies]
cp EGG
jr z, .egg
; Get base stats
dec a
- ld bc, BASE_STATS_LENGTH
+ ld bc, BaseStatsStructEnd - BaseStats
ld hl, BaseStats
call AddNTimes
ld de, CurBaseStats
- ld bc, BASE_STATS_LENGTH
+ ld bc, BaseStatsStructEnd - BaseStats
call CopyBytes
jr .end
@@ -1981,7 +1981,7 @@
.end
; Replace Pokedex # with species
- ld a, [CurBattleSpecies]
+ ld a, [CurSpecies]
ld [CurBaseStats], a
; Restore bank
@@ -12646,7 +12646,7 @@
; Make sure everything knows what species we're working with
ld a, [TempEnemyMonSpecies]
ld [EnemyMonSpecies], a
- ld [CurBattleSpecies], a
+ ld [CurSpecies], a
ld [CurPartySpecies], a
; Grab the base stats for this species
@@ -18589,6 +18589,7 @@
db %01000101
db %00000000
; end
+BaseStatsStructEnd:
IvysaurBaseStats: ; 0x51444
db IVYSAUR ; 002
--- a/wram.asm
+++ b/wram.asm
@@ -658,7 +658,7 @@
; 4 wildmon
ds 1
-CurBattleSpecies: ; cf60
+CurSpecies: ; cf60
ds 1
ds 33