mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
BaseStats is now BaseData
This commit is contained in:
parent
652d26bb05
commit
f2185cd0e4
@ -2020,7 +2020,7 @@ Function0x34a2a: ; 34a2a
|
||||
|
||||
ld a, [hl]
|
||||
ld [CurSpecies], a
|
||||
call GetBaseStats
|
||||
call GetBaseData
|
||||
ld a, [LastEnemyCounterMove]
|
||||
dec a
|
||||
ld hl, $5afd
|
||||
@ -2200,7 +2200,7 @@ Function0x34b20: ; 34b20
|
||||
|
||||
push hl
|
||||
ld [CurSpecies], a
|
||||
call GetBaseStats
|
||||
call GetBaseData
|
||||
ld a, [LastEnemyCounterMove]
|
||||
and a
|
||||
jr z, .asm_34b4a
|
||||
@ -3929,7 +3929,7 @@ BattleCommanda1: ; 35461
|
||||
call FarBattleTextBox
|
||||
ld a, [BattleMonSpecies]
|
||||
ld [CurSpecies], a
|
||||
call GetBaseStats
|
||||
call GetBaseData
|
||||
ld a, [$d239]
|
||||
ld c, a
|
||||
push bc
|
||||
@ -3937,7 +3937,7 @@ BattleCommanda1: ; 35461
|
||||
call Function0x355bd
|
||||
ld a, [hl]
|
||||
ld [CurSpecies], a
|
||||
call GetBaseStats
|
||||
call GetBaseData
|
||||
ld a, [$d238]
|
||||
pop bc
|
||||
ld b, a
|
||||
|
32
main.asm
32
main.asm
@ -3502,27 +3502,27 @@ GetMoveName: ; 34f8
|
||||
INCBIN "baserom.gbc", $350c, $3856 - $350c
|
||||
|
||||
|
||||
GetBaseStats: ; 3856
|
||||
GetBaseData: ; 3856
|
||||
push bc
|
||||
push de
|
||||
push hl
|
||||
ld a, [hROMBank]
|
||||
push af
|
||||
ld a, BANK(BaseStats)
|
||||
ld a, BANK(BaseData)
|
||||
rst Bankswitch
|
||||
|
||||
; Egg doesn't have base stats
|
||||
; Egg doesn't have BaseData
|
||||
ld a, [CurSpecies]
|
||||
cp EGG
|
||||
jr z, .egg
|
||||
|
||||
; Get base stats
|
||||
; Get BaseData
|
||||
dec a
|
||||
ld bc, BaseStats1 - BaseStats0
|
||||
ld hl, BaseStats
|
||||
ld bc, BaseData1 - BaseData0
|
||||
ld hl, BaseData
|
||||
call AddNTimes
|
||||
ld de, CurBaseStats
|
||||
ld bc, BaseStats1 - BaseStats0
|
||||
ld de, CurBaseData
|
||||
ld bc, BaseData1 - BaseData0
|
||||
call CopyBytes
|
||||
jr .end
|
||||
|
||||
@ -3549,7 +3549,7 @@ GetBaseStats: ; 3856
|
||||
.end
|
||||
; Replace Pokedex # with species
|
||||
ld a, [CurSpecies]
|
||||
ld [CurBaseStats], a
|
||||
ld [CurBaseData], a
|
||||
|
||||
pop af
|
||||
rst Bankswitch
|
||||
@ -6734,8 +6734,8 @@ LoadEnemyMon: ; 3e8eb
|
||||
ld [CurSpecies], a
|
||||
ld [CurPartySpecies], a
|
||||
|
||||
; Grab the base stats for this species
|
||||
call GetBaseStats
|
||||
; Grab the BaseData for this species
|
||||
call GetBaseData
|
||||
|
||||
|
||||
; Let's get the item:
|
||||
@ -6754,7 +6754,7 @@ LoadEnemyMon: ; 3e8eb
|
||||
|
||||
|
||||
.WildItem
|
||||
; In a wild battle, we pull from the item slots in base stats
|
||||
; In a wild battle, we pull from the item slots in BaseData
|
||||
|
||||
; Force Item1
|
||||
; Used for Ho-Oh, Lugia and Snorlax encounters
|
||||
@ -8963,12 +8963,12 @@ GetGender: ; 50bdd
|
||||
push bc
|
||||
ld a, [CurPartySpecies]
|
||||
dec a
|
||||
ld hl, BaseStats + 13 ; BASE_GENDER
|
||||
ld bc, BaseStats1 - BaseStats
|
||||
ld hl, BaseData + 13 ; BASE_GENDER
|
||||
ld bc, BaseData1 - BaseData
|
||||
call AddNTimes
|
||||
pop bc
|
||||
|
||||
ld a, BANK(BaseStats)
|
||||
ld a, BANK(BaseData)
|
||||
call GetFarByte
|
||||
|
||||
|
||||
@ -9003,7 +9003,7 @@ GetGender: ; 50bdd
|
||||
|
||||
INCBIN "baserom.gbc", $50c50, $51424 - $50c50
|
||||
|
||||
BaseStats:
|
||||
BaseData:
|
||||
INCLUDE "stats/base_stats.asm"
|
||||
|
||||
PokemonNames:
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user