pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from yenatch/master

Browse Source 
minor label changes
This commit is contained in:
Bryan Bishop
2013-01-11 19:33:25 -08:00
parent 6349efabe4 ad46a9359b
commit 52e79bd8bb
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants.asm
View File

@@ -3287,8 +3287,6 @@ MOVE_ACC EQU 4
MOVE_PP EQU 5 MOVE_PP EQU 5
MOVE_CHANCE EQU 6 MOVE_CHANCE EQU 6
; base stats
BASE_STATS_LENGTH EQU 32
; stat constants ; stat constants
NUM_STATS EQU 6 NUM_STATS EQU 6

11
main.asm
View File

@@ -1945,17 +1945,17 @@ GetBaseStats: ; 3856
rst $10 rst $10
; Egg doesn't have base stats ; Egg doesn't have base stats
ld a, [CurBattleSpecies] ld a, [CurSpecies]
cp EGG cp EGG
jr z, .egg jr z, .egg
; Get base stats ; Get base stats
dec a dec a
ld bc, BASE_STATS_LENGTH ld bc, BaseStatsStructEnd - BaseStats
ld hl, BaseStats ld hl, BaseStats
call AddNTimes call AddNTimes
ld de, CurBaseStats ld de, CurBaseStats
ld bc, BASE_STATS_LENGTH ld bc, BaseStatsStructEnd - BaseStats
call CopyBytes call CopyBytes
jr .end jr .end
@@ -1981,7 +1981,7 @@ GetBaseStats: ; 3856
.end .end
; Replace Pokedex # with species ; Replace Pokedex # with species
ld a, [CurBattleSpecies] ld a, [CurSpecies]
ld [CurBaseStats], a ld [CurBaseStats], a
; Restore bank ; Restore bank
@@ -12646,7 +12646,7 @@ LoadEnemyMon: ; 3e8eb
; Make sure everything knows what species we're working with ; Make sure everything knows what species we're working with
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld [EnemyMonSpecies], a ld [EnemyMonSpecies], a
ld [CurBattleSpecies], a ld [CurSpecies], a
ld [CurPartySpecies], a ld [CurPartySpecies], a
; Grab the base stats for this species ; Grab the base stats for this species
@@ -18589,6 +18589,7 @@ BulbasaurBaseStats: ; 0x51424
db %01000101 db %01000101
db %00000000 db %00000000
; end ; end
BaseStatsStructEnd:
IvysaurBaseStats: ; 0x51444 IvysaurBaseStats: ; 0x51444
db IVYSAUR ; 002 db IVYSAUR ; 002

2
wram.asm
View File

@@ -658,7 +658,7 @@ MonType: ; cf5f
; 4 wildmon ; 4 wildmon
ds 1 ds 1
CurBattleSpecies: ; cf60 CurSpecies: ; cf60
ds 1 ds 1
ds 33 ds 33