Ok the fight works now

Issues:
- Player only walks one space for some reason
- After battle text doesn't happen, so no Candy Jar

Otherwise, almost finished.
This commit is contained in:
Llinos Evans 2023-04-25 00:47:19 +01:00
parent ca1cc6af90
commit 2f82c377fe
7 changed files with 153 additions and 37 deletions

View file

@ -346,7 +346,7 @@ BirdKeeperPic:: INCBIN "gfx/trainers/birdkeeper.pic"
BlackbeltPic:: INCBIN "gfx/trainers/blackbelt.pic"
Rival1Pic:: INCBIN "gfx/trainers/rival1.pic"
ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic"
ChiefPic::
ChiefPic:: INCBIN "gfx/trainers/chief.pic"
ScientistPic:: INCBIN "gfx/trainers/scientist.pic"
GiovanniPic:: INCBIN "gfx/trainers/giovanni.pic"
RocketPic:: INCBIN "gfx/trainers/rocket.pic"
@ -366,7 +366,6 @@ Rival3Pic:: INCBIN "gfx/trainers/rival3.pic"
LoreleiPic:: INCBIN "gfx/trainers/lorelei.pic"
ChannelerPic:: INCBIN "gfx/trainers/channeler.pic"
AgathaPic:: INCBIN "gfx/trainers/agatha.pic"
LancePic:: INCBIN "gfx/trainers/lance.pic"
SECTION "Pics 7", ROMX
@ -588,6 +587,7 @@ TaurosPAPicBack:: INCBIN "gfx/pokemon/back/taurospaquab.pic"
TaurosPBPicFront:: INCBIN "gfx/pokemon/front/taurospblaze.pic"
TaurosPBPicBack:: INCBIN "gfx/pokemon/back/taurospblazeb.pic"
LancePic:: INCBIN "gfx/trainers/lance.pic"
YujirouPic:: INCBIN "gfx/trainers/yujirou.pic"
StudentPic:: INCBIN "gfx/trainers/student.pic"
FirefighterPic:: INCBIN "gfx/trainers/firefighter.pic"