summaryrefslogtreecommitdiff
path: root/common.asm
diff options
context:
space:
mode:
authorKuroiIeWa5Da <tyuki@adu.me>2012-01-20 17:05:58 -0600
committerKuroiIeWa5Da <tyuki@adu.me>2012-01-20 17:05:58 -0600
commit93dce655e1b73aa724ae3a26f869e80afdffeeab (patch)
tree46937fe504088e52e33bc770ff84163b4924a1e0 /common.asm
parent97a8bfbfc9434200d590652bb385fe358e029e05 (diff)
labeled Museum Guy music Data
hg-commit-id: 094678ff2fe9
Diffstat (limited to 'common.asm')
-rw-r--r--common.asm20
1 files changed, 15 insertions, 5 deletions
diff --git a/common.asm b/common.asm
index b7e9718a..20512de9 100644
--- a/common.asm
+++ b/common.asm
@@ -3088,13 +3088,13 @@ db $02
;Guy walks you to museum
MuseumGuy_mh: ;0x82A3 - 0x82AE
db $C0
- dw $6DAE ;Channel 1
+ dw MuseumGuy_md_1 ;Channel 1
db $01
- dw $6DF1 ;Channel 2
+ dw MuseumGuy_md_2 ;Channel 2
db $02
- dw $6E6E ;Channel 3
+ dw MuseumGuy_md_3 ;Channel 3
db $03
- dw $6ED1 ;Channel 4
+ dw MuseumGuy_md_4 ;Channel 4
;Safari Zone
SafariZone_mh: ;0x82AF - 0x82B7
@@ -3201,7 +3201,17 @@ INCBIN "baserom.gbc",$ac32,$acef - $ac32
Cities1_md_4: ;ACEF - ADAD
INCBIN "baserom.gbc",$acef,$adae - $acef
-INCBIN "baserom.gbc",$adae,$af59 - $adae
+MuseumGuy_md_1: ;ADAE - ADF0
+INCBIN "baserom.gbc",$adae,$adf1 - $adae
+
+MuseumGuy_md_2: ;ADF1 - AE6D
+INCBIN "baserom.gbc",$adf1,$ae6e - $adf1
+
+MuseumGuy_md_3: ;AE6E - AED0
+INCBIN "baserom.gbc",$ae6e,$aed1 - $ae6e
+
+MuseumGuy_md_4: ;AED1 - AF58
+INCBIN "baserom.gbc",$aed1,$af59 - $aed1
MeetProfOak_md_1: ;AF59 - AFA8
INCBIN "baserom.gbc",$af59,$afa9 - $af59