From ad46a9359b8bdd9a529aeeea55a80505b70d6586 Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 11 Jan 2013 15:08:28 -0500 Subject: make some labels saner --- main.asm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 52e51f2bd..b90e0e6e0 100644 --- a/main.asm +++ b/main.asm @@ -1945,17 +1945,17 @@ GetBaseStats: ; 3856 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 @@ GetBaseStats: ; 3856 .end ; Replace Pokedex # with species - ld a, [CurBattleSpecies] + ld a, [CurSpecies] ld [CurBaseStats], a ; Restore bank @@ -12646,7 +12646,7 @@ LoadEnemyMon: ; 3e8eb ; 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 @@ BulbasaurBaseStats: ; 0x51424 db %01000101 db %00000000 ; end +BaseStatsStructEnd: IvysaurBaseStats: ; 0x51444 db IVYSAUR ; 002 -- cgit v1.2.3