Move radio code to its own file

This commit is contained in:
PikalaxALT
2015-07-21 01:52:46 -04:00
parent 5631bdc0d7
commit d5ddd9e54e
7 changed files with 2129 additions and 2128 deletions

View File

@@ -4360,7 +4360,7 @@ Function3dc5b: ; 3dc5b
jr z, .asm_3dcc0 jr z, .asm_3dcc0
ld a, [wc71a] ld a, [wc71a]
call Function399f call UpdateBattleMon
ld hl, BattleMonHP ld hl, BattleMonHP
ld a, [hli] ld a, [hli]
or [hl] or [hl]

View File

@@ -485,6 +485,6 @@ ForceMapMusic: ; 15587
ld a, $88 ld a, $88
ld [MusicFade], a ld [MusicFade], a
.notbiking .notbiking
call Function3d2f call TryRestartMapMusic
ret ret
; 1559a ; 1559a

2115
engine/radio.asm Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -420,7 +420,7 @@ EnterMapMusic:: ; 3d03
ret ret
; 3d2f ; 3d2f
Function3d2f:: ; 3d2f TryRestartMapMusic:: ; 3d2f
ld a, [wc2c1] ld a, [wc2c1]
and a and a
jr z, RestartMapMusic jr z, RestartMapMusic

View File

@@ -91,7 +91,7 @@ UpdateBattleMonInParty:: ; 399c
ld a, [CurBattleMon] ld a, [CurBattleMon]
Function399f:: ; 399f UpdateBattleMon:: ; 399f
ld hl, PartyMon1Level ld hl, PartyMon1Level
call GetPartyLocation call GetPartyLocation
@@ -262,7 +262,7 @@ endr
; 3a90 ; 3a90
Function3a90:: ; 3a90 FarJumpText:: ; 3a90
inc hl inc hl
ld a, [hROMBank] ld a, [hROMBank]
push af push af

View File

@@ -56,7 +56,7 @@ Functiondfd:: ; dfd
ld a, b ld a, b
rst Bankswitch rst Bankswitch
.asm_e09 .loop
ld a, d ld a, d
ld [rHDMA1], a ld [rHDMA1], a
ld a, e ld a, e
@@ -70,27 +70,27 @@ Functiondfd:: ; dfd
ld [rHDMA4], a ld [rHDMA4], a
ld a, c ld a, c
cp $8 cp $8
jr c, .asm_e3c jr c, .done
sub $8 sub $8
ld c, a ld c, a
ld a, $f ld a, $f
ld [hDMATransfer], a ld [hDMATransfer], a
call DelayFrame call DelayFrame
ld a, l ld a, l
add $0 add 0
ld l, a ld l, a
ld a, h ld a, h
adc $1 adc 1
ld h, a ld h, a
ld a, e ld a, e
add $0 add 0
ld e, a ld e, a
ld a, d ld a, d
adc $1 adc 1
ld d, a ld d, a
jr .asm_e09 jr .loop
.asm_e3c .done
ld a, c ld a, c
and $7f and $7f
ld [hDMATransfer], a ld [hDMATransfer], a

2116
main.asm

File diff suppressed because it is too large Load Diff