Pokemon data, Gym Leader teams, palette updates and a couple of other fixes

This commit is contained in:
MementoMartha 2022-08-31 11:47:05 +01:00
parent ac45c8b5bc
commit f5a7cc9ffc
14 changed files with 221 additions and 201 deletions

View file

@ -119,10 +119,10 @@ DisplayTitleScreen:
call EnableLCD
IF DEF(_RED)
ld a, STARTER1 ; which Pokemon to show first on the title screen
ld a, CHARIZARD ; which Pokemon to show first on the title screen
ENDC
IF DEF(_BLUE)
ld a, STARTER2 ; which Pokemon to show first on the title screen
ld a, TOTARTLE ; which Pokemon to show first on the title screen
ENDC
ld [wTitleMonSpecies], a
call LoadTitleMonSprite

View file

@ -90,11 +90,11 @@ TitleBallYTable:
TitleScreenAnimateBallIfStarterOut:
; Animate the TitleBall if a starter just got scrolled out.
ld a, [wTitleMonSpecies]
cp STARTER1
cp VENUSAUR
jr z, .ok
cp STARTER2
cp CHARIZARD
jr z, .ok
cp STARTER3
cp TOTARTLE
ret nz
.ok
ld e, 1 ; animate titleball