updated changes in repo

hg-commit-id: 313907c15826
This commit is contained in:
KuroiIeWa5Da 2012-01-23 01:42:37 -06:00
parent 4d0797bc3a
commit 4e9fe0f8ac
3 changed files with 4281 additions and 1091 deletions

4745
common.asm

File diff suppressed because it is too large Load diff

View file

@ -93,6 +93,8 @@ W_AICOUNT EQU $CCDF ; number of times remaining that AI action can occur
W_WHICHTRADE EQU $CD3D ; which entry from TradeMons to select W_WHICHTRADE EQU $CD3D ; which entry from TradeMons to select
W_WHICHPOKEMON EQU $CF92 ; which pokemon you selected
W_OPPONENTHP EQU $CFE6 ; active opponent's hp (16 bits) W_OPPONENTHP EQU $CFE6 ; active opponent's hp (16 bits)
W_OPPONENTNUMBER EQU $CFE8 ; active opponent's position in team (0 to 5) W_OPPONENTNUMBER EQU $CFE8 ; active opponent's position in team (0 to 5)
W_OPPONENTSTATUS EQU $CFE9 ; active opponent's status condition W_OPPONENTSTATUS EQU $CFE9 ; active opponent's status condition
@ -2637,6 +2639,12 @@ mus_note: MACRO
db ((\1 << 4) | \2) db ((\1 << 4) | \2)
ENDM ENDM
;Write an octave note
;format: mus_octave octave
mus_octave: MACRO
db \1
ENDM
; set velocity/note fade (\1 is velocity, \2 is note length, both 0-15) ; set velocity/note fade (\1 is velocity, \2 is note length, both 0-15)
; format: mus_vel vel, length ; format: mus_vel vel, length
mus_vel: MACRO mus_vel: MACRO
@ -2691,13 +2699,15 @@ ENDM
; format: mus_call offset ; format: mus_call offset
mus_call: MACRO mus_call: MACRO
db $FD db $FD
dw ((\1 % $4000) + ((\1 >= $4000) * $4000)) ;dw ((\1 % $4000) + ((\1 >= $4000) * $4000))
dw \1
ENDM ENDM
; jump \1 \2 ; jump \1 \2
; format: mus_jump offset loop ; format: mus_jump loop offset
mus_jump: MACRO mus_jump: MACRO
db $FE db $FE
db \2 db \1
dw ((\1 % $4000) + ((\1 >= $4000) * $4000)) dw \2
;dw ((\2 % $4000) + ((\2 >= $4000) * $4000))
ENDM ENDM

521
music.asm
View file

@ -6,9 +6,8 @@ INCBIN "baserom.gbc",$82FD,$9ba3 - $82FD
;Pokemon Healed Music ;Pokemon Healed Music
PkmnHealed_md_1: ;9BA3 - 9BC3 PkmnHealed_md_1: ;9BA3 - 9BC3
;Setup ;Setup
mus_tempo 0, 144 mus_tempo 0, $90
mus_volume 119 mus_volume 119
mus_duty duty50 mus_duty duty50
db $E8 ;?? db $E8 ;??
@ -83,16 +82,526 @@ PkmnHealed_md_3: ;9BD2 - 9BDD
;Routes 1 and 2 ;Routes 1 and 2
Routes1_md_1: ;9BDE - 9C50 Routes1_md_1: ;9BDE - 9C50
INCBIN "baserom.gbc",$9bde,$9c51 - $9bde mus_tempo 0, 152
mus_volume 119
mus_mod 4, 2, 3
mus_duty duty50
db $E8
branch_9BE9:
mus_vel 10, 1
mus_note noteRst, note4
mus_octave oct3
mus_note noteD, note8
mus_note noteD, note4_8
mus_note noteD, note8
mus_note noteD, note4_8
mus_note noteD, note8
mus_note noteD, note16
mus_note noteC#, note16
mus_octave oct2
mus_note noteB, note16
mus_octave oct3
mus_note noteC#, note16
mus_octave oct2
mus_note noteA, note8
mus_note noteA, note8
mus_note noteA, note4_8
mus_octave oct3
mus_note noteC#, note8
mus_note noteC#, note4_8
mus_note noteC#, note8
mus_note noteC#, note4
mus_octave oct2
mus_note noteA, note8
mus_octave oct3
mus_note noteC#, note8
mus_octave oct2
mus_note noteB, note8
mus_octave oct3
mus_note noteC#, note4
mus_octave oct2
mus_note noteA, note8
mus_note noteA, note4_8
mus_octave oct3
mus_note noteD, note8
mus_note noteD, note4_8
mus_note noteD, note8
mus_note noteD, note4_8
mus_note noteD, note8
mus_note noteD, note16
mus_note noteE, note16
mus_note noteD, note16
mus_note noteC#, note16
mus_octave oct2
mus_note noteB, note8
mus_note noteA, note8
mus_note noteA, note4_8
mus_octave oct3
mus_note noteC#, note8
mus_note noteC#, note4_8
mus_octave oct2
mus_note noteA, note8
mus_octave oct3
mus_note noteE, note8
mus_octave oct2
mus_note noteA, note8
mus_vel 10, 2
mus_octave oct3
mus_note noteG, note4
mus_note noteE, note4
mus_note noteF#, note8
mus_vel 10, 1
mus_octave oct2
mus_note noteA, note8
mus_note noteA, note4_8
mus_note noteA, note8
mus_note noteF#, note8
mus_note noteA, note4
mus_note noteB, note8
mus_octave oct3
mus_note noteC#, note8
mus_octave oct2
mus_note noteB, note4
mus_note noteA, note8
mus_note noteF#, note8
mus_note noteA, note4
mus_note noteG, note8
mus_note noteE, note8
mus_note noteC#, note4
mus_note noteA, note8
mus_octave oct3
mus_note noteD, note8
mus_octave oct2
mus_note noteA, note4
mus_note noteB, note8
mus_note noteG, note8
mus_note noteB, note4
mus_octave oct3
mus_note noteD, note8
mus_note noteE, note8
mus_note noteC#, note8
mus_note noteD, note8
mus_octave oct2
mus_note noteA, note8
mus_note noteA, note8
mus_jump 0, branch_9BE9 ;5BE9
mus_end
Routes1_md_2: ;9C51 - 9CD7 Routes1_md_2: ;9C51 - 9CD7
INCBIN "baserom.gbc",$9c51,$9cd8 - $9c51 mus_duty duty50
branch_9C53:
mus_vel 13, 1
mus_call branch_9C65
mus_call branch_9C78
mus_call branch_9C65
mus_call branch_9C8D
mus_jump 0, branch_9C53
branch_9C65:
mus_octave oct3
mus_note noteD, note16
mus_note noteE, note16
mus_note noteF#, note8
mus_note noteF#, note8
mus_note noteF#, note8
mus_note noteD, note16
mus_note noteE, note16
mus_note noteF#, note8
mus_note noteF#, note8
mus_note noteF#, note8
mus_note noteD, note16
mus_note noteE, note16
mus_note noteF#, note8
mus_note noteF#, note8
mus_note noteG, note8_16
mus_note noteF#, note16
mus_note noteE, note4_8
mus_end
branch_9C78:
mus_note noteC#, note16
mus_note noteD, note16
mus_note noteE, note8
mus_note noteE, note8
mus_note noteE, note8
mus_note noteC#, note16
mus_note noteD, note16
mus_note noteE, note8
mus_note noteE, note8
mus_note noteE, note8
mus_note noteC#, note16
mus_note noteD, note16
mus_note noteE, note8
mus_note noteE, note8
mus_note noteF#, note16
mus_note noteE, note16
mus_note noteE, note16
mus_note noteF#, note16
mus_note noteD, note4
mus_note noteF#, note8
mus_end
branch_9C8D:
mus_note noteC#, note16
mus_note noteD, note16
mus_note noteE, note8
mus_note noteG, note8
mus_note noteF#, note8
mus_note noteE, note8
mus_note noteD, note8
mus_note noteC#, note8
mus_octave oct2
mus_note noteB, note8
mus_octave oct3
mus_note noteC#, note8
mus_vel 13, 2
mus_note noteB, note4
db $D6
db $D1
mus_octave oct2
mus_note noteB, note16
mus_octave oct3
mus_note noteC#, note16
mus_vel 13, 1
mus_octave oct2
mus_note noteB, note16
mus_note noteA, note16
mus_octave oct3
mus_note noteC#, note16
mus_note noteD, note4_8
mus_vel 13, 2
mus_note noteF#, note16
mus_note noteG, note16
mus_note noteA, note8
mus_note noteA, note8
mus_note noteF#, note8
mus_note noteD, note8
mus_octave oct4
mus_note noteD, note8
mus_note noteC#, note8
mus_octave oct3
mus_note noteB, note8
mus_octave oct4
mus_note noteC#, note8
mus_octave oct3
mus_note noteA, note8
mus_note noteF#, note8
mus_note noteD, note8_16
mus_note noteF#, note16
mus_note noteE, note4_8
mus_note noteF#, note16
mus_note noteG, note16
mus_note noteA, note8
mus_note noteA, note8
mus_note noteF#, note8
mus_note noteA, note8
mus_octave oct4
mus_note noteD, note8
mus_note noteC#, note8
mus_octave oct3
mus_note noteB, note8_16
mus_note noteG, note16
mus_note noteA, note8
mus_octave oct4
mus_note noteD, note8
mus_note noteC#, note8
mus_note noteE, note8
mus_note noteD, note8
mus_vel 13, 1
mus_octave oct3
mus_note noteD, note8
mus_note noteD, note8
mus_end
mus_end
Routes1_md_3: ;9CD8 - 9D23 Routes1_md_3: ;9CD8 - 9D23
INCBIN "baserom.gbc",$9cd8,$9d24 - $9cd8 mus_mod 8, 2, 5
mus_vel 1, 3
branch_9CDD:
mus_note noteRst, note8
mus_octave oct3
mus_note noteD, note4
mus_note noteC#, note4
mus_octave oct2
mus_note noteB, note4
mus_note noteA, note4
mus_octave oct3
mus_note noteD, note4
mus_octave oct2
mus_note noteA, note4
mus_note noteB, note4
mus_note noteA, note4
mus_octave oct3
mus_note noteC#, note4
mus_octave oct2
mus_note noteA, note4
mus_note noteB, note4
mus_octave oct3
mus_note noteC, note4
mus_note noteC#, note4
mus_octave oct2
mus_note noteA, note4
mus_octave oct3
mus_note noteD, note4
mus_octave oct2
mus_note noteA, note4
mus_octave oct3
mus_note noteD, note4
mus_note noteC#, note4
mus_octave oct2
mus_note noteB, note4
mus_note noteA, note4
mus_octave oct3
mus_note noteD, note4
mus_octave oct2
mus_note noteA, note4
mus_note noteB, note4
mus_note noteA, note4
mus_octave oct3
mus_note noteC#, note4
mus_octave oct2
mus_note noteB, note4
mus_note noteA, note4
mus_note noteB, note4
mus_octave oct3
mus_note noteC#, note4
mus_octave oct2
mus_note noteA, note4
mus_octave oct3
mus_note noteD, note4
mus_octave oct2
mus_note noteA, note4
mus_octave oct3
mus_note noteD, note2
mus_octave oct2
mus_note noteG, note2
mus_note noteA, note2
mus_octave oct3
mus_note noteC#, note2
mus_note noteD, note2
mus_octave oct2
mus_note noteG, note2
mus_note noteA, note2
mus_octave oct3
mus_note noteD, note4_8
mus_jump 0, branch_9CDD
mus_end
; 9D23
Routes1_md_4: ;9D24 - 9DB8 Routes1_md_4: ;9D24 - 9DB8
INCBIN "baserom.gbc",$9d24,$9db9 - $9d24 ; 9D24
mus_vel 12, 3
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note4
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note4
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note4
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note4
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note4
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note4
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_note noteRst, note8
mus_note noteB, note8
mus_note noteC, note1
mus_note noteB, note8
mus_note noteC, note1
mus_jump 0, Routes1_md_4
mus_end
; 9DB8
;Routes 24 and 25 ;Routes 24 and 25
Routes2_md_1: ;9BD9 - 9E4E Routes2_md_1: ;9BD9 - 9E4E