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

Add the Gym Leader checks for battle music.

Browse Source
This commit is contained in:
IIMarckus 2012-09-10 20:15:03 -06:00
parent 047aaff15b
commit 139eecc9b9
1 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
main.asm
View File

@ -5620,6 +5620,7 @@ TrainerClassNames: ; 2c1ef
INCBIN "baserom.gbc",$2C41a,$2ee8f - $2C41a INCBIN "baserom.gbc",$2C41a,$2ee8f - $2C41a
; XXX this is not the start of the routine ; XXX this is not the start of the routine
; determine what music plays in battle
ld a, [$d22f] ; are we fighting a trainer? ld a, [$d22f] ; are we fighting a trainer?
and a and a
jr nz, .trainermusic jr nz, .trainermusic
@ -5638,28 +5639,33 @@ INCBIN "baserom.gbc",$2C41a,$2ee8f - $2C41a
.kantowild .kantowild
ld de, $0008 ; kanto wild battle music ld de, $0008 ; kanto wild battle music
jr .done jr .done
.trainermusic .trainermusic
ld de, $002f ; lance battle music ld de, $002f ; lance battle music
cp CHAMPION cp CHAMPION
jr z, .done jr z, .done
cp RED cp RED
jr z, .done jr z, .done
; really, they should have included admins and scientists here too... ; really, they should have included admins and scientists here too...
ld de, $0031 ; rocket battle music ld de, $0031 ; rocket battle music
cp GRUNTM cp GRUNTM
jr z, .done jr z, .done
cp GRUNTF cp GRUNTF
jr z, .done jr z, .done
ld de, $0006 ; kanto gym leader battle music ld de, $0006 ; kanto gym leader battle music
ld a, $f ld a, BANK(IsKantoGymLeader)
ld hl, $5123 ld hl, IsKantoGymLeader
rst $8 ; XXX check if kanto gym leader rst $8
jr c, .done jr c, .done
ld de, $002e ; johto gym leader battle music ld de, $002e ; johto gym leader battle music
ld a, $f ld a, BANK(IsJohtoGymLeader)
ld hl, $5128 ld hl, IsJohtoGymLeader
rst $8 ; XXX check if johto gym leader / elite four member rst $8
jr c, .done jr c, .done
ld de, $0030 ; rival battle music ld de, $0030 ; rival battle music
ld a, [$d22f] ld a, [$d22f]
cp RIVAL1 cp RIVAL1
@ -10539,7 +10545,62 @@ MysticalmanTrainerGroupHeader: ; 0x3ba4c
SECTION "bankF",DATA,BANK[$F] SECTION "bankF",DATA,BANK[$F]
INCBIN "baserom.gbc",$3C000,$3ddc2 - $3C000 INCBIN "baserom.gbc",$3C000,$3d123 - $3C000
; These functions check if the current opponent is a gym leader or one of a
; few other special trainers.
; Note: KantoGymLeaders is a subset of JohtoGymLeaders. If you wish to
; differentiate between the two, call IsKantoGymLeader first.
; The Lance and Red entries are unused for music checks; those trainers are
; accounted for elsewhere.
IsKantoGymLeader: ; 0x3d123
ld hl, KantoGymLeaders
jr IsGymLeaderCommon
IsJohtoGymLeader: ; 0x3d128
ld hl, JohtoGymLeaders
IsGymLeaderCommon:
push de
ld a, [$d22f]
ld de, $0001
call IsInArray
pop de
ret
; 0x3d137
JohtoGymLeaders:
db FALKNER
db WHITNEY
db BUGSY
db MORTY
db PRYCE
db JASMINE
db CHUCK
db CLAIR
db WILL
db BRUNO
db KAREN
db KOGA
; fallthrough
; these two entries are unused
db CHAMPION
db RED
; fallthrough
KantoGymLeaders:
db BROCK
db MISTY
db LT_SURGE
db ERIKA
db JANINE
db SABRINA
db BLAINE
db BLUE
db $ff
INCBIN "baserom.gbc",$3d14e,$3ddc2 - $3d14e
ld hl, RecoveredUsingText ld hl, RecoveredUsingText
jp $3ad5 jp $3ad5