ref: 103ac439ed82af326b8025ec387abe266cbaf115
parent: dff781c057375b35372391aba01e838d58c9bb2b
parent: f4db6f6029c287b0306865de8d6160734055c513
author: Bryan Bishop <[email protected]>
date: Wed May 22 09:48:45 EDT 2013
Merge pull request #140 from yenatch/master tile animations and map header updates
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -253,7 +253,8 @@
[ "LD [HL], H", 0x74, 0 ],
[ "LD [HLI], A", 0x22, 0 ],
[ "LD [HL], L", 0x75, 0 ],
- [ "LD HL, SP+x", 0xf8, 1 ],
+# [ "LD HL, SP+x", 0xf8, 1 ], # rgbds uses [sp+x]
+ [ "LD HL, [SP+x]", 0xf8, 1 ],
[ "LD [HL], x", 0x36, 1 ],
[ "LD H, x", 0x26, 1 ],
# [ "LDI A, [HL]", 0x2a, 0 ],
--- /dev/null
+++ b/gfx/tilesets/forest-tree/1.2bpp
@@ -1,0 +1,1 @@
+�W$�2�0[LG`
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/forest-tree/2.2bpp
@@ -1,0 +1,2 @@
+�U&�
+:�(3$nq߰
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/forest-tree/3.2bpp differ
binary files /dev/null b/gfx/tilesets/forest-tree/4.2bpp differ
binary files /dev/null b/gfx/tilesets/fountain/1.2bpp differ
binary files /dev/null b/gfx/tilesets/fountain/2.2bpp differ
binary files /dev/null b/gfx/tilesets/fountain/3.2bpp differ
binary files /dev/null b/gfx/tilesets/fountain/4.2bpp differ
binary files /dev/null b/gfx/tilesets/fountain/5.2bpp differ
--- /dev/null
+++ b/gfx/tilesets/minecart/1.2bpp
@@ -1,0 +1,1 @@
+�����������������_�_������?/�/?�?��?��?� � � �_� �� � � � �O��o
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/10.2bpp
@@ -1,0 +1,1 @@
+?�_���_��������� ���_���_��������W���������������W���W��������U���u������
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/2.2bpp
@@ -1,0 +1,1 @@
+ ������������������������������������������������������������������������
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/3.2bpp
@@ -1,0 +1,1 @@
+�����������������_�_������?/�/?�?��?��?� � � �_� �� � � � �O��o
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/4.2bpp
@@ -1,0 +1,1 @@
+�����������������������������������������������������������������������������
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/5.2bpp
@@ -1,0 +1,1 @@
+�����������������_�_������������?/�o������������ �W������������ �[��������
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/6.2bpp
@@ -1,0 +1,1 @@
+�����������������������������������������������������������������������������
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/7.2bpp
@@ -1,0 +1,1 @@
+�����ݠ߀��������������������������������������������������������������������
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/8.2bpp
@@ -1,0 +1,1 @@
+ �?�?� � �_�_� �� � ���/�/��������������� � ��������
\ No newline at end of file
--- /dev/null
+++ b/gfx/tilesets/minecart/9.2bpp
@@ -1,0 +1,1 @@
+�����������������������������������������������������������������������������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/safari/1.2bpp differ
--- /dev/null
+++ b/gfx/tilesets/safari/2.2bpp
@@ -1,0 +1,1 @@
+@��2��~���,
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/safari/3.2bpp differ
binary files /dev/null b/gfx/tilesets/safari/4.2bpp differ
--- a/main.asm
+++ b/main.asm
@@ -17454,7 +17454,7 @@
; param, function
dw $9140, AnimateWaterTile
dw $0000, WaitTileAnimation
- dw $95f0, $4387
+ dw $95f0, AnimateFountain
dw $0000, WaitTileAnimation
dw $0000, TileAnimationPalette
dw $0000, WaitTileAnimation
@@ -17518,11 +17518,11 @@
Tileset15Anim: ; 0xfc15f
; param, function
- dw $0000, $45eb
+ dw $0000, SafariFountainAnim2
dw $0000, WaitTileAnimation
dw $0000, WaitTileAnimation
dw $0000, WaitTileAnimation
- dw $0000, $45cc
+ dw $0000, SafariFountainAnim1
dw $0000, WaitTileAnimation
dw $0000, NextTileFrame8
dw $0000, DoneTileAnimation
@@ -17535,7 +17535,7 @@
; param, function
dw $9140, $46a2
dw $0000, $471e
- dw $cf41, $4309
+ dw $cf41, ScrollTileRightLeft
dw $0000, $471e
dw $9140, $4696
dw $0000, $471e
@@ -17558,7 +17558,7 @@
; param, function
dw $9350, $46a2
dw $0000, $471e
- dw $cf41, $4309
+ dw $cf41, ScrollTileRightLeft
dw $0000, $471e
dw $9350, $4696
dw $0000, $471e
@@ -17579,16 +17579,16 @@
Tileset23Anim: ; 0xfc27f
; param, function
- dw $4770, $4645
- dw $4774, $4645
- dw $4768, $4645
- dw $476c, $4645
- dw $4760, $4645
- dw $4764, $4645
- dw $4758, $4645
- dw $475c, $4645
- dw $4750, $4645
- dw $4754, $4645
+ dw MinecartTilePointer9, AnimateMinecartTile
+ dw MinecartTilePointer10, AnimateMinecartTile
+ dw MinecartTilePointer7, AnimateMinecartTile
+ dw MinecartTilePointer8, AnimateMinecartTile
+ dw MinecartTilePointer5, AnimateMinecartTile
+ dw MinecartTilePointer6, AnimateMinecartTile
+ dw MinecartTilePointer3, AnimateMinecartTile
+ dw MinecartTilePointer4, AnimateMinecartTile
+ dw MinecartTilePointer1, AnimateMinecartTile
+ dw MinecartTilePointer2, AnimateMinecartTile
dw $0000, NextTileFrame
dw $0000, WaitTileAnimation
dw $0000, WaitTileAnimation
@@ -17650,8 +17650,161 @@
ret
; fc309
-INCBIN "baserom.gbc", $fc309, $fc402 - $fc309
+ScrollTileRightLeft: ; fc309
+; Scroll right for 4 ticks, then left for 4 ticks.
+ ld a, [TileAnimationTimer]
+ inc a
+ and 7
+ ld [TileAnimationTimer], a
+ and 4
+ jr nz, ScrollTileLeft
+ jr ScrollTileRight
+; fc318
+
+ScrollTileUpDown: ; fc318
+; Scroll up for 4 ticks, then down for 4 ticks.
+ ld a, [TileAnimationTimer]
+ inc a
+ and 7
+ ld [TileAnimationTimer], a
+ and 4
+ jr nz, ScrollTileDown
+ jr ScrollTileUp
+; fc327
+
+ScrollTileLeft: ; fc327
+ ld h, d
+ ld l, e
+ ld c, 4
+.loop
+ rept 4
+ ld a, [hl]
+ rlca
+ ld [hli], a
+ endr
+ dec c
+ jr nz, .loop
+ ret
+; fc33b
+
+ScrollTileRight: ; fc33b
+ ld h, d
+ ld l, e
+ ld c, 4
+.loop
+ rept 4
+ ld a, [hl]
+ rrca
+ ld [hli], a
+ endr
+ dec c
+ jr nz, .loop
+ ret
+; fc34f
+
+ScrollTileUp: ; fc34f
+ ld h, d
+ ld l, e
+ ld d, [hl]
+ inc hl
+ ld e, [hl]
+ ld bc, $e
+ add hl, bc
+ ld a, 4
+.loop
+ ld c, [hl]
+ ld [hl], e
+ dec hl
+ ld b, [hl]
+ ld [hl], d
+ dec hl
+ ld e, [hl]
+ ld [hl], c
+ dec hl
+ ld d, [hl]
+ ld [hl], b
+ dec hl
+ dec a
+ jr nz, .loop
+ ret
+; fc36a
+
+ScrollTileDown: ; fc36a
+ ld h, d
+ ld l, e
+ ld de, $e
+ push hl
+ add hl, de
+ ld d, [hl]
+ inc hl
+ ld e, [hl]
+ pop hl
+ ld a, 4
+.loop
+ ld b, [hl]
+ ld [hl], d
+ inc hl
+ ld c, [hl]
+ ld [hl], e
+ inc hl
+ ld d, [hl]
+ ld [hl], b
+ inc hl
+ ld e, [hl]
+ ld [hl], c
+ inc hl
+ dec a
+ jr nz, .loop
+ ret
+; fc387
+
+
+AnimateFountain: ; fc387
+ ld hl, [sp+0]
+ ld b, h
+ ld c, l
+ ld hl, .frames
+ ld a, [TileAnimationTimer]
+ and 7
+ add a
+ add l
+ ld l, a
+ jr nc, .asm_fc399
+ inc h
+
+.asm_fc399
+ ld a, [hli]
+ ld h, [hl]
+ ld l, a
+ ld sp, hl
+ ld l, e
+ ld h, d
+ jp WriteTile
+
+.frames
+ dw .frame1
+ dw .frame2
+ dw .frame3
+ dw .frame4
+ dw .frame3
+ dw .frame4
+ dw .frame5
+ dw .frame1
+
+.frame1
+ INCBIN "gfx/tilesets/fountain/1.2bpp"
+.frame2
+ INCBIN "gfx/tilesets/fountain/2.2bpp"
+.frame3
+ INCBIN "gfx/tilesets/fountain/3.2bpp"
+.frame4
+ INCBIN "gfx/tilesets/fountain/4.2bpp"
+.frame5
+ INCBIN "gfx/tilesets/fountain/5.2bpp"
+; fc402
+
+
AnimateWaterTile: ; fc402
; Draw a water tile for the current frame in VRAM tile at de.
@@ -17691,8 +17844,178 @@
INCBIN "baserom.gbc", $fc41c, $fc45c - $fc41c
; fc45c
-INCBIN "baserom.gbc", $fc45c, $fc56d - $fc45c
+ForestTreeLeftAnimation: ; fc45c
+ ld hl, [sp+0]
+ ld b, h
+ ld c, l
+
+; Only during the Celebi event.
+ ld a, [$dbf3]
+ bit 2, a
+ jr nz, .asm_fc46c
+ ld hl, ForestTreeLeftFrames
+ jr .asm_fc47d
+
+.asm_fc46c
+ ld a, [TileAnimationTimer]
+ call GetForestTreeFrame
+ add a
+ add a
+ add a
+ add ForestTreeLeftFrames % $100
+ ld l, a
+ ld a, 0
+ adc ForestTreeLeftFrames / $100
+ ld h, a
+
+.asm_fc47d
+ ld sp, hl
+ ld hl, $90c0
+ jp WriteTile
+; fc484
+
+
+ForestTreeLeftFrames: ; fc484
+ INCBIN "gfx/tilesets/forest-tree/1.2bpp"
+ INCBIN "gfx/tilesets/forest-tree/2.2bpp"
+; fc4a4
+
+ForestTreeRightFrames: ; fc4a4
+ INCBIN "gfx/tilesets/forest-tree/3.2bpp"
+ INCBIN "gfx/tilesets/forest-tree/4.2bpp"
+; fc4c4
+
+
+ForestTreeRightAnimation: ; fc4c4
+ ld hl, [sp+0]
+ ld b, h
+ ld c, l
+
+; Only during the Celebi event.
+ ld a, [$dbf3]
+ bit 2, a
+ jr nz, .asm_fc4d4
+ ld hl, ForestTreeRightFrames
+ jr .asm_fc4eb
+
+.asm_fc4d4
+ ld a, [TileAnimationTimer]
+ call GetForestTreeFrame
+ add a
+ add a
+ add a
+ add ForestTreeLeftFrames % $100
+ ld l, a
+ ld a, 0
+ adc ForestTreeLeftFrames / $100
+ ld h, a
+ push bc
+ ld bc, ForestTreeRightFrames - ForestTreeLeftFrames
+ add hl, bc
+ pop bc
+
+.asm_fc4eb
+ ld sp, hl
+ ld hl, $90f0
+ jp WriteTile
+; fc4f2
+
+
+ForestTreeLeftAnimation2: ; fc4f2
+ ld hl, [sp+0]
+ ld b, h
+ ld c, l
+
+; Only during the Celebi event.
+ ld a, [$dbf3]
+ bit 2, a
+ jr nz, .asm_fc502
+ ld hl, ForestTreeLeftFrames
+ jr .asm_fc515
+
+.asm_fc502
+ ld a, [TileAnimationTimer]
+ call GetForestTreeFrame
+ xor 2
+ add a
+ add a
+ add a
+ add ForestTreeLeftFrames % $100
+ ld l, a
+ ld a, 0
+ adc ForestTreeLeftFrames / $100
+ ld h, a
+
+.asm_fc515
+ ld sp, hl
+ ld hl, $90c0
+ jp WriteTile
+; fc51c
+
+
+ForestTreeRightAnimation2: ; fc51c
+ ld hl, [sp+0]
+ ld b, h
+ ld c, l
+
+; Only during the Celebi event.
+ ld a, [$dbf3]
+ bit 2, a
+ jr nz, .asm_fc52c
+ ld hl, ForestTreeRightFrames
+ jr .asm_fc545
+
+.asm_fc52c
+ ld a, [TileAnimationTimer]
+ call GetForestTreeFrame
+ xor 2
+ add a
+ add a
+ add a
+ add ForestTreeLeftFrames % $100
+ ld l, a
+ ld a, 0
+ adc ForestTreeLeftFrames / $100
+ ld h, a
+ push bc
+ ld bc, ForestTreeRightFrames - ForestTreeLeftFrames
+ add hl, bc
+ pop bc
+
+.asm_fc545
+ ld sp, hl
+ ld hl, $90f0
+ jp WriteTile
+; fc54c
+
+
+GetForestTreeFrame: ; fc54c
+; Return 0 if a is even, or 2 if odd.
+ and a
+ jr z, .even
+ cp 1
+ jr z, .odd
+ cp 2
+ jr z, .even
+ cp 3
+ jr z, .odd
+ cp 4
+ jr z, .even
+ cp 5
+ jr z, .odd
+ cp 6
+ jr z, .even
+.odd
+ ld a, 2
+ scf
+ ret
+.even
+ xor a
+ ret
+; fc56d
+
+
AnimateFlowerTile: ; fc56d
; No parameters.
@@ -17732,8 +18055,105 @@
INCBIN "baserom.gbc", $fc58c, $fc5cc - $fc58c
; fc5cc
-INCBIN "baserom.gbc", $fc5cc, $fc673 - $fc5cc
+SafariFountainAnim1: ; fc5cc
+; Splash in the bottom-right corner of the fountain.
+ ld hl, [sp+0]
+ ld b, h
+ ld c, l
+ ld a, [TileAnimationTimer]
+ and 6
+ srl a
+ inc a
+ inc a
+ and 3
+ swap a
+ ld e, a
+ ld d, 0
+ ld hl, SafariFountainFrames
+ add hl, de
+ ld sp, hl
+ ld hl, $95b0
+ jp WriteTile
+; fc5eb
+
+
+SafariFountainAnim2: ; fc5eb
+; Splash in the top-left corner of the fountain.
+ ld hl, [sp+0]
+ ld b, h
+ ld c, l
+ ld a, [TileAnimationTimer]
+ and 6
+ add a
+ add a
+ add a
+ ld e, a
+ ld d, 0
+ ld hl, SafariFountainFrames
+ add hl, de
+ ld sp, hl
+ ld hl, $9380
+ jp WriteTile
+; fc605
+
+
+SafariFountainFrames: ; fc605
+ INCBIN "gfx/tilesets/safari/1.2bpp"
+ INCBIN "gfx/tilesets/safari/2.2bpp"
+ INCBIN "gfx/tilesets/safari/3.2bpp"
+ INCBIN "gfx/tilesets/safari/4.2bpp"
+; fc645
+
+
+AnimateMinecartTile: ; fc645
+; Read from struct at de:
+; Destination (VRAM)
+; Address of the first tile in the frame array
+
+ ld hl, [sp+0]
+ ld b, h
+ ld c, l
+
+ ld a, [TileAnimationTimer]
+ and 7
+
+; Get frame index a
+ ld hl, .frames
+ add l
+ ld l, a
+ ld a, 0
+ adc h
+ ld h, a
+ ld a, [hl]
+
+; Destination
+ ld l, e
+ ld h, d
+ ld e, [hl]
+ inc hl
+ ld d, [hl]
+ inc hl
+
+; Add the frame index to the starting address
+ add [hl]
+ inc hl
+ ld h, [hl]
+ ld l, a
+ ld a, 0
+ adc h
+ ld h, a
+
+ ld sp, hl
+ ld l, e
+ ld h, d
+ jr WriteTile
+
+.frames
+ db $00, $10, $20, $30, $40, $30, $20, $10
+; fc673
+
+
NextTileFrame: ; fc673
ld hl, TileAnimationTimer
inc [hl]
@@ -17914,7 +18334,57 @@
ret
; fc71e
-INCBIN "baserom.gbc", $fc71e, $fcdc2 - $fc71e
+
+INCBIN "baserom.gbc", $fc71e, $fc750 - $fc71e
+
+
+MinecartTilePointers: ; fc750
+MinecartTilePointer1:
+ dw $92d0, MinecartTile1
+MinecartTilePointer2:
+ dw $92f0, MinecartTile2
+MinecartTilePointer3:
+ dw $93d0, MinecartTile3
+MinecartTilePointer4:
+ dw $93f0, MinecartTile4
+MinecartTilePointer5:
+ dw $93c0, MinecartTile5
+MinecartTilePointer6:
+ dw $92c0, MinecartTile6
+MinecartTilePointer7:
+ dw $94d0, MinecartTile7
+MinecartTilePointer8:
+ dw $94f0, MinecartTile8
+MinecartTilePointer9:
+ dw $95d0, MinecartTile9
+MinecartTilePointer10:
+ dw $95f0, MinecartTile10
+
+MinecartTile1:
+ INCBIN "gfx/tilesets/minecart/1.2bpp"
+MinecartTile2:
+ INCBIN "gfx/tilesets/minecart/2.2bpp"
+MinecartTile3:
+ INCBIN "gfx/tilesets/minecart/3.2bpp"
+MinecartTile4:
+ INCBIN "gfx/tilesets/minecart/4.2bpp"
+MinecartTile5:
+ INCBIN "gfx/tilesets/minecart/5.2bpp"
+MinecartTile6:
+ INCBIN "gfx/tilesets/minecart/6.2bpp"
+MinecartTile7:
+ INCBIN "gfx/tilesets/minecart/7.2bpp"
+MinecartTile8:
+ INCBIN "gfx/tilesets/minecart/8.2bpp"
+MinecartTile9:
+ INCBIN "gfx/tilesets/minecart/9.2bpp"
+MinecartTile10:
+ INCBIN "gfx/tilesets/minecart/10.2bpp"
+; fca98
+
+
+INCBIN "baserom.gbc", $fca98, $fcdc2 - $fca98
+
LoadTradesPointer: ; 0xfcdc2
ld d, 0
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -9,7 +9,7 @@
dw OlivinePokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $9, 1, 1
+ db $1b, MUSIC_POKEMON_CENTER, 1, 1
; had to increase the final size by 1
; had to convert 0x->$ (duh..)
; 0x9403d
@@ -22,7 +22,7 @@
dw OlivineGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $1b, 17, 1
+ db $1b, MUSIC_GYM, 17, 1
; 0x94046
OlivineVoltorbHouse_MapHeader: ; 0x94046
@@ -33,7 +33,7 @@
dw OlivineVoltorbHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 1, 1
+ db $1b, MUSIC_VIOLET_CITY, 1, 1
; 0x9404f
OlivineHouseBeta_MapHeader: ; 0x9404f
@@ -44,7 +44,7 @@
dw OlivineHouseBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 1, 1
+ db $1b, MUSIC_VIOLET_CITY, 1, 1
; 0x94058
OlivinePunishmentSpeechHouse_MapHeader: ; 0x94058
@@ -55,7 +55,7 @@
dw OlivinePunishmentSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 1, 1
+ db $1b, MUSIC_VIOLET_CITY, 1, 1
; 0x94061
OlivineGoodRodHouse_MapHeader: ; 0x94061
@@ -66,29 +66,29 @@
dw OlivineGoodRodHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 1, 1
+ db $1b, MUSIC_VIOLET_CITY, 1, 1
; 0x9406a
OlivineCafe_MapHeader: ; 0x9406a
; bank, tileset, permission
- db $25, $e, 3
+ db BANK(OlivineCafe_SecondMapHeader), $e, 3
; second map header
dw OlivineCafe_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 1, 1
+ db $1b, MUSIC_VIOLET_CITY, 1, 1
; 0x94073
OlivineMart_MapHeader: ; 0x94073
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(OlivineMart_SecondMapHeader), $c, 3
; second map header
dw OlivineMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 1, 1
+ db $1b, MUSIC_VIOLET_CITY, 1, 1
; 0x9407c
Route38EcruteakGate_MapHeader: ; 0x9407c
@@ -99,7 +99,7 @@
dw Route38EcruteakGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $19, $47, 1, 1
+ db $19, MUSIC_ROUTE_37, 1, 1
; 0x94085
Route39Barn_MapHeader: ; 0x94085
@@ -110,7 +110,7 @@
dw Route39Barn_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1a, $2c, 1, 1
+ db $1a, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x9408e
Route39Farmhouse_MapHeader: ; 0x9408e
@@ -121,7 +121,7 @@
dw Route39Farmhouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1a, $2c, 1, 1
+ db $1a, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x94097
Route38_MapHeader: ; 0x94097
@@ -132,7 +132,7 @@
dw Route38_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $19, $47, 0, 1
+ db $19, MUSIC_ROUTE_37, 0, 1
; 0x940a0
Route39_MapHeader: ; 0x940a0
@@ -143,7 +143,7 @@
dw Route39_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1a, $47, 0, 1
+ db $1a, MUSIC_ROUTE_37, 0, 1
; 0x940a9
OlivineCity_MapHeader: ; 0x940a9
@@ -154,7 +154,7 @@
dw OlivineCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 0, 1
+ db $1b, MUSIC_VIOLET_CITY, 0, 1
; 0x940b2
@@ -168,18 +168,18 @@
dw MahoganyRedGyaradosSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $24, $26, 1, 1
+ db $24, MUSIC_CHERRYGROVE_CITY, 1, 1
; 0x940bb
MahoganyGym_MapHeader: ; 0x940bb
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(MahoganyGym_SecondMapHeader), $f, 3
; second map header
dw MahoganyGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $24, $1b, 17, 1
+ db $24, MUSIC_GYM, 17, 1
; 0x940c4
MahoganyPokeCenter1F_MapHeader: ; 0x940c4
@@ -190,7 +190,7 @@
dw MahoganyPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $24, $9, 1, 1
+ db $24, MUSIC_POKEMON_CENTER, 1, 1
; 0x940cd
Route42EcruteakGate_MapHeader: ; 0x940cd
@@ -201,7 +201,7 @@
dw Route42EcruteakGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $22, $45, 1, 1
+ db $22, MUSIC_LAKE_OF_RAGE, 1, 1
; 0x940d6
Route42_MapHeader: ; 0x940d6
@@ -212,7 +212,7 @@
dw Route42_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $22, $45, 0, 3
+ db $22, MUSIC_LAKE_OF_RAGE, 0, 3
; 0x940df
Route44_MapHeader: ; 0x940df
@@ -223,7 +223,7 @@
dw Route44_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $27, $45, 0, 4
+ db $27, MUSIC_LAKE_OF_RAGE, 0, 4
; 0x940e8
MahoganyTown_MapHeader: ; 0x940e8
@@ -234,7 +234,7 @@
dw MahoganyTown_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $24, $26, 0, 1
+ db $24, MUSIC_CHERRYGROVE_CITY, 0, 1
; 0x940f1
@@ -248,7 +248,7 @@
dw SproutTower1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $7, $42, 1, 1
+ db $7, MUSIC_SPROUT_TOWER, 1, 1
; 0x940fa
SproutTower2F_MapHeader: ; 0x940fa
@@ -259,7 +259,7 @@
dw SproutTower2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $7, $42, 1, 1
+ db $7, MUSIC_SPROUT_TOWER, 1, 1
; 0x94103
SproutTower3F_MapHeader: ; 0x94103
@@ -270,7 +270,7 @@
dw SproutTower3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $7, $42, 1, 1
+ db $7, MUSIC_SPROUT_TOWER, 1, 1
; 0x9410c
TinTower1F_MapHeader: ; 0x9410c
@@ -281,7 +281,7 @@
dw TinTower1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x94115
TinTower2F_MapHeader: ; 0x94115
@@ -292,7 +292,7 @@
dw TinTower2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x9411e
TinTower3F_MapHeader: ; 0x9411e
@@ -303,7 +303,7 @@
dw TinTower3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x94127
TinTower4F_MapHeader: ; 0x94127
@@ -314,7 +314,7 @@
dw TinTower4F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x94130
TinTower5F_MapHeader: ; 0x94130
@@ -325,7 +325,7 @@
dw TinTower5F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x94139
TinTower6F_MapHeader: ; 0x94139
@@ -336,7 +336,7 @@
dw TinTower6F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x94142
TinTower7F_MapHeader: ; 0x94142
@@ -347,7 +347,7 @@
dw TinTower7F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x9414b
TinTower8F_MapHeader: ; 0x9414b
@@ -358,7 +358,7 @@
dw TinTower8F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x94154
TinTower9F_MapHeader: ; 0x94154
@@ -369,7 +369,7 @@
dw TinTower9F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 1, 1
+ db $17, MUSIC_TIN_TOWER, 1, 1
; 0x9415d
BurnedTower1F_MapHeader: ; 0x9415d
@@ -380,7 +380,7 @@
dw BurnedTower1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $18, $43, 18, 1
+ db $18, MUSIC_BURNED_TOWER, 18, 1
; 0x94166
BurnedTowerB1F_MapHeader: ; 0x94166
@@ -391,7 +391,7 @@
dw BurnedTowerB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $18, $43, 18, 1
+ db $18, MUSIC_BURNED_TOWER, 18, 1
; 0x9416f
NationalPark_MapHeader: ; 0x9416f
@@ -402,7 +402,7 @@
dw NationalPark_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $13, $23, 0, 1
+ db $13, MUSIC_NATIONAL_PARK, 0, 1
; 0x94178
NationalParkBugContest_MapHeader: ; 0x94178
@@ -413,62 +413,62 @@
dw NationalParkBugContest_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $13, $59, 0, 1
+ db $13, MUSIC_BUG_CATCHING_CONTEST, 0, 1
; 0x94181
RadioTower1F_MapHeader: ; 0x94181
; bank, tileset, permission
- db $25, $1b, 3
+ db BANK(RadioTower1F_SecondMapHeader), $1b, 3
; second map header
dw RadioTower1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $11, $bd, 17, 1
+ db $11, 1<<7 | MUSIC_GOLDENROD_CITY, 17, 1
; 0x9418a
RadioTower2F_MapHeader: ; 0x9418a
; bank, tileset, permission
- db $25, $1b, 3
+ db BANK(RadioTower2F_SecondMapHeader), $1b, 3
; second map header
dw RadioTower2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $11, $bd, 17, 1
+ db $11, 1<<7 | MUSIC_GOLDENROD_CITY, 17, 1
; 0x94193
RadioTower3F_MapHeader: ; 0x94193
; bank, tileset, permission
- db $25, $1b, 3
+ db BANK(RadioTower3F_SecondMapHeader), $1b, 3
; second map header
dw RadioTower3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $11, $bd, 17, 1
+ db $11, 1<<7 | MUSIC_GOLDENROD_CITY, 17, 1
; 0x9419c
RadioTower4F_MapHeader: ; 0x9419c
; bank, tileset, permission
- db $25, $1b, 3
+ db BANK(RadioTower4F_SecondMapHeader), $1b, 3
; second map header
dw RadioTower4F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $11, $bd, 17, 1
+ db $11, 1<<7 | MUSIC_GOLDENROD_CITY, 17, 1
; 0x941a5
RadioTower5F_MapHeader: ; 0x941a5
; bank, tileset, permission
- db $25, $1b, 3
+ db BANK(RadioTower5F_SecondMapHeader), $1b, 3
; second map header
dw RadioTower5F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $11, $bd, 17, 1
+ db $11, 1<<7 | MUSIC_GOLDENROD_CITY, 17, 1
; 0x941ae
RuinsofAlphOutside_MapHeader: ; 0x941ae
@@ -479,117 +479,117 @@
dw RuinsofAlphOutside_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 0, 4
+ db $9, MUSIC_UNION_CAVE, 0, 4
; 0x941b7
RuinsofAlphHoOhChamber_MapHeader: ; 0x941b7
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphHoOhChamber_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphHoOhChamber_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x941c0
RuinsofAlphKabutoChamber_MapHeader: ; 0x941c0
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphKabutoChamber_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphKabutoChamber_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x941c9
RuinsofAlphOmanyteChamber_MapHeader: ; 0x941c9
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphOmanyteChamber_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphOmanyteChamber_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x941d2
RuinsofAlphAerodactylChamber_MapHeader: ; 0x941d2
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphAerodactylChamber_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphAerodactylChamber_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x941db
RuinsofAlphInnerChamber_MapHeader: ; 0x941db
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphInnerChamber_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphInnerChamber_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $55, 17, 1
+ db $9, MUSIC_RUINS_OF_ALPH_INTERIOR, 17, 1
; 0x941e4
RuinsofAlphResearchCenter_MapHeader: ; 0x941e4
; bank, tileset, permission
- db $25, $b, 3
+ db BANK(RuinsofAlphResearchCenter_SecondMapHeader), $b, 3
; second map header
dw RuinsofAlphResearchCenter_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 1, 1
+ db $9, MUSIC_UNION_CAVE, 1, 1
; 0x941ed
RuinsofAlphHoOhItemRoom_MapHeader: ; 0x941ed
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphHoOhItemRoom_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphHoOhItemRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x941f6
RuinsofAlphKabutoItemRoom_MapHeader: ; 0x941f6
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphKabutoItemRoom_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphKabutoItemRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x941ff
RuinsofAlphOmanyteItemRoom_MapHeader: ; 0x941ff
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphOmanyteItemRoom_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphOmanyteItemRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x94208
RuinsofAlphAerodactylItemRoom_MapHeader: ; 0x94208
; bank, tileset, permission
- db $25, $1a, 7
+ db BANK(RuinsofAlphAerodactylItemRoom_SecondMapHeader), $1a, 7
; second map header
dw RuinsofAlphAerodactylItemRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x94211
RuinsofAlphHoOhWordRoom_MapHeader: ; 0x94211
@@ -600,7 +600,7 @@
dw RuinsofAlphHoOhWordRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x9421a
RuinsofAlphKabutoWordRoom_MapHeader: ; 0x9421a
@@ -611,7 +611,7 @@
dw RuinsofAlphKabutoWordRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x94223
RuinsofAlphOmanyteWordRoom_MapHeader: ; 0x94223
@@ -622,7 +622,7 @@
dw RuinsofAlphOmanyteWordRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x9422c
RuinsofAlphAerodactylWordRoom_MapHeader: ; 0x9422c
@@ -633,7 +633,7 @@
dw RuinsofAlphAerodactylWordRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $9, $28, 17, 1
+ db $9, MUSIC_UNION_CAVE, 17, 1
; 0x94235
UnionCave1F_MapHeader: ; 0x94235
@@ -644,7 +644,7 @@
dw UnionCave1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $a, $28, 18, 3
+ db $a, MUSIC_UNION_CAVE, 18, 3
; 0x9423e
UnionCaveB1F_MapHeader: ; 0x9423e
@@ -655,7 +655,7 @@
dw UnionCaveB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $a, $28, 18, 3
+ db $a, MUSIC_UNION_CAVE, 18, 3
; 0x94247
UnionCaveB2F_MapHeader: ; 0x94247
@@ -666,7 +666,7 @@
dw UnionCaveB2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $a, $28, 18, 1
+ db $a, MUSIC_UNION_CAVE, 18, 1
; 0x94250
SlowpokeWellB1F_MapHeader: ; 0x94250
@@ -677,7 +677,7 @@
dw SlowpokeWellB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $d, $33, 18, 3
+ db $d, MUSIC_DARK_CAVE, 18, 3
; 0x94259
SlowpokeWellB2F_MapHeader: ; 0x94259
@@ -688,7 +688,7 @@
dw SlowpokeWellB2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $d, $33, 18, 3
+ db $d, MUSIC_DARK_CAVE, 18, 3
; 0x94262
OlivineLighthouse1F_MapHeader: ; 0x94262
@@ -699,7 +699,7 @@
dw OlivineLighthouse1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1c, $44, 1, 1
+ db $1c, MUSIC_LIGHTHOUSE, 1, 1
; 0x9426b
OlivineLighthouse2F_MapHeader: ; 0x9426b
@@ -710,7 +710,7 @@
dw OlivineLighthouse2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1c, $44, 1, 1
+ db $1c, MUSIC_LIGHTHOUSE, 1, 1
; 0x94274
OlivineLighthouse3F_MapHeader: ; 0x94274
@@ -721,7 +721,7 @@
dw OlivineLighthouse3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1c, $44, 1, 1
+ db $1c, MUSIC_LIGHTHOUSE, 1, 1
; 0x9427d
OlivineLighthouse4F_MapHeader: ; 0x9427d
@@ -732,7 +732,7 @@
dw OlivineLighthouse4F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1c, $44, 1, 1
+ db $1c, MUSIC_LIGHTHOUSE, 1, 1
; 0x94286
OlivineLighthouse5F_MapHeader: ; 0x94286
@@ -743,7 +743,7 @@
dw OlivineLighthouse5F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1c, $44, 1, 1
+ db $1c, MUSIC_LIGHTHOUSE, 1, 1
; 0x9428f
OlivineLighthouse6F_MapHeader: ; 0x9428f
@@ -754,7 +754,7 @@
dw OlivineLighthouse6F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1c, $2d, 1, 1
+ db $1c, MUSIC_VIOLET_CITY, 1, 1
; 0x94298
MahoganyMart1F_MapHeader: ; 0x94298
@@ -765,51 +765,51 @@
dw MahoganyMart1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $24, $64, 17, 1
+ db $24, MUSIC_MAHOGANY_MART, 17, 1
; 0x942a1
TeamRocketBaseB1F_MapHeader: ; 0x942a1
; bank, tileset, permission
- db $25, $1c, 7
+ db BANK(TeamRocketBaseB1F_SecondMapHeader), $1c, 7
; second map header
dw TeamRocketBaseB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $24, $48, 17, 1
+ db $24, MUSIC_ROCKET_HIDEOUT, 17, 1
; 0x942aa
TeamRocketBaseB2F_MapHeader: ; 0x942aa
; bank, tileset, permission
- db $25, $b, 7
+ db BANK(TeamRocketBaseB2F_SecondMapHeader), $b, 7
; second map header
dw TeamRocketBaseB2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $24, $48, 17, 1
+ db $24, MUSIC_ROCKET_HIDEOUT, 17, 1
; 0x942b3
TeamRocketBaseB3F_MapHeader: ; 0x942b3
; bank, tileset, permission
- db $25, $b, 7
+ db BANK(TeamRocketBaseB3F_SecondMapHeader), $b, 7
; second map header
dw TeamRocketBaseB3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $24, $48, 17, 1
+ db $24, MUSIC_ROCKET_HIDEOUT, 17, 1
; 0x942bc
IlexForest_MapHeader: ; 0x942bc
; bank, tileset, permission
- db $25, $1f, 4
+ db BANK(IlexForest_SecondMapHeader), $1f, 4
; second map header
dw IlexForest_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $e, $28, 2, 4
+ db $e, MUSIC_UNION_CAVE, 2, 4
; 0x942c5
WarehouseEntrance_MapHeader: ; 0x942c5
@@ -820,238 +820,238 @@
dw WarehouseEntrance_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $28, 17, 1
+ db $10, MUSIC_UNION_CAVE, 17, 1
; 0x942ce
UndergroundPathSwitchRoomEntrances_MapHeader: ; 0x942ce
; bank, tileset, permission
- db $25, $f, 7
+ db BANK(UndergroundPathSwitchRoomEntrances_SecondMapHeader), $f, 7
; second map header
dw UndergroundPathSwitchRoomEntrances_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $28, 17, 1
+ db $10, MUSIC_UNION_CAVE, 17, 1
; 0x942d7
GoldenrodDeptStoreB1F_MapHeader: ; 0x942d7
; bank, tileset, permission
- db $25, $1c, 7
+ db BANK(GoldenrodDeptStoreB1F_SecondMapHeader), $1c, 7
; second map header
dw GoldenrodDeptStoreB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 17, 1
+ db $10, MUSIC_GOLDENROD_CITY, 17, 1
; 0x942e0
UndergroundWarehouse_MapHeader: ; 0x942e0
; bank, tileset, permission
- db $25, $1c, 7
+ db BANK(UndergroundWarehouse_SecondMapHeader), $1c, 7
; second map header
dw UndergroundWarehouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $28, 17, 1
+ db $10, MUSIC_UNION_CAVE, 17, 1
; 0x942e9
MountMortar1FOutside_MapHeader: ; 0x942e9
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(MountMortar1FOutside_SecondMapHeader), $1e, 4
; second map header
dw MountMortar1FOutside_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $23, $28, 18, 3
+ db $23, MUSIC_UNION_CAVE, 18, 3
; 0x942f2
MountMortar1FInside_MapHeader: ; 0x942f2
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(MountMortar1FInside_SecondMapHeader), $1e, 4
; second map header
dw MountMortar1FInside_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $23, $28, 18, 3
+ db $23, MUSIC_UNION_CAVE, 18, 3
; 0x942fb
MountMortar2FInside_MapHeader: ; 0x942fb
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(MountMortar2FInside_SecondMapHeader), $1e, 4
; second map header
dw MountMortar2FInside_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $23, $28, 18, 3
+ db $23, MUSIC_UNION_CAVE, 18, 3
; 0x94304
MountMortarB1F_MapHeader: ; 0x94304
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(MountMortarB1F_SecondMapHeader), $1e, 4
; second map header
dw MountMortarB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $23, $28, 18, 3
+ db $23, MUSIC_UNION_CAVE, 18, 3
; 0x9430d
IcePath1F_MapHeader: ; 0x9430d
; bank, tileset, permission
- db $25, $1d, 4
+ db BANK(IcePath1F_SecondMapHeader), $1d, 4
; second map header
dw IcePath1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $28, $33, 18, 5
+ db $28, MUSIC_DARK_CAVE, 18, 5
; 0x94316
IcePathB1F_MapHeader: ; 0x94316
; bank, tileset, permission
- db $25, $1d, 4
+ db BANK(IcePathB1F_SecondMapHeader), $1d, 4
; second map header
dw IcePathB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $28, $33, 18, 5
+ db $28, MUSIC_DARK_CAVE, 18, 5
; 0x9431f
IcePathB2FMahoganySide_MapHeader: ; 0x9431f
; bank, tileset, permission
- db $25, $1d, 4
+ db BANK(IcePathB2FMahoganySide_SecondMapHeader), $1d, 4
; second map header
dw IcePathB2FMahoganySide_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $28, $33, 18, 5
+ db $28, MUSIC_DARK_CAVE, 18, 5
; 0x94328
IcePathB2FBlackthornSide_MapHeader: ; 0x94328
; bank, tileset, permission
- db $25, $1d, 4
+ db BANK(IcePathB2FBlackthornSide_SecondMapHeader), $1d, 4
; second map header
dw IcePathB2FBlackthornSide_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $28, $33, 18, 5
+ db $28, MUSIC_DARK_CAVE, 18, 5
; 0x94331
IcePathB3F_MapHeader: ; 0x94331
; bank, tileset, permission
- db $25, $1d, 4
+ db BANK(IcePathB3F_SecondMapHeader), $1d, 4
; second map header
dw IcePathB3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $28, $33, 18, 5
+ db $28, MUSIC_DARK_CAVE, 18, 5
; 0x9433a
WhirlIslandNW_MapHeader: ; 0x9433a
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(WhirlIslandNW_SecondMapHeader), $1e, 4
; second map header
dw WhirlIslandNW_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1f, $28, 20, 10
+ db $1f, MUSIC_UNION_CAVE, 20, 10
; 0x94343
WhirlIslandNE_MapHeader: ; 0x94343
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(WhirlIslandNE_SecondMapHeader), $1e, 4
; second map header
dw WhirlIslandNE_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1f, $28, 20, 10
+ db $1f, MUSIC_UNION_CAVE, 20, 10
; 0x9434c
WhirlIslandSW_MapHeader: ; 0x9434c
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(WhirlIslandSW_SecondMapHeader), $1e, 4
; second map header
dw WhirlIslandSW_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1f, $28, 20, 10
+ db $1f, MUSIC_UNION_CAVE, 20, 10
; 0x94355
WhirlIslandCave_MapHeader: ; 0x94355
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(WhirlIslandCave_SecondMapHeader), $1e, 4
; second map header
dw WhirlIslandCave_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1f, $28, 20, 10
+ db $1f, MUSIC_UNION_CAVE, 20, 10
; 0x9435e
WhirlIslandSE_MapHeader: ; 0x9435e
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(WhirlIslandSE_SecondMapHeader), $1e, 4
; second map header
dw WhirlIslandSE_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1f, $28, 20, 10
+ db $1f, MUSIC_UNION_CAVE, 20, 10
; 0x94367
WhirlIslandB1F_MapHeader: ; 0x94367
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(WhirlIslandB1F_SecondMapHeader), $1e, 4
; second map header
dw WhirlIslandB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1f, $28, 20, 10
+ db $1f, MUSIC_UNION_CAVE, 20, 10
; 0x94370
WhirlIslandB2F_MapHeader: ; 0x94370
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(WhirlIslandB2F_SecondMapHeader), $1e, 4
; second map header
dw WhirlIslandB2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1f, $28, 20, 10
+ db $1f, MUSIC_UNION_CAVE, 20, 10
; 0x94379
WhirlIslandLugiaChamber_MapHeader: ; 0x94379
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(WhirlIslandLugiaChamber_SecondMapHeader), $1e, 4
; second map header
dw WhirlIslandLugiaChamber_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1f, $28, 20, 10
+ db $1f, MUSIC_UNION_CAVE, 20, 10
; 0x94382
SilverCaveRoom1_MapHeader: ; 0x94382
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(SilverCaveRoom1_SecondMapHeader), $1e, 4
; second map header
dw SilverCaveRoom1_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2e, $44, 20, 3
+ db $2e, MUSIC_LIGHTHOUSE, 20, 3
; 0x9438b
SilverCaveRoom2_MapHeader: ; 0x9438b
@@ -1062,7 +1062,7 @@
dw SilverCaveRoom2_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2e, $44, 18, 3
+ db $2e, MUSIC_LIGHTHOUSE, 18, 3
; 0x94394
SilverCaveRoom3_MapHeader: ; 0x94394
@@ -1073,7 +1073,7 @@
dw SilverCaveRoom3_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2e, $44, 17, 3
+ db $2e, MUSIC_LIGHTHOUSE, 17, 3
; 0x9439d
SilverCaveItemRooms_MapHeader: ; 0x9439d
@@ -1084,29 +1084,29 @@
dw SilverCaveItemRooms_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2e, $44, 18, 3
+ db $2e, MUSIC_LIGHTHOUSE, 18, 3
; 0x943a6
DarkCaveVioletEntrance_MapHeader: ; 0x943a6
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(DarkCaveVioletEntrance_SecondMapHeader), $1e, 4
; second map header
dw DarkCaveVioletEntrance_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2c, $33, 20, 3
+ db $2c, MUSIC_DARK_CAVE, 20, 3
; 0x943af
DarkCaveBlackthornEntrance_MapHeader: ; 0x943af
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(DarkCaveBlackthornEntrance_SecondMapHeader), $1e, 4
; second map header
dw DarkCaveBlackthornEntrance_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2c, $33, 20, 3
+ db $2c, MUSIC_DARK_CAVE, 20, 3
; 0x943b8
DragonsDen1F_MapHeader: ; 0x943b8
@@ -1117,7 +1117,7 @@
dw DragonsDen1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2a, $49, 18, 5
+ db $2a, MUSIC_DRAGONS_DEN, 18, 5
; 0x943c1
DragonsDenB1F_MapHeader: ; 0x943c1
@@ -1128,18 +1128,18 @@
dw DragonsDenB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2a, $49, 18, 5
+ db $2a, MUSIC_DRAGONS_DEN, 18, 5
; 0x943ca
DragonShrine_MapHeader: ; 0x943ca
; bank, tileset, permission
- db $25, $a, 3
+ db BANK(DragonShrine_SecondMapHeader), $a, 3
; second map header
dw DragonShrine_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2a, $49, 18, 1
+ db $2a, MUSIC_DRAGONS_DEN, 18, 1
; 0x943d3
TohjoFalls_MapHeader: ; 0x943d3
@@ -1150,7 +1150,7 @@
dw TohjoFalls_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5d, $28, 18, 3
+ db $5d, MUSIC_UNION_CAVE, 18, 3
; 0x943dc
DiglettsCave_MapHeader: ; 0x943dc
@@ -1161,7 +1161,7 @@
dw DiglettsCave_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3e, $10, 18, 1
+ db $3e, MUSIC_MT_MOON, 18, 1
; 0x943e5
MountMoon_MapHeader: ; 0x943e5
@@ -1172,40 +1172,40 @@
dw MountMoon_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $35, $10, 18, 1
+ db $35, MUSIC_MT_MOON, 18, 1
; 0x943ee
Underground_MapHeader: ; 0x943ee
; bank, tileset, permission
- db $25, $1c, 6
+ db BANK(Underground_SecondMapHeader), $1c, 6
; second map header
dw Underground_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3b, $10, 2, 1
+ db $3b, MUSIC_MT_MOON, 2, 1
; 0x943f7
RockTunnel1F_MapHeader: ; 0x943f7
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(RockTunnel1F_SecondMapHeader), $1e, 4
; second map header
dw RockTunnel1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $42, $10, 20, 1
+ db $42, MUSIC_MT_MOON, 20, 1
; 0x94400
RockTunnelB1F_MapHeader: ; 0x94400
; bank, tileset, permission
- db $25, $1e, 4
+ db BANK(RockTunnelB1F_SecondMapHeader), $1e, 4
; second map header
dw RockTunnelB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $42, $10, 20, 1
+ db $42, MUSIC_MT_MOON, 20, 1
; 0x94409
SafariZoneFuchsiaGateBeta_MapHeader: ; 0x94409
@@ -1216,7 +1216,7 @@
dw SafariZoneFuchsiaGateBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $15, 1, 1
+ db $51, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94412
SafariZoneBeta_MapHeader: ; 0x94412
@@ -1227,7 +1227,7 @@
dw SafariZoneBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $22, 0, 1
+ db $51, MUSIC_EVOLUTION, 0, 1
; 0x9441b
VictoryRoad_MapHeader: ; 0x9441b
@@ -1238,7 +1238,7 @@
dw VictoryRoad_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $58, $4f, 18, 1
+ db $58, MUSIC_VICTORY_ROAD, 18, 1
; 0x94424
@@ -1252,7 +1252,7 @@
dw EcruteakHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $2c, 1, 1
+ db $16, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x9442d
WiseTriosRoom_MapHeader: ; 0x9442d
@@ -1263,7 +1263,7 @@
dw WiseTriosRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $2c, 17, 1
+ db $16, MUSIC_ECRUTEAK_CITY, 17, 1
; 0x94436
EcruteakPokeCenter1F_MapHeader: ; 0x94436
@@ -1274,7 +1274,7 @@
dw EcruteakPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $9, 1, 1
+ db $16, MUSIC_POKEMON_CENTER, 1, 1
; 0x9443f
EcruteakLugiaSpeechHouse_MapHeader: ; 0x9443f
@@ -1285,7 +1285,7 @@
dw EcruteakLugiaSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $2c, 1, 1
+ db $16, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x94448
DanceTheatre_MapHeader: ; 0x94448
@@ -1296,18 +1296,18 @@
dw DanceTheatre_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $57, 1, 1
+ db $16, MUSIC_DANCING_HALL, 1, 1
; 0x94451
EcruteakMart_MapHeader: ; 0x94451
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(EcruteakMart_SecondMapHeader), $c, 3
; second map header
dw EcruteakMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $2c, 1, 1
+ db $16, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x9445a
EcruteakGym_MapHeader: ; 0x9445a
@@ -1318,7 +1318,7 @@
dw EcruteakGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $1b, 17, 1
+ db $16, MUSIC_GYM, 17, 1
; 0x94463
EcruteakItemfinderHouse_MapHeader: ; 0x94463
@@ -1329,7 +1329,7 @@
dw EcruteakItemfinderHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $2c, 1, 1
+ db $16, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x9446c
EcruteakCity_MapHeader: ; 0x9446c
@@ -1340,7 +1340,7 @@
dw EcruteakCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $16, $2c, 0, 4
+ db $16, MUSIC_ECRUTEAK_CITY, 0, 4
; 0x94475
@@ -1348,24 +1348,24 @@
BlackthornGym1F_MapHeader: ; 0x94475
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(BlackthornGym1F_SecondMapHeader), $f, 3
; second map header
dw BlackthornGym1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $29, $1b, 17, 1
+ db $29, MUSIC_GYM, 17, 1
; 0x9447e
BlackthornGym2F_MapHeader: ; 0x9447e
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(BlackthornGym2F_SecondMapHeader), $f, 3
; second map header
dw BlackthornGym2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $29, $1b, 17, 1
+ db $29, MUSIC_GYM, 17, 1
; 0x94487
BlackthornDragonSpeechHouse_MapHeader: ; 0x94487
@@ -1376,7 +1376,7 @@
dw BlackthornDragonSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $29, $25, 1, 1
+ db $29, MUSIC_AZALEA_TOWN, 1, 1
; 0x94490
BlackthornDodrioTradeHouse_MapHeader: ; 0x94490
@@ -1387,18 +1387,18 @@
dw BlackthornDodrioTradeHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $29, $25, 1, 1
+ db $29, MUSIC_AZALEA_TOWN, 1, 1
; 0x94499
BlackthornMart_MapHeader: ; 0x94499
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(BlackthornMart_SecondMapHeader), $c, 3
; second map header
dw BlackthornMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $29, $25, 1, 1
+ db $29, MUSIC_AZALEA_TOWN, 1, 1
; 0x944a2
BlackthornPokeCenter1F_MapHeader: ; 0x944a2
@@ -1409,7 +1409,7 @@
dw BlackthornPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $29, $9, 1, 1
+ db $29, MUSIC_POKEMON_CENTER, 1, 1
; 0x944ab
MoveDeletersHouse_MapHeader: ; 0x944ab
@@ -1420,7 +1420,7 @@
dw MoveDeletersHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $29, $25, 1, 1
+ db $29, MUSIC_AZALEA_TOWN, 1, 1
; 0x944b4
Route45_MapHeader: ; 0x944b4
@@ -1431,7 +1431,7 @@
dw Route45_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2b, $35, 0, 9
+ db $2b, MUSIC_ROUTE_36, 0, 9
; 0x944bd
Route46_MapHeader: ; 0x944bd
@@ -1442,7 +1442,7 @@
dw Route46_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2d, $35, 0, 1
+ db $2d, MUSIC_ROUTE_36, 0, 1
; 0x944c6
BlackthornCity_MapHeader: ; 0x944c6
@@ -1453,7 +1453,7 @@
dw BlackthornCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $29, $25, 0, 4
+ db $29, MUSIC_AZALEA_TOWN, 0, 4
; 0x944cf
@@ -1467,7 +1467,7 @@
dw CinnabarPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $55, $9, 1, 1
+ db $55, MUSIC_POKEMON_CENTER, 1, 1
; 0x944d8
CinnabarPokeCenter2FBeta_MapHeader: ; 0x944d8
@@ -1478,7 +1478,7 @@
dw CinnabarPokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $55, $9, 1, 1
+ db $55, MUSIC_POKEMON_CENTER, 1, 1
; 0x944e1
Route19FuchsiaGate_MapHeader: ; 0x944e1
@@ -1489,7 +1489,7 @@
dw Route19FuchsiaGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $52, $3, 1, 1
+ db $52, MUSIC_ROUTE_3, 1, 1
; 0x944ea
SeafoamGym_MapHeader: ; 0x944ea
@@ -1500,7 +1500,7 @@
dw SeafoamGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $54, $1b, 17, 1
+ db $54, MUSIC_GYM, 17, 1
; 0x944f3
Route19_MapHeader: ; 0x944f3
@@ -1511,7 +1511,7 @@
dw Route19_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $52, $3, 0, 1
+ db $52, MUSIC_ROUTE_3, 0, 1
; 0x944fc
Route20_MapHeader: ; 0x944fc
@@ -1522,7 +1522,7 @@
dw Route20_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $53, $3, 0, 2
+ db $53, MUSIC_ROUTE_3, 0, 2
; 0x94505
Route21_MapHeader: ; 0x94505
@@ -1533,7 +1533,7 @@
dw Route21_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $56, $3, 0, 2
+ db $56, MUSIC_ROUTE_3, 0, 2
; 0x9450e
CinnabarIsland_MapHeader: ; 0x9450e
@@ -1544,7 +1544,7 @@
dw CinnabarIsland_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $55, $15, 0, 2
+ db $55, MUSIC_VIRIDIAN_CITY, 0, 2
; 0x94517
@@ -1558,7 +1558,7 @@
dw CeruleanGymBadgeSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $37, $15, 1, 1
+ db $37, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94520
CeruleanPoliceStation_MapHeader: ; 0x94520
@@ -1569,7 +1569,7 @@
dw CeruleanPoliceStation_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $37, $15, 1, 1
+ db $37, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94529
CeruleanTradeSpeechHouse_MapHeader: ; 0x94529
@@ -1580,7 +1580,7 @@
dw CeruleanTradeSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $37, $15, 1, 1
+ db $37, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94532
CeruleanPokeCenter1F_MapHeader: ; 0x94532
@@ -1591,7 +1591,7 @@
dw CeruleanPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $37, $9, 1, 1
+ db $37, MUSIC_POKEMON_CENTER, 1, 1
; 0x9453b
CeruleanPokeCenter2FBeta_MapHeader: ; 0x9453b
@@ -1602,7 +1602,7 @@
dw CeruleanPokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $37, $9, 1, 1
+ db $37, MUSIC_POKEMON_CENTER, 1, 1
; 0x94544
CeruleanGym_MapHeader: ; 0x94544
@@ -1613,18 +1613,18 @@
dw CeruleanGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $37, $1b, 17, 0
+ db $37, MUSIC_GYM, 17, 0
; 0x9454d
CeruleanMart_MapHeader: ; 0x9454d
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CeruleanMart_SecondMapHeader), $c, 3
; second map header
dw CeruleanMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $37, $15, 1, 1
+ db $37, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94556
Route10PokeCenter1F_MapHeader: ; 0x94556
@@ -1635,7 +1635,7 @@
dw Route10PokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $43, $9, 1, 1
+ db $43, MUSIC_POKEMON_CENTER, 1, 1
; 0x9455f
Route10PokeCenter2FBeta_MapHeader: ; 0x9455f
@@ -1646,18 +1646,18 @@
dw Route10PokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $43, $9, 1, 1
+ db $43, MUSIC_POKEMON_CENTER, 1, 1
; 0x94568
PowerPlant_MapHeader: ; 0x94568
; bank, tileset, permission
- db $25, $b, 3
+ db BANK(PowerPlant_SecondMapHeader), $b, 3
; second map header
dw PowerPlant_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $44, $15, 1, 1
+ db $44, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94571
BillsHouse_MapHeader: ; 0x94571
@@ -1668,7 +1668,7 @@
dw BillsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $39, $15, 1, 1
+ db $39, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x9457a
Route4_MapHeader: ; 0x9457a
@@ -1679,7 +1679,7 @@
dw Route4_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $36, $3, 0, 0
+ db $36, MUSIC_ROUTE_3, 0, 0
; 0x94583
Route9_MapHeader: ; 0x94583
@@ -1690,7 +1690,7 @@
dw Route9_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $41, $3, 0, 3
+ db $41, MUSIC_ROUTE_3, 0, 3
; 0x9458c
Route10North_MapHeader: ; 0x9458c
@@ -1701,7 +1701,7 @@
dw Route10North_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $43, $3, 0, 3
+ db $43, MUSIC_ROUTE_3, 0, 3
; 0x94595
Route24_MapHeader: ; 0x94595
@@ -1712,7 +1712,7 @@
dw Route24_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $38, $3, 0, 3
+ db $38, MUSIC_ROUTE_3, 0, 3
; 0x9459e
Route25_MapHeader: ; 0x9459e
@@ -1723,7 +1723,7 @@
dw Route25_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $39, $3, 0, 3
+ db $39, MUSIC_ROUTE_3, 0, 3
; 0x945a7
CeruleanCity_MapHeader: ; 0x945a7
@@ -1734,7 +1734,7 @@
dw CeruleanCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $37, $15, 0, 0
+ db $37, MUSIC_VIRIDIAN_CITY, 0, 0
; 0x945b0
@@ -1748,7 +1748,7 @@
dw AzaleaPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $c, $9, 1, 1
+ db $c, MUSIC_POKEMON_CENTER, 1, 1
; 0x945b9
CharcoalKiln_MapHeader: ; 0x945b9
@@ -1759,18 +1759,18 @@
dw CharcoalKiln_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $c, $25, 1, 1
+ db $c, MUSIC_AZALEA_TOWN, 1, 1
; 0x945c2
AzaleaMart_MapHeader: ; 0x945c2
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(AzaleaMart_SecondMapHeader), $c, 3
; second map header
dw AzaleaMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $c, $25, 1, 1
+ db $c, MUSIC_AZALEA_TOWN, 1, 1
; 0x945cb
KurtsHouse_MapHeader: ; 0x945cb
@@ -1781,18 +1781,18 @@
dw KurtsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $c, $25, 1, 1
+ db $c, MUSIC_AZALEA_TOWN, 1, 1
; 0x945d4
AzaleaGym_MapHeader: ; 0x945d4
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(AzaleaGym_SecondMapHeader), $f, 3
; second map header
dw AzaleaGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $c, $1b, 17, 1
+ db $c, MUSIC_GYM, 17, 1
; 0x945dd
Route33_MapHeader: ; 0x945dd
@@ -1803,7 +1803,7 @@
dw Route33_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $b, $2b, 0, 1
+ db $b, MUSIC_ROUTE_30, 0, 1
; 0x945e6
AzaleaTown_MapHeader: ; 0x945e6
@@ -1814,7 +1814,7 @@
dw AzaleaTown_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $c, $25, 0, 1
+ db $c, MUSIC_AZALEA_TOWN, 0, 1
; 0x945ef
@@ -1828,7 +1828,7 @@
dw LakeofRageHiddenPowerHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $26, $45, 1, 1
+ db $26, MUSIC_LAKE_OF_RAGE, 1, 1
; 0x945f8
LakeofRageMagikarpHouse_MapHeader: ; 0x945f8
@@ -1839,7 +1839,7 @@
dw LakeofRageMagikarpHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $26, $45, 1, 1
+ db $26, MUSIC_LAKE_OF_RAGE, 1, 1
; 0x94601
Route43MahoganyGate_MapHeader: ; 0x94601
@@ -1850,7 +1850,7 @@
dw Route43MahoganyGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $25, $45, 1, 1
+ db $25, MUSIC_LAKE_OF_RAGE, 1, 1
; 0x9460a
Route43Gate_MapHeader: ; 0x9460a
@@ -1861,7 +1861,7 @@
dw Route43Gate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $25, $45, 1, 1
+ db $25, MUSIC_LAKE_OF_RAGE, 1, 1
; 0x94613
Route43_MapHeader: ; 0x94613
@@ -1872,7 +1872,7 @@
dw Route43_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $25, $45, 0, 4
+ db $25, MUSIC_LAKE_OF_RAGE, 0, 4
; 0x9461c
LakeofRage_MapHeader: ; 0x9461c
@@ -1883,7 +1883,7 @@
dw LakeofRage_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $26, $45, 0, 8
+ db $26, MUSIC_LAKE_OF_RAGE, 0, 8
; 0x94625
@@ -1897,7 +1897,7 @@
dw Route32_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $8, $2b, 0, 11
+ db $8, MUSIC_ROUTE_30, 0, 11
; 0x9462e
Route35_MapHeader: ; 0x9462e
@@ -1908,7 +1908,7 @@
dw Route35_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $12, $35, 0, 4
+ db $12, MUSIC_ROUTE_36, 0, 4
; 0x94637
Route36_MapHeader: ; 0x94637
@@ -1919,7 +1919,7 @@
dw Route36_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $14, $35, 0, 1
+ db $14, MUSIC_ROUTE_36, 0, 1
; 0x94640
Route37_MapHeader: ; 0x94640
@@ -1930,7 +1930,7 @@
dw Route37_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $15, $35, 0, 1
+ db $15, MUSIC_ROUTE_36, 0, 1
; 0x94649
VioletCity_MapHeader: ; 0x94649
@@ -1941,40 +1941,40 @@
dw VioletCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $6, $2d, 0, 4
+ db $6, MUSIC_VIOLET_CITY, 0, 4
; 0x94652
VioletMart_MapHeader: ; 0x94652
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(VioletMart_SecondMapHeader), $c, 3
; second map header
dw VioletMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $6, $2d, 1, 1
+ db $6, MUSIC_VIOLET_CITY, 1, 1
; 0x9465b
VioletGym_MapHeader: ; 0x9465b
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(VioletGym_SecondMapHeader), $f, 3
; second map header
dw VioletGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $6, $1b, 17, 1
+ db $6, MUSIC_GYM, 17, 1
; 0x94664
EarlsPokemonAcademy_MapHeader: ; 0x94664
; bank, tileset, permission
- db $25, $a, 3
+ db BANK(EarlsPokemonAcademy_SecondMapHeader), $a, 3
; second map header
dw EarlsPokemonAcademy_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $6, $2d, 1, 1
+ db $6, MUSIC_VIOLET_CITY, 1, 1
; 0x9466d
VioletNicknameSpeechHouse_MapHeader: ; 0x9466d
@@ -1985,7 +1985,7 @@
dw VioletNicknameSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $6, $2d, 1, 1
+ db $6, MUSIC_VIOLET_CITY, 1, 1
; 0x94676
VioletPokeCenter1F_MapHeader: ; 0x94676
@@ -1996,7 +1996,7 @@
dw VioletPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $6, $9, 1, 1
+ db $6, MUSIC_POKEMON_CENTER, 1, 1
; 0x9467f
VioletOnixTradeHouse_MapHeader: ; 0x9467f
@@ -2007,7 +2007,7 @@
dw VioletOnixTradeHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $6, $2d, 1, 1
+ db $6, MUSIC_VIOLET_CITY, 1, 1
; 0x94688
Route32RuinsofAlphGate_MapHeader: ; 0x94688
@@ -2018,7 +2018,7 @@
dw Route32RuinsofAlphGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $8, $2b, 1, 1
+ db $8, MUSIC_ROUTE_30, 1, 1
; 0x94691
Route32PokeCenter1F_MapHeader: ; 0x94691
@@ -2029,7 +2029,7 @@
dw Route32PokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $8, $9, 1, 1
+ db $8, MUSIC_POKEMON_CENTER, 1, 1
; 0x9469a
Route35Goldenrodgate_MapHeader: ; 0x9469a
@@ -2040,7 +2040,7 @@
dw Route35Goldenrodgate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $12, $35, 1, 1
+ db $12, MUSIC_ROUTE_36, 1, 1
; 0x946a3
Route35NationalParkgate_MapHeader: ; 0x946a3
@@ -2051,7 +2051,7 @@
dw Route35NationalParkgate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $12, $3d, 1, 1
+ db $12, MUSIC_GOLDENROD_CITY, 1, 1
; 0x946ac
Route36RuinsofAlphgate_MapHeader: ; 0x946ac
@@ -2062,7 +2062,7 @@
dw Route36RuinsofAlphgate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $14, $35, 1, 1
+ db $14, MUSIC_ROUTE_36, 1, 1
; 0x946b5
Route36NationalParkgate_MapHeader: ; 0x946b5
@@ -2073,7 +2073,7 @@
dw Route36NationalParkgate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $14, $3d, 1, 1
+ db $14, MUSIC_GOLDENROD_CITY, 1, 1
; 0x946be
@@ -2087,7 +2087,7 @@
dw Route34_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $f, $35, 0, 1
+ db $f, MUSIC_ROUTE_36, 0, 1
; 0x946c7
GoldenrodCity_MapHeader: ; 0x946c7
@@ -2098,18 +2098,18 @@
dw GoldenrodCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 0, 1
+ db $10, MUSIC_GOLDENROD_CITY, 0, 1
; 0x946d0
GoldenrodGym_MapHeader: ; 0x946d0
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(GoldenrodGym_SecondMapHeader), $f, 3
; second map header
dw GoldenrodGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $1b, 17, 1
+ db $10, MUSIC_GYM, 17, 1
; 0x946d9
GoldenrodBikeShop_MapHeader: ; 0x946d9
@@ -2120,7 +2120,7 @@
dw GoldenrodBikeShop_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x946e2
GoldenrodHappinessRater_MapHeader: ; 0x946e2
@@ -2131,7 +2131,7 @@
dw GoldenrodHappinessRater_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x946eb
GoldenrodBillsHouse_MapHeader: ; 0x946eb
@@ -2142,7 +2142,7 @@
dw GoldenrodBillsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x946f4
GoldenrodMagnetTrainStation_MapHeader: ; 0x946f4
@@ -2153,7 +2153,7 @@
dw GoldenrodMagnetTrainStation_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x946fd
GoldenrodFlowerShop_MapHeader: ; 0x946fd
@@ -2164,7 +2164,7 @@
dw GoldenrodFlowerShop_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x94706
GoldenrodPPSpeechHouse_MapHeader: ; 0x94706
@@ -2175,7 +2175,7 @@
dw GoldenrodPPSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x9470f
GoldenrodNameRatersHouse_MapHeader: ; 0x9470f
@@ -2186,106 +2186,106 @@
dw GoldenrodNameRatersHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x94718
GoldenrodDeptStore1F_MapHeader: ; 0x94718
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(GoldenrodDeptStore1F_SecondMapHeader), $c, 3
; second map header
dw GoldenrodDeptStore1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x94721
GoldenrodDeptStore2F_MapHeader: ; 0x94721
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(GoldenrodDeptStore2F_SecondMapHeader), $c, 3
; second map header
dw GoldenrodDeptStore2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x9472a
GoldenrodDeptStore3F_MapHeader: ; 0x9472a
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(GoldenrodDeptStore3F_SecondMapHeader), $c, 3
; second map header
dw GoldenrodDeptStore3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x94733
GoldenrodDeptStore4F_MapHeader: ; 0x94733
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(GoldenrodDeptStore4F_SecondMapHeader), $c, 3
; second map header
dw GoldenrodDeptStore4F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x9473c
GoldenrodDeptStore5F_MapHeader: ; 0x9473c
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(GoldenrodDeptStore5F_SecondMapHeader), $c, 3
; second map header
dw GoldenrodDeptStore5F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x94745
GoldenrodDeptStore6F_MapHeader: ; 0x94745
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(GoldenrodDeptStore6F_SecondMapHeader), $c, 3
; second map header
dw GoldenrodDeptStore6F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x9474e
GoldenrodDeptStoreElevator_MapHeader: ; 0x9474e
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(GoldenrodDeptStoreElevator_SecondMapHeader), $c, 3
; second map header
dw GoldenrodDeptStoreElevator_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x94757
GoldenrodDeptStoreRoof_MapHeader: ; 0x94757
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(GoldenrodDeptStoreRoof_SecondMapHeader), $c, 3
; second map header
dw GoldenrodDeptStoreRoof_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $3d, 1, 1
+ db $10, MUSIC_GOLDENROD_CITY, 1, 1
; 0x94760
GoldenrodGameCorner_MapHeader: ; 0x94760
; bank, tileset, permission
- db $25, $e, 3
+ db BANK(GoldenrodGameCorner_SecondMapHeader), $e, 3
; second map header
dw GoldenrodGameCorner_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $12, 1, 1
+ db $10, MUSIC_GAME_CORNER, 1, 1
; 0x94769
GoldenrodPokeCenter1F_MapHeader: ; 0x94769
@@ -2296,7 +2296,7 @@
dw GoldenrodPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $9, 1, 1
+ db $10, MUSIC_POKEMON_CENTER, 1, 1
; 0x94772
GoldenrodPokeComCenter2FMobile_MapHeader: ; 0x94772
@@ -2307,7 +2307,7 @@
dw GoldenrodPokeComCenter2FMobile_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $10, $9, 1, 1
+ db $10, MUSIC_POKEMON_CENTER, 1, 1
; 0x9477b
IlexForestAzaleaGate_MapHeader: ; 0x9477b
@@ -2318,7 +2318,7 @@
dw IlexForestAzaleaGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $f, $35, 1, 1
+ db $f, MUSIC_ROUTE_36, 1, 1
; 0x94784
Route34IlexForestGate_MapHeader: ; 0x94784
@@ -2329,7 +2329,7 @@
dw Route34IlexForestGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $f, $35, 1, 1
+ db $f, MUSIC_ROUTE_36, 1, 1
; 0x9478d
DayCare_MapHeader: ; 0x9478d
@@ -2340,7 +2340,7 @@
dw DayCare_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $f, $25, 1, 1
+ db $f, MUSIC_AZALEA_TOWN, 1, 1
; 0x94796
@@ -2354,7 +2354,7 @@
dw Route6_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3c, $3, 0, 4
+ db $3c, MUSIC_ROUTE_3, 0, 4
; 0x9479f
Route11_MapHeader: ; 0x9479f
@@ -2365,7 +2365,7 @@
dw Route11_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $49, $4, 0, 1
+ db $49, MUSIC_ROUTE_12, 0, 1
; 0x947a8
VermilionCity_MapHeader: ; 0x947a8
@@ -2376,7 +2376,7 @@
dw VermilionCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 0, 2
+ db $3d, MUSIC_VERMILION_CITY, 0, 2
; 0x947b1
VermilionHouseFishingSpeechHouse_MapHeader: ; 0x947b1
@@ -2387,7 +2387,7 @@
dw VermilionHouseFishingSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 1, 1
+ db $3d, MUSIC_VERMILION_CITY, 1, 1
; 0x947ba
VermilionPokeCenter1F_MapHeader: ; 0x947ba
@@ -2398,7 +2398,7 @@
dw VermilionPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $9, 1, 1
+ db $3d, MUSIC_POKEMON_CENTER, 1, 1
; 0x947c3
VermilionPokeCenter2FBeta_MapHeader: ; 0x947c3
@@ -2409,7 +2409,7 @@
dw VermilionPokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 1, 1
+ db $3d, MUSIC_VERMILION_CITY, 1, 1
; 0x947cc
PokemonFanClub_MapHeader: ; 0x947cc
@@ -2420,7 +2420,7 @@
dw PokemonFanClub_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 1, 1
+ db $3d, MUSIC_VERMILION_CITY, 1, 1
; 0x947d5
VermilionMagnetTrainSpeechHouse_MapHeader: ; 0x947d5
@@ -2431,18 +2431,18 @@
dw VermilionMagnetTrainSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 1, 1
+ db $3d, MUSIC_VERMILION_CITY, 1, 1
; 0x947de
VermilionMart_MapHeader: ; 0x947de
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(VermilionMart_SecondMapHeader), $c, 3
; second map header
dw VermilionMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 1, 1
+ db $3d, MUSIC_VERMILION_CITY, 1, 1
; 0x947e7
VermilionHouseDiglettsCaveSpeechHouse_MapHeader: ; 0x947e7
@@ -2453,18 +2453,18 @@
dw VermilionHouseDiglettsCaveSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 1, 1
+ db $3d, MUSIC_VERMILION_CITY, 1, 1
; 0x947f0
VermilionGym_MapHeader: ; 0x947f0
; bank, tileset, permission
- db $25, $e, 3
+ db BANK(VermilionGym_SecondMapHeader), $e, 3
; second map header
dw VermilionGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $1b, 17, 1
+ db $3d, MUSIC_GYM, 17, 1
; 0x947f9
Route6SaffronGate_MapHeader: ; 0x947f9
@@ -2475,7 +2475,7 @@
dw Route6SaffronGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3c, $3, 1, 1
+ db $3c, MUSIC_ROUTE_3, 1, 1
; 0x94802
Route6UndergroundEntrance_MapHeader: ; 0x94802
@@ -2486,7 +2486,7 @@
dw Route6UndergroundEntrance_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3c, $3, 1, 1
+ db $3c, MUSIC_ROUTE_3, 1, 1
; 0x9480b
@@ -2500,7 +2500,7 @@
dw Route1_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $30, $2, 0, 1
+ db $30, MUSIC_ROUTE_1, 0, 1
; 0x94814
PalletTown_MapHeader: ; 0x94814
@@ -2511,7 +2511,7 @@
dw PalletTown_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2f, $1c, 0, 2
+ db $2f, MUSIC_PALLET_TOWN, 0, 2
; 0x9481d
RedsHouse1F_MapHeader: ; 0x9481d
@@ -2522,7 +2522,7 @@
dw RedsHouse1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2f, $1c, 1, 1
+ db $2f, MUSIC_PALLET_TOWN, 1, 1
; 0x94826
RedsHouse2F_MapHeader: ; 0x94826
@@ -2533,7 +2533,7 @@
dw RedsHouse2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2f, $1c, 1, 1
+ db $2f, MUSIC_PALLET_TOWN, 1, 1
; 0x9482f
BluesHouse_MapHeader: ; 0x9482f
@@ -2544,18 +2544,18 @@
dw BluesHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2f, $1c, 1, 1
+ db $2f, MUSIC_PALLET_TOWN, 1, 1
; 0x94838
OaksLab_MapHeader: ; 0x94838
; bank, tileset, permission
- db $25, $a, 3
+ db BANK(OaksLab_SecondMapHeader), $a, 3
; second map header
dw OaksLab_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2f, $1d, 1, 1
+ db $2f, MUSIC_POKEMON_TALK, 1, 1
; 0x94841
@@ -2569,7 +2569,7 @@
dw Route3_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $34, $3, 0, 1
+ db $34, MUSIC_ROUTE_3, 0, 1
; 0x9484a
PewterCity_MapHeader: ; 0x9484a
@@ -2580,7 +2580,7 @@
dw PewterCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $33, $15, 0, 1
+ db $33, MUSIC_VIRIDIAN_CITY, 0, 1
; 0x94853
PewterNidoranSpeechHouse_MapHeader: ; 0x94853
@@ -2591,7 +2591,7 @@
dw PewterNidoranSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $33, $15, 1, 1
+ db $33, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x9485c
PewterGym_MapHeader: ; 0x9485c
@@ -2602,18 +2602,18 @@
dw PewterGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $33, $1b, 17, 1
+ db $33, MUSIC_GYM, 17, 1
; 0x94865
PewterMart_MapHeader: ; 0x94865
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(PewterMart_SecondMapHeader), $c, 3
; second map header
dw PewterMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $33, $15, 1, 1
+ db $33, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x9486e
PewterPokeCenter1F_MapHeader: ; 0x9486e
@@ -2624,7 +2624,7 @@
dw PewterPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $33, $9, 1, 1
+ db $33, MUSIC_POKEMON_CENTER, 1, 1
; 0x94877
PewterPokeCEnter2FBeta_MapHeader: ; 0x94877
@@ -2635,7 +2635,7 @@
dw PewterPokeCEnter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $33, $15, 1, 1
+ db $33, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94880
PewterSnoozeSpeechHouse_MapHeader: ; 0x94880
@@ -2646,7 +2646,7 @@
dw PewterSnoozeSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $33, $15, 1, 1
+ db $33, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94889
@@ -2660,7 +2660,7 @@
dw OlivinePort_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 0, 2
+ db $1b, MUSIC_VIOLET_CITY, 0, 2
; 0x94892
VermilionPort_MapHeader: ; 0x94892
@@ -2671,7 +2671,7 @@
dw VermilionPort_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 0, 2
+ db $3d, MUSIC_VERMILION_CITY, 0, 2
; 0x9489b
FastShip1F_MapHeader: ; 0x9489b
@@ -2682,7 +2682,7 @@
dw FastShip1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5f, $36, 1, 1
+ db $5f, MUSIC_SS_AQUA, 1, 1
; 0x948a4
FastShipCabins_NNW_NNE_NE_MapHeader: ; 0x948a4
@@ -2693,7 +2693,7 @@
dw FastShipCabins_NNW_NNE_NE_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5f, $36, 1, 1
+ db $5f, MUSIC_SS_AQUA, 1, 1
; 0x948ad
FastShipCabins_SW_SSW_NW_MapHeader: ; 0x948ad
@@ -2704,7 +2704,7 @@
dw FastShipCabins_SW_SSW_NW_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5f, $36, 1, 1
+ db $5f, MUSIC_SS_AQUA, 1, 1
; 0x948b6
FastShipCabins_SE_SSE_CaptainsCabin_MapHeader: ; 0x948b6
@@ -2715,7 +2715,7 @@
dw FastShipCabins_SE_SSE_CaptainsCabin_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5f, $36, 1, 1
+ db $5f, MUSIC_SS_AQUA, 1, 1
; 0x948bf
FastShipB1F_MapHeader: ; 0x948bf
@@ -2726,29 +2726,29 @@
dw FastShipB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5f, $36, 1, 1
+ db $5f, MUSIC_SS_AQUA, 1, 1
; 0x948c8
OlivinePortPassage_MapHeader: ; 0x948c8
; bank, tileset, permission
- db $25, $1c, 3
+ db BANK(OlivinePortPassage_SecondMapHeader), $1c, 3
; second map header
dw OlivinePortPassage_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1b, $2d, 1, 1
+ db $1b, MUSIC_VIOLET_CITY, 1, 1
; 0x948d1
VermilionPortPassage_MapHeader: ; 0x948d1
; bank, tileset, permission
- db $25, $1c, 3
+ db BANK(VermilionPortPassage_SecondMapHeader), $1c, 3
; second map header
dw VermilionPortPassage_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3d, $3e, 1, 1
+ db $3d, MUSIC_VERMILION_CITY, 1, 1
; 0x948da
MountMoonSquare_MapHeader: ; 0x948da
@@ -2759,7 +2759,7 @@
dw MountMoonSquare_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $35, $1a, 0, 1
+ db $35, MUSIC_MT_MOON_SQUARE, 0, 1
; 0x948e3
MountMoonGiftShop_MapHeader: ; 0x948e3
@@ -2770,7 +2770,7 @@
dw MountMoonGiftShop_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $35, $15, 1, 1
+ db $35, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x948ec
TinTowerRoof_MapHeader: ; 0x948ec
@@ -2781,7 +2781,7 @@
dw TinTowerRoof_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $17, $41, 0, 1
+ db $17, MUSIC_TIN_TOWER, 0, 1
; 0x948f5
@@ -2795,7 +2795,7 @@
dw Route23_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $59, $46, 0, 1
+ db $59, MUSIC_INDIGO_PLATEAU, 0, 1
; 0x948fe
IndigoPlateauPokeCenter1F_MapHeader: ; 0x948fe
@@ -2806,51 +2806,51 @@
dw IndigoPlateauPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5a, $46, 1, 1
+ db $5a, MUSIC_INDIGO_PLATEAU, 1, 1
; 0x94907
WillsRoom_MapHeader: ; 0x94907
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(WillsRoom_SecondMapHeader), $f, 3
; second map header
dw WillsRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5a, $46, 17, 1
+ db $5a, MUSIC_INDIGO_PLATEAU, 17, 1
; 0x94910
KogasRoom_MapHeader: ; 0x94910
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(KogasRoom_SecondMapHeader), $f, 3
; second map header
dw KogasRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5a, $46, 17, 1
+ db $5a, MUSIC_INDIGO_PLATEAU, 17, 1
; 0x94919
BrunosRoom_MapHeader: ; 0x94919
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(BrunosRoom_SecondMapHeader), $f, 3
; second map header
dw BrunosRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5a, $46, 17, 1
+ db $5a, MUSIC_INDIGO_PLATEAU, 17, 1
; 0x94922
KarensRoom_MapHeader: ; 0x94922
; bank, tileset, permission
- db $25, $f, 3
+ db BANK(KarensRoom_SecondMapHeader), $f, 3
; second map header
dw KarensRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5a, $46, 17, 1
+ db $5a, MUSIC_INDIGO_PLATEAU, 17, 1
; 0x9492b
LancesRoom_MapHeader: ; 0x9492b
@@ -2861,18 +2861,18 @@
dw LancesRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5a, $46, 17, 1
+ db $5a, MUSIC_INDIGO_PLATEAU, 17, 1
; 0x94934
HallOfFame_MapHeader: ; 0x94934
; bank, tileset, permission
- db $25, $1d, 3
+ db BANK(HallOfFame_SecondMapHeader), $1d, 3
; second map header
dw HallOfFame_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5a, $3c, 17, 1
+ db $5a, MUSIC_NEW_BARK_TOWN, 17, 1
; 0x9493d
@@ -2886,7 +2886,7 @@
dw Route13_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4b, $4, 0, 13
+ db $4b, MUSIC_ROUTE_12, 0, 13
; 0x94946
Route14_MapHeader: ; 0x94946
@@ -2897,7 +2897,7 @@
dw Route14_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4c, $4, 0, 1
+ db $4c, MUSIC_ROUTE_12, 0, 1
; 0x9494f
Route15_MapHeader: ; 0x9494f
@@ -2908,7 +2908,7 @@
dw Route15_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4d, $4, 0, 1
+ db $4d, MUSIC_ROUTE_12, 0, 1
; 0x94958
Route18_MapHeader: ; 0x94958
@@ -2919,7 +2919,7 @@
dw Route18_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $50, $3, 0, 1
+ db $50, MUSIC_ROUTE_3, 0, 1
; 0x94961
FuchsiaCity_MapHeader: ; 0x94961
@@ -2930,40 +2930,40 @@
dw FuchsiaCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $16, 0, 8
+ db $51, MUSIC_CELADON_CITY, 0, 8
; 0x9496a
FuchsiaMart_MapHeader: ; 0x9496a
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(FuchsiaMart_SecondMapHeader), $c, 3
; second map header
dw FuchsiaMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $16, 1, 1
+ db $51, MUSIC_CELADON_CITY, 1, 1
; 0x94973
SafariZoneMainOffice_MapHeader: ; 0x94973
; bank, tileset, permission
- db $25, $e, 3
+ db BANK(SafariZoneMainOffice_SecondMapHeader), $e, 3
; second map header
dw SafariZoneMainOffice_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $16, 1, 1
+ db $51, MUSIC_CELADON_CITY, 1, 1
; 0x9497c
FuchsiaGym_MapHeader: ; 0x9497c
; bank, tileset, permission
- db $25, $a, 3
+ db BANK(FuchsiaGym_SecondMapHeader), $a, 3
; second map header
dw FuchsiaGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $1b, 17, 1
+ db $51, MUSIC_GYM, 17, 1
; 0x94985
FuchsiaBillSpeechHouse_MapHeader: ; 0x94985
@@ -2974,7 +2974,7 @@
dw FuchsiaBillSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $16, 1, 1
+ db $51, MUSIC_CELADON_CITY, 1, 1
; 0x9498e
FuchsiaPokeCenter1F_MapHeader: ; 0x9498e
@@ -2985,7 +2985,7 @@
dw FuchsiaPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $9, 1, 1
+ db $51, MUSIC_POKEMON_CENTER, 1, 1
; 0x94997
FuchsiaPokeCenter2FBeta_MapHeader: ; 0x94997
@@ -2996,7 +2996,7 @@
dw FuchsiaPokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $16, 1, 1
+ db $51, MUSIC_CELADON_CITY, 1, 1
; 0x949a0
SafariZoneWardensHome_MapHeader: ; 0x949a0
@@ -3007,7 +3007,7 @@
dw SafariZoneWardensHome_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $51, $16, 1, 1
+ db $51, MUSIC_CELADON_CITY, 1, 1
; 0x949a9
Route15FuchsiaGate_MapHeader: ; 0x949a9
@@ -3018,7 +3018,7 @@
dw Route15FuchsiaGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4d, $4, 1, 1
+ db $4d, MUSIC_ROUTE_12, 1, 1
; 0x949b2
@@ -3032,7 +3032,7 @@
dw Route8_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $40, $3, 0, 1
+ db $40, MUSIC_ROUTE_3, 0, 1
; 0x949bb
Route12_MapHeader: ; 0x949bb
@@ -3043,7 +3043,7 @@
dw Route12_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4a, $4, 0, 13
+ db $4a, MUSIC_ROUTE_12, 0, 13
; 0x949c4
Route10South_MapHeader: ; 0x949c4
@@ -3054,7 +3054,7 @@
dw Route10South_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $43, $3, 0, 3
+ db $43, MUSIC_ROUTE_3, 0, 3
; 0x949cd
LavenderTown_MapHeader: ; 0x949cd
@@ -3065,7 +3065,7 @@
dw LavenderTown_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $45, $e, 0, 1
+ db $45, MUSIC_LAVENDER_TOWN, 0, 1
; 0x949d6
LavenderPokeCenter1F_MapHeader: ; 0x949d6
@@ -3076,7 +3076,7 @@
dw LavenderPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $45, $9, 1, 1
+ db $45, MUSIC_POKEMON_CENTER, 1, 1
; 0x949df
LavenderPokeCenter2FBeta_MapHeader: ; 0x949df
@@ -3087,7 +3087,7 @@
dw LavenderPokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $45, $9, 1, 1
+ db $45, MUSIC_POKEMON_CENTER, 1, 1
; 0x949e8
MrFujisHouse_MapHeader: ; 0x949e8
@@ -3098,7 +3098,7 @@
dw MrFujisHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $45, $e, 1, 1
+ db $45, MUSIC_LAVENDER_TOWN, 1, 1
; 0x949f1
LavenderTownSpeechHouse_MapHeader: ; 0x949f1
@@ -3109,7 +3109,7 @@
dw LavenderTownSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $45, $e, 1, 1
+ db $45, MUSIC_LAVENDER_TOWN, 1, 1
; 0x949fa
LavenderNameRater_MapHeader: ; 0x949fa
@@ -3120,18 +3120,18 @@
dw LavenderNameRater_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $45, $e, 1, 1
+ db $45, MUSIC_LAVENDER_TOWN, 1, 1
; 0x94a03
LavenderMart_MapHeader: ; 0x94a03
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(LavenderMart_SecondMapHeader), $c, 3
; second map header
dw LavenderMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $45, $e, 1, 1
+ db $45, MUSIC_LAVENDER_TOWN, 1, 1
; 0x94a0c
SoulHouse_MapHeader: ; 0x94a0c
@@ -3142,18 +3142,18 @@
dw SoulHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $45, $e, 1, 1
+ db $45, MUSIC_LAVENDER_TOWN, 1, 1
; 0x94a15
LavRadioTower1F_MapHeader: ; 0x94a15
; bank, tileset, permission
- db $25, $1b, 3
+ db BANK(LavRadioTower1F_SecondMapHeader), $1b, 3
; second map header
dw LavRadioTower1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $46, $e, 1, 1
+ db $46, MUSIC_LAVENDER_TOWN, 1, 1
; 0x94a1e
Route8SaffronGate_MapHeader: ; 0x94a1e
@@ -3164,7 +3164,7 @@
dw Route8SaffronGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $40, $3, 1, 1
+ db $40, MUSIC_ROUTE_3, 1, 1
; 0x94a27
Route12SuperRodHouse_MapHeader: ; 0x94a27
@@ -3175,7 +3175,7 @@
dw Route12SuperRodHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4a, $15, 1, 1
+ db $4a, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94a30
@@ -3189,7 +3189,7 @@
dw Route28_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5e, $46, 0, 4
+ db $5e, MUSIC_INDIGO_PLATEAU, 0, 4
; 0x94a39
SilverCaveOutside_MapHeader: ; 0x94a39
@@ -3200,7 +3200,7 @@
dw SilverCaveOutside_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2e, $46, 0, 4
+ db $2e, MUSIC_INDIGO_PLATEAU, 0, 4
; 0x94a42
SilverCavePokeCenter1F_MapHeader: ; 0x94a42
@@ -3211,7 +3211,7 @@
dw SilverCavePokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2e, $9, 1, 1
+ db $2e, MUSIC_POKEMON_CENTER, 1, 1
; 0x94a4b
Route28FamousSpeechHouse_MapHeader: ; 0x94a4b
@@ -3222,7 +3222,7 @@
dw Route28FamousSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5e, $25, 1, 1
+ db $5e, MUSIC_AZALEA_TOWN, 1, 1
; 0x94a54
@@ -3236,7 +3236,7 @@
dw PokeCenter2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $0, $9, 17, 1
+ db $0, MUSIC_POKEMON_CENTER, 17, 1
; 0x94a5d
TradeCenter_MapHeader: ; 0x94a5d
@@ -3247,7 +3247,7 @@
dw TradeCenter_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $0, $26, 17, 1
+ db $0, MUSIC_CHERRYGROVE_CITY, 17, 1
; 0x94a66
Colosseum_MapHeader: ; 0x94a66
@@ -3258,7 +3258,7 @@
dw Colosseum_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $0, $26, 17, 1
+ db $0, MUSIC_CHERRYGROVE_CITY, 17, 1
; 0x94a6f
TimeCapsule_MapHeader: ; 0x94a6f
@@ -3269,29 +3269,29 @@
dw TimeCapsule_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $0, $26, 17, 1
+ db $0, MUSIC_CHERRYGROVE_CITY, 17, 1
; 0x94a78
MobileTradeRoomMobile_MapHeader: ; 0x94a78
; bank, tileset, permission
- db $25, $d, 3
+ db BANK(MobileTradeRoomMobile_SecondMapHeader), $d, 3
; second map header
dw MobileTradeRoomMobile_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $0, $26, 17, 1
+ db $0, MUSIC_CHERRYGROVE_CITY, 17, 1
; 0x94a81
MobileBattleRoom_MapHeader: ; 0x94a81
; bank, tileset, permission
- db $25, $d, 3
+ db BANK(MobileBattleRoom_SecondMapHeader), $d, 3
; second map header
dw MobileBattleRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $0, $26, 17, 1
+ db $0, MUSIC_CHERRYGROVE_CITY, 17, 1
; 0x94a8a
@@ -3305,7 +3305,7 @@
dw Route7_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3f, $3, 0, 1
+ db $3f, MUSIC_ROUTE_3, 0, 1
; 0x94a93
Route16_MapHeader: ; 0x94a93
@@ -3316,7 +3316,7 @@
dw Route16_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4e, $3, 0, 1
+ db $4e, MUSIC_ROUTE_3, 0, 1
; 0x94a9c
Route17_MapHeader: ; 0x94a9c
@@ -3327,7 +3327,7 @@
dw Route17_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4f, $3, 0, 0
+ db $4f, MUSIC_ROUTE_3, 0, 0
; 0x94aa5
CeladonCity_MapHeader: ; 0x94aa5
@@ -3338,128 +3338,128 @@
dw CeladonCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 0, 0
+ db $47, MUSIC_CELADON_CITY, 0, 0
; 0x94aae
CeladonDeptStore1F_MapHeader: ; 0x94aae
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CeladonDeptStore1F_SecondMapHeader), $c, 3
; second map header
dw CeladonDeptStore1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94ab7
CeladonDeptStore2F_MapHeader: ; 0x94ab7
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CeladonDeptStore2F_SecondMapHeader), $c, 3
; second map header
dw CeladonDeptStore2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94ac0
CeladonDeptStore3F_MapHeader: ; 0x94ac0
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CeladonDeptStore3F_SecondMapHeader), $c, 3
; second map header
dw CeladonDeptStore3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94ac9
CeladonDeptStore4F_MapHeader: ; 0x94ac9
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CeladonDeptStore4F_SecondMapHeader), $c, 3
; second map header
dw CeladonDeptStore4F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94ad2
CeladonDeptStore5F_MapHeader: ; 0x94ad2
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CeladonDeptStore5F_SecondMapHeader), $c, 3
; second map header
dw CeladonDeptStore5F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94adb
CeladonDeptStore6F_MapHeader: ; 0x94adb
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CeladonDeptStore6F_SecondMapHeader), $c, 3
; second map header
dw CeladonDeptStore6F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94ae4
CeladonDeptStoreElevator_MapHeader: ; 0x94ae4
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CeladonDeptStoreElevator_SecondMapHeader), $c, 3
; second map header
dw CeladonDeptStoreElevator_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94aed
CeladonMansion1F_MapHeader: ; 0x94aed
; bank, tileset, permission
- db $25, $d, 3
+ db BANK(CeladonMansion1F_SecondMapHeader), $d, 3
; second map header
dw CeladonMansion1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94af6
CeladonMansion2F_MapHeader: ; 0x94af6
; bank, tileset, permission
- db $25, $d, 3
+ db BANK(CeladonMansion2F_SecondMapHeader), $d, 3
; second map header
dw CeladonMansion2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94aff
CeladonMansion3F_MapHeader: ; 0x94aff
; bank, tileset, permission
- db $25, $d, 3
+ db BANK(CeladonMansion3F_SecondMapHeader), $d, 3
; second map header
dw CeladonMansion3F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94b08
CeladonMansionRoof_MapHeader: ; 0x94b08
; bank, tileset, permission
- db $25, $d, 3
+ db BANK(CeladonMansionRoof_SecondMapHeader), $d, 3
; second map header
dw CeladonMansionRoof_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94b11
CeladonMansionRoofHouse_MapHeader: ; 0x94b11
@@ -3470,7 +3470,7 @@
dw CeladonMansionRoofHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94b1a
CeladonPokeCenter1F_MapHeader: ; 0x94b1a
@@ -3481,7 +3481,7 @@
dw CeladonPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $9, 1, 1
+ db $47, MUSIC_POKEMON_CENTER, 1, 1
; 0x94b23
CeladonPokeCenter2FBeta_MapHeader: ; 0x94b23
@@ -3492,29 +3492,29 @@
dw CeladonPokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94b2c
CeladonGameCorner_MapHeader: ; 0x94b2c
; bank, tileset, permission
- db $25, $e, 3
+ db BANK(CeladonGameCorner_SecondMapHeader), $e, 3
; second map header
dw CeladonGameCorner_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $12, 1, 1
+ db $47, MUSIC_GAME_CORNER, 1, 1
; 0x94b35
CeladonGameCornerPrizeRoom_MapHeader: ; 0x94b35
; bank, tileset, permission
- db $25, $e, 3
+ db BANK(CeladonGameCornerPrizeRoom_SecondMapHeader), $e, 3
; second map header
dw CeladonGameCornerPrizeRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94b3e
CeladonGym_MapHeader: ; 0x94b3e
@@ -3525,18 +3525,18 @@
dw CeladonGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $1b, 17, 1
+ db $47, MUSIC_GYM, 17, 1
; 0x94b47
CeladonCafe_MapHeader: ; 0x94b47
; bank, tileset, permission
- db $25, $e, 3
+ db BANK(CeladonCafe_SecondMapHeader), $e, 3
; second map header
dw CeladonCafe_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $47, $16, 1, 1
+ db $47, MUSIC_CELADON_CITY, 1, 1
; 0x94b50
Route16FuchsiaSpeechHouse_MapHeader: ; 0x94b50
@@ -3547,7 +3547,7 @@
dw Route16FuchsiaSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4e, $16, 1, 1
+ db $4e, MUSIC_CELADON_CITY, 1, 1
; 0x94b59
Route16Gate_MapHeader: ; 0x94b59
@@ -3558,7 +3558,7 @@
dw Route16Gate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4e, $3, 1, 1
+ db $4e, MUSIC_ROUTE_3, 1, 1
; 0x94b62
Route7SaffronGate_MapHeader: ; 0x94b62
@@ -3569,7 +3569,7 @@
dw Route7SaffronGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3f, $3, 1, 1
+ db $3f, MUSIC_ROUTE_3, 1, 1
; 0x94b6b
Route1718Gate_MapHeader: ; 0x94b6b
@@ -3580,7 +3580,7 @@
dw Route1718Gate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4f, $3, 1, 1
+ db $4f, MUSIC_ROUTE_3, 1, 1
; 0x94b74
@@ -3594,7 +3594,7 @@
dw Route40_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1e, $35, 0, 1
+ db $1e, MUSIC_ROUTE_36, 0, 1
; 0x94b7d
Route41_MapHeader: ; 0x94b7d
@@ -3605,7 +3605,7 @@
dw Route41_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $20, $35, 0, 2
+ db $20, MUSIC_ROUTE_36, 0, 2
; 0x94b86
CianwoodCity_MapHeader: ; 0x94b86
@@ -3616,7 +3616,7 @@
dw CianwoodCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $21, $2c, 0, 1
+ db $21, MUSIC_ECRUTEAK_CITY, 0, 1
; 0x94b8f
ManiasHouse_MapHeader: ; 0x94b8f
@@ -3627,7 +3627,7 @@
dw ManiasHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $21, $2c, 1, 1
+ db $21, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x94b98
CianwoodGym_MapHeader: ; 0x94b98
@@ -3638,7 +3638,7 @@
dw CianwoodGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $21, $1b, 17, 1
+ db $21, MUSIC_GYM, 17, 1
; 0x94ba1
CianwoodPokeCenter1F_MapHeader: ; 0x94ba1
@@ -3649,7 +3649,7 @@
dw CianwoodPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $21, $9, 1, 1
+ db $21, MUSIC_POKEMON_CENTER, 1, 1
; 0x94baa
CianwoodPharmacy_MapHeader: ; 0x94baa
@@ -3660,7 +3660,7 @@
dw CianwoodPharmacy_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $21, $2c, 1, 1
+ db $21, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x94bb3
CianwoodCityPhotoStudio_MapHeader: ; 0x94bb3
@@ -3671,7 +3671,7 @@
dw CianwoodCityPhotoStudio_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $21, $2c, 1, 1
+ db $21, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x94bbc
CianwoodLugiaSpeechHouse_MapHeader: ; 0x94bbc
@@ -3682,7 +3682,7 @@
dw CianwoodLugiaSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $21, $2c, 1, 1
+ db $21, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x94bc5
PokeSeersHouse_MapHeader: ; 0x94bc5
@@ -3693,7 +3693,7 @@
dw PokeSeersHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $21, $2c, 1, 1
+ db $21, MUSIC_ECRUTEAK_CITY, 1, 1
; 0x94bce
BattleTower1F_MapHeader: ; 0x94bce
@@ -3704,7 +3704,7 @@
dw BattleTower1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1d, $65, 17, 1
+ db $1d, MUSIC_BATTLE_TOWER_LOBBY, 17, 1
; 0x94bd7
BattleTowerBattleRoom_MapHeader: ; 0x94bd7
@@ -3715,7 +3715,7 @@
dw BattleTowerBattleRoom_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1d, $63, 17, 1
+ db $1d, MUSIC_BATTLE_TOWER_THEME, 17, 1
; 0x94be0
BattleTowerElevator_MapHeader: ; 0x94be0
@@ -3726,7 +3726,7 @@
dw BattleTowerElevator_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1d, $0, 17, 1
+ db $1d, MUSIC_NONE, 17, 1
; 0x94be9
BattleTowerHallway_MapHeader: ; 0x94be9
@@ -3737,7 +3737,7 @@
dw BattleTowerHallway_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1d, $63, 17, 1
+ db $1d, MUSIC_BATTLE_TOWER_THEME, 17, 1
; 0x94bf2
Route40BattleTowerGate_MapHeader: ; 0x94bf2
@@ -3748,7 +3748,7 @@
dw Route40BattleTowerGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1d, $35, 1, 1
+ db $1d, MUSIC_ROUTE_36, 1, 1
; 0x94bfb
BattleTowerOutside_MapHeader: ; 0x94bfb
@@ -3759,7 +3759,7 @@
dw BattleTowerOutside_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1d, $63, 0, 1
+ db $1d, MUSIC_BATTLE_TOWER_THEME, 0, 1
; 0x94c04
@@ -3773,7 +3773,7 @@
dw Route2_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $32, $f, 0, 1
+ db $32, MUSIC_ROUTE_2, 0, 1
; 0x94c0d
Route22_MapHeader: ; 0x94c0d
@@ -3784,7 +3784,7 @@
dw Route22_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $57, $3, 0, 4
+ db $57, MUSIC_ROUTE_3, 0, 4
; 0x94c16
ViridianCity_MapHeader: ; 0x94c16
@@ -3795,7 +3795,7 @@
dw ViridianCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $31, $15, 0, 4
+ db $31, MUSIC_VIRIDIAN_CITY, 0, 4
; 0x94c1f
ViridianGym_MapHeader: ; 0x94c1f
@@ -3806,7 +3806,7 @@
dw ViridianGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $31, $1b, 17, 1
+ db $31, MUSIC_GYM, 17, 1
; 0x94c28
ViridianNicknameSpeechHouse_MapHeader: ; 0x94c28
@@ -3817,7 +3817,7 @@
dw ViridianNicknameSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $31, $15, 1, 1
+ db $31, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94c31
TrainerHouse1F_MapHeader: ; 0x94c31
@@ -3828,29 +3828,29 @@
dw TrainerHouse1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $31, $15, 1, 1
+ db $31, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94c3a
TrainerHouseB1F_MapHeader: ; 0x94c3a
; bank, tileset, permission
- db $25, $b, 3
+ db BANK(TrainerHouseB1F_SecondMapHeader), $b, 3
; second map header
dw TrainerHouseB1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $31, $15, 1, 1
+ db $31, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94c43
ViridianMart_MapHeader: ; 0x94c43
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(ViridianMart_SecondMapHeader), $c, 3
; second map header
dw ViridianMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $31, $15, 1, 1
+ db $31, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94c4c
ViridianPokeCenter1F_MapHeader: ; 0x94c4c
@@ -3861,7 +3861,7 @@
dw ViridianPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $31, $9, 1, 1
+ db $31, MUSIC_POKEMON_CENTER, 1, 1
; 0x94c55
ViridianPokeCenter2FBeta_MapHeader: ; 0x94c55
@@ -3872,7 +3872,7 @@
dw ViridianPokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $31, $15, 1, 1
+ db $31, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94c5e
Route2NuggetSpeechHouse_MapHeader: ; 0x94c5e
@@ -3883,7 +3883,7 @@
dw Route2NuggetSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $32, $15, 1, 1
+ db $32, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94c67
Route2Gate_MapHeader: ; 0x94c67
@@ -3894,7 +3894,7 @@
dw Route2Gate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $32, $f, 1, 1
+ db $32, MUSIC_ROUTE_2, 1, 1
; 0x94c70
VictoryRoadGate_MapHeader: ; 0x94c70
@@ -3905,7 +3905,7 @@
dw VictoryRoadGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5b, $46, 1, 1
+ db $5b, MUSIC_INDIGO_PLATEAU, 1, 1
; 0x94c79
@@ -3919,7 +3919,7 @@
dw Route26_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5b, $4d, 0, 2
+ db $5b, MUSIC_ROUTE_26, 0, 2
; 0x94c82
Route27_MapHeader: ; 0x94c82
@@ -3930,7 +3930,7 @@
dw Route27_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5c, $4d, 0, 2
+ db $5c, MUSIC_ROUTE_26, 0, 2
; 0x94c8b
Route29_MapHeader: ; 0x94c8b
@@ -3941,7 +3941,7 @@
dw Route29_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2, $34, 0, 1
+ db $2, MUSIC_ROUTE_29, 0, 1
; 0x94c94
NewBarkTown_MapHeader: ; 0x94c94
@@ -3952,18 +3952,18 @@
dw NewBarkTown_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1, $3c, 0, 2
+ db $1, MUSIC_NEW_BARK_TOWN, 0, 2
; 0x94c9d
ElmsLab_MapHeader: ; 0x94c9d
; bank, tileset, permission
- db $25, $a, 3
+ db BANK(ElmsLab_SecondMapHeader), $a, 3
; second map header
dw ElmsLab_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1, $32, 1, 1
+ db $1, MUSIC_PROF_ELM, 1, 1
; 0x94ca6
KrissHouse1F_MapHeader: ; 0x94ca6
@@ -3974,7 +3974,7 @@
dw KrissHouse1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1, $3c, 1, 1
+ db $1, MUSIC_NEW_BARK_TOWN, 1, 1
; 0x94caf
KrissHouse2F_MapHeader: ; 0x94caf
@@ -3985,7 +3985,7 @@
dw KrissHouse2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1, $3c, 1, 1
+ db $1, MUSIC_NEW_BARK_TOWN, 1, 1
; 0x94cb8
KrissNeighborsHouse_MapHeader: ; 0x94cb8
@@ -3996,7 +3996,7 @@
dw KrissNeighborsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1, $3c, 1, 1
+ db $1, MUSIC_NEW_BARK_TOWN, 1, 1
; 0x94cc1
ElmsHouse_MapHeader: ; 0x94cc1
@@ -4007,7 +4007,7 @@
dw ElmsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $1, $3c, 1, 1
+ db $1, MUSIC_NEW_BARK_TOWN, 1, 1
; 0x94cca
Route26HealSpeechHouse_MapHeader: ; 0x94cca
@@ -4018,7 +4018,7 @@
dw Route26HealSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5b, $25, 1, 1
+ db $5b, MUSIC_AZALEA_TOWN, 1, 1
; 0x94cd3
Route26DayofWeekSiblingsHouse_MapHeader: ; 0x94cd3
@@ -4029,7 +4029,7 @@
dw Route26DayofWeekSiblingsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5b, $25, 1, 1
+ db $5b, MUSIC_AZALEA_TOWN, 1, 1
; 0x94cdc
Route27SandstormHouse_MapHeader: ; 0x94cdc
@@ -4040,7 +4040,7 @@
dw Route27SandstormHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5c, $25, 1, 1
+ db $5c, MUSIC_AZALEA_TOWN, 1, 1
; 0x94ce5
Route2946Gate_MapHeader: ; 0x94ce5
@@ -4051,7 +4051,7 @@
dw Route2946Gate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $2, $34, 1, 1
+ db $2, MUSIC_ROUTE_29, 1, 1
; 0x94cee
@@ -4065,7 +4065,7 @@
dw Route5_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3a, $3, 0, 1
+ db $3a, MUSIC_ROUTE_3, 0, 1
; 0x94cf7
SaffronCity_MapHeader: ; 0x94cf7
@@ -4076,7 +4076,7 @@
dw SaffronCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 0, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 0, 1
; 0x94d00
FightingDojo_MapHeader: ; 0x94d00
@@ -4087,29 +4087,29 @@
dw FightingDojo_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 1, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d09
SaffronGym_MapHeader: ; 0x94d09
; bank, tileset, permission
- db $25, $1c, 3
+ db BANK(SaffronGym_SecondMapHeader), $1c, 3
; second map header
dw SaffronGym_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $1b, 17, 1
+ db $48, MUSIC_GYM, 17, 1
; 0x94d12
SaffronMart_MapHeader: ; 0x94d12
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(SaffronMart_SecondMapHeader), $c, 3
; second map header
dw SaffronMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 1, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d1b
SaffronPokeCenter1F_MapHeader: ; 0x94d1b
@@ -4120,7 +4120,7 @@
dw SaffronPokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $9, 1, 1
+ db $48, MUSIC_POKEMON_CENTER, 1, 1
; 0x94d24
SaffronPokeCenter2FBeta_MapHeader: ; 0x94d24
@@ -4131,7 +4131,7 @@
dw SaffronPokeCenter2FBeta_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 1, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d2d
MrPsychicsHouse_MapHeader: ; 0x94d2d
@@ -4142,7 +4142,7 @@
dw MrPsychicsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 1, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d36
SaffronTrainStation_MapHeader: ; 0x94d36
@@ -4153,18 +4153,18 @@
dw SaffronTrainStation_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 1, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d3f
SilphCo1F_MapHeader: ; 0x94d3f
; bank, tileset, permission
- db $25, $b, 3
+ db BANK(SilphCo1F_SecondMapHeader), $b, 3
; second map header
dw SilphCo1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 1, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d48
CopycatsHouse1F_MapHeader: ; 0x94d48
@@ -4175,7 +4175,7 @@
dw CopycatsHouse1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 1, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d51
CopycatsHouse2F_MapHeader: ; 0x94d51
@@ -4186,7 +4186,7 @@
dw CopycatsHouse2F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $48, $15, 1, 1
+ db $48, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d5a
Route5UndergroundEntrance_MapHeader: ; 0x94d5a
@@ -4197,7 +4197,7 @@
dw Route5UndergroundEntrance_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3a, $3, 1, 1
+ db $3a, MUSIC_ROUTE_3, 1, 1
; 0x94d63
Route5SaffronCityGate_MapHeader: ; 0x94d63
@@ -4208,7 +4208,7 @@
dw Route5SaffronCityGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3a, $15, 1, 1
+ db $3a, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d6c
Route5CleanseTagSpeechHouse_MapHeader: ; 0x94d6c
@@ -4219,7 +4219,7 @@
dw Route5CleanseTagSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3a, $15, 1, 1
+ db $3a, MUSIC_VIRIDIAN_CITY, 1, 1
; 0x94d75
@@ -4233,7 +4233,7 @@
dw Route30_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4, $2b, 0, 4
+ db $4, MUSIC_ROUTE_30, 0, 4
; 0x94d7e
Route31_MapHeader: ; 0x94d7e
@@ -4244,7 +4244,7 @@
dw Route31_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5, $2b, 0, 4
+ db $5, MUSIC_ROUTE_30, 0, 4
; 0x94d87
CherrygroveCity_MapHeader: ; 0x94d87
@@ -4255,18 +4255,18 @@
dw CherrygroveCity_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3, $26, 0, 1
+ db $3, MUSIC_CHERRYGROVE_CITY, 0, 1
; 0x94d90
CherrygroveMart_MapHeader: ; 0x94d90
; bank, tileset, permission
- db $25, $c, 3
+ db BANK(CherrygroveMart_SecondMapHeader), $c, 3
; second map header
dw CherrygroveMart_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3, $26, 1, 1
+ db $3, MUSIC_CHERRYGROVE_CITY, 1, 1
; 0x94d99
CherrygrovePokeCenter1F_MapHeader: ; 0x94d99
@@ -4277,7 +4277,7 @@
dw CherrygrovePokeCenter1F_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3, $9, 1, 1
+ db $3, MUSIC_POKEMON_CENTER, 1, 1
; 0x94da2
CherrygroveGymSpeechHouse_MapHeader: ; 0x94da2
@@ -4288,7 +4288,7 @@
dw CherrygroveGymSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3, $26, 1, 1
+ db $3, MUSIC_CHERRYGROVE_CITY, 1, 1
; 0x94dab
GuideGentsHouse_MapHeader: ; 0x94dab
@@ -4299,7 +4299,7 @@
dw GuideGentsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3, $26, 1, 1
+ db $3, MUSIC_CHERRYGROVE_CITY, 1, 1
; 0x94db4
CherrygroveEvolutionSpeechHouse_MapHeader: ; 0x94db4
@@ -4310,7 +4310,7 @@
dw CherrygroveEvolutionSpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $3, $26, 1, 1
+ db $3, MUSIC_CHERRYGROVE_CITY, 1, 1
; 0x94dbd
Route30BerrySpeechHouse_MapHeader: ; 0x94dbd
@@ -4321,18 +4321,18 @@
dw Route30BerrySpeechHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4, $26, 1, 1
+ db $4, MUSIC_CHERRYGROVE_CITY, 1, 1
; 0x94dc6
MrPokemonsHouse_MapHeader: ; 0x94dc6
; bank, tileset, permission
- db $25, $b, 3
+ db BANK(MrPokemonsHouse_SecondMapHeader), $b, 3
; second map header
dw MrPokemonsHouse_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $4, $26, 1, 1
+ db $4, MUSIC_CHERRYGROVE_CITY, 1, 1
; 0x94dcf
Route31VioletGate_MapHeader: ; 0x94dcf
@@ -4343,7 +4343,7 @@
dw Route31VioletGate_SecondMapHeader
; location on world map, music, time of day, fishing group
- db $5, $2b, 1, 1
+ db $5, MUSIC_ROUTE_30, 1, 1
; 0x94dd8