mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-01-23 09:16:20 -08:00
Merge pull request #411 from roukaour/master
Clean up more labels, constants, and file names
This commit is contained in:
yenatch
GitHub
commit
f6942b9a13
15
Makefile
15
Makefile
@ -197,17 +197,16 @@ gfx/trainer_card/kris_card.2bpp: rgbgfx += -h
|
||||
|
||||
gfx/battle/dude.2bpp: rgbgfx += -h
|
||||
|
||||
gfx/misc/unknown_egg.2bpp: rgbgfx += -h
|
||||
|
||||
gfx/pokegear/pokegear.2bpp: rgbgfx += -x2
|
||||
gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
|
||||
|
||||
gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace
|
||||
gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip
|
||||
gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace
|
||||
gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace
|
||||
gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip
|
||||
gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace
|
||||
gfx/unknown/ascii_font.2bpp: tools/gfx += --trim-whitespace
|
||||
gfx/unknown/bold_font.1bpp: tools/gfx += --trim-whitespace
|
||||
gfx/unknown/egg_animated.2bpp: tools/gfx += --trim-whitespace
|
||||
gfx/unknown/egg_animated_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip
|
||||
gfx/unknown/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip
|
||||
gfx/unknown/pichu_animated.2bpp: tools/gfx += --trim-whitespace
|
||||
gfx/unknown/unknown_egg.2bpp: rgbgfx += -h
|
||||
|
||||
|
||||
%.bin: ;
|
||||
|
||||
11
audio.asm
11
audio.asm
@ -4,19 +4,10 @@ INCLUDE "includes.asm"
|
||||
SECTION "Audio", ROMX
|
||||
|
||||
INCLUDE "audio/engine.asm"
|
||||
|
||||
; What music plays when a trainer notices you
|
||||
INCLUDE "audio/trainer_encounters.asm"
|
||||
|
||||
Music:
|
||||
INCLUDE "trainers/encounter_music.asm"
|
||||
INCLUDE "audio/music_pointers.asm"
|
||||
|
||||
INCLUDE "audio/music/nothing.asm"
|
||||
|
||||
Cries:
|
||||
INCLUDE "audio/cry_pointers.asm"
|
||||
|
||||
SFX:
|
||||
INCLUDE "audio/sfx_pointers.asm"
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; e91b0
|
||||
Cries: ; e91b0
|
||||
dba Cry_Nidoran_M
|
||||
dba Cry_Nidoran_F
|
||||
dba Cry_Slowpoke
|
||||
|
||||
301
audio/drumkits.asm
Normal file
301
audio/drumkits.asm
Normal file
@ -0,0 +1,301 @@
|
||||
Drumkits: ; e8e52
|
||||
dw Drumkit0
|
||||
dw Drumkit1
|
||||
dw Drumkit2
|
||||
dw Drumkit3
|
||||
dw Drumkit4
|
||||
dw Drumkit5
|
||||
; e8e5e
|
||||
|
||||
Drumkit0: ; e8e5e
|
||||
dw Drum00 ; rest
|
||||
dw Snare1 ; c
|
||||
dw Snare2 ; c#
|
||||
dw Snare3 ; d
|
||||
dw Snare4 ; d#
|
||||
dw Drum05 ; e
|
||||
dw Triangle1 ; f
|
||||
dw Triangle2 ; f#
|
||||
dw HiHat1 ; g
|
||||
dw Snare5 ; g#
|
||||
dw Snare6 ; a
|
||||
dw Snare7 ; a#
|
||||
dw HiHat2 ; b
|
||||
Drumkit1: ; e8e78
|
||||
dw Drum00
|
||||
dw HiHat1
|
||||
dw Snare5
|
||||
dw Snare6
|
||||
dw Snare7
|
||||
dw HiHat2
|
||||
dw HiHat3
|
||||
dw Snare8
|
||||
dw Triangle3
|
||||
dw Triangle4
|
||||
dw Snare9
|
||||
dw Snare10
|
||||
dw Snare11
|
||||
Drumkit2: ; e8e92
|
||||
dw Drum00
|
||||
dw Snare1
|
||||
dw Snare9
|
||||
dw Snare10
|
||||
dw Snare11
|
||||
dw Drum05
|
||||
dw Triangle1
|
||||
dw Triangle2
|
||||
dw HiHat1
|
||||
dw Snare5
|
||||
dw Snare6
|
||||
dw Snare7
|
||||
dw HiHat2
|
||||
Drumkit3: ; e8eac
|
||||
dw Drum21
|
||||
dw Snare12
|
||||
dw Snare13
|
||||
dw Snare14
|
||||
dw Kick1
|
||||
dw Triangle5
|
||||
dw Drum20
|
||||
dw Drum27
|
||||
dw Drum28
|
||||
dw Drum29
|
||||
dw Drum21
|
||||
dw Kick2
|
||||
dw Crash2
|
||||
Drumkit4: ; e8ec6
|
||||
dw Drum21
|
||||
dw Drum20
|
||||
dw Snare13
|
||||
dw Snare14
|
||||
dw Kick1
|
||||
dw Drum33
|
||||
dw Triangle5
|
||||
dw Drum35
|
||||
dw Drum31
|
||||
dw Drum32
|
||||
dw Drum36
|
||||
dw Kick2
|
||||
dw Crash1
|
||||
Drumkit5: ; e8ee0
|
||||
dw Drum00
|
||||
dw Snare9
|
||||
dw Snare10
|
||||
dw Snare11
|
||||
dw Drum27
|
||||
dw Drum28
|
||||
dw Drum29
|
||||
dw Drum05
|
||||
dw Triangle1
|
||||
dw Crash1
|
||||
dw Snare14
|
||||
dw Snare13
|
||||
dw Kick2
|
||||
; e8efa
|
||||
|
||||
Drum00: ; e8efa
|
||||
; unused
|
||||
noise C#, 1, $11, $00
|
||||
endchannel
|
||||
; e8efe
|
||||
|
||||
Snare1: ; e8efe
|
||||
noise C#, 1, $c1, $33
|
||||
endchannel
|
||||
; e8f02
|
||||
|
||||
Snare2: ; e8f02
|
||||
noise C#, 1, $b1, $33
|
||||
endchannel
|
||||
; e8f06
|
||||
|
||||
Snare3: ; e8f06
|
||||
noise C#, 1, $a1, $33
|
||||
endchannel
|
||||
; e8f0a
|
||||
|
||||
Snare4: ; e8f0a
|
||||
noise C#, 1, $81, $33
|
||||
endchannel
|
||||
; e8f0e
|
||||
|
||||
Drum05: ; e8f0e
|
||||
noise C#, 8, $84, $37
|
||||
noise C#, 7, $84, $36
|
||||
noise C#, 6, $83, $35
|
||||
noise C#, 5, $83, $34
|
||||
noise C#, 4, $82, $33
|
||||
noise C#, 3, $81, $32
|
||||
endchannel
|
||||
; e8f21
|
||||
|
||||
Triangle1: ; e8f21
|
||||
noise C#, 1, $51, $2a
|
||||
endchannel
|
||||
; e8f25
|
||||
|
||||
Triangle2: ; e8f25
|
||||
noise C#, 2, $41, $2b
|
||||
noise C#, 1, $61, $2a
|
||||
endchannel
|
||||
; e8f2c
|
||||
|
||||
HiHat1: ; e8f2c
|
||||
noise C#, 1, $81, $10
|
||||
endchannel
|
||||
; e8f30
|
||||
|
||||
Snare5: ; e8f30
|
||||
noise C#, 1, $82, $23
|
||||
endchannel
|
||||
; e8f34
|
||||
|
||||
Snare6: ; e8f34
|
||||
noise C#, 1, $82, $25
|
||||
endchannel
|
||||
; e8f38
|
||||
|
||||
Snare7: ; e8f38
|
||||
noise C#, 1, $82, $26
|
||||
endchannel
|
||||
; e8f3c
|
||||
|
||||
HiHat2: ; e8f3c
|
||||
noise C#, 1, $a1, $10
|
||||
endchannel
|
||||
; e8f40
|
||||
|
||||
HiHat3: ; e8f40
|
||||
noise C#, 1, $a2, $11
|
||||
endchannel
|
||||
; e8f44
|
||||
|
||||
Snare8: ; e8f44
|
||||
noise C#, 1, $a2, $50
|
||||
endchannel
|
||||
; e8f48
|
||||
|
||||
Triangle3: ; e8f48
|
||||
noise C#, 1, $a1, $18
|
||||
noise C#, 1, $31, $33
|
||||
endchannel
|
||||
; e8f4f
|
||||
|
||||
Triangle4: ; e8f4f
|
||||
noise C#, 3, $91, $28
|
||||
noise C#, 1, $71, $18
|
||||
endchannel
|
||||
; e8f56
|
||||
|
||||
Snare9: ; e8f56
|
||||
noise C#, 1, $91, $22
|
||||
endchannel
|
||||
; e8f5a
|
||||
|
||||
Snare10: ; e8f5a
|
||||
noise C#, 1, $71, $22
|
||||
endchannel
|
||||
; e8f5e
|
||||
|
||||
Snare11: ; e8f5e
|
||||
noise C#, 1, $61, $22
|
||||
endchannel
|
||||
; e8f62
|
||||
|
||||
Drum20: ; e8f62
|
||||
noise C#, 1, $11, $11
|
||||
endchannel
|
||||
; e8f66
|
||||
|
||||
Drum21: ; e8f66
|
||||
endchannel
|
||||
; e8f67
|
||||
|
||||
Snare12: ; e8f67
|
||||
noise C#, 1, $91, $33
|
||||
endchannel
|
||||
; e8f6b
|
||||
|
||||
Snare13: ; e8f6b
|
||||
noise C#, 1, $51, $32
|
||||
endchannel
|
||||
; e8f6f
|
||||
|
||||
Snare14: ; e8f6f
|
||||
noise C#, 1, $81, $31
|
||||
endchannel
|
||||
; e8f73
|
||||
|
||||
Kick1: ; e8f73
|
||||
noise C#, 1, $88, $6b
|
||||
noise C#, 1, $71, $00
|
||||
endchannel
|
||||
; e8f7a
|
||||
|
||||
Triangle5: ; e8f7a
|
||||
noise D_, 1, $91, $18
|
||||
endchannel
|
||||
; e8f7e
|
||||
|
||||
Drum27: ; e8f7e
|
||||
noise C#, 8, $92, $10
|
||||
endchannel
|
||||
; e8f82
|
||||
|
||||
Drum28: ; e8f82
|
||||
noise D_, 4, $91, $00
|
||||
noise D_, 4, $11, $00
|
||||
endchannel
|
||||
; e8f89
|
||||
|
||||
Drum29: ; e8f89
|
||||
noise D_, 4, $91, $11
|
||||
noise D_, 4, $11, $00
|
||||
endchannel
|
||||
; e8f90
|
||||
|
||||
Crash1: ; e8f90
|
||||
noise D_, 4, $88, $15
|
||||
noise C#, 1, $65, $12
|
||||
endchannel
|
||||
; e8f97
|
||||
|
||||
Drum31: ; e8f97
|
||||
noise D_, 4, $51, $21
|
||||
noise D_, 4, $11, $11
|
||||
endchannel
|
||||
; e8f9e
|
||||
|
||||
Drum32: ; e8f9e
|
||||
noise D_, 4, $51, $50
|
||||
noise D_, 4, $11, $11
|
||||
endchannel
|
||||
; e8fa5
|
||||
|
||||
Drum33: ; e8fa5
|
||||
noise C#, 1, $a1, $31
|
||||
endchannel
|
||||
; e8fa9
|
||||
|
||||
Crash2: ; e8fa9
|
||||
noise C#, 1, $84, $12
|
||||
endchannel
|
||||
; e8fad
|
||||
|
||||
Drum35: ; e8fad
|
||||
noise D_, 4, $81, $00
|
||||
noise D_, 4, $11, $00
|
||||
endchannel
|
||||
; e8fb4
|
||||
|
||||
Drum36: ; e8fb4
|
||||
noise D_, 4, $81, $21
|
||||
noise D_, 4, $11, $11
|
||||
endchannel
|
||||
; e8fbb
|
||||
|
||||
Kick2: ; e8fbb
|
||||
noise C#, 1, $a8, $6b
|
||||
noise C#, 1, $71, $00
|
||||
endchannel
|
||||
; e8fc2
|
||||
364
audio/engine.asm
364
audio/engine.asm
@ -2882,350 +2882,13 @@ LoadMusicByte:: ; e8d76
|
||||
|
||||
; e8d80
|
||||
|
||||
FrequencyTable: ; e8d80
|
||||
dw 0 ; __
|
||||
dw $f82c ; C_
|
||||
dw $f89d ; C#
|
||||
dw $f907 ; D_
|
||||
dw $f96b ; D#
|
||||
dw $f9ca ; E_
|
||||
dw $fa23 ; F_
|
||||
dw $fa77 ; F#
|
||||
dw $fac7 ; G_
|
||||
dw $fb12 ; G#
|
||||
dw $fb58 ; A_
|
||||
dw $fb9b ; A#
|
||||
dw $fbda ; B_
|
||||
dw $fc16 ; C_
|
||||
dw $fc4e ; C#
|
||||
dw $fc83 ; D_
|
||||
dw $fcb5 ; D#
|
||||
dw $fce5 ; E_
|
||||
dw $fd11 ; F_
|
||||
dw $fd3b ; F#
|
||||
dw $fd63 ; G_
|
||||
dw $fd89 ; G#
|
||||
dw $fdac ; A_
|
||||
dw $fdcd ; A#
|
||||
dw $fded ; B_
|
||||
; e8db2
|
||||
|
||||
WaveSamples: ; e8db2
|
||||
; these are streams of 32 4-bit values used as wavepatterns
|
||||
; nothing interesting here!
|
||||
dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1
|
||||
dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1
|
||||
dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1
|
||||
dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
|
||||
dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0
|
||||
dn 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1, 15, 15, 14, 14, 12, 12, 10, 10, 8, 8, 10, 10, 12, 12, 14, 14
|
||||
dn 0, 2, 4, 6, 8, 10, 12, 14, 12, 11, 10, 9, 8, 7, 6, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 1, 1
|
||||
dn 12, 0, 10, 9, 8, 7, 15, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 15, 1, 0, 2, 4, 6, 8, 10, 12, 14
|
||||
dn 4, 4, 3, 3, 2, 2, 1, 15, 0, 0, 4, 6, 8, 10, 12, 14, 15, 8, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5
|
||||
dn 1, 1, 0, 0, 0, 0, 0, 8, 0, 0, 1, 3, 5, 7, 9, 10, 11, 4, 11, 10, 10, 9, 9, 8, 8, 7, 6, 5, 4, 3, 2, 1
|
||||
; e8e52
|
||||
INCLUDE "data/audio/notes.asm"
|
||||
|
||||
Drumkits: ; e8e52
|
||||
dw Drumkit0
|
||||
dw Drumkit1
|
||||
dw Drumkit2
|
||||
dw Drumkit3
|
||||
dw Drumkit4
|
||||
dw Drumkit5
|
||||
; e8e5e
|
||||
INCLUDE "data/audio/wave_samples.asm"
|
||||
|
||||
Drumkit0: ; e8e5e
|
||||
dw Drum00 ; rest
|
||||
dw Snare1 ; c
|
||||
dw Snare2 ; c#
|
||||
dw Snare3 ; d
|
||||
dw Snare4 ; d#
|
||||
dw Drum05 ; e
|
||||
dw Triangle1 ; f
|
||||
dw Triangle2 ; f#
|
||||
dw HiHat1 ; g
|
||||
dw Snare5 ; g#
|
||||
dw Snare6 ; a
|
||||
dw Snare7 ; a#
|
||||
dw HiHat2 ; b
|
||||
Drumkit1: ; e8e78
|
||||
dw Drum00
|
||||
dw HiHat1
|
||||
dw Snare5
|
||||
dw Snare6
|
||||
dw Snare7
|
||||
dw HiHat2
|
||||
dw HiHat3
|
||||
dw Snare8
|
||||
dw Triangle3
|
||||
dw Triangle4
|
||||
dw Snare9
|
||||
dw Snare10
|
||||
dw Snare11
|
||||
Drumkit2: ; e8e92
|
||||
dw Drum00
|
||||
dw Snare1
|
||||
dw Snare9
|
||||
dw Snare10
|
||||
dw Snare11
|
||||
dw Drum05
|
||||
dw Triangle1
|
||||
dw Triangle2
|
||||
dw HiHat1
|
||||
dw Snare5
|
||||
dw Snare6
|
||||
dw Snare7
|
||||
dw HiHat2
|
||||
Drumkit3: ; e8eac
|
||||
dw Drum21
|
||||
dw Snare12
|
||||
dw Snare13
|
||||
dw Snare14
|
||||
dw Kick1
|
||||
dw Triangle5
|
||||
dw Drum20
|
||||
dw Drum27
|
||||
dw Drum28
|
||||
dw Drum29
|
||||
dw Drum21
|
||||
dw Kick2
|
||||
dw Crash2
|
||||
Drumkit4: ; e8ec6
|
||||
dw Drum21
|
||||
dw Drum20
|
||||
dw Snare13
|
||||
dw Snare14
|
||||
dw Kick1
|
||||
dw Drum33
|
||||
dw Triangle5
|
||||
dw Drum35
|
||||
dw Drum31
|
||||
dw Drum32
|
||||
dw Drum36
|
||||
dw Kick2
|
||||
dw Crash1
|
||||
Drumkit5: ; e8ee0
|
||||
dw Drum00
|
||||
dw Snare9
|
||||
dw Snare10
|
||||
dw Snare11
|
||||
dw Drum27
|
||||
dw Drum28
|
||||
dw Drum29
|
||||
dw Drum05
|
||||
dw Triangle1
|
||||
dw Crash1
|
||||
dw Snare14
|
||||
dw Snare13
|
||||
dw Kick2
|
||||
; e8efa
|
||||
INCLUDE "audio/drumkits.asm"
|
||||
|
||||
Drum00: ; e8efa
|
||||
; unused
|
||||
noise C#, 1, $11, $00
|
||||
endchannel
|
||||
; e8efe
|
||||
|
||||
Snare1: ; e8efe
|
||||
noise C#, 1, $c1, $33
|
||||
endchannel
|
||||
; e8f02
|
||||
|
||||
Snare2: ; e8f02
|
||||
noise C#, 1, $b1, $33
|
||||
endchannel
|
||||
; e8f06
|
||||
|
||||
Snare3: ; e8f06
|
||||
noise C#, 1, $a1, $33
|
||||
endchannel
|
||||
; e8f0a
|
||||
|
||||
Snare4: ; e8f0a
|
||||
noise C#, 1, $81, $33
|
||||
endchannel
|
||||
; e8f0e
|
||||
|
||||
Drum05: ; e8f0e
|
||||
noise C#, 8, $84, $37
|
||||
noise C#, 7, $84, $36
|
||||
noise C#, 6, $83, $35
|
||||
noise C#, 5, $83, $34
|
||||
noise C#, 4, $82, $33
|
||||
noise C#, 3, $81, $32
|
||||
endchannel
|
||||
; e8f21
|
||||
|
||||
Triangle1: ; e8f21
|
||||
noise C#, 1, $51, $2a
|
||||
endchannel
|
||||
; e8f25
|
||||
|
||||
Triangle2: ; e8f25
|
||||
noise C#, 2, $41, $2b
|
||||
noise C#, 1, $61, $2a
|
||||
endchannel
|
||||
; e8f2c
|
||||
|
||||
HiHat1: ; e8f2c
|
||||
noise C#, 1, $81, $10
|
||||
endchannel
|
||||
; e8f30
|
||||
|
||||
Snare5: ; e8f30
|
||||
noise C#, 1, $82, $23
|
||||
endchannel
|
||||
; e8f34
|
||||
|
||||
Snare6: ; e8f34
|
||||
noise C#, 1, $82, $25
|
||||
endchannel
|
||||
; e8f38
|
||||
|
||||
Snare7: ; e8f38
|
||||
noise C#, 1, $82, $26
|
||||
endchannel
|
||||
; e8f3c
|
||||
|
||||
HiHat2: ; e8f3c
|
||||
noise C#, 1, $a1, $10
|
||||
endchannel
|
||||
; e8f40
|
||||
|
||||
HiHat3: ; e8f40
|
||||
noise C#, 1, $a2, $11
|
||||
endchannel
|
||||
; e8f44
|
||||
|
||||
Snare8: ; e8f44
|
||||
noise C#, 1, $a2, $50
|
||||
endchannel
|
||||
; e8f48
|
||||
|
||||
Triangle3: ; e8f48
|
||||
noise C#, 1, $a1, $18
|
||||
noise C#, 1, $31, $33
|
||||
endchannel
|
||||
; e8f4f
|
||||
|
||||
Triangle4: ; e8f4f
|
||||
noise C#, 3, $91, $28
|
||||
noise C#, 1, $71, $18
|
||||
endchannel
|
||||
; e8f56
|
||||
|
||||
Snare9: ; e8f56
|
||||
noise C#, 1, $91, $22
|
||||
endchannel
|
||||
; e8f5a
|
||||
|
||||
Snare10: ; e8f5a
|
||||
noise C#, 1, $71, $22
|
||||
endchannel
|
||||
; e8f5e
|
||||
|
||||
Snare11: ; e8f5e
|
||||
noise C#, 1, $61, $22
|
||||
endchannel
|
||||
; e8f62
|
||||
|
||||
Drum20: ; e8f62
|
||||
noise C#, 1, $11, $11
|
||||
endchannel
|
||||
; e8f66
|
||||
|
||||
Drum21: ; e8f66
|
||||
endchannel
|
||||
; e8f67
|
||||
|
||||
Snare12: ; e8f67
|
||||
noise C#, 1, $91, $33
|
||||
endchannel
|
||||
; e8f6b
|
||||
|
||||
Snare13: ; e8f6b
|
||||
noise C#, 1, $51, $32
|
||||
endchannel
|
||||
; e8f6f
|
||||
|
||||
Snare14: ; e8f6f
|
||||
noise C#, 1, $81, $31
|
||||
endchannel
|
||||
; e8f73
|
||||
|
||||
Kick1: ; e8f73
|
||||
noise C#, 1, $88, $6b
|
||||
noise C#, 1, $71, $00
|
||||
endchannel
|
||||
; e8f7a
|
||||
|
||||
Triangle5: ; e8f7a
|
||||
noise D_, 1, $91, $18
|
||||
endchannel
|
||||
; e8f7e
|
||||
|
||||
Drum27: ; e8f7e
|
||||
noise C#, 8, $92, $10
|
||||
endchannel
|
||||
; e8f82
|
||||
|
||||
Drum28: ; e8f82
|
||||
noise D_, 4, $91, $00
|
||||
noise D_, 4, $11, $00
|
||||
endchannel
|
||||
; e8f89
|
||||
|
||||
Drum29: ; e8f89
|
||||
noise D_, 4, $91, $11
|
||||
noise D_, 4, $11, $00
|
||||
endchannel
|
||||
; e8f90
|
||||
|
||||
Crash1: ; e8f90
|
||||
noise D_, 4, $88, $15
|
||||
noise C#, 1, $65, $12
|
||||
endchannel
|
||||
; e8f97
|
||||
|
||||
Drum31: ; e8f97
|
||||
noise D_, 4, $51, $21
|
||||
noise D_, 4, $11, $11
|
||||
endchannel
|
||||
; e8f9e
|
||||
|
||||
Drum32: ; e8f9e
|
||||
noise D_, 4, $51, $50
|
||||
noise D_, 4, $11, $11
|
||||
endchannel
|
||||
; e8fa5
|
||||
|
||||
Drum33: ; e8fa5
|
||||
noise C#, 1, $a1, $31
|
||||
endchannel
|
||||
; e8fa9
|
||||
|
||||
Crash2: ; e8fa9
|
||||
noise C#, 1, $84, $12
|
||||
endchannel
|
||||
; e8fad
|
||||
|
||||
Drum35: ; e8fad
|
||||
noise D_, 4, $81, $00
|
||||
noise D_, 4, $11, $00
|
||||
endchannel
|
||||
; e8fb4
|
||||
|
||||
Drum36: ; e8fb4
|
||||
noise D_, 4, $81, $21
|
||||
noise D_, 4, $11, $11
|
||||
endchannel
|
||||
; e8fbb
|
||||
|
||||
Kick2: ; e8fbb
|
||||
noise C#, 1, $a8, $6b
|
||||
noise C#, 1, $71, $00
|
||||
endchannel
|
||||
; e8fc2
|
||||
|
||||
GetLRTracks: ; e8fc2
|
||||
; gets the default sound l/r channels
|
||||
@ -3306,3 +2969,24 @@ ClearChannel: ; e8ffe
|
||||
ret
|
||||
|
||||
; e900a
|
||||
|
||||
PlayTrainerEncounterMusic:: ; e900a
|
||||
; input: e = trainer type
|
||||
; turn fade off
|
||||
xor a
|
||||
ld [MusicFade], a
|
||||
; play nothing for one frame
|
||||
push de
|
||||
ld de, 0 ; id: Music_Nothing
|
||||
call PlayMusic
|
||||
call DelayFrame
|
||||
; play new song
|
||||
call MaxVolume
|
||||
pop de
|
||||
ld d, $00
|
||||
ld hl, TrainerEncounterMusic
|
||||
add hl, de
|
||||
ld e, [hl]
|
||||
call PlayMusic
|
||||
ret
|
||||
; e9027
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
; See song sections in audio.asm.
|
||||
|
||||
; e906e
|
||||
Music: ; e906e
|
||||
; entries correspond to MUSIC_* constants
|
||||
|
||||
dba Music_Nothing ; 0xe91a3
|
||||
dba Music_TitleScreen ; 0xeb808
|
||||
dba Music_Route1 ; 0xec000
|
||||
|
||||
@ -1211,16 +1211,16 @@ Sfx_3RdPlace_Ch7: ; f0e56
|
||||
|
||||
togglesfx
|
||||
|
||||
Sfx_GetEggFromDaycareLady: ; f0e66
|
||||
Sfx_GetEggFromDaycareMan: ; f0e66
|
||||
musicheader 4, 5, Sfx_GetEggFromDaycareLady_Ch5
|
||||
musicheader 1, 6, Sfx_GetEggFromDaycareLady_Ch6
|
||||
musicheader 1, 7, Sfx_GetEggFromDaycareLady_Ch7
|
||||
musicheader 1, 8, Sfx_GetEggFromDaycareLady_Ch8
|
||||
Sfx_GetEggFromDayCareLady: ; f0e66
|
||||
Sfx_GetEggFromDayCareMan: ; f0e66
|
||||
musicheader 4, 5, Sfx_GetEggFromDayCareLady_Ch5
|
||||
musicheader 1, 6, Sfx_GetEggFromDayCareLady_Ch6
|
||||
musicheader 1, 7, Sfx_GetEggFromDayCareLady_Ch7
|
||||
musicheader 1, 8, Sfx_GetEggFromDayCareLady_Ch8
|
||||
; f0e72
|
||||
|
||||
Sfx_GetEggFromDaycareLady_Ch5: ; f0e72
|
||||
Sfx_GetEggFromDaycareMan_Ch5: ; f0e72
|
||||
Sfx_GetEggFromDayCareLady_Ch5: ; f0e72
|
||||
Sfx_GetEggFromDayCareMan_Ch5: ; f0e72
|
||||
togglesfx
|
||||
tempo 120
|
||||
volume $77
|
||||
@ -1253,8 +1253,8 @@ Sfx_GetEggFromDaycareMan_Ch5: ; f0e72
|
||||
|
||||
togglesfx
|
||||
|
||||
Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b
|
||||
Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b
|
||||
Sfx_GetEggFromDayCareLady_Ch6: ; f0e9b
|
||||
Sfx_GetEggFromDayCareMan_Ch6: ; f0e9b
|
||||
togglesfx
|
||||
vibrato $12, $34
|
||||
dutycycle $3
|
||||
@ -1284,8 +1284,8 @@ Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b
|
||||
|
||||
togglesfx
|
||||
|
||||
Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe
|
||||
Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe
|
||||
Sfx_GetEggFromDayCareLady_Ch7: ; f0ebe
|
||||
Sfx_GetEggFromDayCareMan_Ch7: ; f0ebe
|
||||
togglesfx
|
||||
notetype $8, $25
|
||||
note __, 2
|
||||
@ -1305,8 +1305,8 @@ Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe
|
||||
|
||||
togglesfx
|
||||
|
||||
Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0
|
||||
Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0
|
||||
Sfx_GetEggFromDayCareLady_Ch8: ; f0ed0
|
||||
Sfx_GetEggFromDayCareMan_Ch8: ; f0ed0
|
||||
togglesfx
|
||||
sfxtogglenoise $4
|
||||
notetype $8
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
; e927c
|
||||
SFX: ; e927c
|
||||
; entries correspond to SFX_* constants
|
||||
|
||||
dba Sfx_DexFanfare5079
|
||||
dba Sfx_Item
|
||||
dba Sfx_CaughtMon
|
||||
@ -148,8 +150,8 @@
|
||||
dba Sfx_Fanfare2
|
||||
dba Sfx_RegisterPhoneNumber
|
||||
dba Sfx_3RdPlace
|
||||
dba Sfx_GetEggFromDaycareMan
|
||||
dba Sfx_GetEggFromDaycareLady
|
||||
dba Sfx_GetEggFromDayCareMan
|
||||
dba Sfx_GetEggFromDayCareLady
|
||||
dba Sfx_MoveDeleted
|
||||
dba Sfx_2ndPlace
|
||||
dba Sfx_1stPlace
|
||||
|
||||
@ -1,96 +0,0 @@
|
||||
; Currently, must be in the same bank as the sound engine.
|
||||
|
||||
PlayTrainerEncounterMusic:: ; e900a
|
||||
; input: e = trainer type
|
||||
; turn fade off
|
||||
xor a
|
||||
ld [MusicFade], a
|
||||
; play nothing for one frame
|
||||
push de
|
||||
ld de, 0 ; id: Music_Nothing
|
||||
call PlayMusic
|
||||
call DelayFrame
|
||||
; play new song
|
||||
call MaxVolume
|
||||
pop de
|
||||
ld d, $00
|
||||
ld hl, TrainerEncounterMusic
|
||||
add hl, de
|
||||
ld e, [hl]
|
||||
call PlayMusic
|
||||
ret
|
||||
; e9027
|
||||
|
||||
TrainerEncounterMusic: ; e9027
|
||||
db MUSIC_HIKER_ENCOUNTER
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; falkner
|
||||
db MUSIC_LASS_ENCOUNTER ; whitney
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; bugsy
|
||||
db MUSIC_OFFICER_ENCOUNTER ; morty
|
||||
db MUSIC_OFFICER_ENCOUNTER ; pryce
|
||||
db MUSIC_LASS_ENCOUNTER ; jasmine
|
||||
db MUSIC_OFFICER_ENCOUNTER ; chuck
|
||||
db MUSIC_BEAUTY_ENCOUNTER ; clair
|
||||
db MUSIC_RIVAL_ENCOUNTER ; rival1
|
||||
db MUSIC_HIKER_ENCOUNTER ; pokemon_prof
|
||||
db MUSIC_HIKER_ENCOUNTER ; will
|
||||
db MUSIC_HIKER_ENCOUNTER ; cal
|
||||
db MUSIC_OFFICER_ENCOUNTER ; bruno
|
||||
db MUSIC_HIKER_ENCOUNTER ; karen
|
||||
db MUSIC_HIKER_ENCOUNTER ; koga
|
||||
db MUSIC_OFFICER_ENCOUNTER ; champion
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; brock
|
||||
db MUSIC_LASS_ENCOUNTER ; misty
|
||||
db MUSIC_OFFICER_ENCOUNTER ; lt_surge
|
||||
db MUSIC_ROCKET_ENCOUNTER ; scientist
|
||||
db MUSIC_OFFICER_ENCOUNTER ; erika
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; youngster
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; schoolboy
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; bird_keeper
|
||||
db MUSIC_LASS_ENCOUNTER ; lass
|
||||
db MUSIC_LASS_ENCOUNTER ; janine
|
||||
db MUSIC_HIKER_ENCOUNTER ; cooltrainerm
|
||||
db MUSIC_BEAUTY_ENCOUNTER ; cooltrainerf
|
||||
db MUSIC_BEAUTY_ENCOUNTER ; beauty
|
||||
db MUSIC_POKEMANIAC_ENCOUNTER ; pokemaniac
|
||||
db MUSIC_ROCKET_ENCOUNTER ; gruntm
|
||||
db MUSIC_HIKER_ENCOUNTER ; gentleman
|
||||
db MUSIC_BEAUTY_ENCOUNTER ; skier
|
||||
db MUSIC_BEAUTY_ENCOUNTER ; teacher
|
||||
db MUSIC_BEAUTY_ENCOUNTER ; sabrina
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; bug_catcher
|
||||
db MUSIC_HIKER_ENCOUNTER ; fisher
|
||||
db MUSIC_HIKER_ENCOUNTER ; swimmerm
|
||||
db MUSIC_BEAUTY_ENCOUNTER ; swimmerf
|
||||
db MUSIC_HIKER_ENCOUNTER ; sailor
|
||||
db MUSIC_POKEMANIAC_ENCOUNTER ; super_nerd
|
||||
db MUSIC_RIVAL_ENCOUNTER ; rival2
|
||||
db MUSIC_HIKER_ENCOUNTER ; guitarist
|
||||
db MUSIC_HIKER_ENCOUNTER ; hiker
|
||||
db MUSIC_HIKER_ENCOUNTER ; biker
|
||||
db MUSIC_OFFICER_ENCOUNTER ; blaine
|
||||
db MUSIC_POKEMANIAC_ENCOUNTER ; burglar
|
||||
db MUSIC_HIKER_ENCOUNTER ; firebreather
|
||||
db MUSIC_POKEMANIAC_ENCOUNTER ; juggler
|
||||
db MUSIC_HIKER_ENCOUNTER ; blackbelt_t
|
||||
db MUSIC_ROCKET_ENCOUNTER ; executivem
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t
|
||||
db MUSIC_LASS_ENCOUNTER ; picnicker
|
||||
db MUSIC_YOUNGSTER_ENCOUNTER ; camper
|
||||
db MUSIC_ROCKET_ENCOUNTER ; executivef
|
||||
db MUSIC_SAGE_ENCOUNTER ; sage
|
||||
db MUSIC_SAGE_ENCOUNTER ; medium
|
||||
db MUSIC_HIKER_ENCOUNTER ; boarder
|
||||
db MUSIC_HIKER_ENCOUNTER ; pokefanm
|
||||
db MUSIC_KIMONO_ENCOUNTER ; kimono_girl
|
||||
db MUSIC_LASS_ENCOUNTER ; twins
|
||||
db MUSIC_BEAUTY_ENCOUNTER ; pokefanf
|
||||
db MUSIC_HIKER_ENCOUNTER ; red
|
||||
db MUSIC_RIVAL_ENCOUNTER ; blue
|
||||
db MUSIC_HIKER_ENCOUNTER ; officer
|
||||
db MUSIC_ROCKET_ENCOUNTER ; gruntf
|
||||
db MUSIC_HIKER_ENCOUNTER ; mysticalman
|
||||
db MUSIC_HIKER_ENCOUNTER
|
||||
db MUSIC_HIKER_ENCOUNTER
|
||||
db MUSIC_HIKER_ENCOUNTER
|
||||
; e906e
|
||||
@ -1,3 +1,5 @@
|
||||
AIScoring: ; 38591
|
||||
|
||||
AI_Basic: ; 38591
|
||||
; Don't do anything redundant:
|
||||
; -Using status-only moves if the player can't be statused
|
||||
|
||||
@ -1437,13 +1437,13 @@ BattleAnim_SetBGPals: ; cc91a
|
||||
ld de, UnknBGPals
|
||||
ld a, [rBGP]
|
||||
ld b, a
|
||||
ld c, $7
|
||||
ld c, 7
|
||||
call CopyPals
|
||||
ld hl, OBPals
|
||||
ld de, UnknOBPals
|
||||
ld a, [rBGP]
|
||||
ld b, a
|
||||
ld c, $2
|
||||
ld c, 2
|
||||
call CopyPals
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
@ -1461,11 +1461,11 @@ BattleAnim_SetOBPals: ; cc94b
|
||||
push af
|
||||
ld a, $5
|
||||
ld [rSVBK], a
|
||||
ld hl, OBPals + $10
|
||||
ld de, UnknOBPals + $10
|
||||
ld hl, OBPals palette PAL_BATTLE_OB_GRAY
|
||||
ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY
|
||||
ld a, [rOBP0]
|
||||
ld b, a
|
||||
ld c, $2
|
||||
ld c, 2
|
||||
call CopyPals
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
|
||||
@ -3484,8 +3484,8 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
dec a
|
||||
ld hl, BaseData + 7 ; type
|
||||
ld bc, BaseData1 - BaseData0
|
||||
ld hl, BaseData + BASE_TYPES
|
||||
ld bc, BASE_DATA_SIZE
|
||||
call AddNTimes
|
||||
ld de, EnemyMonType
|
||||
ld bc, 2
|
||||
@ -6676,7 +6676,7 @@ CheckSleepingTreeMon: ; 3eb38
|
||||
; Get list for the time of day
|
||||
ld hl, .Morn
|
||||
ld a, [TimeOfDay]
|
||||
cp DAY
|
||||
cp DAY_F
|
||||
jr c, .Check
|
||||
ld hl, .Day
|
||||
jr z, .Check
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
dw 0 ; padding
|
||||
|
||||
BattleCommandPointers: ; 3fd28
|
||||
; entries correspond to constants/effect_command_constants.asm
|
||||
dw BattleCommand_CheckTurn ; 34084
|
||||
dw BattleCommand_CheckObedience ; 343db
|
||||
dw BattleCommand_UsedMoveText ; 34541
|
||||
|
||||
@ -9323,21 +9323,21 @@ BattleCommand_ClearHazards: ; 37b39
|
||||
|
||||
BattleCommand_HealMorn: ; 37b74
|
||||
; healmorn
|
||||
ld b, MORN
|
||||
ld b, MORN_F
|
||||
jr BattleCommand_TimeBasedHealContinue
|
||||
|
||||
; 37b78
|
||||
|
||||
BattleCommand_HealDay: ; 37b78
|
||||
; healday
|
||||
ld b, DAY
|
||||
ld b, DAY_F
|
||||
jr BattleCommand_TimeBasedHealContinue
|
||||
|
||||
; 37b7c
|
||||
|
||||
BattleCommand_HealNite: ; 37b7c
|
||||
; healnite
|
||||
ld b, NITE
|
||||
ld b, NITE_F
|
||||
; fallthrough
|
||||
; 37b7e
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
MoveNames::
|
||||
db "POUND@"
|
||||
db "KARATE CHOP@"
|
||||
db "DOUBLESLAP@"
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
; entries correspond to EFFECT_* constants
|
||||
dw NormalHit
|
||||
dw DoSleep
|
||||
dw PoisonHit
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -424,7 +424,7 @@ BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212)
|
||||
ret
|
||||
|
||||
GetBallAnimPal: ; cd249 (33:5249)
|
||||
ld hl, .balls
|
||||
ld hl, BallColors
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $1
|
||||
@ -448,22 +448,10 @@ GetBallAnimPal: ; cd249 (33:5249)
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
; cd26c (33:526c)
|
||||
.balls
|
||||
db MASTER_BALL, PAL_BATTLE_GREEN
|
||||
db ULTRA_BALL, PAL_BATTLE_YELLOW
|
||||
db GREAT_BALL, PAL_BATTLE_BLUE
|
||||
db POKE_BALL, PAL_BATTLE_RED
|
||||
db HEAVY_BALL, PAL_BATTLE_GRAY
|
||||
db LEVEL_BALL, PAL_BATTLE_BROWN
|
||||
db LURE_BALL, PAL_BATTLE_BLUE
|
||||
db FAST_BALL, PAL_BATTLE_BLUE
|
||||
db FRIEND_BALL, PAL_BATTLE_YELLOW
|
||||
db MOON_BALL, PAL_BATTLE_GRAY
|
||||
db LOVE_BALL, PAL_BATTLE_RED
|
||||
db -1, PAL_BATTLE_GRAY
|
||||
; cd284
|
||||
|
||||
INCLUDE "data/ball_colors.asm"
|
||||
|
||||
BattleAnimFunction_10: ; cd284 (33:5284)
|
||||
call BattleAnim_AnonJumptable
|
||||
.anon_dw
|
||||
|
||||
@ -7,7 +7,9 @@ INCLUDE "constants/wram_constants.asm"
|
||||
INCLUDE "constants/pokemon_constants.asm"
|
||||
INCLUDE "constants/type_constants.asm"
|
||||
INCLUDE "constants/move_constants.asm"
|
||||
INCLUDE "constants/effect_command_constants.asm"
|
||||
INCLUDE "constants/battle_constants.asm"
|
||||
INCLUDE "constants/map_dimension_constants.asm"
|
||||
INCLUDE "constants/map_constants.asm"
|
||||
INCLUDE "constants/map_setup_constants.asm"
|
||||
INCLUDE "constants/landmark_constants.asm"
|
||||
@ -21,14 +23,17 @@ INCLUDE "constants/sfx_constants.asm"
|
||||
INCLUDE "constants/animation_constants.asm"
|
||||
INCLUDE "constants/phone_constants.asm"
|
||||
INCLUDE "constants/gfx_constants.asm"
|
||||
INCLUDE "constants/input_constants.asm"
|
||||
INCLUDE "constants/pokemon_data_constants.asm"
|
||||
INCLUDE "constants/serial_constants.asm"
|
||||
INCLUDE "constants/mobile_constants.asm"
|
||||
INCLUDE "constants/misc_constants.asm"
|
||||
INCLUDE "constants/std_constants.asm"
|
||||
INCLUDE "constants/deco_constants.asm"
|
||||
INCLUDE "constants/radio_constants.asm"
|
||||
INCLUDE "constants/npctrade_constants.asm"
|
||||
INCLUDE "constants/sprite_constants.asm"
|
||||
INCLUDE "constants/tilemap_constants.asm"
|
||||
INCLUDE "constants/tileset_constants.asm"
|
||||
INCLUDE "constants/cgb_constants.asm"
|
||||
INCLUDE "constants/battle_tower_constants.asm"
|
||||
INCLUDE "constants/cry_constants.asm"
|
||||
|
||||
@ -824,13 +824,24 @@ const_value SET 1
|
||||
const BG_EFFECT_STRUCT_BATTLE_TURN
|
||||
const BG_EFFECT_STRUCT_03
|
||||
|
||||
; battle palettes
|
||||
const_def
|
||||
const PAL_BATTLE_BG_PLAYER ; 0
|
||||
const PAL_BATTLE_BG_ENEMY ; 1
|
||||
const PAL_BATTLE_BG_ENEMY_HP ; 2
|
||||
const PAL_BATTLE_BG_PLAYER_HP ; 3
|
||||
const PAL_BATTLE_BG_EXP ; 4
|
||||
const PAL_BATTLE_BG_5 ; 5
|
||||
const PAL_BATTLE_BG_6 ; 6
|
||||
const PAL_BATTLE_BG_TEXT ; 7
|
||||
|
||||
; animation object palettes
|
||||
const_def
|
||||
const PAL_BATTLE_ENEMY ; 0
|
||||
const PAL_BATTLE_PLAYER ; 1
|
||||
const PAL_BATTLE_GRAY ; 2
|
||||
const PAL_BATTLE_YELLOW ; 3
|
||||
const PAL_BATTLE_RED ; 4
|
||||
const PAL_BATTLE_GREEN ; 5
|
||||
const PAL_BATTLE_BLUE ; 6
|
||||
const PAL_BATTLE_BROWN ; 7
|
||||
const PAL_BATTLE_OB_ENEMY ; 0
|
||||
const PAL_BATTLE_OB_PLAYER ; 1
|
||||
const PAL_BATTLE_OB_GRAY ; 2
|
||||
const PAL_BATTLE_OB_YELLOW ; 3
|
||||
const PAL_BATTLE_OB_RED ; 4
|
||||
const PAL_BATTLE_OB_GREEN ; 5
|
||||
const PAL_BATTLE_OB_BLUE ; 6
|
||||
const PAL_BATTLE_OB_BROWN ; 7
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user