Skip to content

Commit

Permalink
Merge pull request #531 from mid-kid/master
Browse files Browse the repository at this point in the history
Remove all address comments
  • Loading branch information
yenatch authored Jun 24, 2018
2 parents 131875d + 1d9a68d commit 0cbe04d
Show file tree
Hide file tree
Showing 616 changed files with 12,136 additions and 20,383 deletions.
819 changes: 283 additions & 536 deletions audio/cries.asm

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions audio/cry_pointers.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Cries: ; e91b0
Cries:
dba Cry_Nidoran_M
dba Cry_Nidoran_F
dba Cry_Slowpoke
Expand Down Expand Up @@ -67,4 +67,3 @@ Cries: ; e91b0
dba Cry_Aipom
dba Cry_Dunsparce
dba Cry_Donphan
; e927c
130 changes: 45 additions & 85 deletions audio/drumkits.asm
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Drumkits: ; e8e52
Drumkits:
dw Drumkit0
dw Drumkit1
dw Drumkit2
dw Drumkit3
dw Drumkit4
dw Drumkit5
; e8e5e

Drumkit0: ; e8e5e
Drumkit0:
dw Drum00 ; rest
dw Snare1 ; c
dw Snare2 ; c#
Expand All @@ -21,7 +20,7 @@ Drumkit0: ; e8e5e
dw Snare6 ; a
dw Snare7 ; a#
dw HiHat2 ; b
Drumkit1: ; e8e78
Drumkit1:
dw Drum00
dw HiHat1
dw Snare5
Expand All @@ -35,7 +34,7 @@ Drumkit1: ; e8e78
dw Snare9
dw Snare10
dw Snare11
Drumkit2: ; e8e92
Drumkit2:
dw Drum00
dw Snare1
dw Snare9
Expand All @@ -49,7 +48,7 @@ Drumkit2: ; e8e92
dw Snare6
dw Snare7
dw HiHat2
Drumkit3: ; e8eac
Drumkit3:
dw Drum21
dw Snare12
dw Snare13
Expand All @@ -63,7 +62,7 @@ Drumkit3: ; e8eac
dw Drum21
dw Kick2
dw Crash2
Drumkit4: ; e8ec6
Drumkit4:
dw Drum21
dw Drum20
dw Snare13
Expand All @@ -77,7 +76,7 @@ Drumkit4: ; e8ec6
dw Drum36
dw Kick2
dw Crash1
Drumkit5: ; e8ee0
Drumkit5:
dw Drum00
dw Snare9
dw Snare10
Expand All @@ -91,211 +90,172 @@ Drumkit5: ; e8ee0
dw Snare14
dw Snare13
dw Kick2
; e8efa

Drum00: ; e8efa
Drum00:
; unused
noise C#, 1, $11, $00
endchannel
; e8efe

Snare1: ; e8efe
Snare1:
noise C#, 1, $c1, $33
endchannel
; e8f02

Snare2: ; e8f02
Snare2:
noise C#, 1, $b1, $33
endchannel
; e8f06

Snare3: ; e8f06
Snare3:
noise C#, 1, $a1, $33
endchannel
; e8f0a

Snare4: ; e8f0a
Snare4:
noise C#, 1, $81, $33
endchannel
; e8f0e

Drum05: ; e8f0e
Drum05:
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
Triangle1:
noise C#, 1, $51, $2a
endchannel
; e8f25

Triangle2: ; e8f25
Triangle2:
noise C#, 2, $41, $2b
noise C#, 1, $61, $2a
endchannel
; e8f2c

HiHat1: ; e8f2c
HiHat1:
noise C#, 1, $81, $10
endchannel
; e8f30

Snare5: ; e8f30
Snare5:
noise C#, 1, $82, $23
endchannel
; e8f34

Snare6: ; e8f34
Snare6:
noise C#, 1, $82, $25
endchannel
; e8f38

Snare7: ; e8f38
Snare7:
noise C#, 1, $82, $26
endchannel
; e8f3c

HiHat2: ; e8f3c
HiHat2:
noise C#, 1, $a1, $10
endchannel
; e8f40

HiHat3: ; e8f40
HiHat3:
noise C#, 1, $a2, $11
endchannel
; e8f44

Snare8: ; e8f44
Snare8:
noise C#, 1, $a2, $50
endchannel
; e8f48

Triangle3: ; e8f48
Triangle3:
noise C#, 1, $a1, $18
noise C#, 1, $31, $33
endchannel
; e8f4f

Triangle4: ; e8f4f
Triangle4:
noise C#, 3, $91, $28
noise C#, 1, $71, $18
endchannel
; e8f56

Snare9: ; e8f56
Snare9:
noise C#, 1, $91, $22
endchannel
; e8f5a

Snare10: ; e8f5a
Snare10:
noise C#, 1, $71, $22
endchannel
; e8f5e

Snare11: ; e8f5e
Snare11:
noise C#, 1, $61, $22
endchannel
; e8f62

Drum20: ; e8f62
Drum20:
noise C#, 1, $11, $11
endchannel
; e8f66

Drum21: ; e8f66
Drum21:
endchannel
; e8f67

Snare12: ; e8f67
Snare12:
noise C#, 1, $91, $33
endchannel
; e8f6b

Snare13: ; e8f6b
Snare13:
noise C#, 1, $51, $32
endchannel
; e8f6f

Snare14: ; e8f6f
Snare14:
noise C#, 1, $81, $31
endchannel
; e8f73

Kick1: ; e8f73
Kick1:
noise C#, 1, $88, $6b
noise C#, 1, $71, $00
endchannel
; e8f7a

Triangle5: ; e8f7a
Triangle5:
noise D_, 1, $91, $18
endchannel
; e8f7e

Drum27: ; e8f7e
Drum27:
noise C#, 8, $92, $10
endchannel
; e8f82

Drum28: ; e8f82
Drum28:
noise D_, 4, $91, $00
noise D_, 4, $11, $00
endchannel
; e8f89

Drum29: ; e8f89
Drum29:
noise D_, 4, $91, $11
noise D_, 4, $11, $00
endchannel
; e8f90

Crash1: ; e8f90
Crash1:
noise D_, 4, $88, $15
noise C#, 1, $65, $12
endchannel
; e8f97

Drum31: ; e8f97
Drum31:
noise D_, 4, $51, $21
noise D_, 4, $11, $11
endchannel
; e8f9e

Drum32: ; e8f9e
Drum32:
noise D_, 4, $51, $50
noise D_, 4, $11, $11
endchannel
; e8fa5

Drum33: ; e8fa5
Drum33:
noise C#, 1, $a1, $31
endchannel
; e8fa9

Crash2: ; e8fa9
Crash2:
noise C#, 1, $84, $12
endchannel
; e8fad

Drum35: ; e8fad
Drum35:
noise D_, 4, $81, $00
noise D_, 4, $11, $00
endchannel
; e8fb4

Drum36: ; e8fb4
Drum36:
noise D_, 4, $81, $21
noise D_, 4, $11, $11
endchannel
; e8fbb

Kick2: ; e8fbb
Kick2:
noise C#, 1, $a8, $6b
noise C#, 1, $71, $00
endchannel
; e8fc2
Loading

0 comments on commit 0cbe04d

Please sign in to comment.