thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some progress on the Chief fight

Browse source 
Right now I'm facing a weird bug where if you enter, you get the quote, but the fight doesn't start and it happens while you're stepping for some reason. Very odd.
This commit is contained in:
Llinos Evans 2023-04-24 23:22:35 +01:00
parent 59a9bdb62e
commit ca1cc6af90
9 changed files with 186 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/objects/RedsHouse2F.asm
View file

@ -3,7 +3,7 @@ RedsHouse2F_Object:
def_warp_events
warp_event 7, 1, REDS_HOUSE_1F, 3
warp_event 5, 1, SILPH_CO_11F, 1
warp_event 5, 1, SILPH_GAUNTLET_7F, 1
def_bg_events

2
data/maps/objects/SilphGauntlet7F.asm
View file

@ -2,9 +2,11 @@ SilphGauntlet7F_Object:
db $d ; border block
def_warp_events
warp_event 5, 6, SAFFRON_CITY, 1
def_bg_events
def_object_events
object_event 5, 1, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person
def_warps_to SILPH_GAUNTLET_7F

2
data/trainers/parties.asm
View file

@ -489,7 +489,7 @@ BirdKeeperData:
ChiefData:
; New - this will be used in the Silph Gauntlet
db $FF, 73, MAGNEZONE, 72, LAPRAS, 73, SCIZOR, 73, EXEGGUTOR, 75, PORYGON2, 77, OMEGA, 0
db $FF, 73, MAGNEZONE, 72, LAPRAS, 73, SCIZOR, 73, PORYGON2, 75, PORYGONZ, 77, OMEGA, 0
ScientistData:
; Unused - this will be used in the Silph Gauntlet

2
data/trainers/pic_pointers_money.asm
View file

@ -32,7 +32,7 @@ TrainerPicAndMoneyPointers::
pic_money BlackbeltPic, 2500
pic_money Rival1Pic, 3500
pic_money ProfOakPic, 9900
pic_money ChiefPic, 3000
pic_money ChiefPic, 9900
pic_money ScientistPic, 5000
pic_money GiovanniPic, 9900
pic_money RocketPic, 3000