pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28 from iimarckus/battlemusic

Browse Source 
Confirmed: this RAM location represents link battle.
This commit is contained in:
Bryan Bishop 2012-09-10 20:40:19 -07:00
commit f570fb7fb6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.asm
View File

@ -376,9 +376,9 @@ Char5D:
ld de, $c616 ld de, $c616
jr .asm_126a ; 0x1219 $4f jr .asm_126a ; 0x1219 $4f
push de push de
ld a, [$c2dc] ld a, [InLinkBattle]
and a and a
jr nz, .asm_124d ; 0x1220 $2b jr nz, .linkbattle
ld a, [$d233] ld a, [$d233]
cp $9 cp $9
jr z, .asm_1248 ; 0x1227 $1f jr z, .asm_1248 ; 0x1227 $1f
@ -400,7 +400,7 @@ Char5D:
.asm_1248 .asm_1248
ld de, $d493 ld de, $d493
jr .asm_126a ; 0x124b $1d jr .asm_126a ; 0x124b $1d
.asm_124d .linkbattle
ld de, $c656 ld de, $c656
jr .asm_126a ; 0x1250 $18 jr .asm_126a ; 0x1250 $18
push de push de
@ -5697,9 +5697,9 @@ INCBIN "baserom.gbc",$2C41a,$2ee8f - $2C41a
jr .done jr .done
.othertrainer .othertrainer
ld a, [$c2dc] ld a, [InLinkBattle]
and a and a
jr nz, .linkbattle ; XXX link battle? jr nz, .linkbattle
ld a, BANK(RegionCheck) ld a, BANK(RegionCheck)
ld hl, RegionCheck ld hl, RegionCheck
rst $8 rst $8

5
wram.asm
View File

@ -1,3 +1,8 @@
SECTION "linkbattle",BSS[$c2dc]
InLinkBattle: ; 0xc2dc
ds 1 ; nonzero when in a link battle
SECTION "BattleMons",BSS[$c62a] SECTION "BattleMons",BSS[$c62a]
BattleMonSpecies: ; c62a BattleMonSpecies: ; c62a