ref: 63079fa1fe663fb365ff2042261dc063e8f3b31b
parent: 718c2260e90e61b09bca085f7276ca889c2223b7
author: IIMarckus <iimarckus@gmail.com>
date: Thu Jul 9 22:45:35 EDT 2015
Trim address comments from maps.
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -1,27 +1,23 @@
-AzaleaMart_MapScriptHeader: ; 0x18e03e
+AzaleaMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18e040
-ClerkScript_0x18e040: ; 0x18e040
+ClerkScript_0x18e040:
loadfont
pokemart $0, $0003
loadmovesprites
end
-; 0x18e047
-CooltrainerMScript_0x18e047: ; 0x18e047
+CooltrainerMScript_0x18e047:
jumptextfaceplayer UnknownText_0x18e04d
-; 0x18e04a
-BugCatcherScript_0x18e04a: ; 0x18e04a
+BugCatcherScript_0x18e04a:
jumptextfaceplayer UnknownText_0x18e0b6
-; 0x18e04d
-UnknownText_0x18e04d: ; 0x18e04d
+UnknownText_0x18e04d:
text "There's no GREAT"
line "BALL here. #"
@@ -32,9 +28,8 @@
line "make me some of"
cont "his custom BALLS."
done
-; 0x18e0b6
-UnknownText_0x18e0b6: ; 0x18e0b6
+UnknownText_0x18e0b6:
text "A GREAT BALL is"
line "better for catch-"
cont "ing #MON than a"
@@ -44,9 +39,8 @@
line "be better some-"
cont "times."
done
-; 0x18e118
-AzaleaMart_MapEventHeader: ; 0x18e118
+AzaleaMart_MapEventHeader:
; filler
db 0, 0
@@ -66,4 +60,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, $ffff
person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, $ffff
person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, $ffff
-; 0x18e14f
--- a/maps/AzaleaPokeCenter1F.asm
+++ b/maps/AzaleaPokeCenter1F.asm
@@ -1,4 +1,4 @@
-AzaleaPokeCenter1F_MapScriptHeader: ; 0x18db21
+AzaleaPokeCenter1F_MapScriptHeader:
; trigger count
db 1
@@ -7,29 +7,23 @@
; callback count
db 0
-; 0x18db27
-UnknownScript_0x18db27: ; 0x18db27
+UnknownScript_0x18db27:
end
-; 0x18db28
-NurseScript_0x18db28: ; 0x18db28
+NurseScript_0x18db28:
jumpstd pokecenternurse
-; 0x18db2b
-GentlemanScript_0x18db2b: ; 0x18db2b
+GentlemanScript_0x18db2b:
jumptextfaceplayer UnknownText_0x18db34
-; 0x18db2e
-FishingGuruScript_0x18db2e: ; 0x18db2e
+FishingGuruScript_0x18db2e:
jumptextfaceplayer UnknownText_0x18dbee
-; 0x18db31
-PokefanFScript_0x18db31: ; 0x18db31
+PokefanFScript_0x18db31:
jumptextfaceplayer UnknownText_0x18dc19
-; 0x18db34
-UnknownText_0x18db34: ; 0x18db34
+UnknownText_0x18db34:
text "Do your #MON"
line "know HM moves?"
@@ -39,9 +33,8 @@
para "your #MON has"
line "fainted."
done
-; 0x18db88
-UnknownText_0x18db88: ; 0x18db88
+UnknownText_0x18db88:
text "This BILL guy"
line "created the system"
@@ -52,16 +45,14 @@
line "store up to 20"
cont "#MON per BOX."
done
-; 0x18dbee
-UnknownText_0x18dbee: ; 0x18dbee
+UnknownText_0x18dbee:
text "BILL's PC can"
line "store up to 20"
cont "#MON per BOX."
done
-; 0x18dc19
-UnknownText_0x18dc19: ; 0x18dc19
+UnknownText_0x18dc19:
text "Do you know about"
line "APRICORNS?"
@@ -80,9 +71,8 @@
para "everyone used"
line "APRICORNS."
done
-; 0x18dccf
-AzaleaPokeCenter1F_MapEventHeader: ; 0x18dccf
+AzaleaPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -104,4 +94,3 @@
person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, $ffff
person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, $ffff
person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, $ffff
-; 0x18dd18
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -1,4 +1,4 @@
-BattleTower1F_MapScriptHeader: ; 0x9e393
+BattleTower1F_MapScriptHeader:
; trigger count
db 2
@@ -8,9 +8,8 @@
; callback count
db 0
-; 0x9e39d
-UnknownScript_0x9e39d: ; 0x9e39d
+UnknownScript_0x9e39d:
writebyte $9
special Function170687
iffalse UnknownScript_0x9e3d1
@@ -26,24 +25,21 @@
loadmovesprites
priorityjump UnknownScript_0x9e44e
end
-; 0x9e3c4
-UnknownScript_0x9e3c4: ; 0x9e3c4
+UnknownScript_0x9e3c4:
priorityjump UnknownScript_0x9e555
-; 0x9e3c7
-UnknownScript_0x9e3c7: ; 0x9e3c7
+UnknownScript_0x9e3c7:
writebyte $4
special Function170687
writebyte $6
special Function170687
-UnknownScript_0x9e3d1: ; 0x9e3d1
+UnknownScript_0x9e3d1:
dotrigger $1
-UnknownScript_0x9e3d3: ; 0x9e3d3
+UnknownScript_0x9e3d3:
end
-; 0x9e3d4
-MapBattleTower1FSignpost0Script: ; 0x9e3d4
+MapBattleTower1FSignpost0Script:
loadfont
writetext UnknownText_0x9ed3c
yesorno
@@ -50,12 +46,11 @@
iffalse UnknownScript_0x9e3e0
writetext UnknownText_0x9ed72
closetext
-UnknownScript_0x9e3e0: ; 0x9e3e0
+UnknownScript_0x9e3e0:
loadmovesprites
end
-; 0x9e3e2
-ReceptionistScript_0x9e3e2: ; 0x9e3e2
+ReceptionistScript_0x9e3e2:
writebyte $2
special Function170687
if_equal $3, BattleTowerBattleRoomScript_0x9f4e4
@@ -66,9 +61,8 @@
special Function170687
if_not_equal $0, UnknownScript_0x9e3fc
jump UnknownScript_0x9e49e
-; 0x9e3fc
-UnknownScript_0x9e3fc: ; 0x9e3fc
+UnknownScript_0x9e3fc:
writetext UnknownText_0x9e5ea
writebyte $1
special Function17d224
@@ -75,9 +69,8 @@
if_equal $1, UnknownScript_0x9e40f
if_equal $2, UnknownScript_0x9e4a5
jump UnknownScript_0x9e4b0
-; 0x9e40f
-UnknownScript_0x9e40f: ; 0x9e40f
+UnknownScript_0x9e40f:
writebyte $1a
special Function170687
special Function170bd3
@@ -102,13 +95,12 @@
writebyte $1e
special Function170687
jump UnknownScript_0x9e454
-; 0x9e44e
-UnknownScript_0x9e44e: ; 0x9e44e
+UnknownScript_0x9e44e:
loadmovesprites
writebyte $8
special Function170687
-UnknownScript_0x9e454: ; 0x9e454
+UnknownScript_0x9e454:
musicfadeout MUSIC_NONE, $8
domaptrigger GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $0
domaptrigger GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $0
@@ -123,9 +115,8 @@
applymovement $0, MovementData_0x9e576
warpcheck
end
-; 0x9e47a
-UnknownScript_0x9e47a: ; 0x9e47a
+UnknownScript_0x9e47a:
writebyte $1c
special Function170687
writebyte $1b
@@ -138,48 +129,42 @@
special Function170687
loadmovesprites
end
-; 0x9e498
-UnknownScript_0x9e498: ; 0x9e498
+UnknownScript_0x9e498:
writetext UnknownText_0x9eb94
closetext
loadmovesprites
end
-; 0x9e49e
-UnknownScript_0x9e49e: ; 0x9e49e
+UnknownScript_0x9e49e:
writetext UnknownText_0x9ec3d
yesorno
iffalse UnknownScript_0x9e4a8
-UnknownScript_0x9e4a5: ; 0x9e4a5
+UnknownScript_0x9e4a5:
writetext UnknownText_0x9e886
-UnknownScript_0x9e4a8: ; 0x9e4a8
+UnknownScript_0x9e4a8:
writebyte $1
special Function170687
jump UnknownScript_0x9e3fc
-; 0x9e4b0
-UnknownScript_0x9e4b0: ; 0x9e4b0
+UnknownScript_0x9e4b0:
writetext UnknownText_0x9ec09
closetext
loadmovesprites
end
-; 0x9e4b6
-UnknownScript_0x9e4b6: ; 0x9e4b6
+UnknownScript_0x9e4b6:
special Function17f53d
loadmovesprites
end
-; 0x9e4bb
-UnknownScript_0x9e4bb: ; 0x9e4bb
+UnknownScript_0x9e4bb:
closetext
loadmovesprites
end
-; 0x9e4be
-UnknownScript_0x9e4be: ; 0x9e4be
+UnknownScript_0x9e4be:
writetext UnknownText_0x9ef1f
yesorno
iffalse UnknownScript_0x9e3fc
@@ -197,9 +182,8 @@
spriteface $2, DOWN
loadmovesprites
end
-; 0x9e4ea
-UnknownScript_0x9e4ea: ; 0x9e4ea
+UnknownScript_0x9e4ea:
writebyte $18
special Function170687
if_not_equal $0, UnknownScript_0x9e542
@@ -213,11 +197,10 @@
if_equal $0, UnknownScript_0x9e512
writetext UnknownText_0x9ecb0
jump UnknownScript_0x9e515
-; 0x9e512
-UnknownScript_0x9e512: ; 0x9e512
+UnknownScript_0x9e512:
writetext UnknownText_0x9ec6d
-UnknownScript_0x9e515: ; 0x9e515
+UnknownScript_0x9e515:
yesorno
iffalse UnknownScript_0x9e3fc
writetext UnknownText_0x9ef79
@@ -234,40 +217,34 @@
writetext UnknownText_0x9e60a
closetext
jump UnknownScript_0x9e44e
-; 0x9e53b
-UnknownScript_0x9e53b: ; 0x9e53b
+UnknownScript_0x9e53b:
writetext UnknownText_0x9f076
closetext
jump UnknownScript_0x9e4b0
-; 0x9e542
-UnknownScript_0x9e542: ; 0x9e542
+UnknownScript_0x9e542:
writetext UnknownText_0x9f1e5
closetext
jump UnknownScript_0x9e3fc
-; 0x9e549
-UnknownScript_0x9e549: ; 0x9e549
+UnknownScript_0x9e549:
writetext UnknownText_0x9f217
closetext
jump UnknownScript_0x9e3fc
-; 0x9e550
-UnknownScript_0x9e550: ; 0x9e550
+UnknownScript_0x9e550:
special Function17f53d
loadmovesprites
end
-; 0x9e555
-UnknownScript_0x9e555: ; 0x9e555
+UnknownScript_0x9e555:
loadfont
writetext UnknownText_0x9ee18
closetext
jump UnknownScript_0x9e4b0
-; 0x9e55d
-YoungsterScript_0x9e55d: ; 0x9e55d
+YoungsterScript_0x9e55d:
faceplayer
loadfont
writetext UnknownText_0x9f264
@@ -275,40 +252,34 @@
loadmovesprites
spriteface $3, RIGHT
end
-; 0x9e568
-CooltrainerFScript_0x9e568: ; 0x9e568
+CooltrainerFScript_0x9e568:
jumptextfaceplayer UnknownText_0x9f2a4
-; 0x9e56b
-BugCatcherScript_0x9e56b: ; 0x9e56b
+BugCatcherScript_0x9e56b:
jumptextfaceplayer UnknownText_0x9f35b
-; 0x9e56e
-GrannyScript_0x9e56e: ; 0x9e56e
+GrannyScript_0x9e56e:
jumptextfaceplayer UnknownText_0x9f2e3
-; 0x9e571
-MovementData_0x9e571: ; 0x9e571
+MovementData_0x9e571:
step_up
step_up
step_up
step_up
step_up
-MovementData_0x9e576: ; 0x9e576
+MovementData_0x9e576:
step_up
step_end
-; 0x9e578
-MovementData_0x9e578: ; 0x9e578
+MovementData_0x9e578:
step_down
step_end
-; 0x9e57a
-MovementData_0x9e57a: ; 0x9e57a
+MovementData_0x9e57a:
step_right
step_right
-MovementData_0x9e57c: ; 0x9e57c
+MovementData_0x9e57c:
step_right
step_right
step_up
@@ -315,15 +286,14 @@
step_right
turn_head_left
step_end
-; 0x9e582
-MovementData_0x9e582: ; 0x9e582
+MovementData_0x9e582:
step_left
step_left
-MovementData_0x9e584: ; 0x9e584
+MovementData_0x9e584:
step_left
step_left
-MovementData_0x9e586: ; 0x9e586
+MovementData_0x9e586:
step_left
step_left
step_up
@@ -330,9 +300,8 @@
step_left
turn_head_right
step_end
-; 0x9e58c
-MovementData_0x9e58c: ; 0x9e58c
+MovementData_0x9e58c:
step_up
step_up
step_up
@@ -339,33 +308,29 @@
step_up
turn_head_right
step_end
-; 0x9e592
-MovementData_0x9e592: ; 0x9e592
+MovementData_0x9e592:
slow_step_down
slow_step_down
slow_step_down
turn_head_left
step_end
-; 0x9e597
-MovementData_0x9e597: ; 0x9e597
+MovementData_0x9e597:
turn_head_up
slow_step_up
slow_step_up
slow_step_up
step_end
-; 0x9e59c
-MovementData_0x9e59c: ; 0x9e59c
+MovementData_0x9e59c:
slow_step_right
slow_step_right
slow_step_up
slow_step_up
step_end
-; 0x9e5a1
-MovementData_0x9e5a1: ; 0x9e5a1
+MovementData_0x9e5a1:
slow_step_down
slow_step_down
slow_step_left
@@ -372,19 +337,16 @@
slow_step_left
turn_head_right
step_end
-; 0x9e5a7
-MovementData_0x9e5a7: ; 0x9e5a7
+MovementData_0x9e5a7:
turn_head_down
step_end
-; 0x9e5a9
-MovementData_0x9e5a9: ; 0x9e5a9
+MovementData_0x9e5a9:
turn_head_right
step_end
-; 0x9e5ab
-UnknownText_0x9e5ab: ; 0x9e5ab
+UnknownText_0x9e5ab:
text "BATTLE TOWER"
line "welcomes you!"
@@ -391,21 +353,18 @@
para "I could show you"
line "to a BATTLE ROOM."
done
-; 0x9e5ea
-UnknownText_0x9e5ea: ; 0x9e5ea
+UnknownText_0x9e5ea:
text "Want to go into a"
line "BATTLE ROOM?"
done
-; 0x9e60a
-UnknownText_0x9e60a: ; 0x9e60a
+UnknownText_0x9e60a:
text "Right this way to"
line "your BATTLE ROOM."
done
-; 0x9e62f
-UnknownText_0x9e62f: ; 0x9e62f
+UnknownText_0x9e62f:
text "BATTLE TOWER is a"
line "facility made for"
cont "#MON battles."
@@ -464,9 +423,8 @@
para ""
done
-; 0x9e886
-UnknownText_0x9e886: ; 0x9e886
+UnknownText_0x9e886:
text "BATTLE TOWER is a"
line "facility made for"
cont "#MON battles."
@@ -501,9 +459,8 @@
para ""
done
-; 0x9e9eb
-UnknownText_0x9e9eb: ; 0x9e9eb
+UnknownText_0x9e9eb:
text "Received a list of"
line "LEADERS on the"
cont "HONOR ROLL."
@@ -510,28 +467,24 @@
para ""
done
-; 0x9ea1b
-UnknownText_0x9ea1b: ; 0x9ea1b
+UnknownText_0x9ea1b:
text "Please confirm on"
line "this monitor."
done
-; 0x9ea3c
-UnknownText_0x9ea3c: ; 0x9ea3c
+UnknownText_0x9ea3c:
text "Thank you!"
para ""
done
-; 0x9ea49
-UnknownText_0x9ea49: ; 0x9ea49
+UnknownText_0x9ea49:
text "Thanks for"
line "visiting!"
done
-; 0x9ea5f
-UnknownText_0x9ea5f: ; 0x9ea5f
+UnknownText_0x9ea5f:
text "Congratulations!"
para "You've beaten all"
@@ -548,9 +501,8 @@
para ""
done
-; 0x9eaef
-UnknownText_0x9eaef: ; 0x9eaef
+UnknownText_0x9eaef:
text "Congratulations!"
para "You've beaten all"
@@ -561,9 +513,8 @@
para ""
done
-; 0x9eb45
-UnknownText_0x9eb45: ; 0x9eb45
+UnknownText_0x9eb45:
text "Would you like to"
line "register your"
@@ -570,9 +521,8 @@
para "record with the"
line "CENTER?"
done
-; 0x9eb7e
-UnknownText_0x9eb7e: ; 0x9eb7e
+UnknownText_0x9eb7e:
text "<PLAYER> got five"
line "@"
text_from_ram StringBuffer4
@@ -580,9 +530,8 @@
sound0x0F
text_waitbutton
db "@"
-; 0x9eb94
-UnknownText_0x9eb94: ; 0x9eb94
+UnknownText_0x9eb94:
text "Oops, your PACK is"
line "stuffed full."
@@ -589,36 +538,31 @@
para "Please make room"
line "and come back."
done
-; 0x9ebd6
-UnknownText_0x9ebd6: ; 0x9ebd6
+UnknownText_0x9ebd6:
text "Your registration"
line "is complete."
para "Please come again!"
done
-; 0x9ec09
-UnknownText_0x9ec09: ; 0x9ec09
+UnknownText_0x9ec09:
text "We hope to serve"
line "you again."
done
-; 0x9ec26
-UnknownText_0x9ec26: ; 0x9ec26
+UnknownText_0x9ec26:
text "Please step this"
line "way."
done
-; 0x9ec3d
-UnknownText_0x9ec3d: ; 0x9ec3d
+UnknownText_0x9ec3d:
text "Would you like to"
line "hear about the"
cont "BATTLE TOWER?"
done
-; 0x9ec6d
-UnknownText_0x9ec6d: ; 0x9ec6d
+UnknownText_0x9ec6d:
text "Your record from"
line "the previous"
@@ -625,9 +569,8 @@
para "BATTLE ROOM can't"
line "be registered. OK?"
done
-; 0x9ecb0
-UnknownText_0x9ecb0: ; 0x9ecb0
+UnknownText_0x9ecb0:
text "Your record from"
line "the previous"
@@ -638,23 +581,20 @@
line "record will be"
cont "deleted. OK?"
done
-; 0x9ed1e
-UnknownText_0x9ed1e: ; 0x9ed1e
+UnknownText_0x9ed1e:
text "Check the LEADER"
line "HONOR ROLL?"
done
-; 0x9ed3c
-UnknownText_0x9ed3c: ; 0x9ed3c
+UnknownText_0x9ed3c:
text "BATTLE TOWER rules"
line "are written here."
para "Read the rules?"
done
-; 0x9ed72
-UnknownText_0x9ed72: ; 0x9ed72
+UnknownText_0x9ed72:
text "Three #MON may"
line "enter battles."
@@ -671,9 +611,8 @@
para "level restrictions"
line "placed on them."
done
-; 0x9ee18
-UnknownText_0x9ee18: ; 0x9ee18
+UnknownText_0x9ee18:
text "Excuse me!"
line "You didn't SAVE"
@@ -686,24 +625,21 @@
para "will be declared"
line "invalid."
done
-; 0x9ee92
-UnknownText_0x9ee92: ; 0x9ee92
+UnknownText_0x9ee92:
text "Your #MON will"
line "be healed to full"
cont "health."
done
-; 0x9eebc
-UnknownText_0x9eebc: ; 0x9eebc
+UnknownText_0x9eebc:
text "Next up, opponent"
line "no.@"
text_from_ram StringBuffer3
text ". Ready?"
done
-; 0x9eee0
-UnknownText_0x9eee0: ; 0x9eee0
+UnknownText_0x9eee0:
text "Your session will"
line "be SAVED before"
@@ -710,9 +646,8 @@
para "connecting with"
line "the CENTER."
done
-; 0x9ef1f
-UnknownText_0x9ef1f: ; 0x9ef1f
+UnknownText_0x9ef1f:
text "Before entering"
line "the BATTLE ROOM,"
@@ -719,15 +654,13 @@
para "your progress will"
line "be saved."
done
-; 0x9ef5e
-UnknownText_0x9ef5e: ; 0x9ef5e
+UnknownText_0x9ef5e:
text "SAVE and end the"
line "session?"
done
-; 0x9ef79
-UnknownText_0x9ef79: ; 0x9ef79
+UnknownText_0x9ef79:
text "Your record will"
line "be SAVED before"
@@ -734,15 +667,13 @@
para "you go back into"
line "the previous ROOM."
done
-; 0x9efbf
-UnknownText_0x9efbf: ; 0x9efbf
+UnknownText_0x9efbf:
text "Cancel your BATTLE"
line "ROOM challenge?"
done
-; 0x9efe3
-UnknownText_0x9efe3: ; 0x9efe3
+UnknownText_0x9efe3:
text "We have your"
line "previous record on"
@@ -750,9 +681,8 @@
line "like to register"
cont "it at the CENTER?"
done
-; 0x9f037
-UnknownText_0x9f037: ; 0x9f037
+UnknownText_0x9f037:
text "We've been waiting"
line "for you. This way"
@@ -759,9 +689,8 @@
para "to a BATTLE ROOM,"
line "please."
done
-; 0x9f076
-UnknownText_0x9f076: ; 0x9f076
+UnknownText_0x9f076:
text "You may enter only"
line "five BATTLE ROOMS"
cont "each day."
@@ -769,9 +698,8 @@
para "Please come back"
line "tomorrow."
done
-; 0x9f0c1
-UnknownText_0x9f0c1: ; 0x9f0c1
+UnknownText_0x9f0c1:
text "Sorry, but it's"
line "not possible to"
@@ -785,10 +713,9 @@
line "start of your"
cont "challenge."
done
-; 0x9f151
; a dupe?
-UnknownText_0x9f151: ; 0x9f151
+UnknownText_0x9f151:
text "Sorry, but it's"
line "not possible to"
@@ -802,9 +729,8 @@
line "start of your"
cont "challenge."
done
-; 0x9f1e5
-UnknownText_0x9f1e5: ; 0x9f1e5
+UnknownText_0x9f1e5:
text "One or more of"
line "your #MON's"
cont "levels exceeds @"
@@ -811,9 +737,8 @@
deciram ScriptVar, $13
text "."
done
-; 0x9f217
-UnknownText_0x9f217: ; 0x9f217
+UnknownText_0x9f217:
text_from_ram wcd49
text " may not"
line "enter a BATTLE"
@@ -824,9 +749,8 @@
deciram ScriptVar, $13
text "."
done
-; 0x9f264
-UnknownText_0x9f264: ; 0x9f264
+UnknownText_0x9f264:
text "Destroyed by the"
line "first opponent in"
@@ -833,9 +757,8 @@
para "no time at all…"
line "I'm no good…"
done
-; 0x9f2a4
-UnknownText_0x9f2a4: ; 0x9f2a4
+UnknownText_0x9f2a4:
text "There are lots of"
line "BATTLE ROOMS, but"
@@ -842,9 +765,8 @@
para "I'm going to win"
line "them all!"
done
-; 0x9f2e3
-UnknownText_0x9f2e3: ; 0x9f2e3
+UnknownText_0x9f2e3:
text "It's a grueling"
line "task, not being"
@@ -857,9 +779,8 @@
para "is the key to"
line "winning battles."
done
-; 0x9f35b
-UnknownText_0x9f35b: ; 0x9f35b
+UnknownText_0x9f35b:
text "I'm trying to see"
line "how far I can go"
@@ -869,9 +790,8 @@
para "Don't let there be"
line "any fire #MON…"
done
-; 0x9f3b4
-BattleTower1F_MapEventHeader: ; 0x9f3b4
+BattleTower1F_MapEventHeader:
; filler
db 0, 0
@@ -895,4 +815,3 @@
person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, $ffff
person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, $ffff
person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, $ffff
-; 0x9f40f
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -1,4 +1,4 @@
-BattleTowerBattleRoom_MapScriptHeader: ; 0x9f40f
+BattleTowerBattleRoom_MapScriptHeader:
; trigger count
db 2
@@ -8,21 +8,18 @@
; callback count
db 0
-; 0x9f419
-UnknownScript_0x9f419: ; 0x9f419
+UnknownScript_0x9f419:
disappear $2
priorityjump UnknownScript_0x9f421
dotrigger $1
-; 0x9f420
-UnknownScript_0x9f420: ; 0x9f420
+UnknownScript_0x9f420:
end
-; 0x9f421
-UnknownScript_0x9f421: ; 0x9f421
+UnknownScript_0x9f421:
applymovement $0, MovementData_0x9e58c
-UnknownScript_0x9f425: ; 0x9f425
+UnknownScript_0x9f425:
writebyte $2
special Function170b44
appear $2
@@ -58,14 +55,13 @@
writetext UnknownText_0x9eebc
yesorno
iffalse UnknownScript_0x9f483
-UnknownScript_0x9f477: ; 0x9f477
+UnknownScript_0x9f477:
loadmovesprites
applymovement $0, MovementData_0x9e5a9
applymovement $3, MovementData_0x9e5a1
jump UnknownScript_0x9f425
-; 0x9f483
-UnknownScript_0x9f483: ; 0x9f483
+UnknownScript_0x9f483:
writetext UnknownText_0x9ef5e
yesorno
iffalse UnknownScript_0x9f4a3
@@ -79,7 +75,7 @@
waitbutton
special Function8c084
special Reset
-UnknownScript_0x9f4a3: ; 0x9f4a3
+UnknownScript_0x9f4a3:
writetext UnknownText_0x9efbf
yesorno
iffalse UnknownScript_0x9f477
@@ -92,9 +88,8 @@
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0
-; 0x9f4c2
-UnknownScript_0x9f4c2: ; 0x9f4c2
+UnknownScript_0x9f4c2:
pause 60
special Function8c092
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
@@ -105,19 +100,17 @@
closetext
loadmovesprites
end
-; 0x9f4d9
-UnknownScript_0x9f4d9: ; 0x9f4d9
+UnknownScript_0x9f4d9:
pause 60
special Function8c092
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
-BattleTowerBattleRoomScript_0x9f4e4: ; 0x9f4e4
+BattleTowerBattleRoomScript_0x9f4e4:
loadfont
writetext UnknownText_0x9eaef
jump UnknownScript_0x9e47a
-; 0x9f4eb
-UnknownScript_0x9f4eb: ; 0x9f4eb
+UnknownScript_0x9f4eb:
writebyte $4
special Function170687
loadfont
@@ -125,9 +118,8 @@
closetext
loadmovesprites
end
-; 0x9f4f7
-UnknownScript_0x9f4f7: ; 0x9f4f7
+UnknownScript_0x9f4f7:
writebyte $4
special Function170687
writebyte $6
@@ -138,17 +130,15 @@
closetext
loadmovesprites
end
-; 0x9f50b
-UnknownText_0x9f50b: ; 0x9f50b
+UnknownText_0x9f50b:
text "You'll be returned"
line "after you SAVE."
done
-; 0x9f52e
-BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e
+BattleTowerBattleRoom_MapEventHeader:
; filler
db 0, 0
@@ -167,4 +157,3 @@
db 2
person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791
person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff
-; 0x9f558
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -1,4 +1,4 @@
-BattleTowerElevator_MapScriptHeader: ; 0x9f558
+BattleTowerElevator_MapScriptHeader:
; trigger count
db 2
@@ -8,18 +8,15 @@
; callback count
db 0
-; 0x9f562
-UnknownScript_0x9f562: ; 0x9f562
+UnknownScript_0x9f562:
priorityjump UnknownScript_0x9f568
dotrigger $1
-; 0x9f567
-UnknownScript_0x9f567: ; 0x9f567
+UnknownScript_0x9f567:
end
-; 0x9f568
-UnknownScript_0x9f568: ; 0x9f568
+UnknownScript_0x9f568:
follow $2, $0
applymovement $2, MovementData_0x9f58f
applymovement $0, MovementData_0x9f592
@@ -36,20 +33,17 @@
applymovement $0, MovementData_0x9e578
warpcheck
end
-; 0x9f58f
-MovementData_0x9f58f: ; 0x9f58f
+MovementData_0x9f58f:
step_right
turn_head_down
step_end
-; 0x9f592
-MovementData_0x9f592: ; 0x9f592
+MovementData_0x9f592:
turn_head_down
step_end
-; 0x9f594
-BattleTowerElevator_MapEventHeader: ; 0x9f594
+BattleTowerElevator_MapEventHeader:
; filler
db 0, 0
@@ -67,4 +61,3 @@
; people-events
db 1
person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff
-; 0x9f5b1
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -1,4 +1,4 @@
-BattleTowerHallway_MapScriptHeader: ; 0x9f5b1
+BattleTowerHallway_MapScriptHeader:
; trigger count
db 2
@@ -8,25 +8,21 @@
; callback count
db 0
-; 0x9f5bb
-UnknownScript_0x9f5bb: ; 0x9f5bb
+UnknownScript_0x9f5bb:
priorityjump UnknownScript_0x9f5c1
dotrigger $1
-; 0x9f5c0
-UnknownScript_0x9f5c0: ; 0x9f5c0
+UnknownScript_0x9f5c0:
end
-; 0x9f5c1
-UnknownScript_0x9f5c1: ; 0x9f5c1
+UnknownScript_0x9f5c1:
follow $2, $0
callasm Function_0x9f5cb
jump UnknownScript_0x9f5dc
-; 0x9f5cb
-Function_0x9f5cb: ; 0x9f5cb
+Function_0x9f5cb:
ld a, [rSVBK]
push af
@@ -38,10 +34,9 @@
pop af
ld [rSVBK], a
ret
-; 0x9f5dc
-UnknownScript_0x9f5dc: ; 0x9f5dc
+UnknownScript_0x9f5dc:
if_equal $3, UnknownScript_0x9f603
if_equal $4, UnknownScript_0x9f603
if_equal $5, UnknownScript_0x9f60a
@@ -52,29 +47,24 @@
if_equal $a, UnknownScript_0x9f618
applymovement $2, MovementData_0x9e57a
jump UnknownScript_0x9f61f
-; 0x9f603
-UnknownScript_0x9f603: ; 0x9f603
+UnknownScript_0x9f603:
applymovement $2, MovementData_0x9e57c
jump UnknownScript_0x9f61f
-; 0x9f60a
-UnknownScript_0x9f60a: ; 0x9f60a
+UnknownScript_0x9f60a:
applymovement $2, MovementData_0x9e586
jump UnknownScript_0x9f61f
-; 0x9f611
-UnknownScript_0x9f611: ; 0x9f611
+UnknownScript_0x9f611:
applymovement $2, MovementData_0x9e584
jump UnknownScript_0x9f61f
-; 0x9f618
-UnknownScript_0x9f618: ; 0x9f618
+UnknownScript_0x9f618:
applymovement $2, MovementData_0x9e582
jump UnknownScript_0x9f61f
-; 0x9f61f
-UnknownScript_0x9f61f: ; 0x9f61f
+UnknownScript_0x9f61f:
faceperson $0, $2
loadfont
writetext UnknownText_0x9ec26
@@ -84,9 +74,8 @@
applymovement $0, MovementData_0x9e576
warpcheck
end
-; 0x9f62f
-BattleTowerHallway_MapEventHeader: ; 0x9f62f
+BattleTowerHallway_MapEventHeader:
; filler
db 0, 0
@@ -108,4 +97,3 @@
; people-events
db 1
person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff
-; 0x9f660
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -1,12 +1,11 @@
-BillsHouse_MapScriptHeader: ; 0x189536
+BillsHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x189538
-GrampsScript_0x189538: ; 0x189538
+GrampsScript_0x189538:
faceplayer
loadfont
checkevent $0000
@@ -18,7 +17,7 @@
writetext UnknownText_0x1896ce
keeptextopen
setevent EVENT_MET_BILLS_GRANDPA
-UnknownScript_0x189553: ; 0x189553
+UnknownScript_0x189553:
checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189697
checkevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
@@ -41,9 +40,8 @@
scall UnknownScript_0x1896b0
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
jump UnknownScript_0x18963b
-; 0x189592
-UnknownScript_0x189592: ; 0x189592
+UnknownScript_0x189592:
writetext UnknownText_0x1898ff
keeptextopen
writetext UnknownText_0x189732
@@ -56,9 +54,8 @@
scall UnknownScript_0x1896b0
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
jump UnknownScript_0x189652
-; 0x1895b3
-UnknownScript_0x1895b3: ; 0x1895b3
+UnknownScript_0x1895b3:
writetext UnknownText_0x189953
keeptextopen
writetext UnknownText_0x189732
@@ -71,9 +68,8 @@
scall UnknownScript_0x1896b0
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
jump UnknownScript_0x189669
-; 0x1895d4
-UnknownScript_0x1895d4: ; 0x1895d4
+UnknownScript_0x1895d4:
checkver
iftrue UnknownScript_0x1895f9
writetext UnknownText_0x1899fe
@@ -88,9 +84,8 @@
scall UnknownScript_0x1896b0
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump UnknownScript_0x189680
-; 0x1895f9
-UnknownScript_0x1895f9: ; 0x1895f9
+UnknownScript_0x1895f9:
writetext UnknownText_0x189a57
keeptextopen
writetext UnknownText_0x189732
@@ -103,9 +98,8 @@
scall UnknownScript_0x1896b0
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump UnknownScript_0x189680
-; 0x18961a
-UnknownScript_0x18961a: ; 0x18961a
+UnknownScript_0x18961a:
writetext UnknownText_0x189ab1
keeptextopen
writetext UnknownText_0x189732
@@ -118,9 +112,8 @@
scall UnknownScript_0x1896b0
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
jump UnknownScript_0x189697
-; 0x18963b
-UnknownScript_0x18963b: ; 0x18963b
+UnknownScript_0x18963b:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x189592
scall UnknownScript_0x1896b5
@@ -130,9 +123,8 @@
setevent $0000
loadmovesprites
end
-; 0x189652
-UnknownScript_0x189652: ; 0x189652
+UnknownScript_0x189652:
checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895b3
scall UnknownScript_0x1896b5
@@ -142,9 +134,8 @@
setevent $0000
loadmovesprites
end
-; 0x189669
-UnknownScript_0x189669: ; 0x189669
+UnknownScript_0x189669:
checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895d4
scall UnknownScript_0x1896b5
@@ -154,9 +145,8 @@
setevent $0000
loadmovesprites
end
-; 0x189680
-UnknownScript_0x189680: ; 0x189680
+UnknownScript_0x189680:
checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x18961a
scall UnknownScript_0x1896b5
@@ -166,9 +156,8 @@
setevent $0000
loadmovesprites
end
-; 0x189697
-UnknownScript_0x189697: ; 0x189697
+UnknownScript_0x189697:
scall UnknownScript_0x1896b5
verbosegiveitem THUNDERSTONE, 1
iffalse UnknownScript_0x1896cc
@@ -175,60 +164,51 @@
setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
loadmovesprites
end
-; 0x1896a5
-UnknownScript_0x1896a5: ; 0x1896a5
+UnknownScript_0x1896a5:
writetext UnknownText_0x189760
keeptextopen
end
-; 0x1896aa
-UnknownScript_0x1896aa: ; 0x1896aa
+UnknownScript_0x1896aa:
writetext UnknownText_0x189784
closetext
loadmovesprites
end
-; 0x1896b0
-UnknownScript_0x1896b0: ; 0x1896b0
+UnknownScript_0x1896b0:
writetext UnknownText_0x1897a6
keeptextopen
end
-; 0x1896b5
-UnknownScript_0x1896b5: ; 0x1896b5
+UnknownScript_0x1896b5:
writetext UnknownText_0x1897e1
keeptextopen
end
-; 0x1896ba
-UnknownScript_0x1896ba: ; 0x1896ba
+UnknownScript_0x1896ba:
writetext UnknownText_0x18980e
closetext
loadmovesprites
end
-; 0x1896c0
-UnknownScript_0x1896c0: ; 0x1896c0
+UnknownScript_0x1896c0:
writetext UnknownText_0x18982a
closetext
loadmovesprites
end
-; 0x1896c6
-UnknownScript_0x1896c6: ; 0x1896c6
+UnknownScript_0x1896c6:
writetext UnknownText_0x189891
closetext
loadmovesprites
end
-; 0x1896cc
-UnknownScript_0x1896cc: ; 0x1896cc
+UnknownScript_0x1896cc:
loadmovesprites
end
-; 0x1896ce
-UnknownText_0x1896ce: ; 0x1896ce
+UnknownText_0x1896ce:
text "Hm? You know BILL?"
line "He's my grandson."
@@ -238,28 +218,24 @@
para "with PCs, so I'm"
line "house-sitting."
done
-; 0x189732
-UnknownText_0x189732: ; 0x189732
+UnknownText_0x189732:
text "If you have that"
line "#MON, may I see"
cont "it, please?"
done
-; 0x189760
-UnknownText_0x189760: ; 0x189760
+UnknownText_0x189760:
text "You will show me?"
line "How good of you!"
done
-; 0x189784
-UnknownText_0x189784: ; 0x189784
+UnknownText_0x189784:
text "You don't have it?"
line "That's too bad…"
done
-; 0x1897a6
-UnknownText_0x1897a6: ; 0x1897a6
+UnknownText_0x1897a6:
text "Ah, so that is"
line "@"
text_from_ram StringBuffer3
@@ -269,23 +245,20 @@
line "That's so kind of"
cont "you."
done
-; 0x1897e1
-UnknownText_0x1897e1: ; 0x1897e1
+UnknownText_0x1897e1:
text "Thanks!"
para "This is a token of"
line "my appreciation."
done
-; 0x18980e
-UnknownText_0x18980e: ; 0x18980e
+UnknownText_0x18980e:
text "Come visit again"
line "sometime."
done
-; 0x18982a
-UnknownText_0x18982a: ; 0x18982a
+UnknownText_0x18982a:
text "Thanks for showing"
line "me so many cute"
cont "#MON."
@@ -296,9 +269,8 @@
para "I've lived such a"
line "long life."
done
-; 0x189891
-UnknownText_0x189891: ; 0x189891
+UnknownText_0x189891:
text "Hm?"
para "That's not the"
@@ -305,9 +277,8 @@
line "#MON that I was"
cont "told about."
done
-; 0x1898c0
-UnknownText_0x1898c0: ; 0x1898c0
+UnknownText_0x1898c0:
text "My grandson BILL"
line "told me about a"
@@ -314,9 +285,8 @@
para "#MON that has a"
line "long tongue."
done
-; 0x1898ff
-UnknownText_0x1898ff: ; 0x1898ff
+UnknownText_0x1898ff:
text "Ah, my grandson"
line "mentioned a round,"
@@ -324,9 +294,8 @@
line "has leaves growing"
cont "on its head."
done
-; 0x189953
-UnknownText_0x189953: ; 0x189953
+UnknownText_0x189953:
text "Do you know of a"
line "sea #MON that"
@@ -343,9 +312,8 @@
para "I would surely"
line "like to see it."
done
-; 0x1899fe
-UnknownText_0x1899fe: ; 0x1899fe
+UnknownText_0x1899fe:
text "BILL told me about"
line "a #MON that is"
@@ -355,9 +323,8 @@
para "It's supposed to"
line "ROAR well."
done
-; 0x189a57
-UnknownText_0x189a57: ; 0x189a57
+UnknownText_0x189a57:
text "I heard about a"
line "cute #MON that"
cont "has six tails."
@@ -366,9 +333,8 @@
line "hug a cute #MON"
cont "like that."
done
-; 0x189ab1
-UnknownText_0x189ab1: ; 0x189ab1
+UnknownText_0x189ab1:
text "Do you know that"
line "hugely popular"
cont "#MON?"
@@ -383,9 +349,8 @@
para "like before it"
line "evolves."
done
-; 0x189b42
-BillsHouse_MapEventHeader: ; 0x189b42
+BillsHouse_MapEventHeader:
; filler
db 0, 0
@@ -403,4 +368,3 @@
; people-events
db 1
person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, $ffff
-; 0x189b5f
--- a/maps/BlackthornDodrioTradeHouse.asm
+++ b/maps/BlackthornDodrioTradeHouse.asm
@@ -1,4 +1,4 @@
-BlackthornDodrioTradeHouse_MapScriptHeader: ; 0x195a28
+BlackthornDodrioTradeHouse_MapScriptHeader:
; trigger count
db 0
@@ -16,7 +16,7 @@
EmysHouseBookshelf:
jumpstd magazinebookshelf
-BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34
+BlackthornDodrioTradeHouse_MapEventHeader:
; filler
db 0, 0
@@ -36,4 +36,3 @@
; people-events
db 1
person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, $ffff
-; 0x195a5b
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -1,16 +1,14 @@
-BlackthornDragonSpeechHouse_MapScriptHeader: ; 0x195947
+BlackthornDragonSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x195949
-GrannyScript_0x195949: ; 0x195949
+GrannyScript_0x195949:
jumptextfaceplayer UnknownText_0x19595c
-; 0x19594c
-EkansScript_0x19594c: ; 0x19594c
+EkansScript_0x19594c:
loadfont
writetext UnknownText_0x1959ee
cry DRATINI
@@ -17,7 +15,6 @@
closetext
loadmovesprites
end
-; 0x195956
UnknownScript_0x195956:
jumpstd picturebookshelf
@@ -25,7 +22,7 @@
UnknownScript_0x195959:
jumpstd magazinebookshelf
-UnknownText_0x19595c: ; 0x19595c
+UnknownText_0x19595c:
text "A clan of trainers"
line "who can freely"
@@ -39,14 +36,12 @@
para "about dragons in"
line "this town."
done
-; 0x1959ee
-UnknownText_0x1959ee: ; 0x1959ee
+UnknownText_0x1959ee:
text "DRATINI: Draa!"
done
-; 0x1959fe
-BlackthornDragonSpeechHouse_MapEventHeader: ; 0x1959fe
+BlackthornDragonSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -65,4 +60,3 @@
db 2
person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, $ffff
person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, $ffff
-; 0x195a28
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -1,27 +1,23 @@
-BlackthornMart_MapScriptHeader: ; 0x195a5b
+BlackthornMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x195a5d
-ClerkScript_0x195a5d: ; 0x195a5d
+ClerkScript_0x195a5d:
loadfont
pokemart $0, $0011
loadmovesprites
end
-; 0x195a64
-CooltrainerMScript_0x195a64: ; 0x195a64
+CooltrainerMScript_0x195a64:
jumptextfaceplayer UnknownText_0x195a6a
-; 0x195a67
-BlackBeltScript_0x195a67: ; 0x195a67
+BlackBeltScript_0x195a67:
jumptextfaceplayer UnknownText_0x195ae9
-; 0x195a6a
-UnknownText_0x195a6a: ; 0x195a6a
+UnknownText_0x195a6a:
text "You can't buy MAX"
line "REVIVE, but it"
@@ -34,9 +30,8 @@
para "POWER POINTS"
line "needed for moves."
done
-; 0x195ae9
-UnknownText_0x195ae9: ; 0x195ae9
+UnknownText_0x195ae9:
text "MAX REPEL keeps"
line "weak #MON away"
cont "from you."
@@ -45,9 +40,8 @@
line "lasting of the"
cont "REPEL sprays."
done
-; 0x195b40
-BlackthornMart_MapEventHeader: ; 0x195b40
+BlackthornMart_MapEventHeader:
; filler
db 0, 0
@@ -67,4 +61,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, $ffff
person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, $ffff
person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, $ffff
-; 0x195b77
--- a/maps/BlackthornPokeCenter1F.asm
+++ b/maps/BlackthornPokeCenter1F.asm
@@ -1,28 +1,23 @@
-BlackthornPokeCenter1F_MapScriptHeader: ; 0x195b77
+BlackthornPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x195b79
-NurseScript_0x195b79: ; 0x195b79
+NurseScript_0x195b79:
jumpstd pokecenternurse
-; 0x195b7c
-GentlemanScript_0x195b7c: ; 0x195b7c
+GentlemanScript_0x195b7c:
jumptextfaceplayer UnknownText_0x195b85
-; 0x195b7f
-TwinScript_0x195b7f: ; 0x195b7f
+TwinScript_0x195b7f:
jumptextfaceplayer UnknownText_0x195bfd
-; 0x195b82
-CooltrainerMScript_0x195b82: ; 0x195b82
+CooltrainerMScript_0x195b82:
jumpstd $0033
-; 0x195b85
-UnknownText_0x195b85: ; 0x195b85
+UnknownText_0x195b85:
text "Deep inside far-"
line "off INDIGO PLATEAU"
@@ -35,9 +30,8 @@
para "there from around"
line "the country."
done
-; 0x195bfd
-UnknownText_0x195bfd: ; 0x195bfd
+UnknownText_0x195bfd:
text "There was this"
line "move I just had"
@@ -48,9 +42,8 @@
line "DELETER to make it"
cont "forget an HM move."
done
-; 0x195c69
-BlackthornPokeCenter1F_MapEventHeader: ; 0x195c69
+BlackthornPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -72,4 +65,3 @@
person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, $ffff
person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, $ffff
person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, $ffff
-; 0x195cb2
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -1,12 +1,11 @@
-BluesHouse_MapScriptHeader: ; 0x19b0ce
+BluesHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19b0d0
-DaisyScript_0x19b0d0: ; 0x19b0d0
+DaisyScript_0x19b0d0:
faceplayer
loadfont
checkcode VAR_HOUR
@@ -15,9 +14,8 @@
closetext
loadmovesprites
end
-; 0x19b0de
-UnknownScript_0x19b0de: ; 0x19b0de
+UnknownScript_0x19b0de:
checkflag $005c
iftrue UnknownScript_0x19b11e
writetext UnknownText_0x19b1b6
@@ -45,30 +43,26 @@
closetext
loadmovesprites
end
-; 0x19b11e
-UnknownScript_0x19b11e: ; 0x19b11e
+UnknownScript_0x19b11e:
writetext UnknownText_0x19b2fa
closetext
loadmovesprites
end
-; 0x19b124
-UnknownScript_0x19b124: ; 0x19b124
+UnknownScript_0x19b124:
writetext UnknownText_0x19b334
closetext
loadmovesprites
end
-; 0x19b12a
-UnknownScript_0x19b12a: ; 0x19b12a
+UnknownScript_0x19b12a:
writetext UnknownText_0x19b377
closetext
loadmovesprites
end
-; 0x19b130
-UnknownText_0x19b130: ; 0x19b130
+UnknownText_0x19b130:
text "DAISY: Hi! My kid"
line "brother is the GYM"
@@ -81,9 +75,8 @@
para "it causes problems"
line "for the trainers."
done
-; 0x19b1b6
-UnknownText_0x19b1b6: ; 0x19b1b6
+UnknownText_0x19b1b6:
text "DAISY: Hi! Good"
line "timing. I'm about"
cont "to have some tea."
@@ -97,29 +90,25 @@
para "Would you like me"
line "to groom one?"
done
-; 0x19b244
-UnknownText_0x19b244: ; 0x19b244
+UnknownText_0x19b244:
text "DAISY: Which one"
line "should I groom?"
done
-; 0x19b266
-UnknownText_0x19b266: ; 0x19b266
+UnknownText_0x19b266:
text "DAISY: OK, I'll"
line "get it looking"
cont "nice in no time."
done
-; 0x19b296
-UnknownText_0x19b296: ; 0x19b296
+UnknownText_0x19b296:
text_from_ram StringBuffer3
text " looks"
line "content."
done
-; 0x19b2aa
-UnknownText_0x19b2aa: ; 0x19b2aa
+UnknownText_0x19b2aa:
text "DAISY: There you"
line "go! All done."
@@ -129,9 +118,8 @@
para "It's such a cute"
line "#MON."
done
-; 0x19b2fa
-UnknownText_0x19b2fa: ; 0x19b2fa
+UnknownText_0x19b2fa:
text "DAISY: I always"
line "have tea around"
@@ -138,9 +126,8 @@
para "this time. Come"
line "join me."
done
-; 0x19b334
-UnknownText_0x19b334: ; 0x19b334
+UnknownText_0x19b334:
text "DAISY: You don't"
line "want to have one"
@@ -147,16 +134,14 @@
para "groomed? OK, we'll"
line "just have tea."
done
-; 0x19b377
-UnknownText_0x19b377: ; 0x19b377
+UnknownText_0x19b377:
text "DAISY: Oh, sorry."
line "I honestly can't"
cont "groom an EGG."
done
-; 0x19b3a8
-BluesHouse_MapEventHeader: ; 0x19b3a8
+BluesHouse_MapEventHeader:
; filler
db 0, 0
@@ -174,4 +159,3 @@
; people-events
db 1
person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, $ffff
-; 0x19b3c5
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -1,4 +1,4 @@
-BurnedTower1F_MapScriptHeader: ; 0x185be1
+BurnedTower1F_MapScriptHeader:
; trigger count
db 3
@@ -13,34 +13,29 @@
; callbacks
dbw 1, UnknownScript_0x185bf8
-; 0x185bf2
-UnknownScript_0x185bf2: ; 0x185bf2
+UnknownScript_0x185bf2:
priorityjump UnknownScript_0x185c0d
end
-; 0x185bf6
-UnknownScript_0x185bf6: ; 0x185bf6
+UnknownScript_0x185bf6:
end
-; 0x185bf7
-UnknownScript_0x185bf7: ; 0x185bf7
+UnknownScript_0x185bf7:
end
-; 0x185bf8
-UnknownScript_0x185bf8: ; 0x185bf8
+UnknownScript_0x185bf8:
checkevent $0332
iftrue UnknownScript_0x185c02
changeblock $a, $8, $32
-UnknownScript_0x185c02: ; 0x185c02
+UnknownScript_0x185c02:
checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x185c0c
changeblock $6, $e, $9
-UnknownScript_0x185c0c: ; 0x185c0c
+UnknownScript_0x185c0c:
return
-; 0x185c0d
-UnknownScript_0x185c0d: ; 0x185c0d
+UnknownScript_0x185c0d:
spriteface $3, DOWN
showemote $0, $3, 15
applymovement $3, MovementData_0x185cd3
@@ -51,9 +46,8 @@
moveperson $3, $9, $e
dotrigger $1
end
-; 0x185c25
-UnknownScript_0x185c25: ; 0x185c25
+UnknownScript_0x185c25:
showemote $0, $4, 15
special Functionc48f
pause 15
@@ -77,9 +71,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
-; 0x185c60
-UnknownScript_0x185c60: ; 0x185c60
+UnknownScript_0x185c60:
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4
loadtrainer RIVAL1, RIVAL1_7
@@ -87,9 +80,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
-; 0x185c70
-UnknownScript_0x185c70: ; 0x185c70
+UnknownScript_0x185c70:
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4
loadtrainer RIVAL1, RIVAL1_8
@@ -97,9 +89,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
-; 0x185c80
-UnknownScript_0x185c80: ; 0x185c80
+UnknownScript_0x185c80:
playmusic MUSIC_RIVAL_AFTER
loadfont
writetext UnknownText_0x185de2
@@ -127,51 +118,42 @@
pause 15
warpcheck
end
-; 0x185cbc
-SuperNerdScript_0x185cbc: ; 0x185cbc
+SuperNerdScript_0x185cbc:
jumptextfaceplayer UnknownText_0x185f99
-; 0x185cbf
-MortyScript_0x185cbf: ; 0x185cbf
+MortyScript_0x185cbf:
jumptextfaceplayer UnknownText_0x186002
-; 0x185cc2
BurnedTower1FRock:
jumpstd smashrock
-MapBurnedTower1FSignpostItem0: ; 0x185cc5
+MapBurnedTower1FSignpostItem0:
dw $0080
db ETHER
-; 0x185cc8
-MapBurnedTower1FSignpostItem1: ; 0x185cc8
+MapBurnedTower1FSignpostItem1:
dw $00ff
db ULTRA_BALL
-; 0x185ccb
-ItemFragment_0x185ccb: ; 0x185ccb
+ItemFragment_0x185ccb:
db HP_UP, 1
-; 0x185ccd
-MovementData_0x185ccd: ; 0x185ccd
+MovementData_0x185ccd:
step_left
step_end
-; 0x185ccf
-MovementData_0x185ccf: ; 0x185ccf
+MovementData_0x185ccf:
step_right
step_end
-; 0x185cd1
-MovementData_0x185cd1: ; 0x185cd1
+MovementData_0x185cd1:
db $59 ; movement
step_end
-; 0x185cd3
-MovementData_0x185cd3: ; 0x185cd3
+MovementData_0x185cd3:
step_down
step_left
step_left
@@ -178,9 +160,8 @@
step_left
step_down
step_end
-; 0x185cd9
-UnknownText_0x185cd9: ; 0x185cd9
+UnknownText_0x185cd9:
text $56, " ", $56, " ", $56
para "…Oh, it's you."
@@ -203,9 +184,8 @@
para "It's all your"
line "fault!"
done
-; 0x185d9b
-UnknownText_0x185d9b: ; 0x185d9b
+UnknownText_0x185d9b:
text "…Humph!"
para "This is why I hate"
@@ -214,9 +194,8 @@
para "There's no"
line "challenge in it."
done
-; 0x185de2
-UnknownText_0x185de2: ; 0x185de2
+UnknownText_0x185de2:
text "…Aw, whatever."
para "You would never be"
@@ -225,9 +204,8 @@
para "legendary #MON"
line "anyway."
done
-; 0x185e2c
-UnknownText_0x185e2c: ; 0x185e2c
+UnknownText_0x185e2c:
text "…Humph!"
para "This is why I hate"
@@ -236,9 +214,8 @@
para "It's just a waste"
line "of my time."
done
-; 0x185e75
-UnknownText_0x185e75: ; 0x185e75
+UnknownText_0x185e75:
text "Humph!"
para "What are you doing"
@@ -249,9 +226,8 @@
para "Serves you right!"
done
-; 0x185ecc
-UnknownText_0x185ecc: ; 0x185ecc
+UnknownText_0x185ecc:
text "EUSINE: My name's"
line "EUSINE."
@@ -273,9 +249,8 @@
para "But where exactly"
line "could it be?"
done
-; 0x185f99
-UnknownText_0x185f99: ; 0x185f99
+UnknownText_0x185f99:
text "EUSINE: I heard"
line "that SUICUNE is in"
@@ -285,9 +260,8 @@
para "But where exactly"
line "could it be?"
done
-; 0x186002
-UnknownText_0x186002: ; 0x186002
+UnknownText_0x186002:
text "MORTY: ECRUTEAK's"
line "GYM LEADER has to"
@@ -304,9 +278,8 @@
para "investigate the"
line "TOWER with him."
done
-; 0x1860b2
-BurnedTower1F_MapEventHeader: ; 0x1860b2
+BurnedTower1F_MapEventHeader:
; filler
db 0, 0
@@ -343,4 +316,3 @@
person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, $06c5
person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, $0764
person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, $0656
-; 0x186151
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -1,4 +1,4 @@
-BurnedTowerB1F_MapScriptHeader: ; 0x186151
+BurnedTowerB1F_MapScriptHeader:
; trigger count
db 2
@@ -12,25 +12,21 @@
; callbacks
dbw 1, UnknownScript_0x186160
-; 0x18615e
-UnknownScript_0x18615e: ; 0x18615e
+UnknownScript_0x18615e:
end
-; 0x18615f
-UnknownScript_0x18615f: ; 0x18615f
+UnknownScript_0x18615f:
end
-; 0x186160
-UnknownScript_0x186160: ; 0x186160
+UnknownScript_0x186160:
checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x18616a
changeblock $6, $e, $2
-UnknownScript_0x18616a: ; 0x18616a
+UnknownScript_0x18616a:
return
-; 0x18616b
-UnknownScript_0x18616b: ; 0x18616b
+UnknownScript_0x18616b:
playmusic MUSIC_NONE
pause 30
appear $3
@@ -96,9 +92,8 @@
loadmovesprites
dotrigger $1
end
-; 0x186212
-SuperNerdScript_0x186212: ; 0x186212
+SuperNerdScript_0x186212:
faceplayer
loadfont
writetext UnknownText_0x18626a
@@ -108,33 +103,29 @@
if_equal $1, UnknownScript_0x186226
applymovement $a, MovementData_0x186263
jump UnknownScript_0x18622a
-; 0x186226
-UnknownScript_0x186226: ; 0x186226
+UnknownScript_0x186226:
applymovement $a, MovementData_0x18625c
-UnknownScript_0x18622a: ; 0x18622a
+UnknownScript_0x18622a:
disappear $a
playsound SFX_EXIT_BUILDING
waitbutton
end
-; 0x186231
-ItemFragment_0x186231: ; 0x186231
+ItemFragment_0x186231:
db TM_ENDURE, 1
-; 0x186233
BurnedTowerB1FBoulder:
jumpstd strengthboulder
-MovementData_0x186236: ; 0x186236
+MovementData_0x186236:
db $39 ; movement
fast_jump_step_down
fast_jump_step_left
db $38 ; movement
step_end
-; 0x18623b
-MovementData_0x18623b: ; 0x18623b
+MovementData_0x18623b:
db $39 ; movement
fast_jump_step_right
fast_jump_step_down
@@ -141,9 +132,8 @@
fast_jump_step_right
db $38 ; movement
step_end
-; 0x186241
-MovementData_0x186241: ; 0x186241
+MovementData_0x186241:
db $39 ; movement
fast_jump_step_right
fast_jump_step_down
@@ -151,9 +141,8 @@
fast_jump_step_left
db $38 ; movement
step_end
-; 0x186248
-MovementData_0x186248: ; 0x186248
+MovementData_0x186248:
db $39 ; movement
fast_jump_step_left
fast_jump_step_up
@@ -161,16 +150,14 @@
fast_jump_step_right
db $38 ; movement
step_end
-; 0x18624f
-MovementData_0x18624f: ; 0x18624f
+MovementData_0x18624f:
db $39 ; movement
big_step_down
db $38 ; movement
step_end
-; 0x186253
-MovementData_0x186253: ; 0x186253
+MovementData_0x186253:
db $39 ; movement
big_step_up
fast_jump_step_right
@@ -180,9 +167,8 @@
fast_jump_step_down
db $38 ; movement
step_end
-; 0x18625c
-MovementData_0x18625c: ; 0x18625c
+MovementData_0x18625c:
step_left
step_left
step_down
@@ -190,9 +176,8 @@
step_left
step_down
step_end
-; 0x186263
-MovementData_0x186263: ; 0x186263
+MovementData_0x186263:
step_down
step_left
step_left
@@ -200,9 +185,8 @@
step_down
step_down
step_end
-; 0x18626a
-UnknownText_0x18626a: ; 0x18626a
+UnknownText_0x18626a:
text "EUSINE: I dug a"
line "hole here, too…"
@@ -244,9 +228,8 @@
para "Farewell!"
done
-; 0x1863de
-BurnedTowerB1F_MapEventHeader: ; 0x1863de
+BurnedTowerB1F_MapEventHeader:
; filler
db 0, 0
@@ -277,4 +260,3 @@
person_event SPRITE_SUICUNE, 8, 14, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b
person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, $0657
person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, $07aa
-; 0x18647f
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -1,12 +1,11 @@
-CeladonCafe_MapScriptHeader: ; 0x73047
+CeladonCafe_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x73049
-SuperNerdScript_0x73049: ; 0x73049
+SuperNerdScript_0x73049:
faceplayer
loadfont
writetext UnknownText_0x730de
@@ -13,9 +12,8 @@
closetext
loadmovesprites
end
-; 0x73051
-FisherScript_0x73051: ; 0x73051
+FisherScript_0x73051:
loadfont
writetext UnknownText_0x73129
closetext
@@ -27,9 +25,8 @@
loadmovesprites
spriteface $3, LEFT
end
-; 0x73062
-FisherScript_0x73062: ; 0x73062
+FisherScript_0x73062:
loadfont
writetext UnknownText_0x7316a
closetext
@@ -41,9 +38,8 @@
loadmovesprites
spriteface $4, RIGHT
end
-; 0x73073
-FisherScript_0x73073: ; 0x73073
+FisherScript_0x73073:
loadfont
writetext UnknownText_0x731ae
closetext
@@ -55,9 +51,8 @@
loadmovesprites
spriteface $5, RIGHT
end
-; 0x73084
-TeacherScript_0x73084: ; 0x73084
+TeacherScript_0x73084:
checkitem COIN_CASE
iftrue UnknownScript_0x7309a
loadfont
@@ -71,9 +66,8 @@
loadmovesprites
spriteface $6, LEFT
end
-; 0x7309a
-UnknownScript_0x7309a: ; 0x7309a
+UnknownScript_0x7309a:
loadfont
writetext UnknownText_0x73254
closetext
@@ -85,7 +79,6 @@
loadmovesprites
spriteface $6, LEFT
end
-; 0x730ad
EatathonContestPoster:
jumptext EatathonContestPosterText
@@ -118,7 +111,7 @@
.TrashEmpty
jumpstd trashcan
-UnknownText_0x730de: ; 0x730de
+UnknownText_0x730de:
text "Hi!"
para "We're holding an"
@@ -127,27 +120,23 @@
para "We can't serve you"
line "right now. Sorry."
done
-; 0x73129
-UnknownText_0x73129: ; 0x73129
+UnknownText_0x73129:
text "…Snarfle, chew…"
done
-; 0x7313a
-UnknownText_0x7313a: ; 0x7313a
+UnknownText_0x7313a:
text "Don't talk to me!"
para "You'll break my"
line "concentration!"
done
-; 0x7316a
-UnknownText_0x7316a: ; 0x7316a
+UnknownText_0x7316a:
text "…Gulp… Chew…"
done
-; 0x73178
-UnknownText_0x73178: ; 0x73178
+UnknownText_0x73178:
text "I take quantity"
line "over quality!"
@@ -154,27 +143,23 @@
para "I'm happy when I'm"
line "full!"
done
-; 0x731ae
-UnknownText_0x731ae: ; 0x731ae
+UnknownText_0x731ae:
text "Munch, munch…"
done
-; 0x731bd
-UnknownText_0x731bd: ; 0x731bd
+UnknownText_0x731bd:
text "The food is good"
line "here, but GOLDEN-"
cont "ROD has the best"
cont "food anywhere."
done
-; 0x73201
-UnknownText_0x73201: ; 0x73201
+UnknownText_0x73201:
text "Crunch… Crunch…"
done
-; 0x73212
-UnknownText_0x73212: ; 0x73212
+UnknownText_0x73212:
text "Nobody here will"
line "give you a COIN"
@@ -181,19 +166,16 @@
para "CASE. You should"
line "look in JOHTO."
done
-; 0x73254
-UnknownText_0x73254: ; 0x73254
+UnknownText_0x73254:
text "Crunch… Crunch…"
para "I can keep eating!"
done
-; 0x73278
-UnknownText_0x73278: ; 0x73278
+UnknownText_0x73278:
text "More, CHEF!"
done
-; 0x73285
EatathonContestPosterText:
text "Eatathon Contest!"
@@ -218,7 +200,7 @@
line "hold another item…"
done
-CeladonCafe_MapEventHeader: ; 0x73316
+CeladonCafe_MapEventHeader:
; filler
db 0, 0
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -1,12 +1,11 @@
-CeladonDeptStoreElevator_MapScriptHeader: ; 0x713ab
+CeladonDeptStoreElevator_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x713ad
-MapCeladonDeptStoreElevatorSignpost0Script: ; 0x713ad
+MapCeladonDeptStoreElevatorSignpost0Script:
loadfont
elevator Elevator_0x713be
loadmovesprites
@@ -15,12 +14,11 @@
playsound SFX_ELEVATOR
earthquake 60
waitbutton
-UnknownScript_0x713bd: ; 0x713bd
+UnknownScript_0x713bd:
end
-; 0x713be
-Elevator_0x713be: ; 0x713be
+Elevator_0x713be:
db 6 ; floors
db _1F, 4, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
db _2F, 3, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
@@ -29,10 +27,9 @@
db _5F, 3, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
db _6F, 2, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F
db $ff ; end
-; 0x713d8
-CeladonDeptStoreElevator_MapEventHeader: ; 0x713d8
+CeladonDeptStoreElevator_MapEventHeader:
; filler
db 0, 0
@@ -50,4 +47,3 @@
; people-events
db 0
-; 0x713ed
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -1,20 +1,17 @@
-CeladonGameCorner_MapScriptHeader: ; 0x7211b
+CeladonGameCorner_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7211d
-ClerkScript_0x7211d: ; 0x7211d
+ClerkScript_0x7211d:
jumpstd $0032
-; 0x72120
-ReceptionistScript_0x72120: ; 0x72120
+ReceptionistScript_0x72120:
jumptextfaceplayer UnknownText_0x721d0
-; 0x72123
-PokefanMScript_0x72123: ; 0x72123
+PokefanMScript_0x72123:
faceplayer
loadfont
writetext UnknownText_0x72215
@@ -22,9 +19,8 @@
loadmovesprites
spriteface $4, LEFT
end
-; 0x7212e
-TeacherScript_0x7212e: ; 0x7212e
+TeacherScript_0x7212e:
faceplayer
loadfont
writetext UnknownText_0x72242
@@ -32,9 +28,8 @@
loadmovesprites
spriteface $5, RIGHT
end
-; 0x72139
-FishingGuruScript_0x72139: ; 0x72139
+FishingGuruScript_0x72139:
faceplayer
loadfont
writetext UnknownText_0x72295
@@ -42,9 +37,8 @@
loadmovesprites
spriteface $6, RIGHT
end
-; 0x72144
-FisherScript_0x72144: ; 0x72144
+FisherScript_0x72144:
faceplayer
loadfont
checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
@@ -59,44 +53,38 @@
scall .UnknownScript_0x72172
givecoins 18
setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
-.UnknownScript_0x72169 ; 0x72169
+.UnknownScript_0x72169
writetext UnknownText_0x72345
closetext
loadmovesprites
spriteface $fe, LEFT
end
-; 0x72172
-.UnknownScript_0x72172 ; 0x72172
+.UnknownScript_0x72172
jumpstd $002f
end
-; 0x72176
-.coinname ; 0x72176
+.coinname
db "COIN@"
-; 0x7217b
-UnknownScript_0x7217b: ; 0x7217b
+UnknownScript_0x7217b:
writetext UnknownText_0x7238a
closetext
loadmovesprites
spriteface $fe, LEFT
end
-; 0x72184
-UnknownScript_0x72184: ; 0x72184
+UnknownScript_0x72184:
writetext UnknownText_0x723d9
closetext
loadmovesprites
spriteface $fe, LEFT
end
-; 0x7218d
-CeladonGymGuyScript: ; 0x7218d
+CeladonGymGuyScript:
jumptextfaceplayer CeladonGymGuyText
-; 0x72190
-GrampsScript_0x72190: ; 0x72190
+GrampsScript_0x72190:
faceplayer
loadfont
writetext UnknownText_0x724ad
@@ -104,17 +92,14 @@
loadmovesprites
spriteface $a, LEFT
end
-; 0x7219b
-MapCeladonGameCornerSignpost36Script: ; 0x7219b
+MapCeladonGameCornerSignpost36Script:
jumptext UnknownText_0x724f3
-; 0x7219e
-MapCeladonGameCornerSignpost37Script: ; 0x7219e
+MapCeladonGameCornerSignpost37Script:
jumptext UnknownText_0x72521
-; 0x721a1
-MapCeladonGameCornerSignpost35Script: ; 0x721a1
+MapCeladonGameCornerSignpost35Script:
random $6
if_equal $0, MapCeladonGameCornerSignpost16Script
refreshscreen $0
@@ -122,28 +107,24 @@
special Functionc373
loadmovesprites
end
-; 0x721b0
-MapCeladonGameCornerSignpost16Script: ; 0x721b0
+MapCeladonGameCornerSignpost16Script:
refreshscreen $0
writebyte $1
special Functionc373
loadmovesprites
end
-; 0x721b9
-MapCeladonGameCornerSignpost11Script: ; 0x721b9
+MapCeladonGameCornerSignpost11Script:
refreshscreen $0
special Functionc380
loadmovesprites
end
-; 0x721c0
-MapCeladonGameCornerSignpost32Script: ; 0x721c0
+MapCeladonGameCornerSignpost32Script:
jumptext UnknownText_0x7254f
-; 0x721c3
-MapCeladonGameCornerSignpost9Script: ; 0x721c3
+MapCeladonGameCornerSignpost9Script:
loadfont
writetext UnknownText_0x72567
closetext
@@ -150,16 +131,14 @@
special Functionc380
loadmovesprites
end
-; 0x721cd
-MovementData_0x721cd: ; 0x721cd
+MovementData_0x721cd:
; Unreferenced.
step_right
turn_head_left
step_end
-; 0x721d0
-UnknownText_0x721d0: ; 0x721d0
+UnknownText_0x721d0:
text "Welcome!"
para "You may exchange"
@@ -168,16 +147,14 @@
para "fabulous prizes"
line "next door."
done
-; 0x72215
-UnknownText_0x72215: ; 0x72215
+UnknownText_0x72215:
text "The slot machines"
line "are all state of"
cont "the art."
done
-; 0x72242
-UnknownText_0x72242: ; 0x72242
+UnknownText_0x72242:
text "It's this machine"
line "I want."
@@ -187,9 +164,8 @@
para "should pay out"
line "today."
done
-; 0x72295
-UnknownText_0x72295: ; 0x72295
+UnknownText_0x72295:
text "I think this slot"
line "machine will pay"
cont "out…"
@@ -197,9 +173,8 @@
para "The odds vary"
line "among machines."
done
-; 0x722dc
-UnknownText_0x722dc: ; 0x722dc
+UnknownText_0x722dc:
text "Gahahaha!"
para "The coins just"
@@ -211,9 +186,8 @@
para "I'll share my luck"
line "with you!"
done
-; 0x72345
-UnknownText_0x72345: ; 0x72345
+UnknownText_0x72345:
text "Gahahaha!"
para "It makes me feel"
@@ -222,9 +196,8 @@
para "things for other"
line "people!"
done
-; 0x7238a
-UnknownText_0x7238a: ; 0x7238a
+UnknownText_0x7238a:
text "Hey, you don't"
line "have a COIN CASE."
@@ -232,9 +205,8 @@
line "to give you any"
cont "coins, kid?"
done
-; 0x723d9
-UnknownText_0x723d9: ; 0x723d9
+UnknownText_0x723d9:
text "Hey, your COIN"
line "CASE is full, kid."
@@ -242,9 +214,8 @@
line "a winning streak"
cont "too."
done
-; 0x72425
-CeladonGymGuyText: ; 0x72425
+CeladonGymGuyText:
text "Hey! CHAMP in"
line "making!"
@@ -258,9 +229,8 @@
para "But I don't have"
line "enough coins yet…"
done
-; 0x724ad
-UnknownText_0x724ad: ; 0x724ad
+UnknownText_0x724ad:
text "Hmmm… The odds are"
line "surely better for"
@@ -267,9 +237,8 @@
para "PIKACHU's line,"
line "but… What to do?"
done
-; 0x724f3
-UnknownText_0x724f3: ; 0x724f3
+UnknownText_0x724f3:
text "Hey!"
para "Underneath this"
@@ -277,9 +246,8 @@
para "There's nothing!"
done
-; 0x72521
-UnknownText_0x72521: ; 0x72521
+UnknownText_0x72521:
text "Hey!"
para "Underneath this"
@@ -287,15 +255,13 @@
para "There's nothing!"
done
-; 0x7254f
-UnknownText_0x7254f: ; 0x7254f
+UnknownText_0x7254f:
text "There's a lighter"
line "here."
done
-; 0x72567
-UnknownText_0x72567: ; 0x72567
+UnknownText_0x72567:
text "A can of soda…"
para "Someone must be"
@@ -303,9 +269,8 @@
para "Huh? It's empty!"
done
-; 0x725a4
-CeladonGameCorner_MapEventHeader: ; 0x725a4
+CeladonGameCorner_MapEventHeader:
; filler
db 0, 0
@@ -369,4 +334,3 @@
person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, $ffff
person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, $ffff
person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, $ffff
-; 0x726e7
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -1,20 +1,17 @@
-CeladonGameCornerPrizeRoom_MapScriptHeader: ; 0x726e7
+CeladonGameCornerPrizeRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x726e9
-GentlemanScript_0x726e9: ; 0x726e9
+GentlemanScript_0x726e9:
jumptextfaceplayer UnknownText_0x728b8
-; 0x726ec
-PharmacistScript_0x726ec: ; 0x726ec
+PharmacistScript_0x726ec:
jumptextfaceplayer UnknownText_0x728e9
-; 0x726ef
-MapCeladonGameCornerPrizeRoomSignpost0Script: ; 0x726ef
+MapCeladonGameCornerPrizeRoomSignpost0Script:
faceplayer
loadfont
writetext UnknownText_0x7293e
@@ -22,7 +19,7 @@
checkitem COIN_CASE
iffalse UnknownScript_0x7278a
writetext UnknownText_0x72974
-UnknownScript_0x726fd: ; 0x726fd
+UnknownScript_0x726fd:
special Function24b25
loadmenudata MenuDataHeader_0x72790
interpretmenu2
@@ -31,9 +28,8 @@
if_equal $2, UnknownScript_0x72730
if_equal $3, UnknownScript_0x7274c
jump UnknownScript_0x72784
-; 0x72714
-UnknownScript_0x72714: ; 0x72714
+UnknownScript_0x72714:
checkcoins 1500
if_equal $2, UnknownScript_0x72778
itemtotext TM_DOUBLE_TEAM, $0
@@ -43,9 +39,8 @@
iffalse UnknownScript_0x7277e
takecoins 1500
jump UnknownScript_0x7276d
-; 0x72730
-UnknownScript_0x72730: ; 0x72730
+UnknownScript_0x72730:
checkcoins 3500
if_equal $2, UnknownScript_0x72778
itemtotext TM_PSYCHIC, $0
@@ -55,9 +50,8 @@
iffalse UnknownScript_0x7277e
takecoins 3500
jump UnknownScript_0x7276d
-; 0x7274c
-UnknownScript_0x7274c: ; 0x7274c
+UnknownScript_0x7274c:
checkcoins 7500
if_equal $2, UnknownScript_0x72778
itemtotext TM_HYPER_BEAM, $0
@@ -67,60 +61,52 @@
iffalse UnknownScript_0x7277e
takecoins 7500
jump UnknownScript_0x7276d
-; 0x72768
-UnknownScript_0x72768: ; 0x72768
+UnknownScript_0x72768:
writetext UnknownText_0x72991
yesorno
end
-; 0x7276d
-UnknownScript_0x7276d: ; 0x7276d
+UnknownScript_0x7276d:
waitbutton
playsound SFX_TRANSACTION
writetext UnknownText_0x729ad
closetext
jump UnknownScript_0x726fd
-; 0x72778
-UnknownScript_0x72778: ; 0x72778
+UnknownScript_0x72778:
writetext UnknownText_0x729bb
closetext
loadmovesprites
end
-; 0x7277e
-UnknownScript_0x7277e: ; 0x7277e
+UnknownScript_0x7277e:
writetext UnknownText_0x729d8
closetext
loadmovesprites
end
-; 0x72784
-UnknownScript_0x72784: ; 0x72784
+UnknownScript_0x72784:
writetext UnknownText_0x729f2
closetext
loadmovesprites
end
-; 0x7278a
-UnknownScript_0x7278a: ; 0x7278a
+UnknownScript_0x7278a:
writetext UnknownText_0x72a14
closetext
loadmovesprites
end
-; 0x72790
-MenuDataHeader_0x72790: ; 0x72790
+MenuDataHeader_0x72790:
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
dw MenuData2_0x72798
db 1 ; default option
-; 0x72798
-MenuData2_0x72798: ; 0x72798
+MenuData2_0x72798:
db $80 ; flags
db 4 ; items
db "TM32 1500@"
@@ -127,10 +113,9 @@
db "TM29 3500@"
db "TM15 7500@"
db "CANCEL@"
-; 0x727c8
-MapCeladonGameCornerPrizeRoomSignpost1Script: ; 0x727c8
+MapCeladonGameCornerPrizeRoomSignpost1Script:
faceplayer
loadfont
writetext UnknownText_0x7293e
@@ -137,7 +122,7 @@
closetext
checkitem COIN_CASE
iffalse UnknownScript_0x7278a
-UnknownScript_0x727d3: ; 0x727d3
+UnknownScript_0x727d3:
writetext UnknownText_0x72974
special Function24b25
loadmenudata MenuDataHeader_0x72877
@@ -147,9 +132,8 @@
if_equal $2, UnknownScript_0x7281b
if_equal $3, UnknownScript_0x72849
jump UnknownScript_0x72784
-; 0x727ed
-UnknownScript_0x727ed: ; 0x727ed
+UnknownScript_0x727ed:
checkcoins 2222
if_equal $2, UnknownScript_0x72778
checkcode VAR_PARTYCOUNT
@@ -166,9 +150,8 @@
givepoke PIKACHU, 25, 0, 0
takecoins 2222
jump UnknownScript_0x727d3
-; 0x7281b
-UnknownScript_0x7281b: ; 0x7281b
+UnknownScript_0x7281b:
checkcoins 5555
if_equal $2, UnknownScript_0x72778
checkcode VAR_PARTYCOUNT
@@ -185,9 +168,8 @@
givepoke PORYGON, 15, 0, 0
takecoins 5555
jump UnknownScript_0x727d3
-; 0x72849
-UnknownScript_0x72849: ; 0x72849
+UnknownScript_0x72849:
checkcoins 8888
if_equal $2, UnknownScript_0x72778
checkcode VAR_PARTYCOUNT
@@ -204,18 +186,16 @@
givepoke LARVITAR, 40, 0, 0
takecoins 8888
jump UnknownScript_0x727d3
-; 0x72877
-MenuDataHeader_0x72877: ; 0x72877
+MenuDataHeader_0x72877:
db $40 ; flags
db 02, 00 ; start coords
db 11, 17 ; end coords
dw MenuData2_0x7287f
db 1 ; default option
-; 0x7287f
-MenuData2_0x7287f: ; 0x7287f
+MenuData2_0x7287f:
db $80 ; flags
db 4 ; items
db "PIKACHU 2222@"
@@ -222,17 +202,15 @@
db "PORYGON 5555@"
db "LARVITAR 8888@"
db "CANCEL@"
-; 0x728b8
-UnknownText_0x728b8: ; 0x728b8
+UnknownText_0x728b8:
text "I wanted PORYGON,"
line "but I was short by"
cont "100 coins…"
done
-; 0x728e9
-UnknownText_0x728e9: ; 0x728e9
+UnknownText_0x728e9:
text "Whew…"
para "I've got to stay"
@@ -242,9 +220,8 @@
line "cool, or I'll lose"
cont "all my money…"
done
-; 0x7293e
-UnknownText_0x7293e: ; 0x7293e
+UnknownText_0x7293e:
text "Welcome!"
para "We exchange your"
@@ -251,52 +228,44 @@
line "coins for fabulous"
cont "prizes!"
done
-; 0x72974
-UnknownText_0x72974: ; 0x72974
+UnknownText_0x72974:
text "Which prize would"
line "you like?"
done
-; 0x72991
-UnknownText_0x72991: ; 0x72991
+UnknownText_0x72991:
text "OK, so you wanted"
line "a @"
text_from_ram StringBuffer3
text "?"
done
-; 0x729ad
-UnknownText_0x729ad: ; 0x729ad
+UnknownText_0x729ad:
text "Here you go!"
done
-; 0x729bb
-UnknownText_0x729bb: ; 0x729bb
+UnknownText_0x729bb:
text "You don't have"
line "enough coins."
done
-; 0x729d8
-UnknownText_0x729d8: ; 0x729d8
+UnknownText_0x729d8:
text "You have no room"
line "for it."
done
-; 0x729f2
-UnknownText_0x729f2: ; 0x729f2
+UnknownText_0x729f2:
text "Oh. Please come"
line "back with coins!"
done
-; 0x72a14
-UnknownText_0x72a14: ; 0x72a14
+UnknownText_0x72a14:
text "Oh? You don't have"
line "a COIN CASE."
done
-; 0x72a34
-CeladonGameCornerPrizeRoom_MapEventHeader: ; 0x72a34
+CeladonGameCornerPrizeRoom_MapEventHeader:
; filler
db 0, 0
@@ -317,4 +286,3 @@
db 2
person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, $ffff
person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, $ffff
-; 0x72a68
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -1,10 +1,9 @@
-CeladonMansion1F_MapScriptHeader: ; 0x713ed
+CeladonMansion1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x713ef
CeladonMansionManager:
jumptextfaceplayer CeladonMansionManagerText
@@ -69,7 +68,7 @@
line "MANAGER'S SUITE"
done
-CeladonMansion1F_MapEventHeader: ; 0x714cc
+CeladonMansion1F_MapEventHeader:
; filler
db 0, 0
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -1,12 +1,11 @@
-CeladonMansion3F_MapScriptHeader: ; 0x7166e
+CeladonMansion3F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x71670
-CooltrainerMScript_0x71670: ; 0x71670
+CooltrainerMScript_0x71670:
faceplayer
loadfont
writetext UnknownText_0x716ce
@@ -15,9 +14,8 @@
closetext
loadmovesprites
end
-; 0x7167e
-UnknownScript_0x7167e: ; 0x7167e
+UnknownScript_0x7167e:
keeptextopen
writetext UnknownText_0x71725
playsound SFX_DEX_FANFARE_230_PLUS
@@ -30,9 +28,8 @@
loadmovesprites
setevent EVENT_ENABLE_DIPLOMA_PRINTING
end
-; 0x71696
-GymGuyScript_0x71696: ; 0x71696
+GymGuyScript_0x71696:
faceplayer
loadfont
checkevent EVENT_ENABLE_DIPLOMA_PRINTING
@@ -41,9 +38,8 @@
closetext
loadmovesprites
end
-; 0x716a4
-UnknownScript_0x716a4: ; 0x716a4
+UnknownScript_0x716a4:
writetext UnknownText_0x717d8
yesorno
iffalse UnknownScript_0x716b0
@@ -50,47 +46,38 @@
special Functionc4ac
loadmovesprites
end
-; 0x716b0
-UnknownScript_0x716b0: ; 0x716b0
+UnknownScript_0x716b0:
writetext UnknownText_0x71830
closetext
loadmovesprites
end
-; 0x716b6
-UnknownScript_0x716b6: ; 0x716b6
+UnknownScript_0x716b6:
writetext UnknownText_0x71863
closetext
loadmovesprites
end
-; 0x716bc
-SuperNerdScript_0x716bc: ; 0x716bc
+SuperNerdScript_0x716bc:
jumptextfaceplayer UnknownText_0x71895
-; 0x716bf
-FisherScript_0x716bf: ; 0x716bf
+FisherScript_0x716bf:
jumptextfaceplayer UnknownText_0x718ca
-; 0x716c2
-MapCeladonMansion3FSignpost0Script: ; 0x716c2
+MapCeladonMansion3FSignpost0Script:
jumptext UnknownText_0x7190b
-; 0x716c5
-MapCeladonMansion3FSignpost1Script: ; 0x716c5
+MapCeladonMansion3FSignpost1Script:
jumptext UnknownText_0x71928
-; 0x716c8
-MapCeladonMansion3FSignpost2Script: ; 0x716c8
+MapCeladonMansion3FSignpost2Script:
jumptext UnknownText_0x71952
-; 0x716cb
-MapCeladonMansion3FSignpost3Script: ; 0x716cb
+MapCeladonMansion3FSignpost3Script:
jumptext UnknownText_0x71996
-; 0x716ce
-UnknownText_0x716ce: ; 0x716ce
+UnknownText_0x716ce:
text "Is that right?"
para "I'm the GAME"
@@ -100,9 +87,8 @@
line "#DEX is tough,"
cont "but don't give up!"
done
-; 0x71725
-UnknownText_0x71725: ; 0x71725
+UnknownText_0x71725:
text "Wow! Excellent!"
line "You completed your"
cont "#DEX!"
@@ -109,14 +95,12 @@
para "Congratulations!"
done
-; 0x71760
-UnknownText_0x71760: ; 0x71760
+UnknownText_0x71760:
text "…"
done
-; 0x71763
-UnknownText_0x71763: ; 0x71763
+UnknownText_0x71763:
text "The GRAPHIC ARTIST"
line "will print out a"
cont "DIPLOMA for you."
@@ -124,17 +108,15 @@
para "You should go show"
line "it off."
done
-; 0x717b4
-UnknownText_0x717b4: ; 0x717b4
+UnknownText_0x717b4:
text "I'm the GRAPHIC"
line "ARTIST."
para "I drew you!"
done
-; 0x717d8
-UnknownText_0x717d8: ; 0x717d8
+UnknownText_0x717d8:
text "I'm the GRAPHIC"
line "ARTIST."
@@ -144,23 +126,20 @@
para "Want me to print"
line "out your DIPLOMA?"
done
-; 0x71830
-UnknownText_0x71830: ; 0x71830
+UnknownText_0x71830:
text "Give me a shout if"
line "you want your"
cont "DIPLOMA printed."
done
-; 0x71863
-UnknownText_0x71863: ; 0x71863
+UnknownText_0x71863:
text "Something's wrong."
line "I'll have to can-"
cont "cel printing."
done
-; 0x71895
-UnknownText_0x71895: ; 0x71895
+UnknownText_0x71895:
text "Who, me? I'm the"
line "PROGRAMMER."
@@ -167,9 +146,8 @@
para "Play the slot"
line "machines!"
done
-; 0x718ca
-UnknownText_0x718ca: ; 0x718ca
+UnknownText_0x718ca:
text "Aren't the TWINS"
line "adorable?"
@@ -178,22 +156,19 @@
para "Oh, I love them!"
done
-; 0x7190b
-UnknownText_0x7190b: ; 0x7190b
+UnknownText_0x7190b:
text "GAME FREAK"
line "DEVELOPMENT ROOM"
done
-; 0x71928
-UnknownText_0x71928: ; 0x71928
+UnknownText_0x71928:
text "It's a detailed"
line "drawing of a"
cont "pretty girl."
done
-; 0x71952
-UnknownText_0x71952: ; 0x71952
+UnknownText_0x71952:
text "It's the game"
line "program. Messing"
@@ -200,17 +175,15 @@
para "with it could put"
line "a bug in the game!"
done
-; 0x71996
-UnknownText_0x71996: ; 0x71996
+UnknownText_0x71996:
text "It's crammed with"
line "reference materi-"
cont "als. There's even"
cont "a # DOLL."
done
-; 0x719d5
-CeladonMansion3F_MapEventHeader: ; 0x719d5
+CeladonMansion3F_MapEventHeader:
; filler
db 0, 0
@@ -237,4 +210,3 @@
person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, $ffff
person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, $ffff
person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, $ffff
-; 0x71a37
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -1,20 +1,17 @@
-CeladonMansionRoof_MapScriptHeader: ; 0x71a37
+CeladonMansionRoof_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x71a39
-FisherScript_0x71a39: ; 0x71a39
+FisherScript_0x71a39:
jumptextfaceplayer UnknownText_0x71a3f
-; 0x71a3c
-MapCeladonMansionRoofSignpost0Script: ; 0x71a3c
+MapCeladonMansionRoofSignpost0Script:
jumptext UnknownText_0x71aa1
-; 0x71a3f
-UnknownText_0x71a3f: ; 0x71a3f
+UnknownText_0x71a3f:
text "High places--I do"
line "love them so!"
@@ -24,9 +21,8 @@
para "heights as much as"
line "me is smoke!"
done
-; 0x71aa1
-UnknownText_0x71aa1: ; 0x71aa1
+UnknownText_0x71aa1:
text "There's graffiti"
line "on the wall…"
@@ -33,9 +29,8 @@
para "<PLAYER> added a"
line "moustache!"
done
-; 0x71ad4
-CeladonMansionRoof_MapEventHeader: ; 0x71ad4
+CeladonMansionRoof_MapEventHeader:
; filler
db 0, 0
@@ -55,4 +50,3 @@
; people-events
db 1
person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, $ffff
-; 0x71afb
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -1,12 +1,11 @@
-CeladonMansionRoofHouse_MapScriptHeader: ; 0x71afb
+CeladonMansionRoofHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x71afd
-PharmacistScript_0x71afd: ; 0x71afd
+PharmacistScript_0x71afd:
faceplayer
loadfont
checkevent EVENT_GOT_TM03_CURSE
@@ -19,29 +18,26 @@
closetext
loadmovesprites
end
-; 0x71b14
-UnknownScript_0x71b14: ; 0x71b14
+UnknownScript_0x71b14:
writetext UnknownText_0x71ba3
keeptextopen
verbosegiveitem TM_CURSE, 1
iffalse UnknownScript_0x71b25
setevent EVENT_GOT_TM03_CURSE
-UnknownScript_0x71b21: ; 0x71b21
+UnknownScript_0x71b21:
writetext UnknownText_0x71db3
closetext
-UnknownScript_0x71b25: ; 0x71b25
+UnknownScript_0x71b25:
loadmovesprites
end
-; 0x71b27
-UnknownText_0x71b27: ; 0x71b27
+UnknownText_0x71b27:
text "Let me recount a"
line "terrifying tale…"
done
-; 0x71b4a
-UnknownText_0x71b4a: ; 0x71b4a
+UnknownText_0x71b4a:
text "Then again, it's"
line "not as scary while"
@@ -51,9 +47,8 @@
para "Come back after"
line "sunset, OK?"
done
-; 0x71ba3
-UnknownText_0x71ba3: ; 0x71ba3
+UnknownText_0x71ba3:
text "Once upon a time,"
line "there was a little"
@@ -107,9 +102,8 @@
line "patiently, you may"
cont "take this--TM03!"
done
-; 0x71db3
-UnknownText_0x71db3: ; 0x71db3
+UnknownText_0x71db3:
text "TM03 is CURSE."
para "It's a terrifying"
@@ -118,9 +112,8 @@
para "whittles down the"
line "victim's HP."
done
-; 0x71e03
-CeladonMansionRoofHouse_MapEventHeader: ; 0x71e03
+CeladonMansionRoofHouse_MapEventHeader:
; filler
db 0, 0
@@ -138,4 +131,3 @@
; people-events
db 1
person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, $ffff
-; 0x71e20
--- a/maps/CeladonPokeCenter1F.asm
+++ b/maps/CeladonPokeCenter1F.asm
@@ -1,28 +1,23 @@
-CeladonPokeCenter1F_MapScriptHeader: ; 0x71e20
+CeladonPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x71e22
-NurseScript_0x71e22: ; 0x71e22
+NurseScript_0x71e22:
jumpstd pokecenternurse
-; 0x71e25
-GentlemanScript_0x71e25: ; 0x71e25
+GentlemanScript_0x71e25:
jumpstd $0033
-; 0x71e28
-CooltrainerFScript_0x71e28: ; 0x71e28
+CooltrainerFScript_0x71e28:
jumptextfaceplayer UnknownText_0x71e70
-; 0x71e2b
-PharmacistScript_0x71e2b: ; 0x71e2b
+PharmacistScript_0x71e2b:
jumptextfaceplayer UnknownText_0x71ec1
-; 0x71e2e
-SuperNerdScript_0x71e2e: ; 0x71e2e
+SuperNerdScript_0x71e2e:
faceplayer
loadfont
writetext UnknownText_0x71f22
@@ -34,12 +29,11 @@
iftrue UnknownScript_0x71e48
writetext UnknownText_0x7201a
closetext
-UnknownScript_0x71e46: ; 0x71e46
+UnknownScript_0x71e46:
loadmovesprites
end
-; 0x71e48
-UnknownScript_0x71e48: ; 0x71e48
+UnknownScript_0x71e48:
writetext UnknownText_0x71f65
closetext
loadmovesprites
@@ -47,18 +41,16 @@
if_equal $1, UnknownScript_0x71e5a
applymovement $6, MovementData_0x71e6b
jump UnknownScript_0x71e5e
-; 0x71e5a
-UnknownScript_0x71e5a: ; 0x71e5a
+UnknownScript_0x71e5a:
applymovement $6, MovementData_0x71e65
-UnknownScript_0x71e5e: ; 0x71e5e
+UnknownScript_0x71e5e:
disappear $6
playsound SFX_EXIT_BUILDING
waitbutton
end
-; 0x71e65
-MovementData_0x71e65: ; 0x71e65
+MovementData_0x71e65:
step_left
step_down
step_down
@@ -65,17 +57,15 @@
step_down
step_down
step_end
-; 0x71e6b
-MovementData_0x71e6b: ; 0x71e6b
+MovementData_0x71e6b:
step_down
step_down
step_down
step_down
step_end
-; 0x71e70
-UnknownText_0x71e70: ; 0x71e70
+UnknownText_0x71e70:
text "ERIKA is a master"
line "of grass #MON."
@@ -83,9 +73,8 @@
line "pay if you don't"
cont "watch yourself."
done
-; 0x71ec1
-UnknownText_0x71ec1: ; 0x71ec1
+UnknownText_0x71ec1:
text "TEAM ROCKET's"
line "hideout is in the"
@@ -95,9 +84,8 @@
para "Oh, wait. That was"
line "three years ago."
done
-; 0x71f22
-UnknownText_0x71f22: ; 0x71f22
+UnknownText_0x71f22:
text "EUSINE: Hi!"
para "I'm back visiting"
@@ -106,9 +94,8 @@
para "It's been quite a"
line "while."
done
-; 0x71f65
-UnknownText_0x71f65: ; 0x71f65
+UnknownText_0x71f65:
text "<PLAYER>, have you"
line "heard?"
@@ -128,9 +115,8 @@
para "I'll be seeing"
line "you, <PLAYER>!"
done
-; 0x7201a
-UnknownText_0x7201a: ; 0x7201a
+UnknownText_0x7201a:
text "Oh, by the way,"
line "<PLAYER>."
@@ -151,9 +137,8 @@
para "I'm counting on"
line "you, <PLAYER>!"
done
-; 0x720b8
-CeladonPokeCenter1F_MapEventHeader: ; 0x720b8
+CeladonPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -176,4 +161,3 @@
person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, $ffff
person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, $ffff
person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, $07b7
-; 0x7210e
--- a/maps/CeladonPokeCenter2FBeta.asm
+++ b/maps/CeladonPokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-CeladonPokeCenter2FBeta_MapScriptHeader: ; 0x7210e
+CeladonPokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x72110
-CeladonPokeCenter2FBeta_MapEventHeader: ; 0x72110
+CeladonPokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x7211b
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -1,22 +1,19 @@
-CeruleanGymBadgeSpeechHouse_MapScriptHeader: ; 0x188000
+CeruleanGymBadgeSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x188002
-PokefanMScript_0x188002: ; 0x188002
+PokefanMScript_0x188002:
jumptextfaceplayer UnknownText_0x188005
-; 0x188005
-UnknownText_0x188005: ; 0x188005
+UnknownText_0x188005:
text "Are you collecting"
line "KANTO GYM BADGES?"
done
-; 0x18802b
-CeruleanGymBadgeSpeechHouse_MapEventHeader: ; 0x18802b
+CeruleanGymBadgeSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -34,4 +31,3 @@
; people-events
db 1
person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, $ffff
-; 0x188048
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -1,27 +1,23 @@
-CeruleanMart_MapScriptHeader: ; 0x188abe
+CeruleanMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x188ac0
-ClerkScript_0x188ac0: ; 0x188ac0
+ClerkScript_0x188ac0:
loadfont
pokemart $0, $0014
loadmovesprites
end
-; 0x188ac7
-CooltrainerMScript_0x188ac7: ; 0x188ac7
+CooltrainerMScript_0x188ac7:
jumptextfaceplayer UnknownText_0x188acd
-; 0x188aca
-CooltrainerFScript_0x188aca: ; 0x188aca
+CooltrainerFScript_0x188aca:
jumptextfaceplayer UnknownText_0x188b46
-; 0x188acd
-UnknownText_0x188acd: ; 0x188acd
+UnknownText_0x188acd:
text "You'll run into"
line "many trainers on"
@@ -34,9 +30,8 @@
para "up against other"
line "trainers."
done
-; 0x188b46
-UnknownText_0x188b46: ; 0x188b46
+UnknownText_0x188b46:
text "MISTY is about the"
line "only person in"
@@ -44,9 +39,8 @@
line "the trainers at"
cont "CERULEAN's CAPE."
done
-; 0x188b9b
-CeruleanMart_MapEventHeader: ; 0x188b9b
+CeruleanMart_MapEventHeader:
; filler
db 0, 0
@@ -66,4 +60,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, $ffff
person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, $ffff
person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, $ffff
-; 0x188bd2
--- a/maps/CeruleanPokeCenter1F.asm
+++ b/maps/CeruleanPokeCenter1F.asm
@@ -1,30 +1,25 @@
-CeruleanPokeCenter1F_MapScriptHeader: ; 0x18820d
+CeruleanPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18820f
-NurseScript_0x18820f: ; 0x18820f
+NurseScript_0x18820f:
jumpstd pokecenternurse
-; 0x188212
-SuperNerdScript_0x188212: ; 0x188212
+SuperNerdScript_0x188212:
special Function10630f
iftrue UnknownScript_0x18821b
jumptextfaceplayer UnknownText_0x188221
-; 0x18821b
-UnknownScript_0x18821b: ; 0x18821b
+UnknownScript_0x18821b:
jumptextfaceplayer UnknownText_0x18828c
-; 0x18821e
-GymGuyScript_0x18821e: ; 0x18821e
+GymGuyScript_0x18821e:
jumptextfaceplayer UnknownText_0x1882ff
-; 0x188221
-UnknownText_0x188221: ; 0x188221
+UnknownText_0x188221:
text "For battles, I'd"
line "much rather use"
@@ -35,9 +30,8 @@
line "than some newly"
cont "caught #MON."
done
-; 0x18828c
-UnknownText_0x18828c: ; 0x18828c
+UnknownText_0x18828c:
text "Do you battle by"
line "mobile phone?"
@@ -48,9 +42,8 @@
line "won is really"
cont "nerve wracking."
done
-; 0x1882ff
-UnknownText_0x1882ff: ; 0x1882ff
+UnknownText_0x1882ff:
text "The MAGNET TRAIN"
line "travels at over"
@@ -63,9 +56,8 @@
para "It really makes"
line "JOHTO accessible."
done
-; 0x188386
-CeruleanPokeCenter1F_MapEventHeader: ; 0x188386
+CeruleanPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -86,4 +78,3 @@
person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, $ffff
person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, $ffff
person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, $ffff
-; 0x1883c2
--- a/maps/CeruleanPokeCenter2FBeta.asm
+++ b/maps/CeruleanPokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-CeruleanPokeCenter2FBeta_MapScriptHeader: ; 0x1883c2
+CeruleanPokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1883c4
-CeruleanPokeCenter2FBeta_MapEventHeader: ; 0x1883c4
+CeruleanPokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x1883cf
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -1,20 +1,17 @@
-CeruleanPoliceStation_MapScriptHeader: ; 0x188048
+CeruleanPoliceStation_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18804a
-FishingGuruScript_0x18804a: ; 0x18804a
+FishingGuruScript_0x18804a:
jumptextfaceplayer UnknownText_0x18805a
-; 0x18804d
-PokefanFScript_0x18804d: ; 0x18804d
+PokefanFScript_0x18804d:
jumptextfaceplayer UnknownText_0x1880c3
-; 0x188050
-DiglettScript_0x188050: ; 0x188050
+DiglettScript_0x188050:
loadfont
writetext UnknownText_0x1880e7
cry DIGLETT
@@ -21,9 +18,8 @@
closetext
loadmovesprites
end
-; 0x18805a
-UnknownText_0x18805a: ; 0x18805a
+UnknownText_0x18805a:
text "I heard that some"
line "shady character is"
cont "skulking about."
@@ -32,20 +28,17 @@
line "it if he turns out"
cont "to be a thief."
done
-; 0x1880c3
-UnknownText_0x1880c3: ; 0x1880c3
+UnknownText_0x1880c3:
text "We were held up by"
line "robbers before."
done
-; 0x1880e7
-UnknownText_0x1880e7: ; 0x1880e7
+UnknownText_0x1880e7:
text "DIGLETT: Dug dug."
done
-; 0x1880fa
-CeruleanPoliceStation_MapEventHeader: ; 0x1880fa
+CeruleanPoliceStation_MapEventHeader:
; filler
db 0, 0
@@ -65,4 +58,3 @@
person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, $ffff
person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, $ffff
person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, $ffff
-; 0x188131
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -1,20 +1,17 @@
-CeruleanTradeSpeechHouse_MapScriptHeader: ; 0x188131
+CeruleanTradeSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x188133
-GrannyScript_0x188133: ; 0x188133
+GrannyScript_0x188133:
jumptextfaceplayer UnknownText_0x18814d
-; 0x188136
-GrampsScript_0x188136: ; 0x188136
+GrampsScript_0x188136:
jumptextfaceplayer UnknownText_0x18818a
-; 0x188139
-RhydonScript_0x188139: ; 0x188139
+RhydonScript_0x188139:
loadfont
writetext UnknownText_0x18819c
cry KANGASKHAN
@@ -21,9 +18,8 @@
closetext
loadmovesprites
end
-; 0x188143
-ZubatScript_0x188143: ; 0x188143
+ZubatScript_0x188143:
loadfont
writetext UnknownText_0x1881b5
cry ZUBAT
@@ -30,33 +26,28 @@
closetext
loadmovesprites
end
-; 0x18814d
-UnknownText_0x18814d: ; 0x18814d
+UnknownText_0x18814d:
text "My husband lives"
line "happily with #-"
cont "MON he got through"
cont "trades."
done
-; 0x18818a
-UnknownText_0x18818a: ; 0x18818a
+UnknownText_0x18818a:
text "Ah… I'm so happy…"
done
-; 0x18819c
-UnknownText_0x18819c: ; 0x18819c
+UnknownText_0x18819c:
text "KANGASKHAN: Garu"
line "garuu."
done
-; 0x1881b5
-UnknownText_0x1881b5: ; 0x1881b5
+UnknownText_0x1881b5:
text "ZUBAT: Zuba zubaa."
done
-; 0x1881c9
-CeruleanTradeSpeechHouse_MapEventHeader: ; 0x1881c9
+CeruleanTradeSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -77,4 +68,3 @@
person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, $ffff
person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, $ffff
person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, $ffff
-; 0x18820d
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -143,7 +143,7 @@
text "FARFETCH'D: Kwaa!"
done
-CharcoalKiln_MapEventHeader: ; 0x18dff8
+CharcoalKiln_MapEventHeader:
; filler
db 0, 0
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -1,31 +1,28 @@
-CherrygroveEvolutionSpeechHouse_MapScriptHeader: ; 0x196cb0
+CherrygroveEvolutionSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x196cb2
-YoungsterScript_0x196cb2: ; 0x196cb2
+YoungsterScript_0x196cb2:
loadfont
writetext UnknownText_0x196cc3
closetext
loadmovesprites
end
-; 0x196cb9
-LassScript_0x196cb9: ; 0x196cb9
+LassScript_0x196cb9:
loadfont
writetext UnknownText_0x196cfc
closetext
loadmovesprites
end
-; 0x196cc0
CherrygroveEvolutionSpeechHouseBookshelf:
jumpstd magazinebookshelf
-UnknownText_0x196cc3: ; 0x196cc3
+UnknownText_0x196cc3:
text "#MON gain expe-"
line "rience in battle"
@@ -32,17 +29,15 @@
para "and change their"
line "form."
done
-; 0x196cfc
-UnknownText_0x196cfc: ; 0x196cfc
+UnknownText_0x196cfc:
text "#MON change?"
para "I would be shocked"
line "if one did that!"
done
-; 0x196d2e
-CherrygroveEvolutionSpeechHouse_MapEventHeader: ; 0x196d2e
+CherrygroveEvolutionSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -63,4 +58,3 @@
db 2
person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, $ffff
person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, $ffff
-; 0x196d62
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -1,23 +1,20 @@
-CherrygroveGymSpeechHouse_MapScriptHeader: ; 0x196adf
+CherrygroveGymSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x196ae1
-PokefanMScript_0x196ae1: ; 0x196ae1
+PokefanMScript_0x196ae1:
jumptextfaceplayer UnknownText_0x196aea
-; 0x196ae4
-BugCatcherScript_0x196ae4: ; 0x196ae4
+BugCatcherScript_0x196ae4:
jumptextfaceplayer UnknownText_0x196b65
-; 0x196ae7
CherrygroveGymSpeechHouseBookshelf:
jumpstd picturebookshelf
-UnknownText_0x196aea: ; 0x196aea
+UnknownText_0x196aea:
text "You're trying to"
line "see how good you"
@@ -30,9 +27,8 @@
para "all over JOHTO and"
line "collect BADGES."
done
-; 0x196b65
-UnknownText_0x196b65: ; 0x196b65
+UnknownText_0x196b65:
text "When I get older,"
line "I'm going to be a"
cont "GYM LEADER!"
@@ -43,9 +39,8 @@
para "friend's to make"
line "them tougher!"
done
-; 0x196bd1
-CherrygroveGymSpeechHouse_MapEventHeader: ; 0x196bd1
+CherrygroveGymSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -66,4 +61,3 @@
db 2
person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, $ffff
person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, $ffff
-; 0x196c05
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -1,12 +1,11 @@
-CherrygroveMart_MapScriptHeader: ; 0x196808
+CherrygroveMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19680a
-ClerkScript_0x19680a: ; 0x19680a
+ClerkScript_0x19680a:
loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196817
@@ -13,15 +12,13 @@
pokemart $0, $0000
loadmovesprites
end
-; 0x196817
-UnknownScript_0x196817: ; 0x196817
+UnknownScript_0x196817:
pokemart $0, $0001
loadmovesprites
end
-; 0x19681d
-CooltrainerMScript_0x19681d: ; 0x19681d
+CooltrainerMScript_0x19681d:
faceplayer
loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@@ -30,20 +27,17 @@
closetext
loadmovesprites
end
-; 0x19682b
-UnknownScript_0x19682b: ; 0x19682b
+UnknownScript_0x19682b:
writetext UnknownText_0x196873
closetext
loadmovesprites
end
-; 0x196831
-YoungsterScript_0x196831: ; 0x196831
+YoungsterScript_0x196831:
jumptextfaceplayer UnknownText_0x1968a0
-; 0x196834
-UnknownText_0x196834: ; 0x196834
+UnknownText_0x196834:
text "They're fresh out"
line "of # BALLS!"
@@ -50,16 +44,14 @@
para "When will they get"
line "more of them?"
done
-; 0x196873
-UnknownText_0x196873: ; 0x196873
+UnknownText_0x196873:
text "# BALLS are in"
line "stock! Now I can"
cont "catch #MON!"
done
-; 0x1968a0
-UnknownText_0x1968a0: ; 0x1968a0
+UnknownText_0x1968a0:
text "When I was walking"
line "in the grass, a"
@@ -73,9 +65,8 @@
para "You should keep an"
line "ANTIDOTE with you."
done
-; 0x196934
-CherrygroveMart_MapEventHeader: ; 0x196934
+CherrygroveMart_MapEventHeader:
; filler
db 0, 0
@@ -95,4 +86,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, $ffff
person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, $ffff
person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, $ffff
-; 0x19696b
--- a/maps/CherrygrovePokeCenter1F.asm
+++ b/maps/CherrygrovePokeCenter1F.asm
@@ -1,24 +1,20 @@
-CherrygrovePokeCenter1F_MapScriptHeader: ; 0x19696b
+CherrygrovePokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19696d
-NurseScript_0x19696d: ; 0x19696d
+NurseScript_0x19696d:
jumpstd pokecenternurse
-; 0x196970
-FisherScript_0x196970: ; 0x196970
+FisherScript_0x196970:
jumptextfaceplayer UnknownText_0x19698a
-; 0x196973
-GentlemanScript_0x196973: ; 0x196973
+GentlemanScript_0x196973:
jumptextfaceplayer UnknownText_0x1969c8
-; 0x196976
-TeacherScript_0x196976: ; 0x196976
+TeacherScript_0x196976:
faceplayer
loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@@ -27,16 +23,14 @@
closetext
loadmovesprites
end
-; 0x196984
-UnknownScript_0x196984: ; 0x196984
+UnknownScript_0x196984:
writetext UnknownText_0x196a46
closetext
loadmovesprites
end
-; 0x19698a
-UnknownText_0x19698a: ; 0x19698a
+UnknownText_0x19698a:
text "It's great. I can"
line "store any number"
@@ -43,16 +37,14 @@
para "of #MON, and"
line "it's all free."
done
-; 0x1969c8
-UnknownText_0x1969c8: ; 0x1969c8
+UnknownText_0x1969c8:
text "That PC is free"
line "for any trainer"
cont "to use."
done
-; 0x1969f1
-UnknownText_0x1969f1: ; 0x1969f1
+UnknownText_0x1969f1:
text "The COMMUNICATION"
line "CENTER upstairs"
cont "was just built."
@@ -60,9 +52,8 @@
para "But they're still"
line "finishing it up."
done
-; 0x196a46
-UnknownText_0x196a46: ; 0x196a46
+UnknownText_0x196a46:
text "The COMMUNICATION"
line "CENTER upstairs"
cont "was just built."
@@ -70,9 +61,8 @@
para "I traded #MON"
line "there already!"
done
-; 0x196a96
-CherrygrovePokeCenter1F_MapEventHeader: ; 0x196a96
+CherrygrovePokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -94,4 +84,3 @@
person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, $ffff
person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, $ffff
person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, $ffff
-; 0x196adf
--- a/maps/CianwoodCityPhotoStudio.asm
+++ b/maps/CianwoodCityPhotoStudio.asm
@@ -1,12 +1,11 @@
-CianwoodCityPhotoStudio_MapScriptHeader: ; 0x9e0de
+CianwoodCityPhotoStudio_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9e0e0
-FishingGuruScript_0x9e0e0: ; 0x9e0e0
+FishingGuruScript_0x9e0e0:
faceplayer
loadfont
writetext UnknownText_0x9e0f9
@@ -18,16 +17,14 @@
closetext
loadmovesprites
end
-; 0x9e0f3
-UnknownScript_0x9e0f3: ; 0x9e0f3
+UnknownScript_0x9e0f3:
writetext UnknownText_0x9e156
closetext
loadmovesprites
end
-; 0x9e0f9
-UnknownText_0x9e0f9: ; 0x9e0f9
+UnknownText_0x9e0f9:
text "You have magnifi-"
line "cent #MON with"
cont "you."
@@ -35,14 +32,12 @@
para "How about a photo"
line "for a souvenir?"
done
-; 0x9e142
-UnknownText_0x9e142: ; 0x9e142
+UnknownText_0x9e142:
text "OK! Big smile now!"
done
-; 0x9e156
-UnknownText_0x9e156: ; 0x9e156
+UnknownText_0x9e156:
text "Oh, that's too"
line "bad. I thought it"
@@ -49,9 +44,8 @@
para "would be a great"
line "memento…"
done
-; 0x9e191
-CianwoodCityPhotoStudio_MapEventHeader: ; 0x9e191
+CianwoodCityPhotoStudio_MapEventHeader:
; filler
db 0, 0
@@ -69,4 +63,3 @@
; people-events
db 1
person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, $ffff
-; 0x9e1ae
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -1,27 +1,23 @@
-CianwoodLugiaSpeechHouse_MapScriptHeader: ; 0x9e1ae
+CianwoodLugiaSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9e1b0
-TeacherScript_0x9e1b0: ; 0x9e1b0
+TeacherScript_0x9e1b0:
jumptextfaceplayer UnknownText_0x9e1bc
-; 0x9e1b3
-LassScript_0x9e1b3: ; 0x9e1b3
+LassScript_0x9e1b3:
jumptextfaceplayer UnknownText_0x9e23f
-; 0x9e1b6
-TwinScript_0x9e1b6: ; 0x9e1b6
+TwinScript_0x9e1b6:
jumptextfaceplayer UnknownText_0x9e2a9
-; 0x9e1b9
CianwoodLugiaSpeechHouseBookshelf:
jumpstd picturebookshelf
-UnknownText_0x9e1bc: ; 0x9e1bc
+UnknownText_0x9e1bc:
text "You came from"
line "OLIVINE?"
@@ -34,9 +30,8 @@
cont "ture is hiding in"
cont "them."
done
-; 0x9e23f
-UnknownText_0x9e23f: ; 0x9e23f
+UnknownText_0x9e23f:
text "I heard that you"
line "can only see it if"
@@ -47,9 +42,8 @@
line "same scent as the"
cont "creature."
done
-; 0x9e2a9
-UnknownText_0x9e2a9: ; 0x9e2a9
+UnknownText_0x9e2a9:
text "I've heard that"
line "the whirlpools"
@@ -61,9 +55,8 @@
line "special move to"
cont "get past them."
done
-; 0x9e32b
-CianwoodLugiaSpeechHouse_MapEventHeader: ; 0x9e32b
+CianwoodLugiaSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -85,4 +78,3 @@
person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, $ffff
person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, $ffff
person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, $ffff
-; 0x9e36c
--- a/maps/CianwoodPokeCenter1F.asm
+++ b/maps/CianwoodPokeCenter1F.asm
@@ -1,20 +1,17 @@
-CianwoodPokeCenter1F_MapScriptHeader: ; 0x9dbcd
+CianwoodPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9dbcf
-NurseScript_0x9dbcf: ; 0x9dbcf
+NurseScript_0x9dbcf:
jumpstd pokecenternurse
-; 0x9dbd2
-LassScript_0x9dbd2: ; 0x9dbd2
+LassScript_0x9dbd2:
jumptextfaceplayer UnknownText_0x9dbed
-; 0x9dbd5
-CianwoodGymGuyScript: ; 0x9dbd5
+CianwoodGymGuyScript:
faceplayer
checkevent EVENT_BEAT_CHUCK
iftrue .CianwoodGymGuyWinScript
@@ -30,13 +27,11 @@
closetext
loadmovesprites
end
-; 0x9dbea
-SuperNerdScript_0x9dbea: ; 0x9dbea
+SuperNerdScript_0x9dbea:
jumptextfaceplayer UnknownText_0x9ded7
-; 0x9dbed
-UnknownText_0x9dbed: ; 0x9dbed
+UnknownText_0x9dbed:
text "Did you meet the"
line "#MANIAC?"
@@ -44,9 +39,8 @@
line "ging about his"
cont "rare #MON."
done
-; 0x9dc33
-CianwoodGymGuyText: ; 0x9dc33
+CianwoodGymGuyText:
text "The #MON GYM"
line "trainers here are"
cont "macho bullies."
@@ -84,16 +78,14 @@
para "If you get stuck,"
line "go outside."
done
-; 0x9ddc5
-CianwoodGymGuyWinText: ; 0x9ddc5
+CianwoodGymGuyWinText:
text "<PLAYER>! You won!"
line "I could tell by"
cont "looking at you!"
done
-; 0x9ddf2
-UnknownText_0x9ddf2: ; 0x9ddf2
+UnknownText_0x9ddf2:
text "Don't you get the"
line "urge to show off"
@@ -106,9 +98,8 @@
para "raised to my pal"
line "in VIOLET."
done
-; 0x9de66
-UnknownText_0x9de66: ; 0x9de66
+UnknownText_0x9de66:
text "I've been battling"
line "my pal in VIOLET"
@@ -119,9 +110,8 @@
line "against him. I've"
cont "gotta crank it up!"
done
-; 0x9ded7
-UnknownText_0x9ded7: ; 0x9ded7
+UnknownText_0x9ded7:
text "I love showing off"
line "the #MON that"
@@ -134,9 +124,8 @@
para "battles, and show"
line "off my #MON!"
done
-; 0x9df4e
-CianwoodPokeCenter1F_MapEventHeader: ; 0x9df4e
+CianwoodPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -158,4 +147,3 @@
person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, $ffff
person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, $ffff
person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, $ffff
-; 0x9df97
--- a/maps/CinnabarPokeCenter1F.asm
+++ b/maps/CinnabarPokeCenter1F.asm
@@ -1,24 +1,20 @@
-CinnabarPokeCenter1F_MapScriptHeader: ; 0x1ab32a
+CinnabarPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ab32c
-NurseScript_0x1ab32c: ; 0x1ab32c
+NurseScript_0x1ab32c:
jumpstd pokecenternurse
-; 0x1ab32f
-CooltrainerFScript_0x1ab32f: ; 0x1ab32f
+CooltrainerFScript_0x1ab32f:
jumptextfaceplayer UnknownText_0x1ab335
-; 0x1ab332
-FisherScript_0x1ab332: ; 0x1ab332
+FisherScript_0x1ab332:
jumptextfaceplayer UnknownText_0x1ab37f
-; 0x1ab335
-UnknownText_0x1ab335: ; 0x1ab335
+UnknownText_0x1ab335:
text "CINNABAR GYM's"
line "BLAINE apparently"
@@ -26,16 +22,14 @@
line "SEAFOAM ISLANDS"
cont "cave…"
done
-; 0x1ab37f
-UnknownText_0x1ab37f: ; 0x1ab37f
+UnknownText_0x1ab37f:
text "It's been a year"
line "since the volcano"
cont "erupted."
done
-; 0x1ab3ab
-CinnabarPokeCenter1F_MapEventHeader: ; 0x1ab3ab
+CinnabarPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -56,4 +50,3 @@
person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, $ffff
person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, $ffff
person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, $ffff
-; 0x1ab3e7
--- a/maps/CinnabarPokeCenter2FBeta.asm
+++ b/maps/CinnabarPokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-CinnabarPokeCenter2FBeta_MapScriptHeader: ; 0x1ab3e7
+CinnabarPokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ab3e9
-CinnabarPokeCenter2FBeta_MapEventHeader: ; 0x1ab3e9
+CinnabarPokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x1ab3f4
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -1,4 +1,4 @@
-Colosseum_MapScriptHeader: ; 0x19345d
+Colosseum_MapScriptHeader:
; trigger count
db 3
@@ -15,67 +15,56 @@
dbw 2, UnknownScript_0x193477
dbw 5, UnknownScript_0x193487
-; 0x193471
-UnknownScript_0x193471: ; 0x193471
+UnknownScript_0x193471:
priorityjump UnknownScript_0x19348c
end
-; 0x193475
-UnknownScript_0x193475: ; 0x193475
+UnknownScript_0x193475:
end
-; 0x193476
-UnknownScript_0x193476: ; 0x193476
+UnknownScript_0x193476:
end
-; 0x193477
-UnknownScript_0x193477: ; 0x193477
+UnknownScript_0x193477:
special Function29f47
iffalse UnknownScript_0x193482
disappear $3
appear $2
return
-; 0x193482
-UnknownScript_0x193482: ; 0x193482
+UnknownScript_0x193482:
disappear $2
appear $3
return
-; 0x193487
-UnknownScript_0x193487: ; 0x193487
+UnknownScript_0x193487:
domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2
return
-; 0x19348c
-UnknownScript_0x19348c: ; 0x19348c
+UnknownScript_0x19348c:
dotrigger $1
domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2
end
-; 0x193493
-MapColosseumSignpost1Script: ; 0x193493
+MapColosseumSignpost1Script:
special Function29ed9
newloadmap $f8
end
-; 0x193499
-ChrisScript_0x193499: ; 0x193499
+ChrisScript_0x193499:
loadfont
writetext UnknownText_0x1934a0
closetext
loadmovesprites
end
-; 0x1934a0
-UnknownText_0x1934a0: ; 0x1934a0
+UnknownText_0x1934a0:
text "Your friend is"
line "ready."
done
-; 0x1934b7
-Colosseum_MapEventHeader: ; 0x1934b7
+Colosseum_MapEventHeader:
; filler
db 0, 0
@@ -96,4 +85,3 @@
db 2
person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000
person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001
-; 0x1934eb
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -1,16 +1,14 @@
-CopycatsHouse1F_MapScriptHeader: ; 0x18ad11
+CopycatsHouse1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18ad13
-PokefanMScript_0x18ad13: ; 0x18ad13
+PokefanMScript_0x18ad13:
jumptextfaceplayer UnknownText_0x18ad34
-; 0x18ad16
-PokefanFScript_0x18ad16: ; 0x18ad16
+PokefanFScript_0x18ad16:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -19,16 +17,14 @@
closetext
loadmovesprites
end
-; 0x18ad24
-UnknownScript_0x18ad24: ; 0x18ad24
+UnknownScript_0x18ad24:
writetext UnknownText_0x18add3
closetext
loadmovesprites
end
-; 0x18ad2a
-ClefairyScript_0x18ad2a: ; 0x18ad2a
+ClefairyScript_0x18ad2a:
loadfont
writetext UnknownText_0x18ae4b
cry BLISSEY
@@ -35,9 +31,8 @@
closetext
loadmovesprites
end
-; 0x18ad34
-UnknownText_0x18ad34: ; 0x18ad34
+UnknownText_0x18ad34:
text "My daughter likes"
line "to mimic people."
@@ -47,9 +42,8 @@
para "nickname COPYCAT"
line "around here."
done
-; 0x18ad95
-UnknownText_0x18ad95: ; 0x18ad95
+UnknownText_0x18ad95:
text "My daughter is so"
line "self-centered…"
@@ -56,9 +50,8 @@
para "She only has a few"
line "friends."
done
-; 0x18add3
-UnknownText_0x18add3: ; 0x18add3
+UnknownText_0x18add3:
text "She recently lost"
line "the # DOLL that"
@@ -69,14 +62,12 @@
line "she's gotten even"
cont "better at mimicry…"
done
-; 0x18ae4b
-UnknownText_0x18ae4b: ; 0x18ae4b
+UnknownText_0x18ae4b:
text "BLISSEY: Bliisii!"
done
-; 0x18ae5e
-CopycatsHouse1F_MapEventHeader: ; 0x18ae5e
+CopycatsHouse1F_MapEventHeader:
; filler
db 0, 0
@@ -97,4 +88,3 @@
person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, $ffff
person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, $ffff
person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, $ffff
-; 0x18ae9a
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -1,4 +1,4 @@
-CopycatsHouse2F_MapScriptHeader: ; 0x18ae9a
+CopycatsHouse2F_MapScriptHeader:
; trigger count
db 0
@@ -8,7 +8,6 @@
; callbacks
dbw 2, CopycatsHouse2FCallback
-; 0x18ae9f
CopycatsHouse2FCallback:
checkflag $0063
@@ -184,7 +183,7 @@
CopycatsHouse2FBookshelf:
jumpstd picturebookshelf
-MovementData_0x18afd0: ; 0x18afd0
+MovementData_0x18afd0:
turn_head_down
turn_head_left
turn_head_up
@@ -195,9 +194,8 @@
turn_head_right
turn_head_down
step_end
-; 0x18afda
-UnknownText_0x18afda: ; 0x18afda
+UnknownText_0x18afda:
text "<PLAYER>: Hi! Do"
line "you like #MON?"
@@ -207,9 +205,8 @@
para "<PLAYER>: Huh?"
line "You're strange!"
done
-; 0x18b028
-UnknownText_0x18b028: ; 0x18b028
+UnknownText_0x18b028:
text "COPYCAT: Hmm?"
line "Quit mimicking?"
@@ -216,9 +213,8 @@
para "But that's my"
line "favorite hobby!"
done
-; 0x18b064
-UnknownText_0x18b064: ; 0x18b064
+UnknownText_0x18b064:
text "<PLAYER>: Hi!"
line "I heard that you"
@@ -236,9 +232,8 @@
line "it when you went"
cont "to VERMILION CITY?"
done
-; 0x18b116
-UnknownText_0x18b116: ; 0x18b116
+UnknownText_0x18b116:
text "COPYCAT: Pardon?"
para "I shouldn't decide"
@@ -249,9 +244,8 @@
line "worried… What if"
cont "someone finds it?"
done
-; 0x18b17f
-UnknownText_0x18b17f: ; 0x18b17f
+UnknownText_0x18b17f:
text "COPYCAT: Yay!"
line "That's my CLEFAIRY"
cont "# DOLL!"
@@ -262,16 +256,14 @@
para "sewn on? That's"
line "proof!"
done
-; 0x18b1e2
-UnknownText_0x18b1e2: ; 0x18b1e2
+UnknownText_0x18b1e2:
text "OK. Here's the"
line "MAGNET TRAIN PASS"
cont "like I promised!"
done
-; 0x18b214
-UnknownText_0x18b214: ; 0x18b214
+UnknownText_0x18b214:
text "COPYCAT: That's"
line "the PASS for the"
cont "MAGNET TRAIN."
@@ -283,9 +275,8 @@
line "down our old house"
cont "for the STATION."
done
-; 0x18b298
-UnknownText_0x18b298: ; 0x18b298
+UnknownText_0x18b298:
text "<PLAYER>: Hi!"
line "Thanks a lot for"
cont "the rail PASS!"
@@ -296,15 +287,13 @@
line "that fun to mimic"
cont "my every move?"
done
-; 0x18b2f5
-UnknownText_0x18b2f5: ; 0x18b2f5
+UnknownText_0x18b2f5:
text "COPYCAT: You bet!"
line "It's a scream!"
done
-; 0x18b316
-UnknownText_0x18b316: ; 0x18b316
+UnknownText_0x18b316:
text "<PLAYER>: Hi. You"
line "must like #MON."
@@ -314,9 +303,8 @@
para "<PLAYER>: Pardon?"
line "You're weird!"
done
-; 0x18b366
-UnknownText_0x18b366: ; 0x18b366
+UnknownText_0x18b366:
text "<PLAYER>: Hi. Did"
line "you really lose"
cont "your # DOLL?"
@@ -334,9 +322,8 @@
line "it when you were"
cont "in VERMILION?"
done
-; 0x18b415
-UnknownText_0x18b415: ; 0x18b415
+UnknownText_0x18b415:
text "<PLAYER>: Thank you"
line "for the rail PASS!"
@@ -348,14 +335,12 @@
para "copy what I say"
line "and do?"
done
-; 0x18b476
-CopycatsDodrioText1: ; 0x18b476
+CopycatsDodrioText1:
text "DODRIO: Gii giii!"
done
-; 0x18b489
-CopycatsDodrioText2: ; 0x18b489
+CopycatsDodrioText2:
text "MIRROR, MIRROR ON"
line "THE WALL, WHO'S"
@@ -362,7 +347,6 @@
para "THE FAIREST ONE OF"
line "ALL?"
done
-; 0x18b4c4
CopycatsHouse2FDollText:
text "This is a rare"
@@ -371,7 +355,7 @@
para "It's only a doll…"
done
-CopycatsHouse2F_MapEventHeader: ; 0x18b4f0
+CopycatsHouse2F_MapEventHeader:
; filler
db 0, 0
@@ -395,4 +379,3 @@
person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, $ffff
person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, $ffff
person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, Copycat, $06ef
-; 0x18b553
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -1,12 +1,11 @@
-DarkCaveBlackthornEntrance_MapScriptHeader: ; 0x18c71e
+DarkCaveBlackthornEntrance_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c720
-PharmacistScript_0x18c720: ; 0x18c720
+PharmacistScript_0x18c720:
faceplayer
loadfont
checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
@@ -16,23 +15,20 @@
verbosegiveitem BLACKGLASSES, 1
iffalse UnknownScript_0x18c739
setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
-UnknownScript_0x18c735: ; 0x18c735
+UnknownScript_0x18c735:
writetext UnknownText_0x18c80c
closetext
-UnknownScript_0x18c739: ; 0x18c739
+UnknownScript_0x18c739:
loadmovesprites
end
-; 0x18c73b
-ItemFragment_0x18c73b: ; 0x18c73b
+ItemFragment_0x18c73b:
db REVIVE, 1
-; 0x18c73d
-ItemFragment_0x18c73d: ; 0x18c73d
+ItemFragment_0x18c73d:
db TM_SNORE, 1
-; 0x18c73f
-UnknownText_0x18c73f: ; 0x18c73f
+UnknownText_0x18c73f:
text "Whoa! You startled"
line "me there!"
@@ -53,16 +49,14 @@
cont "GLASSES, so forget"
cont "you saw me, OK?"
done
-; 0x18c80c
-UnknownText_0x18c80c: ; 0x18c80c
+UnknownText_0x18c80c:
text "BLACKGLASSES ups"
line "the power of dark-"
cont "type moves."
done
-; 0x18c83d
-DarkCaveBlackthornEntrance_MapEventHeader: ; 0x18c83d
+DarkCaveBlackthornEntrance_MapEventHeader:
; filler
db 0, 0
@@ -82,4 +76,3 @@
person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, $ffff
person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, $06a1
person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, $06a2
-; 0x18c874
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -1,37 +1,31 @@
-DarkCaveVioletEntrance_MapScriptHeader: ; 0x18c68c
+DarkCaveVioletEntrance_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c68e
-ItemFragment_0x18c68e: ; 0x18c68e
+ItemFragment_0x18c68e:
db POTION, 1
-; 0x18c690
-ItemFragment_0x18c690: ; 0x18c690
+ItemFragment_0x18c690:
db FULL_HEAL, 1
-; 0x18c692
-ItemFragment_0x18c692: ; 0x18c692
+ItemFragment_0x18c692:
db HYPER_POTION, 1
-; 0x18c694
-ItemFragment_0x18c694: ; 0x18c694
+ItemFragment_0x18c694:
db DIRE_HIT, 1
-; 0x18c696
DarkCaveVioletEntranceRock:
jumpstd smashrock
-MapDarkCaveVioletEntranceSignpostItem0: ; 0x18c699
+MapDarkCaveVioletEntranceSignpostItem0:
dw $009d
db ELIXER
-; 0x18c69c
-DarkCaveVioletEntrance_MapEventHeader: ; 0x18c69c
+DarkCaveVioletEntrance_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +52,3 @@
person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, $069f
person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, $06a0
person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, $07ce
-; 0x18c71e
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -1,4 +1,4 @@
-DayCare_MapScriptHeader: ; 0x62f76
+DayCare_MapScriptHeader:
; trigger count
db 0
@@ -8,23 +8,20 @@
; callbacks
dbw 2, UnknownScript_0x62f7b
-; 0x62f7b
-UnknownScript_0x62f7b: ; 0x62f7b
+UnknownScript_0x62f7b:
checkflag $0005
iftrue UnknownScript_0x62f88
clearevent $06e5
setevent $06e6
return
-; 0x62f88
-UnknownScript_0x62f88: ; 0x62f88
+UnknownScript_0x62f88:
setevent $06e5
clearevent $06e6
return
-; 0x62f8f
-GrampsScript_0x62f8f: ; 0x62f8f
+GrampsScript_0x62f8f:
faceplayer
loadfont
checkevent EVENT_GOT_ODD_EGG
@@ -44,24 +41,21 @@
loadmovesprites
setevent EVENT_GOT_ODD_EGG
end
-; 0x62fb6
-UnknownScript_0x62fb6: ; 0x62fb6
+UnknownScript_0x62fb6:
loadfont
writetext UnknownText_0x63237
closetext
loadmovesprites
end
-; 0x62fbd
-UnknownScript_0x62fbd: ; 0x62fbd
+UnknownScript_0x62fbd:
special Function166d6
closetext
loadmovesprites
end
-; 0x62fc3
-GrannyScript_0x62fc3: ; 0x62fc3
+GrannyScript_0x62fc3:
faceplayer
loadfont
checkflag $0005
@@ -70,25 +64,22 @@
closetext
loadmovesprites
end
-; 0x62fd1
-UnknownScript_0x62fd1: ; 0x62fd1
+UnknownScript_0x62fd1:
writetext UnknownText_0x62fda
closetext
loadmovesprites
end
-; 0x62fd7
DayCareBookshelf:
jumpstd difficultbookshelf
-UnknownText_0x62fda: ; 0x62fda
+UnknownText_0x62fda:
text "Gramps was looking"
line "for you."
done
-; 0x62ff7
-UnknownText_0x62ff7: ; 0x62ff7
+UnknownText_0x62ff7:
text "I'm the DAY-CARE"
line "MAN."
@@ -110,9 +101,8 @@
para "need it. You may"
line "as well have it."
done
-; 0x630ce
-UnknownText_0x630ce: ; 0x630ce
+UnknownText_0x630ce:
text "I'm the DAY-CARE"
line "MAN."
@@ -135,20 +125,17 @@
para "Then fine, this is"
line "yours to keep!"
done
-; 0x631a1
-UnknownText_0x631a1: ; 0x631a1
+UnknownText_0x631a1:
text "Come again."
done
-; 0x631ae
-UnknownText_0x631ae: ; 0x631ae
+UnknownText_0x631ae:
text "<PLAYER> received"
line "ODD EGG!"
done
-; 0x631c3
-UnknownText_0x631c3: ; 0x631c3
+UnknownText_0x631c3:
text "I found that when"
line "I was caring for"
@@ -161,15 +148,13 @@
para "EGG, so I'd kept"
line "it around."
done
-; 0x63237
-UnknownText_0x63237: ; 0x63237
+UnknownText_0x63237:
text "You've no room for"
line "this."
done
-; 0x63250
-DayCare_MapEventHeader: ; 0x63250
+DayCare_MapEventHeader:
; filler
db 0, 0
@@ -192,4 +177,3 @@
db 2
person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, $06e5
person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, $ffff
-; 0x6328e
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -1,22 +1,19 @@
-DiglettsCave_MapScriptHeader: ; 0x74000
+DiglettsCave_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x74002
-PokefanMScript_0x74002: ; 0x74002
+PokefanMScript_0x74002:
jumptextfaceplayer UnknownText_0x74008
-; 0x74005
-MapDiglettsCaveSignpostItem0: ; 0x74005
+MapDiglettsCaveSignpostItem0:
dw $00e4
db MAX_REVIVE
-; 0x74008
-UnknownText_0x74008: ; 0x74008
+UnknownText_0x74008:
text "A bunch of DIGLETT"
line "popped out of the"
@@ -23,9 +20,8 @@
para "ground! That was"
line "shocking."
done
-; 0x74049
-DiglettsCave_MapEventHeader: ; 0x74049
+DiglettsCave_MapEventHeader:
; filler
db 0, 0
@@ -48,4 +44,3 @@
; people-events
db 1
person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, $ffff
-; 0x7407f
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -1,4 +1,4 @@
-DragonShrine_MapScriptHeader: ; 0x18d014
+DragonShrine_MapScriptHeader:
; trigger count
db 2
@@ -8,24 +8,21 @@
; callback count
db 0
-; 0x18d01e
-UnknownScript_0x18d01e: ; 0x18d01e
+UnknownScript_0x18d01e:
priorityjump UnknownScript_0x18d023
end
-; 0x18d022
-UnknownScript_0x18d022: ; 0x18d022
+UnknownScript_0x18d022:
end
-; 0x18d023
-UnknownScript_0x18d023: ; 0x18d023
+UnknownScript_0x18d023:
applymovement $0, MovementData_0x18d2bf
applymovement $2, MovementData_0x18d2c7
loadfont
writetext UnknownText_0x18d2ea
keeptextopen
-UnknownScript_0x18d030: ; 0x18d030
+UnknownScript_0x18d030:
setevent $0001
writetext UnknownText_0x18d3bc
keeptextopen
@@ -36,9 +33,8 @@
if_equal $2, UnknownScript_0x18d0cb
if_equal $3, UnknownScript_0x18d0a9
end
-; 0x18d049
-UnknownScript_0x18d049: ; 0x18d049
+UnknownScript_0x18d049:
setevent $0002
writetext UnknownText_0x18d3d3
keeptextopen
@@ -48,7 +44,7 @@
if_equal $1, UnknownScript_0x18d0a9
if_equal $2, UnknownScript_0x18d0a9
if_equal $3, UnknownScript_0x18d0cb
-UnknownScript_0x18d061: ; 0x18d061
+UnknownScript_0x18d061:
setevent $0003
writetext UnknownText_0x18d3f3
keeptextopen
@@ -58,7 +54,7 @@
if_equal $1, UnknownScript_0x18d0cb
if_equal $2, UnknownScript_0x18d0a9
if_equal $3, UnknownScript_0x18d0a9
-UnknownScript_0x18d079: ; 0x18d079
+UnknownScript_0x18d079:
setevent $0004
writetext UnknownText_0x18d420
keeptextopen
@@ -68,7 +64,7 @@
if_equal $1, UnknownScript_0x18d0a9
if_equal $2, UnknownScript_0x18d0cb
if_equal $3, UnknownScript_0x18d0a9
-UnknownScript_0x18d091: ; 0x18d091
+UnknownScript_0x18d091:
setevent $0005
writetext UnknownText_0x18d44a
keeptextopen
@@ -78,7 +74,7 @@
if_equal $1, UnknownScript_0x18d0cb
if_equal $2, UnknownScript_0x18d0a9
if_equal $3, UnknownScript_0x18d0cb
-UnknownScript_0x18d0a9: ; 0x18d0a9
+UnknownScript_0x18d0a9:
checkevent $0005
iftrue UnknownScript_0x18d100
writetext UnknownText_0x18d82d
@@ -91,7 +87,7 @@
iftrue UnknownScript_0x18d061
checkevent $0001
iftrue UnknownScript_0x18d049
-UnknownScript_0x18d0cb: ; 0x18d0cb
+UnknownScript_0x18d0cb:
loadmovesprites
spriteface $2, LEFT
loadfont
@@ -115,7 +111,7 @@
iftrue UnknownScript_0x18d049
checkevent $0001
iftrue UnknownScript_0x18d030
-UnknownScript_0x18d100: ; 0x18d100
+UnknownScript_0x18d100:
writetext UnknownText_0x18d47c
closetext
loadmovesprites
@@ -190,9 +186,8 @@
waitbutton
setevent $0000
end
-; 0x18d1a5
-ElderScript_0x18d1a5: ; 0x18d1a5
+ElderScript_0x18d1a5:
faceplayer
loadfont
checkevent $0000
@@ -207,9 +202,8 @@
closetext
loadmovesprites
end
-; 0x18d1c5
-UnknownScript_0x18d1c5: ; 0x18d1c5
+UnknownScript_0x18d1c5:
writetext UnknownText_0x18d604
closetext
checkcode VAR_PARTYCOUNT
@@ -226,37 +220,32 @@
closetext
loadmovesprites
end
-; 0x18d1ed
-UnknownScript_0x18d1ed: ; 0x18d1ed
+UnknownScript_0x18d1ed:
writetext UnknownText_0x18d6ac
closetext
loadmovesprites
end
-; 0x18d1f3
-UnknownScript_0x18d1f3: ; 0x18d1f3
+UnknownScript_0x18d1f3:
writetext UnknownText_0x18d782
closetext
loadmovesprites
end
-; 0x18d1f9
-UnknownScript_0x18d1f9: ; 0x18d1f9
+UnknownScript_0x18d1f9:
writetext UnknownText_0x18d5e5
closetext
loadmovesprites
end
-; 0x18d1ff
-UnknownScript_0x18d1ff: ; 0x18d1ff
+UnknownScript_0x18d1ff:
writetext UnknownText_0x18d6ca
closetext
loadmovesprites
end
-; 0x18d205
-ElderScript_0x18d205: ; 0x18d205
+ElderScript_0x18d205:
faceplayer
loadfont
writetext UnknownText_0x18d840
@@ -263,9 +252,8 @@
closetext
loadmovesprites
end
-; 0x18d20d
-ElderScript_0x18d20d: ; 0x18d20d
+ElderScript_0x18d20d:
faceplayer
loadfont
writetext UnknownText_0x18d8b1
@@ -272,95 +260,84 @@
closetext
loadmovesprites
end
-; 0x18d215
-MenuDataHeader_0x18d215: ; 0x18d215
+MenuDataHeader_0x18d215:
db $40 ; flags
db 04, 08 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d21d
db 1 ; default option
-; 0x18d21d
-MenuData2_0x18d21d: ; 0x18d21d
+MenuData2_0x18d21d:
db $81 ; flags
db 3 ; items
db "Pal@"
db "Underling@"
db "Friend@"
-; 0x18d234
-MenuDataHeader_0x18d234: ; 0x18d234
+MenuDataHeader_0x18d234:
db $40 ; flags
db 04, 09 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d23c
db 1 ; default option
-; 0x18d23c
-MenuData2_0x18d23c: ; 0x18d23c
+MenuData2_0x18d23c:
db $81 ; flags
db 3 ; items
db "Strategy@"
db "Raising@"
db "Cheating@"
-; 0x18d258
-MenuDataHeader_0x18d258: ; 0x18d258
+MenuDataHeader_0x18d258:
db $40 ; flags
db 04, 05 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d260
db 1 ; default option
-; 0x18d260
-MenuData2_0x18d260: ; 0x18d260
+MenuData2_0x18d260:
db $81 ; flags
db 3 ; items
db "Weak person@"
db "Tough person@"
db "Anybody@"
-; 0x18d283
-MenuDataHeader_0x18d283: ; 0x18d283
+MenuDataHeader_0x18d283:
db $40 ; flags
db 04, 08 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d28b
db 1 ; default option
-; 0x18d28b
-MenuData2_0x18d28b: ; 0x18d28b
+MenuData2_0x18d28b:
db $81 ; flags
db 3 ; items
db "Love@"
db "Violence@"
db "Knowledge@"
-; 0x18d2a5
-MenuDataHeader_0x18d2a5: ; 0x18d2a5
+MenuDataHeader_0x18d2a5:
db $40 ; flags
db 04, 12 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d2ad
db 1 ; default option
-; 0x18d2ad
-MenuData2_0x18d2ad: ; 0x18d2ad
+MenuData2_0x18d2ad:
db $81 ; flags
db 3 ; items
db "Tough@"
db "Both@"
db "Weak@"
-; 0x18d2bf
-MovementData_0x18d2bf: ; 0x18d2bf
+MovementData_0x18d2bf:
slow_step_up
slow_step_up
slow_step_up
@@ -369,34 +346,29 @@
slow_step_up
slow_step_up
step_end
-; 0x18d2c7
-MovementData_0x18d2c7: ; 0x18d2c7
+MovementData_0x18d2c7:
slow_step_down
step_end
-; 0x18d2c9
-MovementData_0x18d2c9: ; 0x18d2c9
+MovementData_0x18d2c9:
slow_step_left
slow_step_left
slow_step_left
turn_head_down
step_end
-; 0x18d2ce
-MovementData_0x18d2ce: ; 0x18d2ce
+MovementData_0x18d2ce:
slow_step_right
slow_step_right
step_end
-; 0x18d2d1
-MovementData_0x18d2d1: ; 0x18d2d1
+MovementData_0x18d2d1:
slow_step_right
turn_head_down
step_end
-; 0x18d2d4
-MovementData_0x18d2d4: ; 0x18d2d4
+MovementData_0x18d2d4:
slow_step_up
slow_step_up
slow_step_up
@@ -403,27 +375,23 @@
slow_step_up
slow_step_up
step_end
-; 0x18d2da
-MovementData_0x18d2da: ; 0x18d2da
+MovementData_0x18d2da:
fix_facing
big_step_left
step_end
-; 0x18d2dd
-MovementData_0x18d2dd: ; 0x18d2dd
+MovementData_0x18d2dd:
slow_step_left
remove_fixed_facing
step_end
-; 0x18d2e0
-MovementData_0x18d2e0: ; 0x18d2e0
+MovementData_0x18d2e0:
slow_step_right
slow_step_right
step_end
-; 0x18d2e3
-MovementData_0x18d2e3: ; 0x18d2e3
+MovementData_0x18d2e3:
step_down
step_down
step_down
@@ -431,9 +399,8 @@
step_down
step_down
step_end
-; 0x18d2ea
-UnknownText_0x18d2ea: ; 0x18d2ea
+UnknownText_0x18d2ea:
text "Hm… Good to see"
line "you here."
@@ -455,35 +422,30 @@
para "Ready?"
done
-; 0x18d3bc
-UnknownText_0x18d3bc: ; 0x18d3bc
+UnknownText_0x18d3bc:
text "What are #MON"
line "to you?"
done
-; 0x18d3d3
-UnknownText_0x18d3d3: ; 0x18d3d3
+UnknownText_0x18d3d3:
text "What helps you to"
line "win battles?"
done
-; 0x18d3f3
-UnknownText_0x18d3f3: ; 0x18d3f3
+UnknownText_0x18d3f3:
text "What kind of"
line "trainer do you"
cont "wish to battle?"
done
-; 0x18d420
-UnknownText_0x18d420: ; 0x18d420
+UnknownText_0x18d420:
text "What is most"
line "important for"
cont "raising #MON?"
done
-; 0x18d44a
-UnknownText_0x18d44a: ; 0x18d44a
+UnknownText_0x18d44a:
text "Strong #MON."
line "Weak #MON."
@@ -490,9 +452,8 @@
para "Which is more"
line "important?"
done
-; 0x18d47c
-UnknownText_0x18d47c: ; 0x18d47c
+UnknownText_0x18d47c:
text "Hm… I see…"
para "You care deeply"
@@ -510,9 +471,8 @@
line "through at the"
cont "#MON LEAGUE."
done
-; 0x18d520
-UnknownText_0x18d520: ; 0x18d520
+UnknownText_0x18d520:
text "CLAIR!"
para "This child is"
@@ -526,9 +486,8 @@
para "…Or must I inform"
line "LANCE of this?"
done
-; 0x18d5a3
-UnknownText_0x18d5a3: ; 0x18d5a3
+UnknownText_0x18d5a3:
text "CLAIR…"
para "Reflect upon what"
@@ -537,15 +496,13 @@
para "lack and this"
line "child has."
done
-; 0x18d5e5
-UnknownText_0x18d5e5: ; 0x18d5e5
+UnknownText_0x18d5e5:
text "Come again, if you"
line "so desire."
done
-; 0x18d604
-UnknownText_0x18d604: ; 0x18d604
+UnknownText_0x18d604:
text "Hm… Good to see"
line "you here."
@@ -561,21 +518,18 @@
para "have recognized"
line "your worth."
done
-; 0x18d697
-UnknownText_0x18d697: ; 0x18d697
+UnknownText_0x18d697:
text "<PLAYER> received"
line "DRATINI!"
done
-; 0x18d6ac
-UnknownText_0x18d6ac: ; 0x18d6ac
+UnknownText_0x18d6ac:
text "Hm? Your #MON"
line "party is full."
done
-; 0x18d6ca
-UnknownText_0x18d6ca: ; 0x18d6ca
+UnknownText_0x18d6ca:
text "Dragon #MON are"
line "symbolic of our"
cont "clan."
@@ -586,9 +540,8 @@
para "entrusted with"
line "one."
done
-; 0x18d724
-UnknownText_0x18d724: ; 0x18d724
+UnknownText_0x18d724:
text "CLAIR appears to"
line "have learned an"
@@ -598,9 +551,8 @@
para "I thank you as her"
line "grandfather."
done
-; 0x18d782
-UnknownText_0x18d782: ; 0x18d782
+UnknownText_0x18d782:
text "A boy close to"
line "your age is in"
cont "training here."
@@ -611,26 +563,22 @@
para "younger. It is a"
line "little worrisome…"
done
-; 0x18d7f6
-UnknownText_0x18d7f6: ; 0x18d7f6
+UnknownText_0x18d7f6:
text "Hah? I didn't"
line "quite catch that…"
done
-; 0x18d816
-UnknownText_0x18d816: ; 0x18d816
+UnknownText_0x18d816:
text "What was it you"
line "said?"
done
-; 0x18d82d
-UnknownText_0x18d82d: ; 0x18d82d
+UnknownText_0x18d82d:
text "Oh, I understand…"
done
-; 0x18d840
-UnknownText_0x18d840: ; 0x18d840
+UnknownText_0x18d840:
text "It's been quite"
line "some time since a"
@@ -641,9 +589,8 @@
para "In fact, not since"
line "Master LANCE."
done
-; 0x18d8b1
-UnknownText_0x18d8b1: ; 0x18d8b1
+UnknownText_0x18d8b1:
text "You know young"
line "Master LANCE?"
@@ -654,9 +601,8 @@
para "It's in their"
line "blood."
done
-; 0x18d916
-UnknownText_0x18d916: ; 0x18d916
+UnknownText_0x18d916:
text "So how did it go?"
para "I guess there's no"
@@ -668,41 +614,35 @@
para "…What? You passed?"
done
-; 0x18d974
-UnknownText_0x18d974: ; 0x18d974
+UnknownText_0x18d974:
text "That can't be!"
done
-; 0x18d983
-UnknownText_0x18d983: ; 0x18d983
+UnknownText_0x18d983:
text "You're lying!"
para "Even I haven't"
line "been approved!"
done
-; 0x18d9ae
-UnknownText_0x18d9ae: ; 0x18d9ae
+UnknownText_0x18d9ae:
text "I-I understand…"
done
-; 0x18d9bf
-UnknownText_0x18d9bf: ; 0x18d9bf
+UnknownText_0x18d9bf:
text "Here, this is the"
line "RISINGBADGE…"
para "Hurry up! Take it!"
done
-; 0x18d9f2
-UnknownText_0x18d9f2: ; 0x18d9f2
+UnknownText_0x18d9f2:
text "<PLAYER> received"
line "RISINGBADGE."
done
-; 0x18da0b
-UnknownText_0x18da0b: ; 0x18da0b
+UnknownText_0x18da0b:
text "RISINGBADGE will"
line "enable your"
@@ -719,14 +659,12 @@
para "command without"
line "question."
done
-; 0x18dab4
-UnknownText_0x18dab4: ; 0x18dab4
+UnknownText_0x18dab4:
text $56, $56, $56, $56, $56, $56
done
-; 0x18dabc
-DragonShrine_MapEventHeader: ; 0x18dabc
+DragonShrine_MapEventHeader:
; filler
db 0, 0
@@ -747,4 +685,3 @@
person_event SPRITE_ELDER, 8, 6, $9, $0, 255, 255, $0, 0, ElderScript_0x18d205, $0000
person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, $0000
person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, $0790
-; 0x18db00
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -1,12 +1,11 @@
-DragonsDen1F_MapScriptHeader: ; 0x18c874
+DragonsDen1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c876
-DragonsDen1F_MapEventHeader: ; 0x18c876
+DragonsDen1F_MapEventHeader:
; filler
db 0, 0
@@ -25,4 +24,3 @@
; people-events
db 0
-; 0x18c890
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -1,4 +1,4 @@
-EarlsPokemonAcademy_MapScriptHeader: ; 0x68a5a
+EarlsPokemonAcademy_MapScriptHeader:
; trigger count
db 0
@@ -30,11 +30,10 @@
loadmovesprites
end
-YoungsterScript_0x68a83: ; 0x68a83
+YoungsterScript_0x68a83:
jumptextfaceplayer UnknownText_0x68d80
-; 0x68a86
-GameboyKidScript_0x68a86: ; 0x68a86
+GameboyKidScript_0x68a86:
faceplayer
loadfont
writetext UnknownText_0x68dda
@@ -42,9 +41,8 @@
loadmovesprites
spriteface $4, DOWN
end
-; 0x68a91
-GameboyKidScript_0x68a91: ; 0x68a91
+GameboyKidScript_0x68a91:
faceplayer
loadfont
writetext UnknownText_0x68e07
@@ -52,11 +50,9 @@
loadmovesprites
spriteface $5, DOWN
end
-; 0x68a9c
-YoungsterScript_0x68a9c: ; 0x68a9c
+YoungsterScript_0x68a9c:
jumptextfaceplayer UnknownText_0x68e39
-; 0x68a9f
AcademyBlackboard:
loadfont
@@ -144,7 +140,7 @@
AcademyBookshelf:
jumpstd difficultbookshelf
-MovementData_0x68b2d: ; 0x68b2d
+MovementData_0x68b2d:
turn_head_down
turn_head_left
turn_head_up
@@ -159,9 +155,8 @@
turn_head_right
turn_head_down
step_end
-; 0x68b3b
-UnknownText_0x68b3b: ; 0x68b3b
+UnknownText_0x68b3b:
text "EARL, I am!"
para "Wonderful are"
@@ -175,9 +170,8 @@
line "know? Want to be"
cont "a winner is you?"
done
-; 0x68bbd
-UnknownText_0x68bbd: ; 0x68bbd
+UnknownText_0x68bbd:
text "Good! Teach you,"
line "I will!"
@@ -192,16 +186,14 @@
para "More from me you"
line "want to hear?"
done
-; 0x68c51
-UnknownText_0x68c51: ; 0x68c51
+UnknownText_0x68c51:
text "So, want to know"
line "how to raise"
cont "#MON well?"
done
-; 0x68c7b
-UnknownText_0x68c7b: ; 0x68c7b
+UnknownText_0x68c7b:
text "Fine! Teach you,"
line "I will!"
@@ -221,9 +213,8 @@
line "#MON strong"
cont "become!"
done
-; 0x68d31
-UnknownText_0x68d31: ; 0x68d31
+UnknownText_0x68d31:
text "Oh! Smart student"
line "you are! Nothing"
cont "more do I teach!"
@@ -231,9 +222,8 @@
para "Good to #MON"
line "you must be!"
done
-; 0x68d80
-UnknownText_0x68d80: ; 0x68d80
+UnknownText_0x68d80:
text "I'm taking notes"
line "of the teacher's"
cont "lecture."
@@ -242,23 +232,20 @@
line "the stuff on the"
cont "blackboard too."
done
-; 0x68dda
-UnknownText_0x68dda: ; 0x68dda
+UnknownText_0x68dda:
text "I traded my best"
line "#MON to the"
cont "guy beside me."
done
-; 0x68e07
-UnknownText_0x68e07: ; 0x68e07
+UnknownText_0x68e07:
text "Huh? The #MON I"
line "just got is hold-"
cont "ing something!"
done
-; 0x68e39
-UnknownText_0x68e39: ; 0x68e39
+UnknownText_0x68e39:
text "A #MON holding"
line "a BERRY will heal"
cont "itself in battle."
@@ -270,7 +257,6 @@
para "It sure is tough"
line "taking notes…"
done
-; 0x68eb2
AcademyBlackboardText:
text "The blackboard"
@@ -418,7 +404,7 @@
para "stickers!"
done
-EarlsPokemonAcademy_MapEventHeader: ; 0x69375
+EarlsPokemonAcademy_MapEventHeader:
; filler
db 0, 0
@@ -445,4 +431,3 @@
person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, $ffff
person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, $ffff
person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, $ffff
-; 0x693e7
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -1,4 +1,4 @@
-EcruteakHouse_MapScriptHeader: ; 0x98000
+EcruteakHouse_MapScriptHeader:
; trigger count
db 2
@@ -12,17 +12,14 @@
; callbacks
dbw 2, UnknownScript_0x9800f
-; 0x9800d
-UnknownScript_0x9800d: ; 0x9800d
+UnknownScript_0x9800d:
end
-; 0x9800e
-UnknownScript_0x9800e: ; 0x9800e
+UnknownScript_0x9800e:
end
-; 0x9800f
-UnknownScript_0x9800f: ; 0x9800f
+UnknownScript_0x9800f:
checkevent EVENT_FOUGHT_SUICUNE
iftrue UnknownScript_0x98033
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
@@ -30,9 +27,8 @@
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x98022
return
-; 0x98022
-UnknownScript_0x98022: ; 0x98022
+UnknownScript_0x98022:
clearevent $0766
setevent $0767
setevent $07b1
@@ -39,16 +35,14 @@
checkitem CLEAR_BELL
iftrue UnknownScript_0x98032
dotrigger $0
-UnknownScript_0x98032: ; 0x98032
+UnknownScript_0x98032:
return
-; 0x98033
-UnknownScript_0x98033: ; 0x98033
+UnknownScript_0x98033:
clearevent $07b1
return
-; 0x98037
-UnknownScript_0x98037: ; 0x98037
+UnknownScript_0x98037:
checkevent $0767
iftrue UnknownScript_0x98061
applymovement $3, MovementData_0x980c7
@@ -57,9 +51,8 @@
pause 5
disappear $3
end
-; 0x9804c
-UnknownScript_0x9804c: ; 0x9804c
+UnknownScript_0x9804c:
checkevent $0766
iftrue UnknownScript_0x98061
applymovement $2, MovementData_0x980cc
@@ -68,13 +61,11 @@
pause 5
disappear $2
end
-; 0x98061
-UnknownScript_0x98061: ; 0x98061
+UnknownScript_0x98061:
end
-; 0x98062
-SageScript_0x98062: ; 0x98062
+SageScript_0x98062:
faceplayer
loadfont
checkevent EVENT_CLEARED_RADIO_TOWER
@@ -85,16 +76,14 @@
closetext
loadmovesprites
end
-; 0x98076
-UnknownScript_0x98076: ; 0x98076
+UnknownScript_0x98076:
writetext UnknownText_0x98131
closetext
loadmovesprites
end
-; 0x9807c
-UnknownScript_0x9807c: ; 0x9807c
+UnknownScript_0x9807c:
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x980a4
checkevent $0000
@@ -105,9 +94,8 @@
closetext
loadmovesprites
end
-; 0x98093
-UnknownScript_0x98093: ; 0x98093
+UnknownScript_0x98093:
writetext UnknownText_0x98250
closetext
loadmovesprites
@@ -116,23 +104,20 @@
clearevent $0766
setevent $0000
end
-; 0x980a4
-UnknownScript_0x980a4: ; 0x980a4
+UnknownScript_0x980a4:
writetext UnknownText_0x9837e
closetext
loadmovesprites
end
-; 0x980aa
-UnknownScript_0x980aa: ; 0x980aa
+UnknownScript_0x980aa:
writetext UnknownText_0x98391
closetext
loadmovesprites
end
-; 0x980b0
-SageScript_0x980b0: ; 0x980b0
+SageScript_0x980b0:
faceplayer
loadfont
checkevent EVENT_GOT_CLEAR_BELL
@@ -141,36 +126,31 @@
closetext
loadmovesprites
end
-; 0x980be
-UnknownScript_0x980be: ; 0x980be
+UnknownScript_0x980be:
writetext UnknownText_0x9846f
closetext
loadmovesprites
end
-; 0x980c4
-GrampsScript_0x980c4: ; 0x980c4
+GrampsScript_0x980c4:
jumptextfaceplayer UnknownText_0x984ab
-; 0x980c7
-MovementData_0x980c7: ; 0x980c7
+MovementData_0x980c7:
fix_facing
big_step_left
remove_fixed_facing
turn_head_down
step_end
-; 0x980cc
-MovementData_0x980cc: ; 0x980cc
+MovementData_0x980cc:
fix_facing
big_step_right
remove_fixed_facing
turn_head_down
step_end
-; 0x980d1
-UnknownText_0x980d1: ; 0x980d1
+UnknownText_0x980d1:
text "TIN TOWER is off"
line "limits to anyone"
@@ -180,9 +160,8 @@
para "Sorry, but you'll"
line "have to leave."
done
-; 0x98131
-UnknownText_0x98131: ; 0x98131
+UnknownText_0x98131:
text "TIN TOWER is off"
line "limits to anyone"
@@ -195,9 +174,8 @@
line "BADGE! Please, go"
cont "right through."
done
-; 0x981a4
-UnknownText_0x981a4: ; 0x981a4
+UnknownText_0x981a4:
text "A momentous event"
line "has occurred."
@@ -214,9 +192,8 @@
para "very difficult to"
line "understand…"
done
-; 0x98250
-UnknownText_0x98250: ; 0x98250
+UnknownText_0x98250:
text "A momentous event"
line "has occurred."
@@ -249,14 +226,12 @@
para "Please, do go on."
done
-; 0x9837e
-UnknownText_0x9837e: ; 0x9837e
+UnknownText_0x9837e:
text "Please, do go on."
done
-; 0x98391
-UnknownText_0x98391: ; 0x98391
+UnknownText_0x98391:
text "That bell's chime"
line "is indicative of"
cont "the bearer's soul."
@@ -269,9 +244,8 @@
para "Please, do go on."
done
-; 0x9840b
-UnknownText_0x9840b: ; 0x9840b
+UnknownText_0x9840b:
text "The TIN TOWER"
line "ahead is a nine-"
@@ -282,9 +256,8 @@
line "soul of all who"
cont "see it."
done
-; 0x9846f
-UnknownText_0x9846f: ; 0x9846f
+UnknownText_0x9846f:
text "The TIN TOWER"
line "shook! A #MON"
@@ -291,9 +264,8 @@
para "must have returned"
line "to the top!"
done
-; 0x984ab
-UnknownText_0x984ab: ; 0x984ab
+UnknownText_0x984ab:
text "Two towers…"
line "Two #MON…"
@@ -303,9 +275,8 @@
para "#MON flew away,"
line "never to return."
done
-; 0x98502
-EcruteakHouse_MapEventHeader: ; 0x98502
+EcruteakHouse_MapEventHeader:
; filler
db 0, 0
@@ -331,4 +302,3 @@
person_event SPRITE_SAGE, 10, 9, $6, $0, 255, 255, $0, 0, SageScript_0x98062, $0767
person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, $07b1
person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, $07b1
-; 0x98565
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -1,12 +1,11 @@
-EcruteakItemfinderHouse_MapScriptHeader: ; 0x9a5f9
+EcruteakItemfinderHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9a5fb
-CooltrainerMScript_0x9a5fb: ; 0x9a5fb
+CooltrainerMScript_0x9a5fb:
faceplayer
loadfont
checkevent EVENT_GOT_ITEMFINDER
@@ -18,21 +17,19 @@
keeptextopen
verbosegiveitem ITEMFINDER, 1
setevent EVENT_GOT_ITEMFINDER
-UnknownScript_0x9a614: ; 0x9a614
+UnknownScript_0x9a614:
writetext UnknownText_0x9a70e
closetext
loadmovesprites
end
-; 0x9a61a
-UnknownScript_0x9a61a: ; 0x9a61a
+UnknownScript_0x9a61a:
writetext UnknownText_0x9a805
closetext
loadmovesprites
end
-; 0x9a620
-PokedexScript_0x9a620: ; 0x9a620
+PokedexScript_0x9a620:
loadfont
writetext UnknownText_0x9a826
yesorno
@@ -39,27 +36,24 @@
iftrue UnknownScript_0x9a62a
loadmovesprites
end
-; 0x9a62a
-UnknownScript_0x9a62a: ; 0x9a62a
+UnknownScript_0x9a62a:
writetext UnknownText_0x9a84c
yesorno
iftrue UnknownScript_0x9a633
loadmovesprites
end
-; 0x9a633
-UnknownScript_0x9a633: ; 0x9a633
+UnknownScript_0x9a633:
writetext UnknownText_0x9a902
closetext
loadmovesprites
end
-; 0x9a639
ItemFinderHouseRadio:
jumpstd radio2
-UnknownText_0x9a63c: ; 0x9a63c
+UnknownText_0x9a63c:
text "Ah. You're on an"
line "adventure with"
cont "your #MON?"
@@ -71,9 +65,8 @@
para "Am I right, or am"
line "I right?"
done
-; 0x9a6b5
-UnknownText_0x9a6b5: ; 0x9a6b5
+UnknownText_0x9a6b5:
text "Good! You under-"
line "stand the true"
@@ -83,9 +76,8 @@
para "I like that! Take"
line "this with you."
done
-; 0x9a70e
-UnknownText_0x9a70e: ; 0x9a70e
+UnknownText_0x9a70e:
text "There are many"
line "items lying about"
@@ -110,23 +102,20 @@
para "in ECRUTEAK's"
line "BURNED TOWER."
done
-; 0x9a805
-UnknownText_0x9a805: ; 0x9a805
+UnknownText_0x9a805:
text "Oh… To each his"
line "own, I suppose…"
done
-; 0x9a826
-UnknownText_0x9a826: ; 0x9a826
+UnknownText_0x9a826:
text "HISTORY OF"
line "ECRUTEAK"
para "Want to read it?"
done
-; 0x9a84c
-UnknownText_0x9a84c: ; 0x9a84c
+UnknownText_0x9a84c:
text "In ECRUTEAK, there"
line "were two towers."
@@ -144,9 +133,8 @@
para "Keep reading?"
done
-; 0x9a902
-UnknownText_0x9a902: ; 0x9a902
+UnknownText_0x9a902:
text "ECRUTEAK was also"
line "home to three"
@@ -169,9 +157,8 @@
para "wind off into the"
line "grassland."
done
-; 0x9a9f5
-EcruteakItemfinderHouse_MapEventHeader: ; 0x9a9f5
+EcruteakItemfinderHouse_MapEventHeader:
; filler
db 0, 0
@@ -191,4 +178,3 @@
db 2
person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, $ffff
person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, $ffff
-; 0x9aa24
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -1,23 +1,20 @@
-EcruteakLugiaSpeechHouse_MapScriptHeader: ; 0x99332
+EcruteakLugiaSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x99334
-GrampsScript_0x99334: ; 0x99334
+GrampsScript_0x99334:
jumptextfaceplayer UnknownText_0x9933d
-; 0x99337
-YoungsterScript_0x99337: ; 0x99337
+YoungsterScript_0x99337:
jumptextfaceplayer UnknownText_0x993ec
-; 0x9933a
LugiaSpeechHouseRadio:
jumpstd radio2
-UnknownText_0x9933d: ; 0x9933d
+UnknownText_0x9933d:
text "This happened when"
line "I was young."
@@ -34,9 +31,8 @@
para "It was like a bird"
line "and a dragon."
done
-; 0x993ec
-UnknownText_0x993ec: ; 0x993ec
+UnknownText_0x993ec:
text "Is there really a"
line "#MON that big?"
@@ -43,9 +39,8 @@
para "If it exists, it"
line "must be powerful."
done
-; 0x99431
-EcruteakLugiaSpeechHouse_MapEventHeader: ; 0x99431
+EcruteakLugiaSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -65,4 +60,3 @@
db 2
person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, $ffff
person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, $ffff
-; 0x99460
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -1,27 +1,23 @@
-EcruteakMart_MapScriptHeader: ; 0x99c39
+EcruteakMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x99c3b
-ClerkScript_0x99c3b: ; 0x99c3b
+ClerkScript_0x99c3b:
loadfont
pokemart $0, $000e
loadmovesprites
end
-; 0x99c42
-SuperNerdScript_0x99c42: ; 0x99c42
+SuperNerdScript_0x99c42:
jumptextfaceplayer UnknownText_0x99c48
-; 0x99c45
-GrannyScript_0x99c45: ; 0x99c45
+GrannyScript_0x99c45:
jumptextfaceplayer UnknownText_0x99cd5
-; 0x99c48
-UnknownText_0x99c48: ; 0x99c48
+UnknownText_0x99c48:
text "My EEVEE evolved"
line "into an ESPEON."
@@ -35,9 +31,8 @@
para "our EEVEE in the"
line "same way…"
done
-; 0x99cd5
-UnknownText_0x99cd5: ; 0x99cd5
+UnknownText_0x99cd5:
text "If you use REVIVE,"
line "a #MON that's"
@@ -44,9 +39,8 @@
para "fainted will wake"
line "right up."
done
-; 0x99d12
-EcruteakMart_MapEventHeader: ; 0x99d12
+EcruteakMart_MapEventHeader:
; filler
db 0, 0
@@ -66,4 +60,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, $ffff
person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, $ffff
person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, $ffff
-; 0x99d49
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokeCenter1F.asm
@@ -1,4 +1,4 @@
-EcruteakPokeCenter1F_MapScriptHeader: ; 0x98e55
+EcruteakPokeCenter1F_MapScriptHeader:
; trigger count
db 2
@@ -8,18 +8,15 @@
; callback count
db 0
-; 0x98e5f
-UnknownScript_0x98e5f: ; 0x98e5f
+UnknownScript_0x98e5f:
priorityjump UnknownScript_0x98e64
end
-; 0x98e63
-UnknownScript_0x98e63: ; 0x98e63
+UnknownScript_0x98e63:
end
-; 0x98e64
-UnknownScript_0x98e64: ; 0x98e64
+UnknownScript_0x98e64:
pause 30
playsound SFX_EXIT_BUILDING
appear $6
@@ -40,9 +37,8 @@
writetext UnknownText_0x98ed8
keeptextopen
jump UnknownScript_0x98e95
-; 0x98e95
-UnknownScript_0x98e95: ; 0x98e95
+UnknownScript_0x98e95:
writetext UnknownText_0x98f22
closetext
loadmovesprites
@@ -55,31 +51,25 @@
dotrigger $1
waitbutton
end
-; 0x98eb0
-NurseScript_0x98eb0: ; 0x98eb0
+NurseScript_0x98eb0:
jumpstd pokecenternurse
-; 0x98eb3
-PokefanMScript_0x98eb3: ; 0x98eb3
+PokefanMScript_0x98eb3:
special Function10630f
iftrue UnknownScript_0x98ebc
jumptextfaceplayer UnknownText_0x99155
-; 0x98ebc
-UnknownScript_0x98ebc: ; 0x98ebc
+UnknownScript_0x98ebc:
jumptextfaceplayer UnknownText_0x991aa
-; 0x98ebf
-CooltrainerFScript_0x98ebf: ; 0x98ebf
+CooltrainerFScript_0x98ebf:
jumptextfaceplayer UnknownText_0x99240
-; 0x98ec2
-GymGuyScript_0x98ec2: ; 0x98ec2
+GymGuyScript_0x98ec2:
jumptextfaceplayer UnknownText_0x99286
-; 0x98ec5
-MovementData_0x98ec5: ; 0x98ec5
+MovementData_0x98ec5:
step_up
step_up
step_up
@@ -89,9 +79,8 @@
step_right
turn_head_up
step_end
-; 0x98ece
-MovementData_0x98ece: ; 0x98ece
+MovementData_0x98ece:
step_right
step_down
step_down
@@ -98,16 +87,14 @@
step_down
step_down
step_end
-; 0x98ed4
-MovementData_0x98ed4: ; 0x98ed4
+MovementData_0x98ed4:
step_up
step_up
step_up
step_end
-; 0x98ed8
-UnknownText_0x98ed8: ; 0x98ed8
+UnknownText_0x98ed8:
text "Hi, I'm BILL. And"
line "who are you?"
@@ -115,9 +102,8 @@
line "You've come at the"
cont "right time."
done
-; 0x98f22
-UnknownText_0x98f22: ; 0x98f22
+UnknownText_0x98f22:
text "I just finished"
line "adjustments on my"
cont "TIME CAPSULE."
@@ -170,9 +156,8 @@
para "Buh-bye!"
done
-; 0x99155
-UnknownText_0x99155: ; 0x99155
+UnknownText_0x99155:
text "The way the KIMONO"
line "GIRLS dance is"
@@ -180,9 +165,8 @@
line "like the way they"
cont "use their #MON."
done
-; 0x991aa
-UnknownText_0x991aa: ; 0x991aa
+UnknownText_0x991aa:
text "You must be hoping"
line "to battle more"
@@ -197,9 +181,8 @@
para "It's a little past"
line "OLIVINE CITY."
done
-; 0x99240
-UnknownText_0x99240: ; 0x99240
+UnknownText_0x99240:
text "MORTY, the GYM"
line "LEADER, is soooo"
cont "cool."
@@ -207,9 +190,8 @@
para "His #MON are"
line "really tough too."
done
-; 0x99286
-UnknownText_0x99286: ; 0x99286
+UnknownText_0x99286:
text "LAKE OF RAGE…"
para "The appearance of"
@@ -218,9 +200,8 @@
para "I smell a conspir-"
line "acy. I know it!"
done
-; 0x992dc
-EcruteakPokeCenter1F_MapEventHeader: ; 0x992dc
+EcruteakPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -243,4 +224,3 @@
person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, $ffff
person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, $ffff
person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, $0713
-; 0x99332
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1,4 +1,4 @@
-ElmsLab_MapScriptHeader: ; 0x78b5d
+ElmsLab_MapScriptHeader:
; trigger count
db 6
@@ -16,55 +16,46 @@
; callbacks
dbw 2, UnknownScript_0x78b83
-; 0x78b7a
-UnknownScript_0x78b7a: ; 0x78b7a
+UnknownScript_0x78b7a:
priorityjump UnknownScript_0x78b8c
end
-; 0x78b7e
-UnknownScript_0x78b7e: ; 0x78b7e
+UnknownScript_0x78b7e:
end
-; 0x78b7f
-UnknownScript_0x78b7f: ; 0x78b7f
+UnknownScript_0x78b7f:
end
-; 0x78b80
-UnknownScript_0x78b80: ; 0x78b80
+UnknownScript_0x78b80:
end
-; 0x78b81
-UnknownScript_0x78b81: ; 0x78b81
+UnknownScript_0x78b81:
end
-; 0x78b82
-UnknownScript_0x78b82: ; 0x78b82
+UnknownScript_0x78b82:
end
-; 0x78b83
-UnknownScript_0x78b83: ; 0x78b83
+UnknownScript_0x78b83:
checktriggers
iftrue UnknownScript_0x78b8b
moveperson $2, $3, $4
-UnknownScript_0x78b8b: ; 0x78b8b
+UnknownScript_0x78b8b:
return
-; 0x78b8c
-UnknownScript_0x78b8c: ; 0x78b8c
+UnknownScript_0x78b8c:
applymovement $0, MovementData_0x78f67
showemote $0, $2, 15
spriteface $2, RIGHT
loadfont
writetext UnknownText_0x78fb6
-UnknownScript_0x78b9b: ; 0x78b9b
+UnknownScript_0x78b9b:
yesorno
iftrue UnknownScript_0x78ba5
writetext UnknownText_0x7911a
jump UnknownScript_0x78b9b
-; 0x78ba5
-UnknownScript_0x78ba5: ; 0x78ba5
+UnknownScript_0x78ba5:
writetext UnknownText_0x790fa
keeptextopen
writetext UnknownText_0x7913a
@@ -93,9 +84,8 @@
dotrigger $1
loadmovesprites
end
-; 0x78be0
-ProfElmScript: ; 0x78be0
+ProfElmScript:
faceplayer
loadfont
checkevent EVENT_GOT_SS_TICKET_FROM_ELM
@@ -102,12 +92,12 @@
iftrue UnknownScript_0x78bee
checkevent EVENT_BEAT_ELITE_FOUR
iftrue ElmGiveTicketScript
-UnknownScript_0x78bee: ; 0x78bee
+UnknownScript_0x78bee:
checkevent EVENT_GOT_MASTER_BALL_FROM_ELM
iftrue UnknownScript_0x78bfa
checkflag $0022
iftrue ElmGiveMasterBallScript
-UnknownScript_0x78bfa: ; 0x78bfa
+UnknownScript_0x78bfa:
checkevent EVENT_GOT_EVERSTONE_FROM_ELM
iftrue UnknownScript_0x78e16
checkevent EVENT_SHOWED_TOGEPI_TO_ELM
@@ -124,9 +114,8 @@
closetext
loadmovesprites
end
-; 0x78c22
-UnknownScript_0x78c22: ; 0x78c22
+UnknownScript_0x78c22:
writebyte TOGEPI
special Functionc284
iftrue ShowElmTogepiScript
@@ -134,14 +123,13 @@
special Functionc284
iftrue ShowElmTogepiScript
jump UnknownScript_0x78c41
-; 0x78c35
-UnknownScript_0x78c35: ; 0x78c35
+UnknownScript_0x78c35:
checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
iffalse UnknownScript_0x78c41
checkevent EVENT_TOGEPI_HATCHED
iftrue UnknownScript_0x78c22
-UnknownScript_0x78c41: ; 0x78c41
+UnknownScript_0x78c41:
checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again?
iftrue ElmWaitingEggHatchScript
checkflag $001b
@@ -156,9 +144,8 @@
closetext
loadmovesprites
end
-; 0x78c65
-LabTryToLeaveScript: ; 0x78c65
+LabTryToLeaveScript:
spriteface $2, DOWN
loadfont
writetext LabWhereGoingText
@@ -166,9 +153,8 @@
loadmovesprites
applymovement $0, MovementData_0x78f70
end
-; 0x78c73
-CyndaquilPokeBallScript: ; 0x78c73
+CyndaquilPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface $2, DOWN
@@ -197,9 +183,8 @@
if_equal $3, ElmDirectionsScript
applymovement $0, AfterCyndaquilMovement
jump ElmDirectionsScript
-; 0x78cb5
-TotodilePokeBallScript: ; 0x78cb5
+TotodilePokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface $2, DOWN
@@ -226,9 +211,8 @@
loadmovesprites
applymovement $0, AfterTotodileMovement
jump ElmDirectionsScript
-; 0x78cf1
-ChikoritaPokeBallScript: ; 0x78cf1
+ChikoritaPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface $2, DOWN
@@ -255,16 +239,14 @@
loadmovesprites
applymovement $0, AfterChikoritaMovement
jump ElmDirectionsScript
-; 0x78d2d
-DidntChooseStarterScript: ; 0x78d2d
+DidntChooseStarterScript:
writetext DidntChooseStarterText
closetext
loadmovesprites
end
-; 0x78d33
-ElmDirectionsScript: ; 0x78d33
+ElmDirectionsScript:
spriteface $0, UP
loadfont
writetext ElmDirectionsText1
@@ -292,22 +274,19 @@
dotrigger $5
domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1
end
-; 0x78d67
-ElmDescribesMrPokemonScript: ; 0x78d67
+ElmDescribesMrPokemonScript:
writetext ElmDescribesMrPokemonText
closetext
loadmovesprites
end
-; 0x78d6d
-LookAtElmPokeBallScript: ; 0x78d6d
+LookAtElmPokeBallScript:
loadfont
writetext ElmPokeBallText
closetext
loadmovesprites
end
-; 0x78d74
ElmsLabHealingMachine:
loadfont
@@ -324,9 +303,8 @@
iftrue UnknownScript_0x78d8a
loadmovesprites
end
-; 0x78d8a
-UnknownScript_0x78d8a: ; 0x78d8a
+UnknownScript_0x78d8a:
special Function1060a2
special HealParty
playmusic MUSIC_NONE
@@ -336,15 +314,13 @@
special RestartMapMusic
loadmovesprites
end
-; 0x78d9f
-ElmAfterTheftDoneScript: ; 0x78d9f
+ElmAfterTheftDoneScript:
closetext
loadmovesprites
end
-; 0x78da2
-ElmAfterTheftScript: ; 0x78da2
+ElmAfterTheftScript:
writetext ElmAfterTheftText1
checkitem MYSTERY_EGG
iffalse ElmAfterTheftDoneScript
@@ -370,30 +346,26 @@
loadmovesprites
dotrigger $6
end
-; 0x78ddc
-ElmStudyingEggScript: ; 0x78ddc
+ElmStudyingEggScript:
writetext ElmStudyingEggText
closetext
loadmovesprites
end
-; 0x78de2
-ElmAideHasEggScript: ; 0x78de2
+ElmAideHasEggScript:
writetext ElmAideHasEggText
closetext
loadmovesprites
end
-; 0x78de8
-ElmWaitingEggHatchScript: ; 0x78de8
+ElmWaitingEggHatchScript:
writetext ElmWaitingEggHatchText
closetext
loadmovesprites
end
-; 0x78dee
-ShowElmTogepiScript: ; 0x78dee
+ShowElmTogepiScript:
writetext ShowElmTogepiText1
closetext
loadmovesprites
@@ -404,7 +376,7 @@
keeptextopen
writetext ShowElmTogepiText3
keeptextopen
-UnknownScript_0x78e03: ; 0x78e03
+UnknownScript_0x78e03:
writetext ElmGiveEverstoneText1
keeptextopen
verbosegiveitem EVERSTONE, 1
@@ -414,17 +386,15 @@
loadmovesprites
setevent EVENT_GOT_EVERSTONE_FROM_ELM
end
-; 0x78e16
-UnknownScript_0x78e16: ; 0x78e16
+UnknownScript_0x78e16:
writetext UnknownText_0x79c37
closetext
-UnknownScript_0x78e1a: ; 0x78e1a
+UnknownScript_0x78e1a:
loadmovesprites
end
-; 0x78e1c
-ElmGiveMasterBallScript: ; 0x78e1c
+ElmGiveMasterBallScript:
writetext ElmGiveMasterBallText1
keeptextopen
verbosegiveitem MASTER_BALL, 1
@@ -435,9 +405,8 @@
.notdone
loadmovesprites
end
-; 0x78e2f
-ElmGiveTicketScript: ; 0x78e2f
+ElmGiveTicketScript:
writetext ElmGiveTicketText1
keeptextopen
verbosegiveitem S_S_TICKET, 1
@@ -446,9 +415,8 @@
closetext
loadmovesprites
end
-; 0x78e3f
-ElmJumpBackScript1: ; 0x78e3f
+ElmJumpBackScript1:
loadmovesprites
checkcode VAR_FACING
if_equal $0, UnknownScript_0x78e6d
@@ -456,9 +424,8 @@
if_equal $2, UnknownScript_0x78e73
if_equal $3, UnknownScript_0x78e79
end
-; 0x78e53
-ElmJumpBackScript2: ; 0x78e53
+ElmJumpBackScript2:
loadmovesprites
checkcode VAR_FACING
if_equal $0, UnknownScript_0x78e67
@@ -466,49 +433,42 @@
if_equal $2, UnknownScript_0x78e79
if_equal $3, UnknownScript_0x78e73
end
-; 0x78e67
-UnknownScript_0x78e67: ; 0x78e67
+UnknownScript_0x78e67:
applymovement $2, MovementData_0x78f90
loadfont
end
-; 0x78e6d
-UnknownScript_0x78e6d: ; 0x78e6d
+UnknownScript_0x78e6d:
applymovement $2, MovementData_0x78f94
loadfont
end
-; 0x78e73
-UnknownScript_0x78e73: ; 0x78e73
+UnknownScript_0x78e73:
applymovement $2, MovementData_0x78f98
loadfont
end
-; 0x78e79
-UnknownScript_0x78e79: ; 0x78e79
+UnknownScript_0x78e79:
applymovement $2, MovementData_0x78f9c
loadfont
end
-; 0x78e7f
-UnknownScript_0x78e7f: ; 0x78e7f
+UnknownScript_0x78e7f:
applymovement $3, MovementData_0x78f7e
spriteface $0, DOWN
scall UnknownScript_0x78e9d
applymovement $3, MovementData_0x78f87
end
-; 0x78e8e
-UnknownScript_0x78e8e: ; 0x78e8e
+UnknownScript_0x78e8e:
applymovement $3, MovementData_0x78f82
spriteface $0, DOWN
scall UnknownScript_0x78e9d
applymovement $3, MovementData_0x78f8b
end
-; 0x78e9d
-UnknownScript_0x78e9d: ; 0x78e9d
+UnknownScript_0x78e9d:
loadfont
writetext UnknownText_0x79f38
keeptextopen
@@ -518,25 +478,22 @@
loadmovesprites
dotrigger $2
end
-; 0x78ead
-UnknownScript_0x78ead: ; 0x78ead
+UnknownScript_0x78ead:
applymovement $3, MovementData_0x78f7e
spriteface $0, DOWN
scall UnknownScript_0x78ecb
applymovement $3, MovementData_0x78f87
end
-; 0x78ebc
-UnknownScript_0x78ebc: ; 0x78ebc
+UnknownScript_0x78ebc:
applymovement $3, MovementData_0x78f82
spriteface $0, DOWN
scall UnknownScript_0x78ecb
applymovement $3, MovementData_0x78f8b
end
-; 0x78ecb
-UnknownScript_0x78ecb: ; 0x78ecb
+UnknownScript_0x78ecb:
loadfont
writetext UnknownText_0x7a078
keeptextopen
@@ -549,14 +506,12 @@
loadmovesprites
dotrigger $2
end
-; 0x78ee2
-UnknownScript_0x78ee2: ; 0x78ee2
+UnknownScript_0x78ee2:
jumpstd $002f
end
-; 0x78ee6
-ElmsAideScript: ; 0x78ee6
+ElmsAideScript:
faceplayer
loadfont
checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
@@ -569,35 +524,31 @@
closetext
loadmovesprites
end
-; 0x78f00
-UnknownScript_0x78f00: ; 0x78f00
+UnknownScript_0x78f00:
writetext UnknownText_0x79f95
closetext
loadmovesprites
end
-; 0x78f06
-UnknownScript_0x78f06: ; 0x78f06
+UnknownScript_0x78f06:
writetext UnknownText_0x7a09a
closetext
loadmovesprites
end
-; 0x78f0c
-UnknownScript_0x78f0c: ; 0x78f0c
+UnknownScript_0x78f0c:
writetext UnknownText_0x79c65
closetext
loadmovesprites
end
-; 0x78f12
-UnknownScript_0x78f12: ; 0x78f12
+UnknownScript_0x78f12:
applymovement $0, MovementData_0x78f72
-MeetCopScript: ; 0x78f16
+MeetCopScript:
applymovement $0, MovementData_0x78f74
-CopScript: ; 0x78f1a
+CopScript:
spriteface $7, LEFT
loadfont
writetext UnknownText_0x7a0f0
@@ -610,7 +561,6 @@
disappear $7
dotrigger $2
end
-; 0x78f33
ElmsLabWindow:
loadfont
@@ -625,7 +575,6 @@
closetext
loadmovesprites
end
-; 0x78f49
.Normal
writetext ElmsLabWindowText1
@@ -632,7 +581,6 @@
closetext
loadmovesprites
end
-; 0x78f4f
ElmsLabTravelTip1:
jumptext ElmsLabTravelTip1Text
@@ -649,9 +597,8 @@
ElmsLabTrashcan:
jumptext ElmsLabTrashcanText
-ElmsLabPC: ; 0x78f5e
+ElmsLabPC:
jumptext ElmsLabPCText
-; 0x78f61
ElmsLabTrashcan2:
; unused
@@ -660,7 +607,7 @@
ElmsLabBookshelf:
jumpstd difficultbookshelf
-MovementData_0x78f67: ; 0x78f67
+MovementData_0x78f67:
step_up
step_up
step_up
@@ -670,26 +617,22 @@
step_up
turn_head_left
step_end
-; 0x78f70
-MovementData_0x78f70: ; 0x78f70
+MovementData_0x78f70:
step_up
step_end
-; 0x78f72
-MovementData_0x78f72: ; 0x78f72
+MovementData_0x78f72:
step_left
step_end
-; 0x78f74
-MovementData_0x78f74: ; 0x78f74
+MovementData_0x78f74:
step_up
step_up
turn_head_right
step_end
-; 0x78f78
-MovementData_0x78f78: ; 0x78f78
+MovementData_0x78f78:
step_down
step_down
step_down
@@ -696,95 +639,82 @@
step_down
step_down
step_end
-; 0x78f7e
-MovementData_0x78f7e: ; 0x78f7e
+MovementData_0x78f7e:
step_right
step_right
turn_head_up
step_end
-; 0x78f82
-MovementData_0x78f82: ; 0x78f82
+MovementData_0x78f82:
step_right
step_right
step_right
turn_head_up
step_end
-; 0x78f87
-MovementData_0x78f87: ; 0x78f87
+MovementData_0x78f87:
step_left
step_left
turn_head_down
step_end
-; 0x78f8b
-MovementData_0x78f8b: ; 0x78f8b
+MovementData_0x78f8b:
step_left
step_left
step_left
turn_head_down
step_end
-; 0x78f90
-MovementData_0x78f90: ; 0x78f90
+MovementData_0x78f90:
fix_facing
big_step_up
remove_fixed_facing
step_end
-; 0x78f94
-MovementData_0x78f94: ; 0x78f94
+MovementData_0x78f94:
fix_facing
big_step_down
remove_fixed_facing
step_end
-; 0x78f98
-MovementData_0x78f98: ; 0x78f98
+MovementData_0x78f98:
fix_facing
big_step_left
remove_fixed_facing
step_end
-; 0x78f9c
-MovementData_0x78f9c: ; 0x78f9c
+MovementData_0x78f9c:
fix_facing
big_step_right
remove_fixed_facing
step_end
-; 0x78fa0
-MovementData_0x78fa0: ; 0x78fa0
+MovementData_0x78fa0:
step_up
step_end
-; 0x78fa2
-MovementData_0x78fa2: ; 0x78fa2
+MovementData_0x78fa2:
step_right
step_right
step_up
turn_head_down
step_end
-; 0x78fa7
-AfterCyndaquilMovement: ; 0x78fa7
+AfterCyndaquilMovement:
step_left
step_up
turn_head_up
step_end
-; 0x78fab
-AfterTotodileMovement: ; 0x78fab
+AfterTotodileMovement:
step_left
step_left
step_up
turn_head_up
step_end
-; 0x78fb0
-AfterChikoritaMovement: ; 0x78fb0
+AfterChikoritaMovement:
step_left
step_left
step_left
@@ -791,9 +721,8 @@
step_up
turn_head_up
step_end
-; 0x78fb6
-UnknownText_0x78fb6: ; 0x78fb6
+UnknownText_0x78fb6:
text "ELM: <PLAY_G>!"
line "There you are!"
@@ -831,23 +760,20 @@
para "that I recently"
line "caught."
done
-; 0x790fa
-UnknownText_0x790fa: ; 0x790fa
+UnknownText_0x790fa:
text "Thanks, <PLAY_G>!"
para "You're a great"
line "help!"
done
-; 0x7911a
-UnknownText_0x7911a: ; 0x7911a
+UnknownText_0x7911a:
text "But… Please, I"
line "need your help!"
done
-; 0x7913a
-UnknownText_0x7913a: ; 0x7913a
+UnknownText_0x7913a:
text "When I announce my"
line "findings, I'm sure"
@@ -860,9 +786,8 @@
para "You can count on"
line "it!"
done
-; 0x791ae
-UnknownText_0x791ae: ; 0x791ae
+UnknownText_0x791ae:
text "Oh, hey! I got an"
line "e-mail!"
@@ -871,9 +796,8 @@
para "Okay…"
done
-; 0x791df
-UnknownText_0x791df: ; 0x791df
+UnknownText_0x791df:
text "Hey, listen."
para "I have an acquain-"
@@ -905,9 +829,8 @@
para "<PLAY_G>, can you"
line "go in our place?"
done
-; 0x792ff
-UnknownText_0x792ff: ; 0x792ff
+UnknownText_0x792ff:
text "I want you to"
line "raise one of the"
@@ -920,43 +843,37 @@
para "Go on. Pick one!"
done
-; 0x79375
-UnknownText_0x79375: ; 0x79375
+UnknownText_0x79375:
text "If a wild #MON"
line "appears, let your"
cont "#MON battle it!"
done
-; 0x793a7
-LabWhereGoingText: ; 0x793a7
+LabWhereGoingText:
text "ELM: Wait! Where"
line "are you going?"
done
-; 0x793c8
-TakeCyndaquilText: ; 0x793c8
+TakeCyndaquilText:
text "ELM: You'll take"
line "CYNDAQUIL, the"
cont "fire #MON?"
done
-; 0x793f3
-TakeTotodileText: ; 0x793f3
+TakeTotodileText:
text "ELM: Do you want"
line "TOTODILE, the"
cont "water #MON?"
done
-; 0x7941f
-TakeChikoritaText: ; 0x7941f
+TakeChikoritaText:
text "ELM: So, you like"
line "CHIKORITA, the"
cont "grass #MON?"
done
-; 0x7944d
-DidntChooseStarterText: ; 0x7944d
+DidntChooseStarterText:
text "ELM: Think it over"
line "carefully."
@@ -963,24 +880,21 @@
para "Your partner is"
line "important."
done
-; 0x79487
-ChoseStarterText: ; 0x79487
+ChoseStarterText:
text "ELM: I think"
line "that's a great"
cont "#MON too!"
done
-; 0x794ad
-ReceivedStarterText: ; 0x794ad
+ReceivedStarterText:
text "<PLAYER> received"
line "@"
text_from_ram StringBuffer3
text "!"
done
-; 0x794c0
-ElmDirectionsText1: ; 0x794c0
+ElmDirectionsText1:
text "MR.#MON lives a"
line "little bit beyond"
@@ -1000,7 +914,7 @@
line "anything comes up!"
done
-ElmDirectionsText2: ; 0x79581
+ElmDirectionsText2:
text "If your #MON is"
line "hurt, you should"
@@ -1011,17 +925,17 @@
line "it anytime."
done
-ElmDirectionsText3: ; 0x795db
+ElmDirectionsText3:
text "<PLAY_G>, I'm"
line "counting on you!"
done
-GotElmsNumberText: ; 0x795f3
+GotElmsNumberText:
text "<PLAYER> got ELM's"
line "phone number."
done
-ElmDescribesMrPokemonText: ; 0x7960d
+ElmDescribesMrPokemonText:
text "MR.#MON goes"
line "everywhere and"
cont "finds rarities."
@@ -1031,7 +945,7 @@
cont "not very useful…"
done
-ElmPokeBallText: ; 0x79668
+ElmPokeBallText:
text "It contains a"
line "#MON caught by"
cont "PROF.ELM."
@@ -1047,7 +961,7 @@
line "heal your #MON?"
done
-ElmAfterTheftText1: ; 0x796cd
+ElmAfterTheftText1:
text "ELM: <PLAY_G>, this"
line "is terrible…"
@@ -1055,21 +969,18 @@
line "MR.#MON's big"
cont "discovery?"
done
-; 0x79712
-ElmAfterTheftText2: ; 0x79712
+ElmAfterTheftText2:
text "<PLAYER> handed"
line "the MYSTERY EGG to"
cont "PROF.ELM."
done
-; 0x79739
-ElmAfterTheftText3: ; 0x79739
+ElmAfterTheftText3:
text "ELM: This?"
done
-; 0x79745
-ElmAfterTheftText4: ; 0x79745
+ElmAfterTheftText4:
text "But… Is it a"
line "#MON EGG?"
@@ -1076,9 +987,8 @@
para "If it is, it is a"
line "great discovery!"
done
-; 0x79780
-ElmAfterTheftText5: ; 0x79780
+ElmAfterTheftText5:
text "ELM: What?!?"
para "PROF.OAK gave you"
@@ -1111,9 +1021,8 @@
line "would be the one"
cont "in VIOLET CITY."
done
-; 0x798cf
-ElmAfterTheftText6: ; 0x798cf
+ElmAfterTheftText6:
text "…<PLAY_G>. The"
line "road to the"
@@ -1124,9 +1033,8 @@
line "make sure that you"
cont "talk to your mom."
done
-; 0x7993c
-ElmStudyingEggText: ; 0x7993c
+ElmStudyingEggText:
text "ELM: Don't give"
line "up! I'll call if"
@@ -1133,9 +1041,8 @@
para "I learn anything"
line "about that EGG!"
done
-; 0x7997d
-ElmAideHasEggText: ; 0x7997d
+ElmAideHasEggText:
text "ELM: <PLAY_G>?"
line "Didn't you meet my"
cont "assistant?"
@@ -1150,15 +1057,13 @@
line "missed him. Try to"
cont "catch him there."
done
-; 0x79a1b
-ElmWaitingEggHatchText: ; 0x79a1b
+ElmWaitingEggHatchText:
text "ELM: Hey, has that"
line "EGG changed any?"
done
-; 0x79a40
-UnknownText_0x79a40: ; 0x79a40
+UnknownText_0x79a40:
text "<PLAY_G>? I thought"
line "the EGG hatched."
@@ -1165,21 +1070,18 @@
para "Where is the"
line "#MON?"
done
-; 0x79a72
-ShowElmTogepiText1: ; 0x79a72
+ShowElmTogepiText1:
text "ELM: <PLAY_G>, you"
line "look great!"
done
-; 0x79a8b
-ShowElmTogepiText2: ; 0x79a8b
+ShowElmTogepiText2:
text "What?"
line "That #MON!?!"
done
-; 0x79a9f
-ShowElmTogepiText3: ; 0x79a9f
+ShowElmTogepiText3:
text "The EGG hatched!"
line "So, #MON are"
cont "born from EGGS…"
@@ -1191,9 +1093,8 @@
line "a lot of research"
cont "to be done."
done
-; 0x79b1c
-ElmGiveEverstoneText1: ; 0x79b1c
+ElmGiveEverstoneText1:
text "Thanks, <PLAY_G>!"
line "You're helping"
@@ -1204,9 +1105,8 @@
line "this as a token of"
cont "our appreciation."
done
-; 0x79b8d
-ElmGiveEverstoneText2: ; 0x79b8d
+ElmGiveEverstoneText2:
text "That's an"
line "EVERSTONE."
@@ -1224,16 +1124,14 @@
line "MON you don't want"
cont "to evolve."
done
-; 0x79c37
-UnknownText_0x79c37: ; 0x79c37
+UnknownText_0x79c37:
text "ELM: <PLAY_G>, I'll"
line "call you if any-"
cont "thing comes up."
done
-; 0x79c65
-UnknownText_0x79c65: ; 0x79c65
+UnknownText_0x79c65:
text "…sigh… That"
line "stolen #MON."
@@ -1246,9 +1144,8 @@
para "person turns bad"
line "itself."
done
-; 0x79cd0
-ElmGiveMasterBallText1: ; 0x79cd0
+ElmGiveMasterBallText1:
text "ELM: Hi, <PLAY_G>!"
line "Thanks to you, my"
@@ -1259,9 +1156,8 @@
line "token of my"
cont "appreciation."
done
-; 0x79d31
-ElmGiveMasterBallText2: ; 0x79d31
+ElmGiveMasterBallText2:
text "The MASTER BALL is"
line "the best!"
@@ -1281,9 +1177,8 @@
para "use of it than I"
line "can, <PLAY_G>!"
done
-; 0x79df3
-ElmGiveTicketText1: ; 0x79df3
+ElmGiveTicketText1:
text "ELM: <PLAY_G>!"
line "There you are!"
@@ -1297,9 +1192,8 @@
para "Now you can catch"
line "#MON in KANTO."
done
-; 0x79e6f
-ElmGiveTicketText2: ; 0x79e6f
+ElmGiveTicketText2:
text "The ship departs"
line "from OLIVINE CITY."
@@ -1313,30 +1207,26 @@
para "Give my regards to"
line "PROF.OAK in KANTO!"
done
-; 0x79f0b
-UnknownText_0x79f0b: ; 0x79f0b
+UnknownText_0x79f0b:
text "It's the #MON"
line "EGG being studied"
cont "by PROF.ELM."
done
-; 0x79f38
-UnknownText_0x79f38: ; 0x79f38
+UnknownText_0x79f38:
text "<PLAY_G>, I want"
line "you to have this"
cont "for your errand."
done
-; 0x79f65
-UnknownText_0x79f65: ; 0x79f65
+UnknownText_0x79f65:
text "There are only two"
line "of us, so we're"
cont "always busy."
done
-; 0x79f95
-UnknownText_0x79f95: ; 0x79f95
+UnknownText_0x79f95:
text "There was a loud"
line "noise outside…"
@@ -1360,17 +1250,15 @@
para "person turns bad"
line "itself."
done
-; 0x7a078
-UnknownText_0x7a078: ; 0x7a078
+UnknownText_0x7a078:
text "<PLAY_G>!"
para "Use these on your"
line "#DEX quest!"
done
-; 0x7a09a
-UnknownText_0x7a09a: ; 0x7a09a
+UnknownText_0x7a09a:
text "To add to your"
line "#DEX, you have"
cont "to catch #MON."
@@ -1379,9 +1267,8 @@
line "at wild #MON"
cont "to get them."
done
-; 0x7a0f0
-UnknownText_0x7a0f0: ; 0x7a0f0
+UnknownText_0x7a0f0:
text "I heard a #MON"
line "was stolen here…"
@@ -1401,9 +1288,8 @@
para "Did you happen to"
line "get his name?"
done
-; 0x7a1c0
-UnknownText_0x7a1c0: ; 0x7a1c0
+UnknownText_0x7a1c0:
text "OK! So <RIVAL>"
line "was his name."
@@ -1410,7 +1296,6 @@
para "Thanks for helping"
line "my investigation!"
done
-; 0x7a1fd
ElmsLabWindowText1:
text "The window's open."
@@ -1482,7 +1367,7 @@
line "screen…"
done
-ElmsLab_MapEventHeader: ; 0x7a3de
+ElmsLab_MapEventHeader:
; filler
db 0, 0
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -1,4 +1,4 @@
-FastShip1F_MapScriptHeader: ; 0x75127
+FastShip1F_MapScriptHeader:
; trigger count
db 3
@@ -9,22 +9,18 @@
; callback count
db 0
-; 0x75135
-UnknownScript_0x75135: ; 0x75135
+UnknownScript_0x75135:
end
-; 0x75136
-UnknownScript_0x75136: ; 0x75136
+UnknownScript_0x75136:
priorityjump UnknownScript_0x7513b
end
-; 0x7513a
-UnknownScript_0x7513a: ; 0x7513a
+UnknownScript_0x7513a:
end
-; 0x7513b
-UnknownScript_0x7513b: ; 0x7513b
+UnknownScript_0x7513b:
applymovement $2, MovementData_0x7520e
applymovement $0, MovementData_0x75217
applymovement $2, MovementData_0x75211
@@ -37,14 +33,12 @@
iftrue UnknownScript_0x7515d
dotrigger $2
end
-; 0x7515d
-UnknownScript_0x7515d: ; 0x7515d
+UnknownScript_0x7515d:
dotrigger $0
end
-; 0x75160
-SailorScript_0x75160: ; 0x75160
+SailorScript_0x75160:
faceplayer
loadfont
checkevent $0031
@@ -55,16 +49,14 @@
closetext
loadmovesprites
end
-; 0x75174
-UnknownScript_0x75174: ; 0x75174
+UnknownScript_0x75174:
writetext UnknownText_0x7529b
closetext
loadmovesprites
end
-; 0x7517a
-UnknownScript_0x7517a: ; 0x7517a
+UnknownScript_0x7517a:
checkevent $002f
iftrue UnknownScript_0x7519c
writetext UnknownText_0x754be
@@ -78,9 +70,8 @@
domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1
warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11
end
-; 0x7519c
-UnknownScript_0x7519c: ; 0x7519c
+UnknownScript_0x7519c:
writetext UnknownText_0x7548d
closetext
loadmovesprites
@@ -92,23 +83,20 @@
domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1
warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17
end
-; 0x751b8
-UnknownScript_0x751b8: ; 0x751b8
+UnknownScript_0x751b8:
checkcode VAR_FACING
if_equal $3, UnknownScript_0x751c7
applymovement $2, MovementData_0x7520e
applymovement $0, MovementData_0x75235
end
-; 0x751c7
-UnknownScript_0x751c7: ; 0x751c7
+UnknownScript_0x751c7:
applymovement $2, MovementData_0x75214
applymovement $0, MovementData_0x75238
end
-; 0x751d0
-SailorScript_0x751d0: ; 0x751d0
+SailorScript_0x751d0:
faceplayer
loadfont
checkevent $0030
@@ -117,24 +105,20 @@
closetext
loadmovesprites
end
-; 0x751de
-UnknownScript_0x751de: ; 0x751de
+UnknownScript_0x751de:
writetext UnknownText_0x7534f
closetext
loadmovesprites
end
-; 0x751e4
-SailorScript_0x751e4: ; 0x751e4
+SailorScript_0x751e4:
jumptextfaceplayer UnknownText_0x753c0
-; 0x751e7
-UnknownScript_0x751e7: ; 0x751e7
+UnknownScript_0x751e7:
moveperson $5, $14, $6
-; 0x751eb
-UnknownScript_0x751eb: ; 0x751eb
+UnknownScript_0x751eb:
appear $5
applymovement $5, MovementData_0x7521b
playsound SFX_TACKLE
@@ -149,47 +133,40 @@
disappear $5
dotrigger $0
end
-; 0x7520e
-MovementData_0x7520e: ; 0x7520e
+MovementData_0x7520e:
slow_step_left
turn_head_right
step_end
-; 0x75211
-MovementData_0x75211: ; 0x75211
+MovementData_0x75211:
slow_step_right
turn_head_down
step_end
-; 0x75214
-MovementData_0x75214: ; 0x75214
+MovementData_0x75214:
slow_step_down
turn_head_up
step_end
-; 0x75217
-MovementData_0x75217: ; 0x75217
+MovementData_0x75217:
step_down
step_down
turn_head_down
step_end
-; 0x7521b
-MovementData_0x7521b: ; 0x7521b
+MovementData_0x7521b:
big_step_right
big_step_right
big_step_right
big_step_right
step_end
-; 0x75220
-MovementData_0x75220: ; 0x75220
+MovementData_0x75220:
step_right
step_end
-; 0x75222
-MovementData_0x75222: ; 0x75222
+MovementData_0x75222:
big_step_down
big_step_right
big_step_right
@@ -202,37 +179,31 @@
big_step_down
big_step_down
step_end
-; 0x7522e
-MovementData_0x7522e: ; 0x7522e
+MovementData_0x7522e:
big_step_right
turn_head_left
step_end
-; 0x75231
-MovementData_0x75231: ; 0x75231
+MovementData_0x75231:
step_up
step_end
-; 0x75233
-MovementData_0x75233: ; 0x75233
+MovementData_0x75233:
step_down
step_end
-; 0x75235
-MovementData_0x75235: ; 0x75235
+MovementData_0x75235:
step_up
step_up
step_end
-; 0x75238
-MovementData_0x75238: ; 0x75238
+MovementData_0x75238:
step_right
step_up
step_end
-; 0x7523b
-UnknownText_0x7523b: ; 0x7523b
+UnknownText_0x7523b:
text "FAST SHIP S.S.AQUA"
line "is en route to"
cont "VERMILION CITY."
@@ -241,9 +212,8 @@
line "announcement when"
cont "we arrive."
done
-; 0x7529b
-UnknownText_0x7529b: ; 0x7529b
+UnknownText_0x7529b:
text "FAST SHIP S.S.AQUA"
line "is en route to"
cont "OLIVINE CITY."
@@ -252,9 +222,8 @@
line "announcement when"
cont "we arrive."
done
-; 0x752f9
-UnknownText_0x752f9: ; 0x752f9
+UnknownText_0x752f9:
text "Here's your cabin."
para "If your #MON"
@@ -264,9 +233,8 @@
para "That will heal"
line "them."
done
-; 0x7534f
-UnknownText_0x7534f: ; 0x7534f
+UnknownText_0x7534f:
text "Here's your cabin."
para "You can heal your"
@@ -277,9 +245,8 @@
line "arrive while"
cont "you're sleeping."
done
-; 0x753c0
-UnknownText_0x753c0: ; 0x753c0
+UnknownText_0x753c0:
text "The passengers are"
line "all trainers."
@@ -287,9 +254,8 @@
line "ing to battle in"
cont "their cabins."
done
-; 0x75412
-UnknownText_0x75412: ; 0x75412
+UnknownText_0x75412:
text "Whoa! Excuse me."
line "I was in a hurry!"
@@ -302,23 +268,20 @@
para "her, please let me"
line "know!"
done
-; 0x7548d
-UnknownText_0x7548d: ; 0x7548d
+UnknownText_0x7548d:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "OLIVINE CITY."
done
-; 0x754be
-UnknownText_0x754be: ; 0x754be
+UnknownText_0x754be:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "VERMILION CITY."
done
-; 0x754f1
-FastShip1F_MapEventHeader: ; 0x754f1
+FastShip1F_MapEventHeader:
; filler
db 0, 0
@@ -351,4 +314,3 @@
person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, $ffff
person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, $ffff
person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, $072c
-; 0x75577
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -1,28 +1,23 @@
-FightingDojo_MapScriptHeader: ; 0x189b5f
+FightingDojo_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x189b61
-BlackBeltScript_0x189b61: ; 0x189b61
+BlackBeltScript_0x189b61:
jumptextfaceplayer UnknownText_0x189b6c
-; 0x189b64
-MapFightingDojoSignpost0Script: ; 0x189b64
+MapFightingDojoSignpost0Script:
jumptext UnknownText_0x189bc0
-; 0x189b67
-MapFightingDojoSignpost1Script: ; 0x189b67
+MapFightingDojoSignpost1Script:
jumptext UnknownText_0x189be0
-; 0x189b6a
-ItemFragment_0x189b6a: ; 0x189b6a
+ItemFragment_0x189b6a:
db FOCUS_BAND, 1
-; 0x189b6c
-UnknownText_0x189b6c: ; 0x189b6c
+UnknownText_0x189b6c:
text "Hello!"
para "KARATE KING, the"
@@ -32,21 +27,18 @@
line "cave in JOHTO for"
cont "training."
done
-; 0x189bc0
-UnknownText_0x189bc0: ; 0x189bc0
+UnknownText_0x189bc0:
text "What goes around"
line "comes around!"
done
-; 0x189be0
-UnknownText_0x189be0: ; 0x189be0
+UnknownText_0x189be0:
text "Enemies on every"
line "side!"
done
-; 0x189bf8
-FightingDojo_MapEventHeader: ; 0x189bf8
+FightingDojo_MapEventHeader:
; filler
db 0, 0
@@ -67,4 +59,3 @@
db 2
person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, $ffff
person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, $077d
-; 0x189c2c
--- a/maps/FuchsiaBillSpeechHouse.asm
+++ b/maps/FuchsiaBillSpeechHouse.asm
@@ -1,34 +1,29 @@
-FuchsiaBillSpeechHouse_MapScriptHeader: ; 0x1963bb
+FuchsiaBillSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1963bd
-PokefanFScript_0x1963bd: ; 0x1963bd
+PokefanFScript_0x1963bd:
jumptextfaceplayer UnknownText_0x1963c3
-; 0x1963c0
-YoungsterScript_0x1963c0: ; 0x1963c0
+YoungsterScript_0x1963c0:
jumptextfaceplayer UnknownText_0x1963f9
-; 0x1963c3
-UnknownText_0x1963c3: ; 0x1963c3
+UnknownText_0x1963c3:
text "My grandpa is at "
line "my brother BILL's"
cont "on CERULEAN CAPE."
done
-; 0x1963f9
-UnknownText_0x1963f9: ; 0x1963f9
+UnknownText_0x1963f9:
text "I saw these weird,"
line "slow #MON on"
cont "CYCLING ROAD."
done
-; 0x196428
-FuchsiaBillSpeechHouse_MapEventHeader: ; 0x196428
+FuchsiaBillSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -47,4 +42,3 @@
db 2
person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, $ffff
person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, $ffff
-; 0x196452
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -1,27 +1,23 @@
-FuchsiaMart_MapScriptHeader: ; 0x195ce6
+FuchsiaMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x195ce8
-ClerkScript_0x195ce8: ; 0x195ce8
+ClerkScript_0x195ce8:
loadfont
pokemart $0, $001d
loadmovesprites
end
-; 0x195cef
-FisherScript_0x195cef: ; 0x195cef
+FisherScript_0x195cef:
jumptextfaceplayer UnknownText_0x195cf5
-; 0x195cf2
-CooltrainerFScript_0x195cf2: ; 0x195cf2
+CooltrainerFScript_0x195cf2:
jumptextfaceplayer UnknownText_0x195d36
-; 0x195cf5
-UnknownText_0x195cf5: ; 0x195cf5
+UnknownText_0x195cf5:
text "I was hoping to"
line "buy some SAFARI"
@@ -28,17 +24,15 @@
para "ZONE souvenirs,"
line "but it's closed…"
done
-; 0x195d36
-UnknownText_0x195d36: ; 0x195d36
+UnknownText_0x195d36:
text "The SAFARI ZONE"
line "WARDEN's grand-"
cont "daughter lives in"
cont "town."
done
-; 0x195d6e
-FuchsiaMart_MapEventHeader: ; 0x195d6e
+FuchsiaMart_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +52,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, $ffff
person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, $ffff
person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, $ffff
-; 0x195da5
--- a/maps/FuchsiaPokeCenter1F.asm
+++ b/maps/FuchsiaPokeCenter1F.asm
@@ -1,4 +1,4 @@
-FuchsiaPokeCenter1F_MapScriptHeader: ; 0x196452
+FuchsiaPokeCenter1F_MapScriptHeader:
; trigger count
db 1
@@ -7,25 +7,20 @@
; callback count
db 0
-; 0x196458
-UnknownScript_0x196458: ; 0x196458
+UnknownScript_0x196458:
end
-; 0x196459
-NurseScript_0x196459: ; 0x196459
+NurseScript_0x196459:
jumpstd pokecenternurse
-; 0x19645c
-CooltrainerMScript_0x19645c: ; 0x19645c
+CooltrainerMScript_0x19645c:
jumptextfaceplayer UnknownText_0x196494
-; 0x19645f
-CooltrainerFScript_0x19645f: ; 0x19645f
+CooltrainerFScript_0x19645f:
jumptextfaceplayer UnknownText_0x1964dc
-; 0x196462
-JanineImpersonatorScript_0x196462: ; 0x196462
+JanineImpersonatorScript_0x196462:
faceplayer
loadfont
writetext UnknownText_0x19652e
@@ -44,9 +39,8 @@
variablesprite $c, $28
special Function14209
end
-; 0x196486
-MovementData_0x196486: ; 0x196486
+MovementData_0x196486:
turn_head_down
turn_head_left
turn_head_up
@@ -61,9 +55,8 @@
turn_head_right
turn_head_down
step_end
-; 0x196494
-UnknownText_0x196494: ; 0x196494
+UnknownText_0x196494:
text "Hey! You have a"
line "brand new kind of"
cont "#DEX."
@@ -71,9 +64,8 @@
para "Did PROF.OAK give"
line "that to you?"
done
-; 0x1964dc
-UnknownText_0x1964dc: ; 0x1964dc
+UnknownText_0x1964dc:
text "I got quite a"
line "shock at the GYM."
@@ -81,21 +73,18 @@
line "these girls who"
cont "looked identical."
done
-; 0x19652e
-UnknownText_0x19652e: ; 0x19652e
+UnknownText_0x19652e:
text "I'm JANINE! Hocus-"
line "pocus… Poof!"
done
-; 0x19654e
-UnknownText_0x19654e: ; 0x19654e
+UnknownText_0x19654e:
text "See? I look just"
line "like her now!"
done
-; 0x19656e
-FuchsiaPokeCenter1F_MapEventHeader: ; 0x19656e
+FuchsiaPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -117,4 +106,3 @@
person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, $ffff
person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, $ffff
person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, $ffff
-; 0x1965b7
--- a/maps/FuchsiaPokeCenter2FBeta.asm
+++ b/maps/FuchsiaPokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-FuchsiaPokeCenter2FBeta_MapScriptHeader: ; 0x1965b7
+FuchsiaPokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1965b9
-FuchsiaPokeCenter2FBeta_MapEventHeader: ; 0x1965b9
+FuchsiaPokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x1965c4
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -1,16 +1,14 @@
-GoldenrodBikeShop_MapScriptHeader: ; 0x5474d
+GoldenrodBikeShop_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5474f
-UnknownScript_0x5474f: ; 0x5474f
+UnknownScript_0x5474f:
end
-; 0x54750
-ClerkScript_0x54750: ; 0x54750
+ClerkScript_0x54750:
faceplayer
loadfont
checkevent EVENT_GOT_BICYCLE
@@ -28,30 +26,26 @@
itemnotify
setflag $0014
setevent EVENT_GOT_BICYCLE
-UnknownScript_0x54775: ; 0x54775
+UnknownScript_0x54775:
writetext UnknownText_0x5485f
closetext
loadmovesprites
end
-; 0x5477b
-UnknownScript_0x5477b: ; 0x5477b
+UnknownScript_0x5477b:
writetext UnknownText_0x54898
closetext
loadmovesprites
end
-; 0x54781
; possibly unused
-UnknownScript_0x54781: ; 0x54781
+UnknownScript_0x54781:
jumptext UnknownText_0x548c0
-; 0x54784
-MapGoldenrodBikeShopSignpost8Script: ; 0x54784
+MapGoldenrodBikeShopSignpost8Script:
jumptext UnknownText_0x548ed
-; 0x54787
-UnknownText_0x54787: ; 0x54787
+UnknownText_0x54787:
text "…sigh… I moved"
line "here, but I can't"
@@ -62,9 +56,8 @@
line "BICYCLE and adver-"
cont "tise for me?"
done
-; 0x547f8
-UnknownText_0x547f8: ; 0x547f8
+UnknownText_0x547f8:
text "Really? Great!"
para "Give me your name"
@@ -73,15 +66,13 @@
para "and I'll loan you"
line "a BICYCLE."
done
-; 0x54848
-UnknownText_0x54848: ; 0x54848
+UnknownText_0x54848:
text "<PLAYER> borrowed a"
line "BICYCLE."
done
-; 0x5485f
-UnknownText_0x5485f: ; 0x5485f
+UnknownText_0x5485f:
text "My BICYCLES are"
line "first-rate! You"
@@ -88,31 +79,27 @@
para "can ride them"
line "anywhere."
done
-; 0x54898
-UnknownText_0x54898: ; 0x54898
+UnknownText_0x54898:
text "…sigh… Oh, for"
line "the kindness of"
cont "people…"
done
-; 0x548c0
; possibly unused
-UnknownText_0x548c0: ; 0x548c0
+UnknownText_0x548c0:
text "Just released!"
para "First-rate compact"
line "BICYCLES!"
done
-; 0x548ed
-UnknownText_0x548ed: ; 0x548ed
+UnknownText_0x548ed:
text "It's a shiny new"
line "BICYCLE!"
done
-; 0x54907
-GoldenrodBikeShop_MapEventHeader: ; 0x54907
+GoldenrodBikeShop_MapEventHeader:
; filler
db 0, 0
@@ -139,4 +126,3 @@
; people-events
db 1
person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, $ffff
-; 0x54951
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -1,10 +1,9 @@
-GoldenrodBillsHouse_MapScriptHeader: ; 0x54be2
+GoldenrodBillsHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x54be4
BillsHouseBill:
faceplayer
@@ -28,30 +27,26 @@
closetext
loadmovesprites
end
-; 0x54c13
-UnknownScript_0x54c13: ; 0x54c13
+UnknownScript_0x54c13:
writetext UnknownText_0x54e02
closetext
loadmovesprites
end
-; 0x54c19
-UnknownScript_0x54c19: ; 0x54c19
+UnknownScript_0x54c19:
writetext UnknownText_0x54e2d
closetext
loadmovesprites
end
-; 0x54c1f
-UnknownScript_0x54c1f: ; 0x54c1f
+UnknownScript_0x54c1f:
writetext UnknownText_0x54e42
closetext
loadmovesprites
end
-; 0x54c25
-BillsMom: ; 0x54c25
+BillsMom:
faceplayer
loadfont
checkevent $0712
@@ -60,14 +55,12 @@
closetext
loadmovesprites
end
-; 0x54c33
-UnknownScript_0x54c33: ; 0x54c33
+UnknownScript_0x54c33:
writetext UnknownText_0x54f4e
closetext
loadmovesprites
end
-; 0x54c39
BillsSister:
faceplayer
@@ -89,20 +82,17 @@
closetext
loadmovesprites
end
-; 0x54c5e
-UnknownScript_0x54c5e: ; 0x54c5e
+UnknownScript_0x54c5e:
writetext UnknownText_0x54ff3
closetext
loadmovesprites
end
-; 0x54c64
-UnknownScript_0x54c64: ; 0x54c64
+UnknownScript_0x54c64:
writetext UnknownText_0x55046
keeptextopen
jump UnknownScript_0x54c5e
-; 0x54c6b
BillsHouseBookshelf1:
jumpstd picturebookshelf
@@ -113,7 +103,7 @@
BillsHouseRadio:
jumpstd radio2
-UnknownText_0x54c74: ; 0x54c74
+UnknownText_0x54c74:
text "BILL: Hi, <PLAYER>!"
line "Do us a favor and"
cont "take this EEVEE."
@@ -132,9 +122,8 @@
line "to play with it,"
cont "<PLAYER>?"
done
-; 0x54d3f
-UnknownText_0x54d3f: ; 0x54d3f
+UnknownText_0x54d3f:
text "BILL: I knew you'd"
line "come through!"
@@ -147,15 +136,13 @@
para "Take good care of"
line "it!"
done
-; 0x54dae
-UnknownText_0x54dae: ; 0x54dae
+UnknownText_0x54dae:
text "<PLAYER> received"
line "EEVEE!"
done
-; 0x54dc1
-UnknownText_0x54dc1: ; 0x54dc1
+UnknownText_0x54dc1:
text "BILL: PROF.ELM"
line "claims EEVEE may"
@@ -162,22 +149,19 @@
para "evolve in new and"
line "unknown ways."
done
-; 0x54e02
-UnknownText_0x54e02: ; 0x54e02
+UnknownText_0x54e02:
text "Whoa, wait. You"
line "can't carry any"
cont "more #MON."
done
-; 0x54e2d
-UnknownText_0x54e2d: ; 0x54e2d
+UnknownText_0x54e2d:
text "Oh… Now what to"
line "do?"
done
-; 0x54e42
-UnknownText_0x54e42: ; 0x54e42
+UnknownText_0x54e42:
text "BILL: My pop, he"
line "won't work. All he"
@@ -187,9 +171,8 @@
para "He's getting to be"
line "a real headache…"
done
-; 0x54ea8
-UnknownText_0x54ea8: ; 0x54ea8
+UnknownText_0x54ea8:
text "Oh, you collect"
line "#MON? My son"
cont "BILL is an expert."
@@ -206,9 +189,8 @@
para "CORNER without"
line "being called…"
done
-; 0x54f4e
-UnknownText_0x54f4e: ; 0x54f4e
+UnknownText_0x54f4e:
text "My husband was"
line "once known as a"
@@ -218,9 +200,8 @@
para "taken after his"
line "father."
done
-; 0x54f9e
-UnknownText_0x54f9e: ; 0x54f9e
+UnknownText_0x54f9e:
text "Are you a trainer?"
para "I've got a useful"
@@ -227,15 +208,13 @@
line "phone number for"
cont "you."
done
-; 0x54fd9
-UnknownText_0x54fd9: ; 0x54fd9
+UnknownText_0x54fd9:
text "<PLAYER> recorded"
line "BILL's number."
done
-; 0x54ff3
-UnknownText_0x54ff3: ; 0x54ff3
+UnknownText_0x54ff3:
text "My brother made"
line "the PC #MON"
cont "storage system."
@@ -244,15 +223,13 @@
line "give you BILL's"
cont "number…"
done
-; 0x55046
-UnknownText_0x55046: ; 0x55046
+UnknownText_0x55046:
text "You can't record"
line "any more numbers."
done
-; 0x55069
-UnknownText_0x55069: ; 0x55069
+UnknownText_0x55069:
text "My big brother"
line "BILL made the PC"
@@ -259,9 +236,8 @@
para "#MON storage"
line "system."
done
-; 0x5509f
-GoldenrodBillsHouse_MapEventHeader: ; 0x5509f
+GoldenrodBillsHouse_MapEventHeader:
; filler
db 0, 0
@@ -284,4 +260,3 @@
person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillsHouseBill, $0712
person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, $ffff
person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, $ffff
-; 0x550e5
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -1,4 +1,4 @@
-GoldenrodDeptStoreB1F_MapScriptHeader: ; 0x7d779
+GoldenrodDeptStoreB1F_MapScriptHeader:
; trigger count
db 0
@@ -10,20 +10,17 @@
dbw 1, UnknownScript_0x7d781
dbw 5, UnknownScript_0x7d7ac
-; 0x7d781
-UnknownScript_0x7d781: ; 0x7d781
+UnknownScript_0x7d781:
checkevent $004a
iftrue UnknownScript_0x7d78a
jump UnknownScript_0x7d791
-; 0x7d78a
-UnknownScript_0x7d78a: ; 0x7d78a
+UnknownScript_0x7d78a:
changeblock $10, $4, $d
jump UnknownScript_0x7d791
-; 0x7d791
-UnknownScript_0x7d791: ; 0x7d791
+UnknownScript_0x7d791:
checkevent $0305
iftrue UnknownScript_0x7d7a2
checkevent $0306
@@ -30,36 +27,29 @@
iftrue UnknownScript_0x7d7a7
changeblock $a, $8, $d
return
-; 0x7d7a2
-UnknownScript_0x7d7a2: ; 0x7d7a2
+UnknownScript_0x7d7a2:
changeblock $4, $a, $d
return
-; 0x7d7a7
-UnknownScript_0x7d7a7: ; 0x7d7a7
+UnknownScript_0x7d7a7:
changeblock $a, $c, $d
return
-; 0x7d7ac
-UnknownScript_0x7d7ac: ; 0x7d7ac
+UnknownScript_0x7d7ac:
clearevent $0307
return
-; 0x7d7b0
-BlackBeltScript_0x7d7b0: ; 0x7d7b0
+BlackBeltScript_0x7d7b0:
jumptextfaceplayer UnknownText_0x7d7cb
-; 0x7d7b3
-BlackBeltScript_0x7d7b3: ; 0x7d7b3
+BlackBeltScript_0x7d7b3:
jumptextfaceplayer UnknownText_0x7d82c
-; 0x7d7b6
-BlackBeltScript_0x7d7b6: ; 0x7d7b6
+BlackBeltScript_0x7d7b6:
jumptextfaceplayer UnknownText_0x7d875
-; 0x7d7b9
-MachopScript_0x7d7b9: ; 0x7d7b9
+MachopScript_0x7d7b9:
loadfont
writetext UnknownText_0x7d8bb
cry MACHOKE
@@ -66,25 +56,20 @@
closetext
loadmovesprites
end
-; 0x7d7c3
-ItemFragment_0x7d7c3: ; 0x7d7c3
+ItemFragment_0x7d7c3:
db ETHER, 1
-; 0x7d7c5
-ItemFragment_0x7d7c5: ; 0x7d7c5
+ItemFragment_0x7d7c5:
db AMULET_COIN, 1
-; 0x7d7c7
-ItemFragment_0x7d7c7: ; 0x7d7c7
+ItemFragment_0x7d7c7:
db BURN_HEAL, 1
-; 0x7d7c9
-ItemFragment_0x7d7c9: ; 0x7d7c9
+ItemFragment_0x7d7c9:
db ULTRA_BALL, 1
-; 0x7d7cb
-UnknownText_0x7d7cb: ; 0x7d7cb
+UnknownText_0x7d7cb:
text "Hey, kid! You're"
line "holding us up!"
@@ -94,9 +79,8 @@
para "scenes where no"
line "one can see us!"
done
-; 0x7d82c
-UnknownText_0x7d82c: ; 0x7d82c
+UnknownText_0x7d82c:
text "I lose my passion"
line "for work if some-"
cont "one's watching."
@@ -104,9 +88,8 @@
para "Come on, kid,"
line "scoot!"
done
-; 0x7d875
-UnknownText_0x7d875: ; 0x7d875
+UnknownText_0x7d875:
text "Oohah! Oohah!"
para "The stuff on the"
@@ -115,14 +98,12 @@
para "Take it if you"
line "want it!"
done
-; 0x7d8bb
-UnknownText_0x7d8bb: ; 0x7d8bb
+UnknownText_0x7d8bb:
text "MACHOKE: Maaacho!"
done
-; 0x7d8ce
-GoldenrodDeptStoreB1F_MapEventHeader: ; 0x7d8ce
+GoldenrodDeptStoreB1F_MapEventHeader:
; filler
db 0, 0
@@ -148,4 +129,3 @@
person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, $ffff
person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, $ffff
person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, $ffff
-; 0x7d94b
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -1,12 +1,11 @@
-GoldenrodDeptStoreElevator_MapScriptHeader: ; 0x56697
+GoldenrodDeptStoreElevator_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x56699
-MapGoldenrodDeptStoreElevatorSignpost0Script: ; 0x56699
+MapGoldenrodDeptStoreElevatorSignpost0Script:
loadfont
elevator Elevator_0x566e0
loadmovesprites
@@ -28,28 +27,24 @@
clearevent $0305
clearevent $0306
end
-; 0x566cb
-UnknownScript_0x566cb: ; 0x566cb
+UnknownScript_0x566cb:
clearevent $0304
setevent $0305
clearevent $0306
end
-; 0x566d5
-UnknownScript_0x566d5: ; 0x566d5
+UnknownScript_0x566d5:
clearevent $0304
clearevent $0305
setevent $0306
end
-; 0x566df
-UnknownScript_0x566df: ; 0x566df
+UnknownScript_0x566df:
end
-; 0x566e0
-Elevator_0x566e0: ; 0x566e0
+Elevator_0x566e0:
db 7 ; floors
db _B1F, 2, GROUP_GOLDENROD_DEPT_STORE_B1F, MAP_GOLDENROD_DEPT_STORE_B1F
db _1F, 4, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F
@@ -59,10 +54,9 @@
db _5F, 3, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F
db _6F, 2, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F
db $ff ; end
-; 0x566fe
-GoldenrodDeptStoreElevator_MapEventHeader: ; 0x566fe
+GoldenrodDeptStoreElevator_MapEventHeader:
; filler
db 0, 0
@@ -80,4 +74,3 @@
; people-events
db 0
-; 0x56713
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -1,4 +1,4 @@
-GoldenrodDeptStoreRoof_MapScriptHeader: ; 0x56713
+GoldenrodDeptStoreRoof_MapScriptHeader:
; trigger count
db 0
@@ -10,46 +10,39 @@
dbw 1, UnknownScript_0x5671b
dbw 2, UnknownScript_0x5672b
-; 0x5671b
-UnknownScript_0x5671b: ; 0x5671b
+UnknownScript_0x5671b:
checkflag $0061
iftrue UnknownScript_0x56722
return
-; 0x56722
-UnknownScript_0x56722: ; 0x56722
+UnknownScript_0x56722:
changeblock $0, $2, $3f
changeblock $0, $4, $f
return
-; 0x5672b
-UnknownScript_0x5672b: ; 0x5672b
+UnknownScript_0x5672b:
checkflag $0061
iftrue UnknownScript_0x56738
setevent $06f0
clearevent $06f1
return
-; 0x56738
-UnknownScript_0x56738: ; 0x56738
+UnknownScript_0x56738:
clearevent $06f0
setevent $06f1
return
-; 0x5673f
-ClerkScript_0x5673f: ; 0x5673f
+ClerkScript_0x5673f:
loadfont
pokemart $4, $0000
loadmovesprites
end
-; 0x56746
-PokefanFScript_0x56746: ; 0x56746
+PokefanFScript_0x56746:
jumptextfaceplayer UnknownText_0x5677f
-; 0x56749
-FisherScript_0x56749: ; 0x56749
+FisherScript_0x56749:
faceplayer
loadfont
writetext UnknownText_0x567d2
@@ -57,13 +50,11 @@
loadmovesprites
spriteface $4, UP
end
-; 0x56754
-TwinScript_0x56754: ; 0x56754
+TwinScript_0x56754:
jumptextfaceplayer UnknownText_0x56839
-; 0x56757
-SuperNerdScript_0x56757: ; 0x56757
+SuperNerdScript_0x56757:
loadfont
writetext UnknownText_0x56867
closetext
@@ -75,37 +66,29 @@
loadmovesprites
spriteface $6, RIGHT
end
-; 0x5676a
-PokefanMScript_0x5676a: ; 0x5676a
+PokefanMScript_0x5676a:
jumptextfaceplayer UnknownText_0x5688e
-; 0x5676d
-TeacherScript_0x5676d: ; 0x5676d
+TeacherScript_0x5676d:
jumptextfaceplayer UnknownText_0x56901
-; 0x56770
-BugCatcherScript_0x56770: ; 0x56770
+BugCatcherScript_0x56770:
jumptextfaceplayer UnknownText_0x56942
-; 0x56773
-MapGoldenrodDeptStoreRoofSignpost0Script: ; 0x56773
+MapGoldenrodDeptStoreRoofSignpost0Script:
jumptext UnknownText_0x569c3
-; 0x56776
-MapGoldenrodDeptStoreRoofSignpost1Script: ; 0x56776
+MapGoldenrodDeptStoreRoofSignpost1Script:
jumptext UnknownText_0x56a2b
-; 0x56779
-MapGoldenrodDeptStoreRoofSignpost2Script: ; 0x56779
+MapGoldenrodDeptStoreRoofSignpost2Script:
jumptext UnknownText_0x56aa6
-; 0x5677c
-MapGoldenrodDeptStoreRoofSignpost3Script: ; 0x5677c
+MapGoldenrodDeptStoreRoofSignpost3Script:
jumptext UnknownText_0x56b11
-; 0x5677f
-UnknownText_0x5677f: ; 0x5677f
+UnknownText_0x5677f:
text "Whew, I'm tired."
para "I sometimes come"
@@ -114,9 +97,8 @@
para "to take a break"
line "from shopping."
done
-; 0x567d2
-UnknownText_0x567d2: ; 0x567d2
+UnknownText_0x567d2:
text "Pardon? Who says"
line "an adult can't get"
cont "into this?"
@@ -127,27 +109,23 @@
para "collect all the"
line "dolls!"
done
-; 0x56839
-UnknownText_0x56839: ; 0x56839
+UnknownText_0x56839:
text "They have bargain"
line "sales here every"
cont "so often."
done
-; 0x56867
-UnknownText_0x56867: ; 0x56867
+UnknownText_0x56867:
text "Oh, wow!"
done
-; 0x56871
-UnknownText_0x56871: ; 0x56871
+UnknownText_0x56871:
text "Will you quit"
line "bothering me?"
done
-; 0x5688e
-UnknownText_0x5688e: ; 0x5688e
+UnknownText_0x5688e:
text "There's something"
line "I really want, but"
@@ -158,9 +136,8 @@
line "off the BERRIES"
cont "I've collected…"
done
-; 0x56901
-UnknownText_0x56901: ; 0x56901
+UnknownText_0x56901:
text "Oh, everything is"
line "so cheap!"
@@ -167,9 +144,8 @@
para "I bought so much,"
line "my PACK's crammed!"
done
-; 0x56942
-UnknownText_0x56942: ; 0x56942
+UnknownText_0x56942:
text "My #MON always"
line "get paralyzed or"
@@ -182,9 +158,8 @@
para "I wonder if"
line "there's any left?"
done
-; 0x569c3
-UnknownText_0x569c3: ; 0x569c3
+UnknownText_0x569c3:
text "These binoculars"
line "let me see far"
@@ -194,9 +169,8 @@
para "Is it the one with"
line "the green roof?"
done
-; 0x56a2b
-UnknownText_0x56a2b: ; 0x56a2b
+UnknownText_0x56a2b:
text "Hey! Some trainers"
line "are battling on"
cont "the road!"
@@ -208,9 +182,8 @@
line "like battling"
cont "right now!"
done
-; 0x56aa6
-UnknownText_0x56aa6: ; 0x56aa6
+UnknownText_0x56aa6:
text "A FISHER caught a"
line "lot of MAGIKARP…"
@@ -220,9 +193,8 @@
para "Look at the water"
line "going everywhere!"
done
-; 0x56b11
-UnknownText_0x56b11: ; 0x56b11
+UnknownText_0x56b11:
text "A vending machine"
line "for #MON dolls?"
@@ -232,9 +204,8 @@
para "But it's almost"
line "empty…"
done
-; 0x56b6d
-GoldenrodDeptStoreRoof_MapEventHeader: ; 0x56b6d
+GoldenrodDeptStoreRoof_MapEventHeader:
; filler
db 0, 0
@@ -262,4 +233,3 @@
person_event SPRITE_POKEFAN_M, 4, 11, $5, $1, 255, 255, $0, 0, PokefanMScript_0x5676a, $06f0
person_event SPRITE_TEACHER, 7, 9, $2, $11, 255, 255, $a0, 0, TeacherScript_0x5676d, $06f0
person_event SPRITE_BUG_CATCHER, 10, 5, $7, $0, 255, 255, $80, 0, BugCatcherScript_0x56770, $06f0
-; 0x56bf4
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -1,12 +1,11 @@
-GoldenrodFlowerShop_MapScriptHeader: ; 0x5535b
+GoldenrodFlowerShop_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5535d
-TeacherScript_0x5535d: ; 0x5535d
+TeacherScript_0x5535d:
checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x5538f
checkevent EVENT_GOT_SQUIRTBOTTLE
@@ -27,9 +26,8 @@
setevent EVENT_FLORIA_AT_SUDOWOODO
clearevent $0768
end
-; 0x5538f
-UnknownScript_0x5538f: ; 0x5538f
+UnknownScript_0x5538f:
spriteface $2, LEFT
loadfont
writetext UnknownText_0x5552e
@@ -36,21 +34,17 @@
closetext
loadmovesprites
end
-; 0x55399
-UnknownScript_0x55399: ; 0x55399
+UnknownScript_0x55399:
jumptextfaceplayer UnknownText_0x5550d
-; 0x5539c
-UnknownScript_0x5539c: ; 0x5539c
+UnknownScript_0x5539c:
jumptextfaceplayer UnknownText_0x55463
-; 0x5539f
-UnknownScript_0x5539f: ; 0x5539f
+UnknownScript_0x5539f:
jumptextfaceplayer UnknownText_0x553d4
-; 0x553a2
-LassScript_0x553a2: ; 0x553a2
+LassScript_0x553a2:
faceplayer
loadfont
checkevent EVENT_FOUGHT_SUDOWOODO
@@ -64,21 +58,18 @@
setevent $0768
clearevent EVENT_FLORIA_AT_SUDOWOODO
end
-; 0x553bf
-UnknownScript_0x553bf: ; 0x553bf
+UnknownScript_0x553bf:
writetext UnknownText_0x555e6
closetext
loadmovesprites
end
-; 0x553c5
-UnknownScript_0x553c5: ; 0x553c5
+UnknownScript_0x553c5:
writetext UnknownText_0x55604
closetext
loadmovesprites
end
-; 0x553cb
FlowerShopShelf1:
; unused
@@ -92,7 +83,7 @@
; unused
jumpstd radio2
-UnknownText_0x553d4: ; 0x553d4
+UnknownText_0x553d4:
text "Have you seen that"
line "wiggly tree that's"
@@ -108,9 +99,8 @@
para "I'm worried… Isn't"
line "it dangerous?"
done
-; 0x55463
-UnknownText_0x55463: ; 0x55463
+UnknownText_0x55463:
text "Do you want to"
line "borrow the water"
@@ -120,9 +110,8 @@
para "doing anything"
line "dangerous with it."
done
-; 0x554c2
-UnknownText_0x554c2: ; 0x554c2
+UnknownText_0x554c2:
text "Oh, you're better"
line "than WHITNEY…"
@@ -130,22 +119,19 @@
line "then. Here's the"
cont "SQUIRTBOTTLE!"
done
-; 0x5550d
-UnknownText_0x5550d: ; 0x5550d
+UnknownText_0x5550d:
text "Don't do anything"
line "too dangerous!"
done
-; 0x5552e
-UnknownText_0x5552e: ; 0x5552e
+UnknownText_0x5552e:
text "Lalala lalalala."
line "Have plenty of"
cont "water, my lovely!"
done
-; 0x55561
-UnknownText_0x55561: ; 0x55561
+UnknownText_0x55561:
text "When I told my sis"
line "about the jiggly"
@@ -158,21 +144,18 @@
para "lend me her water"
line "bottle…"
done
-; 0x555e6
-UnknownText_0x555e6: ; 0x555e6
+UnknownText_0x555e6:
text "Wow, you beat"
line "WHITNEY? Cool!"
done
-; 0x55604
-UnknownText_0x55604: ; 0x55604
+UnknownText_0x55604:
text "So it really was a"
line "#MON!"
done
-; 0x5561e
-GoldenrodFlowerShop_MapEventHeader: ; 0x5561e
+GoldenrodFlowerShop_MapEventHeader:
; filler
db 0, 0
@@ -191,4 +174,3 @@
db 2
person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, $ffff
person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, $0768
-; 0x55648
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -1,4 +1,4 @@
-GoldenrodGameCorner_MapScriptHeader: ; 0x56bf4
+GoldenrodGameCorner_MapScriptHeader:
; trigger count
db 0
@@ -8,9 +8,8 @@
; callbacks
dbw 2, UnknownScript_0x56bf9
-; 0x56bf9
-UnknownScript_0x56bf9: ; 0x56bf9
+UnknownScript_0x56bf9:
checkevent EVENT_BEAT_ELITE_FOUR
iffalse UnknownScript_0x56c19
checkitem COIN_CASE
@@ -18,20 +17,18 @@
checkcode VAR_WEEKDAY
if_equal WEDNESDAY, UnknownScript_0x56c11
if_equal SATURDAY, UnknownScript_0x56c11
-UnknownScript_0x56c0e: ; 0x56c0e
+UnknownScript_0x56c0e:
appear $d
return
-; 0x56c11
-UnknownScript_0x56c11: ; 0x56c11
+UnknownScript_0x56c11:
checkflag ENGINE_5E
iftrue UnknownScript_0x56c19
disappear $d
UnknownScript_0x56c19: ;0x56c19
return
-; 0x56c1a
-PokefanMScript_0x56c1a: ; 0x56c1a
+PokefanMScript_0x56c1a:
faceplayer
loadfont
writetext UnknownText_0x5718a
@@ -39,13 +36,11 @@
loadmovesprites
spriteface $d, RIGHT
end
-; 0x56c25
-ClerkScript_0x56c25: ; 0x56c25
+ClerkScript_0x56c25:
jumpstd $0032
-; 0x56c28
-ReceptionistScript_0x56c28: ; 0x56c28
+ReceptionistScript_0x56c28:
faceplayer
loadfont
writetext UnknownText_0x56e50
@@ -62,9 +57,8 @@
if_equal $2, UnknownScript_0x56c69
if_equal $3, UnknownScript_0x56c85
jump UnknownScript_0x56cbd
-; 0x56c4d
-UnknownScript_0x56c4d: ; 0x56c4d
+UnknownScript_0x56c4d:
checkcoins 5500
if_equal $2, UnknownScript_0x56cb1
itemtotext TM_THUNDER, $0
@@ -74,9 +68,8 @@
iffalse UnknownScript_0x56cb7
takecoins 5500
jump UnknownScript_0x56ca6
-; 0x56c69
-UnknownScript_0x56c69: ; 0x56c69
+UnknownScript_0x56c69:
checkcoins 5500
if_equal $2, UnknownScript_0x56cb1
itemtotext TM_BLIZZARD, $0
@@ -86,9 +79,8 @@
iffalse UnknownScript_0x56cb7
takecoins 5500
jump UnknownScript_0x56ca6
-; 0x56c85
-UnknownScript_0x56c85: ; 0x56c85
+UnknownScript_0x56c85:
checkcoins 5500
if_equal $2, UnknownScript_0x56cb1
itemtotext TM_FIRE_BLAST, $0
@@ -98,60 +90,52 @@
iffalse UnknownScript_0x56cb7
takecoins 5500
jump UnknownScript_0x56ca6
-; 0x56ca1
-UnknownScript_0x56ca1: ; 0x56ca1
+UnknownScript_0x56ca1:
writetext UnknownText_0x56ea8
yesorno
end
-; 0x56ca6
-UnknownScript_0x56ca6: ; 0x56ca6
+UnknownScript_0x56ca6:
waitbutton
playsound SFX_TRANSACTION
writetext UnknownText_0x56ebd
closetext
jump UnknownScript_0x56c36
-; 0x56cb1
-UnknownScript_0x56cb1: ; 0x56cb1
+UnknownScript_0x56cb1:
writetext UnknownText_0x56ecb
closetext
loadmovesprites
end
-; 0x56cb7
-UnknownScript_0x56cb7: ; 0x56cb7
+UnknownScript_0x56cb7:
writetext UnknownText_0x56ee8
closetext
loadmovesprites
end
-; 0x56cbd
-UnknownScript_0x56cbd: ; 0x56cbd
+UnknownScript_0x56cbd:
writetext UnknownText_0x56f09
closetext
loadmovesprites
end
-; 0x56cc3
-UnknownScript_0x56cc3: ; 0x56cc3
+UnknownScript_0x56cc3:
writetext UnknownText_0x56f35
closetext
loadmovesprites
end
-; 0x56cc9
-MenuDataHeader_0x56cc9: ; 0x56cc9
+MenuDataHeader_0x56cc9:
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
dw MenuData2_0x56cd1
db 1 ; default option
-; 0x56cd1
-MenuData2_0x56cd1: ; 0x56cd1
+MenuData2_0x56cd1:
db $80 ; flags
db 4 ; items
db "TM25 5500@"
@@ -158,10 +142,9 @@
db "TM14 5500@"
db "TM38 5500@"
db "CANCEL@"
-; 0x56d01
-ReceptionistScript_0x56d01: ; 0x56d01
+ReceptionistScript_0x56d01:
faceplayer
loadfont
writetext UnknownText_0x56e50
@@ -168,7 +151,7 @@
closetext
checkitem COIN_CASE
iffalse UnknownScript_0x56cc3
-UnknownScript_0x56d0c: ; 0x56d0c
+UnknownScript_0x56d0c:
writetext UnknownText_0x56e8b
special Function24b25
loadmenudata MenuDataHeader_0x56db0
@@ -178,9 +161,8 @@
if_equal $2, UnknownScript_0x56d54
if_equal $3, UnknownScript_0x56d82
jump UnknownScript_0x56cbd
-; 0x56d26
-UnknownScript_0x56d26: ; 0x56d26
+UnknownScript_0x56d26:
checkcoins 100
if_equal $2, UnknownScript_0x56cb1
checkcode VAR_PARTYCOUNT
@@ -197,9 +179,8 @@
givepoke ABRA, 5, 0, 0
takecoins 100
jump UnknownScript_0x56d0c
-; 0x56d54
-UnknownScript_0x56d54: ; 0x56d54
+UnknownScript_0x56d54:
checkcoins 800
if_equal $2, UnknownScript_0x56cb1
checkcode VAR_PARTYCOUNT
@@ -216,9 +197,8 @@
givepoke CUBONE, 15, 0, 0
takecoins 800
jump UnknownScript_0x56d0c
-; 0x56d82
-UnknownScript_0x56d82: ; 0x56d82
+UnknownScript_0x56d82:
checkcoins 1500
if_equal $2, UnknownScript_0x56cb1
checkcode VAR_PARTYCOUNT
@@ -235,18 +215,16 @@
givepoke WOBBUFFET, 15, 0, 0
takecoins 1500
jump UnknownScript_0x56d0c
-; 0x56db0
-MenuDataHeader_0x56db0: ; 0x56db0
+MenuDataHeader_0x56db0:
db $40 ; flags
db 02, 00 ; start coords
db 11, 17 ; end coords
dw MenuData2_0x56db8
db 1 ; default option
-; 0x56db8
-MenuData2_0x56db8: ; 0x56db8
+MenuData2_0x56db8:
db $80 ; flags
db 4 ; items
db "ABRA 100@"
@@ -253,10 +231,9 @@
db "CUBONE 800@"
db "WOBBUFFET 1500@"
db "CANCEL@"
-; 0x56df1
-PharmacistScript_0x56df1: ; 0x56df1
+PharmacistScript_0x56df1:
faceplayer
loadfont
writetext UnknownText_0x56f55
@@ -264,9 +241,8 @@
loadmovesprites
spriteface $fe, LEFT
end
-; 0x56dfc
-PokefanMScript_0x56dfc: ; 0x56dfc
+PokefanMScript_0x56dfc:
faceplayer
loadfont
writetext UnknownText_0x56f9e
@@ -274,9 +250,8 @@
loadmovesprites
spriteface $7, RIGHT
end
-; 0x56e07
-CooltrainerMScript_0x56e07: ; 0x56e07
+CooltrainerMScript_0x56e07:
faceplayer
loadfont
writetext UnknownText_0x56ff4
@@ -284,9 +259,8 @@
loadmovesprites
spriteface $8, LEFT
end
-; 0x56e12
-PokefanFScript_0x56e12: ; 0x56e12
+PokefanFScript_0x56e12:
faceplayer
loadfont
writetext UnknownText_0x5702b
@@ -294,13 +268,11 @@
loadmovesprites
spriteface $9, RIGHT
end
-; 0x56e1d
-CooltrainerFScript_0x56e1d: ; 0x56e1d
+CooltrainerFScript_0x56e1d:
jumptextfaceplayer UnknownText_0x57097
-; 0x56e20
-GentlemanScript_0x56e20: ; 0x56e20
+GentlemanScript_0x56e20:
faceplayer
loadfont
writetext UnknownText_0x570b1
@@ -308,17 +280,14 @@
loadmovesprites
spriteface $b, RIGHT
end
-; 0x56e2b
-PokefanMScript_0x56e2b: ; 0x56e2b
+PokefanMScript_0x56e2b:
jumptextfaceplayer UnknownText_0x5710d
-; 0x56e2e
-MapGoldenrodGameCornerSignpost30Script: ; 0x56e2e
+MapGoldenrodGameCornerSignpost30Script:
jumptext UnknownText_0x571af
-; 0x56e31
-MapGoldenrodGameCornerSignpost17Script: ; 0x56e31
+MapGoldenrodGameCornerSignpost17Script:
random $6
if_equal $0, MapGoldenrodGameCornerSignpost7Script
refreshscreen $0
@@ -326,24 +295,21 @@
special Functionc373
loadmovesprites
end
-; 0x56e40
-MapGoldenrodGameCornerSignpost7Script: ; 0x56e40
+MapGoldenrodGameCornerSignpost7Script:
refreshscreen $0
writebyte $1
special Functionc373
loadmovesprites
end
-; 0x56e49
-MapGoldenrodGameCornerSignpost29Script: ; 0x56e49
+MapGoldenrodGameCornerSignpost29Script:
refreshscreen $0
special Functionc380
loadmovesprites
end
-; 0x56e50
-UnknownText_0x56e50: ; 0x56e50
+UnknownText_0x56e50:
text "Welcome!"
para "We exchange your"
@@ -350,52 +316,44 @@
line "game coins for"
cont "fabulous prizes!"
done
-; 0x56e8b
-UnknownText_0x56e8b: ; 0x56e8b
+UnknownText_0x56e8b:
text "Which prize would"
line "you like?"
done
-; 0x56ea8
-UnknownText_0x56ea8: ; 0x56ea8
+UnknownText_0x56ea8:
text_from_ram StringBuffer3
text "."
line "Is that right?"
done
-; 0x56ebd
-UnknownText_0x56ebd: ; 0x56ebd
+UnknownText_0x56ebd:
text "Here you go!"
done
-; 0x56ecb
-UnknownText_0x56ecb: ; 0x56ecb
+UnknownText_0x56ecb:
text "Sorry! You need"
line "more coins."
done
-; 0x56ee8
-UnknownText_0x56ee8: ; 0x56ee8
+UnknownText_0x56ee8:
text "Sorry. You can't"
line "carry any more."
done
-; 0x56f09
-UnknownText_0x56f09: ; 0x56f09
+UnknownText_0x56f09:
text "OK. Please save"
line "your coins and"
cont "come again!"
done
-; 0x56f35
-UnknownText_0x56f35: ; 0x56f35
+UnknownText_0x56f35:
text "Oh? You don't have"
line "a COIN CASE."
done
-; 0x56f55
-UnknownText_0x56f55: ; 0x56f55
+UnknownText_0x56f55:
text "I always play this"
line "slot machine. It"
@@ -402,9 +360,8 @@
para "pays out more than"
line "others, I think."
done
-; 0x56f9e
-UnknownText_0x56f9e: ; 0x56f9e
+UnknownText_0x56f9e:
text "I just love this"
line "new slot machine."
@@ -412,16 +369,14 @@
line "challenge than the"
cont "ones in CELADON."
done
-; 0x56ff4
-UnknownText_0x56ff4: ; 0x56ff4
+UnknownText_0x56ff4:
text "Life is a gamble."
line "I'm going to flip"
cont "cards till I drop!"
done
-; 0x5702b
-UnknownText_0x5702b: ; 0x5702b
+UnknownText_0x5702b:
text "Card flip…"
para "I prefer it over"
@@ -433,15 +388,13 @@
para "But the payout is"
line "much lower."
done
-; 0x57097
-UnknownText_0x57097: ; 0x57097
+UnknownText_0x57097:
text "I won't quit until"
line "I win!"
done
-; 0x570b1
-UnknownText_0x570b1: ; 0x570b1
+UnknownText_0x570b1:
text "I taught BLIZZARD"
line "to my #MON."
@@ -451,9 +404,8 @@
para "it, but it was"
line "worth it."
done
-; 0x5710d
-UnknownText_0x5710d: ; 0x5710d
+UnknownText_0x5710d:
text "I couldn't win at"
line "the slots, and I"
@@ -466,23 +418,20 @@
para "COIN CASE in the"
line "UNDERGROUND."
done
-; 0x5718a
-UnknownText_0x5718a: ; 0x5718a
+UnknownText_0x5718a:
text "Wahahah! The coins"
line "keep rolling in!"
done
-; 0x571af
-UnknownText_0x571af: ; 0x571af
+UnknownText_0x571af:
text "Someone left their"
line "drink."
para "It smells sweet."
done
-; 0x571db
-GoldenrodGameCorner_MapEventHeader: ; 0x571db
+GoldenrodGameCorner_MapEventHeader:
; filler
db 0, 0
@@ -542,4 +491,3 @@
person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, $ffff
person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, $ffff
person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, $076b
-; 0x57322
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -1,12 +1,11 @@
-GoldenrodHappinessRater_MapScriptHeader: ; 0x54951
+GoldenrodHappinessRater_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x54953
-TeacherScript_0x54953: ; 0x54953
+TeacherScript_0x54953:
faceplayer
loadfont
special Function718d
@@ -18,57 +17,48 @@
if_greater_than $63, UnknownScript_0x54985
if_greater_than $31, UnknownScript_0x5498b
jump UnknownScript_0x54991
-; 0x54973
-UnknownScript_0x54973: ; 0x54973
+UnknownScript_0x54973:
writetext UnknownText_0x549fc
closetext
loadmovesprites
end
-; 0x54979
-UnknownScript_0x54979: ; 0x54979
+UnknownScript_0x54979:
writetext UnknownText_0x54a2c
closetext
loadmovesprites
end
-; 0x5497f
-UnknownScript_0x5497f: ; 0x5497f
+UnknownScript_0x5497f:
writetext UnknownText_0x54a5a
closetext
loadmovesprites
end
-; 0x54985
-UnknownScript_0x54985: ; 0x54985
+UnknownScript_0x54985:
writetext UnknownText_0x54a8e
closetext
loadmovesprites
end
-; 0x5498b
-UnknownScript_0x5498b: ; 0x5498b
+UnknownScript_0x5498b:
writetext UnknownText_0x54a9f
closetext
loadmovesprites
end
-; 0x54991
-UnknownScript_0x54991: ; 0x54991
+UnknownScript_0x54991:
writetext UnknownText_0x54ad1
closetext
loadmovesprites
end
-; 0x54997
-PokefanMScript_0x54997: ; 0x54997
+PokefanMScript_0x54997:
jumptextfaceplayer UnknownText_0x54b04
-; 0x5499a
-TwinScript_0x5499a: ; 0x5499a
+TwinScript_0x5499a:
jumptextfaceplayer UnknownText_0x54b67
-; 0x5499d
HappinessRatersHouseBookshelf:
jumpstd difficultbookshelf
@@ -76,7 +66,7 @@
HappinessRatersHouseRadio:
jumpstd radio2
-UnknownText_0x549a3: ; 0x549a3
+UnknownText_0x549a3:
text "If you treat your"
line "#MON nicely,"
@@ -88,49 +78,42 @@
text_from_ram StringBuffer3
text "…"
done
-; 0x549fc
-UnknownText_0x549fc: ; 0x549fc
+UnknownText_0x549fc:
text "It looks really"
line "happy! It must"
cont "love you a lot."
done
-; 0x54a2c
-UnknownText_0x54a2c: ; 0x54a2c
+UnknownText_0x54a2c:
text "I get the feeling"
line "that it really"
cont "trusts you."
done
-; 0x54a5a
-UnknownText_0x54a5a: ; 0x54a5a
+UnknownText_0x54a5a:
text "It's friendly to-"
line "ward you. It looks"
cont "sort of happy."
done
-; 0x54a8e
-UnknownText_0x54a8e: ; 0x54a8e
+UnknownText_0x54a8e:
text "It's quite cute."
done
-; 0x54a9f
-UnknownText_0x54a9f: ; 0x54a9f
+UnknownText_0x54a9f:
text "You should treat"
line "it better. It's"
cont "not used to you."
done
-; 0x54ad1
-UnknownText_0x54ad1: ; 0x54ad1
+UnknownText_0x54ad1:
text "It doesn't seem to"
line "like you at all."
cont "It looks mean."
done
-; 0x54b04
-UnknownText_0x54b04: ; 0x54b04
+UnknownText_0x54b04:
text "I keep losing in"
line "battles, and my"
@@ -141,16 +124,14 @@
line "my #MON don't"
cont "like me much…"
done
-; 0x54b67
-UnknownText_0x54b67: ; 0x54b67
+UnknownText_0x54b67:
text "When I use an item"
line "on my #MON, it"
cont "acts really glad!"
done
-; 0x54b9c
-GoldenrodHappinessRater_MapEventHeader: ; 0x54b9c
+GoldenrodHappinessRater_MapEventHeader:
; filler
db 0, 0
@@ -173,4 +154,3 @@
person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, $ffff
person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, $ffff
person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, $ffff
-; 0x54be2
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -1,4 +1,4 @@
-GoldenrodMagnetTrainStation_MapScriptHeader: ; 0x550e5
+GoldenrodMagnetTrainStation_MapScriptHeader:
; trigger count
db 1
@@ -7,13 +7,11 @@
; callback count
db 0
-; 0x550eb
-UnknownScript_0x550eb: ; 0x550eb
+UnknownScript_0x550eb:
end
-; 0x550ec
-OfficerScript_0x550ec: ; 0x550ec
+OfficerScript_0x550ec:
faceplayer
loadfont
checkevent EVENT_RESTORED_POWER_TO_KANTO
@@ -22,9 +20,8 @@
closetext
loadmovesprites
end
-; 0x550fa
-UnknownScript_0x550fa: ; 0x550fa
+UnknownScript_0x550fa:
writetext UnknownText_0x551b7
yesorno
iffalse UnknownScript_0x5512a
@@ -42,28 +39,24 @@
applymovement $0, MovementData_0x55122
wait $14
end
-; 0x55122
-MovementData_0x55122: ; 0x55122
+MovementData_0x55122:
turn_head_down
step_end
-; 0x55124
-UnknownScript_0x55124: ; 0x55124
+UnknownScript_0x55124:
writetext UnknownText_0x5522c
closetext
loadmovesprites
end
-; 0x5512a
-UnknownScript_0x5512a: ; 0x5512a
+UnknownScript_0x5512a:
writetext UnknownText_0x5524f
closetext
loadmovesprites
end
-; 0x55130
-UnknownScript_0x55130: ; 0x55130
+UnknownScript_0x55130:
applymovement $2, MovementData_0x55146
applymovement $0, MovementData_0x55158
applymovement $2, MovementData_0x5514b
@@ -72,28 +65,24 @@
closetext
loadmovesprites
end
-; 0x55143
-GentlemanScript_0x55143: ; 0x55143
+GentlemanScript_0x55143:
jumptextfaceplayer UnknownText_0x552a3
-; 0x55146
-MovementData_0x55146: ; 0x55146
+MovementData_0x55146:
step_up
step_up
step_right
turn_head_left
step_end
-; 0x5514b
-MovementData_0x5514b: ; 0x5514b
+MovementData_0x5514b:
step_left
step_down
step_down
step_end
-; 0x5514f
-MovementData_0x5514f: ; 0x5514f
+MovementData_0x5514f:
step_up
step_up
step_up
@@ -103,9 +92,8 @@
step_up
step_up
step_end
-; 0x55158
-MovementData_0x55158: ; 0x55158
+MovementData_0x55158:
step_left
step_left
step_down
@@ -114,9 +102,8 @@
step_down
turn_head_up
step_end
-; 0x55160
-UnknownText_0x55160: ; 0x55160
+UnknownText_0x55160:
text "The train hasn't"
line "come in…"
@@ -126,9 +113,8 @@
para "That won't work."
done
-; 0x551b7
-UnknownText_0x551b7: ; 0x551b7
+UnknownText_0x551b7:
text "We'll soon depart"
line "for SAFFRON."
@@ -135,9 +121,8 @@
para "Are you coming"
line "aboard?"
done
-; 0x551ed
-UnknownText_0x551ed: ; 0x551ed
+UnknownText_0x551ed:
text "May I see your"
line "rail PASS, please?"
@@ -144,21 +129,18 @@
para "OK. Right this"
line "way, please."
done
-; 0x5522c
-UnknownText_0x5522c: ; 0x5522c
+UnknownText_0x5522c:
text "Sorry. You don't"
line "have a rail PASS."
done
-; 0x5524f
-UnknownText_0x5524f: ; 0x5524f
+UnknownText_0x5524f:
text "We hope to see you"
line "again!"
done
-; 0x5526a
-UnknownText_0x5526a: ; 0x5526a
+UnknownText_0x5526a:
text "We have arrived in"
line "GOLDENROD."
@@ -165,9 +147,8 @@
para "We hope to see you"
line "again."
done
-; 0x552a3
-UnknownText_0x552a3: ; 0x552a3
+UnknownText_0x552a3:
text "I'm the PRESIDENT."
para "My dream was to"
@@ -180,9 +161,8 @@
line "JOHTO much closer"
cont "to KANTO."
done
-; 0x5531f
-GoldenrodMagnetTrainStation_MapEventHeader: ; 0x5531f
+GoldenrodMagnetTrainStation_MapEventHeader:
; filler
db 0, 0
@@ -204,4 +184,3 @@
db 2
person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, $ffff
person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, $0749
-; 0x5535b
--- a/maps/GoldenrodNameRatersHouse.asm
+++ b/maps/GoldenrodNameRatersHouse.asm
@@ -1,12 +1,11 @@
-GoldenrodNameRatersHouse_MapScriptHeader: ; 0x5577a
+GoldenrodNameRatersHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5577c
-GentlemanScript_0x5577c: ; 0x5577c
+GentlemanScript_0x5577c:
faceplayer
loadfont
special SpecialNameRater
@@ -13,7 +12,6 @@
closetext
loadmovesprites
end
-; 0x55784
GoldenrodNameRatersHouseBookshelf:
jumpstd difficultbookshelf
@@ -23,7 +21,7 @@
INCLUDE "text/sweethoney.asm"
-GoldenrodNameRatersHouse_MapEventHeader: ; 0x55953
+GoldenrodNameRatersHouse_MapEventHeader:
; filler
db 0, 0
@@ -44,4 +42,3 @@
; people-events
db 1
person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, $ffff
-; 0x5597f
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -1,18 +1,15 @@
-GoldenrodPPSpeechHouse_MapScriptHeader: ; 0x55648
+GoldenrodPPSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5564a
-FisherScript_0x5564a: ; 0x5564a
+FisherScript_0x5564a:
jumptextfaceplayer UnknownText_0x55659
-; 0x5564d
-LassScript_0x5564d: ; 0x5564d
+LassScript_0x5564d:
jumptextfaceplayer UnknownText_0x556ca
-; 0x55650
GoldenrodPPSpeechHouseBookshelf2:
jumpstd difficultbookshelf
@@ -23,7 +20,7 @@
GoldenrodPPSpeechHouseRadio:
jumpstd radio2
-UnknownText_0x55659: ; 0x55659
+UnknownText_0x55659:
text "Once while I was"
line "battling, my"
@@ -36,9 +33,8 @@
para "moves were all"
line "gone."
done
-; 0x556ca
-UnknownText_0x556ca: ; 0x556ca
+UnknownText_0x556ca:
text "Sometimes, a"
line "healthy #MON"
@@ -50,9 +46,8 @@
cont "MON CENTER or use"
cont "an item."
done
-; 0x55741
-GoldenrodPPSpeechHouse_MapEventHeader: ; 0x55741
+GoldenrodPPSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -74,4 +69,3 @@
db 2
person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, $ffff
person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, $ffff
-; 0x5577a
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -1,23 +1,20 @@
-GoldenrodPokeCenter1F_MapScriptHeader: ; 0x60f8f
+GoldenrodPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x60f91
-NurseScript_0x60f91: ; 0x60f91
+NurseScript_0x60f91:
jumpstd pokecenternurse
-; 0x60f94
-UnknownScript_0x60f94: ; 0x60f94
+UnknownScript_0x60f94:
writebyte $b
special Function170687
if_equal $b, UnknownScript_0x60f9e
end
-; 0x60f9e
-UnknownScript_0x60f9e: ; 0x60f9e
+UnknownScript_0x60f9e:
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue UnknownScript_0x60fd8
playsound SFX_EXIT_BUILDING
@@ -40,18 +37,16 @@
special RestartMapMusic
disappear $3
playsound SFX_EXIT_BUILDING
-UnknownScript_0x60fd8: ; 0x60fd8
+UnknownScript_0x60fd8:
end
-; 0x60fd9
-UnknownScript_0x60fd9: ; 0x60fd9
+UnknownScript_0x60fd9:
writebyte $b
special Function170687
if_equal $b, UnknownScript_0x60fe3
end
-; 0x60fe3
-UnknownScript_0x60fe3: ; 0x60fe3
+UnknownScript_0x60fe3:
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue UnknownScript_0x6101d
playsound SFX_EXIT_BUILDING
@@ -74,19 +69,16 @@
special RestartMapMusic
disappear $3
playsound SFX_EXIT_BUILDING
-UnknownScript_0x6101d: ; 0x6101d
+UnknownScript_0x6101d:
end
-; 0x6101e
-GameboyKidScript_0x6101e: ; 0x6101e
+GameboyKidScript_0x6101e:
jumptextfaceplayer UnknownText_0x62105
-; 0x61021
-LassScript_0x61021: ; 0x61021
+LassScript_0x61021:
jumptextfaceplayer UnknownText_0x62260
-; 0x61024
-PokefanFScript_0x61024: ; 0x61024
+PokefanFScript_0x61024:
faceplayer
loadfont
writetext UnknownText_0x623fb
@@ -106,24 +98,21 @@
closetext
loadmovesprites
end
-; 0x6104b
-UnknownScript_0x6104b: ; 0x6104b
+UnknownScript_0x6104b:
writetext UnknownText_0x62509
closetext
loadmovesprites
end
-; 0x61051
-UnknownScript_0x61051: ; 0x61051
+UnknownScript_0x61051:
giveitem EON_MAIL, $1
writetext UnknownText_0x6252a
closetext
loadmovesprites
end
-; 0x6105a
-MovementData_0x6105a: ; 0x6105a
+MovementData_0x6105a:
step_up
step_right
step_right
@@ -130,17 +119,15 @@
step_right
turn_head_down
step_end
-; 0x61060
-MovementData_0x61060: ; 0x61060
+MovementData_0x61060:
step_left
step_left
step_left
step_down
step_end
-; 0x61065
-MovementData_0x61065: ; 0x61065
+MovementData_0x61065:
step_up
step_right
step_right
@@ -148,9 +135,8 @@
step_right
turn_head_down
step_end
-; 0x6106c
-MovementData_0x6106c: ; 0x6106c
+MovementData_0x6106c:
step_left
step_left
step_left
@@ -157,10 +143,9 @@
step_left
step_down
step_end
-; 0x61072
; unused
-UnknownText_0x61072: ; 0x61072
+UnknownText_0x61072:
text "Hello! Welcome to"
line "#COM CENTER"
cont "TRADE CORNER."
@@ -169,9 +154,8 @@
line "#MON with other"
cont "people far away."
done
-; 0x610ce
-UnknownText_0x610ce: ; 0x610ce
+UnknownText_0x610ce:
text "To make a trade,"
line "we must hold your"
cont "#MON."
@@ -179,16 +163,14 @@
para "Would you like to"
line "trade?"
done
-; 0x61111
-UnknownText_0x61111: ; 0x61111
+UnknownText_0x61111:
text "What kind of"
line "#MON do you"
cont "want in return?"
done
-; 0x6113b
-UnknownText_0x6113b: ; 0x6113b
+UnknownText_0x6113b:
text "Fine. We will try"
line "to trade your"
@@ -207,9 +189,8 @@
line "we prepare the"
cont "room for it."
done
-; 0x611c9
-UnknownText_0x611c9: ; 0x611c9
+UnknownText_0x611c9:
text "Fine. We will try"
line "to trade your"
@@ -227,9 +208,8 @@
line "we prepare the"
cont "room for it."
done
-; 0x61271
-UnknownText_0x61271: ; 0x61271
+UnknownText_0x61271:
text "Your trade #MON"
line "has been received."
@@ -239,9 +219,8 @@
para "partner. Please"
line "come back later."
done
-; 0x612d8
-UnknownText_0x612d8: ; 0x612d8
+UnknownText_0x612d8:
text "Oh? You have only"
line "one #MON in"
cont "your party. "
@@ -251,34 +230,29 @@
cont "creased the size"
cont "of your party."
done
-; 0x61344
-UnknownText_0x61344: ; 0x61344
+UnknownText_0x61344:
text "We hope to see you"
line "again."
done
-; 0x6135f
-UnknownText_0x6135f: ; 0x6135f
+UnknownText_0x6135f:
text "Communication"
line "error…"
done
-; 0x61375
-UnknownText_0x61375: ; 0x61375
+UnknownText_0x61375:
text "If we accept that"
line "#MON, what will"
cont "you battle with?"
done
-; 0x613a9
-UnknownText_0x613a9: ; 0x613a9
+UnknownText_0x613a9:
text "Sorry. We can't"
line "accept an EGG."
done
-; 0x613c8
-UnknownText_0x613c8: ; 0x613c8
+UnknownText_0x613c8:
text "Sorry, but your"
line "#MON appears to"
@@ -285,24 +259,21 @@
para "be abnormal. We"
line "can't accept it."
done
-; 0x61409
-UnknownText_0x61409: ; 0x61409
+UnknownText_0x61409:
text "Oh? Aren't we"
line "already holding a"
cont "#MON of yours?"
done
-; 0x61438
-UnknownText_0x61438: ; 0x61438
+UnknownText_0x61438:
text "We'll check the"
line "rooms."
para "Please wait."
done
-; 0x6145c
-UnknownText_0x6145c: ; 0x6145c
+UnknownText_0x6145c:
text "Thank you for your"
line "patience."
@@ -309,9 +280,8 @@
para "A trade partner"
line "has been found."
done
-; 0x6149a
-UnknownText_0x6149a: ; 0x6149a
+UnknownText_0x6149a:
text "It's your new"
line "partner."
@@ -321,9 +291,8 @@
para "We hope to see you"
line "again."
done
-; 0x614ed
-UnknownText_0x614ed: ; 0x614ed
+UnknownText_0x614ed:
text "Uh-oh. Your party"
line "is already full."
@@ -331,9 +300,8 @@
line "when you have room"
cont "in your party."
done
-; 0x61544
-UnknownText_0x61544: ; 0x61544
+UnknownText_0x61544:
text "It's unfortunate,"
line "but no one has"
@@ -343,15 +311,13 @@
para "Would you like"
line "your #MON back?"
done
-; 0x615a5
-UnknownText_0x615a5: ; 0x615a5
+UnknownText_0x615a5:
text "We have returned"
line "your #MON."
done
-; 0x615c2
-UnknownText_0x615c2: ; 0x615c2
+UnknownText_0x615c2:
text "It's unfortunate,"
line "but no one has"
@@ -367,22 +333,19 @@
para "Sorry, but we must"
line "return it to you."
done
-; 0x6166e
-UnknownText_0x6166e: ; 0x6166e
+UnknownText_0x6166e:
text "We hope to see you"
line "again."
done
-; 0x61689
-UnknownText_0x61689: ; 0x61689
+UnknownText_0x61689:
text "Fine. We will"
line "continue to hold"
cont "your #MON."
done
-; 0x616b4
-UnknownText_0x616b4: ; 0x616b4
+UnknownText_0x616b4:
text "Oh? You left your"
line "#MON with us"
cont "only recently."
@@ -390,28 +353,24 @@
para "Please come back"
line "later."
done
-; 0x616fb
-UnknownText_0x616fb: ; 0x616fb
+UnknownText_0x616fb:
text "We'll SAVE before"
line "connecting to the"
cont "CENTER."
done
-; 0x61727
-UnknownText_0x61727: ; 0x61727
+UnknownText_0x61727:
text "Which #MON do"
line "you want to trade?"
done
-; 0x61749
-UnknownText_0x61749: ; 0x61749
+UnknownText_0x61749:
text "Sorry, but we must"
line "cancel the trade."
done
-; 0x6176f
-UnknownText_0x6176f: ; 0x6176f
+UnknownText_0x6176f:
text "Oh!"
para "I see you have an"
@@ -423,9 +382,8 @@
para "redeem for a"
line "special #MON!"
done
-; 0x617d2
-UnknownText_0x617d2: ; 0x617d2
+UnknownText_0x617d2:
text "Let me give you a"
line "quick briefing."
@@ -457,15 +415,13 @@
para "sent from the"
line "chosen room."
done
-; 0x6191f
-UnknownText_0x6191f: ; 0x6191f
+UnknownText_0x6191f:
text "Please wait a"
line "moment."
done
-; 0x61936
-UnknownText_0x61936: ; 0x61936
+UnknownText_0x61936:
text "Thank you for"
line "waiting."
@@ -477,9 +433,8 @@
para "Please raise it"
line "with loving care."
done
-; 0x61996
-UnknownText_0x61996: ; 0x61996
+UnknownText_0x61996:
text "I'm awfully sorry."
para "The EGG TICKET"
@@ -486,21 +441,18 @@
line "exchange service"
cont "isn't running now."
done
-; 0x619db
-UnknownText_0x619db: ; 0x619db
+UnknownText_0x619db:
text "It's a #MON"
line "NEWS MACHINE."
done
-; 0x619f5
-UnknownText_0x619f5: ; 0x619f5
+UnknownText_0x619f5:
text "What would you"
line "like to do?"
done
-; 0x61a11
-UnknownText_0x61a11: ; 0x61a11
+UnknownText_0x61a11:
text "#MON NEWS is"
line "news compiled from"
@@ -534,27 +486,23 @@
para "You might even be"
line "in the NEWS!"
done
-; 0x61b7c
-UnknownText_0x61b7c: ; 0x61b7c
+UnknownText_0x61b7c:
text "Would you like to"
line "get the NEWS?"
done
-; 0x61b9d
-UnknownText_0x61b9d: ; 0x61b9d
+UnknownText_0x61b9d:
text "Reading the latest"
line "NEWS… Please wait."
done
-; 0x61bc4
-UnknownText_0x61bc4: ; 0x61bc4
+UnknownText_0x61bc4:
text "There is no old"
line "NEWS…"
done
-; 0x61bdb
-UnknownText_0x61bdb: ; 0x61bdb
+UnknownText_0x61bdb:
text "The NEWS data is"
line "corrupted."
@@ -561,9 +509,8 @@
para "Please download"
line "the NEWS again."
done
-; 0x61c18
-UnknownText_0x61c18: ; 0x61c18
+UnknownText_0x61c18:
text "We're making"
line "preparations."
@@ -570,9 +517,8 @@
para "Please come back"
line "later."
done
-; 0x61c4b
-UnknownText_0x61c4b: ; 0x61c4b
+UnknownText_0x61c4b:
text "We will SAVE your"
line "progress before"
@@ -579,9 +525,8 @@
para "starting the NEWS"
line "MACHINE."
done
-; 0x61c89
-UnknownText_0x61c89: ; 0x61c89
+UnknownText_0x61c89:
text "Whoa, this #MON"
line "CENTER is huge."
@@ -591,9 +536,8 @@
para "installed lots of"
line "new machines too."
done
-; 0x61cef
-UnknownText_0x61cef: ; 0x61cef
+UnknownText_0x61cef:
text "I thought up a fun"
line "new thing for the"
cont "TRADE CORNER!"
@@ -620,9 +564,8 @@
para "make lots of new"
line "friends!"
done
-; 0x61dfd
-UnknownText_0x61dfd: ; 0x61dfd
+UnknownText_0x61dfd:
text "They said you can"
line "trade #MON with"
@@ -632,9 +575,8 @@
para "But they're still"
line "adjusting things."
done
-; 0x61e5c
-UnknownText_0x61e5c: ; 0x61e5c
+UnknownText_0x61e5c:
text "Some girl I don't"
line "know sent me her"
@@ -644,9 +586,8 @@
para "for a #MON that"
line "you want."
done
-; 0x61eb2
-UnknownText_0x61eb2: ; 0x61eb2
+UnknownText_0x61eb2:
text "I received a"
line "female HOPPIP, but"
cont "its named STANLEY!"
@@ -654,9 +595,8 @@
para "That's my dad's"
line "name!"
done
-; 0x61efa
-UnknownText_0x61efa: ; 0x61efa
+UnknownText_0x61efa:
text "What is the NEWS"
line "MACHINE?"
@@ -664,9 +604,8 @@
line "from a wider area"
cont "than the radio?"
done
-; 0x61f48
-UnknownText_0x61f48: ; 0x61f48
+UnknownText_0x61f48:
text "The #COM CENTER"
line "will link with all"
@@ -679,9 +618,8 @@
para "link with all"
line "sorts of people."
done
-; 0x61fc9
-UnknownText_0x61fc9: ; 0x61fc9
+UnknownText_0x61fc9:
text "The machines here"
line "can't be used yet."
@@ -691,9 +629,8 @@
para "place before other"
line "people."
done
-; 0x6202c
-UnknownText_0x6202c: ; 0x6202c
+UnknownText_0x6202c:
text "My friend was in"
line "the NEWS a while"
@@ -700,16 +637,14 @@
para "back. I was really"
line "surprised!"
done
-; 0x6206d
-UnknownText_0x6206d: ; 0x6206d
+UnknownText_0x6206d:
text "I get anxious if I"
line "don't check out"
cont "the latest NEWS!"
done
-; 0x620a1
-UnknownText_0x620a1: ; 0x620a1
+UnknownText_0x620a1:
text "If I get in the"
line "NEWS and become"
@@ -720,9 +655,8 @@
line "could get in the"
cont "NEWS?"
done
-; 0x62105
-UnknownText_0x62105: ; 0x62105
+UnknownText_0x62105:
text "The COLOSSEUM"
line "upstairs is for"
cont "link battles."
@@ -733,9 +667,8 @@
para "wall, so I can't"
line "afford to lose."
done
-; 0x62173
-UnknownText_0x62173: ; 0x62173
+UnknownText_0x62173:
text "I came over here"
line "when I got word"
@@ -752,9 +685,8 @@
para "with all their"
line "preparations…"
done
-; 0x62222
-UnknownText_0x62222: ; 0x62222
+UnknownText_0x62222:
text "Just seeing all"
line "these new things"
@@ -761,9 +693,8 @@
para "here makes me feel"
line "younger!"
done
-; 0x62260
-UnknownText_0x62260: ; 0x62260
+UnknownText_0x62260:
text "A higher level"
line "#MON doesn't"
cont "always win."
@@ -778,9 +709,8 @@
para "#MON that is"
line "the toughest."
done
-; 0x622f0
-UnknownText_0x622f0: ; 0x622f0
+UnknownText_0x622f0:
text "<PLAYER>, isn't it?"
para "Congratulations!"
@@ -791,15 +721,13 @@
para "Please accept it!"
done
-; 0x62359
-UnknownText_0x62359: ; 0x62359
+UnknownText_0x62359:
text "Please do come"
line "again!"
done
-; 0x62370
-UnknownText_0x62370: ; 0x62370
+UnknownText_0x62370:
text "#COM CENTER"
line "1F INFORMATION"
@@ -812,9 +740,8 @@
para "Right:"
line "#MON NEWS"
done
-; 0x623c7
-UnknownText_0x623c7: ; 0x623c7
+UnknownText_0x623c7:
text "It's a #MON"
line "NEWS MACHINE!"
@@ -821,9 +748,8 @@
para "It's not in"
line "operation yet…"
done
-; 0x623fb
-UnknownText_0x623fb: ; 0x623fb
+UnknownText_0x623fb:
text "Oh my, your pack"
line "looks so heavy!"
@@ -837,15 +763,13 @@
para "You can part with"
line "one, can't you?"
done
-; 0x6248c
-UnknownText_0x6248c: ; 0x6248c
+UnknownText_0x6248c:
text "Give away an EON"
line "MAIL?"
done
-; 0x624a4
-UnknownText_0x624a4: ; 0x624a4
+UnknownText_0x624a4:
text "Oh, that's great!"
line "Thank you, honey!"
@@ -852,33 +776,28 @@
para "Here, this is for"
line "you in return!"
done
-; 0x624e9
-UnknownText_0x624e9: ; 0x624e9
+UnknownText_0x624e9:
text "My daughter will"
line "be delighted!"
done
-; 0x62509
-UnknownText_0x62509: ; 0x62509
+UnknownText_0x62509:
text "Oh? You don't have"
line "one? Too bad."
done
-; 0x6252a
-UnknownText_0x6252a: ; 0x6252a
+UnknownText_0x6252a:
text "Oh… Well, another"
line "time, then."
done
-; 0x62549
-UnknownText_0x62549: ; 0x62549
+UnknownText_0x62549:
text "<PLAYER> gave away"
line "the EON MAIL."
done
-; 0x62564
-GoldenrodPokeCenter1F_MapEventHeader: ; 0x62564
+GoldenrodPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -904,4 +823,3 @@
person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, $ffff
person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, $ffff
person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, $ffff
-; 0x625cf
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -1,28 +1,24 @@
-GoldenrodPokeComCenter2FMobile_MapScriptHeader: ; 0x625cf
+GoldenrodPokeComCenter2FMobile_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x625d1
-ScientistScript_0x625d1: ; 0x625d1
+ScientistScript_0x625d1:
jumptextfaceplayer UnknownText_0x62674
-; 0x625d4
-ScientistScript_0x625d4: ; 0x625d4
+ScientistScript_0x625d4:
jumptextfaceplayer UnknownText_0x626f9
-; 0x625d7
-ScientistScript_0x625d7: ; 0x625d7
+ScientistScript_0x625d7:
jumptextfaceplayer UnknownText_0x62795
-; 0x625da
-MapGoldenrodPokeComCenter2FMobileSignpost0Script: ; 0x625da
+MapGoldenrodPokeComCenter2FMobileSignpost0Script:
loadfont
writetext UnknownText_0x627ee
closetext
-UnknownScript_0x625df: ; 0x625df
+UnknownScript_0x625df:
reloadmappart
loadmenudata MenuDataHeader_0x62602
interpretmenu2
@@ -30,50 +26,44 @@
if_equal $1, UnknownScript_0x625f0
if_equal $2, UnknownScript_0x625f8
jump UnknownScript_0x62600
-; 0x625f0
-UnknownScript_0x625f0: ; 0x625f0
+UnknownScript_0x625f0:
loadfont
writetext UnknownText_0x62828
closetext
jump UnknownScript_0x625df
-; 0x625f8
-UnknownScript_0x625f8: ; 0x625f8
+UnknownScript_0x625f8:
loadfont
writetext UnknownText_0x628f4
closetext
jump UnknownScript_0x625df
-; 0x62600
-UnknownScript_0x62600: ; 0x62600
+UnknownScript_0x62600:
loadmovesprites
end
-; 0x62602
-MenuDataHeader_0x62602: ; 0x62602
+MenuDataHeader_0x62602:
db $40 ; flags
db 00, 00 ; start coords
db 08, 15 ; end coords
dw MenuData2_0x6260a
db 1 ; default option
-; 0x6260a
-MenuData2_0x6260a: ; 0x6260a
+MenuData2_0x6260a:
db $80 ; flags
db 3 ; items
db "# つうしん クラブ@" ; # COM CLUB
db "モバイルセンター@" ; MOBILE CENTER
db "やめる@" ; QUIT
-; 0x62624
-MapGoldenrodPokeComCenter2FMobileSignpost1Script: ; 0x62624
+MapGoldenrodPokeComCenter2FMobileSignpost1Script:
loadfont
writetext UnknownText_0x62989
closetext
-UnknownScript_0x62629: ; 0x62629
+UnknownScript_0x62629:
reloadmappart
loadmenudata MenuDataHeader_0x6264c
interpretmenu2
@@ -81,50 +71,43 @@
if_equal $1, UnknownScript_0x6263a
if_equal $2, UnknownScript_0x62642
jump UnknownScript_0x6264a
-; 0x6263a
-UnknownScript_0x6263a: ; 0x6263a
+UnknownScript_0x6263a:
loadfont
writetext UnknownText_0x629ae
closetext
jump UnknownScript_0x62629
-; 0x62642
-UnknownScript_0x62642: ; 0x62642
+UnknownScript_0x62642:
loadfont
writetext UnknownText_0x62a5a
closetext
jump UnknownScript_0x62629
-; 0x6264a
-UnknownScript_0x6264a: ; 0x6264a
+UnknownScript_0x6264a:
loadmovesprites
end
-; 0x6264c
-MenuDataHeader_0x6264c: ; 0x6264c
+MenuDataHeader_0x6264c:
db $40 ; flags
db 00, 00 ; start coords
db 08, 15 ; end coords
dw MenuData2_0x62654
db 1 ; default option
-; 0x62654
-MenuData2_0x62654: ; 0x62654
+MenuData2_0x62654:
db $80 ; flags
db 3 ; items
db "でんわ",$1f,"つかうとき@" ; Use phone
db "でんわ",$4a,"つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT
-; 0x62673
-MapGoldenrodPokeComCenter2FMobileSignpost2Script: ; 0x62671
+MapGoldenrodPokeComCenter2FMobileSignpost2Script:
jumptext UnknownText_0x62b26
-; 0x62674
-UnknownText_0x62674: ; 0x62674
+UnknownText_0x62674:
text "#COM CENTER and"
line "MOBILE CENTER were"
@@ -137,9 +120,8 @@
para "and with total"
line "strangers."
done
-; 0x626f9
-UnknownText_0x626f9: ; 0x626f9
+UnknownText_0x626f9:
text "When you linked"
line "with someone by"
@@ -155,9 +137,8 @@
para "impressed that I"
line "got the shakes!"
done
-; 0x62795
-UnknownText_0x62795: ; 0x62795
+UnknownText_0x62795:
text "They were able to"
line "build this huge"
@@ -165,9 +146,8 @@
line "advances in wire-"
cont "less technology."
done
-; 0x627ee
-UnknownText_0x627ee: ; 0x627ee
+UnknownText_0x627ee:
text "It's a notice"
line "about where MOBILE"
@@ -174,9 +154,8 @@
para "ADAPTERS are to be"
line "used…"
done
-; 0x62828
-UnknownText_0x62828: ; 0x62828
+UnknownText_0x62828:
text "There's a #COM"
line "CLUB upstairs in"
@@ -197,9 +176,8 @@
line "MOBILE ADAPTER as"
cont "you."
done
-; 0x628f4
-UnknownText_0x628f4: ; 0x628f4
+UnknownText_0x628f4:
text "To use the TRADE"
line "CORNER or read the"
@@ -213,16 +191,14 @@
para "CENTER before"
line "connecting there."
done
-; 0x62989
-UnknownText_0x62989: ; 0x62989
+UnknownText_0x62989:
text "It's a notice"
line "about using the"
cont "phone…"
done
-; 0x629ae
-UnknownText_0x629ae: ; 0x629ae
+UnknownText_0x629ae:
text "Please ensure that"
line "your phone and"
@@ -237,9 +213,8 @@
line "hang up the phone"
cont "while linking."
done
-; 0x62a5a
-UnknownText_0x62a5a: ; 0x62a5a
+UnknownText_0x62a5a:
text "If the server is"
line "busy, it may not"
@@ -259,9 +234,8 @@
line "center or read the"
cont "instructions."
done
-; 0x62b26
-UnknownText_0x62b26: ; 0x62b26
+UnknownText_0x62b26:
text "The ADMINISTRATION"
line "OFFICE received an"
cont "e-mail. It says…"
@@ -288,9 +262,8 @@
para $56, " ", $56, " ", $56
done
-; 0x62c32
-GoldenrodPokeComCenter2FMobile_MapEventHeader: ; 0x62c32
+GoldenrodPokeComCenter2FMobile_MapEventHeader:
; filler
db 0, 0
@@ -313,4 +286,3 @@
person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, $ffff
person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, $ffff
person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, $ffff
-; 0x62c78
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -1,24 +1,20 @@
-IcePath1F_MapScriptHeader: ; 0x7e470
+IcePath1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e472
-ItemFragment_0x7e472: ; 0x7e472
+ItemFragment_0x7e472:
db HM_WATERFALL, 1
-; 0x7e474
-ItemFragment_0x7e474: ; 0x7e474
+ItemFragment_0x7e474:
db PP_UP, 1
-; 0x7e476
-ItemFragment_0x7e476: ; 0x7e476
+ItemFragment_0x7e476:
db PROTEIN, 1
-; 0x7e478
-IcePath1F_MapEventHeader: ; 0x7e478
+IcePath1F_MapEventHeader:
; filler
db 0, 0
@@ -40,4 +36,3 @@
person_event SPRITE_POKE_BALL, 11, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e472, $0688
person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, $0689
person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, $07be
-; 0x7e4b9
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -1,4 +1,4 @@
-IcePathB1F_MapScriptHeader: ; 0x7e4b9
+IcePathB1F_MapScriptHeader:
; trigger count
db 0
@@ -8,19 +8,16 @@
; callbacks
dbw 3, UnknownScript_0x7e4be
-; 0x7e4be
-UnknownScript_0x7e4be: ; 0x7e4be
+UnknownScript_0x7e4be:
writecmdqueue CmdQueue_0x7e4c2
return
-; 0x7e4c2
-CmdQueue_0x7e4c2: ; 0x7e4c2
+CmdQueue_0x7e4c2:
dbw 2, StoneTable_0x7e4c7 ; check if any stones are sitting on a warp
db 0, 0 ; filler
-; 0x7e4c7
-StoneTable_0x7e4c7: ; 0x7e4c7
+StoneTable_0x7e4c7:
db 3, 2 ; warp, person
dw UnknownScript_0x7e4d8
@@ -34,33 +31,28 @@
dw UnknownScript_0x7e4f0
db $ff ; end
-; 0x7e4d8
-UnknownScript_0x7e4d8: ; 0x7e4d8
+UnknownScript_0x7e4d8:
disappear 2
clearevent EVENT_BOULDER_IN_ICE_PATH_1
jump UnknownScript_0x7e4f8
-; 0x7e4e0
-UnknownScript_0x7e4e0: ; 0x7e4e0
+UnknownScript_0x7e4e0:
disappear 3
clearevent EVENT_BOULDER_IN_ICE_PATH_2
jump UnknownScript_0x7e4f8
-; 0x7e4e8
-UnknownScript_0x7e4e8: ; 0x7e4e8
+UnknownScript_0x7e4e8:
disappear 4
clearevent EVENT_BOULDER_IN_ICE_PATH_3
jump UnknownScript_0x7e4f8
-; 0x7e4f0
-UnknownScript_0x7e4f0: ; 0x7e4f0
+UnknownScript_0x7e4f0:
disappear 5
clearevent EVENT_BOULDER_IN_ICE_PATH_4
jump UnknownScript_0x7e4f8
-; 0x7e4f8
-UnknownScript_0x7e4f8: ; 0x7e4f8
+UnknownScript_0x7e4f8:
pause 30
scall UnknownScript_0x7e504
loadfont
@@ -68,37 +60,31 @@
closetext
loadmovesprites
end
-; 0x7e504
-UnknownScript_0x7e504: ; 0x7e504
+UnknownScript_0x7e504:
playsound SFX_STRENGTH
earthquake 80
end
-; 0x7e50a
-IcePathB1FBoulder: ; 0x7e50a
+IcePathB1FBoulder:
jumpstd strengthboulder
-; 0x7e50d
-ItemFragment_0x7e50d: ; 0x7e50d
+ItemFragment_0x7e50d:
db IRON, 1
-; 0x7e50f
-MapIcePathB1FSignpostItem0: ; 0x7e50f
+MapIcePathB1FSignpostItem0:
dw $0094
db MAX_POTION
-; 0x7e512
-UnknownText_0x7e512: ; 0x7e512
+UnknownText_0x7e512:
text "The boulder fell"
line "through."
done
-; 0x7e52d
-IcePathB1F_MapEventHeader: ; 0x7e52d
+IcePathB1F_MapEventHeader:
; filler
db 0, 0
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -1,22 +1,19 @@
-IcePathB2FBlackthornSide_MapScriptHeader: ; 0x7e644
+IcePathB2FBlackthornSide_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e646
-ItemFragment_0x7e646: ; 0x7e646
+ItemFragment_0x7e646:
db TM_REST, 1
-; 0x7e648
-MapIcePathB2FBlackthornSideSignpostItem0: ; 0x7e648
+MapIcePathB2FBlackthornSideSignpostItem0:
dw $0096
db ICE_HEAL
-; 0x7e64b
-IcePathB2FBlackthornSide_MapEventHeader: ; 0x7e64b
+IcePathB2FBlackthornSide_MapEventHeader:
; filler
db 0, 0
@@ -35,4 +32,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d
-; 0x7e66d
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -1,36 +1,30 @@
-IcePathB2FMahoganySide_MapScriptHeader: ; 0x7e5a1
+IcePathB2FMahoganySide_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e5a3
-BoulderScript_0x7e5a3: ; 0x7e5a3
+BoulderScript_0x7e5a3:
jumptext UnknownText_0x7e5ad
-; 0x7e5a6
-ItemFragment_0x7e5a6: ; 0x7e5a6
+ItemFragment_0x7e5a6:
db FULL_HEAL, 1
-; 0x7e5a8
-ItemFragment_0x7e5a8: ; 0x7e5a8
+ItemFragment_0x7e5a8:
db MAX_POTION, 1
-; 0x7e5aa
-MapIcePathB2FMahoganySideSignpostItem0: ; 0x7e5aa
+MapIcePathB2FMahoganySideSignpostItem0:
dw $0095
db CARBOS
-; 0x7e5ad
-UnknownText_0x7e5ad: ; 0x7e5ad
+UnknownText_0x7e5ad:
text "It's immovably"
line "imbedded in ice."
done
-; 0x7e5cd
-IcePathB2FMahoganySide_MapEventHeader: ; 0x7e5cd
+IcePathB2FMahoganySide_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +52,3 @@
person_event SPRITE_BOULDER, 17, 16, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $0710
person_event SPRITE_POKE_BALL, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, $068b
person_event SPRITE_POKE_BALL, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, $068c
-; 0x7e644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -1,19 +1,17 @@
-IcePathB3F_MapScriptHeader: ; 0x7e66d
+IcePathB3F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e66f
-ItemFragment_0x7e66f: ; 0x7e66f
+ItemFragment_0x7e66f:
db NEVERMELTICE, 1
-; 0x7e671
IcePathB3FRock:
jumpstd smashrock
-IcePathB3F_MapEventHeader: ; 0x7e674
+IcePathB3F_MapEventHeader:
; filler
db 0, 0
@@ -32,4 +30,3 @@
db 2
person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, $068e
person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, $ffff
-; 0x7e69e
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -1,27 +1,23 @@
-IlexForestAzaleaGate_MapScriptHeader: ; 0x62c78
+IlexForestAzaleaGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x62c7a
-OfficerScript_0x62c7a: ; 0x62c7a
+OfficerScript_0x62c7a:
jumptextfaceplayer UnknownText_0x62c80
-; 0x62c7d
-GrannyScript_0x62c7d: ; 0x62c7d
+GrannyScript_0x62c7d:
jumptextfaceplayer UnknownText_0x62cb0
-; 0x62c80
-UnknownText_0x62c80: ; 0x62c80
+UnknownText_0x62c80:
text "ILEX FOREST is"
line "big. Be careful!"
cont "Don't get lost."
done
-; 0x62cb0
-UnknownText_0x62cb0: ; 0x62cb0
+UnknownText_0x62cb0:
text "The FOREST is"
line "watched over by"
cont "its protector."
@@ -29,9 +25,8 @@
para "Stay out of"
line "mischief!"
done
-; 0x62cf4
-IlexForestAzaleaGate_MapEventHeader: ; 0x62cf4
+IlexForestAzaleaGate_MapEventHeader:
; filler
db 0, 0
@@ -52,4 +47,3 @@
db 2
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, $ffff
person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, $ffff
-; 0x62d28
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -1,4 +1,4 @@
-IndigoPlateauPokeCenter1F_MapScriptHeader: ; 0x180000
+IndigoPlateauPokeCenter1F_MapScriptHeader:
; trigger count
db 1
@@ -11,13 +11,11 @@
; callbacks
dbw 5, UnknownScript_0x18000a
-; 0x180009
-UnknownScript_0x180009: ; 0x180009
+UnknownScript_0x180009:
end
-; 0x18000a
-UnknownScript_0x18000a: ; 0x18000a
+UnknownScript_0x18000a:
domaptrigger GROUP_WILLS_ROOM, MAP_WILLS_ROOM, $0
domaptrigger GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM, $0
domaptrigger GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM, $0
@@ -41,9 +39,8 @@
clearevent EVENT_BEAT_CHAMPION_LANCE
setevent $075f
return
-; 0x180053
-UnknownScript_0x180053: ; 0x180053
+UnknownScript_0x180053:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iffalse UnknownScript_0x18012b
checkflag $005d
@@ -64,9 +61,8 @@
playmusic MUSIC_RIVAL_ENCOUNTER
spriteface $0, RIGHT
jump UnknownScript_0x1800ce
-; 0x180094
-UnknownScript_0x180094: ; 0x180094
+UnknownScript_0x180094:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iffalse UnknownScript_0x18012b
checkflag $005d
@@ -85,7 +81,7 @@
applymovement $5, MovementData_0x18016b
playmusic MUSIC_RIVAL_ENCOUNTER
spriteface $0, LEFT
-UnknownScript_0x1800ce: ; 0x1800ce
+UnknownScript_0x1800ce:
loadfont
writetext UnknownText_0x1801f5
closetext
@@ -102,9 +98,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x180113
-; 0x1800f3
-UnknownScript_0x1800f3: ; 0x1800f3
+UnknownScript_0x1800f3:
winlosstext UnknownText_0x180295, UnknownText_0x1802fd
setlasttalked $5
loadtrainer RIVAL2, 4
@@ -112,9 +107,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x180113
-; 0x180103
-UnknownScript_0x180103: ; 0x180103
+UnknownScript_0x180103:
winlosstext UnknownText_0x180295, UnknownText_0x1802fd
setlasttalked $5
loadtrainer RIVAL2, 5
@@ -122,9 +116,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x180113
-; 0x180113
-UnknownScript_0x180113: ; 0x180113
+UnknownScript_0x180113:
playmusic MUSIC_RIVAL_AFTER
loadfont
writetext UnknownText_0x1802a4
@@ -136,24 +129,20 @@
dotrigger $0
playmapmusic
setflag $005d
-UnknownScript_0x18012b: ; 0x18012b
+UnknownScript_0x18012b:
end
-; 0x18012c
-NurseScript_0x18012c: ; 0x18012c
+NurseScript_0x18012c:
jumpstd pokecenternurse
-; 0x18012f
-ClerkScript_0x18012f: ; 0x18012f
+ClerkScript_0x18012f:
loadfont
pokemart $0, $0020
loadmovesprites
end
-; 0x180136
-CooltrainerMScript_0x180136: ; 0x180136
+CooltrainerMScript_0x180136:
jumptextfaceplayer UnknownText_0x180178
-; 0x180139
TeleportGuyScript:
faceplayer
@@ -184,7 +173,7 @@
loadmovesprites
end
-MovementData_0x180164: ; 0x180164
+MovementData_0x180164:
step_up
step_up
step_up
@@ -192,9 +181,8 @@
step_up
turn_head_left
step_end
-; 0x18016b
-MovementData_0x18016b: ; 0x18016b
+MovementData_0x18016b:
step_up
step_up
step_up
@@ -202,9 +190,8 @@
step_up
turn_head_right
step_end
-; 0x180172
-MovementData_0x180172: ; 0x180172
+MovementData_0x180172:
step_down
step_down
step_down
@@ -211,9 +198,8 @@
step_down
step_down
step_end
-; 0x180178
-UnknownText_0x180178: ; 0x180178
+UnknownText_0x180178:
text "At the #MON"
line "LEAGUE, you'll get"
@@ -226,9 +212,8 @@
para "lose, you have to"
line "start all over!"
done
-; 0x1801f5
-UnknownText_0x1801f5: ; 0x1801f5
+UnknownText_0x1801f5:
text "Hold it."
para "You're going to"
@@ -249,16 +234,14 @@
para "<PLAYER>!"
line "I challenge you!"
done
-; 0x180295
-UnknownText_0x180295: ; 0x180295
+UnknownText_0x180295:
text "…"
para "OK--I lost…"
done
-; 0x1802a4
-UnknownText_0x1802a4: ; 0x1802a4
+UnknownText_0x1802a4:
text "…Darn… I still"
line "can't win…"
@@ -269,9 +252,8 @@
para "Humph! Try not to"
line "lose!"
done
-; 0x1802fd
-UnknownText_0x1802fd: ; 0x1802fd
+UnknownText_0x1802fd:
text "…"
para "Whew…"
@@ -280,7 +262,6 @@
para "I'm going to be"
line "the CHAMPION!"
done
-; 0x180335
TeleportGuyText1:
text "Ah! You're chal-"
@@ -312,13 +293,12 @@
text "OK, OK. The best"
line "of luck to you!"
done
-; 0x180433
AbraText:
text "ABRA: Aabra…"
done
-IndigoPlateauPokeCenter1F_MapEventHeader: ; 0x180441
+IndigoPlateauPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -345,4 +325,3 @@
person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, $077b
person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, AbraScript, EVENT_TELEPORT_GUY
-; 0x1804b9
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -1,4 +1,4 @@
-KrissHouse1F_MapScriptHeader: ; 0x7a4cc
+KrissHouse1F_MapScriptHeader:
; trigger count
db 2
@@ -8,21 +8,17 @@
; callback count
db 0
-; 0x7a4d6
-UnknownScript_0x7a4d6: ; 0x7a4d6
+UnknownScript_0x7a4d6:
end
-; 0x7a4d7
-UnknownScript_0x7a4d7: ; 0x7a4d7
+UnknownScript_0x7a4d7:
end
-; 0x7a4d8
-UnknownScript_0x7a4d8: ; 0x7a4d8
+UnknownScript_0x7a4d8:
setevent $0000
-; 0x7a4db
-UnknownScript_0x7a4db: ; 0x7a4db
+UnknownScript_0x7a4db:
playmusic MUSIC_MOM
showemote $0, $2, 15
spriteface $0, LEFT
@@ -30,11 +26,10 @@
iffalse UnknownScript_0x7a4f2
applymovement $2, MovementData_0x7a5fc
jump UnknownScript_0x7a4f6
-; 0x7a4f2
-UnknownScript_0x7a4f2: ; 0x7a4f2
+UnknownScript_0x7a4f2:
applymovement $2, MovementData_0x7a5fe
-UnknownScript_0x7a4f6: ; 0x7a4f6
+UnknownScript_0x7a4f6:
loadfont
writetext UnknownText_0x7a604
keeptextopen
@@ -49,7 +44,7 @@
writetext UnknownText_0x7a6bd
keeptextopen
special Function90913
-UnknownScript_0x7a519: ; 0x7a519
+UnknownScript_0x7a519:
writetext UnknownText_0x7a742
yesorno
iffalse UnknownScript_0x7a52a
@@ -57,32 +52,28 @@
yesorno
iffalse UnknownScript_0x7a519
jump UnknownScript_0x7a531
-; 0x7a52a
-UnknownScript_0x7a52a: ; 0x7a52a
+UnknownScript_0x7a52a:
special Function90a88
yesorno
iffalse UnknownScript_0x7a519
-UnknownScript_0x7a531: ; 0x7a531
+UnknownScript_0x7a531:
writetext UnknownText_0x7a763
yesorno
iffalse UnknownScript_0x7a542
jump UnknownScript_0x7a53b
-; 0x7a53b
-UnknownScript_0x7a53b: ; 0x7a53b
+UnknownScript_0x7a53b:
writetext UnknownText_0x7a7cb
keeptextopen
jump UnknownScript_0x7a549
-; 0x7a542
-UnknownScript_0x7a542: ; 0x7a542
+UnknownScript_0x7a542:
writetext UnknownText_0x7a807
keeptextopen
jump UnknownScript_0x7a549
-; 0x7a549
-UnknownScript_0x7a549: ; 0x7a549
+UnknownScript_0x7a549:
writetext UnknownText_0x7a850
closetext
loadmovesprites
@@ -91,39 +82,32 @@
checkevent $0001
iffalse UnknownScript_0x7a564
jump UnknownScript_0x7a56b
-; 0x7a55d
-UnknownScript_0x7a55d: ; 0x7a55d
+UnknownScript_0x7a55d:
applymovement $2, MovementData_0x7a600
jump UnknownScript_0x7a56b
-; 0x7a564
-UnknownScript_0x7a564: ; 0x7a564
+UnknownScript_0x7a564:
applymovement $2, MovementData_0x7a602
jump UnknownScript_0x7a56b
-; 0x7a56b
-UnknownScript_0x7a56b: ; 0x7a56b
+UnknownScript_0x7a56b:
special RestartMapMusic
spriteface $2, LEFT
end
-; 0x7a572
-UnknownScript_0x7a572: ; 0x7a572
+UnknownScript_0x7a572:
playmusic MUSIC_MOM
jump UnknownScript_0x7a4f6
-; 0x7a578
-GearName: ; 0x7a578
+GearName:
db "#GEAR@"
-; 0x7a57e
-UnknownScript_0x7a57e: ; 0x7a57e
+UnknownScript_0x7a57e:
jumpstd $002f
end
-; 0x7a582
-MomScript_0x7a582: ; 0x7a582
+MomScript_0x7a582:
faceplayer
setevent $0001
checktriggers
@@ -141,31 +125,27 @@
closetext
loadmovesprites
end
-; 0x7a5a9
-UnknownScript_0x7a5a9: ; 0x7a5a9
+UnknownScript_0x7a5a9:
writetext UnknownText_0x7a8e5
closetext
loadmovesprites
end
-; 0x7a5af
-UnknownScript_0x7a5af: ; 0x7a5af
+UnknownScript_0x7a5af:
writetext UnknownText_0x7a957
closetext
loadmovesprites
end
-; 0x7a5b5
-UnknownScript_0x7a5b5: ; 0x7a5b5
+UnknownScript_0x7a5b5:
setevent $0076
-UnknownScript_0x7a5b8: ; 0x7a5b8
+UnknownScript_0x7a5b8:
setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
special Function16218
closetext
loadmovesprites
end
-; 0x7a5c1
NeighborScript:
faceplayer
@@ -211,27 +191,23 @@
FridgeScript:
jumptext FridgeText
-MovementData_0x7a5fc: ; 0x7a5fc
+MovementData_0x7a5fc:
turn_head_right
step_end
-; 0x7a5fe
-MovementData_0x7a5fe: ; 0x7a5fe
+MovementData_0x7a5fe:
slow_step_right
step_end
-; 0x7a600
-MovementData_0x7a600: ; 0x7a600
+MovementData_0x7a600:
turn_head_left
step_end
-; 0x7a602
-MovementData_0x7a602: ; 0x7a602
+MovementData_0x7a602:
slow_step_left
step_end
-; 0x7a604
-UnknownText_0x7a604: ; 0x7a604
+UnknownText_0x7a604:
text "Oh, <PLAYER>…! Our"
line "neighbor, PROF."
@@ -250,9 +226,8 @@
para "Here you go!"
done
-; 0x7a6bd
-UnknownText_0x7a6bd: ; 0x7a6bd
+UnknownText_0x7a6bd:
text "#MON GEAR, or"
line "just #GEAR."
@@ -266,15 +241,13 @@
para "You mustn't forget"
line "that!"
done
-; 0x7a742
-UnknownText_0x7a742: ; 0x7a742
+UnknownText_0x7a742:
text "Is it Daylight"
line "Saving Time now?"
done
-; 0x7a763
-UnknownText_0x7a763: ; 0x7a763
+UnknownText_0x7a763:
text "Come home to"
line "adjust your clock"
@@ -285,9 +258,8 @@
line "know how to use"
cont "the PHONE?"
done
-; 0x7a7cb
-UnknownText_0x7a7cb: ; 0x7a7cb
+UnknownText_0x7a7cb:
text "Don't you just"
line "turn the #GEAR"
@@ -294,9 +266,8 @@
para "on and select the"
line "PHONE icon?"
done
-; 0x7a807
-UnknownText_0x7a807: ; 0x7a807
+UnknownText_0x7a807:
text "I'll read the"
line "instructions."
@@ -304,9 +275,8 @@
line "on and select the"
cont "PHONE icon."
done
-; 0x7a850
-UnknownText_0x7a850: ; 0x7a850
+UnknownText_0x7a850:
text "Phone numbers are"
line "stored in memory."
@@ -316,17 +286,15 @@
para "Gee, isn't that"
line "convenient?"
done
-; 0x7a8b5
-UnknownText_0x7a8b5: ; 0x7a8b5
+UnknownText_0x7a8b5:
text "PROF.ELM is wait-"
line "ing for you."
para "Hurry up, baby!"
done
-; 0x7a8e5
-UnknownText_0x7a8e5: ; 0x7a8e5
+UnknownText_0x7a8e5:
text "So, what was PROF."
line "ELM's errand?"
@@ -339,15 +307,13 @@
line "proud that people"
cont "rely on you."
done
-; 0x7a957
-UnknownText_0x7a957: ; 0x7a957
+UnknownText_0x7a957:
text "<PLAYER>, do it!"
para "I'm behind you all"
line "the way!"
done
-; 0x7a97d
NeighborMornIntroText:
text "Good morning,"
@@ -414,7 +380,7 @@
line "rolling too!"
done
-KrissHouse1F_MapEventHeader: ; 0x7ab31
+KrissHouse1F_MapEventHeader:
; filler
db 0, 0
@@ -443,4 +409,3 @@
person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, $06c8
person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, $06c8
person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, NeighborScript, $0792
-; 0x7abab
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -1,4 +1,4 @@
-KrissHouse2F_MapScriptHeader: ; 0x7abab
+KrissHouse2F_MapScriptHeader:
; trigger count
db 0
@@ -10,13 +10,11 @@
dbw 5, UnknownScript_0x7abb4
dbw 1, UnknownScript_0x7abc5
-; 0x7abb3
-UnknownScript_0x7abb3: ; 0x7abb3
+UnknownScript_0x7abb3:
end
-; 0x7abb4
-UnknownScript_0x7abb4: ; 0x7abb4
+UnknownScript_0x7abb4:
special Function27043
setevent $0007
checkevent $0036
@@ -23,16 +21,13 @@
iftrue UnknownScript_0x7abc4
jumpstd initializeevents
return
-; 0x7abc4
-UnknownScript_0x7abc4: ; 0x7abc4
+UnknownScript_0x7abc4:
return
-; 0x7abc5
-UnknownScript_0x7abc5: ; 0x7abc5
+UnknownScript_0x7abc5:
special Function26feb
return
-; 0x7abc9
db 0, 0, 0 ; filler
@@ -117,7 +112,7 @@
line "#MON CHANNEL…"
done
-KrissHouse2F_MapEventHeader: ; 0x7ac99
+KrissHouse2F_MapEventHeader:
; filler
db 0, 0
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -1,4 +1,4 @@
-KrissNeighborsHouse_MapScriptHeader: ; 0x7acec
+KrissNeighborsHouse_MapScriptHeader:
; trigger count
db 0
@@ -94,7 +94,7 @@
line "#MON CHANNEL…"
done
-KrissNeighborsHouse_MapEventHeader: ; 0x7aeb0
+KrissNeighborsHouse_MapEventHeader:
; filler
db 0, 0
@@ -116,4 +116,3 @@
db 2
person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, $ffff
person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, KrissNeighbor, $0793
-; 0x7aee9
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -1,4 +1,4 @@
-KurtsHouse_MapScriptHeader: ; 0x18e14f
+KurtsHouse_MapScriptHeader:
; trigger count
db 0
@@ -8,9 +8,8 @@
; callbacks
dbw 2, UnknownScript_0x18e154
-; 0x18e154
-UnknownScript_0x18e154: ; 0x18e154
+UnknownScript_0x18e154:
checkevent EVENT_CLEARED_SLOWPOKE_WELL
iffalse UnknownScript_0x18e177
checkevent $00c0
@@ -22,18 +21,16 @@
disappear $6
appear $3
return
-; 0x18e16f
-UnknownScript_0x18e16f: ; 0x18e16f
+UnknownScript_0x18e16f:
disappear $2
appear $5
disappear $3
appear $6
-UnknownScript_0x18e177: ; 0x18e177
+UnknownScript_0x18e177:
return
-; 0x18e178
-KurtScript_0x18e178: ; 0x18e178
+KurtScript_0x18e178:
faceplayer
loadfont
checkevent $0035
@@ -55,9 +52,8 @@
waitbutton
special RestartMapMusic
end
-; 0x18e1ab
-UnknownScript_0x18e1ab: ; 0x18e1ab
+UnknownScript_0x18e1ab:
spriteface $0, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e46c
@@ -66,15 +62,14 @@
waitbutton
special RestartMapMusic
end
-; 0x18e1bf
-UnknownScript_0x18e1bf: ; 0x18e1bf
+UnknownScript_0x18e1bf:
writetext UnknownText_0x18e615
keeptextopen
verbosegiveitem LURE_BALL, 1
iffalse UnknownScript_0x18e2b2
setevent $0035
-UnknownScript_0x18e1cc: ; 0x18e1cc
+UnknownScript_0x18e1cc:
checkevent $0000
iftrue UnknownScript_0x18e29f
checkevent $0258
@@ -93,7 +88,7 @@
iftrue UnknownScript_0x18e338
checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
iftrue UnknownScript_0x18e34e
-UnknownScript_0x18e202: ; 0x18e202
+UnknownScript_0x18e202:
checkevent $0001
iftrue UnknownScript_0x18e212
checkevent $0002
@@ -100,7 +95,7 @@
iftrue UnknownScript_0x18e212
writetext UnknownText_0x18e6c9
closetext
-UnknownScript_0x18e212: ; 0x18e212
+UnknownScript_0x18e212:
checkitem RED_APRICORN
iftrue UnknownScript_0x18e249
checkitem BLU_APRICORN
@@ -121,16 +116,14 @@
iftrue UnknownScript_0x18e243
loadmovesprites
end
-; 0x18e243
-UnknownScript_0x18e243: ; 0x18e243
+UnknownScript_0x18e243:
writetext UnknownText_0x18e6c9
closetext
loadmovesprites
end
-; 0x18e249
-UnknownScript_0x18e249: ; 0x18e249
+UnknownScript_0x18e249:
writetext UnknownText_0x18e736
keeptextopen
setevent $0002
@@ -144,66 +137,56 @@
if_equal $65, UnknownScript_0x18e293
setevent $0258
jump UnknownScript_0x18e299
-; 0x18e275
-UnknownScript_0x18e275: ; 0x18e275
+UnknownScript_0x18e275:
setevent $0259
jump UnknownScript_0x18e299
-; 0x18e27b
-UnknownScript_0x18e27b: ; 0x18e27b
+UnknownScript_0x18e27b:
setevent $025a
jump UnknownScript_0x18e299
-; 0x18e281
-UnknownScript_0x18e281: ; 0x18e281
+UnknownScript_0x18e281:
setevent $025b
jump UnknownScript_0x18e299
-; 0x18e287
-UnknownScript_0x18e287: ; 0x18e287
+UnknownScript_0x18e287:
setevent $025c
jump UnknownScript_0x18e299
-; 0x18e28d
-UnknownScript_0x18e28d: ; 0x18e28d
+UnknownScript_0x18e28d:
setevent $025d
jump UnknownScript_0x18e299
-; 0x18e293
-UnknownScript_0x18e293: ; 0x18e293
+UnknownScript_0x18e293:
setevent $025e
jump UnknownScript_0x18e299
-; 0x18e299
-UnknownScript_0x18e299: ; 0x18e299
+UnknownScript_0x18e299:
setevent $0000
setflag $0050
-UnknownScript_0x18e29f: ; 0x18e29f
+UnknownScript_0x18e29f:
writetext UnknownText_0x18e779
closetext
loadmovesprites
end
-; 0x18e2a5
-UnknownScript_0x18e2a5: ; 0x18e2a5
+UnknownScript_0x18e2a5:
writetext UnknownText_0x18e7bc
closetext
loadmovesprites
end
-; 0x18e2ab
-UnknownScript_0x18e2ab: ; 0x18e2ab
+UnknownScript_0x18e2ab:
setevent $0001
-UnknownScript_0x18e2ae: ; 0x18e2ae
+UnknownScript_0x18e2ae:
writetext UnknownText_0x18e82a
closetext
-UnknownScript_0x18e2b2: ; 0x18e2b2
+UnknownScript_0x18e2b2:
loadmovesprites
end
-; 0x18e2b4
-UnknownScript_0x18e2b4: ; 0x18e2b4
+UnknownScript_0x18e2b4:
checkflag $0050
iftrue UnknownScript_0x18e3c5
writetext UnknownText_0x18e7fb
@@ -210,12 +193,11 @@
keeptextopen
verbosegiveitem2 LEVEL_BALL, $16
iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e2c4: ; 0x18e2c4
+UnknownScript_0x18e2c4:
clearevent $0258
jump UnknownScript_0x18e2ab
-; 0x18e2ca
-UnknownScript_0x18e2ca: ; 0x18e2ca
+UnknownScript_0x18e2ca:
checkflag $0050
iftrue UnknownScript_0x18e3c5
writetext UnknownText_0x18e7fb
@@ -222,12 +204,11 @@
keeptextopen
verbosegiveitem2 LURE_BALL, $16
iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e2da: ; 0x18e2da
+UnknownScript_0x18e2da:
clearevent $0259
jump UnknownScript_0x18e2ab
-; 0x18e2e0
-UnknownScript_0x18e2e0: ; 0x18e2e0
+UnknownScript_0x18e2e0:
checkflag $0050
iftrue UnknownScript_0x18e3c5
writetext UnknownText_0x18e7fb
@@ -234,12 +215,11 @@
keeptextopen
verbosegiveitem2 MOON_BALL, $16
iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e2f0: ; 0x18e2f0
+UnknownScript_0x18e2f0:
clearevent $025a
jump UnknownScript_0x18e2ab
-; 0x18e2f6
-UnknownScript_0x18e2f6: ; 0x18e2f6
+UnknownScript_0x18e2f6:
checkflag $0050
iftrue UnknownScript_0x18e3c5
writetext UnknownText_0x18e7fb
@@ -246,12 +226,11 @@
keeptextopen
verbosegiveitem2 FRIEND_BALL, $16
iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e306: ; 0x18e306
+UnknownScript_0x18e306:
clearevent $025b
jump UnknownScript_0x18e2ab
-; 0x18e30c
-UnknownScript_0x18e30c: ; 0x18e30c
+UnknownScript_0x18e30c:
checkflag $0050
iftrue UnknownScript_0x18e3c5
writetext UnknownText_0x18e7fb
@@ -258,12 +237,11 @@
keeptextopen
verbosegiveitem2 FAST_BALL, $16
iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e31c: ; 0x18e31c
+UnknownScript_0x18e31c:
clearevent $025c
jump UnknownScript_0x18e2ab
-; 0x18e322
-UnknownScript_0x18e322: ; 0x18e322
+UnknownScript_0x18e322:
checkflag $0050
iftrue UnknownScript_0x18e3c5
writetext UnknownText_0x18e7fb
@@ -270,12 +248,11 @@
keeptextopen
verbosegiveitem2 HEAVY_BALL, $16
iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e332: ; 0x18e332
+UnknownScript_0x18e332:
clearevent $025d
jump UnknownScript_0x18e2ab
-; 0x18e338
-UnknownScript_0x18e338: ; 0x18e338
+UnknownScript_0x18e338:
checkflag $0050
iftrue UnknownScript_0x18e3c5
writetext UnknownText_0x18e7fb
@@ -282,12 +259,11 @@
keeptextopen
verbosegiveitem2 LOVE_BALL, $16
iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e348: ; 0x18e348
+UnknownScript_0x18e348:
clearevent $025e
jump UnknownScript_0x18e2ab
-; 0x18e34e
-UnknownScript_0x18e34e: ; 0x18e34e
+UnknownScript_0x18e34e:
checkevent $00bf
iftrue UnknownScript_0x18e368
checkitem GS_BALL
@@ -299,9 +275,8 @@
takeitem GS_BALL, 1
setflag $0050
end
-; 0x18e368
-UnknownScript_0x18e368: ; 0x18e368
+UnknownScript_0x18e368:
checkflag $0050
iffalse UnknownScript_0x18e378
writetext UnknownText_0x18e934
@@ -310,9 +285,8 @@
closetext
loadmovesprites
end
-; 0x18e378
-UnknownScript_0x18e378: ; 0x18e378
+UnknownScript_0x18e378:
writetext UnknownText_0x18e95c
closetext
loadmovesprites
@@ -328,13 +302,12 @@
playsound SFX_FLY
applymovement $2, MovementData_0x18e466
jump UnknownScript_0x18e3ac
-; 0x18e3a2
-UnknownScript_0x18e3a2: ; 0x18e3a2
+UnknownScript_0x18e3a2:
spriteface $0, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e46c
-UnknownScript_0x18e3ac: ; 0x18e3ac
+UnknownScript_0x18e3ac:
playsound SFX_EXIT_BUILDING
disappear $2
clearevent $07a4
@@ -342,14 +315,13 @@
special RestartMapMusic
domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $2
end
-; 0x18e3bd
-KurtScript_0x18e3bd: ; 0x18e3bd
+KurtScript_0x18e3bd:
faceplayer
loadfont
checkevent $00bf
iftrue UnknownScript_0x18e3e0
-UnknownScript_0x18e3c5: ; 0x18e3c5
+UnknownScript_0x18e3c5:
checkevent $00bb
iffalse UnknownScript_0x18e3d4
writetext UnknownText_0x18e7d8
@@ -357,9 +329,8 @@
loadmovesprites
spriteface $5, UP
end
-; 0x18e3d4
-UnknownScript_0x18e3d4: ; 0x18e3d4
+UnknownScript_0x18e3d4:
writetext UnknownText_0x18e863
closetext
loadmovesprites
@@ -366,9 +337,8 @@
spriteface $5, UP
setevent $00bb
end
-; 0x18e3e0
-UnknownScript_0x18e3e0: ; 0x18e3e0
+UnknownScript_0x18e3e0:
writetext UnknownText_0x18e934
closetext
spriteface $5, UP
@@ -376,7 +346,6 @@
closetext
loadmovesprites
end
-; 0x18e3ed
KurtsGranddaughter1:
faceplayer
@@ -438,7 +407,7 @@
spriteface $6, RIGHT
end
-KurtsGranddaughterFunScript: ; 0x18e448
+KurtsGranddaughterFunScript:
loadfont
writetext KurtsGranddaughterFunText
closetext
@@ -466,7 +435,7 @@
KurtsHouseRadio:
jumpstd radio2
-MovementData_0x18e466: ; 0x18e466
+MovementData_0x18e466:
big_step_down
big_step_down
big_step_down
@@ -473,9 +442,8 @@
big_step_down
big_step_down
step_end
-; 0x18e46c
-MovementData_0x18e46c: ; 0x18e46c
+MovementData_0x18e46c:
big_step_right
big_step_down
big_step_down
@@ -483,9 +451,8 @@
big_step_down
big_step_down
step_end
-; 0x18e473
-UnknownText_0x18e473: ; 0x18e473
+UnknownText_0x18e473:
text "Hm? Who are you?"
para "<PLAYER>, eh? You"
@@ -525,9 +492,8 @@
line "Old KURT is on his"
cont "way!"
done
-; 0x18e615
-UnknownText_0x18e615: ; 0x18e615
+UnknownText_0x18e615:
text "KURT: Hi, <PLAYER>!"
para "You handled your-"
@@ -545,9 +511,8 @@
para "This is all I have"
line "now, but take it."
done
-; 0x18e6c9
-UnknownText_0x18e6c9: ; 0x18e6c9
+UnknownText_0x18e6c9:
text "KURT: I make BALLS"
line "from APRICORNS."
@@ -558,9 +523,8 @@
para "I'll make BALLS"
line "out of them."
done
-; 0x18e736
-UnknownText_0x18e736: ; 0x18e736
+UnknownText_0x18e736:
text "KURT: You have an"
line "APRICORN for me?"
@@ -567,9 +531,8 @@
para "Fine! I'll turn it"
line "into a BALL."
done
-; 0x18e779
-UnknownText_0x18e779: ; 0x18e779
+UnknownText_0x18e779:
text "KURT: It'll take a"
line "day to make you a"
@@ -576,28 +539,24 @@
para "BALL. Come back"
line "for it later."
done
-; 0x18e7bc
-UnknownText_0x18e7bc: ; 0x18e7bc
+UnknownText_0x18e7bc:
text "KURT: Oh…"
line "That's a letdown."
done
-; 0x18e7d8
-UnknownText_0x18e7d8: ; 0x18e7d8
+UnknownText_0x18e7d8:
text "KURT: I'm working!"
line "Don't bother me!"
done
-; 0x18e7fb
-UnknownText_0x18e7fb: ; 0x18e7fb
+UnknownText_0x18e7fb:
text "KURT: Ah, <PLAYER>!"
line "I just finished"
cont "your BALL. Here!"
done
-; 0x18e82a
-UnknownText_0x18e82a: ; 0x18e82a
+UnknownText_0x18e82a:
text "KURT: That turned"
line "out great."
@@ -604,9 +563,8 @@
para "Try catching"
line "#MON with it."
done
-; 0x18e863
-UnknownText_0x18e863: ; 0x18e863
+UnknownText_0x18e863:
text "KURT: Now that my"
line "granddaughter is"
@@ -613,9 +571,8 @@
para "helping me, I can"
line "work much faster."
done
-; 0x18e8ab
-UnknownText_0x18e8ab: ; 0x18e8ab
+UnknownText_0x18e8ab:
text "Wh-what is that?"
para "I've never seen"
@@ -630,21 +587,18 @@
para "Let me check it"
line "for you."
done
-; 0x18e934
-UnknownText_0x18e934: ; 0x18e934
+UnknownText_0x18e934:
text "I'm checking it"
line "now."
done
-; 0x18e949
-UnknownText_0x18e949: ; 0x18e949
+UnknownText_0x18e949:
text "Ah-ha! I see!"
line "So…"
done
-; 0x18e95c
-UnknownText_0x18e95c: ; 0x18e95c
+UnknownText_0x18e95c:
text "<PLAYER>!"
para "This BALL started"
@@ -724,7 +678,7 @@
cont "tector."
done
-KurtsHouse_MapEventHeader: ; 0x18eba8
+KurtsHouse_MapEventHeader:
; filler
db 0, 0
@@ -753,4 +707,3 @@
person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, KurtsHouseSlowpoke, $06fd
person_event SPRITE_KURT, 7, 18, $7, $0, 255, 255, $0, 0, KurtScript_0x18e3bd, $073f
person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, KurtsGranddaughter2, $078d
-; 0x18ec1c
--- a/maps/LakeofRageMagikarpHouse.asm
+++ b/maps/LakeofRageMagikarpHouse.asm
@@ -1,12 +1,11 @@
-LakeofRageMagikarpHouse_MapScriptHeader: ; 0x19a6ac
+LakeofRageMagikarpHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19a6ae
-FishingGuruScript_0x19a6ae: ; 0x19a6ae
+FishingGuruScript_0x19a6ae:
faceplayer
loadfont
checkevent $003a
@@ -22,24 +21,21 @@
loadmovesprites
setevent $0038
end
-; 0x19a6d1
-UnknownScript_0x19a6d1: ; 0x19a6d1
+UnknownScript_0x19a6d1:
writetext UnknownText_0x19a84d
closetext
loadmovesprites
end
-; 0x19a6d7
-UnknownScript_0x19a6d7: ; 0x19a6d7
+UnknownScript_0x19a6d7:
writetext UnknownText_0x19a890
closetext
loadmovesprites
setevent $0039
end
-; 0x19a6e0
-UnknownScript_0x19a6e0: ; 0x19a6e0
+UnknownScript_0x19a6e0:
writebyte MAGIKARP
special Functionc276
iffalse UnknownScript_0x19a6d7
@@ -50,9 +46,8 @@
if_equal $1, UnknownScript_0x19a722
if_equal $2, UnknownScript_0x19a716
jump UnknownScript_0x19a6fe
-; 0x19a6fe
-UnknownScript_0x19a6fe: ; 0x19a6fe
+UnknownScript_0x19a6fe:
writetext UnknownText_0x19a977
keeptextopen
verbosegiveitem ELIXER, 1
@@ -62,43 +57,37 @@
loadmovesprites
clearevent $003a
end
-; 0x19a711
-UnknownScript_0x19a711: ; 0x19a711
+UnknownScript_0x19a711:
loadmovesprites
setevent $003a
end
-; 0x19a716
-UnknownScript_0x19a716: ; 0x19a716
+UnknownScript_0x19a716:
writetext UnknownText_0x19aa01
closetext
loadmovesprites
end
-; 0x19a71c
-UnknownScript_0x19a71c: ; 0x19a71c
+UnknownScript_0x19a71c:
writetext UnknownText_0x19aa5c
closetext
loadmovesprites
end
-; 0x19a722
-UnknownScript_0x19a722: ; 0x19a722
+UnknownScript_0x19a722:
writetext UnknownText_0x19aa79
closetext
loadmovesprites
end
-; 0x19a728
-UnknownScript_0x19a728: ; 0x19a728
+UnknownScript_0x19a728:
jumptext UnknownText_0x19aabc
-; 0x19a72b
MagikarpHouseBookshelf:
jumpstd difficultbookshelf
-UnknownText_0x19a72e: ; 0x19a72e
+UnknownText_0x19a72e:
text "LAKE OF RAGE is"
line "actually a crater"
@@ -126,9 +115,8 @@
para "I don't understand"
line "what's happening."
done
-; 0x19a84d
-UnknownText_0x19a84d: ; 0x19a84d
+UnknownText_0x19a84d:
text "The LAKE hasn't"
line "been normal since"
@@ -135,9 +123,8 @@
para "those men wearing"
line "black arrived."
done
-; 0x19a890
-UnknownText_0x19a890: ; 0x19a890
+UnknownText_0x19a890:
text "LAKE OF RAGE is"
line "back to normal."
@@ -153,9 +140,8 @@
line "Please help me if"
cont "you do."
done
-; 0x19a93e
-UnknownText_0x19a93e: ; 0x19a93e
+UnknownText_0x19a93e:
text "Ah, you have a"
line "MAGIKARP! Let's"
@@ -162,9 +148,8 @@
para "see how big that"
line "baby is."
done
-; 0x19a977
-UnknownText_0x19a977: ; 0x19a977
+UnknownText_0x19a977:
text "Wow! This one is"
line "outstanding!"
@@ -174,9 +159,8 @@
para "Take this as a"
line "memento!"
done
-; 0x19a9c3
-UnknownText_0x19a9c3: ; 0x19a9c3
+UnknownText_0x19a9c3:
text "The record is the"
line "important thing."
@@ -183,9 +167,8 @@
para "Think of that as"
line "a bonus!"
done
-; 0x19aa01
-UnknownText_0x19aa01: ; 0x19aa01
+UnknownText_0x19aa01:
text "Wow! This one is"
line "outstanding!"
@@ -195,15 +178,13 @@
para "seen a bigger one"
line "before."
done
-; 0x19aa5c
-UnknownText_0x19aa5c: ; 0x19aa5c
+UnknownText_0x19aa5c:
text "What? That's not a"
line "MAGIKARP!"
done
-; 0x19aa79
-UnknownText_0x19aa79: ; 0x19aa79
+UnknownText_0x19aa79:
text "Oh… So you didn't"
line "get one good"
@@ -210,9 +191,8 @@
para "enough to show me?"
line "Maybe next time."
done
-; 0x19aabc
-UnknownText_0x19aabc: ; 0x19aabc
+UnknownText_0x19aabc:
text "CURRENT RECORD"
para "@"
@@ -221,9 +201,8 @@
line "@"
text_from_ram StringBuffer4
db "@@"
-; 0x19aae2
-LakeofRageMagikarpHouse_MapEventHeader: ; 0x19aae2
+LakeofRageMagikarpHouse_MapEventHeader:
; filler
db 0, 0
@@ -243,4 +222,3 @@
; people-events
db 1
person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, $ffff
-; 0x19ab09
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -1,24 +1,20 @@
-LavRadioTower1F_MapScriptHeader: ; 0x7ee61
+LavRadioTower1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7ee63
-ReceptionistScript_0x7ee63: ; 0x7ee63
+ReceptionistScript_0x7ee63:
jumptextfaceplayer UnknownText_0x7eebf
-; 0x7ee66
-OfficerScript_0x7ee66: ; 0x7ee66
+OfficerScript_0x7ee66:
jumptextfaceplayer UnknownText_0x7eefa
-; 0x7ee69
-SuperNerdScript_0x7ee69: ; 0x7ee69
+SuperNerdScript_0x7ee69:
jumptextfaceplayer UnknownText_0x7ef90
-; 0x7ee6c
-GentlemanScript_0x7ee6c: ; 0x7ee6c
+GentlemanScript_0x7ee6c:
faceplayer
loadfont
checkflag $0003
@@ -29,31 +25,27 @@
closetext
loadmovesprites
end
-; 0x7ee80
-.UnknownScript_0x7ee80: ; 0x7ee80
+.UnknownScript_0x7ee80:
writetext UnknownText_0x7f0a1
keeptextopen
stringtotext .expncardname, $1
scall .UnknownScript_0x7ee94
setflag $0003
-.UnknownScript_0x7ee8e ; 0x7ee8e
+.UnknownScript_0x7ee8e
writetext UnknownText_0x7f141
closetext
loadmovesprites
end
-; 0x7ee94
-.UnknownScript_0x7ee94 ; 0x7ee94
+.UnknownScript_0x7ee94
jumpstd $002f
end
-; 0x7ee98
-.expncardname ; 0x7ee98
+.expncardname
db "EXPN CARD@"
-; 0x7eea2
-SuperNerdScript_0x7eea2: ; 0x7eea2
+SuperNerdScript_0x7eea2:
faceplayer
loadfont
checkflag $0003
@@ -62,28 +54,23 @@
closetext
loadmovesprites
end
-; 0x7eeb0
-UnknownScript_0x7eeb0: ; 0x7eeb0
+UnknownScript_0x7eeb0:
writetext UnknownText_0x7f248
closetext
loadmovesprites
end
-; 0x7eeb6
-MapLavRadioTower1FSignpost0Script: ; 0x7eeb6
+MapLavRadioTower1FSignpost0Script:
jumptext UnknownText_0x7f2e3
-; 0x7eeb9
-MapLavRadioTower1FSignpost1Script: ; 0x7eeb9
+MapLavRadioTower1FSignpost1Script:
jumptext UnknownText_0x7f32d
-; 0x7eebc
-UnknownScript_0x7eebc: ; 0x7eebc
+UnknownScript_0x7eebc:
jumptext UnknownText_0x7f36b
-; 0x7eebf
-UnknownText_0x7eebf: ; 0x7eebf
+UnknownText_0x7eebf:
text "Welcome!"
line "Feel free to look"
@@ -90,9 +77,8 @@
para "around anywhere on"
line "this floor."
done
-; 0x7eefa
-UnknownText_0x7eefa: ; 0x7eefa
+UnknownText_0x7eefa:
text "Sorry, but you can"
line "only tour the"
cont "ground floor."
@@ -106,9 +92,8 @@
para "have had to step"
line "up our security."
done
-; 0x7ef90
-UnknownText_0x7ef90: ; 0x7ef90
+UnknownText_0x7ef90:
text "Many people are"
line "hard at work here"
@@ -119,9 +104,8 @@
line "their best to put"
cont "on good shows."
done
-; 0x7effb
-UnknownText_0x7effb: ; 0x7effb
+UnknownText_0x7effb:
text "Oh, no, no, no!"
para "We've been off the"
@@ -138,9 +122,8 @@
para "I'll be ruined!"
done
-; 0x7f0a1
-UnknownText_0x7f0a1: ; 0x7f0a1
+UnknownText_0x7f0a1:
text "Ah! So you're the"
line "<PLAY_G> who solved"
@@ -156,9 +139,8 @@
para "Please take this"
line "as my thanks."
done
-; 0x7f141
-UnknownText_0x7f141: ; 0x7f141
+UnknownText_0x7f141:
text "With that thing,"
line "you can tune into"
@@ -167,9 +149,8 @@
para "Gahahahaha!"
done
-; 0x7f193
-UnknownText_0x7f193: ; 0x7f193
+UnknownText_0x7f193:
text "Hey there!"
para "I am the super"
@@ -187,9 +168,8 @@
para "can tune in. You'd"
line "better get one!"
done
-; 0x7f248
-UnknownText_0x7f248: ; 0x7f248
+UnknownText_0x7f248:
text "Hey there!"
para "I am the super"
@@ -205,9 +185,8 @@
line "Grab your music"
cont "off the air!"
done
-; 0x7f2e3
-UnknownText_0x7f2e3: ; 0x7f2e3
+UnknownText_0x7f2e3:
text "1F RECEPTION"
line "2F SALES"
@@ -217,9 +196,8 @@
para "5F DIRECTOR'S"
line " OFFICE"
done
-; 0x7f32d
-UnknownText_0x7f32d: ; 0x7f32d
+UnknownText_0x7f32d:
text "Perk Up #MON"
line "with Mellow Sounds"
@@ -226,9 +204,8 @@
para "of the # FLUTE"
line "on CHANNEL 20"
done
-; 0x7f36b
-UnknownText_0x7f36b: ; 0x7f36b
+UnknownText_0x7f36b:
text "Wow! A full rack"
line "of #MON CDs and"
cont "videos."
@@ -236,9 +213,8 @@
para "This must be the"
line "reference library."
done
-; 0x7f3b9
-LavRadioTower1F_MapEventHeader: ; 0x7f3b9
+LavRadioTower1F_MapEventHeader:
; filler
db 0, 0
@@ -262,4 +238,3 @@
person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, $ffff
person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, $ffff
person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, $ffff
-; 0x7f414
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -1,27 +1,23 @@
-LavenderMart_MapScriptHeader: ; 0x7eb1a
+LavenderMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7eb1c
-ClerkScript_0x7eb1c: ; 0x7eb1c
+ClerkScript_0x7eb1c:
loadfont
pokemart $0, $0015
loadmovesprites
end
-; 0x7eb23
-PokefanMScript_0x7eb23: ; 0x7eb23
+PokefanMScript_0x7eb23:
jumptextfaceplayer UnknownText_0x7eb29
-; 0x7eb26
-RockerScript_0x7eb26: ; 0x7eb26
+RockerScript_0x7eb26:
jumptextfaceplayer UnknownText_0x7ebac
-; 0x7eb29
-UnknownText_0x7eb29: ; 0x7eb29
+UnknownText_0x7eb29:
text "REPEL is a neces-"
line "sity if you are"
@@ -34,9 +30,8 @@
para "haven't made it to"
line "all the caves."
done
-; 0x7ebac
-UnknownText_0x7ebac: ; 0x7ebac
+UnknownText_0x7ebac:
text "I heard about a"
line "craftsman who"
@@ -46,9 +41,8 @@
para "of AZALEA. I wish"
line "I had some."
done
-; 0x7ec0e
-LavenderMart_MapEventHeader: ; 0x7ec0e
+LavenderMart_MapEventHeader:
; filler
db 0, 0
@@ -68,4 +62,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, $ffff
person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, $ffff
person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, $ffff
-; 0x7ec45
--- a/maps/LavenderPokeCenter1F.asm
+++ b/maps/LavenderPokeCenter1F.asm
@@ -1,24 +1,20 @@
-LavenderPokeCenter1F_MapScriptHeader: ; 0x7e69e
+LavenderPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e6a0
-NurseScript_0x7e6a0: ; 0x7e6a0
+NurseScript_0x7e6a0:
jumpstd pokecenternurse
-; 0x7e6a3
-GentlemanScript_0x7e6a3: ; 0x7e6a3
+GentlemanScript_0x7e6a3:
jumptextfaceplayer UnknownText_0x7e6bd
-; 0x7e6a6
-TeacherScript_0x7e6a6: ; 0x7e6a6
+TeacherScript_0x7e6a6:
jumptextfaceplayer UnknownText_0x7e710
-; 0x7e6a9
-YoungsterScript_0x7e6a9: ; 0x7e6a9
+YoungsterScript_0x7e6a9:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -27,16 +23,14 @@
closetext
loadmovesprites
end
-; 0x7e6b7
-UnknownScript_0x7e6b7: ; 0x7e6b7
+UnknownScript_0x7e6b7:
writetext UnknownText_0x7e7ed
closetext
loadmovesprites
end
-; 0x7e6bd
-UnknownText_0x7e6bd: ; 0x7e6bd
+UnknownText_0x7e6bd:
text "To the north of"
line "LAVENDER is ROCK"
@@ -44,9 +38,8 @@
line "it to get to the"
cont "POWER PLANT."
done
-; 0x7e710
-UnknownText_0x7e710: ; 0x7e710
+UnknownText_0x7e710:
text "There's a radio"
line "program that plays"
cont "# FLUTE music."
@@ -55,9 +48,8 @@
line "needs an EXPN CARD"
cont "to tune into it."
done
-; 0x7e779
-UnknownText_0x7e779: ; 0x7e779
+UnknownText_0x7e779:
text "If the POWER PLANT"
line "isn't running, the"
@@ -68,9 +60,8 @@
line "RADIO STATION"
cont "can't broadcast…"
done
-; 0x7e7ed
-UnknownText_0x7e7ed: ; 0x7e7ed
+UnknownText_0x7e7ed:
text "The DIRECTOR of"
line "the RADIO STATION"
cont "sure was happy."
@@ -82,9 +73,8 @@
line "PLANT is running"
cont "smoothly again."
done
-; 0x7e872
-LavenderPokeCenter1F_MapEventHeader: ; 0x7e872
+LavenderPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -106,4 +96,3 @@
person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, $ffff
person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, $ffff
person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, $ffff
-; 0x7e8bb
--- a/maps/LavenderPokeCenter2FBeta.asm
+++ b/maps/LavenderPokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-LavenderPokeCenter2FBeta_MapScriptHeader: ; 0x7e8bb
+LavenderPokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e8bd
-LavenderPokeCenter2FBeta_MapEventHeader: ; 0x7e8bd
+LavenderPokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x7e8c8
--- a/maps/LavenderTownSpeechHouse.asm
+++ b/maps/LavenderTownSpeechHouse.asm
@@ -1,19 +1,17 @@
-LavenderTownSpeechHouse_MapScriptHeader: ; 0x7ea45
+LavenderTownSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7ea47
-PokefanFScript_0x7ea47: ; 0x7ea47
+PokefanFScript_0x7ea47:
jumptextfaceplayer UnknownText_0x7ea4d
-; 0x7ea4a
LavenderTownSpeechHouseBookshelf:
jumpstd picturebookshelf
-UnknownText_0x7ea4d: ; 0x7ea4d
+UnknownText_0x7ea4d:
text "LAVENDER is a"
line "tiny, quiet town"
@@ -26,9 +24,8 @@
para "RADIO TOWER was"
line "built."
done
-; 0x7eac4
-LavenderTownSpeechHouse_MapEventHeader: ; 0x7eac4
+LavenderTownSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -48,4 +45,3 @@
; people-events
db 1
person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, $ffff
-; 0x7eaeb
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -1,4 +1,4 @@
-MahoganyMart1F_MapScriptHeader: ; 0x6c349
+MahoganyMart1F_MapScriptHeader:
; trigger count
db 2
@@ -12,29 +12,24 @@
; callbacks
dbw 1, UnknownScript_0x6c35b
-; 0x6c356
-UnknownScript_0x6c356: ; 0x6c356
+UnknownScript_0x6c356:
end
-; 0x6c357
-UnknownScript_0x6c357: ; 0x6c357
+UnknownScript_0x6c357:
priorityjump UnknownScript_0x6c38f
end
-; 0x6c35b
-UnknownScript_0x6c35b: ; 0x6c35b
+UnknownScript_0x6c35b:
checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
iftrue UnknownScript_0x6c362
return
-; 0x6c362
-UnknownScript_0x6c362: ; 0x6c362
+UnknownScript_0x6c362:
changeblock $6, $2, $1e
return
-; 0x6c367
-PharmacistScript_0x6c367: ; 0x6c367
+PharmacistScript_0x6c367:
faceplayer
loadfont
checkevent EVENT_DECIDED_TO_HELP_LANCE
@@ -42,16 +37,14 @@
pokemart $0, $000f
loadmovesprites
end
-; 0x6c375
-UnknownScript_0x6c375: ; 0x6c375
+UnknownScript_0x6c375:
writetext UnknownText_0x6c46b
closetext
loadmovesprites
end
-; 0x6c37b
-BlackBeltScript_0x6c37b: ; 0x6c37b
+BlackBeltScript_0x6c37b:
faceplayer
loadfont
checkevent EVENT_DECIDED_TO_HELP_LANCE
@@ -60,16 +53,14 @@
closetext
loadmovesprites
end
-; 0x6c389
-UnknownScript_0x6c389: ; 0x6c389
+UnknownScript_0x6c389:
writetext UnknownText_0x6c501
closetext
loadmovesprites
end
-; 0x6c38f
-UnknownScript_0x6c38f: ; 0x6c38f
+UnknownScript_0x6c38f:
pause 15
loadfont
writetext UnknownText_0x6c52a
@@ -111,25 +102,22 @@
dotrigger $0
waitbutton
end
-; 0x6c3ee
-GrannyScript_0x6c3ee: ; 0x6c3ee
+GrannyScript_0x6c3ee:
faceplayer
loadfont
pokemart $0, $0010
loadmovesprites
end
-; 0x6c3f6
-MovementData_0x6c3f6: ; 0x6c3f6
+MovementData_0x6c3f6:
fix_facing
big_step_left
big_step_right
remove_fixed_facing
step_end
-; 0x6c3fb
-MovementData_0x6c3fb: ; 0x6c3fb
+MovementData_0x6c3fb:
fix_facing
big_step_left
remove_fixed_facing
@@ -138,41 +126,35 @@
turn_head_up
turn_head_right
step_end
-; 0x6c403
-MovementData_0x6c403: ; 0x6c403
+MovementData_0x6c403:
fix_facing
big_step_left
remove_fixed_facing
step_end
-; 0x6c407
-MovementData_0x6c407: ; 0x6c407
+MovementData_0x6c407:
slow_step_left
turn_head_down
step_end
-; 0x6c40a
-MovementData_0x6c40a: ; 0x6c40a
+MovementData_0x6c40a:
slow_step_right
slow_step_up
slow_step_up
step_end
-; 0x6c40e
-MovementData_0x6c40e: ; 0x6c40e
+MovementData_0x6c40e:
slow_step_up
slow_step_right
slow_step_right
step_end
-; 0x6c412
-MovementData_0x6c412: ; 0x6c412
+MovementData_0x6c412:
slow_step_right
step_end
-; 0x6c414
-UnknownText_0x6c414: ; 0x6c414
+UnknownText_0x6c414:
text "Hello, kiddo!"
para "How would you like"
@@ -181,16 +163,14 @@
para "It's the thing to"
line "eat in MAHOGANY!"
done
-; 0x6c46b
-UnknownText_0x6c46b: ; 0x6c46b
+UnknownText_0x6c46b:
text "Arrgh… You found"
line "the secret stair-"
cont "way…"
done
-; 0x6c494
-UnknownText_0x6c494: ; 0x6c494
+UnknownText_0x6c494:
text "Heheh! The experi-"
line "ment worked like a"
cont "charm."
@@ -201,23 +181,20 @@
para "GYARADOS are big"
line "moneymakers."
done
-; 0x6c501
-UnknownText_0x6c501: ; 0x6c501
+UnknownText_0x6c501:
text "Urrgh…"
para "That guy's dragon"
line "#MON are tough…"
done
-; 0x6c52a
-UnknownText_0x6c52a: ; 0x6c52a
+UnknownText_0x6c52a:
text "LANCE: DRAGONITE,"
line "HYPER BEAM."
done
-; 0x6c549
-UnknownText_0x6c549: ; 0x6c549
+UnknownText_0x6c549:
text "What took you,"
line "<PLAY_G>?"
@@ -227,15 +204,13 @@
para "signal is coming"
line "from here."
done
-; 0x6c59e
-UnknownText_0x6c59e: ; 0x6c59e
+UnknownText_0x6c59e:
text "The stairs are"
line "right here."
done
-; 0x6c5ba
-UnknownText_0x6c5ba: ; 0x6c5ba
+UnknownText_0x6c5ba:
text "LANCE: <PLAY_G>, we"
line "should split up to"
@@ -242,9 +217,8 @@
para "check this place."
line "I'll go first."
done
-; 0x6c5fb
-MahoganyMart1F_MapEventHeader: ; 0x6c5fb
+MahoganyMart1F_MapEventHeader:
; filler
db 0, 0
@@ -267,4 +241,3 @@
person_event SPRITE_LANCE, 10, 8, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5
person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5
person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, $0736
-; 0x6c651
--- a/maps/MahoganyPokeCenter1F.asm
+++ b/maps/MahoganyPokeCenter1F.asm
@@ -1,28 +1,23 @@
-MahoganyPokeCenter1F_MapScriptHeader: ; 0x19a354
+MahoganyPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19a356
-NurseScript_0x19a356: ; 0x19a356
+NurseScript_0x19a356:
jumpstd pokecenternurse
-; 0x19a359
-PokefanMScript_0x19a359: ; 0x19a359
+PokefanMScript_0x19a359:
jumptextfaceplayer UnknownText_0x19a362
-; 0x19a35c
-YoungsterScript_0x19a35c: ; 0x19a35c
+YoungsterScript_0x19a35c:
jumptextfaceplayer UnknownText_0x19a3b3
-; 0x19a35f
-CooltrainerFScript_0x19a35f: ; 0x19a35f
+CooltrainerFScript_0x19a35f:
jumptextfaceplayer UnknownText_0x19a418
-; 0x19a362
-UnknownText_0x19a362: ; 0x19a362
+UnknownText_0x19a362:
text "What's this? TEAM"
line "ROCKET has come"
cont "back?"
@@ -31,9 +26,8 @@
line "black at LAKE OF"
cont "RAGE…"
done
-; 0x19a3b3
-UnknownText_0x19a3b3: ; 0x19a3b3
+UnknownText_0x19a3b3:
text "I stop my #MON"
line "from evolving too"
cont "early."
@@ -43,9 +37,8 @@
cont "fore I let them"
cont "evolve."
done
-; 0x19a418
-UnknownText_0x19a418: ; 0x19a418
+UnknownText_0x19a418:
text "#MON do become"
line "stronger when they"
@@ -53,9 +46,8 @@
line "also learn moves"
cont "more slowly."
done
-; 0x19a46a
-MahoganyPokeCenter1F_MapEventHeader: ; 0x19a46a
+MahoganyPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -77,4 +69,3 @@
person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, $ffff
person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, $ffff
person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, $ffff
-; 0x19a4b3
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -1,16 +1,14 @@
-MahoganyRedGyaradosSpeechHouse_MapScriptHeader: ; 0x19997d
+MahoganyRedGyaradosSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19997f
-BlackBeltScript_0x19997f: ; 0x19997f
+BlackBeltScript_0x19997f:
jumptextfaceplayer UnknownText_0x19999c
-; 0x199982
-TeacherScript_0x199982: ; 0x199982
+TeacherScript_0x199982:
faceplayer
loadfont
checkflag $0013
@@ -19,14 +17,12 @@
closetext
loadmovesprites
end
-; 0x199990
-UnknownScript_0x199990: ; 0x199990
+UnknownScript_0x199990:
writetext UnknownText_0x199a3d
closetext
loadmovesprites
end
-; 0x199996
UnknownScript_0x195996:
jumpstd picturebookshelf
@@ -34,7 +30,7 @@
UnknownScript_0x195999:
jumpstd magazinebookshelf
-UnknownText_0x19999c: ; 0x19999c
+UnknownText_0x19999c:
text "I heard that a red"
line "GYARADOS appeared"
cont "at the LAKE."
@@ -45,16 +41,14 @@
para "GYARADOS are rare"
line "in that lake…"
done
-; 0x199a0e
-UnknownText_0x199a0e: ; 0x199a0e
+UnknownText_0x199a0e:
text "My favorite radio"
line "program? I'd say"
cont "#MON MUSIC."
done
-; 0x199a3d
-UnknownText_0x199a3d: ; 0x199a3d
+UnknownText_0x199a3d:
text "I've been hearing"
line "laughter on the"
@@ -61,9 +55,8 @@
para "radio…"
line "It's creepy."
done
-; 0x199a72
-MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; 0x199a72
+MahoganyRedGyaradosSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -82,4 +75,3 @@
db 2
person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, $ffff
person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, $ffff
-; 0x199a9c
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -1,12 +1,11 @@
-ManiasHouse_MapScriptHeader: ; 0x9d276
+ManiasHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9d278
-RockerScript_0x9d278: ; 0x9d278
+RockerScript_0x9d278:
faceplayer
loadfont
checkevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
@@ -27,9 +26,8 @@
loadmovesprites
setevent EVENT_GOT_SHUCKIE
end
-; 0x9d2a4
-UnknownScript_0x9d2a4: ; 0x9d2a4
+UnknownScript_0x9d2a4:
checkflag $0055
iffalse UnknownScript_0x9d2bc
writetext UnknownText_0x9d3ed
@@ -36,23 +34,20 @@
closetext
loadmovesprites
end
-; 0x9d2b0
-UnknownScript_0x9d2b0: ; 0x9d2b0
+UnknownScript_0x9d2b0:
writetext UnknownText_0x9d42f
closetext
loadmovesprites
end
-; 0x9d2b6
-UnknownScript_0x9d2b6: ; 0x9d2b6
+UnknownScript_0x9d2b6:
writetext UnknownText_0x9d449
closetext
loadmovesprites
end
-; 0x9d2bc
-UnknownScript_0x9d2bc: ; 0x9d2bc
+UnknownScript_0x9d2bc:
writetext UnknownText_0x9d470
yesorno
iffalse UnknownScript_0x9d2ee
@@ -66,49 +61,42 @@
loadmovesprites
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end
-; 0x9d2df
-UnknownScript_0x9d2df: ; 0x9d2df
+UnknownScript_0x9d2df:
writetext UnknownText_0x9d4bd
closetext
loadmovesprites
end
-; 0x9d2e5
-UnknownScript_0x9d2e5: ; 0x9d2e5
+UnknownScript_0x9d2e5:
writetext UnknownText_0x9d4e3
closetext
loadmovesprites
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end
-; 0x9d2ee
-UnknownScript_0x9d2ee: ; 0x9d2ee
+UnknownScript_0x9d2ee:
writetext UnknownText_0x9d53f
closetext
loadmovesprites
end
-; 0x9d2f4
-UnknownScript_0x9d2f4: ; 0x9d2f4
+UnknownScript_0x9d2f4:
writetext UnknownText_0x9d5b0
closetext
loadmovesprites
end
-; 0x9d2fa
-UnknownScript_0x9d2fa: ; 0x9d2fa
+UnknownScript_0x9d2fa:
writetext UnknownText_0x9d56c
closetext
loadmovesprites
end
-; 0x9d300
-UnknownScript_0x9d300: ; 0x9d300
+UnknownScript_0x9d300:
jumpstd picturebookshelf
-; 0x9d303
-UnknownText_0x9d303: ; 0x9d303
+UnknownText_0x9d303:
text "I, I'm in shock!"
para "A guy about your"
@@ -131,36 +119,31 @@
para "after my #MON"
line "for a while?"
done
-; 0x9d3ed
-UnknownText_0x9d3ed: ; 0x9d3ed
+UnknownText_0x9d3ed:
text "Oh, thank you!"
para "Take good care of"
line "it, please!"
done
-; 0x9d41b
-UnknownText_0x9d41b: ; 0x9d41b
+UnknownText_0x9d41b:
text "<PLAYER> received a"
line "#MON."
done
-; 0x9d42f
-UnknownText_0x9d42f: ; 0x9d42f
+UnknownText_0x9d42f:
text "Your #MON party"
line "is full."
done
-; 0x9d449
-UnknownText_0x9d449: ; 0x9d449
+UnknownText_0x9d449:
text "Oh, no… What'll"
line "I do if he comes"
cont "back?"
done
-; 0x9d470
-UnknownText_0x9d470: ; 0x9d470
+UnknownText_0x9d470:
text "Hi! How's my #-"
line "MON?"
@@ -168,21 +151,18 @@
line "now, so may I have"
cont "it back?"
done
-; 0x9d4b1
-UnknownText_0x9d4b1: ; 0x9d4b1
+UnknownText_0x9d4b1:
text "Thank you!"
done
-; 0x9d4bd
-UnknownText_0x9d4bd: ; 0x9d4bd
+UnknownText_0x9d4bd:
text "Hey, you don't"
line "have my #MON"
cont "with you."
done
-; 0x9d4e3
-UnknownText_0x9d4e3: ; 0x9d4e3
+UnknownText_0x9d4e3:
text "My #MON has"
line "come to like you."
@@ -192,16 +172,14 @@
para "But promise to"
line "be good to it!"
done
-; 0x9d53f
-UnknownText_0x9d53f: ; 0x9d53f
+UnknownText_0x9d53f:
text "Oh, no, no… That's"
line "the same as being"
cont "robbed."
done
-; 0x9d56c
-UnknownText_0x9d56c: ; 0x9d56c
+UnknownText_0x9d56c:
text "For #MON, hap-"
line "piness is being"
@@ -208,9 +186,8 @@
para "with a person who"
line "treats them well."
done
-; 0x9d5b0
-UnknownText_0x9d5b0: ; 0x9d5b0
+UnknownText_0x9d5b0:
text "If I take my #-"
line "MON back, what are"
@@ -217,9 +194,8 @@
para "you going to use"
line "in battle?"
done
-; 0x9d5f0
-ManiasHouse_MapEventHeader: ; 0x9d5f0
+ManiasHouse_MapEventHeader:
; filler
db 0, 0
@@ -237,4 +213,3 @@
; people-events
db 1
person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, $ffff
-; 0x9d60d
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,4 +1,4 @@
-MobileBattleRoom_MapScriptHeader: ; 0x1935c4
+MobileBattleRoom_MapScriptHeader:
; trigger count
db 2
@@ -8,24 +8,20 @@
; callback count
db 0
-; 0x1935ce
-UnknownScript_0x1935ce: ; 0x1935ce
+UnknownScript_0x1935ce:
priorityjump UnknownScript_0x1935d3
end
-; 0x1935d2
-UnknownScript_0x1935d2: ; 0x1935d2
+UnknownScript_0x1935d2:
end
-; 0x1935d3
-UnknownScript_0x1935d3: ; 0x1935d3
+UnknownScript_0x1935d3:
dotrigger $1
domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $5
end
-; 0x1935da
-MapMobileBattleRoomSignpost0Script: ; 0x1935da
+MapMobileBattleRoomSignpost0Script:
refreshscreen $0
special Function1037c2
if_equal $1, UnknownScript_0x193619
@@ -34,9 +30,8 @@
if_equal $1, UnknownScript_0x1935f4
if_equal $2, UnknownScript_0x19360d
jump UnknownScript_0x193624
-; 0x1935f4
-UnknownScript_0x1935f4: ; 0x1935f4
+UnknownScript_0x1935f4:
writetext UnknownText_0x193644
pause 20
loadmovesprites
@@ -47,36 +42,33 @@
special Function8c079
special RestartMapMusic
refreshscreen $0
-UnknownScript_0x19360d: ; 0x19360d
+UnknownScript_0x19360d:
special Function1060a2
special HealParty
special Function10383c
iftrue UnknownScript_0x193624
-UnknownScript_0x193619: ; 0x193619
+UnknownScript_0x193619:
special Function10387b
writetext UnknownText_0x193626
closetext
reloadmappart
special Function101225
-UnknownScript_0x193624: ; 0x193624
+UnknownScript_0x193624:
loadmovesprites
end
-; 0x193626
-UnknownText_0x193626: ; 0x193626
+UnknownText_0x193626:
text "Establishing"
line "communications…"
done
-; 0x193644
-UnknownText_0x193644: ; 0x193644
+UnknownText_0x193644:
text "Your #MON will"
line "be fully healed"
cont "before battle."
done
-; 0x193673
-MobileBattleRoom_MapEventHeader: ; 0x193673
+MobileBattleRoom_MapEventHeader:
; filler
db 0, 0
@@ -94,4 +86,3 @@
; people-events
db 0
-; 0x193688
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -1,4 +1,4 @@
-MobileTradeRoomMobile_MapScriptHeader: ; 0x19356c
+MobileTradeRoomMobile_MapScriptHeader:
; trigger count
db 2
@@ -8,24 +8,20 @@
; callback count
db 0
-; 0x193576
-UnknownScript_0x193576: ; 0x193576
+UnknownScript_0x193576:
priorityjump UnknownScript_0x19357b
end
-; 0x19357a
-UnknownScript_0x19357a: ; 0x19357a
+UnknownScript_0x19357a:
end
-; 0x19357b
-UnknownScript_0x19357b: ; 0x19357b
+UnknownScript_0x19357b:
dotrigger $1
domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $4
end
-; 0x193582
-MapMobileTradeRoomMobileSignpost0Script: ; 0x193582
+MapMobileTradeRoomMobileSignpost0Script:
refreshscreen $0
special Function1037c2
writetext UnknownText_0x193591
@@ -34,15 +30,13 @@
special Function101231
loadmovesprites
end
-; 0x193591
-UnknownText_0x193591: ; 0x193591
+UnknownText_0x193591:
text "Establishing"
line "communications…"
done
-; 0x1935af
-MobileTradeRoomMobile_MapEventHeader: ; 0x1935af
+MobileTradeRoomMobile_MapEventHeader:
; filler
db 0, 0
@@ -60,4 +54,3 @@
; people-events
db 0
-; 0x1935c4
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -1,4 +1,4 @@
-MountMoon_MapScriptHeader: ; 0x7407f
+MountMoon_MapScriptHeader:
; trigger count
db 2
@@ -8,18 +8,15 @@
; callback count
db 0
-; 0x74089
-UnknownScript_0x74089: ; 0x74089
+UnknownScript_0x74089:
priorityjump UnknownScript_0x7408e
end
-; 0x7408d
-UnknownScript_0x7408d: ; 0x7408d
+UnknownScript_0x7408d:
end
-; 0x7408e
-UnknownScript_0x7408e: ; 0x7408e
+UnknownScript_0x7408e:
spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
@@ -41,9 +38,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x740e3
-; 0x740c3
-UnknownScript_0x740c3: ; 0x740c3
+UnknownScript_0x740c3:
winlosstext UnknownText_0x7419d, UnknownText_0x742e0
setlasttalked $2
loadtrainer RIVAL2, 1
@@ -51,9 +47,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x740e3
-; 0x740d3
-UnknownScript_0x740d3: ; 0x740d3
+UnknownScript_0x740d3:
winlosstext UnknownText_0x7419d, UnknownText_0x742e0
setlasttalked $2
loadtrainer RIVAL2, 2
@@ -61,9 +56,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x740e3
-; 0x740e3
-UnknownScript_0x740e3: ; 0x740e3
+UnknownScript_0x740e3:
playmusic MUSIC_RIVAL_AFTER
loadfont
writetext UnknownText_0x741fa
@@ -75,16 +69,14 @@
setevent EVENT_BEAT_RIVAL_IN_MT_MOON
playmapmusic
end
-; 0x740f9
-MovementData_0x740f9: ; 0x740f9
+MovementData_0x740f9:
step_left
step_left
step_left
step_end
-; 0x740fd
-MovementData_0x740fd: ; 0x740fd
+MovementData_0x740fd:
step_right
step_right
step_down
@@ -93,9 +85,8 @@
step_down
step_down
step_end
-; 0x74105
-UnknownText_0x74105: ; 0x74105
+UnknownText_0x74105:
text $56, " ", $56, " ", $56
para "It's been a while,"
@@ -114,9 +105,8 @@
para "<PLAYER>, now we'll"
line "show you!"
done
-; 0x7419d
-UnknownText_0x7419d: ; 0x7419d
+UnknownText_0x7419d:
text $56, " ", $56, " ", $56
para "I thought I raised"
@@ -128,9 +118,8 @@
para "…But it still "
line "wasn't enough…"
done
-; 0x741fa
-UnknownText_0x741fa: ; 0x741fa
+UnknownText_0x741fa:
text $56, " ", $56, " ", $56
para "…You won, fair"
@@ -155,9 +144,8 @@
para "how good I am by"
line "beating you."
done
-; 0x742e0
-UnknownText_0x742e0: ; 0x742e0
+UnknownText_0x742e0:
text $56, " ", $56, " ", $56
para "I've repaid my"
@@ -170,9 +158,8 @@
line "become the world's"
cont "greatest trainer."
done
-; 0x74356
-MountMoon_MapEventHeader: ; 0x74356
+MountMoon_MapEventHeader:
; filler
db 0, 0
@@ -196,4 +183,3 @@
; people-events
db 1
person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, $077a
-; 0x74391
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -1,31 +1,27 @@
-MountMoonGiftShop_MapScriptHeader: ; 0x771a6
+MountMoonGiftShop_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x771a8
-GrampsScript_0x771a8: ; 0x771a8
+GrampsScript_0x771a8:
faceplayer
loadfont
pokemart $0, $001f
loadmovesprites
end
-; 0x771b0
-LassScript_0x771b0: ; 0x771b0
+LassScript_0x771b0:
jumptextfaceplayer UnknownText_0x771b3
-; 0x771b3
-UnknownText_0x771b3: ; 0x771b3
+UnknownText_0x771b3:
text "When the sun goes"
line "down, CLEFAIRY"
cont "come out to play."
done
-; 0x771e7
-MountMoonGiftShop_MapEventHeader: ; 0x771e7
+MountMoonGiftShop_MapEventHeader:
; filler
db 0, 0
@@ -46,4 +42,3 @@
person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, $ffff
person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, $ffff
person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, $ffff
-; 0x7722b
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -1,4 +1,4 @@
-MountMoonSquare_MapScriptHeader: ; 0x77086
+MountMoonSquare_MapScriptHeader:
; trigger count
db 1
@@ -13,23 +13,19 @@
dbw 5, UnknownScript_0x77093
dbw 2, UnknownScript_0x77097
-; 0x77092
-UnknownScript_0x77092: ; 0x77092
+UnknownScript_0x77092:
end
-; 0x77093
-UnknownScript_0x77093: ; 0x77093
+UnknownScript_0x77093:
setevent $00ec
return
-; 0x77097
-UnknownScript_0x77097: ; 0x77097
+UnknownScript_0x77097:
disappear $4
return
-; 0x7709a
-UnknownScript_0x7709a: ; 0x7709a
+UnknownScript_0x7709a:
checkflag $0058
iftrue UnknownScript_0x77117
checkcode VAR_WEEKDAY
@@ -75,69 +71,57 @@
clearevent $00ec
setflag $0058
end
-; 0x77117
-UnknownScript_0x77117: ; 0x77117
+UnknownScript_0x77117:
end
-; 0x77118
-MapMountMoonSquareSignpostItem0: ; 0x77118
+MapMountMoonSquareSignpostItem0:
dw $00ec
db MOON_STONE
-; 0x7711b
-MapMountMoonSquareSignpost1Script: ; 0x7711b
+MapMountMoonSquareSignpost1Script:
jumptext UnknownText_0x7713b
-; 0x7711e
MtMoonSquareRock:
jumpstd smashrock
-MovementData_0x77121: ; 0x77121
+MovementData_0x77121:
step_up
step_end
-; 0x77123
-MovementData_0x77123: ; 0x77123
+MovementData_0x77123:
slow_step_down
slow_jump_step_down
step_end
-; 0x77126
-MovementData_0x77126: ; 0x77126
+MovementData_0x77126:
slow_jump_step_right
step_end
-; 0x77128
-MovementData_0x77128: ; 0x77128
+MovementData_0x77128:
slow_step_up
slow_jump_step_up
step_end
-; 0x7712b
-MovementData_0x7712b: ; 0x7712b
+MovementData_0x7712b:
slow_jump_step_left
step_end
-; 0x7712d
-MovementData_0x7712d: ; 0x7712d
+MovementData_0x7712d:
slow_step_down
slow_jump_step_down
step_end
-; 0x77130
-MovementData_0x77130: ; 0x77130
+MovementData_0x77130:
slow_step_down
step_end
-; 0x77132
-MovementData_0x77132: ; 0x77132
+MovementData_0x77132:
slow_step_right
step_end
-; 0x77134
-MovementData_0x77134: ; 0x77134
+MovementData_0x77134:
step_right
step_right
step_right
@@ -145,15 +129,13 @@
step_right
step_right
step_end
-; 0x7713b
-UnknownText_0x7713b: ; 0x7713b
+UnknownText_0x7713b:
text "MT.MOON SQUARE"
line "DON'T LITTER"
done
-; 0x77158
-MountMoonSquare_MapEventHeader: ; 0x77158
+MountMoonSquare_MapEventHeader:
; filler
db 0, 0
@@ -177,4 +159,3 @@
person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779
person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779
person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, MtMoonSquareRock, $0778
-; 0x771a6
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -1,26 +1,22 @@
-MountMortar1FOutside_MapScriptHeader: ; 0x7ddf4
+MountMortar1FOutside_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7ddf6
-ItemFragment_0x7ddf6: ; 0x7ddf6
+ItemFragment_0x7ddf6:
db ETHER, 1
-; 0x7ddf8
-ItemFragment_0x7ddf8: ; 0x7ddf8
+ItemFragment_0x7ddf8:
db REVIVE, 1
-; 0x7ddfa
-MapMountMortar1FOutsideSignpostItem0: ; 0x7ddfa
+MapMountMortar1FOutsideSignpostItem0:
dw $0090
db HYPER_POTION
-; 0x7ddfd
-MountMortar1FOutside_MapEventHeader: ; 0x7ddfd
+MountMortar1FOutside_MapEventHeader:
; filler
db 0, 0
@@ -47,4 +43,3 @@
db 2
person_event SPRITE_POKE_BALL, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, $067b
person_event SPRITE_POKE_BALL, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, $067c
-; 0x7de4f
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -1,12 +1,11 @@
-MountMortarB1F_MapScriptHeader: ; 0x7e1f4
+MountMortarB1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e1f6
-BlackBeltScript_0x7e1f6: ; 0x7e1f6
+BlackBeltScript_0x7e1f6:
faceplayer
loadfont
checkevent EVENT_GOT_TYROGUE_FROM_KIYO
@@ -22,7 +21,7 @@
returnafterbattle
setevent EVENT_BEAT_BLACKBELT_KIYO
loadfont
-UnknownScript_0x7e217: ; 0x7e217
+UnknownScript_0x7e217:
writetext UnknownText_0x7e2c0
keeptextopen
waitbutton
@@ -33,50 +32,42 @@
waitbutton
givepoke TYROGUE, 10, 0, 0
setevent EVENT_GOT_TYROGUE_FROM_KIYO
-UnknownScript_0x7e231: ; 0x7e231
+UnknownScript_0x7e231:
writetext UnknownText_0x7e36a
closetext
loadmovesprites
end
-; 0x7e237
-UnknownScript_0x7e237: ; 0x7e237
+UnknownScript_0x7e237:
writetext UnknownText_0x7e3df
closetext
loadmovesprites
end
-; 0x7e23d
MountMortarB1FBoulder:
jumpstd strengthboulder
-ItemFragment_0x7e240: ; 0x7e240
+ItemFragment_0x7e240:
db HYPER_POTION, 1
-; 0x7e242
-ItemFragment_0x7e242: ; 0x7e242
+ItemFragment_0x7e242:
db CARBOS, 1
-; 0x7e244
-ItemFragment_0x7e244: ; 0x7e244
+ItemFragment_0x7e244:
db FULL_RESTORE, 1
-; 0x7e246
-ItemFragment_0x7e246: ; 0x7e246
+ItemFragment_0x7e246:
db MAX_ETHER, 1
-; 0x7e248
-ItemFragment_0x7e248: ; 0x7e248
+ItemFragment_0x7e248:
db PP_UP, 1
-; 0x7e24a
-MapMountMortarB1FSignpostItem0: ; 0x7e24a
+MapMountMortarB1FSignpostItem0:
dw $0093
db MAX_REVIVE
-; 0x7e24d
-UnknownText_0x7e24d: ; 0x7e24d
+UnknownText_0x7e24d:
text "Hey!"
para "I am the KARATE"
@@ -90,15 +81,13 @@
para "Hwaaarggh!"
done
-; 0x7e2a9
-UnknownText_0x7e2a9: ; 0x7e2a9
+UnknownText_0x7e2a9:
text "Waaaarggh!"
line "I'm beaten!"
done
-; 0x7e2c0
-UnknownText_0x7e2c0: ; 0x7e2c0
+UnknownText_0x7e2c0:
text "I… I'm crushed…"
para "My training is"
@@ -113,15 +102,13 @@
para "give you a rare"
line "fighting #MON."
done
-; 0x7e355
-UnknownText_0x7e355: ; 0x7e355
+UnknownText_0x7e355:
text "<PLAYER> received"
line "TYROGUE."
done
-; 0x7e36a
-UnknownText_0x7e36a: ; 0x7e36a
+UnknownText_0x7e36a:
text "TYROGUE is a"
line "fighting-type."
@@ -134,15 +121,13 @@
para "Farewell!"
done
-; 0x7e3df
-UnknownText_0x7e3df: ; 0x7e3df
+UnknownText_0x7e3df:
text "You have no room"
line "in your party!"
done
-; 0x7e400
-MountMortarB1F_MapEventHeader: ; 0x7e400
+MountMortarB1F_MapEventHeader:
; filler
db 0, 0
@@ -167,4 +152,3 @@
person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, $07ca
person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, $07cb
person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, $07cc
-; 0x7e470
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -1,18 +1,15 @@
-MrFujisHouse_MapScriptHeader: ; 0x7e8c8
+MrFujisHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e8ca
-SuperNerdScript_0x7e8ca: ; 0x7e8ca
+SuperNerdScript_0x7e8ca:
jumptextfaceplayer UnknownText_0x7e8f1
-; 0x7e8cd
-LassScript_0x7e8cd: ; 0x7e8cd
+LassScript_0x7e8cd:
jumptextfaceplayer UnknownText_0x7e940
-; 0x7e8d0
MrFujisPsyduck:
loadfont
@@ -41,7 +38,7 @@
MrFujisHouseBookshelf:
jumpstd difficultbookshelf
-UnknownText_0x7e8f1: ; 0x7e8f1
+UnknownText_0x7e8f1:
text "MR.FUJI does live"
line "here, but he's not"
@@ -50,9 +47,8 @@
para "He should be at"
line "the SOUL HOUSE."
done
-; 0x7e940
-UnknownText_0x7e940: ; 0x7e940
+UnknownText_0x7e940:
text "Some cold-hearted"
line "people stop caring"
cont "for their #MON."
@@ -63,7 +59,6 @@
para "#MON and takes"
line "care of them."
done
-; 0x7e9b6
MrFujisPsyduckText:
text "PSYDUCK: Gu-guwa?"
@@ -77,7 +72,7 @@
text "PIDGEY: Pijji!"
done
-MrFujisHouse_MapEventHeader: ; 0x7e9ea
+MrFujisHouse_MapEventHeader:
; filler
db 0, 0
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -1,4 +1,4 @@
-MrPokemonsHouse_MapScriptHeader: ; 0x196e47
+MrPokemonsHouse_MapScriptHeader:
; trigger count
db 2
@@ -8,18 +8,15 @@
; callback count
db 0
-; 0x196e51
-UnknownScript_0x196e51: ; 0x196e51
+UnknownScript_0x196e51:
priorityjump UnknownScript_0x196e56
end
-; 0x196e55
-UnknownScript_0x196e55: ; 0x196e55
+UnknownScript_0x196e55:
end
-; 0x196e56
-UnknownScript_0x196e56: ; 0x196e56
+UnknownScript_0x196e56:
showemote $0, $2, 15
spriteface $2, DOWN
loadfont
@@ -49,9 +46,8 @@
closetext
loadmovesprites
jump UnknownScript_0x196ec9
-; 0x196e97
-GentlemanScript_0x196e97: ; 0x196e97
+GentlemanScript_0x196e97:
faceplayer
loadfont
checkitem RED_SCALE
@@ -62,16 +58,14 @@
closetext
loadmovesprites
end
-; 0x196eaa
-UnknownScript_0x196eaa: ; 0x196eaa
+UnknownScript_0x196eaa:
writetext UnknownText_0x19714a
closetext
loadmovesprites
end
-; 0x196eb0
-UnknownScript_0x196eb0: ; 0x196eb0
+UnknownScript_0x196eb0:
writetext UnknownText_0x197476
yesorno
iffalse UnknownScript_0x196ec3
@@ -79,17 +73,15 @@
iffalse UnknownScript_0x196ec7
takeitem RED_SCALE, 1
jump UnknownScript_0x196eaa
-; 0x196ec3
-UnknownScript_0x196ec3: ; 0x196ec3
+UnknownScript_0x196ec3:
writetext UnknownText_0x19750d
closetext
-UnknownScript_0x196ec7: ; 0x196ec7
+UnknownScript_0x196ec7:
loadmovesprites
end
-; 0x196ec9
-UnknownScript_0x196ec9: ; 0x196ec9
+UnknownScript_0x196ec9:
playmusic MUSIC_PROF_OAK
applymovement $3, MovementData_0x196f5d
spriteface $0, RIGHT
@@ -142,52 +134,43 @@
iftrue UnknownScript_0x196f4d
setevent $0641
end
-; 0x196f49
-UnknownScript_0x196f49: ; 0x196f49
+UnknownScript_0x196f49:
setevent $0642
end
-; 0x196f4d
-UnknownScript_0x196f4d: ; 0x196f4d
+UnknownScript_0x196f4d:
setevent $0640
end
-; 0x196f51
-MapMrPokemonsHouseSignpost1Script: ; 0x196f51
+MapMrPokemonsHouseSignpost1Script:
jumptext UnknownText_0x197543
-; 0x196f54
-MapMrPokemonsHouseSignpost3Script: ; 0x196f54
+MapMrPokemonsHouseSignpost3Script:
jumptext UnknownText_0x197584
-; 0x196f57
-MapMrPokemonsHouseSignpost4Script: ; 0x196f57
+MapMrPokemonsHouseSignpost4Script:
jumptext UnknownText_0x1975ac
-; 0x196f5a
-MovementData_0x196f5a: ; 0x196f5a
+MovementData_0x196f5a:
step_right
step_up
step_end
-; 0x196f5d
-MovementData_0x196f5d: ; 0x196f5d
+MovementData_0x196f5d:
step_down
step_left
step_left
step_end
-; 0x196f61
-MovementData_0x196f61: ; 0x196f61
+MovementData_0x196f61:
step_down
step_left
turn_head_down
db $3f ; movement
step_end
-; 0x196f66
-UnknownText_0x196f66: ; 0x196f66
+UnknownText_0x196f66:
text "Hello, hello! You"
line "must be <PLAY_G>."
@@ -194,22 +177,19 @@
para "PROF.ELM said that"
line "you would visit."
done
-; 0x196fa8
-UnknownText_0x196fa8: ; 0x196fa8
+UnknownText_0x196fa8:
text "This is what I"
line "want PROF.ELM to"
cont "examine."
done
-; 0x196fd2
-UnknownText_0x196fd2: ; 0x196fd2
+UnknownText_0x196fd2:
text "<PLAYER> received"
line "MYSTERY EGG."
done
-; 0x196feb
-UnknownText_0x196feb: ; 0x196feb
+UnknownText_0x196feb:
text "I know a couple"
line "who run a #MON"
cont "DAY-CARE service."
@@ -225,22 +205,19 @@
line "tion, PROF.ELM is"
cont "the authority."
done
-; 0x197092
-UnknownText_0x197092: ; 0x197092
+UnknownText_0x197092:
text "Even PROF.OAK here"
line "recognizes that."
done
-; 0x1970b7
-UnknownText_0x1970b7: ; 0x1970b7
+UnknownText_0x1970b7:
text "If my assumption"
line "is correct, PROF."
cont "ELM will know it."
done
-; 0x1970ed
-UnknownText_0x1970ed: ; 0x1970ed
+UnknownText_0x1970ed:
text "You are returning"
line "to PROF.ELM?"
@@ -248,15 +225,13 @@
line "should have some"
cont "rest."
done
-; 0x197134
-UnknownText_0x197134: ; 0x197134
+UnknownText_0x197134:
text "I'm depending on"
line "you!"
done
-; 0x19714a
-UnknownText_0x19714a: ; 0x19714a
+UnknownText_0x19714a:
text "Life is delight-"
line "ful! Always, new"
@@ -263,9 +238,8 @@
para "discoveries to be"
line "made!"
done
-; 0x197185
-UnknownText_0x197185: ; 0x197185
+UnknownText_0x197185:
text "OAK: Aha! So"
line "you're <PLAY_G>!"
@@ -328,15 +302,13 @@
para "It's a hi-tech"
line "encyclopedia!"
done
-; 0x1973cc
-UnknownText_0x1973cc: ; 0x1973cc
+UnknownText_0x1973cc:
text "<PLAYER> received"
line "#DEX!"
done
-; 0x1973de
-UnknownText_0x1973de: ; 0x1973de
+UnknownText_0x1973de:
text "Go meet many kinds"
line "of #MON and"
@@ -353,9 +325,8 @@
para "<PLAY_G>, I'm"
line "counting on you!"
done
-; 0x197476
-UnknownText_0x197476: ; 0x197476
+UnknownText_0x197476:
text "Hm? That SCALE!"
line "What's that?"
cont "A red GYARADOS?"
@@ -370,16 +341,14 @@
line "EXP.SHARE I got"
cont "from PROF.OAK."
done
-; 0x19750d
-UnknownText_0x19750d: ; 0x19750d
+UnknownText_0x19750d:
text "That's disappoint-"
line "ing. That happens"
cont "to be very rare."
done
-; 0x197543
-UnknownText_0x197543: ; 0x197543
+UnknownText_0x197543:
text "It's packed with"
line "foreign magazines."
@@ -386,16 +355,14 @@
para "Can't even read"
line "their titles…"
done
-; 0x197584
-UnknownText_0x197584: ; 0x197584
+UnknownText_0x197584:
text "It's a big com-"
line "puter. Hmm. It's"
cont "broken."
done
-; 0x1975ac
-UnknownText_0x1975ac: ; 0x1975ac
+UnknownText_0x1975ac:
text "A whole pile of"
line "strange coins!"
@@ -402,9 +369,8 @@
para "Maybe they're from"
line "another country…"
done
-; 0x1975ef
-MrPokemonsHouse_MapEventHeader: ; 0x1975ef
+MrPokemonsHouse_MapEventHeader:
; filler
db 0, 0
@@ -428,4 +394,3 @@
db 2
person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, $ffff
person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c9
-; 0x197632
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -1,12 +1,11 @@
-NationalParkBugContest_MapScriptHeader: ; 0x5c8ea
+NationalParkBugContest_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5c8ec
-YoungsterScript_0x5c8ec: ; 0x5c8ec
+YoungsterScript_0x5c8ec:
faceplayer
loadfont
writetext UnknownText_0x5c94c
@@ -13,9 +12,8 @@
closetext
loadmovesprites
end
-; 0x5c8f4
-YoungsterScript_0x5c8f4: ; 0x5c8f4
+YoungsterScript_0x5c8f4:
faceplayer
loadfont
writetext UnknownText_0x5c973
@@ -22,9 +20,8 @@
closetext
loadmovesprites
end
-; 0x5c8fc
-RockerScript_0x5c8fc: ; 0x5c8fc
+RockerScript_0x5c8fc:
faceplayer
loadfont
writetext UnknownText_0x5c9a3
@@ -31,9 +28,8 @@
closetext
loadmovesprites
end
-; 0x5c904
-PokefanMScript_0x5c904: ; 0x5c904
+PokefanMScript_0x5c904:
faceplayer
loadfont
writetext UnknownText_0x5c9cc
@@ -40,9 +36,8 @@
closetext
loadmovesprites
end
-; 0x5c90c
-YoungsterScript_0x5c90c: ; 0x5c90c
+YoungsterScript_0x5c90c:
faceplayer
loadfont
writetext UnknownText_0x5ca15
@@ -49,9 +44,8 @@
closetext
loadmovesprites
end
-; 0x5c914
-YoungsterScript_0x5c914: ; 0x5c914
+YoungsterScript_0x5c914:
faceplayer
loadfont
writetext UnknownText_0x5ca52
@@ -58,9 +52,8 @@
closetext
loadmovesprites
end
-; 0x5c91c
-LassScript_0x5c91c: ; 0x5c91c
+LassScript_0x5c91c:
faceplayer
loadfont
writetext UnknownText_0x5ca8f
@@ -67,9 +60,8 @@
closetext
loadmovesprites
end
-; 0x5c924
-YoungsterScript_0x5c924: ; 0x5c924
+YoungsterScript_0x5c924:
faceplayer
loadfont
writetext UnknownText_0x5cac8
@@ -76,9 +68,8 @@
closetext
loadmovesprites
end
-; 0x5c92c
-YoungsterScript_0x5c92c: ; 0x5c92c
+YoungsterScript_0x5c92c:
faceplayer
loadfont
writetext UnknownText_0x5cb25
@@ -85,9 +76,8 @@
closetext
loadmovesprites
end
-; 0x5c934
-YoungsterScript_0x5c934: ; 0x5c934
+YoungsterScript_0x5c934:
faceplayer
loadfont
writetext UnknownText_0x5cb64
@@ -94,56 +84,46 @@
closetext
loadmovesprites
end
-; 0x5c93c
-MapNationalParkBugContestSignpost0Script: ; 0x5c93c
+MapNationalParkBugContestSignpost0Script:
jumptext UnknownText_0x5cba7
-; 0x5c93f
-MapNationalParkBugContestSignpost1Script: ; 0x5c93f
+MapNationalParkBugContestSignpost1Script:
jumptext UnknownText_0x5cbc8
-; 0x5c942
-MapNationalParkBugContestSignpost3Script: ; 0x5c942
+MapNationalParkBugContestSignpost3Script:
jumptext UnknownText_0x5cc1d
-; 0x5c945
-ItemFragment_0x5c945: ; 0x5c945
+ItemFragment_0x5c945:
db PARLYZ_HEAL, 1
-; 0x5c947
-ItemFragment_0x5c947: ; 0x5c947
+ItemFragment_0x5c947:
db TM_DIG, 1
-; 0x5c949
-MapNationalParkBugContestSignpostItem2: ; 0x5c949
+MapNationalParkBugContestSignpostItem2:
dw $0084
db FULL_HEAL
-; 0x5c94c
-UnknownText_0x5c94c: ; 0x5c94c
+UnknownText_0x5c94c:
text "DON: I'm going to"
line "win! Don't bother"
cont "me."
done
-; 0x5c973
-UnknownText_0x5c973: ; 0x5c973
+UnknownText_0x5c973:
text "ED: My PARASECT"
line "puts #MON to"
cont "sleep with SPORE."
done
-; 0x5c9a3
-UnknownText_0x5c9a3: ; 0x5c9a3
+UnknownText_0x5c9a3:
text "NICK: I'm raising"
line "fast #MON for"
cont "battles."
done
-; 0x5c9cc
-UnknownText_0x5c9cc: ; 0x5c9cc
+UnknownText_0x5c9cc:
text "WILLIAM: I'm not"
line "concerned about"
cont "winning."
@@ -151,9 +131,8 @@
para "I'm just looking"
line "for rare #MON."
done
-; 0x5ca15
-UnknownText_0x5ca15: ; 0x5ca15
+UnknownText_0x5ca15:
text "BENNY: Ssh! You'll"
line "scare off SCYTHER."
@@ -160,9 +139,8 @@
para "I'll talk to you"
line "later."
done
-; 0x5ca52
-UnknownText_0x5ca52: ; 0x5ca52
+UnknownText_0x5ca52:
text "BARRY: You should"
line "weaken bug #MON"
@@ -169,9 +147,8 @@
para "first, then throw"
line "a BALL."
done
-; 0x5ca8f
-UnknownText_0x5ca8f: ; 0x5ca8f
+UnknownText_0x5ca8f:
text "CINDY: I love bug"
line "#MON."
@@ -178,9 +155,8 @@
para "I guess you must"
line "like them too."
done
-; 0x5cac8
-UnknownText_0x5cac8: ; 0x5cac8
+UnknownText_0x5cac8:
text "JOSH: I've been"
line "collecting bug"
@@ -190,9 +166,8 @@
para "There's no way I'm"
line "going to lose!"
done
-; 0x5cb25
-UnknownText_0x5cb25: ; 0x5cb25
+UnknownText_0x5cb25:
text "SAMUEL: If you've"
line "got the time to"
@@ -199,9 +174,8 @@
para "chat, go find some"
line "bug #MON."
done
-; 0x5cb64
-UnknownText_0x5cb64: ; 0x5cb64
+UnknownText_0x5cb64:
text "KIPP: I've studied"
line "about bug #MON"
cont "a lot."
@@ -209,15 +183,13 @@
para "I'm going to win"
line "for sure."
done
-; 0x5cba7
-UnknownText_0x5cba7: ; 0x5cba7
+UnknownText_0x5cba7:
text "RELAXATION SQUARE"
line "NATIONAL PARK"
done
-; 0x5cbc8
-UnknownText_0x5cbc8: ; 0x5cbc8
+UnknownText_0x5cbc8:
text "What is this"
line "notice?"
@@ -227,9 +199,8 @@
para "NATIONAL PARK"
line "WARDEN'S OFFICE"
done
-; 0x5cc1d
-UnknownText_0x5cc1d: ; 0x5cc1d
+UnknownText_0x5cc1d:
text "TRAINER TIPS"
para "Print out MAIL by"
@@ -236,9 +207,8 @@
line "opening it then"
cont "pressing START."
done
-; 0x5cc5d
-NationalParkBugContest_MapEventHeader: ; 0x5cc5d
+NationalParkBugContest_MapEventHeader:
; filler
db 0, 0
@@ -273,4 +243,3 @@
person_event SPRITE_YOUNGSTER, 38, 21, $2, $33, 255, 255, $90, 0, YoungsterScript_0x5c934, $071f
person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, $0658
person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, $0659
-; 0x5cd27
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -1,14 +1,12 @@
-OaksLab_MapScriptHeader: ; 0x19b3c5
+OaksLab_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19b3c7
-UnknownScript_0x19b3c7: ; 0x19b3c7
+UnknownScript_0x19b3c7:
end
-; 0x19b3c8
Oak:
faceplayer
@@ -51,17 +49,14 @@
keeptextopen
jump .CheckPokedex
-ScientistScript_0x19b40f: ; 0x19b40f
+ScientistScript_0x19b40f:
jumptextfaceplayer UnknownText_0x19b7fb
-; 0x19b412
-ScientistScript_0x19b412: ; 0x19b412
+ScientistScript_0x19b412:
jumptextfaceplayer UnknownText_0x19b859
-; 0x19b415
-ScientistScript_0x19b415: ; 0x19b415
+ScientistScript_0x19b415:
jumptextfaceplayer UnknownText_0x19b8a7
-; 0x19b418
OaksLabBookshelf:
jumpstd difficultbookshelf
@@ -183,7 +178,7 @@
line "<PLAY_G>!"
done
-UnknownText_0x19b7fb: ; 0x19b7fb
+UnknownText_0x19b7fb:
text "The PROF's #MON"
line "TALK radio program"
@@ -193,9 +188,8 @@
para "It's a shame--I'd"
line "like to hear it."
done
-; 0x19b859
-UnknownText_0x19b859: ; 0x19b859
+UnknownText_0x19b859:
text "Thanks to your"
line "work on the #-"
cont "DEX, the PROF's"
@@ -203,9 +197,8 @@
para "research is coming"
line "along great."
done
-; 0x19b8a7
-UnknownText_0x19b8a7: ; 0x19b8a7
+UnknownText_0x19b8a7:
text "Don't tell anyone,"
line "but PROF.OAK'S"
@@ -212,7 +205,6 @@
para "#MON TALK isn't"
line "a live broadcast."
done
-; 0x19b8ea
OaksLabPoster1Text:
text "Press START to"
@@ -257,9 +249,8 @@
para "ELM in NEW BARK"
line "TOWN 8-)"
done
-; 0x19ba33
-OaksLab_MapEventHeader: ; 0x19ba33
+OaksLab_MapEventHeader:
; filler
db 0, 0
@@ -296,4 +287,3 @@
person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, $ffff
person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, $ffff
person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, $ffff
-; 0x19bac7
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -1,12 +1,11 @@
-OlivineCafe_MapScriptHeader: ; 0x9c8bf
+OlivineCafe_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9c8c1
-SailorScript_0x9c8c1: ; 0x9c8c1
+SailorScript_0x9c8c1:
faceplayer
loadfont
checkevent EVENT_GOT_HM04_STRENGTH
@@ -15,22 +14,19 @@
keeptextopen
verbosegiveitem HM_STRENGTH, 1
setevent EVENT_GOT_HM04_STRENGTH
-UnknownScript_0x9c8d3: ; 0x9c8d3
+UnknownScript_0x9c8d3:
writetext UnknownText_0x9c965
closetext
loadmovesprites
end
-; 0x9c8d9
-FishingGuruScript_0x9c8d9: ; 0x9c8d9
+FishingGuruScript_0x9c8d9:
jumptextfaceplayer UnknownText_0x9c9c5
-; 0x9c8dc
-SailorScript_0x9c8dc: ; 0x9c8dc
+SailorScript_0x9c8dc:
jumptextfaceplayer UnknownText_0x9ca09
-; 0x9c8df
-UnknownText_0x9c8df: ; 0x9c8df
+UnknownText_0x9c8df:
text "Hah! Your #MON"
line "sure look like"
cont "lightweights!"
@@ -43,9 +39,8 @@
line "and teach them"
cont "STRENGTH!"
done
-; 0x9c965
-UnknownText_0x9c965: ; 0x9c965
+UnknownText_0x9c965:
text "On the sea, the"
line "only thing you can"
@@ -55,9 +50,8 @@
para "I'm so proud of my"
line "buff bod!"
done
-; 0x9c9c5
-UnknownText_0x9c9c5: ; 0x9c9c5
+UnknownText_0x9c9c5:
text "OLIVINE CAFE's"
line "menu is chock full"
@@ -64,9 +58,8 @@
para "of hearty fare for"
line "beefy SAILORS!"
done
-; 0x9ca09
-UnknownText_0x9ca09: ; 0x9ca09
+UnknownText_0x9ca09:
text "Whenever I roll"
line "into this town, I"
@@ -79,9 +72,8 @@
para "stronger. I can't"
line "stop eating!"
done
-; 0x9ca8e
-OlivineCafe_MapEventHeader: ; 0x9ca8e
+OlivineCafe_MapEventHeader:
; filler
db 0, 0
@@ -101,4 +93,3 @@
person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, $ffff
person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, $ffff
person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, $ffff
-; 0x9cac5
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -1,16 +1,14 @@
-OlivineHouseBeta_MapScriptHeader: ; 0x9c58d
+OlivineHouseBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9c58f
-TeacherScript_0x9c58f: ; 0x9c58f
+TeacherScript_0x9c58f:
jumptextfaceplayer UnknownText_0x9c5a2
-; 0x9c592
-RhydonScript_0x9c592: ; 0x9c592
+RhydonScript_0x9c592:
loadfont
writetext UnknownText_0x9c5f0
cry RHYDON
@@ -17,7 +15,6 @@
closetext
loadmovesprites
end
-; 0x9c59c
OlivineHouseBetaBookshelf1:
jumpstd picturebookshelf
@@ -25,7 +22,7 @@
OlivineHouseBetaBookshelf2:
jumpstd magazinebookshelf
-UnknownText_0x9c5a2: ; 0x9c5a2
+UnknownText_0x9c5a2:
text "When my #MON"
line "got sick, the"
@@ -33,14 +30,12 @@
line "ECRUTEAK made some"
cont "medicine for me."
done
-; 0x9c5f0
-UnknownText_0x9c5f0: ; 0x9c5f0
+UnknownText_0x9c5f0:
text "RHYDON: Gugooh!"
done
-; 0x9c601
-OlivineHouseBeta_MapEventHeader: ; 0x9c601
+OlivineHouseBeta_MapEventHeader:
; filler
db 0, 0
@@ -61,4 +56,3 @@
db 2
person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, $ffff
person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, $ffff
-; 0x9c635
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -1,20 +1,17 @@
-OlivineLighthouse1F_MapScriptHeader: ; 0x5ae65
+OlivineLighthouse1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5ae67
-SailorScript_0x5ae67: ; 0x5ae67
+SailorScript_0x5ae67:
jumptextfaceplayer UnknownText_0x5ae6d
-; 0x5ae6a
-PokefanFScript_0x5ae6a: ; 0x5ae6a
+PokefanFScript_0x5ae6a:
jumptextfaceplayer UnknownText_0x5aec2
-; 0x5ae6d
-UnknownText_0x5ae6d: ; 0x5ae6d
+UnknownText_0x5ae6d:
text "People train at"
line "this LIGHTHOUSE."
@@ -22,9 +19,8 @@
line "climb because of"
cont "all the trainers."
done
-; 0x5aec2
-UnknownText_0x5aec2: ; 0x5aec2
+UnknownText_0x5aec2:
text "In the past, #-"
line "MON used to light"
@@ -35,9 +31,8 @@
line "made in honor of"
cont "those #MON."
done
-; 0x5af36
-OlivineLighthouse1F_MapEventHeader: ; 0x5af36
+OlivineLighthouse1F_MapEventHeader:
; filler
db 0, 0
@@ -59,4 +54,3 @@
db 2
person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, $ffff
person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, $ffff
-; 0x5af6f
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -1,12 +1,11 @@
-OlivineLighthouse6F_MapScriptHeader: ; 0x60b8f
+OlivineLighthouse6F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x60b91
-JasmineScript_0x60b91: ; 0x60b91
+JasmineScript_0x60b91:
faceplayer
loadfont
checkitem SECRETPOTION
@@ -16,14 +15,13 @@
writetext UnknownText_0x60c81
keeptextopen
setevent $0037
-UnknownScript_0x60ba5: ; 0x60ba5
+UnknownScript_0x60ba5:
writetext UnknownText_0x60d64
closetext
loadmovesprites
end
-; 0x60bab
-UnknownScript_0x60bab: ; 0x60bab
+UnknownScript_0x60bab:
writetext UnknownText_0x60d99
yesorno
iffalse UnknownScript_0x60c25
@@ -72,21 +70,18 @@
applymovement $2, MovementData_0x60c68
disappear $2
end
-; 0x60c17
-UnknownScript_0x60c17: ; 0x60c17
+UnknownScript_0x60c17:
applymovement $2, MovementData_0x60c70
disappear $2
end
-; 0x60c1e
-UnknownScript_0x60c1e: ; 0x60c1e
+UnknownScript_0x60c1e:
applymovement $2, MovementData_0x60c79
disappear $2
end
-; 0x60c25
-UnknownScript_0x60c25: ; 0x60c25
+UnknownScript_0x60c25:
writetext UnknownText_0x60edf
closetext
loadmovesprites
@@ -98,13 +93,11 @@
closetext
loadmovesprites
end
-; 0x60c39
-UnknownScript_0x60c39: ; 0x60c39
+UnknownScript_0x60c39:
end
-; 0x60c3a
-MonsterScript_0x60c3a: ; 0x60c3a
+MonsterScript_0x60c3a:
faceplayer
loadfont
checkevent EVENT_JASMINE_RETURNED_TO_GYM
@@ -117,9 +110,8 @@
closetext
loadmovesprites
end
-; 0x60c51
-UnknownScript_0x60c51: ; 0x60c51
+UnknownScript_0x60c51:
writetext UnknownText_0x60f3d
cry AMPHAROS
closetext
@@ -129,13 +121,11 @@
special Function8c084
special Function8c079
end
-; 0x60c66
-ItemFragment_0x60c66: ; 0x60c66
+ItemFragment_0x60c66:
db SUPER_POTION, 1
-; 0x60c68
-MovementData_0x60c68: ; 0x60c68
+MovementData_0x60c68:
slow_step_up
slow_step_up
slow_step_right
@@ -144,9 +134,8 @@
accelerate_last
accelerate_last
step_end
-; 0x60c70
-MovementData_0x60c70: ; 0x60c70
+MovementData_0x60c70:
slow_step_down
slow_step_right
slow_step_right
@@ -156,9 +145,8 @@
slow_step_right
slow_step_right
step_end
-; 0x60c79
-MovementData_0x60c79: ; 0x60c79
+MovementData_0x60c79:
slow_step_up
slow_step_up
slow_step_right
@@ -167,9 +155,8 @@
slow_step_up
accelerate_last
step_end
-; 0x60c81
-UnknownText_0x60c81: ; 0x60c81
+UnknownText_0x60c81:
text "JASMINE: … This"
line "#MON always"
@@ -192,30 +179,26 @@
para "And I can't leave"
line "AMPHY unattended…"
done
-; 0x60d64
-UnknownText_0x60d64: ; 0x60d64
+UnknownText_0x60d64:
text "…May I ask you to"
line "get some medicine"
cont "for me? Please?"
done
-; 0x60d99
-UnknownText_0x60d99: ; 0x60d99
+UnknownText_0x60d99:
text "JASMINE: …Will"
line "that medicine cure"
cont "AMPHY?"
done
-; 0x60dc3
-UnknownText_0x60dc3: ; 0x60dc3
+UnknownText_0x60dc3:
text "<PLAYER> handed the"
line "SECRETPOTION to"
cont "JASMINE."
done
-; 0x60dea
-UnknownText_0x60dea: ; 0x60dea
+UnknownText_0x60dea:
text "JASMINE: …Um,"
line "please don't be"
cont "offended…"
@@ -224,17 +207,15 @@
line "take anything from"
cont "anyone but me…"
done
-; 0x60e44
-UnknownText_0x60e44: ; 0x60e44
+UnknownText_0x60e44:
text "JASMINE: …"
para "AMPHY, how are you"
line "feeling?"
done
-; 0x60e6c
-UnknownText_0x60e6c: ; 0x60e6c
+UnknownText_0x60e6c:
text "JASMINE: …Oh, I'm"
line "so relieved…"
@@ -247,37 +228,31 @@
para "…I will return to"
line "the GYM…"
done
-; 0x60edf
-UnknownText_0x60edf: ; 0x60edf
+UnknownText_0x60edf:
text "JASMINE: …I see…"
done
-; 0x60ef1
-UnknownText_0x60ef1: ; 0x60ef1
+UnknownText_0x60ef1:
text "…AMPHY, hang on!"
done
-; 0x60f03
-UnknownText_0x60f03: ; 0x60f03
+UnknownText_0x60f03:
text "AMPHY: …"
line "…Pa… paloo…"
done
-; 0x60f19
-UnknownText_0x60f19: ; 0x60f19
+UnknownText_0x60f19:
text "Its breathing is"
line "terribly labored…"
done
-; 0x60f3d
-UnknownText_0x60f3d: ; 0x60f3d
+UnknownText_0x60f3d:
text "AMPHY: Palu!"
line "Palulu!"
done
-; 0x60f53
-OlivineLighthouse6F_MapEventHeader: ; 0x60f53
+OlivineLighthouse6F_MapEventHeader:
; filler
db 0, 0
@@ -298,4 +273,3 @@
person_event SPRITE_JASMINE, 12, 12, $6, $0, 255, 255, $80, 0, JasmineScript_0x60b91, $06d2
person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, $ffff
person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, $0668
-; 0x60f8f
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -1,27 +1,23 @@
-OlivineMart_MapScriptHeader: ; 0x9cac5
+OlivineMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9cac7
-ClerkScript_0x9cac7: ; 0x9cac7
+ClerkScript_0x9cac7:
loadfont
pokemart $0, $000d
loadmovesprites
end
-; 0x9cace
-CooltrainerFScript_0x9cace: ; 0x9cace
+CooltrainerFScript_0x9cace:
jumptextfaceplayer UnknownText_0x9cad4
-; 0x9cad1
-LassScript_0x9cad1: ; 0x9cad1
+LassScript_0x9cad1:
jumptextfaceplayer UnknownText_0x9cb16
-; 0x9cad4
-UnknownText_0x9cad4: ; 0x9cad4
+UnknownText_0x9cad4:
text "Do your #MON"
line "already know the"
@@ -28,9 +24,8 @@
para "move for carrying"
line "people on water?"
done
-; 0x9cb16
-UnknownText_0x9cb16: ; 0x9cb16
+UnknownText_0x9cb16:
text "My BUTTERFREE came"
line "from my boyfriend"
cont "overseas."
@@ -44,9 +39,8 @@
para "Let's see… Nope!"
line "It's a secret!"
done
-; 0x9cb9e
-OlivineMart_MapEventHeader: ; 0x9cb9e
+OlivineMart_MapEventHeader:
; filler
db 0, 0
@@ -66,4 +60,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, $ffff
person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, $ffff
person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, $ffff
-; 0x9cbd5
--- a/maps/OlivinePokeCenter1F.asm
+++ b/maps/OlivinePokeCenter1F.asm
@@ -1,28 +1,23 @@
-OlivinePokeCenter1F_MapScriptHeader: ; 0x9c000
+OlivinePokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9c002
-NurseScript_0x9c002: ; 0x9c002
+NurseScript_0x9c002:
jumpstd pokecenternurse
-; 0x9c005
-FishingGuruScript_0x9c005: ; 0x9c005
+FishingGuruScript_0x9c005:
jumpstd $0033
-; 0x9c008
-FisherScript_0x9c008: ; 0x9c008
+FisherScript_0x9c008:
jumptextfaceplayer UnknownText_0x9c00e
-; 0x9c00b
-TeacherScript_0x9c00b: ; 0x9c00b
+TeacherScript_0x9c00b:
jumptextfaceplayer UnknownText_0x9c086
-; 0x9c00e
-UnknownText_0x9c00e: ; 0x9c00e
+UnknownText_0x9c00e:
text "The SAILOR in the"
line "OLIVINE CAFE next"
@@ -35,9 +30,8 @@
para "Now it can move"
line "big boulders."
done
-; 0x9c086
-UnknownText_0x9c086: ; 0x9c086
+UnknownText_0x9c086:
text "There's a person"
line "in CIANWOOD CITY"
cont "across the sea."
@@ -46,9 +40,8 @@
line "ging about his"
cont "rare #MON."
done
-; 0x9c0e4
-OlivinePokeCenter1F_MapEventHeader: ; 0x9c0e4
+OlivinePokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -70,4 +63,3 @@
person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, $ffff
person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, $ffff
person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, $ffff
-; 0x9c12d
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -1,4 +1,4 @@
-OlivinePort_MapScriptHeader: ; 0x748a2
+OlivinePort_MapScriptHeader:
; trigger count
db 2
@@ -8,18 +8,15 @@
; callback count
db 0
-; 0x748ac
-UnknownScript_0x748ac: ; 0x748ac
+UnknownScript_0x748ac:
end
-; 0x748ad
-UnknownScript_0x748ad: ; 0x748ad
+UnknownScript_0x748ad:
priorityjump UnknownScript_0x748b1
end
-; 0x748b1
-UnknownScript_0x748b1: ; 0x748b1
+UnknownScript_0x748b1:
applymovement $0, MovementData_0x74a32
appear $2
dotrigger $0
@@ -26,9 +23,8 @@
setevent $0000
blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
end
-; 0x748c0
-SailorScript_0x748c0: ; 0x748c0
+SailorScript_0x748c0:
faceplayer
loadfont
checkevent $0000
@@ -58,22 +54,20 @@
clearevent EVENT_BEAT_SAILOR_GARRETT
clearevent EVENT_BEAT_FISHER_JONAH
clearevent EVENT_BEAT_BLACKBELT_WAI
-UnknownScript_0x7490a: ; 0x7490a
+UnknownScript_0x7490a:
clearevent $002f
appear $2
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1
warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1
end
-; 0x74919
-UnknownScript_0x74919: ; 0x74919
+UnknownScript_0x74919:
writetext UnknownText_0x74a80
closetext
loadmovesprites
end
-; 0x7491f
-UnknownScript_0x7491f: ; 0x7491f
+UnknownScript_0x7491f:
spriteface $4, RIGHT
checkevent $0000
iftrue UnknownScript_0x7498b
@@ -89,7 +83,7 @@
if_equal TUESDAY, UnknownScript_0x74981
if_equal WEDNESDAY, UnknownScript_0x74981
if_equal THURSDAY, UnknownScript_0x74981
-UnknownScript_0x7494e: ; 0x7494e
+UnknownScript_0x7494e:
writetext UnknownText_0x74a9c
yesorno
iffalse UnknownScript_0x74992
@@ -103,52 +97,45 @@
setevent $0001
applymovement $0, MovementData_0x74a37
jump SailorScript_0x748c0
-; 0x7496d
-UnknownScript_0x7496d: ; 0x7496d
+UnknownScript_0x7496d:
writetext UnknownText_0x74b41
closetext
loadmovesprites
applymovement $0, MovementData_0x74a34
end
-; 0x74977
-UnknownScript_0x74977: ; 0x74977
+UnknownScript_0x74977:
writetext UnknownText_0x74ba8
closetext
loadmovesprites
applymovement $0, MovementData_0x74a34
end
-; 0x74981
-UnknownScript_0x74981: ; 0x74981
+UnknownScript_0x74981:
writetext UnknownText_0x74bce
closetext
loadmovesprites
applymovement $0, MovementData_0x74a34
end
-; 0x7498b
-UnknownScript_0x7498b: ; 0x7498b
+UnknownScript_0x7498b:
end
-; 0x7498c
-UnknownScript_0x7498c: ; 0x7498c
+UnknownScript_0x7498c:
writetext UnknownText_0x74af6
closetext
loadmovesprites
end
-; 0x74992
-UnknownScript_0x74992: ; 0x74992
+UnknownScript_0x74992:
writetext UnknownText_0x74af6
closetext
loadmovesprites
applymovement $0, MovementData_0x74a34
end
-; 0x7499c
-SailorScript_0x7499c: ; 0x7499c
+SailorScript_0x7499c:
faceplayer
loadfont
checkevent $0000
@@ -161,7 +148,7 @@
if_equal TUESDAY, UnknownScript_0x749f8
if_equal WEDNESDAY, UnknownScript_0x749f8
if_equal THURSDAY, UnknownScript_0x749f8
-UnknownScript_0x749c0: ; 0x749c0
+UnknownScript_0x749c0:
writetext UnknownText_0x74a9c
yesorno
iffalse UnknownScript_0x7498c
@@ -177,39 +164,33 @@
if_equal $3, UnknownScript_0x749e5
applymovement $0, MovementData_0x74a3f
jump SailorScript_0x748c0
-; 0x749e5
-UnknownScript_0x749e5: ; 0x749e5
+UnknownScript_0x749e5:
applymovement $0, MovementData_0x74a49
jump SailorScript_0x748c0
-; 0x749ec
-UnknownScript_0x749ec: ; 0x749ec
+UnknownScript_0x749ec:
writetext UnknownText_0x74b41
closetext
loadmovesprites
end
-; 0x749f2
-UnknownScript_0x749f2: ; 0x749f2
+UnknownScript_0x749f2:
writetext UnknownText_0x74ba8
closetext
loadmovesprites
end
-; 0x749f8
-UnknownScript_0x749f8: ; 0x749f8
+UnknownScript_0x749f8:
writetext UnknownText_0x74bce
closetext
loadmovesprites
end
-; 0x749fe
-SailorScript_0x749fe: ; 0x749fe
+SailorScript_0x749fe:
jumptextfaceplayer UnknownText_0x74cd7
-; 0x74a01
-FishingGuruScript_0x74a01: ; 0x74a01
+FishingGuruScript_0x74a01:
faceplayer
loadfont
writetext UnknownText_0x74bf4
@@ -217,9 +198,8 @@
loadmovesprites
spriteface $5, UP
end
-; 0x74a0c
-FishingGuruScript_0x74a0c: ; 0x74a0c
+FishingGuruScript_0x74a0c:
faceplayer
loadfont
writetext UnknownText_0x74c35
@@ -227,9 +207,8 @@
loadmovesprites
spriteface $6, UP
end
-; 0x74a17
-YoungsterScript_0x74a17: ; 0x74a17
+YoungsterScript_0x74a17:
faceplayer
loadfont
writetext UnknownText_0x74c76
@@ -237,9 +216,8 @@
loadmovesprites
spriteface $7, DOWN
end
-; 0x74a22
-CooltrainerFScript_0x74a22: ; 0x74a22
+CooltrainerFScript_0x74a22:
faceplayer
loadfont
writetext UnknownText_0x74ca2
@@ -247,31 +225,26 @@
loadmovesprites
spriteface $8, DOWN
end
-; 0x74a2d
-MapOlivinePortSignpostItem0: ; 0x74a2d
+MapOlivinePortSignpostItem0:
dw $00ea
db PROTEIN
-; 0x74a30
-MovementData_0x74a30: ; 0x74a30
+MovementData_0x74a30:
step_down
step_end
-; 0x74a32
-MovementData_0x74a32: ; 0x74a32
+MovementData_0x74a32:
step_up
step_end
-; 0x74a34
-MovementData_0x74a34: ; 0x74a34
+MovementData_0x74a34:
step_right
turn_head_left
step_end
-; 0x74a37
-MovementData_0x74a37: ; 0x74a37
+MovementData_0x74a37:
step_down
step_down
step_down
@@ -280,9 +253,8 @@
step_down
step_down
step_end
-; 0x74a3f
-MovementData_0x74a3f: ; 0x74a3f
+MovementData_0x74a3f:
step_right
step_down
step_down
@@ -293,9 +265,8 @@
step_down
step_down
step_end
-; 0x74a49
-MovementData_0x74a49: ; 0x74a49
+MovementData_0x74a49:
step_up
step_right
step_right
@@ -308,22 +279,19 @@
step_down
step_down
step_end
-; 0x74a55
-UnknownText_0x74a55: ; 0x74a55
+UnknownText_0x74a55:
text "We're departing"
line "soon. Please get"
cont "on board."
done
-; 0x74a80
-UnknownText_0x74a80: ; 0x74a80
+UnknownText_0x74a80:
text "Sorry. You can't"
line "board now."
done
-; 0x74a9c
-UnknownText_0x74a9c: ; 0x74a9c
+UnknownText_0x74a9c:
text "Welcome to FAST"
line "SHIP S.S.AQUA."
@@ -330,21 +298,18 @@
para "Will you be board-"
line "ing today?"
done
-; 0x74ada
-UnknownText_0x74ada: ; 0x74ada
+UnknownText_0x74ada:
text "May I see your"
line "S.S.TICKET?"
done
-; 0x74af6
-UnknownText_0x74af6: ; 0x74af6
+UnknownText_0x74af6:
text "We hope to see you"
line "again!"
done
-; 0x74b11
-UnknownText_0x74b11: ; 0x74b11
+UnknownText_0x74b11:
text "<PLAYER> flashed"
line "the S.S.TICKET."
@@ -351,9 +316,8 @@
para "That's it."
line "Thank you!"
done
-; 0x74b41
-UnknownText_0x74b41: ; 0x74b41
+UnknownText_0x74b41:
text "<PLAYER> tried to"
line "show the S.S."
cont "TICKET…"
@@ -366,21 +330,18 @@
para "if you have an"
line "S.S.TICKET."
done
-; 0x74ba8
-UnknownText_0x74ba8: ; 0x74ba8
+UnknownText_0x74ba8:
text "The FAST SHIP will"
line "sail next Monday."
done
-; 0x74bce
-UnknownText_0x74bce: ; 0x74bce
+UnknownText_0x74bce:
text "The FAST SHIP will"
line "sail next Friday."
done
-; 0x74bf4
-UnknownText_0x74bf4: ; 0x74bf4
+UnknownText_0x74bf4:
text "SHELLDER are easy"
line "to catch here."
@@ -387,9 +348,8 @@
para "They're kind of"
line "rare elsewhere."
done
-; 0x74c35
-UnknownText_0x74c35: ; 0x74c35
+UnknownText_0x74c35:
text "How many RODS do"
line "you have?"
@@ -397,24 +357,21 @@
line "catch different"
cont "#MON."
done
-; 0x74c76
-UnknownText_0x74c76: ; 0x74c76
+UnknownText_0x74c76:
text "S.S.AQUA uses jets"
line "to skim over the"
cont "waves!"
done
-; 0x74ca2
-UnknownText_0x74ca2: ; 0x74ca2
+UnknownText_0x74ca2:
text "There are lots of"
line "#MON in KANTO."
para "I wish I could go…"
done
-; 0x74cd7
-UnknownText_0x74cd7: ; 0x74cd7
+UnknownText_0x74cd7:
text "We don't want you"
line "to fall into the"
@@ -421,9 +378,8 @@
para "sea, so you're not"
line "allowed in."
done
-; 0x74d18
-OlivinePort_MapEventHeader: ; 0x74d18
+OlivinePort_MapEventHeader:
; filler
db 0, 0
@@ -449,4 +405,3 @@
person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, $0737
person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, $0738
person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, $0738
-; 0x74d90
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -1,16 +1,14 @@
-OlivinePortPassage_MapScriptHeader: ; 0x76faa
+OlivinePortPassage_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x76fac
-PokefanMScript_0x76fac: ; 0x76fac
+PokefanMScript_0x76fac:
jumptextfaceplayer UnknownText_0x76faf
-; 0x76faf
-UnknownText_0x76faf: ; 0x76faf
+UnknownText_0x76faf:
text "FAST SHIP S.S.AQUA"
line "sails to KANTO on"
@@ -17,9 +15,8 @@
para "Mondays and Fri-"
line "days."
done
-; 0x76fec
-OlivinePortPassage_MapEventHeader: ; 0x76fec
+OlivinePortPassage_MapEventHeader:
; filler
db 0, 0
@@ -40,4 +37,3 @@
; people-events
db 1
person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, $0733
-; 0x77018
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -1,27 +1,23 @@
-PewterMart_MapScriptHeader: ; 0x1a2dc9
+PewterMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a2dcb
-ClerkScript_0x1a2dcb: ; 0x1a2dcb
+ClerkScript_0x1a2dcb:
loadfont
pokemart $0, $0013
loadmovesprites
end
-; 0x1a2dd2
-YoungsterScript_0x1a2dd2: ; 0x1a2dd2
+YoungsterScript_0x1a2dd2:
jumptextfaceplayer UnknownText_0x1a2dd8
-; 0x1a2dd5
-SuperNerdScript_0x1a2dd5: ; 0x1a2dd5
+SuperNerdScript_0x1a2dd5:
jumptextfaceplayer UnknownText_0x1a2e3a
-; 0x1a2dd8
-UnknownText_0x1a2dd8: ; 0x1a2dd8
+UnknownText_0x1a2dd8:
text "Hi! Check out my"
line "GYARADOS!"
@@ -31,9 +27,8 @@
para "believe how strong"
line "it has become."
done
-; 0x1a2e3a
-UnknownText_0x1a2e3a: ; 0x1a2e3a
+UnknownText_0x1a2e3a:
text "There once was a"
line "weird old man who"
cont "sold MAGIKARP."
@@ -44,9 +39,8 @@
para "LAKE OF RAGE were"
line "excellent."
done
-; 0x1a2eae
-PewterMart_MapEventHeader: ; 0x1a2eae
+PewterMart_MapEventHeader:
; filler
db 0, 0
@@ -66,4 +60,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, $ffff
person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, $ffff
person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, $ffff
-; 0x1a2ee5
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -1,16 +1,14 @@
-PewterNidoranSpeechHouse_MapScriptHeader: ; 0x1a2805
+PewterNidoranSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a2807
-SuperNerdScript_0x1a2807: ; 0x1a2807
+SuperNerdScript_0x1a2807:
jumptextfaceplayer UnknownText_0x1a2814
-; 0x1a280a
-GrowlitheScript_0x1a280a: ; 0x1a280a
+GrowlitheScript_0x1a280a:
loadfont
writetext UnknownText_0x1a2825
cry NIDORAN_M
@@ -17,19 +15,16 @@
closetext
loadmovesprites
end
-; 0x1a2814
-UnknownText_0x1a2814: ; 0x1a2814
+UnknownText_0x1a2814:
text "NIDORAN, shake!"
done
-; 0x1a2825
-UnknownText_0x1a2825: ; 0x1a2825
+UnknownText_0x1a2825:
text "NIDORAN: Gau gau!"
done
-; 0x1a2838
-PewterNidoranSpeechHouse_MapEventHeader: ; 0x1a2838
+PewterNidoranSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -48,4 +43,3 @@
db 2
person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, $ffff
person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, $ffff
-; 0x1a2862
--- a/maps/PewterPokeCEnter2FBeta.asm
+++ b/maps/PewterPokeCEnter2FBeta.asm
@@ -1,12 +1,11 @@
-PewterPokeCEnter2FBeta_MapScriptHeader: ; 0x1a304a
+PewterPokeCEnter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a304c
-PewterPokeCEnter2FBeta_MapEventHeader: ; 0x1a304c
+PewterPokeCEnter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x1a3057
--- a/maps/PewterPokeCenter1F.asm
+++ b/maps/PewterPokeCenter1F.asm
@@ -1,20 +1,17 @@
-PewterPokeCenter1F_MapScriptHeader: ; 0x1a2ee5
+PewterPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a2ee7
-NurseScript_0x1a2ee7: ; 0x1a2ee7
+NurseScript_0x1a2ee7:
jumpstd pokecenternurse
-; 0x1a2eea
-TeacherScript_0x1a2eea: ; 0x1a2eea
+TeacherScript_0x1a2eea:
jumptextfaceplayer UnknownText_0x1a2f01
-; 0x1a2eed
-JigglypuffScript_0x1a2eed: ; 0x1a2eed
+JigglypuffScript_0x1a2eed:
loadfont
writetext UnknownText_0x1a2f5d
cry JIGGLYPUFF
@@ -21,13 +18,11 @@
closetext
loadmovesprites
end
-; 0x1a2ef7
-BugCatcherScript_0x1a2ef7: ; 0x1a2ef7
+BugCatcherScript_0x1a2ef7:
jumptextfaceplayer UnknownText_0x1a2f75
-; 0x1a2efa
-PokefanMScript_0x1a2efa: ; 0x1a2efa
+PokefanMScript_0x1a2efa:
faceplayer
loadfont
trade $4
@@ -34,9 +29,8 @@
closetext
loadmovesprites
end
-; 0x1a2f01
-UnknownText_0x1a2f01: ; 0x1a2f01
+UnknownText_0x1a2f01:
text "…Yeah, and the"
line "GYM in CINNABAR's"
@@ -46,15 +40,13 @@
para "…Yes? I'm on the"
line "phone. Go away!"
done
-; 0x1a2f5d
-UnknownText_0x1a2f5d: ; 0x1a2f5d
+UnknownText_0x1a2f5d:
text "JIGGLYPUFF: Puu"
line "pupuu."
done
-; 0x1a2f75
-UnknownText_0x1a2f75: ; 0x1a2f75
+UnknownText_0x1a2f75:
text "Most #MON get"
line "drowsy if they"
@@ -67,9 +59,8 @@
para "used only while a"
line "#MON is asleep."
done
-; 0x1a2ff4
-PewterPokeCenter1F_MapEventHeader: ; 0x1a2ff4
+PewterPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -92,4 +83,3 @@
person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, $ffff
person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, $ffff
person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, $ffff
-; 0x1a304a
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -1,4 +1,4 @@
-PokeCenter2F_MapScriptHeader: ; 0x192845
+PokeCenter2F_MapScriptHeader:
; trigger count
db 6
@@ -12,9 +12,8 @@
; callback count
db 0
-; 0x19285f
-UnknownScript_0x19285f: ; 0x19285f
+UnknownScript_0x19285f:
special Functionc2f6
if_equal $0, UnknownScript_0x192872
clearevent $0711
@@ -21,44 +20,36 @@
checkevent $0001
iftrue UnknownScript_0x192872
priorityjump UnknownScript_0x192887
-; 0x192872
-UnknownScript_0x192872: ; 0x192872
+UnknownScript_0x192872:
end
-; 0x192873
-UnknownScript_0x192873: ; 0x192873
+UnknownScript_0x192873:
priorityjump UnknownScript_0x192ab6
end
-; 0x192877
-UnknownScript_0x192877: ; 0x192877
+UnknownScript_0x192877:
priorityjump UnknownScript_0x192add
end
-; 0x19287b
-UnknownScript_0x19287b: ; 0x19287b
+UnknownScript_0x19287b:
priorityjump UnknownScript_0x192c4e
end
-; 0x19287f
-UnknownScript_0x19287f: ; 0x19287f
+UnknownScript_0x19287f:
priorityjump UnknownScript_0x192ac3
end
-; 0x192883
-UnknownScript_0x192883: ; 0x192883
+UnknownScript_0x192883:
priorityjump UnknownScript_0x192aea
end
-; 0x192887
-UnknownScript_0x192887: ; 0x192887
+UnknownScript_0x192887:
appear $5
setevent $0001
end
-; 0x19288d
-UnknownScript_0x19288d: ; 0x19288d
+UnknownScript_0x19288d:
faceplayer
loadfont
writetext UnknownText_0x19312f
@@ -65,9 +56,8 @@
closetext
loadmovesprites
end
-; 0x192895
-UnknownScript_0x192895: ; 0x192895
+UnknownScript_0x192895:
faceplayer
loadfont
writetext UnknownText_0x19315f
@@ -74,9 +64,8 @@
closetext
loadmovesprites
end
-; 0x19289d
-LinkReceptionistScript_0x19289d: ; 0x19289d
+LinkReceptionistScript_0x19289d:
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iffalse UnknownScript_0x19288d
loadfont
@@ -89,7 +78,7 @@
special Function103612
iffalse UnknownScript_0x19291d
if_equal $1, UnknownScript_0x19291f
-UnknownScript_0x1928be: ; 0x1928be
+UnknownScript_0x1928be:
special Function29ce8
writetext UnknownText_0x192f67
special Function29d11
@@ -112,57 +101,49 @@
scall UnknownScript_0x192b04
warpcheck
end
-; 0x1928f6
-UnknownScript_0x1928f6: ; 0x1928f6
+UnknownScript_0x1928f6:
special Function29c92
writetext UnknownText_0x192f19
loadmovesprites
end
-; 0x1928fe
-UnknownScript_0x1928fe: ; 0x1928fe
+UnknownScript_0x1928fe:
special Function29efa
writetext UnknownText_0x193029
special Function29eee
loadmovesprites
end
-; 0x192909
-UnknownScript_0x192909: ; 0x192909
+UnknownScript_0x192909:
writetext UnknownText_0x19304a
special Function29eee
loadmovesprites
end
-; 0x192911
-UnknownScript_0x192911: ; 0x192911
+UnknownScript_0x192911:
writetext UnknownText_0x192f75
jump UnknownScript_0x19291a
-; 0x192917
-UnknownScript_0x192917: ; 0x192917
+UnknownScript_0x192917:
writetext UnknownText_0x192fd1
-UnknownScript_0x19291a: ; 0x19291a
+UnknownScript_0x19291a:
special Function29c92
-UnknownScript_0x19291d: ; 0x19291d
+UnknownScript_0x19291d:
loadmovesprites
end
-; 0x19291f
-UnknownScript_0x19291f: ; 0x19291f
+UnknownScript_0x19291f:
scall UnknownScript_0x19292b
iftrue UnknownScript_0x19292a
scall UnknownScript_0x19294a
warpcheck
end
-; 0x19292a
-UnknownScript_0x19292a: ; 0x19292a
+UnknownScript_0x19292a:
end
-; 0x19292b
-UnknownScript_0x19292b: ; 0x19292b
+UnknownScript_0x19292b:
writetext UnknownText_0x192f34
yesorno
iffalse UnknownScript_0x192943
@@ -174,22 +155,19 @@
loadmovesprites
writebyte $0
end
-; 0x192943
-UnknownScript_0x192943: ; 0x192943
+UnknownScript_0x192943:
writetext UnknownText_0x192fd1
loadmovesprites
writebyte $1
end
-; 0x19294a
-UnknownScript_0x19294a: ; 0x19294a
+UnknownScript_0x19294a:
applymovement2 MovementData_0x192cce
applymovement $0, MovementData_0x192ce7
end
-; 0x192952
-LinkReceptionistScript_0x192952: ; 0x192952
+LinkReceptionistScript_0x192952:
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iffalse UnknownScript_0x192895
loadfont
@@ -202,7 +180,7 @@
special Function103612
iffalse UnknownScript_0x1929d2
if_equal $1, UnknownScript_0x1929d4
-UnknownScript_0x192973: ; 0x192973
+UnknownScript_0x192973:
special Function29cf1
writetext UnknownText_0x192f67
special Function29d11
@@ -225,45 +203,39 @@
scall UnknownScript_0x192b04
warpcheck
end
-; 0x1929ab
-UnknownScript_0x1929ab: ; 0x1929ab
+UnknownScript_0x1929ab:
special Function29c92
writetext UnknownText_0x192f19
loadmovesprites
end
-; 0x1929b3
-UnknownScript_0x1929b3: ; 0x1929b3
+UnknownScript_0x1929b3:
special Function29efa
writetext UnknownText_0x193029
special Function29eee
loadmovesprites
end
-; 0x1929be
-UnknownScript_0x1929be: ; 0x1929be
+UnknownScript_0x1929be:
writetext UnknownText_0x19304a
special Function29eee
loadmovesprites
end
-; 0x1929c6
-UnknownScript_0x1929c6: ; 0x1929c6
+UnknownScript_0x1929c6:
writetext UnknownText_0x192f75
jump UnknownScript_0x1929cf
-; 0x1929cc
-UnknownScript_0x1929cc: ; 0x1929cc
+UnknownScript_0x1929cc:
writetext UnknownText_0x192fd1
-UnknownScript_0x1929cf: ; 0x1929cf
+UnknownScript_0x1929cf:
special Function29c92
-UnknownScript_0x1929d2: ; 0x1929d2
+UnknownScript_0x1929d2:
loadmovesprites
end
-; 0x1929d4
-UnknownScript_0x1929d4: ; 0x1929d4
+UnknownScript_0x1929d4:
scall UnknownScript_0x192a05
iffalse UnknownScript_0x1929e5
scall UnknownScript_0x1929e6
@@ -271,13 +243,11 @@
scall UnknownScript_0x19294a
warpcheck
end
-; 0x1929e5
-UnknownScript_0x1929e5: ; 0x1929e5
+UnknownScript_0x1929e5:
end
-; 0x1929e6
-UnknownScript_0x1929e6: ; 0x1929e6
+UnknownScript_0x1929e6:
writetext UnknownText_0x192f34
yesorno
iffalse UnknownScript_0x1929fe
@@ -289,16 +259,14 @@
loadmovesprites
writebyte $0
end
-; 0x1929fe
-UnknownScript_0x1929fe: ; 0x1929fe
+UnknownScript_0x1929fe:
writetext UnknownText_0x192fd1
loadmovesprites
writebyte $1
end
-; 0x192a05
-UnknownScript_0x192a05: ; 0x192a05
+UnknownScript_0x192a05:
special Function10366e
iffalse UnknownScript_0x192a1e
if_equal $1, UnknownScript_0x192a22
@@ -305,23 +273,20 @@
if_equal $2, UnknownScript_0x192a22
if_equal $3, UnknownScript_0x192a1a
jump UnknownScript_0x192a1e
-; 0x192a1a
-UnknownScript_0x192a1a: ; 0x192a1a
+UnknownScript_0x192a1a:
writetext UnknownText_0x1932bc
closetext
-UnknownScript_0x192a1e: ; 0x192a1e
+UnknownScript_0x192a1e:
loadmovesprites
writebyte $0
end
-; 0x192a22
-UnknownScript_0x192a22: ; 0x192a22
+UnknownScript_0x192a22:
writebyte $1
end
-; 0x192a25
-UnknownScript_0x192a25: ; 0x192a25
+UnknownScript_0x192a25:
faceplayer
loadfont
writetext UnknownText_0x193100
@@ -328,9 +293,8 @@
closetext
loadmovesprites
end
-; 0x192a2d
-LinkReceptionistScript_0x192a2d: ; 0x192a2d
+LinkReceptionistScript_0x192a2d:
checkevent $0712
iftrue UnknownScript_0x192a25
checkflag $0053
@@ -363,9 +327,8 @@
special Function29eee
loadmovesprites
end
-; 0x192a84
-UnknownScript_0x192a84: ; 0x192a84
+UnknownScript_0x192a84:
special Function29c7b
writetext UnknownText_0x19306b
closetext
@@ -373,101 +336,87 @@
scall UnknownScript_0x192bc4
warpcheck
end
-; 0x192a91
-UnknownScript_0x192a91: ; 0x192a91
+UnknownScript_0x192a91:
special Function29c92
writetext UnknownText_0x192f19
loadmovesprites
end
-; 0x192a99
-UnknownScript_0x192a99: ; 0x192a99
+UnknownScript_0x192a99:
writetext UnknownText_0x192f75
jump UnknownScript_0x192aa2
-; 0x192a9f
-UnknownScript_0x192a9f: ; 0x192a9f
+UnknownScript_0x192a9f:
writetext UnknownText_0x192fd1
-UnknownScript_0x192aa2: ; 0x192aa2
+UnknownScript_0x192aa2:
special Function29c92
loadmovesprites
end
-; 0x192aa7
-UnknownScript_0x192aa7: ; 0x192aa7
+UnknownScript_0x192aa7:
writetext UnknownText_0x19308b
loadmovesprites
end
-; 0x192aac
-UnknownScript_0x192aac: ; 0x192aac
+UnknownScript_0x192aac:
writetext UnknownText_0x1930a8
loadmovesprites
end
-; 0x192ab1
-UnknownScript_0x192ab1: ; 0x192ab1
+UnknownScript_0x192ab1:
writetext UnknownText_0x1930cf
loadmovesprites
end
-; 0x192ab6
-UnknownScript_0x192ab6: ; 0x192ab6
+UnknownScript_0x192ab6:
special Function29c92
scall UnknownScript_0x192b50
dotrigger $0
domaptrigger GROUP_TRADE_CENTER, MAP_TRADE_CENTER, $0
end
-; 0x192ac3
-UnknownScript_0x192ac3: ; 0x192ac3
+UnknownScript_0x192ac3:
special Function101220
scall UnknownScript_0x192ad0
dotrigger $0
domaptrigger GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE, $0
end
-; 0x192ad0
-UnknownScript_0x192ad0: ; 0x192ad0
+UnknownScript_0x192ad0:
applymovement $2, MovementData_0x192d0b
applymovement $0, MovementData_0x192d0f
applymovement $2, MovementData_0x192d14
end
-; 0x192add
-UnknownScript_0x192add: ; 0x192add
+UnknownScript_0x192add:
special Function29c92
scall UnknownScript_0x192b8a
dotrigger $0
domaptrigger GROUP_COLOSSEUM, MAP_COLOSSEUM, $0
end
-; 0x192aea
-UnknownScript_0x192aea: ; 0x192aea
+UnknownScript_0x192aea:
special Function101220
scall UnknownScript_0x192af7
dotrigger $0
domaptrigger GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM, $0
end
-; 0x192af7
-UnknownScript_0x192af7: ; 0x192af7
+UnknownScript_0x192af7:
applymovement $3, MovementData_0x192d0b
applymovement $0, MovementData_0x192d0f
applymovement $3, MovementData_0x192d14
end
-; 0x192b04
-UnknownScript_0x192b04: ; 0x192b04
+UnknownScript_0x192b04:
checkflag $0063
iftrue UnknownScript_0x192b12
applymovement2 MovementData_0x192cca
applymovement $0, MovementData_0x192cde
end
-; 0x192b12
-UnknownScript_0x192b12: ; 0x192b12
+UnknownScript_0x192b12:
applymovement2 MovementData_0x192cd8
applymovement $0, MovementData_0x192ce2
loadfont
@@ -494,9 +443,8 @@
showemote $0, $0, 15
applymovement $0, MovementData_0x192ce5
end
-; 0x192b50
-UnknownScript_0x192b50: ; 0x192b50
+UnknownScript_0x192b50:
checkflag $009f
iftrue UnknownScript_0x192b63
applymovement $2, MovementData_0x192d04
@@ -503,9 +451,8 @@
applymovement $0, MovementData_0x192cf5
applymovement $2, MovementData_0x192cfe
end
-; 0x192b63
-UnknownScript_0x192b63: ; 0x192b63
+UnknownScript_0x192b63:
applymovement $2, MovementData_0x192d04
applymovement $0, MovementData_0x192d28
clearflag $009f
@@ -518,9 +465,8 @@
applymovement $0, MovementData_0x192d2a
applymovement $2, MovementData_0x192cfe
end
-; 0x192b8a
-UnknownScript_0x192b8a: ; 0x192b8a
+UnknownScript_0x192b8a:
checkflag $009f
iftrue UnknownScript_0x192b9d
applymovement $3, MovementData_0x192d04
@@ -527,9 +473,8 @@
applymovement $0, MovementData_0x192cf5
applymovement $3, MovementData_0x192cfe
end
-; 0x192b9d
-UnknownScript_0x192b9d: ; 0x192b9d
+UnknownScript_0x192b9d:
applymovement $3, MovementData_0x192d04
applymovement $0, MovementData_0x192d28
clearflag $009f
@@ -542,9 +487,8 @@
applymovement $0, MovementData_0x192d2a
applymovement $3, MovementData_0x192cfe
end
-; 0x192bc4
-UnknownScript_0x192bc4: ; 0x192bc4
+UnknownScript_0x192bc4:
checkflag $0063
iftrue UnknownScript_0x192bec
checkcode VAR_FACING
@@ -553,21 +497,18 @@
applymovement2 MovementData_0x192cd2
applymovement $0, MovementData_0x192cec
end
-; 0x192bdc
-UnknownScript_0x192bdc: ; 0x192bdc
+UnknownScript_0x192bdc:
applymovement2 MovementData_0x192cd2
applymovement $0, MovementData_0x192cef
end
-; 0x192be4
-UnknownScript_0x192be4: ; 0x192be4
+UnknownScript_0x192be4:
applymovement2 MovementData_0x192cd5
applymovement $0, MovementData_0x192cf2
end
-; 0x192bec
-UnknownScript_0x192bec: ; 0x192bec
+UnknownScript_0x192bec:
checkcode VAR_FACING
if_equal $3, UnknownScript_0x192c00
if_equal $2, UnknownScript_0x192c0a
@@ -574,18 +515,16 @@
applymovement2 MovementData_0x192d33
applymovement $0, MovementData_0x192d2d
jump UnknownScript_0x192c11
-; 0x192c00
-UnknownScript_0x192c00: ; 0x192c00
+UnknownScript_0x192c00:
applymovement2 MovementData_0x192d36
applymovement $0, MovementData_0x192d2f
jump UnknownScript_0x192c11
-; 0x192c0a
-UnknownScript_0x192c0a: ; 0x192c0a
+UnknownScript_0x192c0a:
applymovement2 MovementData_0x192d33
applymovement $0, MovementData_0x192d31
-UnknownScript_0x192c11: ; 0x192c11
+UnknownScript_0x192c11:
loadfont
writetext UnknownText_0x193266
closetext
@@ -593,7 +532,7 @@
checkcode VAR_FACING
if_not_equal $1, UnknownScript_0x192c20
spriteface $0, LEFT
-UnknownScript_0x192c20: ; 0x192c20
+UnknownScript_0x192c20:
loadfont
writetext UnknownText_0x193278
closetext
@@ -613,9 +552,8 @@
showemote $0, $0, 15
applymovement $0, MovementData_0x192d2d
end
-; 0x192c4e
-UnknownScript_0x192c4e: ; 0x192c4e
+UnknownScript_0x192c4e:
special Function29c92
checkflag $009f
iftrue UnknownScript_0x192c66
@@ -623,9 +561,8 @@
applymovement $0, MovementData_0x192cf9
applymovement $4, MovementData_0x192d01
jump UnknownScript_0x192c8c
-; 0x192c66
-UnknownScript_0x192c66: ; 0x192c66
+UnknownScript_0x192c66:
applymovement $4, MovementData_0x192d08
applymovement $0, MovementData_0x192cfc
clearflag $009f
@@ -637,20 +574,18 @@
special Functione4a
applymovement $0, MovementData_0x192cfc
applymovement $4, MovementData_0x192d01
-UnknownScript_0x192c8c: ; 0x192c8c
+UnknownScript_0x192c8c:
dotrigger $0
domaptrigger GROUP_TIME_CAPSULE, MAP_TIME_CAPSULE, $0
end
-; 0x192c93
-MapPokeCenter2FSignpost0Script: ; 0x192c93
+MapPokeCenter2FSignpost0Script:
refreshscreen $0
special Functionc2da
loadmovesprites
end
-; 0x192c9a
-OfficerScript_0x192c9a: ; 0x192c9a
+OfficerScript_0x192c9a:
faceplayer
loadfont
checkevent $0711
@@ -665,182 +600,155 @@
iffalse UnknownScript_0x192cbe
itemnotify
setevent $0711
-UnknownScript_0x192cb8: ; 0x192cb8
+UnknownScript_0x192cb8:
writetext UnknownText_0x1931d2
closetext
loadmovesprites
end
-; 0x192cbe
-UnknownScript_0x192cbe: ; 0x192cbe
+UnknownScript_0x192cbe:
writetext UnknownText_0x1931ef
closetext
loadmovesprites
end
-; 0x192cc4
-UnknownScript_0x192cc4: ; 0x192cc4
+UnknownScript_0x192cc4:
writetext UnknownText_0x19324d
closetext
loadmovesprites
end
-; 0x192cca
-MovementData_0x192cca: ; 0x192cca
+MovementData_0x192cca:
slow_step_up
slow_step_left
turn_head_right
step_end
-; 0x192cce
-MovementData_0x192cce: ; 0x192cce
+MovementData_0x192cce:
slow_step_up
slow_step_left
turn_head_down
step_end
-; 0x192cd2
-MovementData_0x192cd2: ; 0x192cd2
+MovementData_0x192cd2:
slow_step_left
turn_head_down
step_end
-; 0x192cd5
-MovementData_0x192cd5: ; 0x192cd5
+MovementData_0x192cd5:
slow_step_right
turn_head_down
step_end
-; 0x192cd8
-MovementData_0x192cd8: ; 0x192cd8
+MovementData_0x192cd8:
slow_step_up
slow_step_left
turn_head_right
step_end
-; 0x192cdc
-MovementData_0x192cdc: ; 0x192cdc
+MovementData_0x192cdc:
turn_head_right
step_end
-; 0x192cde
-MovementData_0x192cde: ; 0x192cde
+MovementData_0x192cde:
step_up
step_up
step_up
step_end
-; 0x192ce2
-MovementData_0x192ce2: ; 0x192ce2
+MovementData_0x192ce2:
step_up
step_up
step_end
-; 0x192ce5
-MovementData_0x192ce5: ; 0x192ce5
+MovementData_0x192ce5:
step_up
step_end
-; 0x192ce7
-MovementData_0x192ce7: ; 0x192ce7
+MovementData_0x192ce7:
step_up
step_up
step_right
step_up
step_end
-; 0x192cec
-MovementData_0x192cec: ; 0x192cec
+MovementData_0x192cec:
step_up
step_up
step_end
-; 0x192cef
-MovementData_0x192cef: ; 0x192cef
+MovementData_0x192cef:
step_left
step_up
step_end
-; 0x192cf2
-MovementData_0x192cf2: ; 0x192cf2
+MovementData_0x192cf2:
step_right
step_up
step_end
-; 0x192cf5
-MovementData_0x192cf5: ; 0x192cf5
+MovementData_0x192cf5:
step_down
step_down
step_down
step_end
-; 0x192cf9
-MovementData_0x192cf9: ; 0x192cf9
+MovementData_0x192cf9:
step_down
step_down
step_end
-; 0x192cfc
-MovementData_0x192cfc: ; 0x192cfc
+MovementData_0x192cfc:
step_down
step_end
-; 0x192cfe
-MovementData_0x192cfe: ; 0x192cfe
+MovementData_0x192cfe:
slow_step_right
slow_step_down
step_end
-; 0x192d01
-MovementData_0x192d01: ; 0x192d01
+MovementData_0x192d01:
slow_step_right
turn_head_down
step_end
-; 0x192d04
-MovementData_0x192d04: ; 0x192d04
+MovementData_0x192d04:
slow_step_up
slow_step_left
turn_head_right
step_end
-; 0x192d08
-MovementData_0x192d08: ; 0x192d08
+MovementData_0x192d08:
slow_step_left
turn_head_right
step_end
-; 0x192d0b
-MovementData_0x192d0b: ; 0x192d0b
+MovementData_0x192d0b:
slow_step_up
slow_step_left
turn_head_right
step_end
-; 0x192d0f
-MovementData_0x192d0f: ; 0x192d0f
+MovementData_0x192d0f:
step_down
step_left
step_down
step_down
step_end
-; 0x192d14
-MovementData_0x192d14: ; 0x192d14
+MovementData_0x192d14:
slow_step_right
slow_step_down
step_end
-; 0x192d17
-MovementData_0x192d17: ; 0x192d17
+MovementData_0x192d17:
turn_head_down
turn_head_left
turn_head_up
turn_head_right
step_end
-; 0x192d1c
-MovementData_0x192d1c: ; 0x192d1c
+MovementData_0x192d1c:
turn_head_down
turn_head_left
turn_head_up
@@ -847,9 +755,8 @@
turn_head_right
turn_head_left
step_end
-; 0x192d22
-MovementData_0x192d22: ; 0x192d22
+MovementData_0x192d22:
turn_head_down
turn_head_left
turn_head_up
@@ -856,47 +763,39 @@
turn_head_right
turn_head_down
step_end
-; 0x192d28
-MovementData_0x192d28: ; 0x192d28
+MovementData_0x192d28:
step_down
step_end
-; 0x192d2a
-MovementData_0x192d2a: ; 0x192d2a
+MovementData_0x192d2a:
step_down
step_down
step_end
-; 0x192d2d
-MovementData_0x192d2d: ; 0x192d2d
+MovementData_0x192d2d:
step_up
step_end
-; 0x192d2f
-MovementData_0x192d2f: ; 0x192d2f
+MovementData_0x192d2f:
step_right
step_end
-; 0x192d31
-MovementData_0x192d31: ; 0x192d31
+MovementData_0x192d31:
step_left
step_end
-; 0x192d33
-MovementData_0x192d33: ; 0x192d33
+MovementData_0x192d33:
slow_step_left
turn_head_right
step_end
-; 0x192d36
-MovementData_0x192d36: ; 0x192d36
+MovementData_0x192d36:
slow_step_right
turn_head_left
step_end
-; 0x192d39
-UnknownText_0x192d39: ; 0x192d39
+UnknownText_0x192d39:
text "Would you like to"
line "battle over a GAME"
@@ -903,9 +802,8 @@
para "LINK cable or by"
line "mobile phone?"
done
-; 0x192d7e
-UnknownText_0x192d7e: ; 0x192d7e
+UnknownText_0x192d7e:
text "Would you like to"
line "trade over a GAME"
@@ -912,15 +810,13 @@
para "LINK cable or by"
line "mobile phone?"
done
-; 0x192dc2
-UnknownText_0x192dc2: ; 0x192dc2
+UnknownText_0x192dc2:
text "This way to the"
line "MOBILE ROOM."
done
-; 0x192de0
-UnknownText_0x192de0: ; 0x192de0
+UnknownText_0x192de0:
text "Welcome to CABLE"
line "CLUB COLOSSEUM."
@@ -930,9 +826,8 @@
para "Would you like to"
line "battle?"
done
-; 0x192e3a
-UnknownText_0x192e3a: ; 0x192e3a
+UnknownText_0x192e3a:
text "Welcome to CABLE"
line "TRADE CENTER."
@@ -943,9 +838,8 @@
para "Would you like to"
line "trade?"
done
-; 0x192e9f
-UnknownText_0x192e9f: ; 0x192e9f
+UnknownText_0x192e9f:
text "Welcome to CABLE"
line "CLUB TIME CAPSULE."
@@ -956,27 +850,23 @@
para "Would you like to"
line "trade across time?"
done
-; 0x192f19
-UnknownText_0x192f19: ; 0x192f19
+UnknownText_0x192f19:
text "Your friend is not"
line "ready."
prompt
-; 0x192f34
-UnknownText_0x192f34: ; 0x192f34
+UnknownText_0x192f34:
text "Before opening the"
line "link, you must"
cont "save your game."
done
-; 0x192f67
-UnknownText_0x192f67: ; 0x192f67
+UnknownText_0x192f67:
text "Please wait."
done
-; 0x192f75
-UnknownText_0x192f75: ; 0x192f75
+UnknownText_0x192f75:
text "The link has been"
line "closed because of"
cont "inactivity."
@@ -985,56 +875,47 @@
line "your friend and"
cont "come again."
prompt
-; 0x192fd1
-UnknownText_0x192fd1: ; 0x192fd1
+UnknownText_0x192fd1:
text "Please come again."
prompt
-; 0x192fe5
-UnknownText_0x192fe5: ; 0x192fe5
+UnknownText_0x192fe5:
text "Please come in."
prompt
-; 0x192ff6
-UnknownText_0x192ff6: ; 0x192ff6
+UnknownText_0x192ff6:
text "We'll put you in"
line "the link room for"
cont "the time being."
done
-; 0x193029
-UnknownText_0x193029: ; 0x193029
+UnknownText_0x193029:
text "You can't link to"
line "the past here."
prompt
-; 0x19304a
-UnknownText_0x19304a: ; 0x19304a
+UnknownText_0x19304a:
text "Incompatible rooms"
line "were chosen."
prompt
-; 0x19306b
-UnknownText_0x19306b: ; 0x19306b
+UnknownText_0x19306b:
text "Please come in."
done
-; 0x19307c
-UnknownText_0x19307c: ; 0x19307c
+UnknownText_0x19307c:
text "Please enter."
prompt
-; 0x19308b
-UnknownText_0x19308b: ; 0x19308b
+UnknownText_0x19308b:
text "Sorry--@"
text_from_ram StringBuffer1
text ""
line "can't be taken."
prompt
-; 0x1930a8
-UnknownText_0x1930a8: ; 0x1930a8
+UnknownText_0x1930a8:
text "You can't take the"
line "@"
text_from_ram StringBuffer1
@@ -1043,9 +924,8 @@
text_from_ram StringBuffer2
text "."
prompt
-; 0x1930cf
-UnknownText_0x1930cf: ; 0x1930cf
+UnknownText_0x1930cf:
text "You can't take the"
line "@"
text_from_ram StringBuffer1
@@ -1052,30 +932,26 @@
text " that"
cont "has MAIL with you."
prompt
-; 0x193100
-UnknownText_0x193100: ; 0x193100
+UnknownText_0x193100:
text "I'm sorry--the"
line "TIME CAPSULE is"
cont "being adjusted."
done
-; 0x19312f
-UnknownText_0x19312f: ; 0x19312f
+UnknownText_0x19312f:
text "I'm sorry--the"
line "TRADE MACHINE is"
cont "being adjusted."
done
-; 0x19315f
-UnknownText_0x19315f: ; 0x19315f
+UnknownText_0x19315f:
text "I'm sorry--the"
line "BATTLE MACHINE is"
cont "being adjusted."
done
-; 0x193190
-UnknownText_0x193190: ; 0x193190
+UnknownText_0x193190:
text "Hello! You're"
line "<PLAYER>, right?"
@@ -1082,20 +958,17 @@
para "I have some-"
line "thing for you."
done
-; 0x1931c4
-UnknownText_0x1931c4: ; 0x1931c4
+UnknownText_0x1931c4:
text "Here you go!"
done
-; 0x1931d2
-UnknownText_0x1931d2: ; 0x1931d2
+UnknownText_0x1931d2:
text "We hope to serve"
line "you again."
done
-; 0x1931ef
-UnknownText_0x1931ef: ; 0x1931ef
+UnknownText_0x1931ef:
text "Oh, you have no"
line "space for this."
@@ -1105,32 +978,27 @@
para "across the country"
line "to pick it up."
done
-; 0x19324d
-UnknownText_0x19324d: ; 0x19324d
+UnknownText_0x19324d:
text "No? That's very"
line "strange…"
done
-; 0x193266
-UnknownText_0x193266: ; 0x193266
+UnknownText_0x193266:
text "Oh, please wait."
done
-; 0x193278
-UnknownText_0x193278: ; 0x193278
+UnknownText_0x193278:
text "We need to change"
line "the look here…"
done
-; 0x19329a
-UnknownText_0x19329a: ; 0x19329a
+UnknownText_0x19329a:
text "How does this"
line "style look to you?"
done
-; 0x1932bc
-UnknownText_0x1932bc: ; 0x1932bc
+UnknownText_0x1932bc:
text "Excuse me!"
para "For STADIUM rules,"
@@ -1149,9 +1017,8 @@
para "Please come back"
line "when you're ready."
done
-; 0x19337f
-PokeCenter2F_MapEventHeader: ; 0x19337f
+PokeCenter2F_MapEventHeader:
; filler
db 0, 0
@@ -1177,4 +1044,3 @@
person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, $ffff
person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, $ffff
person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, $0711
-; 0x1933dc
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -1,12 +1,11 @@
-PokeSeersHouse_MapScriptHeader: ; 0x9e36c
+PokeSeersHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9e36e
-SeerScript: ; 0x9e36e
+SeerScript:
faceplayer
loadfont
special SpecialPokeSeer
@@ -13,9 +12,8 @@
closetext
loadmovesprites
end
-; 0x9e376
-PokeSeersHouse_MapEventHeader: ; 0x9e376
+PokeSeersHouse_MapEventHeader:
; filler
db 0, 0
@@ -33,4 +31,3 @@
; people-events
db 1
person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, $ffff
-; 0x9e393
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -1,12 +1,11 @@
-PokemonFanClub_MapScriptHeader: ; 0x1917e7
+PokemonFanClub_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1917e9
-GentlemanScript_0x1917e9: ; 0x1917e9
+GentlemanScript_0x1917e9:
faceplayer
loadfont
checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
@@ -18,7 +17,7 @@
iffalse UnknownScript_0x19181b
writetext UnknownText_0x191911
keeptextopen
-UnknownScript_0x191802: ; 0x191802
+UnknownScript_0x191802:
writetext UnknownText_0x191a3d
keeptextopen
verbosegiveitem RARE_CANDY, 1
@@ -28,28 +27,24 @@
closetext
loadmovesprites
end
-; 0x191815
-UnknownScript_0x191815: ; 0x191815
+UnknownScript_0x191815:
writetext UnknownText_0x191ae0
closetext
loadmovesprites
end
-; 0x19181b
-UnknownScript_0x19181b: ; 0x19181b
+UnknownScript_0x19181b:
writetext UnknownText_0x191b38
closetext
-UnknownScript_0x19181f: ; 0x19181f
+UnknownScript_0x19181f:
loadmovesprites
end
-; 0x191821
-ReceptionistScript_0x191821: ; 0x191821
+ReceptionistScript_0x191821:
jumptextfaceplayer UnknownText_0x191b6d
-; 0x191824
-FisherScript_0x191824: ; 0x191824
+FisherScript_0x191824:
faceplayer
loadfont
checkevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
@@ -60,9 +55,8 @@
closetext
loadmovesprites
end
-; 0x191838
-UnknownScript_0x191838: ; 0x191838
+UnknownScript_0x191838:
writetext UnknownText_0x191bff
checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
iftrue UnknownScript_0x191844
@@ -69,9 +63,8 @@
closetext
loadmovesprites
end
-; 0x191844
-UnknownScript_0x191844: ; 0x191844
+UnknownScript_0x191844:
keeptextopen
writetext UnknownText_0x191c5a
keeptextopen
@@ -86,31 +79,26 @@
setevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
loadmovesprites
end
-; 0x19185f
-UnknownScript_0x19185f: ; 0x19185f
+UnknownScript_0x19185f:
writetext UnknownText_0x191d1e
closetext
loadmovesprites
end
-; 0x191865
-UnknownScript_0x191865: ; 0x191865
+UnknownScript_0x191865:
writetext UnknownText_0x191d58
closetext
loadmovesprites
end
-; 0x19186b
-TeacherScript_0x19186b: ; 0x19186b
+TeacherScript_0x19186b:
jumptextfaceplayer UnknownText_0x191d73
-; 0x19186e
-FairyScript_0x19186e: ; 0x19186e
+FairyScript_0x19186e:
jumptext UnknownText_0x191db1
-; 0x191871
-OddishScript_0x191871: ; 0x191871
+OddishScript_0x191871:
loadfont
writetext UnknownText_0x191de9
cry BAYLEEF
@@ -117,17 +105,14 @@
closetext
loadmovesprites
end
-; 0x19187b
-MapPokemonFanClubSignpost0Script: ; 0x19187b
+MapPokemonFanClubSignpost0Script:
jumptext UnknownText_0x191dfc
-; 0x19187e
-MapPokemonFanClubSignpost1Script: ; 0x19187e
+MapPokemonFanClubSignpost1Script:
jumptext UnknownText_0x191e29
-; 0x191881
-UnknownText_0x191881: ; 0x191881
+UnknownText_0x191881:
text "I'm the CHAIRMAN"
line "of the #MON FAN"
cont "CLUB."
@@ -143,9 +128,8 @@
line "to hear about my"
cont "#MON?"
done
-; 0x191911
-UnknownText_0x191911: ; 0x191911
+UnknownText_0x191911:
text "Good!"
line "Then listen up!"
@@ -170,16 +154,14 @@
cont "time! I've kept"
cont "you too long!"
done
-; 0x191a3d
-UnknownText_0x191a3d: ; 0x191a3d
+UnknownText_0x191a3d:
text "Thanks for hearing"
line "me out. I want you"
cont "to have this!"
done
-; 0x191a72
-UnknownText_0x191a72: ; 0x191a72
+UnknownText_0x191a72:
text "It's a RARE CANDY"
line "that makes #MON"
cont "stronger."
@@ -190,9 +172,8 @@
para "by battling, so"
line "you can have it."
done
-; 0x191ae0
-UnknownText_0x191ae0: ; 0x191ae0
+UnknownText_0x191ae0:
text "Hello, <PLAY_G>!"
para "Did you come see"
@@ -202,24 +183,21 @@
para "No? Oh… I had more"
line "tales to tell…"
done
-; 0x191b38
-UnknownText_0x191b38: ; 0x191b38
+UnknownText_0x191b38:
text "How disappointing…"
para "Come back if you"
line "want to listen."
done
-; 0x191b6d
-UnknownText_0x191b6d: ; 0x191b6d
+UnknownText_0x191b6d:
text "Our CHAIRMAN is"
line "very vocal when it"
cont "comes to #MON…"
done
-; 0x191ba0
-UnknownText_0x191ba0: ; 0x191ba0
+UnknownText_0x191ba0:
text "I love the way"
line "CLEFAIRY waggles"
@@ -229,9 +207,8 @@
para "METRONOME."
line "It's so adorable!"
done
-; 0x191bff
-UnknownText_0x191bff: ; 0x191bff
+UnknownText_0x191bff:
text "I love CLEFAIRY,"
line "but I could never"
@@ -241,9 +218,8 @@
para "# DOLL that I"
line "found."
done
-; 0x191c5a
-UnknownText_0x191c5a: ; 0x191c5a
+UnknownText_0x191c5a:
text "Oh, I see now. The"
line "girl who lost this"
@@ -261,15 +237,13 @@
para "my own one day."
line "No worries!"
done
-; 0x191d0a
-UnknownText_0x191d0a: ; 0x191d0a
+UnknownText_0x191d0a:
text "<PLAYER> received"
line "# DOLL."
done
-; 0x191d1e
-UnknownText_0x191d1e: ; 0x191d1e
+UnknownText_0x191d1e:
text "You watch. I'm"
line "going to get a"
@@ -276,15 +250,13 @@
para "real CLEFAIRY as"
line "my friend."
done
-; 0x191d58
-UnknownText_0x191d58: ; 0x191d58
+UnknownText_0x191d58:
text "Your PACK is"
line "jammed full."
done
-; 0x191d73
-UnknownText_0x191d73: ; 0x191d73
+UnknownText_0x191d73:
text "Look at my darling"
line "BAYLEEF!"
@@ -291,9 +263,8 @@
para "The leaf on its"
line "head is so cute!"
done
-; 0x191db1
-UnknownText_0x191db1: ; 0x191db1
+UnknownText_0x191db1:
text "It's a CLEFAIRY!"
line "Huh?"
@@ -301,27 +272,23 @@
line "CLEFAIRY #"
cont "DOLL."
done
-; 0x191de9
-UnknownText_0x191de9: ; 0x191de9
+UnknownText_0x191de9:
text "BAYLEEF: Li liif!"
done
-; 0x191dfc
-UnknownText_0x191dfc: ; 0x191dfc
+UnknownText_0x191dfc:
text "Let's all listen"
line "politely to other"
cont "trainers."
done
-; 0x191e29
-UnknownText_0x191e29: ; 0x191e29
+UnknownText_0x191e29:
text "If someone brags,"
line "brag right back!"
done
-; 0x191e4d
-PokemonFanClub_MapEventHeader: ; 0x191e4d
+PokemonFanClub_MapEventHeader:
; filler
db 0, 0
@@ -346,4 +313,3 @@
person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, $ffff
person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, $0774
person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, $ffff
-; 0x191eb5
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -1,4 +1,4 @@
-PowerPlant_MapScriptHeader: ; 0x188db9
+PowerPlant_MapScriptHeader:
; trigger count
db 2
@@ -8,17 +8,14 @@
; callback count
db 0
-; 0x188dc3
-UnknownScript_0x188dc3: ; 0x188dc3
+UnknownScript_0x188dc3:
end
-; 0x188dc4
-UnknownScript_0x188dc4: ; 0x188dc4
+UnknownScript_0x188dc4:
end
-; 0x188dc5
-UnknownScript_0x188dc5: ; 0x188dc5
+UnknownScript_0x188dc5:
playsound SFX_CALL
showemote $0, $2, 15
waitbutton
@@ -40,9 +37,8 @@
applymovement $2, MovementData_0x188eda
dotrigger $0
end
-; 0x188df5
-OfficerScript_0x188df5: ; 0x188df5
+OfficerScript_0x188df5:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -53,23 +49,20 @@
closetext
loadmovesprites
end
-; 0x188e09
-UnknownScript_0x188e09: ; 0x188e09
+UnknownScript_0x188e09:
writetext UnknownText_0x188f7f
closetext
loadmovesprites
end
-; 0x188e0f
-UnknownScript_0x188e0f: ; 0x188e0f
+UnknownScript_0x188e0f:
writetext UnknownText_0x188fa2
closetext
loadmovesprites
end
-; 0x188e15
-GymGuyScript_0x188e15: ; 0x188e15
+GymGuyScript_0x188e15:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -78,16 +71,14 @@
closetext
loadmovesprites
end
-; 0x188e23
-UnknownScript_0x188e23: ; 0x188e23
+UnknownScript_0x188e23:
writetext UnknownText_0x189038
closetext
loadmovesprites
end
-; 0x188e29
-GymGuyScript_0x188e29: ; 0x188e29
+GymGuyScript_0x188e29:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -96,16 +87,14 @@
closetext
loadmovesprites
end
-; 0x188e37
-UnknownScript_0x188e37: ; 0x188e37
+UnknownScript_0x188e37:
writetext UnknownText_0x1890ef
closetext
loadmovesprites
end
-; 0x188e3d
-OfficerScript_0x188e3d: ; 0x188e3d
+OfficerScript_0x188e3d:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -114,16 +103,14 @@
closetext
loadmovesprites
end
-; 0x188e4b
-UnknownScript_0x188e4b: ; 0x188e4b
+UnknownScript_0x188e4b:
writetext UnknownText_0x18917f
closetext
loadmovesprites
end
-; 0x188e51
-GymGuyScript_0x188e51: ; 0x188e51
+GymGuyScript_0x188e51:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -132,16 +119,14 @@
closetext
loadmovesprites
end
-; 0x188e5f
-UnknownScript_0x188e5f: ; 0x188e5f
+UnknownScript_0x188e5f:
writetext UnknownText_0x189225
closetext
loadmovesprites
end
-; 0x188e65
-PowerPlantManager: ; 0x188e65
+PowerPlantManager:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -159,16 +144,14 @@
domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1
dotrigger $1
end
-; 0x188e8d
-UnknownScript_0x188e8d: ; 0x188e8d
+UnknownScript_0x188e8d:
writetext UnknownText_0x189308
closetext
loadmovesprites
end
-; 0x188e93
-UnknownScript_0x188e93: ; 0x188e93
+UnknownScript_0x188e93:
writetext UnknownText_0x18936e
keeptextopen
takeitem MACHINE_PART, 1
@@ -178,7 +161,7 @@
setevent $076c
setevent EVENT_RESTORED_POWER_TO_KANTO
clearevent $0749
-UnknownScript_0x188eac: ; 0x188eac
+UnknownScript_0x188eac:
checkevent EVENT_GOT_TM07_ZAP_CANNON
iftrue UnknownScript_0x188ec5
writetext UnknownText_0x1893c4
@@ -188,19 +171,17 @@
setevent EVENT_GOT_TM07_ZAP_CANNON
writetext UnknownText_0x1893f4
closetext
-UnknownScript_0x188ec3: ; 0x188ec3
+UnknownScript_0x188ec3:
loadmovesprites
end
-; 0x188ec5
-UnknownScript_0x188ec5: ; 0x188ec5
+UnknownScript_0x188ec5:
writetext UnknownText_0x189475
closetext
loadmovesprites
end
-; 0x188ecb
-GymGuyScript_0x188ecb: ; 0x188ecb
+GymGuyScript_0x188ecb:
faceplayer
loadfont
trade $6
@@ -207,20 +188,18 @@
closetext
loadmovesprites
end
-; 0x188ed2
PowerPlantBookshelf:
jumpstd difficultbookshelf
-MovementData_0x188ed5: ; 0x188ed5
+MovementData_0x188ed5:
step_right
step_right
step_up
step_up
step_end
-; 0x188eda
-MovementData_0x188eda: ; 0x188eda
+MovementData_0x188eda:
step_down
step_down
step_left
@@ -227,9 +206,8 @@
step_left
turn_head_down
step_end
-; 0x188ee0
-UnknownText_0x188ee0: ; 0x188ee0
+UnknownText_0x188ee0:
text "A thief broke into"
line "the POWER PLANT…"
@@ -236,9 +214,8 @@
para "What is the world"
line "coming to?"
done
-; 0x188f22
-UnknownText_0x188f22: ; 0x188f22
+UnknownText_0x188f22:
text "I just got word"
line "from CERULEAN."
@@ -248,22 +225,19 @@
para "has been loitering"
line "around."
done
-; 0x188f7f
-UnknownText_0x188f7f: ; 0x188f7f
+UnknownText_0x188f7f:
text "Could I ask for"
line "your cooperation?"
done
-; 0x188fa2
-UnknownText_0x188fa2: ; 0x188fa2
+UnknownText_0x188fa2:
text "We'll have to beef"
line "up our security"
cont "presence."
done
-; 0x188fcf
-UnknownText_0x188fcf: ; 0x188fcf
+UnknownText_0x188fcf:
text "Someone made off"
line "with a part that's"
@@ -274,9 +248,8 @@
line "new generator's"
cont "useless!"
done
-; 0x189038
-UnknownText_0x189038: ; 0x189038
+UnknownText_0x189038:
text "The generator's up"
line "and running. It's"
@@ -283,9 +256,8 @@
para "making electricity"
line "to spare."
done
-; 0x189079
-UnknownText_0x189079: ; 0x189079
+UnknownText_0x189079:
text "This POWER PLANT"
line "had been abandoned"
cont "in the past."
@@ -296,15 +268,13 @@
para "provide power to"
line "the MAGNET TRAIN."
done
-; 0x1890ef
-UnknownText_0x1890ef: ; 0x1890ef
+UnknownText_0x1890ef:
text "The generator's"
line "running again!"
done
-; 0x18910e
-UnknownText_0x18910e: ; 0x18910e
+UnknownText_0x18910e:
text "The POWER PLANT's"
line "MANAGER is up"
cont "ahead."
@@ -315,9 +285,8 @@
cont "both sad and"
cont "furious…"
done
-; 0x18917f
-UnknownText_0x18917f: ; 0x18917f
+UnknownText_0x18917f:
text "Since the gener-"
line "ator's been fixed,"
@@ -324,9 +293,8 @@
para "the MANAGER has"
line "been cheerful."
done
-; 0x1891c2
-UnknownText_0x1891c2: ; 0x1891c2
+UnknownText_0x1891c2:
text "The MAGNET TRAIN"
line "consumes a lot of"
cont "electricity."
@@ -335,9 +303,8 @@
line "the new generator"
cont "isn't operating."
done
-; 0x189225
-UnknownText_0x189225: ; 0x189225
+UnknownText_0x189225:
text "All right! We can"
line "finally get the"
@@ -344,9 +311,8 @@
para "MAGNET TRAIN"
line "running again."
done
-; 0x189264
-UnknownText_0x189264: ; 0x189264
+UnknownText_0x189264:
text "MANAGER: I, I, I'm"
line "ready to blast"
cont "someone!"
@@ -363,9 +329,8 @@
para "a taste of my ZAP"
line "CANNON!"
done
-; 0x189308
-UnknownText_0x189308: ; 0x189308
+UnknownText_0x189308:
text "MANAGER: I won't"
line "forgive him!"
@@ -377,9 +342,8 @@
para "Gahahahah!"
done
-; 0x18936e
-UnknownText_0x18936e: ; 0x18936e
+UnknownText_0x18936e:
text "MANAGER: Ah! Yeah!"
para "That's the missing"
@@ -387,17 +351,15 @@
cont "loved generator!"
cont "You found it?"
done
-; 0x1893c4
-UnknownText_0x1893c4: ; 0x1893c4
+UnknownText_0x1893c4:
text "Wahah! Thanks!"
para "Here! Take this TM"
line "as a reward!"
done
-; 0x1893f4
-UnknownText_0x1893f4: ; 0x1893f4
+UnknownText_0x1893f4:
text "MANAGER: TM07 is"
line "my ZAP CANNON."
@@ -410,9 +372,8 @@
para "accurate, but it"
line "packs a wallop!"
done
-; 0x189475
-UnknownText_0x189475: ; 0x189475
+UnknownText_0x189475:
text "MANAGER: My be-"
line "loved generator!"
@@ -419,9 +380,8 @@
para "Keep pumping the"
line "electricity out!"
done
-; 0x1894b9
-PowerPlant_MapEventHeader: ; 0x1894b9
+PowerPlant_MapEventHeader:
; filler
db 0, 0
@@ -448,4 +408,3 @@
person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, $ffff
person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, $ffff
person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, $ffff
-; 0x189536
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -1,20 +1,17 @@
-RedsHouse2F_MapScriptHeader: ; 0x19b048
+RedsHouse2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19b04a
-MapRedsHouse2FSignpost0Script: ; 0x19b04a
+MapRedsHouse2FSignpost0Script:
jumptext UnknownText_0x19b050
-; 0x19b04d
-MapRedsHouse2FSignpost1Script: ; 0x19b04d
+MapRedsHouse2FSignpost1Script:
jumptext UnknownText_0x19b087
-; 0x19b050
-UnknownText_0x19b050: ; 0x19b050
+UnknownText_0x19b050:
text "<PLAYER> played the"
line "N64."
@@ -21,16 +18,14 @@
para "Better get going--"
line "no time to lose!"
done
-; 0x19b087
-UnknownText_0x19b087: ; 0x19b087
+UnknownText_0x19b087:
text "It looks like it"
line "hasn't been used"
cont "in a long time…"
done
-; 0x19b0b9
-RedsHouse2F_MapEventHeader: ; 0x19b0b9
+RedsHouse2F_MapEventHeader:
; filler
db 0, 0
@@ -48,4 +43,3 @@
; people-events
db 0
-; 0x19b0ce
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -1,32 +1,27 @@
-RockTunnel1F_MapScriptHeader: ; 0x743b3
+RockTunnel1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x743b5
-ItemFragment_0x743b5: ; 0x743b5
+ItemFragment_0x743b5:
db ELIXER, 1
-; 0x743b7
-ItemFragment_0x743b7: ; 0x743b7
+ItemFragment_0x743b7:
db TM_STEEL_WING, 1
-; 0x743b9
-MapRockTunnel1FSignpostItem0: ; 0x743b9
+MapRockTunnel1FSignpostItem0:
dw $00e7
db X_ACCURACY
-; 0x743bc
-MapRockTunnel1FSignpostItem1: ; 0x743bc
+MapRockTunnel1FSignpostItem1:
dw $00e8
db X_DEFEND
-; 0x743bf
-RockTunnel1F_MapEventHeader: ; 0x743bf
+RockTunnel1F_MapEventHeader:
; filler
db 0, 0
@@ -51,4 +46,3 @@
db 2
person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, $077e
person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, $077f
-; 0x74407
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -1,30 +1,25 @@
-RockTunnelB1F_MapScriptHeader: ; 0x74407
+RockTunnelB1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x74409
-ItemFragment_0x74409: ; 0x74409
+ItemFragment_0x74409:
db IRON, 1
-; 0x7440b
-ItemFragment_0x7440b: ; 0x7440b
+ItemFragment_0x7440b:
db PP_UP, 1
-; 0x7440d
-ItemFragment_0x7440d: ; 0x7440d
+ItemFragment_0x7440d:
db REVIVE, 1
-; 0x7440f
-MapRockTunnelB1FSignpostItem0: ; 0x7440f
+MapRockTunnelB1FSignpostItem0:
dw $00e9
db MAX_POTION
-; 0x74412
-RockTunnelB1F_MapEventHeader: ; 0x74412
+RockTunnelB1F_MapEventHeader:
; filler
db 0, 0
@@ -47,4 +42,3 @@
person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74409, $0780
person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, $0781
person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, $0782
-; 0x74458
--- a/maps/Route10PokeCenter1F.asm
+++ b/maps/Route10PokeCenter1F.asm
@@ -1,20 +1,17 @@
-Route10PokeCenter1F_MapScriptHeader: ; 0x188bd2
+Route10PokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x188bd4
-NurseScript_0x188bd4: ; 0x188bd4
+NurseScript_0x188bd4:
jumpstd pokecenternurse
-; 0x188bd7
-GentlemanScript_0x188bd7: ; 0x188bd7
+GentlemanScript_0x188bd7:
jumptextfaceplayer UnknownText_0x188bf1
-; 0x188bda
-GymGuyScript_0x188bda: ; 0x188bda
+GymGuyScript_0x188bda:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -23,20 +20,17 @@
closetext
loadmovesprites
end
-; 0x188be8
-UnknownScript_0x188be8: ; 0x188be8
+UnknownScript_0x188be8:
writetext UnknownText_0x188c9e
closetext
loadmovesprites
end
-; 0x188bee
-CooltrainerFScript_0x188bee: ; 0x188bee
+CooltrainerFScript_0x188bee:
jumptextfaceplayer UnknownText_0x188d0c
-; 0x188bf1
-UnknownText_0x188bf1: ; 0x188bf1
+UnknownText_0x188bf1:
text "A #MON CENTER"
line "near a cave?"
@@ -43,9 +37,8 @@
para "That's mighty"
line "convenient."
done
-; 0x188c26
-UnknownText_0x188c26: ; 0x188c26
+UnknownText_0x188c26:
text "The POWER PLANT's"
line "MANAGER is looking"
@@ -58,9 +51,8 @@
para "something that"
line "was stolen."
done
-; 0x188c9e
-UnknownText_0x188c9e: ; 0x188c9e
+UnknownText_0x188c9e:
text "I hear TEAM ROCKET"
line "got back together"
@@ -70,9 +62,8 @@
para "I didn't know any-"
line "thing about that."
done
-; 0x188d0c
-UnknownText_0x188d0c: ; 0x188d0c
+UnknownText_0x188d0c:
text "When you go out-"
line "side, you can see"
@@ -82,9 +73,8 @@
para "That's the POWER"
line "PLANT."
done
-; 0x188d63
-Route10PokeCenter1F_MapEventHeader: ; 0x188d63
+Route10PokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -106,4 +96,3 @@
person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, $ffff
person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, $ffff
person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, $ffff
-; 0x188dac
--- a/maps/Route10PokeCenter2FBeta.asm
+++ b/maps/Route10PokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-Route10PokeCenter2FBeta_MapScriptHeader: ; 0x188dac
+Route10PokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x188dae
-Route10PokeCenter2FBeta_MapEventHeader: ; 0x188dae
+Route10PokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x188db9
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -1,12 +1,11 @@
-Route12SuperRodHouse_MapScriptHeader: ; 0x7f482
+Route12SuperRodHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7f484
-FishingGuruScript_0x7f484: ; 0x7f484
+FishingGuruScript_0x7f484:
faceplayer
loadfont
checkevent EVENT_GOT_SUPER_ROD
@@ -19,26 +18,24 @@
verbosegiveitem SUPER_ROD, 1
iffalse UnknownScript_0x7f4aa
setevent EVENT_GOT_SUPER_ROD
-UnknownScript_0x7f4a0: ; 0x7f4a0
+UnknownScript_0x7f4a0:
writetext UnknownText_0x7f57c
closetext
loadmovesprites
end
-; 0x7f4a6
-UnknownScript_0x7f4a6: ; 0x7f4a6
+UnknownScript_0x7f4a6:
writetext UnknownText_0x7f5ec
closetext
-UnknownScript_0x7f4aa: ; 0x7f4aa
+UnknownScript_0x7f4aa:
loadmovesprites
end
-; 0x7f4ac
SuperRodHouseBookshelf:
; unused
jumpstd picturebookshelf
-UnknownText_0x7f4af: ; 0x7f4af
+UnknownText_0x7f4af:
text "I'm the FISHING"
line "GURU's younger"
cont "brother."
@@ -52,9 +49,8 @@
para "So? I know I'm"
line "right."
done
-; 0x7f52f
-UnknownText_0x7f52f: ; 0x7f52f
+UnknownText_0x7f52f:
text "Yes, yes. Just as"
line "I thought!"
@@ -62,9 +58,8 @@
line "Take this--it's a"
cont "SUPER ROD."
done
-; 0x7f57c
-UnknownText_0x7f57c: ; 0x7f57c
+UnknownText_0x7f57c:
text "Try your hand at"
line "fishing wherever"
cont "there is water."
@@ -75,15 +70,13 @@
para "#MON using"
line "different RODS."
done
-; 0x7f5ec
-UnknownText_0x7f5ec: ; 0x7f5ec
+UnknownText_0x7f5ec:
text "Huh? My own eyes"
line "deceived me?"
done
-; 0x7f60b
-Route12SuperRodHouse_MapEventHeader: ; 0x7f60b
+Route12SuperRodHouse_MapEventHeader:
; filler
db 0, 0
@@ -101,4 +94,3 @@
; people-events
db 1
person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, $ffff
-; 0x7f628
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -1,16 +1,14 @@
-Route15FuchsiaGate_MapScriptHeader: ; 0x19679c
+Route15FuchsiaGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19679e
-OfficerScript_0x19679e: ; 0x19679e
+OfficerScript_0x19679e:
jumptextfaceplayer UnknownText_0x1967a1
-; 0x1967a1
-UnknownText_0x1967a1: ; 0x1967a1
+UnknownText_0x1967a1:
text "You're working on"
line "a #DEX? That's"
@@ -17,9 +15,8 @@
para "really something."
line "Don't give up!"
done
-; 0x1967e1
-Route15FuchsiaGate_MapEventHeader: ; 0x1967e1
+Route15FuchsiaGate_MapEventHeader:
; filler
db 0, 0
@@ -39,4 +36,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, $ffff
-; 0x196808
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -1,4 +1,4 @@
-Route16_MapScriptHeader: ; 0x1ad313
+Route16_MapScriptHeader:
; trigger count
db 0
@@ -8,9 +8,8 @@
; callbacks
dbw 5, UnknownScript_0x1ad318
-; 0x1ad318
-UnknownScript_0x1ad318: ; 0x1ad318
+UnknownScript_0x1ad318:
checkcode VAR_YCOORD
if_less_than $5, UnknownScript_0x1ad328
checkcode VAR_XCOORD
@@ -17,26 +16,22 @@
if_greater_than $d, UnknownScript_0x1ad328
setflag $0019
return
-; 0x1ad328
-UnknownScript_0x1ad328: ; 0x1ad328
+UnknownScript_0x1ad328:
clearflag $0019
return
-; 0x1ad32c
-MapRoute16Signpost0Script: ; 0x1ad32c
+MapRoute16Signpost0Script:
jumptext UnknownText_0x1ad32f
-; 0x1ad32f
-UnknownText_0x1ad32f: ; 0x1ad32f
+UnknownText_0x1ad32f:
text "CYCLING ROAD"
para "DOWNHILL COASTING"
line "ALL THE WAY!"
done
-; 0x1ad35c
-Route16_MapEventHeader: ; 0x1ad35c
+Route16_MapEventHeader:
; filler
db 0, 0
@@ -57,4 +52,3 @@
; people-events
db 0
-; 0x1ad380
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -1,4 +1,4 @@
-Route16Gate_MapScriptHeader: ; 0x733e3
+Route16Gate_MapScriptHeader:
; trigger count
db 1
@@ -7,23 +7,19 @@
; callback count
db 0
-; 0x733e9
-UnknownScript_0x733e9: ; 0x733e9
+UnknownScript_0x733e9:
end
-; 0x733ea
-OfficerScript_0x733ea: ; 0x733ea
+OfficerScript_0x733ea:
jumptextfaceplayer UnknownText_0x73408
-; 0x733ed
-UnknownScript_0x733ed: ; 0x733ed
+UnknownScript_0x733ed:
checkitem BICYCLE
iffalse UnknownScript_0x733f3
end
-; 0x733f3
-UnknownScript_0x733f3: ; 0x733f3
+UnknownScript_0x733f3:
showemote $0, $2, 15
spriteface $0, UP
loadfont
@@ -32,15 +28,13 @@
loadmovesprites
applymovement $0, MovementData_0x73405
end
-; 0x73405
-MovementData_0x73405: ; 0x73405
+MovementData_0x73405:
step_right
turn_head_left
step_end
-; 0x73408
-UnknownText_0x73408: ; 0x73408
+UnknownText_0x73408:
text "CYCLING ROAD"
line "starts here."
@@ -54,9 +48,8 @@
para "you can't get from"
line "a ship or train."
done
-; 0x73496
-UnknownText_0x73496: ; 0x73496
+UnknownText_0x73496:
text "Hey! Whoa! Stop!"
para "You can't go out"
@@ -65,9 +58,8 @@
para "ROAD without a"
line "BICYCLE."
done
-; 0x734df
-Route16Gate_MapEventHeader: ; 0x734df
+Route16Gate_MapEventHeader:
; filler
db 0, 0
@@ -89,4 +81,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, $ffff
-; 0x73516
--- a/maps/Route1718Gate.asm
+++ b/maps/Route1718Gate.asm
@@ -1,4 +1,4 @@
-Route1718Gate_MapScriptHeader: ; 0x73607
+Route1718Gate_MapScriptHeader:
; trigger count
db 1
@@ -7,23 +7,19 @@
; callback count
db 0
-; 0x7360d
-UnknownScript_0x7360d: ; 0x7360d
+UnknownScript_0x7360d:
end
-; 0x7360e
-OfficerScript_0x7360e: ; 0x7360e
+OfficerScript_0x7360e:
jumptextfaceplayer UnknownText_0x7362c
-; 0x73611
-UnknownScript_0x73611: ; 0x73611
+UnknownScript_0x73611:
checkitem BICYCLE
iffalse UnknownScript_0x73617
end
-; 0x73617
-UnknownScript_0x73617: ; 0x73617
+UnknownScript_0x73617:
showemote $0, $2, 15
spriteface $0, UP
loadfont
@@ -32,21 +28,18 @@
loadmovesprites
applymovement $0, MovementData_0x73629
end
-; 0x73629
-MovementData_0x73629: ; 0x73629
+MovementData_0x73629:
step_right
turn_head_left
step_end
-; 0x7362c
-UnknownText_0x7362c: ; 0x7362c
+UnknownText_0x7362c:
text "CYCLING ROAD"
line "Uphill Starts Here"
done
-; 0x7364d
-UnknownText_0x7364d: ; 0x7364d
+UnknownText_0x7364d:
text "Hang on! Don't you"
line "have a BICYCLE?"
@@ -56,9 +49,8 @@
para "You have to have a"
line "BICYCLE to go on."
done
-; 0x736b6
-Route1718Gate_MapEventHeader: ; 0x736b6
+Route1718Gate_MapEventHeader:
; filler
db 0, 0
@@ -80,4 +72,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, $ffff
-; 0x736ed
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -1,12 +1,11 @@
-Route19FuchsiaGate_MapScriptHeader: ; 0x1ab3f4
+Route19FuchsiaGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ab3f6
-OfficerScript_0x1ab3f6: ; 0x1ab3f6
+OfficerScript_0x1ab3f6:
faceplayer
loadfont
checkevent $00d7
@@ -15,16 +14,14 @@
closetext
loadmovesprites
end
-; 0x1ab404
-UnknownScript_0x1ab404: ; 0x1ab404
+UnknownScript_0x1ab404:
writetext UnknownText_0x1ab48a
closetext
loadmovesprites
end
-; 0x1ab40a
-UnknownText_0x1ab40a: ; 0x1ab40a
+UnknownText_0x1ab40a:
text "CINNABAR's volcano"
line "erupted."
@@ -36,9 +33,8 @@
line "people of CINNABAR"
cont "are safe…"
done
-; 0x1ab48a
-UnknownText_0x1ab48a: ; 0x1ab48a
+UnknownText_0x1ab48a:
text "No CINNABAR citi-"
line "zens were injured"
@@ -45,9 +41,8 @@
para "by the eruption."
line "That's great!"
done
-; 0x1ab4cd
-Route19FuchsiaGate_MapEventHeader: ; 0x1ab4cd
+Route19FuchsiaGate_MapEventHeader:
; filler
db 0, 0
@@ -67,4 +62,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, $ffff
-; 0x1ab4f4
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -1,24 +1,21 @@
-Route22_MapScriptHeader: ; 0x7c000
+Route22_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7c002
-MapRoute22Signpost0Script: ; 0x7c002
+MapRoute22Signpost0Script:
jumptext UnknownText_0x7c005
-; 0x7c005
-UnknownText_0x7c005: ; 0x7c005
+UnknownText_0x7c005:
text "#MON LEAGUE"
para "VICTORY ROAD"
line "ENTRANCE"
done
-; 0x7c028
-Route22_MapEventHeader: ; 0x7c028
+Route22_MapEventHeader:
; filler
db 0, 0
@@ -35,4 +32,3 @@
; people-events
db 0
-; 0x7c038
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -1,12 +1,11 @@
-Route24_MapScriptHeader: ; 0x1adbf8
+Route24_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1adbfa
-RocketScript_0x1adbfa: ; 0x1adbfa
+RocketScript_0x1adbfa:
faceplayer
playmusic MUSIC_ROCKET_ENCOUNTER
loadfont
@@ -33,9 +32,8 @@
special Function8c0ab
playmapmusic
end
-; 0x1adc2e
-UnknownText_0x1adc2e: ; 0x1adc2e
+UnknownText_0x1adc2e:
text "Hey, kid! Me am a"
line "TEAM ROCKET member"
cont "kind of guy!"
@@ -63,9 +61,8 @@
para "Hey, kid! Battle"
line "begin we do!"
done
-; 0x1add67
-UnknownText_0x1add67: ; 0x1add67
+UnknownText_0x1add67:
text "Ayieeeh! No, no,"
line "no, believe it I"
cont "can't!"
@@ -74,9 +71,8 @@
line "be you! Match I am"
cont "not to you!"
done
-; 0x1addc0
-UnknownText_0x1addc0: ; 0x1addc0
+UnknownText_0x1addc0:
text "OK. Tell you mine"
line "secret will I."
@@ -104,9 +100,8 @@
para "friends, yes. Will"
line "revenge they are."
done
-; 0x1adee1
-UnknownText_0x1adee1: ; 0x1adee1
+UnknownText_0x1adee1:
text "…"
para "You say what? TEAM"
@@ -119,9 +114,8 @@
line "do what now on"
cont "from, me?"
done
-; 0x1adf50
-Route24_MapEventHeader: ; 0x1adf50
+Route24_MapEventHeader:
; filler
db 0, 0
@@ -137,4 +131,3 @@
; people-events
db 1
person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, $076c
-; 0x1adf63
--- a/maps/Route26DayofWeekSiblingsHouse.asm
+++ b/maps/Route26DayofWeekSiblingsHouse.asm
@@ -1,12 +1,11 @@
-Route26DayofWeekSiblingsHouse_MapScriptHeader: ; 0x7b1e2
+Route26DayofWeekSiblingsHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7b1e4
-PokedexScript_0x7b1e4: ; 0x7b1e4
+PokedexScript_0x7b1e4:
loadfont
writetext UnknownText_0x7b1f9
yesorno
@@ -16,20 +15,18 @@
iffalse UnknownText_0x7b1f7
writetext UnknownText_0x7b2b9
closetext
-UnknownText_0x7b1f7: ; 0x7b1f7
+UnknownText_0x7b1f7:
loadmovesprites
end
-; 0x7b1f9
-UnknownText_0x7b1f9: ; 0x7b1f9
+UnknownText_0x7b1f9:
text "There's something"
line "written here."
para "Read it?"
done
-; 0x7b222
-UnknownText_0x7b222: ; 0x7b222
+UnknownText_0x7b222:
text "To my brothers and"
line "sisters:"
@@ -46,9 +43,8 @@
para "Keep reading?"
done
-; 0x7b2b9
-UnknownText_0x7b2b9: ; 0x7b2b9
+UnknownText_0x7b2b9:
text "Monday, MONICA"
line "ROUTE 40"
@@ -70,9 +66,8 @@
para "Sunday, SUNNY"
line "ROUTE 37"
done
-; 0x7b375
-Route26DayofWeekSiblingsHouse_MapEventHeader: ; 0x7b375
+Route26DayofWeekSiblingsHouse_MapEventHeader:
; filler
db 0, 0
@@ -90,4 +85,3 @@
; people-events
db 1
person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, $ffff
-; 0x7b392
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -1,12 +1,11 @@
-Route26HealSpeechHouse_MapScriptHeader: ; 0x7b123
+Route26HealSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7b125
-TeacherScript_0x7b125: ; 0x7b125
+TeacherScript_0x7b125:
faceplayer
loadfont
writetext UnknownText_0x7b14d
@@ -25,13 +24,11 @@
closetext
loadmovesprites
end
-; 0x7b14a
-Route26HealHouseBookshelf: ; 0x7b14a
+Route26HealHouseBookshelf:
jumpstd picturebookshelf
-; 0x7b14d
-UnknownText_0x7b14d: ; 0x7b14d
+UnknownText_0x7b14d:
text "Your #MON look"
line "a little tired."
@@ -38,9 +35,8 @@
para "You should rest"
line "them a while."
done
-; 0x7b18b
-UnknownText_0x7b18b: ; 0x7b18b
+UnknownText_0x7b18b:
text "There!"
para "Your #MON are"
@@ -48,9 +44,8 @@
para "Keep at it!"
done
-; 0x7b1bb
-Route26HealSpeechHouse_MapEventHeader: ; 0x7b1bb
+Route26HealSpeechHouse_MapEventHeader:
; filler
db 0, 0
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -1,27 +1,23 @@
-Route28_MapScriptHeader: ; 0x1a540b
+Route28_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a540d
-MapRoute28Signpost0Script: ; 0x1a540d
+MapRoute28Signpost0Script:
jumptext UnknownText_0x1a5413
-; 0x1a5410
-MapRoute28SignpostItem1: ; 0x1a5410
+MapRoute28SignpostItem1:
dw $00a3
db RARE_CANDY
-; 0x1a5413
-UnknownText_0x1a5413: ; 0x1a5413
+UnknownText_0x1a5413:
text "ROUTE 28"
done
-; 0x1a541d
-Route28_MapEventHeader: ; 0x1a541d
+Route28_MapEventHeader:
; filler
db 0, 0
@@ -40,4 +36,3 @@
; people-events
db 0
-; 0x1a5437
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -1,4 +1,4 @@
-Route29_MapScriptHeader: ; 0x1a0f4c
+Route29_MapScriptHeader:
; trigger count
db 2
@@ -13,13 +13,11 @@
dbw 2, TuscanyCallback
-UnknownScript_0x1a0f59: ; 0x1a0f59
+UnknownScript_0x1a0f59:
end
-; 0x1a0f5a
-UnknownScript_0x1a0f5a: ; 0x1a0f5a
+UnknownScript_0x1a0f5a:
end
-; 0x1a0f5b
TuscanyCallback:
checkflag $001b
@@ -35,7 +33,7 @@
appear $8
return
-UnknownScript_0x1a0f6d: ; 0x1a0f6d
+UnknownScript_0x1a0f6d:
spriteface $2, UP
showemote $0, $2, 15
applymovement $2, MovementData_0x1a108d
@@ -59,9 +57,8 @@
dotrigger $0
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
-; 0x1a0fa3
-UnknownScript_0x1a0fa3: ; 0x1a0fa3
+UnknownScript_0x1a0fa3:
spriteface $2, UP
showemote $0, $2, 15
applymovement $2, MovementData_0x1a1094
@@ -85,9 +82,8 @@
dotrigger $0
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
-; 0x1a0fd9
-UnknownScript_0x1a0fd9: ; 0x1a0fd9
+UnknownScript_0x1a0fd9:
writetext UnknownText_0x1a1197
closetext
loadmovesprites
@@ -94,9 +90,8 @@
applymovement $2, MovementData_0x1a109a
dotrigger $0
end
-; 0x1a0fe5
-UnknownScript_0x1a0fe5: ; 0x1a0fe5
+UnknownScript_0x1a0fe5:
writetext UnknownText_0x1a1197
closetext
loadmovesprites
@@ -103,9 +98,8 @@
applymovement $2, MovementData_0x1a10a1
dotrigger $0
end
-; 0x1a0ff1
-CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1
+CooltrainerMScript_0x1a0ff1:
faceplayer
loadfont
checkcode VAR_BOXSPACE
@@ -126,35 +120,29 @@
loadmovesprites
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
-; 0x1a101c
-UnknownScript_0x1a101c: ; 0x1a101c
+UnknownScript_0x1a101c:
writetext UnknownText_0x1a10a7
closetext
loadmovesprites
end
-; 0x1a1022
-UnknownScript_0x1a1022: ; 0x1a1022
+UnknownScript_0x1a1022:
writetext UnknownText_0x1a1197
closetext
loadmovesprites
end
-; 0x1a1028
-YoungsterScript_0x1a1028: ; 0x1a1028
+YoungsterScript_0x1a1028:
jumptextfaceplayer UnknownText_0x1a1214
-; 0x1a102b
-TeacherScript_0x1a102b: ; 0x1a102b
+TeacherScript_0x1a102b:
jumptextfaceplayer UnknownText_0x1a126c
-; 0x1a102e
-FisherScript_0x1a102e: ; 0x1a102e
+FisherScript_0x1a102e:
jumptextfaceplayer UnknownText_0x1a12d9
-; 0x1a1031
-CooltrainerMScript_0x1a1031: ; 0x1a1031
+CooltrainerMScript_0x1a1031:
faceplayer
loadfont
checkday
@@ -161,19 +149,17 @@
iftrue UnknownScript_0x1a103d
checknite
iftrue UnknownScript_0x1a1043
-UnknownScript_0x1a103d: ; 0x1a103d
+UnknownScript_0x1a103d:
writetext UnknownText_0x1a134c
closetext
loadmovesprites
end
-; 0x1a1043
-UnknownScript_0x1a1043: ; 0x1a1043
+UnknownScript_0x1a1043:
writetext UnknownText_0x1a137c
closetext
loadmovesprites
end
-; 0x1a1049
TuscanyScript:
faceplayer
@@ -211,23 +197,19 @@
loadmovesprites
end
-MapRoute29Signpost0Script: ; 0x1a1083
+MapRoute29Signpost0Script:
jumptext UnknownText_0x1a158e
-; 0x1a1086
-MapRoute29Signpost1Script: ; 0x1a1086
+MapRoute29Signpost1Script:
jumptext UnknownText_0x1a15b9
-; 0x1a1089
-FruitTreeScript_0x1a1089: ; 0x1a1089
+FruitTreeScript_0x1a1089:
fruittree $1
-; 0x1a108b
-ItemFragment_0x1a108b: ; 0x1a108b
+ItemFragment_0x1a108b:
db POTION, 1
-; 0x1a108d
-MovementData_0x1a108d: ; 0x1a108d
+MovementData_0x1a108d:
step_up
step_up
step_up
@@ -235,9 +217,8 @@
step_right
step_right
step_end
-; 0x1a1094
-MovementData_0x1a1094: ; 0x1a1094
+MovementData_0x1a1094:
step_up
step_up
step_up
@@ -244,9 +225,8 @@
step_right
step_right
step_end
-; 0x1a109a
-MovementData_0x1a109a: ; 0x1a109a
+MovementData_0x1a109a:
step_left
step_left
step_down
@@ -254,9 +234,8 @@
step_down
step_down
step_end
-; 0x1a10a1
-MovementData_0x1a10a1: ; 0x1a10a1
+MovementData_0x1a10a1:
step_left
step_left
step_down
@@ -263,9 +242,8 @@
step_down
step_down
step_end
-; 0x1a10a7
-UnknownText_0x1a10a7: ; 0x1a10a7
+UnknownText_0x1a10a7:
text "#MON hide in"
line "the grass. Who"
@@ -272,9 +250,8 @@
para "knows when they'll"
line "pop out…"
done
-; 0x1a10df
-UnknownText_0x1a10df: ; 0x1a10df
+UnknownText_0x1a10df:
text "I've seen you a"
line "couple times. How"
@@ -285,9 +262,8 @@
line "to show you how to"
cont "catch #MON?"
done
-; 0x1a114d
-UnknownText_0x1a114d: ; 0x1a114d
+UnknownText_0x1a114d:
text "That's how you do"
line "it."
@@ -295,9 +271,8 @@
line "first, #MON are"
cont "easier to catch."
done
-; 0x1a1197
-UnknownText_0x1a1197: ; 0x1a1197
+UnknownText_0x1a1197:
text "Oh. Fine, then."
para "Anyway, if you"
@@ -306,16 +281,14 @@
para "#MON, you have"
line "to walk a lot."
done
-; 0x1a11e3
-UnknownText_0x1a11e3: ; 0x1a11e3
+UnknownText_0x1a11e3:
text "Huh? You want me"
line "to show you how to"
cont "catch #MON?"
done
-; 0x1a1214
-UnknownText_0x1a1214: ; 0x1a1214
+UnknownText_0x1a1214:
text "Yo. How are your"
line "#MON?"
@@ -325,9 +298,8 @@
para "battle, keep out"
line "of the grass."
done
-; 0x1a126c
-UnknownText_0x1a126c: ; 0x1a126c
+UnknownText_0x1a126c:
text "See those ledges?"
line "It's scary to jump"
cont "off them."
@@ -338,9 +310,8 @@
para "walking through"
line "the grass."
done
-; 0x1a12d9
-UnknownText_0x1a12d9: ; 0x1a12d9
+UnknownText_0x1a12d9:
text "I wanted to take a"
line "break, so I saved"
@@ -347,10 +318,9 @@
para "to record my"
line "progress."
done
-; 0x1a1316
; possibly unused
-UnknownText_0x1a1316: ; 0x1a1316
+UnknownText_0x1a1316:
text "I'm waiting for"
line "#MON that"
@@ -357,9 +327,8 @@
para "appear only in the"
line "daytime."
done
-; 0x1a134c
-UnknownText_0x1a134c: ; 0x1a134c
+UnknownText_0x1a134c:
text "I'm waiting for"
line "#MON that"
@@ -366,9 +335,8 @@
para "appear only at"
line "night."
done
-; 0x1a137c
-UnknownText_0x1a137c: ; 0x1a137c
+UnknownText_0x1a137c:
text "I'm waiting for"
line "#MON that"
@@ -375,7 +343,6 @@
para "appear only in the"
line "morning."
done
-; 0x1a13b2
MeetTuscanyText:
text "TUSCANY: I do be-"
@@ -429,23 +396,21 @@
cont "is unfortunate…"
done
-UnknownText_0x1a158e: ; 0x1a158e
+UnknownText_0x1a158e:
text "ROUTE 29"
para "CHERRYGROVE CITY -"
line "NEW BARK TOWN"
done
-; 0x1a15b9
-UnknownText_0x1a15b9: ; 0x1a15b9
+UnknownText_0x1a15b9:
text "ROUTE 29"
para "CHERRYGROVE CITY -"
line "NEW BARK TOWN"
done
-; 0x1a15e4
-Route29_MapEventHeader: ; 0x1a15e4
+Route29_MapEventHeader:
; filler
db 0, 0
--- a/maps/Route2946Gate.asm
+++ b/maps/Route2946Gate.asm
@@ -1,20 +1,17 @@
-Route2946Gate_MapScriptHeader: ; 0x7b5b9
+Route2946Gate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7b5bb
-OfficerScript_0x7b5bb: ; 0x7b5bb
+OfficerScript_0x7b5bb:
jumptextfaceplayer UnknownText_0x7b5c1
-; 0x7b5be
-YoungsterScript_0x7b5be: ; 0x7b5be
+YoungsterScript_0x7b5be:
jumptextfaceplayer UnknownText_0x7b60d
-; 0x7b5c1
-UnknownText_0x7b5c1: ; 0x7b5c1
+UnknownText_0x7b5c1:
text "You can't climb"
line "ledges."
@@ -22,9 +19,8 @@
line "down from them to"
cont "take a shortcut."
done
-; 0x7b60d
-UnknownText_0x7b60d: ; 0x7b60d
+UnknownText_0x7b60d:
text "Different kinds of"
line "#MON appear"
cont "past here."
@@ -35,9 +31,8 @@
para "you have to look"
line "everywhere."
done
-; 0x7b674
-Route2946Gate_MapEventHeader: ; 0x7b674
+Route2946Gate_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +53,3 @@
db 2
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, $ffff
person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, $ffff
-; 0x7b6a8
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -1,16 +1,14 @@
-Route2Gate_MapScriptHeader: ; 0x9b950
+Route2Gate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9b952
-ScientistScript_0x9b952: ; 0x9b952
+ScientistScript_0x9b952:
jumptextfaceplayer UnknownText_0x9b955
-; 0x9b955
-UnknownText_0x9b955: ; 0x9b955
+UnknownText_0x9b955:
text "Are you <PLAY_G>?"
para "I work as PROF."
@@ -23,9 +21,8 @@
line "nearby in PALLET"
cont "TOWN."
done
-; 0x9b9ca
-Route2Gate_MapEventHeader: ; 0x9b9ca
+Route2Gate_MapEventHeader:
; filler
db 0, 0
@@ -45,4 +42,3 @@
; people-events
db 1
person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, $ffff
-; 0x9b9f1
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetSpeechHouse.asm
@@ -1,12 +1,11 @@
-Route2NuggetSpeechHouse_MapScriptHeader: ; 0x9b845
+Route2NuggetSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9b847
-FisherScript_0x9b847: ; 0x9b847
+FisherScript_0x9b847:
faceplayer
loadfont
checkevent $00c8
@@ -16,10 +15,10 @@
verbosegiveitem NUGGET, 1
iffalse UnknownScript_0x9b860
setevent $00c8
-UnknownScript_0x9b85c: ; 0x9b85c
+UnknownScript_0x9b85c:
writetext UnknownText_0x9b8e5
closetext
-UnknownScript_0x9b860: ; 0x9b860
+UnknownScript_0x9b860:
loadmovesprites
end
@@ -27,7 +26,7 @@
; unused
jumpstd difficultbookshelf
-UnknownText_0x9b865: ; 0x9b865
+UnknownText_0x9b865:
text "Hi! Wow, I'm glad"
line "to see you."
@@ -39,9 +38,8 @@
line "Let me give you a"
cont "little present."
done
-; 0x9b8e5
-UnknownText_0x9b8e5: ; 0x9b8e5
+UnknownText_0x9b8e5:
text "That's a NUGGET."
para "I can't give you"
@@ -50,9 +48,8 @@
para "wisdom, so that'll"
line "have to do!"
done
-; 0x9b933
-Route2NuggetSpeechHouse_MapEventHeader: ; 0x9b933
+Route2NuggetSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -70,4 +67,3 @@
; people-events
db 1
person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, $ffff
-; 0x9b950
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -1,12 +1,11 @@
-Route30BerrySpeechHouse_MapScriptHeader: ; 0x196d62
+Route30BerrySpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x196d64
-PokefanMScript_0x196d64: ; 0x196d64
+PokefanMScript_0x196d64:
faceplayer
loadfont
checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
@@ -16,18 +15,17 @@
verbosegiveitem BERRY, 1
iffalse UnknownScript_0x196d7d
setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
-UnknownScript_0x196d79: ; 0x196d79
+UnknownScript_0x196d79:
writetext UnknownText_0x196dec
closetext
-UnknownScript_0x196d7d: ; 0x196d7d
+UnknownScript_0x196d7d:
loadmovesprites
end
-; 0x196d7f
Route30BerrySpeechHouseBookshelf:
jumpstd magazinebookshelf
-UnknownText_0x196d82: ; 0x196d82
+UnknownText_0x196d82:
text "You know, #MON"
line "eat BERRIES."
@@ -38,16 +36,14 @@
para "Here. I'll share"
line "one with you!"
done
-; 0x196dec
-UnknownText_0x196dec: ; 0x196dec
+UnknownText_0x196dec:
text "Check trees for"
line "BERRIES. They just"
cont "drop right off."
done
-; 0x196e20
-Route30BerrySpeechHouse_MapEventHeader: ; 0x196e20
+Route30BerrySpeechHouse_MapEventHeader:
; filler
db 0, 0
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -1,34 +1,29 @@
-Route31VioletGate_MapScriptHeader: ; 0x197632
+Route31VioletGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x197634
-OfficerScript_0x197634: ; 0x197634
+OfficerScript_0x197634:
jumptextfaceplayer UnknownText_0x19763a
-; 0x197637
-CooltrainerFScript_0x197637: ; 0x197637
+CooltrainerFScript_0x197637:
jumptextfaceplayer UnknownText_0x197661
-; 0x19763a
-UnknownText_0x19763a: ; 0x19763a
+UnknownText_0x19763a:
text "Hi there!"
line "Did you visit"
cont "SPROUT TOWER?"
done
-; 0x197661
-UnknownText_0x197661: ; 0x197661
+UnknownText_0x197661:
text "I came too far"
line "out. I'd better"
cont "phone home!"
done
-; 0x19768c
-Route31VioletGate_MapEventHeader: ; 0x19768c
+Route31VioletGate_MapEventHeader:
; filler
db 0, 0
@@ -49,4 +44,3 @@
db 2
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, $ffff
person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, $ffff
-; 0x1976c0
--- a/maps/Route32PokeCenter1F.asm
+++ b/maps/Route32PokeCenter1F.asm
@@ -1,16 +1,14 @@
-Route32PokeCenter1F_MapScriptHeader: ; 0x69b50
+Route32PokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x69b52
-NurseScript_0x69b52: ; 0x69b52
+NurseScript_0x69b52:
jumpstd pokecenternurse
-; 0x69b55
-FishingGuruScript_0x69b55: ; 0x69b55
+FishingGuruScript_0x69b55:
faceplayer
loadfont
checkevent EVENT_GOT_OLD_ROD
@@ -26,27 +24,23 @@
loadmovesprites
setevent EVENT_GOT_OLD_ROD
end
-; 0x69b74
-UnknownScript_0x69b74: ; 0x69b74
+UnknownScript_0x69b74:
writetext UnknownText_0x69c6c
closetext
loadmovesprites
end
-; 0x69b7a
-UnknownScript_0x69b7a: ; 0x69b7a
+UnknownScript_0x69b7a:
writetext UnknownText_0x69c8d
closetext
loadmovesprites
end
-; 0x69b80
-CooltrainerFScript_0x69b80: ; 0x69b80
+CooltrainerFScript_0x69b80:
jumptextfaceplayer UnknownText_0x69cac
-; 0x69b83
-UnknownText_0x69b83: ; 0x69b83
+UnknownText_0x69b83:
text "This is a great"
line "fishing spot."
@@ -57,9 +51,8 @@
para "Would you like one"
line "of my RODS?"
done
-; 0x69be8
-UnknownText_0x69be8: ; 0x69be8
+UnknownText_0x69be8:
text "Heh, that's good"
line "to hear."
@@ -66,9 +59,8 @@
para "Now you're an"
line "angler too!"
done
-; 0x69c1b
-UnknownText_0x69c1b: ; 0x69c1b
+UnknownText_0x69c1b:
text "Fishing is great!"
para "If there's water,"
@@ -77,21 +69,18 @@
para "stream, try out"
line "your ROD."
done
-; 0x69c6c
-UnknownText_0x69c6c: ; 0x69c6c
+UnknownText_0x69c6c:
text "Oh. That's rather"
line "disappointing…"
done
-; 0x69c8d
-UnknownText_0x69c8d: ; 0x69c8d
+UnknownText_0x69c8d:
text "Yo, kid. How are"
line "they biting?"
done
-; 0x69cac
-UnknownText_0x69cac: ; 0x69cac
+UnknownText_0x69cac:
text "What should I make"
line "my #MON hold?"
@@ -99,9 +88,8 @@
line "increases ATTACK"
cont "power…"
done
-; 0x69cf9
-Route32PokeCenter1F_MapEventHeader: ; 0x69cf9
+Route32PokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -122,4 +110,3 @@
person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, $ffff
person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, $ffff
person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, $ffff
-; 0x69d35
--- a/maps/Route32RuinsofAlphGate.asm
+++ b/maps/Route32RuinsofAlphGate.asm
@@ -1,24 +1,20 @@
-Route32RuinsofAlphGate_MapScriptHeader: ; 0x69a2b
+Route32RuinsofAlphGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x69a2d
-OfficerScript_0x69a2d: ; 0x69a2d
+OfficerScript_0x69a2d:
jumptextfaceplayer UnknownText_0x69a36
-; 0x69a30
-PokefanMScript_0x69a30: ; 0x69a30
+PokefanMScript_0x69a30:
jumptextfaceplayer UnknownText_0x69a81
-; 0x69a33
-YoungsterScript_0x69a33: ; 0x69a33
+YoungsterScript_0x69a33:
jumptextfaceplayer UnknownText_0x69abd
-; 0x69a36
-UnknownText_0x69a36: ; 0x69a36
+UnknownText_0x69a36:
text "RUINS OF ALPH"
para "A Look-and-Touch"
@@ -27,9 +23,8 @@
para "Try the sliding"
line "stone panels!"
done
-; 0x69a81
-UnknownText_0x69a81: ; 0x69a81
+UnknownText_0x69a81:
text "You're studying"
line "the RUINS?"
@@ -36,9 +31,8 @@
para "I see a scientist"
line "in the making."
done
-; 0x69abd
-UnknownText_0x69abd: ; 0x69abd
+UnknownText_0x69abd:
text "There are drawings"
line "on stone panels."
@@ -46,9 +40,8 @@
line "them. I wonder"
cont "what they are."
done
-; 0x69b0f
-Route32RuinsofAlphGate_MapEventHeader: ; 0x69b0f
+Route32RuinsofAlphGate_MapEventHeader:
; filler
db 0, 0
@@ -70,4 +63,3 @@
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, $ffff
person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, $ffff
person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, $ffff
-; 0x69b50
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -1,4 +1,4 @@
-Route34IlexForestGate_MapScriptHeader: ; 0x62d28
+Route34IlexForestGate_MapScriptHeader:
; trigger count
db 0
@@ -8,23 +8,20 @@
; callbacks
dbw 2, UnknownScript_0x62d2d
-; 0x62d2d
-UnknownScript_0x62d2d: ; 0x62d2d
+UnknownScript_0x62d2d:
checkevent $00c0
iffalse UnknownScript_0x62d38
disappear $2
appear $5
return
-; 0x62d38
-UnknownScript_0x62d38: ; 0x62d38
+UnknownScript_0x62d38:
disappear $5
appear $2
return
-; 0x62d3d
-UnknownScript_0x62d3d: ; 0x62d3d
+UnknownScript_0x62d3d:
checkevent $00c0
iffalse UnknownScript_0x62d62
showemote $0, $5, 20
@@ -39,11 +36,10 @@
closetext
loadmovesprites
applymovement $5, MovementData_0x62d9a
-UnknownScript_0x62d62: ; 0x62d62
+UnknownScript_0x62d62:
end
-; 0x62d63
-TeacherScript_0x62d63: ; 0x62d63
+TeacherScript_0x62d63:
faceplayer
loadfont
checkevent $00c0
@@ -55,22 +51,20 @@
verbosegiveitem TM_SWEET_SCENT, 1
iffalse UnknownScript_0x62d82
setevent EVENT_GOT_TM12_SWEET_SCENT
-UnknownScript_0x62d7e: ; 0x62d7e
+UnknownScript_0x62d7e:
writetext UnknownText_0x62df6
closetext
-UnknownScript_0x62d82: ; 0x62d82
+UnknownScript_0x62d82:
loadmovesprites
end
-; 0x62d84
-UnknownScript_0x62d84: ; 0x62d84
+UnknownScript_0x62d84:
writetext UnknownText_0x62e41
keeptextopen
loadmovesprites
end
-; 0x62d8a
-ButterfreeScript_0x62d8a: ; 0x62d8a
+ButterfreeScript_0x62d8a:
loadfont
writetext UnknownText_0x62e83
cry BUTTERFREE
@@ -77,25 +71,21 @@
closetext
loadmovesprites
end
-; 0x62d94
-LassScript_0x62d94: ; 0x62d94
+LassScript_0x62d94:
jumptextfaceplayer UnknownText_0x62e97
-; 0x62d97
-MovementData_0x62d97: ; 0x62d97
+MovementData_0x62d97:
step_up
step_up
step_end
-; 0x62d9a
-MovementData_0x62d9a: ; 0x62d9a
+MovementData_0x62d9a:
step_down
step_right
step_end
-; 0x62d9d
-UnknownText_0x62d9d: ; 0x62d9d
+UnknownText_0x62d9d:
text "Oh, honey. You're"
line "making a #DEX?"
@@ -105,9 +95,8 @@
para "appear. Try using"
line "this TM."
done
-; 0x62df6
-UnknownText_0x62df6: ; 0x62df6
+UnknownText_0x62df6:
text "It's SWEET SCENT."
para "Use it wherever"
@@ -116,9 +105,8 @@
para "#MON will be"
line "enticed by it."
done
-; 0x62e41
-UnknownText_0x62e41: ; 0x62e41
+UnknownText_0x62e41:
text "Something's wrong"
line "in ILEX FOREST…"
@@ -125,14 +113,12 @@
para "You should stay"
line "away right now."
done
-; 0x62e83
-UnknownText_0x62e83: ; 0x62e83
+UnknownText_0x62e83:
text "BUTTERFREE: Freeh!"
done
-; 0x62e97
-UnknownText_0x62e97: ; 0x62e97
+UnknownText_0x62e97:
text "Did you see the"
line "shrine honoring"
cont "the protector?"
@@ -145,9 +131,8 @@
line "must be a grass-"
cont "type #MON."
done
-; 0x62f20
-Route34IlexForestGate_MapEventHeader: ; 0x62f20
+Route34IlexForestGate_MapEventHeader:
; filler
db 0, 0
@@ -171,4 +156,3 @@
person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, $ffff
person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, $06eb
person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, $06ec
-; 0x62f76
--- a/maps/Route35Goldenrodgate.asm
+++ b/maps/Route35Goldenrodgate.asm
@@ -1,12 +1,11 @@
-Route35Goldenrodgate_MapScriptHeader: ; 0x69d35
+Route35Goldenrodgate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x69d37
-OfficerScript_0x69d37: ; 0x69d37
+OfficerScript_0x69d37:
faceplayer
loadfont
checkevent EVENT_GOT_HP_UP_FROM_RANDY
@@ -29,52 +28,49 @@
givepoke SPEAROW, 10, 0, 1, GiftSpearowName, GiftSpearowOTName
givepokeitem GiftSpearowMail
setevent EVENT_GOT_KENYA
-UnknownScript_0x69d73: ; 0x69d73
+UnknownScript_0x69d73:
writetext UnknownText_0x69ed6
closetext
loadmovesprites
end
-; 0x69d79
-UnknownScript_0x69d79: ; 0x69d79
+UnknownScript_0x69d79:
writetext UnknownText_0x69f56
closetext
loadmovesprites
end
-; 0x69d7f
-UnknownScript_0x69d7f: ; 0x69d7f
+UnknownScript_0x69d7f:
writetext UnknownText_0x69f74
closetext
loadmovesprites
end
-; 0x69d85
-UnknownScript_0x69d85: ; 0x69d85
+UnknownScript_0x69d85:
writetext UnknownText_0x69f8b
keeptextopen
verbosegiveitem HP_UP, 1
iffalse UnknownScript_0x69d96
setevent EVENT_GOT_HP_UP_FROM_RANDY
-UnknownScript_0x69d92: ; 0x69d92
+UnknownScript_0x69d92:
writetext UnknownText_0x69fd9
closetext
-UnknownScript_0x69d96: ; 0x69d96
+UnknownScript_0x69d96:
loadmovesprites
end
-GiftSpearowMail: ; 0x69d98
+GiftSpearowMail:
db FLOWER_MAIL
db "DARK CAVE leads", $4E
db "to another road@"
-GiftSpearowName: ; 0x69db9
+GiftSpearowName:
db "KENYA@"
-GiftSpearowOTName: ; 0x69dbf
+GiftSpearowOTName:
db "RANDY@"
- db 0 ; 0x69dc5 XXX is there a reason for this?
+ db 0
-PokefanFScript_0x69dc6: ; 0x69dc6
+PokefanFScript_0x69dc6:
faceplayer
loadfont
checkevent EVENT_FOUGHT_SUDOWOODO
@@ -83,20 +79,17 @@
closetext
loadmovesprites
end
-; 0x69dd4
-UnknownScript_0x69dd4: ; 0x69dd4
+UnknownScript_0x69dd4:
writetext UnknownText_0x6a09a
closetext
loadmovesprites
end
-; 0x69dda
-FisherScript_0x69dda: ; 0x69dda
+FisherScript_0x69dda:
jumptextfaceplayer UnknownText_0x6a0cb
-; 0x69ddd
-UnknownText_0x69ddd: ; 0x69ddd
+UnknownText_0x69ddd:
text "Excuse me, kid!"
line "Can you do a guy"
cont "a favor?"
@@ -107,9 +100,8 @@
para "He's on ROUTE 31."
done
-; 0x69e48
-UnknownText_0x69e48: ; 0x69e48
+UnknownText_0x69e48:
text "You will? Perfect!"
line "Thanks, kid!"
@@ -120,15 +112,13 @@
para "You'll recognize"
line "him right away!"
done
-; 0x69eb8
-UnknownText_0x69eb8: ; 0x69eb8
+UnknownText_0x69eb8:
text "<PLAYER> received a"
line "#MON with MAIL."
done
-; 0x69ed6
-UnknownText_0x69ed6: ; 0x69ed6
+UnknownText_0x69ed6:
text "You can read it,"
line "but don't lose it!"
cont "ROUTE 31!"
@@ -140,21 +130,18 @@
para "I wonder if it's"
line "been cleared?"
done
-; 0x69f56
-UnknownText_0x69f56: ; 0x69f56
+UnknownText_0x69f56:
text "You can't carry"
line "another #MON…"
done
-; 0x69f74
-UnknownText_0x69f74: ; 0x69f74
+UnknownText_0x69f74:
text "Oh… Never mind,"
line "then…"
done
-; 0x69f8b
-UnknownText_0x69f8b: ; 0x69f8b
+UnknownText_0x69f8b:
text "Thanks, kid! You"
line "made the delivery"
cont "for me!"
@@ -162,16 +149,14 @@
para "Here's something"
line "for your trouble!"
done
-; 0x69fd9
-UnknownText_0x69fd9: ; 0x69fd9
+UnknownText_0x69fd9:
text "My pal was snooz-"
line "ing, right? Heh,"
cont "what'd I say?"
done
-; 0x6a00a
-UnknownText_0x6a00a: ; 0x6a00a
+UnknownText_0x6a00a:
text "A strange tree is"
line "blocking the road."
@@ -184,16 +169,14 @@
para "watered it with a"
line "SQUIRTBOTTLE."
done
-; 0x6a09a
-UnknownText_0x6a09a: ; 0x6a09a
+UnknownText_0x6a09a:
text "I like the #MON"
line "Lullaby they play"
cont "on the radio."
done
-; 0x6a0cb
-UnknownText_0x6a0cb: ; 0x6a0cb
+UnknownText_0x6a0cb:
text "I wonder how many"
line "kinds of #MON"
@@ -206,9 +189,8 @@
para "there were 150"
line "different kinds."
done
-; 0x6a148
-Route35Goldenrodgate_MapEventHeader: ; 0x6a148
+Route35Goldenrodgate_MapEventHeader:
; filler
db 0, 0
@@ -230,4 +212,3 @@
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, $ffff
person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, $ffff
person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, $ffff
-; 0x6a189
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -1,4 +1,4 @@
-Route35NationalParkgate_MapScriptHeader: ; 0x6a189
+Route35NationalParkgate_MapScriptHeader:
; trigger count
db 3
@@ -15,34 +15,28 @@
dbw 5, UnknownScript_0x6a1a3
dbw 2, UnknownScript_0x6a1af
-; 0x6a19d
-UnknownScript_0x6a19d: ; 0x6a19d
+UnknownScript_0x6a19d:
end
-; 0x6a19e
-UnknownScript_0x6a19e: ; 0x6a19e
+UnknownScript_0x6a19e:
end
-; 0x6a19f
-UnknownScript_0x6a19f: ; 0x6a19f
+UnknownScript_0x6a19f:
priorityjump UnknownScript_0x6a1d1
end
-; 0x6a1a3
-UnknownScript_0x6a1a3: ; 0x6a1a3
+UnknownScript_0x6a1a3:
checkflag $0011
iftrue UnknownScript_0x6a1ac
dotrigger $0
return
-; 0x6a1ac
-UnknownScript_0x6a1ac: ; 0x6a1ac
+UnknownScript_0x6a1ac:
dotrigger $2
return
-; 0x6a1af
-UnknownScript_0x6a1af: ; 0x6a1af
+UnknownScript_0x6a1af:
checkcode VAR_WEEKDAY
if_equal TUESDAY, UnknownScript_0x6a1ca
if_equal THURSDAY, UnknownScript_0x6a1ca
@@ -53,16 +47,14 @@
appear $3
appear $4
return
-; 0x6a1ca
-UnknownScript_0x6a1ca: ; 0x6a1ca
+UnknownScript_0x6a1ca:
appear $2
disappear $3
disappear $4
return
-; 0x6a1d1
-UnknownScript_0x6a1d1: ; 0x6a1d1
+UnknownScript_0x6a1d1:
applymovement $0, MovementData_0x6a2e2
spriteface $2, RIGHT
loadfont
@@ -76,9 +68,8 @@
closetext
loadmovesprites
jumpstd bugcontestresultswarp
-; 0x6a1ee
-UnknownScript_0x6a1ee: ; 0x6a1ee
+UnknownScript_0x6a1ee:
writetext UnknownText_0x6a823
closetext
loadmovesprites
@@ -88,9 +79,8 @@
waitbutton
warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
-; 0x6a204
-OfficerScript_0x6a204: ; 0x6a204
+OfficerScript_0x6a204:
checkcode VAR_WEEKDAY
if_equal SUNDAY, UnknownScript_0x6a2c7
if_equal MONDAY, UnknownScript_0x6a2c7
@@ -108,7 +98,7 @@
if_greater_than $1, UnknownScript_0x6a271
special Function13a12
clearevent $0308
-UnknownScript_0x6a234: ; 0x6a234
+UnknownScript_0x6a234:
setflag $0011
special PlayMapMusic
writetext UnknownText_0x6a39d
@@ -127,21 +117,18 @@
special Function139a8
warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
-; 0x6a261
-UnknownScript_0x6a261: ; 0x6a261
+UnknownScript_0x6a261:
checkcode VAR_FACING
if_equal $2, UnknownScript_0x6a26c
applymovement $0, MovementData_0x6a2e5
end
-; 0x6a26c
-UnknownScript_0x6a26c: ; 0x6a26c
+UnknownScript_0x6a26c:
applymovement $0, MovementData_0x6a2e9
end
-; 0x6a271
-UnknownScript_0x6a271: ; 0x6a271
+UnknownScript_0x6a271:
checkcode VAR_PARTYCOUNT
if_less_than $6, UnknownScript_0x6a27d
checkcode VAR_BOXSPACE
@@ -163,55 +150,47 @@
waitbutton
keeptextopen
jump UnknownScript_0x6a234
-; 0x6a2a3
-UnknownScript_0x6a2a3: ; 0x6a2a3
+UnknownScript_0x6a2a3:
writetext UnknownText_0x6a5dc
closetext
loadmovesprites
end
-; 0x6a2a9
-UnknownScript_0x6a2a9: ; 0x6a2a9
+UnknownScript_0x6a2a9:
writetext UnknownText_0x6a597
closetext
loadmovesprites
end
-; 0x6a2af
-UnknownScript_0x6a2af: ; 0x6a2af
+UnknownScript_0x6a2af:
writetext UnknownText_0x6a608
closetext
loadmovesprites
end
-; 0x6a2b5
-UnknownScript_0x6a2b5: ; 0x6a2b5
+UnknownScript_0x6a2b5:
writetext UnknownText_0x6a67c
closetext
loadmovesprites
end
-; 0x6a2bb
-UnknownScript_0x6a2bb: ; 0x6a2bb
+UnknownScript_0x6a2bb:
writetext UnknownText_0x6a71f
closetext
loadmovesprites
end
-; 0x6a2c1
-UnknownScript_0x6a2c1: ; 0x6a2c1
+UnknownScript_0x6a2c1:
writetext UnknownText_0x6a84f
closetext
loadmovesprites
end
-; 0x6a2c7
-UnknownScript_0x6a2c7: ; 0x6a2c7
+UnknownScript_0x6a2c7:
jumptextfaceplayer UnknownText_0x6a894
-; 0x6a2ca
-OfficerScript_0x6a2ca: ; 0x6a2ca
+OfficerScript_0x6a2ca:
faceplayer
loadfont
checkflag $0051
@@ -220,40 +199,33 @@
closetext
loadmovesprites
end
-; 0x6a2d8
-YoungsterScript_0x6a2d8: ; 0x6a2d8
+YoungsterScript_0x6a2d8:
jumptextfaceplayer UnknownText_0x6a8d8
-; 0x6a2db
-MapRoute36NationalParkgateSignpost0Script: ; 0x6a2db
+MapRoute36NationalParkgateSignpost0Script:
jumptext UnknownText_0x6a90e
-; 0x6a2de
-UnknownScript_0x6a2de: ; 0x6a2de
+UnknownScript_0x6a2de:
jumpstd daytotext
end
-; 0x6a2e2
-MovementData_0x6a2e2: ; 0x6a2e2
+MovementData_0x6a2e2:
step_down
turn_head_left
step_end
-; 0x6a2e5
-MovementData_0x6a2e5: ; 0x6a2e5
+MovementData_0x6a2e5:
step_right
step_up
step_up
step_end
-; 0x6a2e9
-MovementData_0x6a2e9: ; 0x6a2e9
+MovementData_0x6a2e9:
step_up
step_end
-; 0x6a2eb
-UnknownText_0x6a2eb: ; 0x6a2eb
+UnknownText_0x6a2eb:
text "Today's @"
text_from_ram StringBuffer3
text "."
@@ -274,22 +246,19 @@
para "Would you like to"
line "give it a try?"
done
-; 0x6a39d
-UnknownText_0x6a39d: ; 0x6a39d
+UnknownText_0x6a39d:
text "Here are the PARK"
line "BALLS for the"
cont "Contest."
done
-; 0x6a3c7
-UnknownText_0x6a3c7: ; 0x6a3c7
+UnknownText_0x6a3c7:
text "<PLAYER> received"
line "20 PARK BALLS."
done
-; 0x6a3e2
-UnknownText_0x6a3e2: ; 0x6a3e2
+UnknownText_0x6a3e2:
text "The person who"
line "gets the strong-"
cont "est bug #MON"
@@ -312,9 +281,8 @@
para "#MON you can"
line "find!"
done
-; 0x6a4c6
-UnknownText_0x6a4c6: ; 0x6a4c6
+UnknownText_0x6a4c6:
text "Uh-oh…"
para "You have more than"
@@ -331,23 +299,20 @@
para "Is that OK with"
line "you?"
done
-; 0x6a537
-UnknownText_0x6a537: ; 0x6a537
+UnknownText_0x6a537:
text "Fine, we'll hold"
line "your other #MON"
cont "while you compete."
done
-; 0x6a56b
-UnknownText_0x6a56b: ; 0x6a56b
+UnknownText_0x6a56b:
text "<PLAYER>'s #MON"
line "were left with the"
cont "CONTEST HELPER."
done
-; 0x6a597
-UnknownText_0x6a597: ; 0x6a597
+UnknownText_0x6a597:
text "Please choose the"
line "#MON to be used"
@@ -354,16 +319,14 @@
para "in the Contest,"
line "then come see me."
done
-; 0x6a5dc
-UnknownText_0x6a5dc: ; 0x6a5dc
+UnknownText_0x6a5dc:
text "OK. We hope you'll"
line "take part in the"
cont "future."
done
-; 0x6a608
-UnknownText_0x6a608: ; 0x6a608
+UnknownText_0x6a608:
text "Uh-oh…"
line "The first #MON"
@@ -376,9 +339,8 @@
para "you want to use,"
line "then come see me."
done
-; 0x6a67c
-UnknownText_0x6a67c: ; 0x6a67c
+UnknownText_0x6a67c:
text "Uh-oh…"
line "Both your party"
@@ -395,9 +357,8 @@
para "your PC BOX, then"
line "come see me."
done
-; 0x6a71f
-UnknownText_0x6a71f: ; 0x6a71f
+UnknownText_0x6a71f:
text "Uh-oh…"
line "You have an EGG as"
@@ -410,9 +371,8 @@
para "you want to use,"
line "then come see me."
done
-; 0x6a79a
-UnknownText_0x6a79a: ; 0x6a79a
+UnknownText_0x6a79a:
text "You still have @"
text_from_ram StringBuffer3
text ""
@@ -421,9 +381,8 @@
para "Do you want to"
line "finish now?"
done
-; 0x6a7db
-UnknownText_0x6a7db: ; 0x6a7db
+UnknownText_0x6a7db:
text "OK. Please wait at"
line "the North Gate for"
@@ -430,16 +389,14 @@
para "the announcement"
line "of the winners."
done
-; 0x6a823
-UnknownText_0x6a823: ; 0x6a823
+UnknownText_0x6a823:
text "OK. Please get"
line "back outside and"
cont "finish up."
done
-; 0x6a84f
-UnknownText_0x6a84f: ; 0x6a84f
+UnknownText_0x6a84f:
text "Today's Contest is"
line "over. We hope you"
@@ -446,9 +403,8 @@
para "will participate"
line "in the future."
done
-; 0x6a894
-UnknownText_0x6a894: ; 0x6a894
+UnknownText_0x6a894:
text "We hold Contests"
line "regularly in the"
@@ -455,16 +411,14 @@
para "PARK. You should"
line "give it a shot."
done
-; 0x6a8d8
-UnknownText_0x6a8d8: ; 0x6a8d8
+UnknownText_0x6a8d8:
text "When is the next"
line "Bug-Catching Con-"
cont "test going to be?"
done
-; 0x6a90e
-UnknownText_0x6a90e: ; 0x6a90e
+UnknownText_0x6a90e:
text "The Bug-Catching"
line "Contest is held on"
@@ -483,9 +437,8 @@
para "have at the end of"
line "the contest."
done
-; 0x6a9d2
-Route35NationalParkgate_MapEventHeader: ; 0x6a9d2
+Route35NationalParkgate_MapEventHeader:
; filler
db 0, 0
@@ -508,4 +461,3 @@
person_event SPRITE_OFFICER, 5, 6, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6a204, $0745
person_event SPRITE_YOUNGSTER, 9, 10, $2, $11, 255, 255, $80, 0, YoungsterScript_0x6a2d8, $0734
person_event SPRITE_OFFICER, 7, 4, $9, $0, 255, 255, $a0, 0, OfficerScript_0x6a2ca, $0746
-; 0x6aa18
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -1,4 +1,4 @@
-Route36NationalParkgate_MapScriptHeader: ; 0x6aafd
+Route36NationalParkgate_MapScriptHeader:
; trigger count
db 3
@@ -15,34 +15,28 @@
dbw 5, UnknownScript_0x6ab17
dbw 2, UnknownScript_0x6ab23
-; 0x6ab11
-UnknownScript_0x6ab11: ; 0x6ab11
+UnknownScript_0x6ab11:
end
-; 0x6ab12
-UnknownScript_0x6ab12: ; 0x6ab12
+UnknownScript_0x6ab12:
end
-; 0x6ab13
-UnknownScript_0x6ab13: ; 0x6ab13
+UnknownScript_0x6ab13:
priorityjump UnknownScript_0x6ab47
end
-; 0x6ab17
-UnknownScript_0x6ab17: ; 0x6ab17
+UnknownScript_0x6ab17:
checkflag $0011
iftrue UnknownScript_0x6ab20
dotrigger $0
return
-; 0x6ab20
-UnknownScript_0x6ab20: ; 0x6ab20
+UnknownScript_0x6ab20:
dotrigger $2
return
-; 0x6ab23
-UnknownScript_0x6ab23: ; 0x6ab23
+UnknownScript_0x6ab23:
checkevent $02d2
iftrue UnknownScript_0x6ab46
checkcode VAR_WEEKDAY
@@ -54,16 +48,14 @@
disappear $2
appear $d
return
-; 0x6ab42
-UnknownScript_0x6ab42: ; 0x6ab42
+UnknownScript_0x6ab42:
appear $2
disappear $d
-UnknownScript_0x6ab46: ; 0x6ab46
+UnknownScript_0x6ab46:
return
-; 0x6ab47
-UnknownScript_0x6ab47: ; 0x6ab47
+UnknownScript_0x6ab47:
spriteface $0, UP
loadfont
checkcode VAR_11
@@ -84,9 +76,8 @@
pause 15
special Function8c0ab
jumpstd bugcontestresults
-; 0x6ab76
-UnknownScript_0x6ab76: ; 0x6ab76
+UnknownScript_0x6ab76:
writetext UnknownText_0x6b300
closetext
loadmovesprites
@@ -96,54 +87,52 @@
waitbutton
warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
end
-; 0x6ab8c
-UnknownScript_0x6ab8c: ; 0x6ab8c
+UnknownScript_0x6ab8c:
checkevent $0716
iftrue UnknownScript_0x6ab94
appear $3
-UnknownScript_0x6ab94: ; 0x6ab94
+UnknownScript_0x6ab94:
checkevent $0717
iftrue UnknownScript_0x6ab9c
appear $4
-UnknownScript_0x6ab9c: ; 0x6ab9c
+UnknownScript_0x6ab9c:
checkevent $0718
iftrue UnknownScript_0x6aba4
appear $5
-UnknownScript_0x6aba4: ; 0x6aba4
+UnknownScript_0x6aba4:
checkevent $0719
iftrue UnknownScript_0x6abac
appear $6
-UnknownScript_0x6abac: ; 0x6abac
+UnknownScript_0x6abac:
checkevent $071a
iftrue UnknownScript_0x6abb4
appear $7
-UnknownScript_0x6abb4: ; 0x6abb4
+UnknownScript_0x6abb4:
checkevent $071b
iftrue UnknownScript_0x6abbc
appear $8
-UnknownScript_0x6abbc: ; 0x6abbc
+UnknownScript_0x6abbc:
checkevent $071c
iftrue UnknownScript_0x6abc4
appear $9
-UnknownScript_0x6abc4: ; 0x6abc4
+UnknownScript_0x6abc4:
checkevent $071d
iftrue UnknownScript_0x6abcc
appear $a
-UnknownScript_0x6abcc: ; 0x6abcc
+UnknownScript_0x6abcc:
checkevent $071e
iftrue UnknownScript_0x6abd4
appear $b
-UnknownScript_0x6abd4: ; 0x6abd4
+UnknownScript_0x6abd4:
checkevent $071f
iftrue UnknownScript_0x6abdc
appear $c
-UnknownScript_0x6abdc: ; 0x6abdc
+UnknownScript_0x6abdc:
special Function1ad2
end
-; 0x6abe0
-OfficerScript_0x6abe0: ; 0x6abe0
+OfficerScript_0x6abe0:
checkcode VAR_WEEKDAY
if_equal SUNDAY, UnknownScript_0x6acf1
if_equal MONDAY, UnknownScript_0x6acf1
@@ -161,7 +150,7 @@
if_greater_than $1, UnknownScript_0x6ac41
special Function13a12
clearevent $0308
-UnknownScript_0x6ac10: ; 0x6ac10
+UnknownScript_0x6ac10:
setflag $0011
special PlayMapMusic
writetext UnknownText_0x6ae87
@@ -182,14 +171,13 @@
special Function139a8
warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
end
-; 0x6ac41
-UnknownScript_0x6ac41: ; 0x6ac41
+UnknownScript_0x6ac41:
checkcode VAR_PARTYCOUNT
if_less_than $6, UnknownScript_0x6ac4d
checkcode VAR_BOXSPACE
if_equal $0, UnknownScript_0x6ac85
-UnknownScript_0x6ac4d: ; 0x6ac4d
+UnknownScript_0x6ac4d:
special Function71ac
if_equal $1, UnknownScript_0x6ac8b
writetext UnknownText_0x6afb0
@@ -205,44 +193,38 @@
waitbutton
keeptextopen
jump UnknownScript_0x6ac10
-; 0x6ac73
-UnknownScript_0x6ac73: ; 0x6ac73
+UnknownScript_0x6ac73:
writetext UnknownText_0x6b0c6
closetext
loadmovesprites
end
-; 0x6ac79
-UnknownScript_0x6ac79: ; 0x6ac79
+UnknownScript_0x6ac79:
writetext UnknownText_0x6b081
closetext
loadmovesprites
end
-; 0x6ac7f
-UnknownScript_0x6ac7f: ; 0x6ac7f
+UnknownScript_0x6ac7f:
writetext UnknownText_0x6b0f2
closetext
loadmovesprites
end
-; 0x6ac85
-UnknownScript_0x6ac85: ; 0x6ac85
+UnknownScript_0x6ac85:
writetext UnknownText_0x6b166
closetext
loadmovesprites
end
-; 0x6ac8b
-UnknownScript_0x6ac8b: ; 0x6ac8b
+UnknownScript_0x6ac8b:
writetext UnknownText_0x6b209
closetext
loadmovesprites
end
-; 0x6ac91
-UnknownScript_0x6ac91: ; 0x6ac91
+UnknownScript_0x6ac91:
checkevent $0313
iftrue UnknownScript_0x6acaf
checkevent $0314
@@ -255,9 +237,8 @@
closetext
loadmovesprites
end
-; 0x6acaf
-UnknownScript_0x6acaf: ; 0x6acaf
+UnknownScript_0x6acaf:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem SUN_STONE, 1
@@ -265,9 +246,8 @@
clearevent $0313
loadmovesprites
end
-; 0x6acbe
-UnknownScript_0x6acbe: ; 0x6acbe
+UnknownScript_0x6acbe:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem EVERSTONE, 1
@@ -275,9 +255,8 @@
clearevent $0314
loadmovesprites
end
-; 0x6accd
-UnknownScript_0x6accd: ; 0x6accd
+UnknownScript_0x6accd:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem GOLD_BERRY, 1
@@ -285,9 +264,8 @@
clearevent $0315
loadmovesprites
end
-; 0x6acdc
-UnknownScript_0x6acdc: ; 0x6acdc
+UnknownScript_0x6acdc:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem BERRY, 1
@@ -295,20 +273,17 @@
clearevent $0316
loadmovesprites
end
-; 0x6aceb
-UnknownScript_0x6aceb: ; 0x6aceb
+UnknownScript_0x6aceb:
writetext UnknownText_0x6b910
closetext
loadmovesprites
end
-; 0x6acf1
-UnknownScript_0x6acf1: ; 0x6acf1
+UnknownScript_0x6acf1:
jumptextfaceplayer UnknownText_0x6b370
-; 0x6acf4
-OfficerScript_0x6acf4: ; 0x6acf4
+OfficerScript_0x6acf4:
faceplayer
loadfont
checkflag $0051
@@ -317,14 +292,12 @@
closetext
loadmovesprites
end
-; 0x6ad02
-UnknownScript_0x6ad02: ; 0x6ad02
+UnknownScript_0x6ad02:
jumpstd daytotext
end
-; 0x6ad06
-YoungsterScript_0x6ad06: ; 0x6ad06
+YoungsterScript_0x6ad06:
faceplayer
loadfont
checkevent $0000
@@ -333,16 +306,14 @@
closetext
loadmovesprites
end
-; 0x6ad14
-UnknownScript_0x6ad14: ; 0x6ad14
+UnknownScript_0x6ad14:
writetext UnknownText_0x6b3c4
closetext
loadmovesprites
end
-; 0x6ad1a
-YoungsterScript_0x6ad1a: ; 0x6ad1a
+YoungsterScript_0x6ad1a:
faceplayer
loadfont
checkevent $0000
@@ -351,16 +322,14 @@
closetext
loadmovesprites
end
-; 0x6ad28
-UnknownScript_0x6ad28: ; 0x6ad28
+UnknownScript_0x6ad28:
writetext UnknownText_0x6b440
closetext
loadmovesprites
end
-; 0x6ad2e
-RockerScript_0x6ad2e: ; 0x6ad2e
+RockerScript_0x6ad2e:
faceplayer
loadfont
checkevent $0000
@@ -369,16 +338,14 @@
closetext
loadmovesprites
end
-; 0x6ad3c
-UnknownScript_0x6ad3c: ; 0x6ad3c
+UnknownScript_0x6ad3c:
writetext UnknownText_0x6b496
closetext
loadmovesprites
end
-; 0x6ad42
-PokefanMScript_0x6ad42: ; 0x6ad42
+PokefanMScript_0x6ad42:
faceplayer
loadfont
checkevent $0000
@@ -387,16 +354,14 @@
closetext
loadmovesprites
end
-; 0x6ad50
-UnknownScript_0x6ad50: ; 0x6ad50
+UnknownScript_0x6ad50:
writetext UnknownText_0x6b50a
closetext
loadmovesprites
end
-; 0x6ad56
-YoungsterScript_0x6ad56: ; 0x6ad56
+YoungsterScript_0x6ad56:
faceplayer
loadfont
checkevent $0000
@@ -405,16 +370,14 @@
closetext
loadmovesprites
end
-; 0x6ad64
-UnknownScript_0x6ad64: ; 0x6ad64
+UnknownScript_0x6ad64:
writetext UnknownText_0x6b57c
closetext
loadmovesprites
end
-; 0x6ad6a
-YoungsterScript_0x6ad6a: ; 0x6ad6a
+YoungsterScript_0x6ad6a:
faceplayer
loadfont
checkevent $0000
@@ -423,16 +386,14 @@
closetext
loadmovesprites
end
-; 0x6ad78
-UnknownScript_0x6ad78: ; 0x6ad78
+UnknownScript_0x6ad78:
writetext UnknownText_0x6b5dd
closetext
loadmovesprites
end
-; 0x6ad7e
-LassScript_0x6ad7e: ; 0x6ad7e
+LassScript_0x6ad7e:
faceplayer
loadfont
checkevent $0000
@@ -441,16 +402,14 @@
closetext
loadmovesprites
end
-; 0x6ad8c
-UnknownScript_0x6ad8c: ; 0x6ad8c
+UnknownScript_0x6ad8c:
writetext UnknownText_0x6b698
closetext
loadmovesprites
end
-; 0x6ad92
-YoungsterScript_0x6ad92: ; 0x6ad92
+YoungsterScript_0x6ad92:
faceplayer
loadfont
checkevent $0000
@@ -459,16 +418,14 @@
closetext
loadmovesprites
end
-; 0x6ada0
-UnknownScript_0x6ada0: ; 0x6ada0
+UnknownScript_0x6ada0:
writetext UnknownText_0x6b6e9
closetext
loadmovesprites
end
-; 0x6ada6
-YoungsterScript_0x6ada6: ; 0x6ada6
+YoungsterScript_0x6ada6:
faceplayer
loadfont
checkevent $0000
@@ -477,16 +434,14 @@
closetext
loadmovesprites
end
-; 0x6adb4
-UnknownScript_0x6adb4: ; 0x6adb4
+UnknownScript_0x6adb4:
writetext UnknownText_0x6b740
closetext
loadmovesprites
end
-; 0x6adba
-YoungsterScript_0x6adba: ; 0x6adba
+YoungsterScript_0x6adba:
faceplayer
loadfont
checkevent $0000
@@ -495,27 +450,23 @@
closetext
loadmovesprites
end
-; 0x6adc8
-UnknownScript_0x6adc8: ; 0x6adc8
+UnknownScript_0x6adc8:
writetext UnknownText_0x6b7af
closetext
loadmovesprites
end
-; 0x6adce
-UnknownScript_0x6adce: ; 0x6adce
+UnknownScript_0x6adce:
jumptext UnknownText_0x6b84c
-; 0x6add1
-MovementData_0x6add1: ; 0x6add1
+MovementData_0x6add1:
big_step_down
big_step_right
turn_head_up
step_end
-; 0x6add5
-UnknownText_0x6add5: ; 0x6add5
+UnknownText_0x6add5:
text "Today's @"
text_from_ram StringBuffer3
text "."
@@ -536,22 +487,19 @@
para "Would you like to"
line "give it a try?"
done
-; 0x6ae87
-UnknownText_0x6ae87: ; 0x6ae87
+UnknownText_0x6ae87:
text "Here are the PARK"
line "BALLS for the"
cont "Contest."
done
-; 0x6aeb1
-UnknownText_0x6aeb1: ; 0x6aeb1
+UnknownText_0x6aeb1:
text "<PLAYER> received"
line "20 PARK BALLS."
done
-; 0x6aecc
-UnknownText_0x6aecc: ; 0x6aecc
+UnknownText_0x6aecc:
text "The person who"
line "gets the strong-"
cont "est bug #MON"
@@ -574,9 +522,8 @@
para "#MON you can"
line "find!"
done
-; 0x6afb0
-UnknownText_0x6afb0: ; 0x6afb0
+UnknownText_0x6afb0:
text "Uh-oh…"
para "You have more than"
@@ -593,23 +540,20 @@
para "Is that OK with"
line "you?"
done
-; 0x6b021
-UnknownText_0x6b021: ; 0x6b021
+UnknownText_0x6b021:
text "Fine, we'll hold"
line "your other #MON"
cont "while you compete."
done
-; 0x6b055
-UnknownText_0x6b055: ; 0x6b055
+UnknownText_0x6b055:
text "<PLAYER>'s #MON"
line "were left with the"
cont "CONTEST HELPER."
done
-; 0x6b081
-UnknownText_0x6b081: ; 0x6b081
+UnknownText_0x6b081:
text "Please choose the"
line "#MON to be used"
@@ -616,16 +560,14 @@
para "in the Contest,"
line "then come see me."
done
-; 0x6b0c6
-UnknownText_0x6b0c6: ; 0x6b0c6
+UnknownText_0x6b0c6:
text "OK. We hope you'll"
line "take part in the"
cont "future."
done
-; 0x6b0f2
-UnknownText_0x6b0f2: ; 0x6b0f2
+UnknownText_0x6b0f2:
text "Uh-oh…"
line "The first #MON"
@@ -638,9 +580,8 @@
para "you want to use,"
line "then come see me."
done
-; 0x6b166
-UnknownText_0x6b166: ; 0x6b166
+UnknownText_0x6b166:
text "Uh-oh…"
line "Both your party"
@@ -657,9 +598,8 @@
para "your PC BOX, then"
line "come see me."
done
-; 0x6b209
-UnknownText_0x6b209: ; 0x6b209
+UnknownText_0x6b209:
text "Uh-oh…"
line "You have an EGG as"
@@ -672,9 +612,8 @@
para "you want to use,"
line "then come see me."
done
-; 0x6b284
-UnknownText_0x6b284: ; 0x6b284
+UnknownText_0x6b284:
text "You still have @"
text_from_ram StringBuffer3
text ""
@@ -683,9 +622,8 @@
para "Do you want to"
line "finish now?"
done
-; 0x6b2c5
-UnknownText_0x6b2c5: ; 0x6b2c5
+UnknownText_0x6b2c5:
text "OK. Please wait"
line "here for the"
@@ -692,16 +630,14 @@
para "announcement of"
line "the winners."
done
-; 0x6b300
-UnknownText_0x6b300: ; 0x6b300
+UnknownText_0x6b300:
text "OK. Please go back"
line "outside and finish"
cont "up."
done
-; 0x6b32b
-UnknownText_0x6b32b: ; 0x6b32b
+UnknownText_0x6b32b:
text "Today's Contest is"
line "over. We hope you"
@@ -708,23 +644,20 @@
para "will participate"
line "in the future."
done
-; 0x6b370
-UnknownText_0x6b370: ; 0x6b370
+UnknownText_0x6b370:
text "Some #MON can"
line "only be seen in"
cont "the PARK."
done
-; 0x6b399
-UnknownText_0x6b399: ; 0x6b399
+UnknownText_0x6b399:
text "DON: Wow, you beat"
line "me. You're pretty"
cont "good."
done
-; 0x6b3c4
-UnknownText_0x6b3c4: ; 0x6b3c4
+UnknownText_0x6b3c4:
text "DON: Luck plays a"
line "big part in this."
@@ -732,29 +665,25 @@
line "what #MON will"
cont "appear."
done
-; 0x6b40f
-UnknownText_0x6b40f: ; 0x6b40f
+UnknownText_0x6b40f:
text "ED: I envy you."
line "I just couldn't"
cont "do it this time."
done
-; 0x6b440
-UnknownText_0x6b440: ; 0x6b440
+UnknownText_0x6b440:
text "ED: Maybe you win"
line "with big #MON?"
done
-; 0x6b462
-UnknownText_0x6b462: ; 0x6b462
+UnknownText_0x6b462:
text "NICK: Well done!"
line "I'm going to raise"
cont "my #MON better."
done
-; 0x6b496
-UnknownText_0x6b496: ; 0x6b496
+UnknownText_0x6b496:
text "NICK: Maybe you"
line "get a higher score"
@@ -761,16 +690,14 @@
para "for a #MON of"
line "an unusual color."
done
-; 0x6b4da
-UnknownText_0x6b4da: ; 0x6b4da
+UnknownText_0x6b4da:
text "WILLIAM: You're"
line "the winner? What"
cont "did you catch?"
done
-; 0x6b50a
-UnknownText_0x6b50a: ; 0x6b50a
+UnknownText_0x6b50a:
text "WILLIAM: Well, I'm"
line "satisfied because"
@@ -777,30 +704,26 @@
para "I caught a #MON"
line "that I wanted."
done
-; 0x6b54e
-UnknownText_0x6b54e: ; 0x6b54e
+UnknownText_0x6b54e:
text "BENNY: Congrats!"
line "You have earned my"
cont "respect!"
done
-; 0x6b57c
-UnknownText_0x6b57c: ; 0x6b57c
+UnknownText_0x6b57c:
text "BENNY: I caught a"
line "SCYTHER before,"
cont "but I didn't win."
done
-; 0x6b5b0
-UnknownText_0x6b5b0: ; 0x6b5b0
+UnknownText_0x6b5b0:
text "BARRY: That #-"
line "MON you caught…"
cont "it's awesome!"
done
-; 0x6b5dd
-UnknownText_0x6b5dd: ; 0x6b5dd
+UnknownText_0x6b5dd:
text "BARRY: It's easier"
line "to win if you get"
@@ -811,9 +734,8 @@
line "also consider some"
cont "other points."
done
-; 0x6b64b
-UnknownText_0x6b64b: ; 0x6b64b
+UnknownText_0x6b64b:
text "CINDY: You won?"
line "That's great!"
@@ -821,42 +743,36 @@
line "looking for bug"
cont "#MON with me?"
done
-; 0x6b698
-UnknownText_0x6b698: ; 0x6b698
+UnknownText_0x6b698:
text "CINDY: I really"
line "love bug #MON!"
done
-; 0x6b6b8
-UnknownText_0x6b6b8: ; 0x6b6b8
+UnknownText_0x6b6b8:
text "JOSH: I… I can't"
line "believe I lost at"
cont "bug-catching…"
done
-; 0x6b6e9
-UnknownText_0x6b6e9: ; 0x6b6e9
+UnknownText_0x6b6e9:
text "JOSH: I heard that"
line "somebody won with"
cont "a CATERPIE!"
done
-; 0x6b71b
-UnknownText_0x6b71b: ; 0x6b71b
+UnknownText_0x6b71b:
text "SAMUEL: Next time,"
line "I'm going to win."
done
-; 0x6b740
-UnknownText_0x6b740: ; 0x6b740
+UnknownText_0x6b740:
text "SAMUEL: Darn."
line "I thought I would"
cont "score higher…"
done
-; 0x6b76f
-UnknownText_0x6b76f: ; 0x6b76f
+UnknownText_0x6b76f:
text "KIPP: Could you"
line "give me some tips?"
@@ -863,9 +779,8 @@
para "I want to study"
line "your style."
done
-; 0x6b7af
-UnknownText_0x6b7af: ; 0x6b7af
+UnknownText_0x6b7af:
text "KIPP: I study a"
line "lot, but that's"
@@ -872,13 +787,12 @@
para "not good enough to"
line "win."
done
-; 0x6b7e7
; This text is unused and unreferenced in the final game.
; The tree Pokémon is Sudowoodo.
; The Silph Scope 2 was later reworked into the Squirtbottle.
-UnusedSudowoodoText: ; 0x6b7e7
+UnusedSudowoodoText:
text "I hear there's a"
line "#MON that looks"
cont "just like a tree."
@@ -888,7 +802,7 @@
cont "SILPHSCOPE 2."
done
-UnknownText_0x6b84c: ; 0x6b84c
+UnknownText_0x6b84c:
text "The Bug-Catching"
line "Contest is held on"
@@ -907,9 +821,8 @@
para "have at the end of"
line "the contest."
done
-; 0x6b910
-UnknownText_0x6b910: ; 0x6b910
+UnknownText_0x6b910:
text "Uh-oh… Your PACK"
line "is full."
@@ -920,9 +833,8 @@
para "Please make room,"
line "then come see me."
done
-; 0x6b97f
-UnknownText_0x6b97f: ; 0x6b97f
+UnknownText_0x6b97f:
text "<PLAYER>?"
para "Here's the prize"
@@ -929,9 +841,8 @@
line "we were holding"
cont "for you."
done
-; 0x6b9ac
-Route36NationalParkgate_MapEventHeader: ; 0x6b9ac
+Route36NationalParkgate_MapEventHeader:
; filler
db 0, 0
@@ -963,4 +874,3 @@
person_event SPRITE_YOUNGSTER, 11, 10, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ada6, $0728
person_event SPRITE_YOUNGSTER, 10, 10, $7, $0, 255, 255, $90, 0, YoungsterScript_0x6adba, $0729
person_event SPRITE_OFFICER, 6, 7, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6acf4, $0748
-; 0x6ba67
--- a/maps/Route36RuinsofAlphgate.asm
+++ b/maps/Route36RuinsofAlphgate.asm
@@ -1,28 +1,24 @@
-Route36RuinsofAlphgate_MapScriptHeader: ; 0x6aa18
+Route36RuinsofAlphgate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x6aa1a
-OfficerScript_0x6aa1a: ; 0x6aa1a
+OfficerScript_0x6aa1a:
jumptextfaceplayer UnknownText_0x6aa20
-; 0x6aa1d
-GrampsScript_0x6aa1d: ; 0x6aa1d
+GrampsScript_0x6aa1d:
jumptextfaceplayer UnknownText_0x6aa5b
-; 0x6aa20
-UnknownText_0x6aa20: ; 0x6aa20
+UnknownText_0x6aa20:
text "Don't you wonder"
line "who'd make some-"
cont "thing like this?"
cont "And why?"
done
-; 0x6aa5b
-UnknownText_0x6aa5b: ; 0x6aa5b
+UnknownText_0x6aa5b:
text "Did you see that"
line "strange tree in"
cont "the road?"
@@ -33,9 +29,8 @@
para "are visiting the"
line "RUINS OF ALPH."
done
-; 0x6aac9
-Route36RuinsofAlphgate_MapEventHeader: ; 0x6aac9
+Route36RuinsofAlphgate_MapEventHeader:
; filler
db 0, 0
@@ -56,4 +51,3 @@
db 2
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, $ffff
person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, $ffff
-; 0x6aafd
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -1,16 +1,14 @@
-Route38EcruteakGate_MapScriptHeader: ; 0x9cbd5
+Route38EcruteakGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9cbd7
-OfficerScript_0x9cbd7: ; 0x9cbd7
+OfficerScript_0x9cbd7:
jumptextfaceplayer UnknownText_0x9cbda
-; 0x9cbda
-UnknownText_0x9cbda: ; 0x9cbda
+UnknownText_0x9cbda:
text "Where did you say"
line "you're from?"
@@ -22,9 +20,8 @@
para "You've come a long"
line "way to get here."
done
-; 0x9cc4d
-Route38EcruteakGate_MapEventHeader: ; 0x9cc4d
+Route38EcruteakGate_MapEventHeader:
; filler
db 0, 0
@@ -44,4 +41,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, $ffff
-; 0x9cc74
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -1,12 +1,11 @@
-Route39Barn_MapScriptHeader: ; 0x9cc74
+Route39Barn_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9cc76
-TwinScript_0x9cc76: ; 0x9cc76
+TwinScript_0x9cc76:
faceplayer
loadfont
checkevent EVENT_HEALED_MOOMOO
@@ -16,17 +15,15 @@
loadmovesprites
spriteface $2, RIGHT
end
-; 0x9cc87
-UnknownScript_0x9cc87: ; 0x9cc87
+UnknownScript_0x9cc87:
writetext UnknownText_0x9cd5a
closetext
loadmovesprites
spriteface $2, RIGHT
end
-; 0x9cc90
-TwinScript_0x9cc90: ; 0x9cc90
+TwinScript_0x9cc90:
faceplayer
loadfont
checkevent EVENT_HEALED_MOOMOO
@@ -36,17 +33,15 @@
loadmovesprites
spriteface $3, LEFT
end
-; 0x9cca1
-UnknownScript_0x9cca1: ; 0x9cca1
+UnknownScript_0x9cca1:
writetext UnknownText_0x9cd5a
closetext
loadmovesprites
spriteface $3, LEFT
end
-; 0x9ccaa
-TaurosScript_0x9ccaa: ; 0x9ccaa
+TaurosScript_0x9ccaa:
loadfont
checkevent EVENT_HEALED_MOOMOO
iftrue UnknownScript_0x9cd25
@@ -60,9 +55,8 @@
closetext
loadmovesprites
end
-; 0x9ccc6
-UnknownScript_0x9ccc6: ; 0x9ccc6
+UnknownScript_0x9ccc6:
keeptextopen
writetext UnknownText_0x9cda2
yesorno
@@ -80,9 +74,8 @@
closetext
loadmovesprites
end
-; 0x9ccf0
-UnknownScript_0x9ccf0: ; 0x9ccf0
+UnknownScript_0x9ccf0:
writetext UnknownText_0x9cdbc
keeptextopen
writetext UnknownText_0x9cdd8
@@ -89,9 +82,8 @@
closetext
loadmovesprites
end
-; 0x9ccfa
-UnknownScript_0x9ccfa: ; 0x9ccfa
+UnknownScript_0x9ccfa:
writetext UnknownText_0x9cdbc
keeptextopen
writetext UnknownText_0x9cdfc
@@ -98,9 +90,8 @@
closetext
loadmovesprites
end
-; 0x9cd04
-UnknownScript_0x9cd04: ; 0x9cd04
+UnknownScript_0x9cd04:
playmusic MUSIC_HEAL
writetext UnknownText_0x9cdbc
pause 60
@@ -111,104 +102,88 @@
loadmovesprites
setevent EVENT_HEALED_MOOMOO
end
-; 0x9cd19
-UnknownScript_0x9cd19: ; 0x9cd19
+UnknownScript_0x9cd19:
writetext UnknownText_0x9ce3c
closetext
loadmovesprites
end
-; 0x9cd1f
-UnknownScript_0x9cd1f: ; 0x9cd1f
+UnknownScript_0x9cd1f:
writetext UnknownText_0x9ce4f
closetext
loadmovesprites
end
-; 0x9cd25
-UnknownScript_0x9cd25: ; 0x9cd25
+UnknownScript_0x9cd25:
writetext UnknownText_0x9cd92
cry MILTANK
closetext
loadmovesprites
end
-; 0x9cd2e
-UnknownText_0x9cd2e: ; 0x9cd2e
+UnknownText_0x9cd2e:
text "MOOMOO is sick…"
para "She needs lots of"
line "BERRIES."
done
-; 0x9cd5a
-UnknownText_0x9cd5a: ; 0x9cd5a
+UnknownText_0x9cd5a:
text "We're feeding"
line "MOOMOO!"
done
-; 0x9cd70
-UnknownText_0x9cd70: ; 0x9cd70
+UnknownText_0x9cd70:
text "MILTANK: …Moo…"
done
-; 0x9cd80
-UnknownText_0x9cd80: ; 0x9cd80
+UnknownText_0x9cd80:
text "Its cry is weak…"
done
-; 0x9cd92
-UnknownText_0x9cd92: ; 0x9cd92
+UnknownText_0x9cd92:
text "MILTANK: Mooo!"
done
-; 0x9cda2
-UnknownText_0x9cda2: ; 0x9cda2
+UnknownText_0x9cda2:
text "Give a BERRY to"
line "MILTANK?"
done
-; 0x9cdbc
-UnknownText_0x9cdbc: ; 0x9cdbc
+UnknownText_0x9cdbc:
text "<PLAYER> gave a"
line "BERRY to MILTANK."
done
-; 0x9cdd8
-UnknownText_0x9cdd8: ; 0x9cdd8
+UnknownText_0x9cdd8:
text "MILTANK became a"
line "little healthier!"
done
-; 0x9cdfc
-UnknownText_0x9cdfc: ; 0x9cdfc
+UnknownText_0x9cdfc:
text "MILTANK became"
line "quite healthy!"
done
-; 0x9ce1b
-UnknownText_0x9ce1b: ; 0x9ce1b
+UnknownText_0x9ce1b:
text "MILTANK became"
line "totally healthy!"
done
-; 0x9ce3c
-UnknownText_0x9ce3c: ; 0x9ce3c
+UnknownText_0x9ce3c:
text "<PLAYER> has no"
line "BERRIES…"
done
-; 0x9ce4f
-UnknownText_0x9ce4f: ; 0x9ce4f
+UnknownText_0x9ce4f:
text "<PLAYER> wouldn't"
line "give a BERRY."
para "MILTANK looks sad."
done
-; 0x9ce7b
-Route39Barn_MapEventHeader: ; 0x9ce7b
+Route39Barn_MapEventHeader:
; filler
db 0, 0
@@ -228,4 +203,3 @@
person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, $ffff
person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, $ffff
person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, $ffff
-; 0x9ceb2
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -1,12 +1,11 @@
-Route39Farmhouse_MapScriptHeader: ; 0x9ceb2
+Route39Farmhouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9ceb4
-PokefanMScript_0x9ceb4: ; 0x9ceb4
+PokefanMScript_0x9ceb4:
faceplayer
loadfont
checkevent EVENT_HEALED_MOOMOO
@@ -16,9 +15,8 @@
loadmovesprites
setevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
end
-; 0x9cec5
-UnknownScript_0x9cec5: ; 0x9cec5
+UnknownScript_0x9cec5:
checkitem MOOMOO_MILK
iftrue UnknownScript_0x9cf08
writetext UnknownText_0x9cfe1
@@ -38,37 +36,32 @@
itemnotify
loadmovesprites
end
-; 0x9cef6
-UnknownScript_0x9cef6: ; 0x9cef6
+UnknownScript_0x9cef6:
writetext UnknownText_0x9d07c
closetext
loadmovesprites
end
-; 0x9cefc
-UnknownScript_0x9cefc: ; 0x9cefc
+UnknownScript_0x9cefc:
writetext UnknownText_0x9d09d
closetext
loadmovesprites
end
-; 0x9cf02
-UnknownScript_0x9cf02: ; 0x9cf02
+UnknownScript_0x9cf02:
writetext UnknownText_0x9d0b7
closetext
loadmovesprites
end
-; 0x9cf08
-UnknownScript_0x9cf08: ; 0x9cf08
+UnknownScript_0x9cf08:
writetext UnknownText_0x9d0dc
closetext
loadmovesprites
end
-; 0x9cf0e
-PokefanFScript_0x9cf0e: ; 0x9cf0e
+PokefanFScript_0x9cf0e:
faceplayer
loadfont
checkevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
@@ -79,27 +72,24 @@
closetext
loadmovesprites
end
-; 0x9cf22
-UnknownScript_0x9cf22: ; 0x9cf22
+UnknownScript_0x9cf22:
writetext UnknownText_0x9d156
keeptextopen
verbosegiveitem TM_SNORE, 1
iffalse UnknownScript_0x9cf33
setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
-UnknownScript_0x9cf2f: ; 0x9cf2f
+UnknownScript_0x9cf2f:
writetext UnknownText_0x9d1c7
closetext
-UnknownScript_0x9cf33: ; 0x9cf33
+UnknownScript_0x9cf33:
loadmovesprites
end
-; 0x9cf35
FarmhouseBookshelf:
jumpstd picturebookshelf
-; 0x9cf38
-UnknownText_0x9cf38: ; 0x9cf38
+UnknownText_0x9cf38:
text "My MILTANK ain't"
line "givin' me milk"
cont "n'more."
@@ -116,9 +106,8 @@
para "feed it lots o'"
line "BERRIES, I reckon."
done
-; 0x9cfe1
-UnknownText_0x9cfe1: ; 0x9cfe1
+UnknownText_0x9cfe1:
text "How'd you like my"
line "MOOMOO MILK?"
@@ -131,39 +120,33 @@
para "I'll give it to ya"
line "fer just ¥500."
done
-; 0x9d05d
-UnknownText_0x9d05d: ; 0x9d05d
+UnknownText_0x9d05d:
text "Here ya go!"
line "Drink up'n enjoy!"
done
-; 0x9d07c
-UnknownText_0x9d07c: ; 0x9d07c
+UnknownText_0x9d07c:
text "Sorry, there."
line "No cash, no sale!"
done
-; 0x9d09d
-UnknownText_0x9d09d: ; 0x9d09d
+UnknownText_0x9d09d:
text "I reckon yer"
line "PACK's full."
done
-; 0x9d0b7
-UnknownText_0x9d0b7: ; 0x9d0b7
+UnknownText_0x9d0b7:
text "You don't want it?"
line "Come again, hear?"
done
-; 0x9d0dc
-UnknownText_0x9d0dc: ; 0x9d0dc
+UnknownText_0x9d0dc:
text "I best go do my"
line "milkin'."
done
-; 0x9d0f6
-UnknownText_0x9d0f6: ; 0x9d0f6
+UnknownText_0x9d0f6:
text "Our milk even goes"
line "out to KANTO."
@@ -173,9 +156,8 @@
para "us any milk, we're"
line "in trouble."
done
-; 0x9d156
-UnknownText_0x9d156: ; 0x9d156
+UnknownText_0x9d156:
text "You fixed our"
line "MILTANK, hon. Now"
@@ -185,15 +167,13 @@
para "Here's somethin'"
line "fer your trouble."
done
-; 0x9d1b5
-UnknownText_0x9d1b5: ; 0x9d1b5
+UnknownText_0x9d1b5:
text "<PLAYER> received"
line "TM13."
done
-; 0x9d1c7
-UnknownText_0x9d1c7: ; 0x9d1c7
+UnknownText_0x9d1c7:
text "That there's"
line "SNORE."
@@ -207,9 +187,8 @@
line "you ought to use"
cont "it, hon."
done
-; 0x9d242
-Route39Farmhouse_MapEventHeader: ; 0x9d242
+Route39Farmhouse_MapEventHeader:
; filler
db 0, 0
@@ -230,4 +209,3 @@
db 2
person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, $ffff
person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, $ffff
-; 0x9d276
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -1,4 +1,4 @@
-Route40BattleTowerGate_MapScriptHeader: ; 0x9f660
+Route40BattleTowerGate_MapScriptHeader:
; trigger count
db 0
@@ -8,22 +8,18 @@
; callbacks
dbw 2, UnknownScript_0x9f665
-; 0x9f665
-UnknownScript_0x9f665: ; 0x9f665
+UnknownScript_0x9f665:
clearevent $07cf
return
-; 0x9f669
-RockerScript_0x9f669: ; 0x9f669
+RockerScript_0x9f669:
jumptextfaceplayer UnknownText_0x9f716
-; 0x9f66c
-TwinScript_0x9f66c: ; 0x9f66c
+TwinScript_0x9f66c:
jumptextfaceplayer UnknownText_0x9f7c8
-; 0x9f66f
-UnknownText_0x9f66f: ; 0x9f66f
+UnknownText_0x9f66f:
text "Did you come to"
line "see the BATTLE"
cont "TOWER too?"
@@ -31,9 +27,8 @@
para "But I guess you"
line "can't go in yet."
done
-; 0x9f6ba
-UnknownText_0x9f6ba: ; 0x9f6ba
+UnknownText_0x9f6ba:
text "BATTLE TOWER has"
line "opened."
@@ -43,9 +38,8 @@
para "up a cool line for"
line "when I win."
done
-; 0x9f716
-UnknownText_0x9f716: ; 0x9f716
+UnknownText_0x9f716:
text "Are you going to"
line "the BATTLE TOWER?"
@@ -55,9 +49,8 @@
para "whole lot, you can"
line "win special gifts."
done
-; 0x9f783
-UnknownText_0x9f783: ; 0x9f783
+UnknownText_0x9f783:
text "I'm going to train"
line "my #MON so I'll"
@@ -64,9 +57,8 @@
para "be all ready for"
line "the BATTLE TOWER."
done
-; 0x9f7c8
-UnknownText_0x9f7c8: ; 0x9f7c8
+UnknownText_0x9f7c8:
text "The levels of the"
line "#MON I want to"
@@ -76,9 +68,8 @@
para "I have to go train"
line "them now!"
done
-; 0x9f81e
-Route40BattleTowerGate_MapEventHeader: ; 0x9f81e
+Route40BattleTowerGate_MapEventHeader:
; filler
db 0, 0
@@ -99,4 +90,3 @@
db 2
person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, $07cf
person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, $ffff
-; 0x9f852
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -1,16 +1,14 @@
-Route42EcruteakGate_MapScriptHeader: ; 0x19a4b3
+Route42EcruteakGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19a4b5
-OfficerScript_0x19a4b5: ; 0x19a4b5
+OfficerScript_0x19a4b5:
jumptextfaceplayer UnknownText_0x19a4b8
-; 0x19a4b8
-UnknownText_0x19a4b8: ; 0x19a4b8
+UnknownText_0x19a4b8:
text "MT.MORTAR is like"
line "a maze inside."
@@ -17,9 +15,8 @@
para "Be careful. Don't"
line "get lost in there."
done
-; 0x19a4fe
-Route42EcruteakGate_MapEventHeader: ; 0x19a4fe
+Route42EcruteakGate_MapEventHeader:
; filler
db 0, 0
@@ -39,4 +36,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, $ffff
-; 0x19a525
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -1,4 +1,4 @@
-Route43Gate_MapScriptHeader: ; 0x19abb8
+Route43Gate_MapScriptHeader:
; trigger count
db 2
@@ -12,30 +12,25 @@
; callbacks
dbw 5, UnknownScript_0x19abca
-; 0x19abc5
-UnknownScript_0x19abc5: ; 0x19abc5
+UnknownScript_0x19abc5:
priorityjump UnknownScript_0x19abda
end
-; 0x19abc9
-UnknownScript_0x19abc9: ; 0x19abc9
+UnknownScript_0x19abc9:
end
-; 0x19abca
-UnknownScript_0x19abca: ; 0x19abca
+UnknownScript_0x19abca:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19abd5
domaptrigger GROUP_ROUTE_43, MAP_ROUTE_43, $0
return
-; 0x19abd5
-UnknownScript_0x19abd5: ; 0x19abd5
+UnknownScript_0x19abd5:
domaptrigger GROUP_ROUTE_43, MAP_ROUTE_43, $1
return
-; 0x19abda
-UnknownScript_0x19abda: ; 0x19abda
+UnknownScript_0x19abda:
playmusic MUSIC_ROCKET_ENCOUNTER
checkcode VAR_FACING
if_equal $0, UnknownScript_0x19abea
@@ -42,9 +37,8 @@
if_equal $1, UnknownScript_0x19ac38
dotrigger $1
end
-; 0x19abea
-UnknownScript_0x19abea: ; 0x19abea
+UnknownScript_0x19abea:
applymovement $0, MovementData_0x19aca2
showemote $0, $4, 15
applymovement $4, MovementData_0x19acbb
@@ -57,21 +51,18 @@
checkmoney $0, 999
if_equal $0, UnknownScript_0x19ac12
jump UnknownScript_0x19ac1d
-; 0x19ac12
-UnknownScript_0x19ac12: ; 0x19ac12
+UnknownScript_0x19ac12:
takemoney $0, 1000
writetext UnknownText_0x19ad0a
jump UnknownScript_0x19ac28
-; 0x19ac1d
-UnknownScript_0x19ac1d: ; 0x19ac1d
+UnknownScript_0x19ac1d:
takemoney $0, 1000
writetext UnknownText_0x19ad20
jump UnknownScript_0x19ac28
-; 0x19ac28
-UnknownScript_0x19ac28: ; 0x19ac28
+UnknownScript_0x19ac28:
keeptextopen
loadmovesprites
applymovement $3, MovementData_0x19acaa
@@ -79,9 +70,8 @@
dotrigger $1
special RestartMapMusic
end
-; 0x19ac38
-UnknownScript_0x19ac38: ; 0x19ac38
+UnknownScript_0x19ac38:
showemote $0, $3, 15
applymovement $3, MovementData_0x19acaf
spriteface $4, DOWN
@@ -93,21 +83,18 @@
checkmoney $0, 999
if_equal $0, UnknownScript_0x19ac5c
jump UnknownScript_0x19ac67
-; 0x19ac5c
-UnknownScript_0x19ac5c: ; 0x19ac5c
+UnknownScript_0x19ac5c:
takemoney $0, 1000
writetext UnknownText_0x19ad0a
jump UnknownScript_0x19ac72
-; 0x19ac67
-UnknownScript_0x19ac67: ; 0x19ac67
+UnknownScript_0x19ac67:
takemoney $0, 1000
writetext UnknownText_0x19ad20
jump UnknownScript_0x19ac72
-; 0x19ac72
-UnknownScript_0x19ac72: ; 0x19ac72
+UnknownScript_0x19ac72:
keeptextopen
loadmovesprites
applymovement $4, MovementData_0x19accd
@@ -115,13 +102,11 @@
dotrigger $1
special RestartMapMusic
end
-; 0x19ac82
-RocketScript_0x19ac82: ; 0x19ac82
+RocketScript_0x19ac82:
jumptextfaceplayer UnknownText_0x19ad41
-; 0x19ac85
-OfficerScript_0x19ac85: ; 0x19ac85
+OfficerScript_0x19ac85:
faceplayer
loadfont
checkevent EVENT_GOT_TM36_SLUDGE_BOMB
@@ -133,22 +118,19 @@
setevent EVENT_GOT_TM36_SLUDGE_BOMB
loadmovesprites
end
-; 0x19ac9c
-UnknownScript_0x19ac9c: ; 0x19ac9c
+UnknownScript_0x19ac9c:
writetext UnknownText_0x19ae2d
closetext
-UnknownScript_0x19aca0: ; 0x19aca0
+UnknownScript_0x19aca0:
loadmovesprites
end
-; 0x19aca2
-MovementData_0x19aca2: ; 0x19aca2
+MovementData_0x19aca2:
step_down
step_end
-; 0x19aca4
-MovementData_0x19aca4: ; 0x19aca4
+MovementData_0x19aca4:
big_step_up
big_step_up
big_step_right
@@ -155,17 +137,15 @@
big_step_right
turn_head_up
step_end
-; 0x19acaa
-MovementData_0x19acaa: ; 0x19acaa
+MovementData_0x19acaa:
big_step_left
big_step_left
big_step_down
big_step_down
step_end
-; 0x19acaf
-MovementData_0x19acaf: ; 0x19acaf
+MovementData_0x19acaf:
big_step_down
big_step_down
big_step_right
@@ -172,9 +152,8 @@
big_step_right
turn_head_down
step_end
-; 0x19acb5
-MovementData_0x19acb5: ; 0x19acb5
+MovementData_0x19acb5:
big_step_left
big_step_left
big_step_up
@@ -181,9 +160,8 @@
big_step_up
turn_head_down
step_end
-; 0x19acbb
-MovementData_0x19acbb: ; 0x19acbb
+MovementData_0x19acbb:
big_step_up
big_step_up
big_step_left
@@ -190,9 +168,8 @@
big_step_left
turn_head_up
step_end
-; 0x19acc1
-MovementData_0x19acc1: ; 0x19acc1
+MovementData_0x19acc1:
big_step_right
big_step_right
big_step_down
@@ -199,9 +176,8 @@
big_step_down
turn_head_up
step_end
-; 0x19acc7
-MovementData_0x19acc7: ; 0x19acc7
+MovementData_0x19acc7:
big_step_down
big_step_down
big_step_left
@@ -208,17 +184,15 @@
big_step_left
turn_head_down
step_end
-; 0x19accd
-MovementData_0x19accd: ; 0x19accd
+MovementData_0x19accd:
big_step_right
big_step_right
big_step_up
big_step_up
step_end
-; 0x19acd2
-UnknownText_0x19acd2: ; 0x19acd2
+UnknownText_0x19acd2:
text "Hold it there,"
line "kiddo!"
@@ -225,21 +199,18 @@
para "The toll is ¥1000"
line "to go through."
done
-; 0x19ad0a
-UnknownText_0x19ad0a: ; 0x19ad0a
+UnknownText_0x19ad0a:
text "Thank you very"
line "much!"
done
-; 0x19ad20
-UnknownText_0x19ad20: ; 0x19ad20
+UnknownText_0x19ad20:
text "Then pay what you"
line "have, please."
done
-; 0x19ad41
-UnknownText_0x19ad41: ; 0x19ad41
+UnknownText_0x19ad41:
text "He-he-he. We're"
line "making a bundle."
@@ -249,9 +220,8 @@
para "on up at LAKE OF"
line "RAGE."
done
-; 0x19ad9b
-UnknownText_0x19ad9b: ; 0x19ad9b
+UnknownText_0x19ad9b:
text "I got chased from"
line "my post by these"
cont "thugs in black."
@@ -263,22 +233,19 @@
line "fortable. Could"
cont "you take it away?"
done
-; 0x19ae1b
-UnknownText_0x19ae1b: ; 0x19ae1b
+UnknownText_0x19ae1b:
text "<PLAYER> received"
line "TM30."
done
-; 0x19ae2d
-UnknownText_0x19ae2d: ; 0x19ae2d
+UnknownText_0x19ae2d:
text "Use this gate to"
line "avoid walking in"
cont "the grass."
done
-; 0x19ae5b
-Route43Gate_MapEventHeader: ; 0x19ae5b
+Route43Gate_MapEventHeader:
; filler
db 0, 0
@@ -300,4 +267,3 @@
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ac85, $0735
person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc
person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc
-; 0x19ae9c
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -1,12 +1,11 @@
-Route43MahoganyGate_MapScriptHeader: ; 0x19ab09
+Route43MahoganyGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19ab0b
-OfficerScript_0x19ab0b: ; 0x19ab0b
+OfficerScript_0x19ab0b:
faceplayer
loadfont
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
@@ -15,16 +14,14 @@
closetext
loadmovesprites
end
-; 0x19ab19
-UnknownScript_0x19ab19: ; 0x19ab19
+UnknownScript_0x19ab19:
writetext UnknownText_0x19ab65
closetext
loadmovesprites
end
-; 0x19ab1f
-UnknownText_0x19ab1f: ; 0x19ab1f
+UnknownText_0x19ab1f:
text "Only people headed"
line "up to LAKE OF RAGE"
@@ -31,16 +28,14 @@
para "have been through"
line "here lately."
done
-; 0x19ab65
-UnknownText_0x19ab65: ; 0x19ab65
+UnknownText_0x19ab65:
text "Nobody goes up to"
line "LAKE OF RAGE these"
cont "days."
done
-; 0x19ab91
-Route43MahoganyGate_MapEventHeader: ; 0x19ab91
+Route43MahoganyGate_MapEventHeader:
; filler
db 0, 0
@@ -60,4 +55,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, $ffff
-; 0x19abb8
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -1,24 +1,20 @@
-Route5_MapScriptHeader: ; 0x1adb17
+Route5_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1adb19
-PokefanMScript_0x1adb19: ; 0x1adb19
+PokefanMScript_0x1adb19:
jumptextfaceplayer UnknownText_0x1adb22
-; 0x1adb1c
-MapRoute5Signpost0Script: ; 0x1adb1c
+MapRoute5Signpost0Script:
jumptext UnknownText_0x1adb66
-; 0x1adb1f
-MapRoute5Signpost1Script: ; 0x1adb1f
+MapRoute5Signpost1Script:
jumptext UnknownText_0x1adb97
-; 0x1adb22
-UnknownText_0x1adb22: ; 0x1adb22
+UnknownText_0x1adb22:
text "The road is closed"
line "until the problem"
@@ -25,25 +21,22 @@
para "at the POWER PLANT"
line "is solved."
done
-; 0x1adb66
-UnknownText_0x1adb66: ; 0x1adb66
+UnknownText_0x1adb66:
text "UNDERGROUND PATH"
para "CERULEAN CITY -"
line "VERMILION CITY"
done
-; 0x1adb97
-UnknownText_0x1adb97: ; 0x1adb97
+UnknownText_0x1adb97:
text "What's this?"
para "House for Sale…"
line "Nobody lives here."
done
-; 0x1adbc7
-Route5_MapEventHeader: ; 0x1adbc7
+Route5_MapEventHeader:
; filler
db 0, 0
@@ -65,4 +58,3 @@
; people-events
db 1
person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, $0771
-; 0x1adbf8
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagSpeechHouse.asm
@@ -1,12 +1,11 @@
-Route5CleanseTagSpeechHouse_MapScriptHeader: ; 0x18b632
+Route5CleanseTagSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18b634
-GrannyScript_0x18b634: ; 0x18b634
+GrannyScript_0x18b634:
faceplayer
loadfont
checkevent EVENT_GOT_CLEANSE_TAG
@@ -16,22 +15,20 @@
verbosegiveitem CLEANSE_TAG, 1
iffalse UnknownScript_0x18b64d
setevent EVENT_GOT_CLEANSE_TAG
-UnknownScript_0x18b649: ; 0x18b649
+UnknownScript_0x18b649:
writetext UnknownText_0x18b6a7
closetext
-UnknownScript_0x18b64d: ; 0x18b64d
+UnknownScript_0x18b64d:
loadmovesprites
end
-; 0x18b64f
-TeacherScript_0x18b64f: ; 0x18b64f
+TeacherScript_0x18b64f:
jumptextfaceplayer UnknownText_0x18b6de
-; 0x18b652
HouseForSaleBookshelf:
jumpstd difficultbookshelf
-UnknownText_0x18b655: ; 0x18b655
+UnknownText_0x18b655:
text "Eeyaaaah!"
para "I sense a sinister"
@@ -41,16 +38,14 @@
para "Take this to ward"
line "it off!"
done
-; 0x18b6a7
-UnknownText_0x18b6a7: ; 0x18b6a7
+UnknownText_0x18b6a7:
text "You were in mortal"
line "danger, but you"
cont "are protected now."
done
-; 0x18b6de
-UnknownText_0x18b6de: ; 0x18b6de
+UnknownText_0x18b6de:
text "My grandma is into"
line "warding off what"
@@ -60,9 +55,8 @@
para "I'm sorry that she"
line "startled you."
done
-; 0x18b744
-Route5CleanseTagSpeechHouse_MapEventHeader: ; 0x18b744
+Route5CleanseTagSpeechHouse_MapEventHeader:
; filler
db 0, 0
--- a/maps/Route5SaffronCityGate.asm
+++ b/maps/Route5SaffronCityGate.asm
@@ -1,16 +1,14 @@
-Route5SaffronCityGate_MapScriptHeader: ; 0x18b5b7
+Route5SaffronCityGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18b5b9
-OfficerScript_0x18b5b9: ; 0x18b5b9
+OfficerScript_0x18b5b9:
jumptextfaceplayer UnknownText_0x18b5bc
-; 0x18b5bc
-UnknownText_0x18b5bc: ; 0x18b5bc
+UnknownText_0x18b5bc:
text "You're from JOHTO,"
line "aren't you?"
@@ -18,9 +16,8 @@
line "KANTO? It's nice,"
cont "don't you agree?"
done
-; 0x18b60b
-Route5SaffronCityGate_MapEventHeader: ; 0x18b60b
+Route5SaffronCityGate_MapEventHeader:
; filler
db 0, 0
@@ -40,4 +37,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, $ffff
-; 0x18b632
--- a/maps/Route5UndergroundEntrance.asm
+++ b/maps/Route5UndergroundEntrance.asm
@@ -1,16 +1,14 @@
-Route5UndergroundEntrance_MapScriptHeader: ; 0x18b553
+Route5UndergroundEntrance_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18b555
-TeacherScript_0x18b555: ; 0x18b555
+TeacherScript_0x18b555:
jumptextfaceplayer UnknownText_0x18b558
-; 0x18b558
-UnknownText_0x18b558: ; 0x18b558
+UnknownText_0x18b558:
text "Many cities in"
line "JOHTO have long"
@@ -17,9 +15,8 @@
para "histories. I'd"
line "love to visit!"
done
-; 0x18b595
-Route5UndergroundEntrance_MapEventHeader: ; 0x18b595
+Route5UndergroundEntrance_MapEventHeader:
; filler
db 0, 0
@@ -38,4 +35,3 @@
; people-events
db 1
person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, $ffff
-; 0x18b5b7
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -1,4 +1,4 @@
-Route6SaffronGate_MapScriptHeader: ; 0x1926e3
+Route6SaffronGate_MapScriptHeader:
; trigger count
db 1
@@ -7,13 +7,11 @@
; callback count
db 0
-; 0x1926e9
-UnknownScript_0x1926e9: ; 0x1926e9
+UnknownScript_0x1926e9:
end
-; 0x1926ea
-OfficerScript_0x1926ea: ; 0x1926ea
+OfficerScript_0x1926ea:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -22,16 +20,14 @@
closetext
loadmovesprites
end
-; 0x1926f8
-UnknownScript_0x1926f8: ; 0x1926f8
+UnknownScript_0x1926f8:
writetext UnknownText_0x1927cb
closetext
loadmovesprites
end
-; 0x1926fe
-UnknownText_0x1926fe: ; 0x1926fe
+UnknownText_0x1926fe:
text "Welcome to SAFFRON"
line "CITY, home of the"
cont "MAGNET TRAIN!"
@@ -51,9 +47,8 @@
para "with the POWER"
line "PLANT."
done
-; 0x1927cb
-UnknownText_0x1927cb: ; 0x1927cb
+UnknownText_0x1927cb:
text "The MAGNET TRAIN"
line "is the most famous"
@@ -60,9 +55,8 @@
para "thing about SAF-"
line "FRON."
done
-; 0x192807
-Route6SaffronGate_MapEventHeader: ; 0x192807
+Route6SaffronGate_MapEventHeader:
; filler
db 0, 0
@@ -82,4 +76,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, $ffff
-; 0x19282e
--- a/maps/Route6UndergroundEntrance.asm
+++ b/maps/Route6UndergroundEntrance.asm
@@ -1,12 +1,11 @@
-Route6UndergroundEntrance_MapScriptHeader: ; 0x19282e
+Route6UndergroundEntrance_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x192830
-Route6UndergroundEntrance_MapEventHeader: ; 0x192830
+Route6UndergroundEntrance_MapEventHeader:
; filler
db 0, 0
@@ -24,4 +23,3 @@
; people-events
db 0
-; 0x192845
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -1,20 +1,17 @@
-Route7_MapScriptHeader: ; 0x1ad380
+Route7_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ad382
-MapRoute7Signpost0Script: ; 0x1ad382
+MapRoute7Signpost0Script:
jumptext UnknownText_0x1ad388
-; 0x1ad385
-MapRoute7Signpost1Script: ; 0x1ad385
+MapRoute7Signpost1Script:
jumptext UnknownText_0x1ad456
-; 0x1ad388
-UnknownText_0x1ad388: ; 0x1ad388
+UnknownText_0x1ad388:
text "What's this flyer?"
para "… Uncouth trainers"
@@ -32,14 +29,12 @@
para "CELADON POLICE"
done
-; 0x1ad456
-UnknownText_0x1ad456: ; 0x1ad456
+UnknownText_0x1ad456:
text "It's locked…"
done
-; 0x1ad463
-Route7_MapEventHeader: ; 0x1ad463
+Route7_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +53,3 @@
; people-events
db 0
-; 0x1ad47d
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -1,12 +1,11 @@
-Route7SaffronGate_MapScriptHeader: ; 0x73516
+Route7SaffronGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x73518
-OfficerScript_0x73518: ; 0x73518
+OfficerScript_0x73518:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -15,16 +14,14 @@
closetext
loadmovesprites
end
-; 0x73526
-UnknownScript_0x73526: ; 0x73526
+UnknownScript_0x73526:
writetext UnknownText_0x73592
closetext
loadmovesprites
end
-; 0x7352c
-UnknownText_0x7352c: ; 0x7352c
+UnknownText_0x7352c:
text "Did you hear about"
line "the accident at"
cont "the POWER PLANT?"
@@ -33,9 +30,8 @@
line "the East, close to"
cont "LAVENDER TOWN."
done
-; 0x73592
-UnknownText_0x73592: ; 0x73592
+UnknownText_0x73592:
text "I take my GUARD"
line "job seriously."
@@ -45,9 +41,8 @@
para "OK. You can go"
line "through."
done
-; 0x735e0
-Route7SaffronGate_MapEventHeader: ; 0x735e0
+Route7SaffronGate_MapEventHeader:
; filler
db 0, 0
@@ -67,4 +62,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, $ffff
-; 0x73607
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -1,16 +1,14 @@
-Route8SaffronGate_MapScriptHeader: ; 0x7f414
+Route8SaffronGate_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7f416
-OfficerScript_0x7f416: ; 0x7f416
+OfficerScript_0x7f416:
jumptextfaceplayer UnknownText_0x7f419
-; 0x7f419
-UnknownText_0x7f419: ; 0x7f419
+UnknownText_0x7f419:
text "Have you been to"
line "LAVENDER TOWN?"
@@ -17,9 +15,8 @@
para "There's a tall"
line "RADIO TOWER there."
done
-; 0x7f45b
-Route8SaffronGate_MapEventHeader: ; 0x7f45b
+Route8SaffronGate_MapEventHeader:
; filler
db 0, 0
@@ -39,4 +36,3 @@
; people-events
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, $ffff
-; 0x7f482
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -1,4 +1,4 @@
-RuinsofAlphAerodactylChamber_MapScriptHeader: ; 0x58da0
+RuinsofAlphAerodactylChamber_MapScriptHeader:
; trigger count
db 2
@@ -12,40 +12,34 @@
; callbacks
dbw 1, UnknownScript_0x58db9
-; 0x58dad
-UnknownScript_0x58dad: ; 0x58dad
+UnknownScript_0x58dad:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
iftrue UnknownScript_0x58db4
end
-; 0x58db4
-UnknownScript_0x58db4: ; 0x58db4
+UnknownScript_0x58db4:
priorityjump UnknownScript_0x58dd3
end
-; 0x58db8
-UnknownScript_0x58db8: ; 0x58db8
+UnknownScript_0x58db8:
end
-; 0x58db9
-UnknownScript_0x58db9: ; 0x58db9
+UnknownScript_0x58db9:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
iftrue UnknownScript_0x58dc3
changeblock $4, $0, $2e
-UnknownScript_0x58dc3: ; 0x58dc3
+UnknownScript_0x58dc3:
checkevent $02a3
iffalse UnknownScript_0x58dca
return
-; 0x58dca
-UnknownScript_0x58dca: ; 0x58dca
+UnknownScript_0x58dca:
changeblock $2, $2, $1
changeblock $4, $2, $2
return
-; 0x58dd3
-UnknownScript_0x58dd3: ; 0x58dd3
+UnknownScript_0x58dd3:
pause 30
earthquake 30
showemote $0, $0, 20
@@ -57,9 +51,8 @@
dotrigger $1
loadmovesprites
end
-; 0x58deb
-MapRuinsofAlphAerodactylChamberSignpost2Script: ; 0x58deb
+MapRuinsofAlphAerodactylChamberSignpost2Script:
refreshscreen $0
writebyte $2
special Functionc360
@@ -66,9 +59,8 @@
loadmovesprites
iftrue UnknownScript_0x58df7
end
-; 0x58df7
-UnknownScript_0x58df7: ; 0x58df7
+UnknownScript_0x58df7:
setevent $0705
setevent $02a3
setflag $002d
@@ -86,17 +78,14 @@
pause 20
warpcheck
end
-; 0x58e24
-MapRuinsofAlphAerodactylChamberSignpost1Script: ; 0x58e24
+MapRuinsofAlphAerodactylChamberSignpost1Script:
jumptext UnknownText_0x58ec2
-; 0x58e27
-MapRuinsofAlphAerodactylChamberSignpost3Script: ; 0x58e27
+MapRuinsofAlphAerodactylChamberSignpost3Script:
jumptext UnknownText_0x58ee7
-; 0x58e2a
-MapRuinsofAlphAerodactylChamberSignpost4Script: ; 0x58e2a
+MapRuinsofAlphAerodactylChamberSignpost4Script:
loadfont
writetext UnknownText_0x58e4f
writebyte $1
@@ -103,9 +92,8 @@
special Function8ae68
loadmovesprites
end
-; 0x58e35
-MapRuinsofAlphAerodactylChamberSignpost5Script: ; 0x58e35
+MapRuinsofAlphAerodactylChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
iftrue UnknownScript_0x58e46
loadfont
@@ -114,53 +102,45 @@
special Function8ae68
loadmovesprites
end
-; 0x58e46
-UnknownScript_0x58e46: ; 0x58e46
+UnknownScript_0x58e46:
loadfont
writetext UnknownText_0x58ea2
closetext
loadmovesprites
end
-; 0x58e4d
-MovementData_0x58e4d: ; 0x58e4d
+MovementData_0x58e4d:
db $59 ; movement
step_end
-; 0x58e4f
-UnknownText_0x58e4f: ; 0x58e4f
+UnknownText_0x58e4f:
text "Patterns appeared"
line "on the walls…"
done
-; 0x58e70
; possibly unused.. again?
-UnknownText_0x58e70: ; 0x58e70
+UnknownText_0x58e70:
text "It's UNOWN text!"
done
-; 0x58e81
-UnknownText_0x58e81: ; 0x58e81
+UnknownText_0x58e81:
text "Patterns appeared"
line "on the walls…"
done
-; 0x58ea2
-UnknownText_0x58ea2: ; 0x58ea2
+UnknownText_0x58ea2:
text "There's a big hole"
line "in the wall!"
done
-; 0x58ec2
-UnknownText_0x58ec2: ; 0x58ec2
+UnknownText_0x58ec2:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x58ee7
-UnknownText_0x58ee7: ; 0x58ee7
+UnknownText_0x58ee7:
text "This flying #-"
line "MON attacked its"
@@ -167,9 +147,8 @@
para "prey with saw-like"
line "fangs."
done
-; 0x58f22
-RuinsofAlphAerodactylChamber_MapEventHeader: ; 0x58f22
+RuinsofAlphAerodactylChamber_MapEventHeader:
; filler
db 0, 0
@@ -195,4 +174,3 @@
; people-events
db 0
-; 0x58f5f
--- a/maps/RuinsofAlphAerodactylItemRoom.asm
+++ b/maps/RuinsofAlphAerodactylItemRoom.asm
@@ -1,39 +1,32 @@
-RuinsofAlphAerodactylItemRoom_MapScriptHeader: ; 0x59ab4
+RuinsofAlphAerodactylItemRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59ab6
-ItemFragment_0x59ab6: ; 0x59ab6
+ItemFragment_0x59ab6:
db GOLD_BERRY, 1
-; 0x59ab8
-ItemFragment_0x59ab8: ; 0x59ab8
+ItemFragment_0x59ab8:
db MOON_STONE, 1
-; 0x59aba
-ItemFragment_0x59aba: ; 0x59aba
+ItemFragment_0x59aba:
db HEAL_POWDER, 1
-; 0x59abc
-ItemFragment_0x59abc: ; 0x59abc
+ItemFragment_0x59abc:
db ENERGY_ROOT, 1
-; 0x59abe
-MapRuinsofAlphAerodactylItemRoomSignpost1Script: ; 0x59abe
+MapRuinsofAlphAerodactylItemRoomSignpost1Script:
jumptext UnknownText_0x59ac1
-; 0x59ac1
-UnknownText_0x59ac1: ; 0x59ac1
+UnknownText_0x59ac1:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x59ae6
-RuinsofAlphAerodactylItemRoom_MapEventHeader: ; 0x59ae6
+RuinsofAlphAerodactylItemRoom_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +51,3 @@
person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab8, $07a1
person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, $07a2
person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, $07a3
-; 0x59b3e
--- a/maps/RuinsofAlphAerodactylWordRoom.asm
+++ b/maps/RuinsofAlphAerodactylWordRoom.asm
@@ -1,12 +1,11 @@
-RuinsofAlphAerodactylWordRoom_MapScriptHeader: ; 0x59b83
+RuinsofAlphAerodactylWordRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59b85
-RuinsofAlphAerodactylWordRoom_MapEventHeader: ; 0x59b85
+RuinsofAlphAerodactylWordRoom_MapEventHeader:
; filler
db 0, 0
@@ -24,4 +23,3 @@
; people-events
db 0
-; 0x59b9a
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -1,4 +1,4 @@
-RuinsofAlphHoOhChamber_MapScriptHeader: ; 0x58560
+RuinsofAlphHoOhChamber_MapScriptHeader:
; trigger count
db 2
@@ -12,41 +12,35 @@
; callbacks
dbw 1, UnknownScript_0x5857c
-; 0x5856d
-UnknownScript_0x5856d: ; 0x5856d
+UnknownScript_0x5856d:
special SpecialHoOhChamber
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue UnknownScript_0x58577
end
-; 0x58577
-UnknownScript_0x58577: ; 0x58577
+UnknownScript_0x58577:
priorityjump UnknownScript_0x58596
end
-; 0x5857b
-UnknownScript_0x5857b: ; 0x5857b
+UnknownScript_0x5857b:
end
-; 0x5857c
-UnknownScript_0x5857c: ; 0x5857c
+UnknownScript_0x5857c:
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue UnknownScript_0x58586
changeblock $4, $0, $2e
-UnknownScript_0x58586: ; 0x58586
+UnknownScript_0x58586:
checkevent $02a0
iffalse UnknownScript_0x5858d
return
-; 0x5858d
-UnknownScript_0x5858d: ; 0x5858d
+UnknownScript_0x5858d:
changeblock $2, $2, $1
changeblock $4, $2, $2
return
-; 0x58596
-UnknownScript_0x58596: ; 0x58596
+UnknownScript_0x58596:
pause 30
earthquake 30
showemote $0, $0, 20
@@ -58,9 +52,8 @@
dotrigger $1
loadmovesprites
end
-; 0x585ae
-MapRuinsofAlphHoOhChamberSignpost2Script: ; 0x585ae
+MapRuinsofAlphHoOhChamberSignpost2Script:
refreshscreen $0
writebyte $3
special Functionc360
@@ -67,9 +60,8 @@
loadmovesprites
iftrue UnknownScript_0x585ba
end
-; 0x585ba
-UnknownScript_0x585ba: ; 0x585ba
+UnknownScript_0x585ba:
setevent $0705
setevent $02a0
setflag $002e
@@ -87,17 +79,14 @@
pause 20
warpcheck
end
-; 0x585e7
-MapRuinsofAlphHoOhChamberSignpost1Script: ; 0x585e7
+MapRuinsofAlphHoOhChamberSignpost1Script:
jumptext UnknownText_0x58685
-; 0x585ea
-MapRuinsofAlphHoOhChamberSignpost3Script: ; 0x585ea
+MapRuinsofAlphHoOhChamberSignpost3Script:
jumptext UnknownText_0x586aa
-; 0x585ed
-MapRuinsofAlphHoOhChamberSignpost4Script: ; 0x585ed
+MapRuinsofAlphHoOhChamberSignpost4Script:
loadfont
writetext UnknownText_0x58612
writebyte $3
@@ -104,9 +93,8 @@
special Function8ae68
loadmovesprites
end
-; 0x585f8
-MapRuinsofAlphHoOhChamberSignpost5Script: ; 0x585f8
+MapRuinsofAlphHoOhChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue UnknownScript_0x58609
loadfont
@@ -115,53 +103,45 @@
special Function8ae68
loadmovesprites
end
-; 0x58609
-UnknownScript_0x58609: ; 0x58609
+UnknownScript_0x58609:
loadfont
writetext UnknownText_0x58665
closetext
loadmovesprites
end
-; 0x58610
-MovementData_0x58610: ; 0x58610
+MovementData_0x58610:
db $59 ; movement
step_end
-; 0x58612
-UnknownText_0x58612: ; 0x58612
+UnknownText_0x58612:
text "Patterns appeared"
line "on the walls…"
done
-; 0x58633
; possibly unused
-UnknownText_0x58633: ; 0x58633
+UnknownText_0x58633:
text "It's UNOWN text!"
done
-; 0x58644
-UnknownText_0x58644: ; 0x58644
+UnknownText_0x58644:
text "Patterns appeared"
line "on the walls…"
done
-; 0x58665
-UnknownText_0x58665: ; 0x58665
+UnknownText_0x58665:
text "There's a big hole"
line "in the wall!"
done
-; 0x58685
-UnknownText_0x58685: ; 0x58685
+UnknownText_0x58685:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x586aa
-UnknownText_0x586aa: ; 0x586aa
+UnknownText_0x586aa:
text "A #MON that"
line "flew gracefully on"
@@ -168,9 +148,8 @@
para "rainbow-colored"
line "wings."
done
-; 0x586e1
-RuinsofAlphHoOhChamber_MapEventHeader: ; 0x586e1
+RuinsofAlphHoOhChamber_MapEventHeader:
; filler
db 0, 0
@@ -196,4 +175,3 @@
; people-events
db 0
-; 0x5871e
--- a/maps/RuinsofAlphHoOhItemRoom.asm
+++ b/maps/RuinsofAlphHoOhItemRoom.asm
@@ -1,39 +1,32 @@
-RuinsofAlphHoOhItemRoom_MapScriptHeader: ; 0x59916
+RuinsofAlphHoOhItemRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59918
-ItemFragment_0x59918: ; 0x59918
+ItemFragment_0x59918:
db GOLD_BERRY, 1
-; 0x5991a
-ItemFragment_0x5991a: ; 0x5991a
+ItemFragment_0x5991a:
db MYSTERYBERRY, 1
-; 0x5991c
-ItemFragment_0x5991c: ; 0x5991c
+ItemFragment_0x5991c:
db REVIVAL_HERB, 1
-; 0x5991e
-ItemFragment_0x5991e: ; 0x5991e
+ItemFragment_0x5991e:
db CHARCOAL, 1
-; 0x59920
-MapRuinsofAlphHoOhItemRoomSignpost1Script: ; 0x59920
+MapRuinsofAlphHoOhItemRoomSignpost1Script:
jumptext UnknownText_0x59923
-; 0x59923
-UnknownText_0x59923: ; 0x59923
+UnknownText_0x59923:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x59948
-RuinsofAlphHoOhItemRoom_MapEventHeader: ; 0x59948
+RuinsofAlphHoOhItemRoom_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +51,3 @@
person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991a, $0795
person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, $0796
person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, $0797
-; 0x599a0
--- a/maps/RuinsofAlphHoOhWordRoom.asm
+++ b/maps/RuinsofAlphHoOhWordRoom.asm
@@ -1,12 +1,11 @@
-RuinsofAlphHoOhWordRoom_MapScriptHeader: ; 0x59b3e
+RuinsofAlphHoOhWordRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59b40
-RuinsofAlphHoOhWordRoom_MapEventHeader: ; 0x59b40
+RuinsofAlphHoOhWordRoom_MapEventHeader:
; filler
db 0, 0
@@ -24,4 +23,3 @@
; people-events
db 0
-; 0x59b55
--- a/maps/RuinsofAlphInnerChamber.asm
+++ b/maps/RuinsofAlphInnerChamber.asm
@@ -1,4 +1,4 @@
-RuinsofAlphInnerChamber_MapScriptHeader: ; 0x58f5f
+RuinsofAlphInnerChamber_MapScriptHeader:
; trigger count
db 2
@@ -8,21 +8,17 @@
; callback count
db 0
-; 0x58f69
-UnknownScript_0x58f69: ; 0x58f69
+UnknownScript_0x58f69:
end
-; 0x58f6a
-UnknownScript_0x58f6a: ; 0x58f6a
+UnknownScript_0x58f6a:
priorityjump UnknownScript_0x58f6e
-; 0x58f6d
-UnknownScript_0x58f6d: ; 0x58f6d
+UnknownScript_0x58f6d:
end
-; 0x58f6e
-UnknownScript_0x58f6e: ; 0x58f6e
+UnknownScript_0x58f6e:
loadfont
writetext UnknownText_0x58f89
closetext
@@ -31,38 +27,31 @@
setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
clearevent $078e
end
-; 0x58f7d
-FisherScript_0x58f7d: ; 0x58f7d
+FisherScript_0x58f7d:
jumptextfaceplayer UnknownText_0x58fac
-; 0x58f80
-TeacherScript_0x58f80: ; 0x58f80
+TeacherScript_0x58f80:
jumptextfaceplayer UnknownText_0x58fda
-; 0x58f83
-GrampsScript_0x58f83: ; 0x58f83
+GrampsScript_0x58f83:
jumptextfaceplayer UnknownText_0x59024
-; 0x58f86
-MapRuinsofAlphInnerChamberSignpost25Script: ; 0x58f86
+MapRuinsofAlphInnerChamberSignpost25Script:
jumptext UnknownText_0x59072
-; 0x58f89
-UnknownText_0x58f89: ; 0x58f89
+UnknownText_0x58f89:
text "There is a strange"
line "presence here…"
done
-; 0x58fac
-UnknownText_0x58fac: ; 0x58fac
+UnknownText_0x58fac:
text "This is a big"
line "room, but there's"
cont "nothing here."
done
-; 0x58fda
-UnknownText_0x58fda: ; 0x58fda
+UnknownText_0x58fda:
text "This place has a"
line "mystical quality"
cont "to it."
@@ -70,9 +59,8 @@
para "It feels sort of"
line "ethereal even."
done
-; 0x59024
-UnknownText_0x59024: ; 0x59024
+UnknownText_0x59024:
text "Ancient buildings"
line "are often tombs of"
cont "kings."
@@ -80,16 +68,14 @@
para "Like the pyramids,"
line "for instance."
done
-; 0x59072
-UnknownText_0x59072: ; 0x59072
+UnknownText_0x59072:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x59097
-RuinsofAlphInnerChamber_MapEventHeader: ; 0x59097
+RuinsofAlphInnerChamber_MapEventHeader:
; filler
db 0, 0
@@ -142,4 +128,3 @@
person_event SPRITE_FISHER, 11, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x58f7d, $0705
person_event SPRITE_TEACHER, 17, 18, $2, $11, 255, 255, $0, 0, TeacherScript_0x58f80, $0705
person_event SPRITE_GRAMPS, 23, 15, $7, $0, 255, 255, $b0, 0, GrampsScript_0x58f83, $0705
-; 0x59173
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -1,4 +1,4 @@
-RuinsofAlphKabutoChamber_MapScriptHeader: ; 0x5871e
+RuinsofAlphKabutoChamber_MapScriptHeader:
; trigger count
db 2
@@ -12,43 +12,36 @@
; callbacks
dbw 1, UnknownScript_0x58737
-; 0x5872b
-UnknownScript_0x5872b: ; 0x5872b
+UnknownScript_0x5872b:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x58732
end
-; 0x58732
-UnknownScript_0x58732: ; 0x58732
+UnknownScript_0x58732:
priorityjump UnknownScript_0x58751
-; 0x58735
-UnknownScript_0x58735: ; 0x58735
+UnknownScript_0x58735:
end
-; 0x58736
-UnknownScript_0x58736: ; 0x58736
+UnknownScript_0x58736:
end
-; 0x58737
-UnknownScript_0x58737: ; 0x58737
+UnknownScript_0x58737:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x58741
changeblock $4, $0, $2e
-UnknownScript_0x58741: ; 0x58741
+UnknownScript_0x58741:
checkevent $02a1
iffalse UnknownScript_0x58748
return
-; 0x58748
-UnknownScript_0x58748: ; 0x58748
+UnknownScript_0x58748:
changeblock $2, $2, $1
changeblock $4, $2, $2
return
-; 0x58751
-UnknownScript_0x58751: ; 0x58751
+UnknownScript_0x58751:
pause 30
earthquake 30
showemote $0, $0, 20
@@ -60,13 +53,11 @@
dotrigger $1
loadmovesprites
end
-; 0x58769
-ReceptionistScript_0x58769: ; 0x58769
+ReceptionistScript_0x58769:
jumptextfaceplayer UnknownText_0x58800
-; 0x5876c
-MapRuinsofAlphKabutoChamberSignpost2Script: ; 0x5876c
+MapRuinsofAlphKabutoChamberSignpost2Script:
refreshscreen $0
writebyte $0
special Functionc360
@@ -73,9 +64,8 @@
loadmovesprites
iftrue UnknownScript_0x58778
end
-; 0x58778
-UnknownScript_0x58778: ; 0x58778
+UnknownScript_0x58778:
setevent $0705
setevent $02a1
setflag $002b
@@ -94,9 +84,8 @@
pause 20
warpcheck
end
-; 0x587a8
-ScientistScript_0x587a8: ; 0x587a8
+ScientistScript_0x587a8:
faceplayer
loadfont
checkcode VAR_UNOWNCOUNT
@@ -107,37 +96,32 @@
iffalse UnknownScript_0x587c0
writetext UnknownText_0x589b8
keeptextopen
-UnknownScript_0x587c0: ; 0x587c0
+UnknownScript_0x587c0:
writetext UnknownText_0x588f5
closetext
loadmovesprites
spriteface $3, UP
end
-; 0x587c9
-UnknownScript_0x587c9: ; 0x587c9
+UnknownScript_0x587c9:
writetext UnknownText_0x5897c
closetext
loadmovesprites
end
-; 0x587cf
-UnknownScript_0x587cf: ; 0x587cf
+UnknownScript_0x587cf:
writetext UnknownText_0x594cb
closetext
loadmovesprites
end
-; 0x587d5
-MapRuinsofAlphKabutoChamberSignpost1Script: ; 0x587d5
+MapRuinsofAlphKabutoChamberSignpost1Script:
jumptext UnknownText_0x58b1a
-; 0x587d8
-MapRuinsofAlphKabutoChamberSignpost3Script: ; 0x587d8
+MapRuinsofAlphKabutoChamberSignpost3Script:
jumptext UnknownText_0x58b3f
-; 0x587db
-MapRuinsofAlphKabutoChamberSignpost4Script: ; 0x587db
+MapRuinsofAlphKabutoChamberSignpost4Script:
loadfont
writetext UnknownText_0x58aa7
writebyte $0
@@ -144,9 +128,8 @@
special Function8ae68
loadmovesprites
end
-; 0x587e6
-MapRuinsofAlphKabutoChamberSignpost5Script: ; 0x587e6
+MapRuinsofAlphKabutoChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x587f7
loadfont
@@ -155,22 +138,19 @@
special Function8ae68
loadmovesprites
end
-; 0x587f7
-UnknownScript_0x587f7: ; 0x587f7
+UnknownScript_0x587f7:
loadfont
writetext UnknownText_0x58afa
closetext
loadmovesprites
end
-; 0x587fe
-MovementData_0x587fe: ; 0x587fe
+MovementData_0x587fe:
db $59 ; movement
step_end
-; 0x58800
-UnknownText_0x58800: ; 0x58800
+UnknownText_0x58800:
text "Welcome to this"
line "chamber."
@@ -194,9 +174,8 @@
para "some newly found"
line "patterns."
done
-; 0x588f5
-UnknownText_0x588f5: ; 0x588f5
+UnknownText_0x588f5:
text "Recently, strange,"
line "cryptic patterns"
cont "have appeared."
@@ -208,9 +187,8 @@
para "You should take a"
line "look at the walls."
done
-; 0x5897c
-UnknownText_0x5897c: ; 0x5897c
+UnknownText_0x5897c:
text "Ah! Here's another"
line "huge hole!"
@@ -217,9 +195,8 @@
para "It's big enough to"
line "go through!"
done
-; 0x589b8
-UnknownText_0x589b8: ; 0x589b8
+UnknownText_0x589b8:
text "That tremor was"
line "pretty scary!"
@@ -227,10 +204,9 @@
line "concerned about"
cont "this wall here…"
done
-; 0x58a03
; possibly unused
-UnknownText_0x58a03: ; 0x58a03
+UnknownText_0x58a03:
text "The patterns on"
line "the wall appear to"
cont "be words!"
@@ -247,40 +223,34 @@
para "but it's not clear"
line "yet…"
done
-; 0x58aa7
-UnknownText_0x58aa7: ; 0x58aa7
+UnknownText_0x58aa7:
text "Patterns appeared"
line "on the walls…"
done
-; 0x58ac8
; possibly unused
-UnknownText_0x58ac8: ; 0x58ac8
+UnknownText_0x58ac8:
text "It's UNOWN text!"
done
-; 0x58ad9
-UnknownText_0x58ad9: ; 0x58ad9
+UnknownText_0x58ad9:
text "Patterns appeared"
line "on the walls…"
done
-; 0x58afa
-UnknownText_0x58afa: ; 0x58afa
+UnknownText_0x58afa:
text "There's a big hole"
line "in the wall!"
done
-; 0x58b1a
-UnknownText_0x58b1a: ; 0x58b1a
+UnknownText_0x58b1a:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x58b3f
-UnknownText_0x58b3f: ; 0x58b3f
+UnknownText_0x58b3f:
text "A #MON that hid"
line "on the sea floor."
@@ -287,9 +257,8 @@
para "Eyes on its back"
line "scanned the area."
done
-; 0x58b85
-RuinsofAlphKabutoChamber_MapEventHeader: ; 0x58b85
+RuinsofAlphKabutoChamber_MapEventHeader:
; filler
db 0, 0
@@ -317,4 +286,3 @@
db 2
person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, $074e
person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, $ffff
-; 0x58bdc
--- a/maps/RuinsofAlphKabutoItemRoom.asm
+++ b/maps/RuinsofAlphKabutoItemRoom.asm
@@ -1,39 +1,32 @@
-RuinsofAlphKabutoItemRoom_MapScriptHeader: ; 0x599a0
+RuinsofAlphKabutoItemRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x599a2
-ItemFragment_0x599a2: ; 0x599a2
+ItemFragment_0x599a2:
db BERRY, 1
-; 0x599a4
-ItemFragment_0x599a4: ; 0x599a4
+ItemFragment_0x599a4:
db PSNCUREBERRY, 1
-; 0x599a6
-ItemFragment_0x599a6: ; 0x599a6
+ItemFragment_0x599a6:
db HEAL_POWDER, 1
-; 0x599a8
-ItemFragment_0x599a8: ; 0x599a8
+ItemFragment_0x599a8:
db ENERGYPOWDER, 1
-; 0x599aa
-MapRuinsofAlphKabutoItemRoomSignpost1Script: ; 0x599aa
+MapRuinsofAlphKabutoItemRoomSignpost1Script:
jumptext UnknownText_0x599ad
-; 0x599ad
-UnknownText_0x599ad: ; 0x599ad
+UnknownText_0x599ad:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x599d2
-RuinsofAlphKabutoItemRoom_MapEventHeader: ; 0x599d2
+RuinsofAlphKabutoItemRoom_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +51,3 @@
person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a4, $0799
person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, $079a
person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, $079b
-; 0x59a2a
--- a/maps/RuinsofAlphKabutoWordRoom.asm
+++ b/maps/RuinsofAlphKabutoWordRoom.asm
@@ -1,12 +1,11 @@
-RuinsofAlphKabutoWordRoom_MapScriptHeader: ; 0x59b55
+RuinsofAlphKabutoWordRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59b57
-RuinsofAlphKabutoWordRoom_MapEventHeader: ; 0x59b57
+RuinsofAlphKabutoWordRoom_MapEventHeader:
; filler
db 0, 0
@@ -24,4 +23,3 @@
; people-events
db 0
-; 0x59b6c
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -1,4 +1,4 @@
-RuinsofAlphOmanyteChamber_MapScriptHeader: ; 0x58bdc
+RuinsofAlphOmanyteChamber_MapScriptHeader:
; trigger count
db 2
@@ -12,41 +12,35 @@
; callbacks
dbw 1, UnknownScript_0x58bf8
-; 0x58be9
-UnknownScript_0x58be9: ; 0x58be9
+UnknownScript_0x58be9:
special Function8adef
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue UnknownScript_0x58bf3
end
-; 0x58bf3
-UnknownScript_0x58bf3: ; 0x58bf3
+UnknownScript_0x58bf3:
priorityjump UnknownScript_0x58c12
end
-; 0x58bf7
-UnknownScript_0x58bf7: ; 0x58bf7
+UnknownScript_0x58bf7:
end
-; 0x58bf8
-UnknownScript_0x58bf8: ; 0x58bf8
+UnknownScript_0x58bf8:
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue UnknownScript_0x58c02
changeblock $4, $0, $2e
-UnknownScript_0x58c02: ; 0x58c02
+UnknownScript_0x58c02:
checkevent $02a2
iffalse UnknownScript_0x58c09
return
-; 0x58c09
-UnknownScript_0x58c09: ; 0x58c09
+UnknownScript_0x58c09:
changeblock $2, $2, $1
changeblock $4, $2, $2
return
-; 0x58c12
-UnknownScript_0x58c12: ; 0x58c12
+UnknownScript_0x58c12:
pause 30
earthquake 30
showemote $0, $0, 20
@@ -58,9 +52,8 @@
dotrigger $1
loadmovesprites
end
-; 0x58c2a
-MapRuinsofAlphOmanyteChamberSignpost2Script: ; 0x58c2a
+MapRuinsofAlphOmanyteChamberSignpost2Script:
refreshscreen $0
writebyte $1
special Functionc360
@@ -67,9 +60,8 @@
loadmovesprites
iftrue UnknownScript_0x58c36
end
-; 0x58c36
-UnknownScript_0x58c36: ; 0x58c36
+UnknownScript_0x58c36:
setevent $0705
setevent $02a2
setflag $002c
@@ -87,17 +79,14 @@
pause 20
warpcheck
end
-; 0x58c63
-MapRuinsofAlphOmanyteChamberSignpost1Script: ; 0x58c63
+MapRuinsofAlphOmanyteChamberSignpost1Script:
jumptext UnknownText_0x58d01
-; 0x58c66
-MapRuinsofAlphOmanyteChamberSignpost3Script: ; 0x58c66
+MapRuinsofAlphOmanyteChamberSignpost3Script:
jumptext UnknownText_0x58d26
-; 0x58c69
-MapRuinsofAlphOmanyteChamberSignpost4Script: ; 0x58c69
+MapRuinsofAlphOmanyteChamberSignpost4Script:
loadfont
writetext UnknownText_0x58c8e
writebyte $2
@@ -104,9 +93,8 @@
special Function8ae68
loadmovesprites
end
-; 0x58c74
-MapRuinsofAlphOmanyteChamberSignpost5Script: ; 0x58c74
+MapRuinsofAlphOmanyteChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue UnknownScript_0x58c85
loadfont
@@ -115,53 +103,45 @@
special Function8ae68
loadmovesprites
end
-; 0x58c85
-UnknownScript_0x58c85: ; 0x58c85
+UnknownScript_0x58c85:
loadfont
writetext UnknownText_0x58ce1
closetext
loadmovesprites
end
-; 0x58c8c
-MovementData_0x58c8c: ; 0x58c8c
+MovementData_0x58c8c:
db $59 ; movement
step_end
-; 0x58c8e
-UnknownText_0x58c8e: ; 0x58c8e
+UnknownText_0x58c8e:
text "Patterns appeared"
line "on the walls…"
done
-; 0x58caf
; possibly unused.. this again?
-UnknownText_0x58caf: ; 0x58caf
+UnknownText_0x58caf:
text "It's UNOWN text!"
done
-; 0x58cc0
-UnknownText_0x58cc0: ; 0x58cc0
+UnknownText_0x58cc0:
text "Patterns appeared"
line "on the walls…"
done
-; 0x58ce1
-UnknownText_0x58ce1: ; 0x58ce1
+UnknownText_0x58ce1:
text "There's a big hole"
line "in the wall!"
done
-; 0x58d01
-UnknownText_0x58d01: ; 0x58d01
+UnknownText_0x58d01:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x58d26
-UnknownText_0x58d26: ; 0x58d26
+UnknownText_0x58d26:
text "This #MON"
line "drifted in the"
@@ -168,9 +148,8 @@
para "sea by twisting"
line "its ten tentacles."
done
-; 0x58d63
-RuinsofAlphOmanyteChamber_MapEventHeader: ; 0x58d63
+RuinsofAlphOmanyteChamber_MapEventHeader:
; filler
db 0, 0
@@ -196,4 +175,3 @@
; people-events
db 0
-; 0x58da0
--- a/maps/RuinsofAlphOmanyteItemRoom.asm
+++ b/maps/RuinsofAlphOmanyteItemRoom.asm
@@ -1,39 +1,32 @@
-RuinsofAlphOmanyteItemRoom_MapScriptHeader: ; 0x59a2a
+RuinsofAlphOmanyteItemRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59a2c
-ItemFragment_0x59a2c: ; 0x59a2c
+ItemFragment_0x59a2c:
db MYSTERYBERRY, 1
-; 0x59a2e
-ItemFragment_0x59a2e: ; 0x59a2e
+ItemFragment_0x59a2e:
db MYSTIC_WATER, 1
-; 0x59a30
-ItemFragment_0x59a30: ; 0x59a30
+ItemFragment_0x59a30:
db STARDUST, 1
-; 0x59a32
-ItemFragment_0x59a32: ; 0x59a32
+ItemFragment_0x59a32:
db STAR_PIECE, 1
-; 0x59a34
-MapRuinsofAlphOmanyteItemRoomSignpost1Script: ; 0x59a34
+MapRuinsofAlphOmanyteItemRoomSignpost1Script:
jumptext UnknownText_0x59a37
-; 0x59a37
-UnknownText_0x59a37: ; 0x59a37
+UnknownText_0x59a37:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-; 0x59a5c
-RuinsofAlphOmanyteItemRoom_MapEventHeader: ; 0x59a5c
+RuinsofAlphOmanyteItemRoom_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +51,3 @@
person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2e, $079d
person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, $079e
person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, $079f
-; 0x59ab4
--- a/maps/RuinsofAlphOmanyteWordRoom.asm
+++ b/maps/RuinsofAlphOmanyteWordRoom.asm
@@ -1,12 +1,11 @@
-RuinsofAlphOmanyteWordRoom_MapScriptHeader: ; 0x59b6c
+RuinsofAlphOmanyteWordRoom_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59b6e
-RuinsofAlphOmanyteWordRoom_MapEventHeader: ; 0x59b6e
+RuinsofAlphOmanyteWordRoom_MapEventHeader:
; filler
db 0, 0
@@ -24,4 +23,3 @@
; people-events
db 0
-; 0x59b83
--- a/maps/RuinsofAlphResearchCenter.asm
+++ b/maps/RuinsofAlphResearchCenter.asm
@@ -1,4 +1,4 @@
-RuinsofAlphResearchCenter_MapScriptHeader: ; 0x59173
+RuinsofAlphResearchCenter_MapScriptHeader:
; trigger count
db 2
@@ -12,30 +12,25 @@
; callbacks
dbw 2, UnknownScript_0x59185
-; 0x59180
-UnknownScript_0x59180: ; 0x59180
+UnknownScript_0x59180:
end
-; 0x59181
-UnknownScript_0x59181: ; 0x59181
+UnknownScript_0x59181:
priorityjump UnknownScript_0x59192
end
-; 0x59185
-UnknownScript_0x59185: ; 0x59185
+UnknownScript_0x59185:
checktriggers
if_equal $1, UnknownScript_0x5918b
return
-; 0x5918b
-UnknownScript_0x5918b: ; 0x5918b
+UnknownScript_0x5918b:
moveperson $4, $3, $7
appear $4
return
-; 0x59192
-UnknownScript_0x59192: ; 0x59192
+UnknownScript_0x59192:
applymovement $4, MovementData_0x5926f
playsound SFX_BOOT_PC
pause 60
@@ -63,9 +58,8 @@
dotrigger $0
special RestartMapMusic
end
-; 0x591d1
-ScientistScript_0x591d1: ; 0x591d1
+ScientistScript_0x591d1:
faceplayer
loadfont
checkcode VAR_UNOWNCOUNT
@@ -74,16 +68,14 @@
closetext
loadmovesprites
end
-; 0x591df
-UnknownScript_0x591df: ; 0x591df
+UnknownScript_0x591df:
writetext UnknownText_0x5935f
closetext
loadmovesprites
end
-; 0x591e5
-ScientistScript_0x591e5: ; 0x591e5
+ScientistScript_0x591e5:
faceplayer
loadfont
checkcode VAR_UNOWNCOUNT
@@ -96,31 +88,27 @@
closetext
loadmovesprites
end
-; 0x591ff
-UnknownScript_0x591ff: ; 0x591ff
+UnknownScript_0x591ff:
writetext UnknownText_0x59478
closetext
loadmovesprites
end
-; 0x59205
-UnknownScript_0x59205: ; 0x59205
+UnknownScript_0x59205:
writetext UnknownText_0x59445
closetext
loadmovesprites
end
-; 0x5920b
-UnknownScript_0x5920b: ; 0x5920b
+UnknownScript_0x5920b:
writetext UnknownText_0x594cb
closetext
loadmovesprites
clearevent $078f
end
-; 0x59214
-ScientistScript_0x59214: ; 0x59214
+ScientistScript_0x59214:
faceplayer
loadfont
checkcode VAR_UNOWNCOUNT
@@ -131,90 +119,78 @@
closetext
loadmovesprites
end
-; 0x59228
-UnknownScript_0x59228: ; 0x59228
+UnknownScript_0x59228:
writetext UnknownText_0x595cb
closetext
loadmovesprites
end
-; 0x5922e
-UnknownScript_0x5922e: ; 0x5922e
+UnknownScript_0x5922e:
writetext UnknownText_0x59769
closetext
loadmovesprites
end
-; 0x59234
-MapRuinsofAlphResearchCenterSignpost1Script: ; 0x59234
+MapRuinsofAlphResearchCenterSignpost1Script:
loadfont
checkevent $0704
iftrue UnknownScript_0x59241
checkcode VAR_UNOWNCOUNT
if_equal 26, UnknownScript_0x59247
-UnknownScript_0x59241: ; 0x59241
+UnknownScript_0x59241:
writetext UnknownText_0x597b6
closetext
loadmovesprites
end
-; 0x59247
-UnknownScript_0x59247: ; 0x59247
+UnknownScript_0x59247:
writetext UnknownText_0x597d9
closetext
loadmovesprites
end
-; 0x5924d
-MapRuinsofAlphResearchCenterSignpost2Script: ; 0x5924d
+MapRuinsofAlphResearchCenterSignpost2Script:
loadfont
checkevent $0704
iftrue UnknownScript_0x5925a
checkcode VAR_UNOWNCOUNT
if_equal 26, UnknownScript_0x59260
-UnknownScript_0x5925a: ; 0x5925a
+UnknownScript_0x5925a:
writetext UnknownText_0x5980e
closetext
loadmovesprites
end
-; 0x59260
-UnknownScript_0x59260: ; 0x59260
+UnknownScript_0x59260:
writetext UnknownText_0x5982d
closetext
special Functionc2cd
loadmovesprites
end
-; 0x59269
-UnknownScript_0x59269: ; 0x59269
+UnknownScript_0x59269:
jumptext UnknownText_0x59848
-; 0x5926c
-MapRuinsofAlphResearchCenterSignpost0Script: ; 0x5926c
+MapRuinsofAlphResearchCenterSignpost0Script:
jumptext UnknownText_0x59886
-; 0x5926f
-MovementData_0x5926f: ; 0x5926f
+MovementData_0x5926f:
step_up
step_up
step_left
turn_head_up
step_end
-; 0x59274
-MovementData_0x59274: ; 0x59274
+MovementData_0x59274:
step_down
step_end
-; 0x59276
-MovementData_0x59276: ; 0x59276
+MovementData_0x59276:
step_up
step_end
-; 0x59278
-UnknownText_0x59278: ; 0x59278
+UnknownText_0x59278:
text "Done!"
para "I modified your"
@@ -230,15 +206,13 @@
line "the sequence that"
cont "they were caught."
done
-; 0x592fa
-UnknownText_0x592fa: ; 0x592fa
+UnknownText_0x592fa:
text "<PLAYER>'s #DEX"
line "was upgraded."
done
-; 0x59311
-UnknownText_0x59311: ; 0x59311
+UnknownText_0x59311:
text "The UNOWN you"
line "catch will all be"
cont "recorded."
@@ -246,9 +220,8 @@
para "Check to see how"
line "many kinds exist."
done
-; 0x5935f
-UnknownText_0x5935f: ; 0x5935f
+UnknownText_0x5935f:
text "You caught all the"
line "UNOWN variations?"
@@ -262,9 +235,8 @@
para "Feel free to use"
line "it anytime."
done
-; 0x593ed
-UnknownText_0x593ed: ; 0x593ed
+UnknownText_0x593ed:
text "The RUINS are"
line "about 1500 years"
cont "old."
@@ -273,16 +245,14 @@
line "why they were"
cont "built--or by whom."
done
-; 0x59445
-UnknownText_0x59445: ; 0x59445
+UnknownText_0x59445:
text "I wonder how many"
line "kinds of #MON"
cont "are in the RUINS?"
done
-; 0x59478
-UnknownText_0x59478: ; 0x59478
+UnknownText_0x59478:
text "#MON appeared"
line "in the RUINS?"
@@ -292,9 +262,8 @@
para "We'll need to"
line "investigate this."
done
-; 0x594cb
-UnknownText_0x594cb: ; 0x594cb
+UnknownText_0x594cb:
text "Our investigation,"
line "with your help, is"
@@ -307,9 +276,8 @@
para "as a habitat for"
line "#MON."
done
-; 0x5954f
-UnknownText_0x5954f: ; 0x5954f
+UnknownText_0x5954f:
text "There are odd pat-"
line "terns drawn on the"
@@ -321,9 +289,8 @@
cont "ing the mystery"
cont "of the RUINS."
done
-; 0x595cb
-UnknownText_0x595cb: ; 0x595cb
+UnknownText_0x595cb:
text "The strange #-"
line "MON you saw in the"
cont "RUINS?"
@@ -340,10 +307,9 @@
line "there are many"
cont "kinds of them…"
done
-; 0x59669
; possibly unused
-UnknownText_0x59669: ; 0x59669
+UnknownText_0x59669:
text "We think something"
line "caused the cryptic"
@@ -353,10 +319,9 @@
para "We've focused our"
line "studies on that."
done
-; 0x596d3
; possibly unused
-UnknownText_0x596d3: ; 0x596d3
+UnknownText_0x596d3:
text "According to my"
line "research…"
@@ -372,9 +337,8 @@
para "some sort of a"
line "link…"
done
-; 0x59769
-UnknownText_0x59769: ; 0x59769
+UnknownText_0x59769:
text "Why did those"
line "ancient patterns"
@@ -384,17 +348,15 @@
para "The mystery"
line "deepens…"
done
-; 0x597b6
-UnknownText_0x597b6: ; 0x597b6
+UnknownText_0x597b6:
text "RUINS OF ALPH"
para "Exploration"
line "Year 10"
done
-; 0x597d9
-UnknownText_0x597d9: ; 0x597d9
+UnknownText_0x597d9:
text "Mystery #MON"
line "Name: UNOWN"
@@ -401,22 +363,19 @@
para "A total of 26"
line "kinds found."
done
-; 0x5980e
-UnknownText_0x5980e: ; 0x5980e
+UnknownText_0x5980e:
text "This doesn't seem"
line "to work yet."
done
-; 0x5982d
-UnknownText_0x5982d: ; 0x5982d
+UnknownText_0x5982d:
text "UNOWN may be"
line "printed out."
done
-; 0x59848
; possibly unused
-UnknownText_0x59848: ; 0x59848
+UnknownText_0x59848:
text "It's a photo of"
line "the RESEARCH"
@@ -423,9 +382,8 @@
para "CENTER'S founder,"
line "PROF.SILKTREE."
done
-; 0x59886
-UnknownText_0x59886: ; 0x59886
+UnknownText_0x59886:
text "There are many"
line "academic books."
@@ -433,9 +391,8 @@
line "Mysteries of the"
cont "Ancients…"
done
-; 0x598d0
-RuinsofAlphResearchCenter_MapEventHeader: ; 0x598d0
+RuinsofAlphResearchCenter_MapEventHeader:
; filler
db 0, 0
@@ -458,4 +415,3 @@
person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, $ffff
person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, $ffff
person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, $0704
-; 0x59916
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -1,12 +1,11 @@
-SafariZoneBeta_MapScriptHeader: ; 0x74474
+SafariZoneBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x74476
-SafariZoneBeta_MapEventHeader: ; 0x74476
+SafariZoneBeta_MapEventHeader:
; filler
db 0, 0
@@ -23,4 +22,3 @@
; people-events
db 0
-; 0x74486
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -1,12 +1,11 @@
-SafariZoneFuchsiaGateBeta_MapScriptHeader: ; 0x74458
+SafariZoneFuchsiaGateBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7445a
-SafariZoneFuchsiaGateBeta_MapEventHeader: ; 0x7445a
+SafariZoneFuchsiaGateBeta_MapEventHeader:
; filler
db 0, 0
@@ -25,4 +24,3 @@
; people-events
db 0
-; 0x74474
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -1,12 +1,11 @@
-SafariZoneMainOffice_MapScriptHeader: ; 0x195da5
+SafariZoneMainOffice_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x195da7
-SafariZoneMainOffice_MapEventHeader: ; 0x195da7
+SafariZoneMainOffice_MapEventHeader:
; filler
db 0, 0
@@ -23,4 +22,3 @@
; people-events
db 0
-; 0x195db7
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -1,34 +1,29 @@
-SaffronMart_MapScriptHeader: ; 0x18a3bd
+SaffronMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18a3bf
-ClerkScript_0x18a3bf: ; 0x18a3bf
+ClerkScript_0x18a3bf:
loadfont
pokemart $0, $001e
loadmovesprites
end
-; 0x18a3c6
-CooltrainerMScript_0x18a3c6: ; 0x18a3c6
+CooltrainerMScript_0x18a3c6:
jumptextfaceplayer UnknownText_0x18a3cc
-; 0x18a3c9
-CooltrainerFScript_0x18a3c9: ; 0x18a3c9
+CooltrainerFScript_0x18a3c9:
jumptextfaceplayer UnknownText_0x18a3f3
-; 0x18a3cc
-UnknownText_0x18a3cc: ; 0x18a3cc
+UnknownText_0x18a3cc:
text "There's a big"
line "RADIO TOWER in"
cont "LAVENDER."
done
-; 0x18a3f3
-UnknownText_0x18a3f3: ; 0x18a3f3
+UnknownText_0x18a3f3:
text "I want to become"
line "stronger, but I'm"
cont "not good yet…"
@@ -36,9 +31,8 @@
para "Could you show me"
line "how sometime?"
done
-; 0x18a444
-SaffronMart_MapEventHeader: ; 0x18a444
+SaffronMart_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +52,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, $ffff
person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, $ffff
person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, $ffff
-; 0x18a47b
--- a/maps/SaffronPokeCenter1F.asm
+++ b/maps/SaffronPokeCenter1F.asm
@@ -1,26 +1,22 @@
-SaffronPokeCenter1F_MapScriptHeader: ; 0x18a47b
+SaffronPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18a47d
-NurseScript_0x18a47d: ; 0x18a47d
+NurseScript_0x18a47d:
jumpstd pokecenternurse
-; 0x18a480
-TeacherScript_0x18a480: ; 0x18a480
+TeacherScript_0x18a480:
special Function10630f
iftrue UnknownScript_0x18a489
jumptextfaceplayer UnknownText_0x18a4a3
-; 0x18a489
-UnknownScript_0x18a489: ; 0x18a489
+UnknownScript_0x18a489:
jumptextfaceplayer UnknownText_0x18a532
-; 0x18a48c
-FisherScript_0x18a48c: ; 0x18a48c
+FisherScript_0x18a48c:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -29,20 +25,17 @@
closetext
loadmovesprites
end
-; 0x18a49a
-UnknownScript_0x18a49a: ; 0x18a49a
+UnknownScript_0x18a49a:
writetext UnknownText_0x18a62e
closetext
loadmovesprites
end
-; 0x18a4a0
-YoungsterScript_0x18a4a0: ; 0x18a4a0
+YoungsterScript_0x18a4a0:
jumptextfaceplayer UnknownText_0x18a6c5
-; 0x18a4a3
-UnknownText_0x18a4a3: ; 0x18a4a3
+UnknownText_0x18a4a3:
text "What are JOHTO's"
line "#MON CENTERS"
cont "like?"
@@ -57,9 +50,8 @@
line "without worrying,"
cont "then!"
done
-; 0x18a532
-UnknownText_0x18a532: ; 0x18a532
+UnknownText_0x18a532:
text "What are JOHTO's"
line "#MON CENTERS"
cont "like?"
@@ -76,9 +68,8 @@
para "catch a MARILL and"
line "trade it to me!"
done
-; 0x18a5d3
-UnknownText_0x18a5d3: ; 0x18a5d3
+UnknownText_0x18a5d3:
text "I just happened to"
line "come through ROCK"
@@ -86,9 +77,8 @@
line "some commotion at"
cont "the POWER PLANT."
done
-; 0x18a62e
-UnknownText_0x18a62e: ; 0x18a62e
+UnknownText_0x18a62e:
text "Caves collapse"
line "easily."
@@ -103,9 +93,8 @@
line "that's common"
cont "knowledge."
done
-; 0x18a6c5
-UnknownText_0x18a6c5: ; 0x18a6c5
+UnknownText_0x18a6c5:
text "SILPH CO.'s HEAD"
line "OFFICE and the"
@@ -115,9 +104,8 @@
para "places to see in"
line "SAFFRON."
done
-; 0x18a722
-SaffronPokeCenter1F_MapEventHeader: ; 0x18a722
+SaffronPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -139,4 +127,3 @@
person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, $ffff
person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, $ffff
person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, $ffff
-; 0x18a76b
--- a/maps/SaffronPokeCenter2FBeta.asm
+++ b/maps/SaffronPokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-SaffronPokeCenter2FBeta_MapScriptHeader: ; 0x18a76b
+SaffronPokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18a76d
-SaffronPokeCenter2FBeta_MapEventHeader: ; 0x18a76d
+SaffronPokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x18a778
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -1,4 +1,4 @@
-SaffronTrainStation_MapScriptHeader: ; 0x18a817
+SaffronTrainStation_MapScriptHeader:
; trigger count
db 1
@@ -7,13 +7,11 @@
; callback count
db 0
-; 0x18a81d
-UnknownScript_0x18a81d: ; 0x18a81d
+UnknownScript_0x18a81d:
end
-; 0x18a81e
-OfficerScript_0x18a81e: ; 0x18a81e
+OfficerScript_0x18a81e:
faceplayer
loadfont
checkevent EVENT_RESTORED_POWER_TO_KANTO
@@ -22,9 +20,8 @@
closetext
loadmovesprites
end
-; 0x18a82c
-UnknownScript_0x18a82c: ; 0x18a82c
+UnknownScript_0x18a82c:
writetext UnknownText_0x18a8dd
yesorno
iffalse UnknownScript_0x18a85c
@@ -42,28 +39,24 @@
applymovement $0, MovementData_0x18a854
wait $14
end
-; 0x18a854
-MovementData_0x18a854: ; 0x18a854
+MovementData_0x18a854:
turn_head_down
step_end
-; 0x18a856
-UnknownScript_0x18a856: ; 0x18a856
+UnknownScript_0x18a856:
writetext UnknownText_0x18a956
closetext
loadmovesprites
end
-; 0x18a85c
-UnknownScript_0x18a85c: ; 0x18a85c
+UnknownScript_0x18a85c:
writetext UnknownText_0x18a978
closetext
loadmovesprites
end
-; 0x18a862
-UnknownScript_0x18a862: ; 0x18a862
+UnknownScript_0x18a862:
applymovement $2, MovementData_0x18a88f
applymovement $0, MovementData_0x18a8a1
applymovement $2, MovementData_0x18a894
@@ -72,9 +65,8 @@
closetext
loadmovesprites
end
-; 0x18a875
-GymGuyScript_0x18a875: ; 0x18a875
+GymGuyScript_0x18a875:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -83,39 +75,33 @@
closetext
loadmovesprites
end
-; 0x18a883
-UnknownScript_0x18a883: ; 0x18a883
+UnknownScript_0x18a883:
writetext UnknownText_0x18aa61
closetext
loadmovesprites
end
-; 0x18a889
-TeacherScript_0x18a889: ; 0x18a889
+TeacherScript_0x18a889:
jumptextfaceplayer UnknownText_0x18aaab
-; 0x18a88c
-LassScript_0x18a88c: ; 0x18a88c
+LassScript_0x18a88c:
jumptextfaceplayer UnknownText_0x18ab20
-; 0x18a88f
-MovementData_0x18a88f: ; 0x18a88f
+MovementData_0x18a88f:
step_up
step_up
step_right
turn_head_left
step_end
-; 0x18a894
-MovementData_0x18a894: ; 0x18a894
+MovementData_0x18a894:
step_left
step_down
step_down
step_end
-; 0x18a898
-MovementData_0x18a898: ; 0x18a898
+MovementData_0x18a898:
step_up
step_up
step_up
@@ -125,9 +111,8 @@
step_up
step_up
step_end
-; 0x18a8a1
-MovementData_0x18a8a1: ; 0x18a8a1
+MovementData_0x18a8a1:
step_left
step_left
step_down
@@ -136,16 +121,14 @@
step_down
turn_head_up
step_end
-; 0x18a8a9
-UnknownText_0x18a8a9: ; 0x18a8a9
+UnknownText_0x18a8a9:
text "I'm sorry, but the"
line "MAGNET TRAIN isn't"
cont "operating now."
done
-; 0x18a8dd
-UnknownText_0x18a8dd: ; 0x18a8dd
+UnknownText_0x18a8dd:
text "We'll soon depart"
line "for GOLDENROD."
@@ -152,9 +135,8 @@
para "Are you coming on"
line "board?"
done
-; 0x18a917
-UnknownText_0x18a917: ; 0x18a917
+UnknownText_0x18a917:
text "May I see your"
line "rail PASS, please?"
@@ -161,21 +143,18 @@
para "OK. Right this"
line "way, please."
done
-; 0x18a956
-UnknownText_0x18a956: ; 0x18a956
+UnknownText_0x18a956:
text "Sorry, but you"
line "don't have a PASS."
done
-; 0x18a978
-UnknownText_0x18a978: ; 0x18a978
+UnknownText_0x18a978:
text "We hope to see you"
line "again."
done
-; 0x18a993
-UnknownText_0x18a993: ; 0x18a993
+UnknownText_0x18a993:
text "We have arrived in"
line "SAFFRON."
@@ -182,9 +161,8 @@
para "We hope to see you"
line "again."
done
-; 0x18a9ca
-UnknownText_0x18a9ca: ; 0x18a9ca
+UnknownText_0x18a9ca:
text "The MAGNET TRAIN"
line "is a super-modern"
@@ -199,9 +177,8 @@
line "isn't any elec-"
cont "tricity…"
done
-; 0x18aa61
-UnknownText_0x18aa61: ; 0x18aa61
+UnknownText_0x18aa61:
text "Whew…"
para "How many times"
@@ -210,9 +187,8 @@
para "and forth between"
line "KANTO and JOHTO?"
done
-; 0x18aaab
-UnknownText_0x18aaab: ; 0x18aaab
+UnknownText_0x18aaab:
text "Before the MAGNET"
line "TRAIN STATION was"
@@ -223,9 +199,8 @@
line "named COPYCAT used"
cont "to live there."
done
-; 0x18ab20
-UnknownText_0x18ab20: ; 0x18ab20
+UnknownText_0x18ab20:
text "Hi. Do you have a"
line "rail PASS? I have"
@@ -235,9 +210,8 @@
para "ride the MAGNET"
line "TRAIN have PASSES."
done
-; 0x18ab8d
-SaffronTrainStation_MapEventHeader: ; 0x18ab8d
+SaffronTrainStation_MapEventHeader:
; filler
db 0, 0
@@ -261,4 +235,3 @@
person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, $ffff
person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, $0772
person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, $0772
-; 0x18abe3
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -1,16 +1,14 @@
-SilphCo1F_MapScriptHeader: ; 0x18abe3
+SilphCo1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18abe5
-ReceptionistScript_0x18abe5: ; 0x18abe5
+ReceptionistScript_0x18abe5:
jumptextfaceplayer UnknownText_0x18ac03
-; 0x18abe8
-OfficerScript_0x18abe8: ; 0x18abe8
+OfficerScript_0x18abe8:
faceplayer
loadfont
checkevent EVENT_GOT_UP_GRADE
@@ -20,22 +18,20 @@
verbosegiveitem UP_GRADE, 1
iffalse UnknownScript_0x18ac01
setevent EVENT_GOT_UP_GRADE
-UnknownScript_0x18abfd: ; 0x18abfd
+UnknownScript_0x18abfd:
writetext UnknownText_0x18aca8
closetext
-UnknownScript_0x18ac01: ; 0x18ac01
+UnknownScript_0x18ac01:
loadmovesprites
end
-; 0x18ac03
-UnknownText_0x18ac03: ; 0x18ac03
+UnknownText_0x18ac03:
text "Welcome. This is"
line "SILPH CO.'s HEAD"
cont "OFFICE BUILDING."
done
-; 0x18ac36
-UnknownText_0x18ac36: ; 0x18ac36
+UnknownText_0x18ac36:
text "Only employees are"
line "permitted to go"
cont "upstairs."
@@ -46,9 +42,8 @@
para "have this neat"
line "little souvenir."
done
-; 0x18aca8
-UnknownText_0x18aca8: ; 0x18aca8
+UnknownText_0x18aca8:
text "It's SILPH CO.'s"
line "latest product."
@@ -55,9 +50,8 @@
para "It's not for sale"
line "anywhere yet."
done
-; 0x18ace7
-SilphCo1F_MapEventHeader: ; 0x18ace7
+SilphCo1F_MapEventHeader:
; filler
db 0, 0
@@ -76,4 +70,3 @@
db 2
person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, $ffff
person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, $ffff
-; 0x18ad11
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -1,20 +1,17 @@
-SilverCaveItemRooms_MapScriptHeader: ; 0x18c65c
+SilverCaveItemRooms_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c65e
-ItemFragment_0x18c65e: ; 0x18c65e
+ItemFragment_0x18c65e:
db MAX_REVIVE, 1
-; 0x18c660
-ItemFragment_0x18c660: ; 0x18c660
+ItemFragment_0x18c660:
db FULL_RESTORE, 1
-; 0x18c662
-SilverCaveItemRooms_MapEventHeader: ; 0x18c662
+SilverCaveItemRooms_MapEventHeader:
; filler
db 0, 0
@@ -33,4 +30,3 @@
db 2
person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, $069c
person_event SPRITE_POKE_BALL, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, $069d
-; 0x18c68c
--- a/maps/SilverCavePokeCenter1F.asm
+++ b/maps/SilverCavePokeCenter1F.asm
@@ -1,20 +1,17 @@
-SilverCavePokeCenter1F_MapScriptHeader: ; 0x1ae598
+SilverCavePokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ae59a
-NurseScript_0x1ae59a: ; 0x1ae59a
+NurseScript_0x1ae59a:
jumpstd pokecenternurse
-; 0x1ae59d
-GrannyScript_0x1ae59d: ; 0x1ae59d
+GrannyScript_0x1ae59d:
jumptextfaceplayer UnknownText_0x1ae5a0
-; 0x1ae5a0
-UnknownText_0x1ae5a0: ; 0x1ae5a0
+UnknownText_0x1ae5a0:
text "Trainers who seek"
line "power climb MT."
@@ -27,9 +24,8 @@
para "feel they can go"
line "anywhere…"
done
-; 0x1ae622
-SilverCavePokeCenter1F_MapEventHeader: ; 0x1ae622
+SilverCavePokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -49,4 +45,3 @@
db 2
person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, $ffff
person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, $ffff
-; 0x1ae651
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -1,40 +1,33 @@
-SilverCaveRoom1_MapScriptHeader: ; 0x18c552
+SilverCaveRoom1_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c554
-ItemFragment_0x18c554: ; 0x18c554
+ItemFragment_0x18c554:
db MAX_ELIXER, 1
-; 0x18c556
-ItemFragment_0x18c556: ; 0x18c556
+ItemFragment_0x18c556:
db PROTEIN, 1
-; 0x18c558
-ItemFragment_0x18c558: ; 0x18c558
+ItemFragment_0x18c558:
db ESCAPE_ROPE, 1
-; 0x18c55a
-ItemFragment_0x18c55a: ; 0x18c55a
+ItemFragment_0x18c55a:
db ULTRA_BALL, 1
-; 0x18c55c
-MapSilverCaveRoom1SignpostItem0: ; 0x18c55c
+MapSilverCaveRoom1SignpostItem0:
dw $009a
db DIRE_HIT
-; 0x18c55f
-MapSilverCaveRoom1SignpostItem1: ; 0x18c55f
+MapSilverCaveRoom1SignpostItem1:
dw $009b
db ULTRA_BALL
-; 0x18c562
-SilverCaveRoom1_MapEventHeader: ; 0x18c562
+SilverCaveRoom1_MapEventHeader:
; filler
db 0, 0
@@ -57,4 +50,3 @@
person_event SPRITE_POKE_BALL, 33, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c556, $069a
person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, $069b
person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, $07c1
-; 0x18c5b0
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -1,30 +1,25 @@
-SilverCaveRoom2_MapScriptHeader: ; 0x18c5b0
+SilverCaveRoom2_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c5b2
-ItemFragment_0x18c5b2: ; 0x18c5b2
+ItemFragment_0x18c5b2:
db CALCIUM, 1
-; 0x18c5b4
-ItemFragment_0x18c5b4: ; 0x18c5b4
+ItemFragment_0x18c5b4:
db ULTRA_BALL, 1
-; 0x18c5b6
-ItemFragment_0x18c5b6: ; 0x18c5b6
+ItemFragment_0x18c5b6:
db PP_UP, 1
-; 0x18c5b8
-MapSilverCaveRoom2SignpostItem0: ; 0x18c5b8
+MapSilverCaveRoom2SignpostItem0:
dw $009c
db MAX_POTION
-; 0x18c5bb
-SilverCaveRoom2_MapEventHeader: ; 0x18c5bb
+SilverCaveRoom2_MapEventHeader:
; filler
db 0, 0
@@ -47,4 +42,3 @@
person_event SPRITE_POKE_BALL, 14, 28, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b2, $07c2
person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, $07c3
person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, $07c4
-; 0x18c601
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -1,12 +1,11 @@
-SilverCaveRoom3_MapScriptHeader: ; 0x18c601
+SilverCaveRoom3_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c603
-RedScript_0x18c603: ; 0x18c603
+RedScript_0x18c603:
special Functionc48f
faceplayer
loadfont
@@ -33,26 +32,22 @@
refreshscreen $0
credits
end
-; 0x18c637
-UnknownText_0x18c637: ; 0x18c637
+UnknownText_0x18c637:
text $56
line $56
done
-; 0x18c63c
-UnknownText_0x18c63c: ; 0x18c63c
+UnknownText_0x18c63c:
text "…"
done
-; 0x18c63f
-UnknownText_0x18c63f: ; 0x18c63f
+UnknownText_0x18c63f:
text $56
line $56
done
-; 0x18c644
-SilverCaveRoom3_MapEventHeader: ; 0x18c644
+SilverCaveRoom3_MapEventHeader:
; filler
db 0, 0
@@ -69,4 +64,3 @@
; people-events
db 1
person_event SPRITE_RED, 14, 13, $7, $0, 255, 255, $80, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER
-; 0x18c65c
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -1,12 +1,11 @@
-SlowpokeWellB2F_MapScriptHeader: ; 0x5ad09
+SlowpokeWellB2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5ad0b
-GymGuyScript_0x5ad0b: ; 0x5ad0b
+GymGuyScript_0x5ad0b:
faceplayer
loadfont
checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
@@ -16,23 +15,20 @@
verbosegiveitem KINGS_ROCK, 1
iffalse UnknownScript_0x5ad20
setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
-UnknownScript_0x5ad20: ; 0x5ad20
+UnknownScript_0x5ad20:
loadmovesprites
end
-; 0x5ad22
-UnknownScript_0x5ad22: ; 0x5ad22
+UnknownScript_0x5ad22:
writetext UnknownText_0x5adf2
closetext
loadmovesprites
end
-; 0x5ad28
-ItemFragment_0x5ad28: ; 0x5ad28
+ItemFragment_0x5ad28:
db TM_RAIN_DANCE, 1
-; 0x5ad2a
-UnknownText_0x5ad2a: ; 0x5ad2a
+UnknownText_0x5ad2a:
text "I'm waiting to see"
line "SLOWPOKE's moment"
cont "of evolution."
@@ -51,9 +47,8 @@
line "KING'S ROCK with"
cont "you."
done
-; 0x5adf2
-UnknownText_0x5adf2: ; 0x5adf2
+UnknownText_0x5adf2:
text "I'm going to be"
line "like SLOWPOKE."
@@ -61,9 +56,8 @@
line "ly, so I can see"
cont "one evolve."
done
-; 0x5ae40
-SlowpokeWellB2F_MapEventHeader: ; 0x5ae40
+SlowpokeWellB2F_MapEventHeader:
; filler
db 0, 0
@@ -81,4 +75,3 @@
db 2
person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, $ffff
person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, $0663
-; 0x5ae65
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -1,28 +1,23 @@
-SoulHouse_MapScriptHeader: ; 0x7ec45
+SoulHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7ec47
-GrampsScript_0x7ec47: ; 0x7ec47
+GrampsScript_0x7ec47:
jumptextfaceplayer UnknownText_0x7ec53
-; 0x7ec4a
-TeacherScript_0x7ec4a: ; 0x7ec4a
+TeacherScript_0x7ec4a:
jumptextfaceplayer UnknownText_0x7ed4d
-; 0x7ec4d
-LassScript_0x7ec4d: ; 0x7ec4d
+LassScript_0x7ec4d:
jumptextfaceplayer UnknownText_0x7edb1
-; 0x7ec50
-GrannyScript_0x7ec50: ; 0x7ec50
+GrannyScript_0x7ec50:
jumptextfaceplayer UnknownText_0x7eddb
-; 0x7ec53
-UnknownText_0x7ec53: ; 0x7ec53
+UnknownText_0x7ec53:
text "MR.FUJI: Welcome."
para "Hmm… You appear to"
@@ -46,9 +41,8 @@
para "I'm sure that will"
line "make them happy."
done
-; 0x7ed4d
-UnknownText_0x7ed4d: ; 0x7ed4d
+UnknownText_0x7ed4d:
text "There are other"
line "graves of #MON"
cont "here, I think."
@@ -57,16 +51,14 @@
line "chambers that only"
cont "MR.FUJI may enter."
done
-; 0x7edb1
-UnknownText_0x7edb1: ; 0x7edb1
+UnknownText_0x7edb1:
text "I came with my mom"
line "to visit #MON"
cont "graves…"
done
-; 0x7eddb
-UnknownText_0x7eddb: ; 0x7eddb
+UnknownText_0x7eddb:
text "The #MON that"
line "lived with me…"
@@ -73,9 +65,8 @@
para "I loved them like"
line "my grandchildren…"
done
-; 0x7ee1d
-SoulHouse_MapEventHeader: ; 0x7ee1d
+SoulHouse_MapEventHeader:
; filler
db 0, 0
@@ -96,4 +87,3 @@
person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, $ffff
person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, $ffff
person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, $ffff
-; 0x7ee61
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -1,4 +1,4 @@
-TimeCapsule_MapScriptHeader: ; 0x1934eb
+TimeCapsule_MapScriptHeader:
; trigger count
db 2
@@ -12,58 +12,49 @@
; callbacks
dbw 2, UnknownScript_0x1934fd
-; 0x1934f8
-UnknownScript_0x1934f8: ; 0x1934f8
+UnknownScript_0x1934f8:
priorityjump UnknownScript_0x19350d
end
-; 0x1934fc
-UnknownScript_0x1934fc: ; 0x1934fc
+UnknownScript_0x1934fc:
end
-; 0x1934fd
-UnknownScript_0x1934fd: ; 0x1934fd
+UnknownScript_0x1934fd:
special Function29f47
iffalse UnknownScript_0x193508
disappear $3
appear $2
return
-; 0x193508
-UnknownScript_0x193508: ; 0x193508
+UnknownScript_0x193508:
disappear $2
appear $3
return
-; 0x19350d
-UnknownScript_0x19350d: ; 0x19350d
+UnknownScript_0x19350d:
dotrigger $1
domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $3
end
-; 0x193514
-MapTimeCapsuleSignpost1Script: ; 0x193514
+MapTimeCapsuleSignpost1Script:
special Function29eaf
newloadmap $f8
end
-; 0x19351a
-ChrisScript_0x19351a: ; 0x19351a
+ChrisScript_0x19351a:
loadfont
writetext UnknownText_0x193521
closetext
loadmovesprites
end
-; 0x193521
-UnknownText_0x193521: ; 0x193521
+UnknownText_0x193521:
text "Your friend is"
line "ready."
done
-; 0x193538
-TimeCapsule_MapEventHeader: ; 0x193538
+TimeCapsule_MapEventHeader:
; filler
db 0, 0
@@ -84,4 +75,3 @@
db 2
person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0000
person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0001
-; 0x19356c
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -1,4 +1,4 @@
-TinTower1F_MapScriptHeader: ; 0x18501a
+TinTower1F_MapScriptHeader:
; trigger count
db 2
@@ -14,18 +14,15 @@
dbw 2, UnknownScript_0x18502f
dbw 1, UnknownScript_0x185084
-; 0x18502a
-UnknownScript_0x18502a: ; 0x18502a
+UnknownScript_0x18502a:
priorityjump UnknownScript_0x18508f
end
-; 0x18502e
-UnknownScript_0x18502e: ; 0x18502e
+UnknownScript_0x18502e:
end
-; 0x18502f
-UnknownScript_0x18502f: ; 0x18502f
+UnknownScript_0x18502f:
checkevent EVENT_GOT_RAINBOW_WING
iftrue UnknownScript_0x185047
checkevent EVENT_BEAT_ELITE_FOUR
@@ -34,15 +31,14 @@
iffalse UnknownScript_0x185050
clearevent $07c5
setevent $07b6
-UnknownScript_0x185047: ; 0x185047
+UnknownScript_0x185047:
checkevent EVENT_FOUGHT_HO_OH
iffalse UnknownScript_0x18504f
appear $5
-UnknownScript_0x18504f: ; 0x18504f
+UnknownScript_0x18504f:
return
-; 0x185050
-UnknownScript_0x185050: ; 0x185050
+UnknownScript_0x185050:
checkevent EVENT_FOUGHT_SUICUNE
iftrue UnknownScript_0x185077
appear $2
@@ -51,25 +47,22 @@
iftrue UnknownScript_0x185065
appear $3
jump UnknownScript_0x185067
-; 0x185065
-UnknownScript_0x185065: ; 0x185065
+UnknownScript_0x185065:
disappear $3
-UnknownScript_0x185067: ; 0x185067
+UnknownScript_0x185067:
writebyte ENTEI
special SpecialMonCheck
iftrue UnknownScript_0x185074
appear $4
jump UnknownScript_0x185076
-; 0x185074
-UnknownScript_0x185074: ; 0x185074
+UnknownScript_0x185074:
disappear $4
-UnknownScript_0x185076: ; 0x185076
+UnknownScript_0x185076:
return
-; 0x185077
-UnknownScript_0x185077: ; 0x185077
+UnknownScript_0x185077:
disappear $2
disappear $3
disappear $4
@@ -76,17 +69,15 @@
clearevent $07b6
setevent $07c5
return
-; 0x185084
-UnknownScript_0x185084: ; 0x185084
+UnknownScript_0x185084:
checkevent EVENT_GOT_RAINBOW_WING
iftrue UnknownScript_0x18508e
changeblock $a, $2, $9
-UnknownScript_0x18508e: ; 0x18508e
+UnknownScript_0x18508e:
return
-; 0x18508f
-UnknownScript_0x18508f: ; 0x18508f
+UnknownScript_0x18508f:
applymovement $0, MovementData_0x1851cb
pause 15
writebyte RAIKOU
@@ -101,7 +92,7 @@
disappear $3
playsound SFX_EXIT_BUILDING
waitbutton
-UnknownScript_0x1850b6: ; 0x1850b6
+UnknownScript_0x1850b6:
writebyte ENTEI
special SpecialMonCheck
iftrue UnknownScript_0x1850d7
@@ -114,7 +105,7 @@
disappear $4
playsound SFX_EXIT_BUILDING
waitbutton
-UnknownScript_0x1850d7: ; 0x1850d7
+UnknownScript_0x1850d7:
spriteface $0, UP
pause 10
applymovement $0, MovementData_0x1851e8
@@ -171,31 +162,25 @@
pause 20
playmapmusic
end
-; 0x185173
-SageScript_0x185173: ; 0x185173
+SageScript_0x185173:
jumptextfaceplayer UnknownText_0x185386
-; 0x185176
-SageScript_0x185176: ; 0x185176
+SageScript_0x185176:
jumptextfaceplayer UnknownText_0x185433
-; 0x185179
-SageScript_0x185179: ; 0x185179
+SageScript_0x185179:
jumptextfaceplayer UnknownText_0x185544
-; 0x18517c
-SageScript_0x18517c: ; 0x18517c
+SageScript_0x18517c:
checkevent EVENT_FOUGHT_HO_OH
iftrue UnknownScript_0x185185
jumptextfaceplayer UnknownText_0x1855ee
-; 0x185185
-UnknownScript_0x185185: ; 0x185185
+UnknownScript_0x185185:
jumptextfaceplayer UnknownText_0x185765
-; 0x185188
-SageScript_0x185188: ; 0x185188
+SageScript_0x185188:
faceplayer
loadfont
checkevent EVENT_FOUGHT_HO_OH
@@ -215,50 +200,43 @@
setevent EVENT_GOT_RAINBOW_WING
loadmovesprites
loadfont
-UnknownScript_0x1851b0: ; 0x1851b0
+UnknownScript_0x1851b0:
writetext UnknownText_0x18564a
closetext
loadmovesprites
end
-; 0x1851b6
-UnknownScript_0x1851b6: ; 0x1851b6
+UnknownScript_0x1851b6:
writetext UnknownText_0x185803
closetext
loadmovesprites
end
-; 0x1851bc
-SageScript_0x1851bc: ; 0x1851bc
+SageScript_0x1851bc:
checkevent EVENT_FOUGHT_HO_OH
iftrue UnknownScript_0x1851c5
jumptextfaceplayer UnknownText_0x185654
-; 0x1851c5
-UnknownScript_0x1851c5: ; 0x1851c5
+UnknownScript_0x1851c5:
jumptextfaceplayer UnknownText_0x1858d0
-; 0x1851c8
-SuperNerdScript_0x1851c8: ; 0x1851c8
+SuperNerdScript_0x1851c8:
jumptextfaceplayer UnknownText_0x1856a3
-; 0x1851cb
-MovementData_0x1851cb: ; 0x1851cb
+MovementData_0x1851cb:
slow_step_up
slow_step_up
slow_step_up
slow_step_up
step_end
-; 0x1851d0
-MovementData_0x1851d0: ; 0x1851d0
+MovementData_0x1851d0:
db $39 ; movement
fast_jump_step_down
db $38 ; movement
step_end
-; 0x1851d4
-MovementData_0x1851d4: ; 0x1851d4
+MovementData_0x1851d4:
db $39 ; movement
fast_jump_step_down
fast_jump_step_right
@@ -265,16 +243,14 @@
fast_jump_step_down
db $38 ; movement
step_end
-; 0x1851da
-MovementData_0x1851da: ; 0x1851da
+MovementData_0x1851da:
db $39 ; movement
fast_jump_step_down
db $38 ; movement
step_end
-; 0x1851de
-MovementData_0x1851de: ; 0x1851de
+MovementData_0x1851de:
db $39 ; movement
fast_jump_step_down
fast_jump_step_left
@@ -281,38 +257,33 @@
fast_jump_step_down
db $38 ; movement
step_end
-; 0x1851e4
-MovementData_0x1851e4: ; 0x1851e4
+MovementData_0x1851e4:
db $39 ; movement
fast_jump_step_down
db $38 ; movement
step_end
-; 0x1851e8
-MovementData_0x1851e8: ; 0x1851e8
+MovementData_0x1851e8:
fix_facing
big_step_down
remove_fixed_facing
step_end
-; 0x1851ec
-MovementData_0x1851ec: ; 0x1851ec
+MovementData_0x1851ec:
step_up
step_up
step_up
turn_head_left
step_end
-; 0x1851f1
-MovementData_0x1851f1: ; 0x1851f1
+MovementData_0x1851f1:
step_down
step_down
step_down
step_end
-; 0x1851f5
-MovementData_0x1851f5: ; 0x1851f5
+MovementData_0x1851f5:
step_up
step_up
step_left
@@ -319,23 +290,20 @@
step_left
turn_head_up
step_end
-; 0x1851fb
-MovementData_0x1851fb: ; 0x1851fb
+MovementData_0x1851fb:
step_up
step_up
step_end
-; 0x1851fe
-MovementData_0x1851fe: ; 0x1851fe
+MovementData_0x1851fe:
step_up
step_right
step_right
step_up
step_end
-; 0x185203
-UnknownText_0x185203: ; 0x185203
+UnknownText_0x185203:
text "EUSINE: Awesome!"
line "Too awesome, even!"
@@ -372,9 +340,8 @@
para "Later, <PLAYER>!"
done
-; 0x185386
-UnknownText_0x185386: ; 0x185386
+UnknownText_0x185386:
text "According to"
line "legend…"
@@ -393,9 +360,8 @@
para "are testing us"
line "humans?"
done
-; 0x185433
-UnknownText_0x185433: ; 0x185433
+UnknownText_0x185433:
text "When the BRASS"
line "TOWER burned down,"
@@ -426,9 +392,8 @@
para "That is what they"
line "say."
done
-; 0x185544
-UnknownText_0x185544: ; 0x185544
+UnknownText_0x185544:
text "The two TOWERS are"
line "said to have been"
@@ -444,9 +409,8 @@
para "still remains"
line "important today."
done
-; 0x1855ee
-UnknownText_0x1855ee: ; 0x1855ee
+UnknownText_0x1855ee:
text "HO-OH appears to"
line "have descended"
@@ -453,20 +417,17 @@
para "upon this, the TIN"
line "TOWER!"
done
-; 0x185629
-UnknownText_0x185629: ; 0x185629
+UnknownText_0x185629:
text "This will protect"
line "you. Take it."
done
-; 0x18564a
-UnknownText_0x18564a: ; 0x18564a
+UnknownText_0x18564a:
text "Now, go."
done
-; 0x185654
-UnknownText_0x185654: ; 0x185654
+UnknownText_0x185654:
text "I believe you are"
line "being tested."
@@ -474,9 +435,8 @@
line "from uncertainty,"
cont "and advance."
done
-; 0x1856a3
-UnknownText_0x1856a3: ; 0x1856a3
+UnknownText_0x1856a3:
text "I knew it."
para "I knew you'd get"
@@ -497,9 +457,8 @@
para "to become a famous"
line "#MANIAC!"
done
-; 0x185765
-UnknownText_0x185765: ; 0x185765
+UnknownText_0x185765:
text "The legendary"
line "#MON are said"
@@ -515,9 +474,8 @@
para "And the rain that"
line "put out the fire…"
done
-; 0x185803
-UnknownText_0x185803: ; 0x185803
+UnknownText_0x185803:
text "When the legendary"
line "#MON appeared…"
@@ -537,9 +495,8 @@
line "fled, ignoring the"
cont "frightened people."
done
-; 0x1858d0
-UnknownText_0x1858d0: ; 0x1858d0
+UnknownText_0x1858d0:
text "Of the legendary"
line "#MON, SUICUNE"
@@ -558,9 +515,8 @@
para "cooperative bond"
line "with SUICUNE."
done
-; 0x18598c
-TinTower1F_MapEventHeader: ; 0x18598c
+TinTower1F_MapEventHeader:
; filler
db 0, 0
@@ -588,4 +544,3 @@
person_event SPRITE_SAGE, 6, 8, $4, $10, 255, 255, $0, 0, SageScript_0x18517c, $07c5
person_event SPRITE_SAGE, 5, 13, $6, $0, 255, 255, $0, 0, SageScript_0x185188, $07c5
person_event SPRITE_SAGE, 6, 18, $5, $1, 255, 255, $0, 0, SageScript_0x1851bc, $07c5
-; 0x185a23
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -1,12 +1,11 @@
-TinTower2F_MapScriptHeader: ; 0x185a23
+TinTower2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x185a25
-TinTower2F_MapEventHeader: ; 0x185a25
+TinTower2F_MapEventHeader:
; filler
db 0, 0
@@ -23,4 +22,3 @@
; people-events
db 0
-; 0x185a35
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -1,16 +1,14 @@
-TinTower3F_MapScriptHeader: ; 0x185a35
+TinTower3F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x185a37
-ItemFragment_0x185a37: ; 0x185a37
+ItemFragment_0x185a37:
db FULL_HEAL, 1
-; 0x185a39
-TinTower3F_MapEventHeader: ; 0x185a39
+TinTower3F_MapEventHeader:
; filler
db 0, 0
@@ -28,4 +26,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, $064b
-; 0x185a56
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -1,30 +1,25 @@
-TinTower4F_MapScriptHeader: ; 0x185a56
+TinTower4F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x185a58
-ItemFragment_0x185a58: ; 0x185a58
+ItemFragment_0x185a58:
db ULTRA_BALL, 1
-; 0x185a5a
-ItemFragment_0x185a5a: ; 0x185a5a
+ItemFragment_0x185a5a:
db PP_UP, 1
-; 0x185a5c
-ItemFragment_0x185a5c: ; 0x185a5c
+ItemFragment_0x185a5c:
db ESCAPE_ROPE, 1
-; 0x185a5e
-MapTinTower4FSignpostItem0: ; 0x185a5e
+MapTinTower4FSignpostItem0:
dw $007d
db MAX_POTION
-; 0x185a61
-TinTower4F_MapEventHeader: ; 0x185a61
+TinTower4F_MapEventHeader:
; filler
db 0, 0
@@ -47,4 +42,3 @@
person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a58, $064c
person_event SPRITE_POKE_BALL, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, $064d
person_event SPRITE_POKE_BALL, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, $064e
-; 0x185aa7
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -1,28 +1,24 @@
-TinTower5F_MapScriptHeader: ; 0x185aa7
+TinTower5F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x185aa9
-ItemFragment_0x185aa9: ; 0x185aa9
+ItemFragment_0x185aa9:
db RARE_CANDY, 1
-; 0x185aab
-MapTinTower5FSignpostItem0: ; 0x185aab
+MapTinTower5FSignpostItem0:
dw $007e
db FULL_RESTORE
-; 0x185aae
-MapTinTower5FSignpostItem1: ; 0x185aae
+MapTinTower5FSignpostItem1:
dw $007f
db CARBOS
-; 0x185ab1
-TinTower5F_MapEventHeader: ; 0x185ab1
+TinTower5F_MapEventHeader:
; filler
db 0, 0
@@ -44,4 +40,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, $064f
-; 0x185ae2
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -1,16 +1,14 @@
-TinTower6F_MapScriptHeader: ; 0x185ae2
+TinTower6F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x185ae4
-ItemFragment_0x185ae4: ; 0x185ae4
+ItemFragment_0x185ae4:
db MAX_POTION, 1
-; 0x185ae6
-TinTower6F_MapEventHeader: ; 0x185ae6
+TinTower6F_MapEventHeader:
; filler
db 0, 0
@@ -28,4 +26,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, $07c6
-; 0x185b03
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -1,16 +1,14 @@
-TinTower7F_MapScriptHeader: ; 0x185b03
+TinTower7F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x185b05
-ItemFragment_0x185b05: ; 0x185b05
+ItemFragment_0x185b05:
db MAX_REVIVE, 1
-; 0x185b07
-TinTower7F_MapEventHeader: ; 0x185b07
+TinTower7F_MapEventHeader:
; filler
db 0, 0
@@ -31,4 +29,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, $0650
-; 0x185b33
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -1,24 +1,20 @@
-TinTower8F_MapScriptHeader: ; 0x185b33
+TinTower8F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x185b35
-ItemFragment_0x185b35: ; 0x185b35
+ItemFragment_0x185b35:
db NUGGET, 1
-; 0x185b37
-ItemFragment_0x185b37: ; 0x185b37
+ItemFragment_0x185b37:
db MAX_ELIXER, 1
-; 0x185b39
-ItemFragment_0x185b39: ; 0x185b39
+ItemFragment_0x185b39:
db FULL_RESTORE, 1
-; 0x185b3b
-TinTower8F_MapEventHeader: ; 0x185b3b
+TinTower8F_MapEventHeader:
; filler
db 0, 0
@@ -42,4 +38,3 @@
person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b35, $0651
person_event SPRITE_POKE_BALL, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, $0652
person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, $0653
-; 0x185b86
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -1,26 +1,22 @@
-TinTower9F_MapScriptHeader: ; 0x185b86
+TinTower9F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x185b88
-ItemFragment_0x185b88: ; 0x185b88
+ItemFragment_0x185b88:
db HP_UP, 1
-; 0x185b8a
-UnknownText_0x185b8a: ; 0x185b8a
+UnknownText_0x185b8a:
text "HO-OH: Shaoooh!"
done
-; 0x185b9b
-UnknownText_0x185b9b: ; 0x185b9b
+UnknownText_0x185b9b:
text "LUGIA: Gyaaan!"
done
-; 0x185bab
-TinTower9F_MapEventHeader: ; 0x185bab
+TinTower9F_MapEventHeader:
; filler
db 0, 0
@@ -43,4 +39,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, $07c7
-; 0x185be1
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -1,4 +1,4 @@
-TinTowerRoof_MapScriptHeader: ; 0x7722b
+TinTowerRoof_MapScriptHeader:
; trigger count
db 0
@@ -8,27 +8,23 @@
; callbacks
dbw 2, UnknownScript_0x77230
-; 0x77230
-UnknownScript_0x77230: ; 0x77230
+UnknownScript_0x77230:
checkevent EVENT_FOUGHT_HO_OH
iftrue UnknownScript_0x77241
checkitem RAINBOW_WING
iftrue UnknownScript_0x7723e
jump UnknownScript_0x77241
-; 0x7723e
-UnknownScript_0x7723e: ; 0x7723e
+UnknownScript_0x7723e:
appear $2
return
-; 0x77241
-UnknownScript_0x77241: ; 0x77241
+UnknownScript_0x77241:
disappear $2
return
-; 0x77244
-HoOhScript_0x77244: ; 0x77244
+HoOhScript_0x77244:
faceplayer
loadfont
writetext UnknownText_0x77260
@@ -43,14 +39,12 @@
returnafterbattle
setevent EVENT_SET_WHEN_FOUGHT_HO_OH
end
-; 0x77260
-UnknownText_0x77260: ; 0x77260
+UnknownText_0x77260:
text "Shaoooh!"
done
-; 0x7726a
-TinTowerRoof_MapEventHeader: ; 0x7726a
+TinTowerRoof_MapEventHeader:
; filler
db 0, 0
@@ -67,4 +61,3 @@
; people-events
db 1
person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, $073c
-; 0x77282
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -1,16 +1,14 @@
-TohjoFalls_MapScriptHeader: ; 0x18db00
+TohjoFalls_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18db02
-ItemFragment_0x18db02: ; 0x18db02
+ItemFragment_0x18db02:
db MOON_STONE, 1
-; 0x18db04
-TohjoFalls_MapEventHeader: ; 0x18db04
+TohjoFalls_MapEventHeader:
; filler
db 0, 0
@@ -28,4 +26,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, $06a9
-; 0x18db21
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -1,4 +1,4 @@
-TradeCenter_MapScriptHeader: ; 0x1933dc
+TradeCenter_MapScriptHeader:
; trigger count
db 2
@@ -12,58 +12,49 @@
; callbacks
dbw 2, UnknownScript_0x1933ee
-; 0x1933e9
-UnknownScript_0x1933e9: ; 0x1933e9
+UnknownScript_0x1933e9:
priorityjump UnknownScript_0x1933fe
end
-; 0x1933ed
-UnknownScript_0x1933ed: ; 0x1933ed
+UnknownScript_0x1933ed:
end
-; 0x1933ee
-UnknownScript_0x1933ee: ; 0x1933ee
+UnknownScript_0x1933ee:
special Function29f47
iffalse UnknownScript_0x1933f9
disappear $3
appear $2
return
-; 0x1933f9
-UnknownScript_0x1933f9: ; 0x1933f9
+UnknownScript_0x1933f9:
disappear $2
appear $3
return
-; 0x1933fe
-UnknownScript_0x1933fe: ; 0x1933fe
+UnknownScript_0x1933fe:
dotrigger $1
domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $1
end
-; 0x193405
-MapTradeCenterSignpost1Script: ; 0x193405
+MapTradeCenterSignpost1Script:
special Function29ec4
newloadmap $f8
end
-; 0x19340b
-UnknownScript_0x19340b: ; 0x19340b
+UnknownScript_0x19340b:
loadfont
writetext UnknownText_0x193412
closetext
loadmovesprites
end
-; 0x193412
-UnknownText_0x193412: ; 0x193412
+UnknownText_0x193412:
text "Your friend is"
line "ready."
done
-; 0x193429
-TradeCenter_MapEventHeader: ; 0x193429
+TradeCenter_MapEventHeader:
; filler
db 0, 0
@@ -84,4 +75,3 @@
db 2
person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000
person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001
-; 0x19345d
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -1,44 +1,35 @@
-TrainerHouse1F_MapScriptHeader: ; 0x9af65
+TrainerHouse1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9af67
-ReceptionistScript_0x9af67: ; 0x9af67
+ReceptionistScript_0x9af67:
jumptextfaceplayer UnknownText_0x9af7f
-; 0x9af6a
-CooltrainerMScript_0x9af6a: ; 0x9af6a
+CooltrainerMScript_0x9af6a:
jumptextfaceplayer UnknownText_0x9b025
-; 0x9af6d
-CooltrainerFScript_0x9af6d: ; 0x9af6d
+CooltrainerFScript_0x9af6d:
jumptextfaceplayer UnknownText_0x9b0b5
-; 0x9af70
-YoungsterScript_0x9af70: ; 0x9af70
+YoungsterScript_0x9af70:
jumptextfaceplayer UnknownText_0x9b11d
-; 0x9af73
-GentlemanScript_0x9af73: ; 0x9af73
+GentlemanScript_0x9af73:
jumptextfaceplayer UnknownText_0x9b1c9
-; 0x9af76
-MapTrainerHouse1FSignpost0Script: ; 0x9af76
+MapTrainerHouse1FSignpost0Script:
jumptext UnknownText_0x9b1f4
-; 0x9af79
-MapTrainerHouse1FSignpost1Script: ; 0x9af79
+MapTrainerHouse1FSignpost1Script:
jumptext UnknownText_0x9b25d
-; 0x9af7c
-MapTrainerHouse1FSignpost2Script: ; 0x9af7c
+MapTrainerHouse1FSignpost2Script:
jumptext UnknownText_0x9b2c1
-; 0x9af7f
-UnknownText_0x9af7f: ; 0x9af7f
+UnknownText_0x9af7f:
text "Welcome to TRAINER"
line "HOUSE, the newest"
@@ -54,9 +45,8 @@
para "of the best right"
line "downstairs."
done
-; 0x9b025
-UnknownText_0x9b025: ; 0x9b025
+UnknownText_0x9b025:
text "VIRIDIAN is the"
line "town closest to"
cont "INDIGO PLATEAU."
@@ -70,9 +60,8 @@
para "way up to INDIGO"
line "PLATEAU."
done
-; 0x9b0b5
-UnknownText_0x9b0b5: ; 0x9b0b5
+UnknownText_0x9b0b5:
text "They hold practice"
line "battles downstairs"
cont "here."
@@ -83,9 +72,8 @@
para "trainer from JOHTO"
line "battles."
done
-; 0x9b11d
-UnknownText_0x9b11d: ; 0x9b11d
+UnknownText_0x9b11d:
text "I guess you can't"
line "become the CHAMP"
@@ -101,16 +89,14 @@
para "all the cities and"
line "towns in KANTO."
done
-; 0x9b1c9
-UnknownText_0x9b1c9: ; 0x9b1c9
+UnknownText_0x9b1c9:
text "Whew… I'm taking a"
line "rest from #MON"
cont "battles."
done
-; 0x9b1f4
-UnknownText_0x9b1f4: ; 0x9b1f4
+UnknownText_0x9b1f4:
text "Practice battles"
line "are held in the"
@@ -121,9 +107,8 @@
line "are invited to"
cont "participate."
done
-; 0x9b25d
-UnknownText_0x9b25d: ; 0x9b25d
+UnknownText_0x9b25d:
text "There are no rules"
line "or regulations for"
@@ -133,9 +118,8 @@
para "battles, anything"
line "goes!"
done
-; 0x9b2c1
-UnknownText_0x9b2c1: ; 0x9b2c1
+UnknownText_0x9b2c1:
text "…What's this?"
line "A strategy memo?"
@@ -145,9 +129,8 @@
para "It's completely"
line "illegible…"
done
-; 0x9b31f
-TrainerHouse1F_MapEventHeader: ; 0x9b31f
+TrainerHouse1F_MapEventHeader:
; filler
db 0, 0
@@ -173,4 +156,3 @@
person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, $ffff
person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, $ffff
person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, $ffff
-; 0x9b384
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -1,4 +1,4 @@
-TrainerHouseB1F_MapScriptHeader: ; 0x9b384
+TrainerHouseB1F_MapScriptHeader:
; trigger count
db 1
@@ -7,13 +7,11 @@
; callback count
db 0
-; 0x9b38a
-UnknownScript_0x9b38a: ; 0x9b38a
+UnknownScript_0x9b38a:
end
-; 0x9b38b
-UnknownScript_0x9b38b: ; 0x9b38b
+UnknownScript_0x9b38b:
spriteface $0, UP
loadfont
checkflag $0057
@@ -24,11 +22,10 @@
iffalse UnknownScript_0x9b3a6
trainertotext CAL, CAL2, $0
jump UnknownScript_0x9b3aa
-; 0x9b3a6
-UnknownScript_0x9b3a6: ; 0x9b3a6
+UnknownScript_0x9b3a6:
trainertotext CAL, CAL3, $0
-UnknownScript_0x9b3aa: ; 0x9b3aa
+UnknownScript_0x9b3aa:
writetext UnknownText_0x9b46a
keeptextopen
writetext UnknownText_0x9b487
@@ -51,34 +48,31 @@
startbattle
returnafterbattle
iffalse UnknownScript_0x9b3e8
-UnknownScript_0x9b3dc: ; 0x9b3dc
+UnknownScript_0x9b3dc:
winlosstext UnknownText_0x9b578, $0000
setlasttalked $3
loadtrainer CAL, CAL3
startbattle
returnafterbattle
-UnknownScript_0x9b3e8: ; 0x9b3e8
+UnknownScript_0x9b3e8:
applymovement $0, MovementData_0x9b40f
end
-; 0x9b3ed
-UnknownScript_0x9b3ed: ; 0x9b3ed
+UnknownScript_0x9b3ed:
writetext UnknownText_0x9b4d6
closetext
loadmovesprites
applymovement $0, MovementData_0x9b41d
end
-; 0x9b3f7
-UnknownScript_0x9b3f7: ; 0x9b3f7
+UnknownScript_0x9b3f7:
writetext UnknownText_0x9b51d
closetext
loadmovesprites
applymovement $0, MovementData_0x9b41d
end
-; 0x9b401
-MovementData_0x9b401: ; 0x9b401
+MovementData_0x9b401:
step_left
step_left
step_left
@@ -93,9 +87,8 @@
step_left
turn_head_right
step_end
-; 0x9b40f
-MovementData_0x9b40f: ; 0x9b40f
+MovementData_0x9b40f:
step_up
step_up
step_up
@@ -110,15 +103,13 @@
step_right
step_right
step_end
-; 0x9b41d
-MovementData_0x9b41d: ; 0x9b41d
+MovementData_0x9b41d:
step_right
turn_head_left
step_end
-; 0x9b420
-UnknownText_0x9b420: ; 0x9b420
+UnknownText_0x9b420:
text "Hi. Welcome to our"
line "TRAINING HALL."
@@ -126,22 +117,19 @@
line "trainer once per"
cont "day."
done
-; 0x9b46a
-UnknownText_0x9b46a: ; 0x9b46a
+UnknownText_0x9b46a:
text_from_ram StringBuffer3
text " is your"
line "opponent today."
done
-; 0x9b487
-UnknownText_0x9b487: ; 0x9b487
+UnknownText_0x9b487:
text "Would you like to"
line "battle?"
done
-; 0x9b4a2
-UnknownText_0x9b4a2: ; 0x9b4a2
+UnknownText_0x9b4a2:
text "Please go right"
line "through."
@@ -148,9 +136,8 @@
para "You may begin"
line "right away."
done
-; 0x9b4d6
-UnknownText_0x9b4d6: ; 0x9b4d6
+UnknownText_0x9b4d6:
text "Sorry. Only those"
line "trainers who will"
@@ -157,9 +144,8 @@
para "be battling are"
line "allowed to go in."
done
-; 0x9b51d
-UnknownText_0x9b51d: ; 0x9b51d
+UnknownText_0x9b51d:
text "I'm sorry."
line "This would be your"
@@ -169,22 +155,19 @@
para "to enter just once"
line "a day."
done
-; 0x9b578
-UnknownText_0x9b578: ; 0x9b578
+UnknownText_0x9b578:
text "I lost…"
line "Darn…"
done
-; 0x9b587
-UnknownText_0x9b587: ; 0x9b587
+UnknownText_0x9b587:
text "I traveled out"
line "here just so I"
cont "could battle you."
done
-; 0x9b5b8
-TrainerHouseB1F_MapEventHeader: ; 0x9b5b8
+TrainerHouseB1F_MapEventHeader:
; filler
db 0, 0
@@ -203,4 +186,3 @@
db 2
person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, $ffff
person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, $ffff
-; 0x9b5e5
--- a/maps/Underground.asm
+++ b/maps/Underground.asm
@@ -1,24 +1,21 @@
-Underground_MapScriptHeader: ; 0x74391
+Underground_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x74393
-MapUndergroundSignpostItem0: ; 0x74393
+MapUndergroundSignpostItem0:
dw $00e5
db FULL_RESTORE
-; 0x74396
-MapUndergroundSignpostItem1: ; 0x74396
+MapUndergroundSignpostItem1:
dw $00e6
db X_SPECIAL
-; 0x74399
-Underground_MapEventHeader: ; 0x74399
+Underground_MapEventHeader:
; filler
db 0, 0
@@ -37,4 +34,3 @@
; people-events
db 0
-; 0x743b3
--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
@@ -1,16 +1,14 @@
-VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: ; 0x19202f
+VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x192031
-GentlemanScript_0x192031: ; 0x192031
+GentlemanScript_0x192031:
jumptextfaceplayer UnknownText_0x192034
-; 0x192034
-UnknownText_0x192034: ; 0x192034
+UnknownText_0x192034:
text "Over many years,"
line "DIGLETT dug a"
cont "large tunnel."
@@ -18,9 +16,8 @@
para "That tunnel goes"
line "to a distant town."
done
-; 0x192086
-VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; 0x192086
+VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -38,4 +35,3 @@
; people-events
db 1
person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, $ffff
-; 0x1920a3
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -1,23 +1,20 @@
-VermilionMagnetTrainSpeechHouse_MapScriptHeader: ; 0x191eb5
+VermilionMagnetTrainSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x191eb7
-PokefanFScript_0x191eb7: ; 0x191eb7
+PokefanFScript_0x191eb7:
jumptextfaceplayer UnknownText_0x191ec0
-; 0x191eba
-YoungsterScript_0x191eba: ; 0x191eba
+YoungsterScript_0x191eba:
jumptextfaceplayer UnknownText_0x191f16
-; 0x191ebd
VermilionMagnetTrainSpeechHouseBookshelf:
jumpstd picturebookshelf
-UnknownText_0x191ec0: ; 0x191ec0
+UnknownText_0x191ec0:
text "Do you know about"
line "the MAGNET TRAIN?"
@@ -25,16 +22,14 @@
line "that goes to GOL-"
cont "DENROD in JOHTO."
done
-; 0x191f16
-UnknownText_0x191f16: ; 0x191f16
+UnknownText_0x191f16:
text "I want to go to"
line "SAFFRON to see"
cont "the MAGNET TRAIN."
done
-; 0x191f48
-VermilionMagnetTrainSpeechHouse_MapEventHeader: ; 0x191f48
+VermilionMagnetTrainSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -55,4 +50,3 @@
db 2
person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, $ffff
person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, $ffff
-; 0x191f7c
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -1,27 +1,23 @@
-VermilionMart_MapScriptHeader: ; 0x191f7c
+VermilionMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x191f7e
-ClerkScript_0x191f7e: ; 0x191f7e
+ClerkScript_0x191f7e:
loadfont
pokemart $0, $0016
loadmovesprites
end
-; 0x191f85
-SuperNerdScript_0x191f85: ; 0x191f85
+SuperNerdScript_0x191f85:
jumptextfaceplayer UnknownText_0x191f8b
-; 0x191f88
-BuenaScript_0x191f88: ; 0x191f88
+BuenaScript_0x191f88:
jumptextfaceplayer UnknownText_0x191fca
-; 0x191f8b
-UnknownText_0x191f8b: ; 0x191f8b
+UnknownText_0x191f8b:
text "TEAM ROCKET is no"
line "longer in KANTO."
@@ -28,16 +24,14 @@
para "That alone makes"
line "me happy."
done
-; 0x191fca
-UnknownText_0x191fca: ; 0x191fca
+UnknownText_0x191fca:
text "I'm thinking about"
line "going shopping in"
cont "SAFFRON."
done
-; 0x191ff8
-VermilionMart_MapEventHeader: ; 0x191ff8
+VermilionMart_MapEventHeader:
; filler
db 0, 0
@@ -57,4 +51,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, $ffff
person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, $ffff
person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, $ffff
-; 0x19202f
--- a/maps/VermilionPokeCenter1F.asm
+++ b/maps/VermilionPokeCenter1F.asm
@@ -1,16 +1,14 @@
-VermilionPokeCenter1F_MapScriptHeader: ; 0x191601
+VermilionPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x191603
-NurseScript_0x191603: ; 0x191603
+NurseScript_0x191603:
jumpstd pokecenternurse
-; 0x191606
-FishingGuruScript_0x191606: ; 0x191606
+FishingGuruScript_0x191606:
faceplayer
loadfont
checkevent EVENT_FOUGHT_SNORLAX
@@ -19,24 +17,20 @@
closetext
loadmovesprites
end
-; 0x191614
-UnknownScript_0x191614: ; 0x191614
+UnknownScript_0x191614:
writetext UnknownText_0x191698
closetext
loadmovesprites
end
-; 0x19161a
-SailorScript_0x19161a: ; 0x19161a
+SailorScript_0x19161a:
jumptextfaceplayer UnknownText_0x1916fe
-; 0x19161d
-BugCatcherScript_0x19161d: ; 0x19161d
+BugCatcherScript_0x19161d:
jumptextfaceplayer UnknownText_0x19173b
-; 0x191620
-UnknownText_0x191620: ; 0x191620
+UnknownText_0x191620:
text "A sleeping #MON"
line "is lying in front"
cont "of DIGLETT'S CAVE."
@@ -47,9 +41,8 @@
para "it, but how do you"
line "wake it up?"
done
-; 0x191698
-UnknownText_0x191698: ; 0x191698
+UnknownText_0x191698:
text "There used to be a"
line "sleeping #MON"
@@ -59,9 +52,8 @@
para "But it seems to"
line "have disappeared."
done
-; 0x1916fe
-UnknownText_0x1916fe: ; 0x1916fe
+UnknownText_0x1916fe:
text "The FAST SHIP is a"
line "great place to"
@@ -68,9 +60,8 @@
para "meet and battle"
line "trainers."
done
-; 0x19173b
-UnknownText_0x19173b: ; 0x19173b
+UnknownText_0x19173b:
text "Oh? You have some"
line "BADGES I've never"
cont "seen before."
@@ -78,9 +69,8 @@
para "Oh, I get it. You"
line "got them in JOHTO."
done
-; 0x191791
-VermilionPokeCenter1F_MapEventHeader: ; 0x191791
+VermilionPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -102,4 +92,3 @@
person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, $ffff
person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, $ffff
person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, $ffff
-; 0x1917da
--- a/maps/VermilionPokeCenter2FBeta.asm
+++ b/maps/VermilionPokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-VermilionPokeCenter2FBeta_MapScriptHeader: ; 0x1917da
+VermilionPokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1917dc
-VermilionPokeCenter2FBeta_MapEventHeader: ; 0x1917dc
+VermilionPokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x1917e7
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -1,24 +1,21 @@
-VermilionPortPassage_MapScriptHeader: ; 0x77018
+VermilionPortPassage_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7701a
-TeacherScript_0x7701a: ; 0x7701a
+TeacherScript_0x7701a:
jumptextfaceplayer UnknownText_0x7701d
-; 0x7701d
-UnknownText_0x7701d: ; 0x7701d
+UnknownText_0x7701d:
text "The FAST SHIP"
line "sails on Wednes-"
cont "days and Sundays"
cont "every week."
done
-; 0x7705a
-VermilionPortPassage_MapEventHeader: ; 0x7705a
+VermilionPortPassage_MapEventHeader:
; filler
db 0, 0
@@ -39,4 +36,3 @@
; people-events
db 1
person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, $ffff
-; 0x77086
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -1,4 +1,4 @@
-VictoryRoad_MapScriptHeader: ; 0x74486
+VictoryRoad_MapScriptHeader:
; trigger count
db 2
@@ -8,17 +8,14 @@
; callback count
db 0
-; 0x74490
-UnknownScript_0x74490: ; 0x74490
+UnknownScript_0x74490:
end
-; 0x74491
-UnknownScript_0x74491: ; 0x74491
+UnknownScript_0x74491:
end
-; 0x74492
-UnknownScript_0x74492: ; 0x74492
+UnknownScript_0x74492:
moveperson $2, $12, $b
spriteface $0, DOWN
showemote $0, $0, 15
@@ -32,9 +29,8 @@
dotrigger $1
playmapmusic
end
-; 0x744b5
-UnknownScript_0x744b5: ; 0x744b5
+UnknownScript_0x744b5:
spriteface $0, DOWN
showemote $0, $0, 15
special Functionc48f
@@ -47,9 +43,8 @@
dotrigger $1
playmapmusic
end
-; 0x744d4
-UnknownScript_0x744d4: ; 0x744d4
+UnknownScript_0x744d4:
spriteface $0, DOWN
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
@@ -68,9 +63,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x7451f
-; 0x744ff
-UnknownScript_0x744ff: ; 0x744ff
+UnknownScript_0x744ff:
winlosstext UnknownText_0x7463d, UnknownText_0x747aa
setlasttalked $2
loadtrainer RIVAL1, RIVAL1_13
@@ -78,9 +72,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x7451f
-; 0x7450f
-UnknownScript_0x7450f: ; 0x7450f
+UnknownScript_0x7450f:
winlosstext UnknownText_0x7463d, UnknownText_0x747aa
setlasttalked $2
loadtrainer RIVAL1, RIVAL1_14
@@ -88,9 +81,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x7451f
-; 0x7451f
-UnknownScript_0x7451f: ; 0x7451f
+UnknownScript_0x7451f:
playmusic MUSIC_RIVAL_AFTER
loadfont
writetext UnknownText_0x746ce
@@ -97,41 +89,33 @@
closetext
loadmovesprites
end
-; 0x74529
-ItemFragment_0x74529: ; 0x74529
+ItemFragment_0x74529:
db TM_EARTHQUAKE, 1
-; 0x7452b
-ItemFragment_0x7452b: ; 0x7452b
+ItemFragment_0x7452b:
db MAX_REVIVE, 1
-; 0x7452d
-ItemFragment_0x7452d: ; 0x7452d
+ItemFragment_0x7452d:
db FULL_RESTORE, 1
-; 0x7452f
-ItemFragment_0x7452f: ; 0x7452f
+ItemFragment_0x7452f:
db FULL_HEAL, 1
-; 0x74531
-ItemFragment_0x74531: ; 0x74531
+ItemFragment_0x74531:
db HP_UP, 1
-; 0x74533
-MapVictoryRoadSignpostItem0: ; 0x74533
+MapVictoryRoadSignpostItem0:
dw $009e
db MAX_POTION
-; 0x74536
-MapVictoryRoadSignpostItem1: ; 0x74536
+MapVictoryRoadSignpostItem1:
dw $009f
db FULL_HEAL
-; 0x74539
-MovementData_0x74539: ; 0x74539
+MovementData_0x74539:
step_left
step_left
step_left
@@ -141,9 +125,8 @@
step_up
step_up
step_end
-; 0x74542
-MovementData_0x74542: ; 0x74542
+MovementData_0x74542:
step_up
step_up
step_left
@@ -154,9 +137,8 @@
step_up
step_up
step_end
-; 0x7454c
-MovementData_0x7454c: ; 0x7454c
+MovementData_0x7454c:
step_down
step_down
step_right
@@ -166,9 +148,8 @@
step_right
step_right
step_end
-; 0x74555
-MovementData_0x74555: ; 0x74555
+MovementData_0x74555:
step_down
step_down
step_right
@@ -179,9 +160,8 @@
step_down
step_down
step_end
-; 0x7455f
-UnknownText_0x7455f: ; 0x7455f
+UnknownText_0x7455f:
text "Hold it."
para "…Are you going to"
@@ -206,9 +186,8 @@
para "<PLAYER>!"
line "I challenge you!"
done
-; 0x7463d
-UnknownText_0x7463d: ; 0x7463d
+UnknownText_0x7463d:
text "…I couldn't win…"
para "I gave it every-"
@@ -223,9 +202,8 @@
para "that dragon master"
line "said to me…"
done
-; 0x746ce
-UnknownText_0x746ce: ; 0x746ce
+UnknownText_0x746ce:
text "…I haven't given up"
line "on becoming the"
cont "greatest trainer…"
@@ -246,9 +224,8 @@
para "…Humph! You keep"
line "at it until then."
done
-; 0x747aa
-UnknownText_0x747aa: ; 0x747aa
+UnknownText_0x747aa:
text "…Humph!"
para "When it comes down"
@@ -258,9 +235,8 @@
para "I don't need any-"
line "thing else."
done
-; 0x74802
-VictoryRoad_MapEventHeader: ; 0x74802
+VictoryRoad_MapEventHeader:
; filler
db 0, 0
@@ -295,4 +271,3 @@
person_event SPRITE_POKE_BALL, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, $06a5
person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, $06a6
person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, $06a7
-; 0x748a2
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -1,4 +1,4 @@
-VictoryRoadGate_MapScriptHeader: ; 0x9b9f1
+VictoryRoadGate_MapScriptHeader:
; trigger count
db 2
@@ -8,24 +8,20 @@
; callback count
db 0
-; 0x9b9fb
-UnknownScript_0x9b9fb: ; 0x9b9fb
+UnknownScript_0x9b9fb:
end
-; 0x9b9fc
-UnknownScript_0x9b9fc: ; 0x9b9fc
+UnknownScript_0x9b9fc:
end
-; 0x9b9fd
-UnknownScript_0x9b9fd: ; 0x9b9fd
+UnknownScript_0x9b9fd:
spriteface $0, LEFT
jump UnknownScript_0x9ba04
-; 0x9ba03
-OfficerScript_0x9ba03: ; 0x9ba03
+OfficerScript_0x9ba03:
faceplayer
-UnknownScript_0x9ba04: ; 0x9ba04
+UnknownScript_0x9ba04:
loadfont
writetext UnknownText_0x9ba29
keeptextopen
@@ -36,37 +32,31 @@
loadmovesprites
applymovement $0, MovementData_0x9ba27
end
-; 0x9ba19
-UnknownScript_0x9ba19: ; 0x9ba19
+UnknownScript_0x9ba19:
writetext UnknownText_0x9bab4
closetext
loadmovesprites
dotrigger $1
end
-; 0x9ba21
-BlackBeltScript_0x9ba21: ; 0x9ba21
+BlackBeltScript_0x9ba21:
jumptextfaceplayer UnknownText_0x9baf1
-; 0x9ba24
-BlackBeltScript_0x9ba24: ; 0x9ba24
+BlackBeltScript_0x9ba24:
jumptextfaceplayer UnknownText_0x9bb37
-; 0x9ba27
-MovementData_0x9ba27: ; 0x9ba27
+MovementData_0x9ba27:
step_down
step_end
-; 0x9ba29
-UnknownText_0x9ba29: ; 0x9ba29
+UnknownText_0x9ba29:
text "Only trainers who"
line "have proven them-"
cont "selves may pass."
done
-; 0x9ba5f
-UnknownText_0x9ba5f: ; 0x9ba5f
+UnknownText_0x9ba5f:
text "You don't have all"
line "the GYM BADGES of"
cont "JOHTO."
@@ -75,9 +65,8 @@
line "can't let you go"
cont "through."
done
-; 0x9bab4
-UnknownText_0x9bab4: ; 0x9bab4
+UnknownText_0x9bab4:
text "Oh! The eight"
line "BADGES of JOHTO!"
@@ -84,9 +73,8 @@
para "Please, go right"
line "on through!"
done
-; 0x9baf1
-UnknownText_0x9baf1: ; 0x9baf1
+UnknownText_0x9baf1:
text "This way leads to"
line "MT.SILVER."
@@ -94,9 +82,8 @@
line "strong #MON out"
cont "there."
done
-; 0x9bb37
-UnknownText_0x9bb37: ; 0x9bb37
+UnknownText_0x9bb37:
text "Off to the #MON"
line "LEAGUE, are you?"
@@ -106,9 +93,8 @@
para "scary, and they're"
line "ready for you!"
done
-; 0x9bb9b
-VictoryRoadGate_MapEventHeader: ; 0x9bb9b
+VictoryRoadGate_MapEventHeader:
; filler
db 0, 0
@@ -135,4 +121,3 @@
person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, $ffff
person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER
person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, $0750
-; 0x9bbf8
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -1,27 +1,23 @@
-VioletMart_MapScriptHeader: ; 0x68293
+VioletMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x68295
-ClerkScript_0x68295: ; 0x68295
+ClerkScript_0x68295:
loadfont
pokemart $0, $0002
loadmovesprites
end
-; 0x6829c
-GrannyScript_0x6829c: ; 0x6829c
+GrannyScript_0x6829c:
jumptextfaceplayer UnknownText_0x682a2
-; 0x6829f
-CooltrainerMScript_0x6829f: ; 0x6829f
+CooltrainerMScript_0x6829f:
jumptextfaceplayer UnknownText_0x68323
-; 0x682a2
-UnknownText_0x682a2: ; 0x682a2
+UnknownText_0x682a2:
text "When you first"
line "catch a #MON,"
cont "it may be weak."
@@ -34,9 +30,8 @@
line "treat #MON with"
cont "love."
done
-; 0x68323
-UnknownText_0x68323: ; 0x68323
+UnknownText_0x68323:
text "#MON can hold"
line "items like POTION"
cont "and ANTIDOTE."
@@ -47,9 +42,8 @@
para "to use manmade"
line "items."
done
-; 0x68389
-VioletMart_MapEventHeader: ; 0x68389
+VioletMart_MapEventHeader:
; filler
db 0, 0
@@ -69,4 +63,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, $ffff
person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, $ffff
person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, $ffff
-; 0x683c0
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -1,20 +1,17 @@
-VioletNicknameSpeechHouse_MapScriptHeader: ; 0x693e7
+VioletNicknameSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x693e9
-TeacherScript_0x693e9: ; 0x693e9
+TeacherScript_0x693e9:
jumptextfaceplayer UnknownText_0x693fa
-; 0x693ec
-LassScript_0x693ec: ; 0x693ec
+LassScript_0x693ec:
jumptextfaceplayer UnknownText_0x6945e
-; 0x693ef
-BirdScript_0x693ef: ; 0x693ef
+BirdScript_0x693ef:
faceplayer
loadfont
writetext UnknownText_0x6947c
@@ -22,9 +19,8 @@
closetext
loadmovesprites
end
-; 0x693fa
-UnknownText_0x693fa: ; 0x693fa
+UnknownText_0x693fa:
text "She uses the names"
line "of her favorite"
cont "things to eat."
@@ -33,20 +29,17 @@
line "she gives to her"
cont "#MON, I mean."
done
-; 0x6945e
-UnknownText_0x6945e: ; 0x6945e
+UnknownText_0x6945e:
text "I call my PIDGEY"
line "STRAWBERRY!"
done
-; 0x6947c
-UnknownText_0x6947c: ; 0x6947c
+UnknownText_0x6947c:
text "STRAWBERRY: Pijji!"
done
-; 0x69490
-VioletNicknameSpeechHouse_MapEventHeader: ; 0x69490
+VioletNicknameSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -66,4 +59,3 @@
person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, $ffff
person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, $ffff
person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, $ffff
-; 0x694c7
--- a/maps/VioletOnixTradeHouse.asm
+++ b/maps/VioletOnixTradeHouse.asm
@@ -1,16 +1,14 @@
-VioletOnixTradeHouse_MapScriptHeader: ; 0x6998b
+VioletOnixTradeHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x6998d
-PokefanMScript_0x6998d: ; 0x6998d
+PokefanMScript_0x6998d:
jumptextfaceplayer UnknownText_0x69997
-; 0x69990
-YoungsterScript_0x69990: ; 0x69990
+YoungsterScript_0x69990:
faceplayer
loadfont
trade $1
@@ -17,9 +15,8 @@
closetext
loadmovesprites
end
-; 0x69997
-UnknownText_0x69997: ; 0x69997
+UnknownText_0x69997:
text "A #MON you get"
line "in a trade grows"
cont "quickly."
@@ -30,9 +27,8 @@
para "BADGE, they may"
line "disobey you."
done
-; 0x69a01
-VioletOnixTradeHouse_MapEventHeader: ; 0x69a01
+VioletOnixTradeHouse_MapEventHeader:
; filler
db 0, 0
@@ -51,4 +47,3 @@
db 2
person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, $ffff
person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, $ffff
-; 0x69a2b
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokeCenter1F.asm
@@ -1,22 +1,20 @@
-VioletPokeCenter1F_MapScriptHeader: ; 0x694c7
+VioletPokeCenter1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x694c9
-NurseScript_0x694c9: ; 0x694c9
+NurseScript_0x694c9:
jumpstd pokecenternurse
-; 0x694cc
-ScientistScript_0x694cc: ; 0x694cc
+ScientistScript_0x694cc:
faceplayer
loadfont
checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
iftrue UnknownScript_0x6953a
writetext UnknownText_0x69555
-UnknownScript_0x694d7: ; 0x694d7
+UnknownScript_0x694d7:
yesorno
iffalse UnknownScript_0x69531
checkcode VAR_PARTYCOUNT
@@ -40,7 +38,7 @@
waitbutton
end
-.UnknownScript_0x69511 ; 0x69511
+.UnknownScript_0x69511
applymovement $6, MovementData_0x6954e
spriteface $0, DOWN
applymovement $6, MovementData_0x69551
@@ -48,71 +46,59 @@
disappear $6
waitbutton
end
-; 0x69523
-.eggname ; 0x69523
+.eggname
db "EGG@"
-; 0x69527
-UnknownScript_0x69527: ; 0x69527
+UnknownScript_0x69527:
jumpstd $0030
end
-; 0x6952b
-UnknownScript_0x6952b: ; 0x6952b
+UnknownScript_0x6952b:
writetext UnknownText_0x69693
closetext
loadmovesprites
end
-; 0x69531
-UnknownScript_0x69531: ; 0x69531
+UnknownScript_0x69531:
writetext UnknownText_0x696f2
closetext
loadmovesprites
setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
end
-; 0x6953a
-UnknownScript_0x6953a: ; 0x6953a
+UnknownScript_0x6953a:
writetext UnknownText_0x69712
jump UnknownScript_0x694d7
-; 0x69540
-GameboyKidScript_0x69540: ; 0x69540
+GameboyKidScript_0x69540:
jumptextfaceplayer UnknownText_0x69809
-; 0x69543
-GentlemanScript_0x69543: ; 0x69543
+GentlemanScript_0x69543:
jumptextfaceplayer UnknownText_0x6983c
-; 0x69546
-YoungsterScript_0x69546: ; 0x69546
+YoungsterScript_0x69546:
jumptextfaceplayer UnknownText_0x698b8
-; 0x69549
-MovementData_0x69549: ; 0x69549
+MovementData_0x69549:
step_down
step_down
step_down
step_down
step_end
-; 0x6954e
-MovementData_0x6954e: ; 0x6954e
+MovementData_0x6954e:
step_left
step_down
step_end
-; 0x69551
-MovementData_0x69551: ; 0x69551
+MovementData_0x69551:
step_down
step_down
step_down
step_end
-; 0x69555
-UnknownText_0x69555: ; 0x69555
+UnknownText_0x69555:
text "<PLAY_G>, long"
line "time, no see."
@@ -125,9 +111,8 @@
para "Would you take the"
line "#MON EGG?"
done
-; 0x695c5
-UnknownText_0x695c5: ; 0x695c5
+UnknownText_0x695c5:
text "We discovered that"
line "a #MON will not"
@@ -146,9 +131,8 @@
line "ELM when that EGG"
cont "hatches!"
done
-; 0x69693
-UnknownText_0x69693: ; 0x69693
+UnknownText_0x69693:
text "Oh, no. You can't"
line "carry any more"
cont "#MON with you."
@@ -157,21 +141,18 @@
line "while you make"
cont "room for the EGG."
done
-; 0x696f2
-UnknownText_0x696f2: ; 0x696f2
+UnknownText_0x696f2:
text "B-but… PROF.ELM"
line "asked for you…"
done
-; 0x69712
-UnknownText_0x69712: ; 0x69712
+UnknownText_0x69712:
text "<PLAY_G>, will you"
line "take the EGG?"
done
-; 0x6972d
-UnknownText_0x6972d: ; 0x6972d
+UnknownText_0x6972d:
text "I've been thinking"
line "it'd be great to"
@@ -181,9 +162,8 @@
para "friends who live"
line "far away."
done
-; 0x69791
-UnknownText_0x69791: ; 0x69791
+UnknownText_0x69791:
text "I just battled a"
line "friend in CIANWOOD"
cont "over a link."
@@ -194,16 +174,14 @@
para "you can link with"
line "a friend far away."
done
-; 0x69809
-UnknownText_0x69809: ; 0x69809
+UnknownText_0x69809:
text "A guy named BILL"
line "made the #MON"
cont "PC storage system."
done
-; 0x6983c
-UnknownText_0x6983c: ; 0x6983c
+UnknownText_0x6983c:
text "It was around"
line "three years ago."
@@ -215,9 +193,8 @@
line "vailed--a young"
cont "kid broke 'em up."
done
-; 0x698b8
-UnknownText_0x698b8: ; 0x698b8
+UnknownText_0x698b8:
text "#MON are smart."
line "They won't obey a"
@@ -230,9 +207,8 @@
para "will just do as"
line "they please."
done
-; 0x69935
-VioletPokeCenter1F_MapEventHeader: ; 0x69935
+VioletPokeCenter1F_MapEventHeader:
; filler
db 0, 0
@@ -255,4 +231,3 @@
person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, $ffff
person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, $ffff
person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, $0700
-; 0x6998b
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -1,34 +1,29 @@
-ViridianMart_MapScriptHeader: ; 0x9b5e5
+ViridianMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9b5e7
-ClerkScript_0x9b5e7: ; 0x9b5e7
+ClerkScript_0x9b5e7:
loadfont
pokemart $0, $0012
loadmovesprites
end
-; 0x9b5ee
-LassScript_0x9b5ee: ; 0x9b5ee
+LassScript_0x9b5ee:
jumptextfaceplayer UnknownText_0x9b5f4
-; 0x9b5f1
-CooltrainerMScript_0x9b5f1: ; 0x9b5f1
+CooltrainerMScript_0x9b5f1:
jumptextfaceplayer UnknownText_0x9b61a
-; 0x9b5f4
-UnknownText_0x9b5f4: ; 0x9b5f4
+UnknownText_0x9b5f4:
text "The GYM LEADER"
line "here is totally"
cont "cool."
done
-; 0x9b61a
-UnknownText_0x9b61a: ; 0x9b61a
+UnknownText_0x9b61a:
text "Have you been to"
line "CINNABAR?"
@@ -35,9 +30,8 @@
para "It's an island way"
line "south of here."
done
-; 0x9b657
-ViridianMart_MapEventHeader: ; 0x9b657
+ViridianMart_MapEventHeader:
; filler
db 0, 0
@@ -57,4 +51,3 @@
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, $ffff
person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, $ffff
person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, $ffff
-; 0x9b68e
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -1,20 +1,17 @@
-ViridianNicknameSpeechHouse_MapScriptHeader: ; 0x9ae38
+ViridianNicknameSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9ae3a
-PokefanMScript_0x9ae3a: ; 0x9ae3a
+PokefanMScript_0x9ae3a:
jumptextfaceplayer UnknownText_0x9ae54
-; 0x9ae3d
-LassScript_0x9ae3d: ; 0x9ae3d
+LassScript_0x9ae3d:
jumptextfaceplayer UnknownText_0x9aecb
-; 0x9ae40
-MoltresScript_0x9ae40: ; 0x9ae40
+MoltresScript_0x9ae40:
loadfont
writetext UnknownText_0x9aefe
cry SPEAROW
@@ -21,9 +18,8 @@
closetext
loadmovesprites
end
-; 0x9ae4a
-GrowlitheScript_0x9ae4a: ; 0x9ae4a
+GrowlitheScript_0x9ae4a:
loadfont
writetext UnknownText_0x9af10
cry RATTATA
@@ -30,9 +26,8 @@
closetext
loadmovesprites
end
-; 0x9ae54
-UnknownText_0x9ae54: ; 0x9ae54
+UnknownText_0x9ae54:
text "Do you put a lot"
line "of thought into"
@@ -45,26 +40,22 @@
para "the fun of trading"
line "with others."
done
-; 0x9aecb
-UnknownText_0x9aecb: ; 0x9aecb
+UnknownText_0x9aecb:
text "They're SPEARY--"
line "a SPEAROW--and"
cont "RATTEY--a RATTATA."
done
-; 0x9aefe
-UnknownText_0x9aefe: ; 0x9aefe
+UnknownText_0x9aefe:
text "SPEARY: Ch-chun!"
done
-; 0x9af10
-UnknownText_0x9af10: ; 0x9af10
+UnknownText_0x9af10:
text "RATTEY: Kikiii!"
done
-; 0x9af21
-ViridianNicknameSpeechHouse_MapEventHeader: ; 0x9af21
+ViridianNicknameSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -85,4 +76,3 @@
person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, $ffff
person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, $ffff
person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, $ffff
-; 0x9af65
--- a/maps/ViridianPokeCenter2FBeta.asm
+++ b/maps/ViridianPokeCenter2FBeta.asm
@@ -1,12 +1,11 @@
-ViridianPokeCenter2FBeta_MapScriptHeader: ; 0x9b838
+ViridianPokeCenter2FBeta_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9b83a
-ViridianPokeCenter2FBeta_MapEventHeader: ; 0x9b83a
+ViridianPokeCenter2FBeta_MapEventHeader:
; filler
db 0, 0
@@ -22,4 +21,3 @@
; people-events
db 0
-; 0x9b845
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -1,53 +1,44 @@
-WhirlIslandB1F_MapScriptHeader: ; 0x18c40e
+WhirlIslandB1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c410
-ItemFragment_0x18c410: ; 0x18c410
+ItemFragment_0x18c410:
db FULL_RESTORE, 1
-; 0x18c412
-ItemFragment_0x18c412: ; 0x18c412
+ItemFragment_0x18c412:
db CARBOS, 1
-; 0x18c414
-ItemFragment_0x18c414: ; 0x18c414
+ItemFragment_0x18c414:
db CALCIUM, 1
-; 0x18c416
-ItemFragment_0x18c416: ; 0x18c416
+ItemFragment_0x18c416:
db NUGGET, 1
-; 0x18c418
-ItemFragment_0x18c418: ; 0x18c418
+ItemFragment_0x18c418:
db ESCAPE_ROPE, 1
-; 0x18c41a
WhirlIslandB1FBoulder:
jumpstd strengthboulder
-MapWhirlIslandB1FSignpostItem0: ; 0x18c41d
+MapWhirlIslandB1FSignpostItem0:
dw $0097
db RARE_CANDY
-; 0x18c420
-MapWhirlIslandB1FSignpostItem1: ; 0x18c420
+MapWhirlIslandB1FSignpostItem1:
dw $0098
db ULTRA_BALL
-; 0x18c423
-MapWhirlIslandB1FSignpostItem2: ; 0x18c423
+MapWhirlIslandB1FSignpostItem2:
dw $0099
db FULL_RESTORE
-; 0x18c426
-WhirlIslandB1F_MapEventHeader: ; 0x18c426
+WhirlIslandB1F_MapEventHeader:
; filler
db 0, 0
@@ -80,4 +71,3 @@
person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, $0694
person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, $0695
person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, $ffff
-; 0x18c4b6
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -1,24 +1,20 @@
-WhirlIslandB2F_MapScriptHeader: ; 0x18c4b6
+WhirlIslandB2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c4b8
-ItemFragment_0x18c4b8: ; 0x18c4b8
+ItemFragment_0x18c4b8:
db FULL_RESTORE, 1
-; 0x18c4ba
-ItemFragment_0x18c4ba: ; 0x18c4ba
+ItemFragment_0x18c4ba:
db MAX_REVIVE, 1
-; 0x18c4bc
-ItemFragment_0x18c4bc: ; 0x18c4bc
+ItemFragment_0x18c4bc:
db MAX_ELIXER, 1
-; 0x18c4be
-WhirlIslandB2F_MapEventHeader: ; 0x18c4be
+WhirlIslandB2F_MapEventHeader:
; filler
db 0, 0
@@ -40,4 +36,3 @@
person_event SPRITE_POKE_BALL, 15, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4b8, $0696
person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, $0697
person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, $0698
-; 0x18c4ff
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -1,12 +1,11 @@
-WhirlIslandCave_MapScriptHeader: ; 0x18c3ea
+WhirlIslandCave_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c3ec
-WhirlIslandCave_MapEventHeader: ; 0x18c3ec
+WhirlIslandCave_MapEventHeader:
; filler
db 0, 0
@@ -23,4 +22,3 @@
; people-events
db 0
-; 0x18c3fc
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -1,4 +1,4 @@
-WhirlIslandLugiaChamber_MapScriptHeader: ; 0x18c4ff
+WhirlIslandLugiaChamber_MapScriptHeader:
; trigger count
db 0
@@ -8,27 +8,23 @@
; callbacks
dbw 2, UnknownScript_0x18c504
-; 0x18c504
-UnknownScript_0x18c504: ; 0x18c504
+UnknownScript_0x18c504:
checkevent EVENT_FOUGHT_LUGIA
iftrue UnknownScript_0x18c515
checkitem SILVER_WING
iftrue UnknownScript_0x18c512
jump UnknownScript_0x18c515
-; 0x18c512
-UnknownScript_0x18c512: ; 0x18c512
+UnknownScript_0x18c512:
appear $2
return
-; 0x18c515
-UnknownScript_0x18c515: ; 0x18c515
+UnknownScript_0x18c515:
disappear $2
return
-; 0x18c518
-LugiaScript_0x18c518: ; 0x18c518
+LugiaScript_0x18c518:
faceplayer
loadfont
writetext UnknownText_0x18c531
@@ -42,14 +38,12 @@
disappear $2
returnafterbattle
end
-; 0x18c531
-UnknownText_0x18c531: ; 0x18c531
+UnknownText_0x18c531:
text "Gyaaas!"
done
-; 0x18c53a
-WhirlIslandLugiaChamber_MapEventHeader: ; 0x18c53a
+WhirlIslandLugiaChamber_MapEventHeader:
; filler
db 0, 0
@@ -66,4 +60,3 @@
; people-events
db 1
person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, $073d
-; 0x18c552
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -1,16 +1,14 @@
-WhirlIslandNE_MapScriptHeader: ; 0x18c394
+WhirlIslandNE_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c396
-ItemFragment_0x18c396: ; 0x18c396
+ItemFragment_0x18c396:
db ULTRA_BALL, 1
-; 0x18c398
-WhirlIslandNE_MapEventHeader: ; 0x18c398
+WhirlIslandNE_MapEventHeader:
; filler
db 0, 0
@@ -29,4 +27,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, $068f
-; 0x18c3ba
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -1,12 +1,11 @@
-WhirlIslandNW_MapScriptHeader: ; 0x18c378
+WhirlIslandNW_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c37a
-WhirlIslandNW_MapEventHeader: ; 0x18c37a
+WhirlIslandNW_MapEventHeader:
; filler
db 0, 0
@@ -25,4 +24,3 @@
; people-events
db 0
-; 0x18c394
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -1,12 +1,11 @@
-WhirlIslandSE_MapScriptHeader: ; 0x18c3fc
+WhirlIslandSE_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c3fe
-WhirlIslandSE_MapEventHeader: ; 0x18c3fe
+WhirlIslandSE_MapEventHeader:
; filler
db 0, 0
@@ -23,4 +22,3 @@
; people-events
db 0
-; 0x18c40e
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -1,16 +1,14 @@
-WhirlIslandSW_MapScriptHeader: ; 0x18c3ba
+WhirlIslandSW_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18c3bc
-ItemFragment_0x18c3bc: ; 0x18c3bc
+ItemFragment_0x18c3bc:
db ULTRA_BALL, 1
-; 0x18c3be
-WhirlIslandSW_MapEventHeader: ; 0x18c3be
+WhirlIslandSW_MapEventHeader:
; filler
db 0, 0
@@ -31,4 +29,3 @@
; people-events
db 1
person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, $0690
-; 0x18c3ea
--- a/maps/blockdata_1.asm
+++ b/maps/blockdata_1.asm
@@ -1,76 +1,58 @@
-Route32_BlockData: ; 0xa8000
+Route32_BlockData:
INCBIN "maps/Route32.blk"
-; 0xa81c2
-Route40_BlockData: ; 0xa81c2
+Route40_BlockData:
INCBIN "maps/Route40.blk"
-; 0xa8276
-Route36_BlockData: ; 0xa8276
+Route36_BlockData:
INCBIN "maps/Route36.blk"
-; 0xa8384
-Route44_BlockData: ; 0xa8384
+Route44_BlockData:
INCBIN "maps/Route44.blk"
-; 0xa8492
-Route28_BlockData: ; 0xa8492
+Route28_BlockData:
INCBIN "maps/Route28.blk"
-; 0xa8546
-BetaHerosHouse_BlockData: ; 0xa8546
+BetaHerosHouse_BlockData:
INCBIN "maps/BetaHerosHouse.blk"
-; 0xa8552
-CeladonCity_BlockData: ; 0xa8552
+CeladonCity_BlockData:
INCBIN "maps/CeladonCity.blk"
-; 0xa86ba
-SaffronCity_BlockData: ; 0xa86ba
+SaffronCity_BlockData:
INCBIN "maps/SaffronCity.blk"
-; 0xa8822
-Route2_BlockData: ; 0xa8822
+Route2_BlockData:
INCBIN "maps/Route2.blk"
-; 0xa8930
-ElmsHouse_BlockData: ; 0xa8930
+ElmsHouse_BlockData:
INCBIN "maps/ElmsHouse.blk"
-; 0xa8940
-BetaSproutTower1_BlockData: ; 0xa8940
+BetaSproutTower1_BlockData:
INCBIN "maps/BetaSproutTower1.blk"
-; 0xa899a
-Route11_BlockData: ; 0xa899a
+Route11_BlockData:
INCBIN "maps/Route11.blk"
-; 0xa8a4e
-BetaSproutTower5_BlockData: ; 0xa8a4e
+BetaSproutTower5_BlockData:
INCBIN "maps/BetaSproutTower5.blk"
-; 0xa8aa8
-Route15_BlockData: ; 0xa8aa8
+Route15_BlockData:
INCBIN "maps/Route15.blk"
-; 0xa8b5c
-BetaSproutTower9_BlockData: ; 0xa8b5c
+BetaSproutTower9_BlockData:
INCBIN "maps/BetaSproutTower9.blk"
-; 0xa8b80
-Route19_BlockData: ; 0xa8b80
+Route19_BlockData:
INCBIN "maps/Route19.blk"
-; 0xa8c34
-BetaBlackthornCity_BlockData: ; 0xa8c34
+BetaBlackthornCity_BlockData:
INCBIN "maps/BetaBlackthornCity.blk"
-; 0xa8d9c
-Route10South_BlockData: ; 0xa8d9c
+Route10South_BlockData:
INCBIN "maps/Route10South.blk"
-; 0xa8df6
-CinnabarPokeCenter2FBeta_BlockData: ; 0xa8df6
+CinnabarPokeCenter2FBeta_BlockData:
CeruleanPokeCenter2FBeta_BlockData:
Route10PokeCenter2FBeta_BlockData:
VermilionPokeCenter2FBeta_BlockData:
@@ -82,117 +64,89 @@
ViridianPokeCenter2FBeta_BlockData:
SaffronPokeCenter2FBeta_BlockData:
INCBIN "maps/CinnabarPokeCenter2FBeta.blk"
-; 0xa8e16
-Route41_BlockData: ; 0xa8e16
+Route41_BlockData:
INCBIN "maps/Route41.blk"
-; 0xa90b9
-Route33_BlockData: ; 0xa90b9
+Route33_BlockData:
INCBIN "maps/Route33.blk"
-; 0xa9113
-Route45_BlockData: ; 0xa9113
+Route45_BlockData:
INCBIN "maps/Route45.blk"
-; 0xa92d5
-Route29_BlockData: ; 0xa92d5
+Route29_BlockData:
INCBIN "maps/Route29.blk"
-; 0xa93e3
-Route37_BlockData: ; 0xa93e3
+Route37_BlockData:
INCBIN "maps/Route37.blk"
-; 0xa943d
-LavenderTown_BlockData: ; 0xa943d
+LavenderTown_BlockData:
INCBIN "maps/LavenderTown.blk"
-; 0xa9497
-PalletTown_BlockData: ; 0xa9497
+PalletTown_BlockData:
INCBIN "maps/PalletTown.blk"
-; 0xa94f1
-Route25_BlockData: ; 0xa94f1
+Route25_BlockData:
INCBIN "maps/Route25.blk"
-; 0xa95ff
-Route24_BlockData: ; 0xa95ff
+Route24_BlockData:
INCBIN "maps/Route24.blk"
-; 0xa9659
-BetaVioletCity_BlockData: ; 0xa9659
+BetaVioletCity_BlockData:
INCBIN "maps/BetaVioletCity.blk"
-; 0xa97c1
-Route3_BlockData: ; 0xa97c1
+Route3_BlockData:
INCBIN "maps/Route3.blk"
-; 0xa98cf
-PewterCity_BlockData: ; 0xa98cf
+PewterCity_BlockData:
INCBIN "maps/PewterCity.blk"
-; 0xa9a37
-BetaIlexForest_BlockData: ; 0xa9a37
+BetaIlexForest_BlockData:
INCBIN "maps/BetaIlexForest.blk"
-; 0xa9b9f
-BetaSproutTower2_BlockData: ; 0xa9b9f
+BetaSproutTower2_BlockData:
INCBIN "maps/BetaSproutTower2.blk"
-; 0xa9bf9
-Route12_BlockData: ; 0xa9bf9
+Route12_BlockData:
INCBIN "maps/Route12.blk"
-; 0xa9d07
-BetaGoldenrodCity_BlockData: ; 0xa9d07
+BetaGoldenrodCity_BlockData:
INCBIN "maps/BetaGoldenrodCity.blk"
-; 0xa9e6f
-Route20_BlockData: ; 0xa9e6f
+Route20_BlockData:
INCBIN "maps/Route20.blk"
-; 0xa9f7d
-BetaSproutTower6_BlockData: ; 0xa9f7d
+BetaSproutTower6_BlockData:
INCBIN "maps/BetaSproutTower6.blk"
-; 0xa9fd7
-BetaPokecenterMainHouse_BlockData: ; 0xa9fd7
+BetaPokecenterMainHouse_BlockData:
INCBIN "maps/BetaPokecenterMainHouse.blk"
-; 0xa9ff7
-Route30_BlockData: ; 0xa9ff7
+Route30_BlockData:
INCBIN "maps/Route30.blk"
-; 0xaa105
-Route26_BlockData: ; 0xaa105
+Route26_BlockData:
INCBIN "maps/Route26.blk"
-; 0xaa321
-Route42_BlockData: ; 0xaa321
+Route42_BlockData:
INCBIN "maps/Route42.blk"
-; 0xaa42f
-Route34_BlockData: ; 0xaa42f
+Route34_BlockData:
INCBIN "maps/Route34.blk"
-; 0xaa53d
-Route46_BlockData: ; 0xaa53d
+Route46_BlockData:
INCBIN "maps/Route46.blk"
-; 0xaa5f1
-FuchsiaCity_BlockData: ; 0xaa5f1
+FuchsiaCity_BlockData:
INCBIN "maps/FuchsiaCity.blk"
-; 0xaa759
-Route38_BlockData: ; 0xaa759
+Route38_BlockData:
INCBIN "maps/Route38.blk"
-; 0xaa80d
-BetaCianwoodCity_BlockData: ; 0xaa80d
+BetaCianwoodCity_BlockData:
INCBIN "maps/BetaCianwoodCity.blk"
-; 0xaa867
-OlivineVoltorbHouse_BlockData: ; 0xaa867
+OlivineVoltorbHouse_BlockData:
OlivineHouseBeta_BlockData:
OlivinePunishmentSpeechHouse_BlockData:
OlivineGoodRodHouse_BlockData:
@@ -243,9 +197,8 @@
CherrygroveEvolutionSpeechHouse_BlockData:
Route30BerrySpeechHouse_BlockData:
INCBIN "maps/OlivineVoltorbHouse.blk"
-; 0xaa877
-SafariZoneFuchsiaGateBeta_BlockData: ; 0xaa877
+SafariZoneFuchsiaGateBeta_BlockData:
Route19FuchsiaGate_BlockData:
Route43MahoganyGate_BlockData:
Route43Gate_BlockData:
@@ -258,81 +211,62 @@
Route2946Gate_BlockData:
Route5SaffronCityGate_BlockData:
INCBIN "maps/SafariZoneFuchsiaGateBeta.blk"
-; 0xaa88b
-BetaTeakCity_BlockData: ; 0xaa88b
+BetaTeakCity_BlockData:
INCBIN "maps/BetaTeakCity.blk"
-; 0xaa9f3
-BetaCherrygroveCity_BlockData: ; 0xaa9f3
+BetaCherrygroveCity_BlockData:
INCBIN "maps/BetaCherrygroveCity.blk"
-; 0xaaa4d
-CinnabarIsland_BlockData: ; 0xaaa4d
+CinnabarIsland_BlockData:
INCBIN "maps/CinnabarIsland.blk"
-; 0xaaaa7
-Route4_BlockData: ; 0xaaaa7
+Route4_BlockData:
INCBIN "maps/Route4.blk"
-; 0xaab5b
-Route8_BlockData: ; 0xaab5b
+Route8_BlockData:
INCBIN "maps/Route8.blk"
-; 0xaac0f
-BetaSproutTower3_BlockData: ; 0xaac0f
+BetaSproutTower3_BlockData:
INCBIN "maps/BetaSproutTower3.blk"
-; 0xaac69
-ViridianCity_BlockData: ; 0xaac69
+ViridianCity_BlockData:
INCBIN "maps/ViridianCity.blk"
-; 0xaadd1
-Route13_BlockData: ; 0xaadd1
+Route13_BlockData:
INCBIN "maps/Route13.blk"
-; 0xaaedf
-Route21_BlockData: ; 0xaaedf
+Route21_BlockData:
INCBIN "maps/Route21.blk"
-; 0xaaf93
-BetaSproutTower7_BlockData: ; 0xaaf93
+BetaSproutTower7_BlockData:
INCBIN "maps/BetaSproutTower7.blk"
-; 0xaafed
-Route17_BlockData: ; 0xaafed
+Route17_BlockData:
INCBIN "maps/Route17.blk"
-; 0xab1af
-BetaMahoganyTown_BlockData: ; 0xab1af
+BetaMahoganyTown_BlockData:
INCBIN "maps/BetaMahoganyTown.blk"
-; 0xab209
-Route31_BlockData: ; 0xab209
+Route31_BlockData:
INCBIN "maps/Route31.blk"
-; 0xab2bd
-Route27_BlockData: ; 0xab2bd
+Route27_BlockData:
INCBIN "maps/Route27.blk"
-; 0xab425
-Route35_BlockData: ; 0xab425
+Route35_BlockData:
INCBIN "maps/Route35.blk"
-; 0xab4d9
-Route43_BlockData: ; 0xab4d9
+Route43_BlockData:
INCBIN "maps/Route43.blk"
-; 0xab5e7
-Route39_BlockData: ; 0xab5e7
+Route39_BlockData:
INCBIN "maps/Route39.blk"
-; 0xab69b
-KrissHouse1F_BlockData: ; 0xab69b
+KrissHouse1F_BlockData:
INCBIN "maps/KrissHouse1F.blk"
-; 0xab6af
-Route38EcruteakGate_BlockData: ; 0xab6af
+Route38EcruteakGate_BlockData:
Route42EcruteakGate_BlockData:
Route32RuinsofAlphGate_BlockData:
IlexForestAzaleaGate_BlockData:
@@ -343,44 +277,33 @@
Route1718Gate_BlockData:
Route31VioletGate_BlockData:
INCBIN "maps/Route38EcruteakGate.blk"
-; 0xab6c3
-BetaAzaleaTown_BlockData: ; 0xab6c3
+BetaAzaleaTown_BlockData:
INCBIN "maps/BetaAzaleaTown.blk"
-; 0xab82b
-VermilionCity_BlockData: ; 0xab82b
+VermilionCity_BlockData:
INCBIN "maps/VermilionCity.blk"
-; 0xab993
-BetaOlivineCity_BlockData: ; 0xab993
+BetaOlivineCity_BlockData:
INCBIN "maps/BetaOlivineCity.blk"
-; 0xabafb
-BetaNewBarkTown_BlockData: ; 0xabafb
+BetaNewBarkTown_BlockData:
INCBIN "maps/BetaNewBarkTown.blk"
-; 0xabb55
-ElmsLab_BlockData: ; 0xabb55
+ElmsLab_BlockData:
INCBIN "maps/ElmsLab.blk"
-; 0xabb73
-CeruleanCity_BlockData: ; 0xabb73
+CeruleanCity_BlockData:
INCBIN "maps/CeruleanCity.blk"
-; 0xabcdb
-Route1_BlockData: ; 0xabcdb
+Route1_BlockData:
INCBIN "maps/Route1.blk"
-; 0xabd8f
-Route5_BlockData: ; 0xabd8f
+Route5_BlockData:
INCBIN "maps/Route5.blk"
-; 0xabde9
-Route9_BlockData: ; 0xabde9
+Route9_BlockData:
INCBIN "maps/Route9.blk"
-; 0xabef7
-Route22_BlockData: ; 0xabef7
+Route22_BlockData:
INCBIN "maps/Route22.blk"
-; 0xabfab
--- a/maps/blockdata_2.asm
+++ b/maps/blockdata_2.asm
@@ -1,12 +1,10 @@
-Route14_BlockData: ; 0xac000
+Route14_BlockData:
INCBIN "maps/Route14.blk"
-; 0xac0b4
-BetaSproutTower8_BlockData: ; 0xac0b4
+BetaSproutTower8_BlockData:
INCBIN "maps/BetaSproutTower8.blk"
-; 0xac10e
-OlivineMart_BlockData: ; 0xac10e
+OlivineMart_BlockData:
EcruteakMart_BlockData:
BlackthornMart_BlockData:
CeruleanMart_BlockData:
@@ -20,17 +18,14 @@
SaffronMart_BlockData:
CherrygroveMart_BlockData:
INCBIN "maps/OlivineMart.blk"
-; 0xac126
-Route10North_BlockData: ; 0xac126
+Route10North_BlockData:
INCBIN "maps/Route10North.blk"
-; 0xac180
-BetaLakeOfRage_BlockData: ; 0xac180
+BetaLakeOfRage_BlockData:
INCBIN "maps/BetaLakeOfRage.blk"
-; 0xac2e8
-OlivinePokeCenter1F_BlockData: ; 0xac2e8
+OlivinePokeCenter1F_BlockData:
MahoganyPokeCenter1F_BlockData:
EcruteakPokeCenter1F_BlockData:
BlackthornPokeCenter1F_BlockData:
@@ -52,549 +47,416 @@
SaffronPokeCenter1F_BlockData:
CherrygrovePokeCenter1F_BlockData:
INCBIN "maps/OlivinePokeCenter1F.blk"
-; 0xac2fc
-BetaPewterMuseumOfScience1F_BlockData: ; 0xac2fc
+BetaPewterMuseumOfScience1F_BlockData:
INCBIN "maps/BetaPewterMuseumOfScience1F.blk"
-; 0xac324
-BetaPewterMuseumOfScience2F_BlockData: ; 0xac324
+BetaPewterMuseumOfScience2F_BlockData:
INCBIN "maps/BetaPewterMuseumOfScience2F.blk"
-; 0xac340
-EarlsPokemonAcademy_BlockData: ; 0xac340
+EarlsPokemonAcademy_BlockData:
INCBIN "maps/EarlsPokemonAcademy.blk"
-; 0xac360
-BetaCinnabarIslandPokemonLabHallway_BlockData: ; 0xac360
+BetaCinnabarIslandPokemonLabHallway_BlockData:
INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk"
-; 0xac384
-BetaCinnabarIslandPokemonLabRoom1_BlockData: ; 0xac384
+BetaCinnabarIslandPokemonLabRoom1_BlockData:
INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk"
-; 0xac394
-BetaCinnabarIslandPokemonLabRoom2_BlockData: ; 0xac394
+BetaCinnabarIslandPokemonLabRoom2_BlockData:
INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk"
-; 0xac3a4
-BetaCinnabarIslandPokemonLabRoom3_BlockData: ; 0xac3a4
+BetaCinnabarIslandPokemonLabRoom3_BlockData:
INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk"
-; 0xac3b4
-GoldenrodDeptStore1F_BlockData: ; 0xac3b4
+GoldenrodDeptStore1F_BlockData:
CeladonDeptStore1F_BlockData:
INCBIN "maps/GoldenrodDeptStore1F.blk"
-; 0xac3d4
-GoldenrodDeptStore2F_BlockData: ; 0xac3d4
+GoldenrodDeptStore2F_BlockData:
CeladonDeptStore2F_BlockData:
INCBIN "maps/GoldenrodDeptStore2F.blk"
-; 0xac3f4
-GoldenrodDeptStore3F_BlockData: ; 0xac3f4
+GoldenrodDeptStore3F_BlockData:
CeladonDeptStore3F_BlockData:
INCBIN "maps/GoldenrodDeptStore3F.blk"
-; 0xac414
-GoldenrodDeptStore4F_BlockData: ; 0xac414
+GoldenrodDeptStore4F_BlockData:
CeladonDeptStore4F_BlockData:
INCBIN "maps/GoldenrodDeptStore4F.blk"
-; 0xac434
-GoldenrodDeptStore5F_BlockData: ; 0xac434
+GoldenrodDeptStore5F_BlockData:
CeladonDeptStore5F_BlockData:
INCBIN "maps/GoldenrodDeptStore5F.blk"
-; 0xac454
-GoldenrodDeptStore6F_BlockData: ; 0xac454
+GoldenrodDeptStore6F_BlockData:
CeladonDeptStore6F_BlockData:
INCBIN "maps/GoldenrodDeptStore6F.blk"
-; 0xac474
-GoldenrodDeptStoreElevator_BlockData: ; 0xac474
+GoldenrodDeptStoreElevator_BlockData:
CeladonDeptStoreElevator_BlockData:
INCBIN "maps/GoldenrodDeptStoreElevator.blk"
-; 0xac478
-CeladonMansion1F_BlockData: ; 0xac478
+CeladonMansion1F_BlockData:
INCBIN "maps/CeladonMansion1F.blk"
-; 0xac48c
-CeladonMansion2F_BlockData: ; 0xac48c
+CeladonMansion2F_BlockData:
INCBIN "maps/CeladonMansion2F.blk"
-; 0xac4a0
-CeladonMansion3F_BlockData: ; 0xac4a0
+CeladonMansion3F_BlockData:
INCBIN "maps/CeladonMansion3F.blk"
-; 0xac4b4
-CeladonMansionRoof_BlockData: ; 0xac4b4
+CeladonMansionRoof_BlockData:
INCBIN "maps/CeladonMansionRoof.blk"
-; 0xac4c8
-BetaHouse_BlockData: ; 0xac4c8
+BetaHouse_BlockData:
INCBIN "maps/BetaHouse.blk"
-; 0xac4d8
-CeladonGameCorner_BlockData: ; 0xac4d8
+CeladonGameCorner_BlockData:
INCBIN "maps/CeladonGameCorner.blk"
-; 0xac51e
-CeladonGameCornerPrizeRoom_BlockData: ; 0xac51e
+CeladonGameCornerPrizeRoom_BlockData:
INCBIN "maps/CeladonGameCornerPrizeRoom.blk"
-; 0xac527
-Colosseum_BlockData: ; 0xac527
+Colosseum_BlockData:
INCBIN "maps/Colosseum.blk"
-; 0xac53b
-TradeCenter_BlockData: ; 0xac53b
+TradeCenter_BlockData:
TimeCapsule_BlockData:
INCBIN "maps/TradeCenter.blk"
-; 0xac54f
-EcruteakLugiaSpeechHouse_BlockData: ; 0xac54f
+EcruteakLugiaSpeechHouse_BlockData:
EcruteakItemfinderHouse_BlockData:
VioletNicknameSpeechHouse_BlockData:
VioletOnixTradeHouse_BlockData:
INCBIN "maps/EcruteakLugiaSpeechHouse.blk"
-; 0xac55f
-BetaCave_BlockData: ; 0xac55f
+BetaCave_BlockData:
INCBIN "maps/BetaCave.blk"
-; 0xac5b9
-UnionCaveB1F_BlockData: ; 0xac5b9
+UnionCaveB1F_BlockData:
INCBIN "maps/UnionCaveB1F.blk"
-; 0xac66d
-UnionCaveB2F_BlockData: ; 0xac66d
+UnionCaveB2F_BlockData:
INCBIN "maps/UnionCaveB2F.blk"
-; 0xac721
-UnionCave1F_BlockData: ; 0xac721
+UnionCave1F_BlockData:
INCBIN "maps/UnionCave1F.blk"
-; 0xac7d5
-NationalPark_BlockData: ; 0xac7d5
+NationalPark_BlockData:
NationalParkBugContest_BlockData:
INCBIN "maps/NationalPark.blk"
-; 0xac9f1
-Route6UndergroundEntrance_BlockData: ; 0xac9f1
+Route6UndergroundEntrance_BlockData:
Route5UndergroundEntrance_BlockData:
INCBIN "maps/Route6UndergroundEntrance.blk"
-; 0xaca01
-BetaPokecenterTradeStation_BlockData: ; 0xaca01
+BetaPokecenterTradeStation_BlockData:
INCBIN "maps/BetaPokecenterTradeStation.blk"
-; 0xaca11
-KurtsHouse_BlockData: ; 0xaca11
+KurtsHouse_BlockData:
INCBIN "maps/KurtsHouse.blk"
-; 0xaca31
-GoldenrodMagnetTrainStation_BlockData: ; 0xaca31
+GoldenrodMagnetTrainStation_BlockData:
INCBIN "maps/GoldenrodMagnetTrainStation.blk"
-; 0xaca8b
-RuinsofAlphOutside_BlockData: ; 0xaca8b
+RuinsofAlphOutside_BlockData:
INCBIN "maps/RuinsofAlphOutside.blk"
-; 0xacb3f
-BetaAlphRuinUnsolvedPuzzleRoom_BlockData: ; 0xacb3f
+BetaAlphRuinUnsolvedPuzzleRoom_BlockData:
INCBIN "maps/BetaAlphRuinUnsolvedPuzzleRoom.blk"
-; 0xacb53
-RuinsofAlphInnerChamber_BlockData: ; 0xacb53
+RuinsofAlphInnerChamber_BlockData:
INCBIN "maps/RuinsofAlphInnerChamber.blk"
-; 0xacbdf
-RuinsofAlphHoOhChamber_BlockData: ; 0xacbdf
+RuinsofAlphHoOhChamber_BlockData:
RuinsofAlphKabutoChamber_BlockData:
RuinsofAlphOmanyteChamber_BlockData:
RuinsofAlphAerodactylChamber_BlockData:
INCBIN "maps/RuinsofAlphHoOhChamber.blk"
-; 0xacbf3
-SproutTower1F_BlockData: ; 0xacbf3
+SproutTower1F_BlockData:
INCBIN "maps/SproutTower1F.blk"
-; 0xacc43
-BetaSproutTowerCutOut1_BlockData: ; 0xacc43
+BetaSproutTowerCutOut1_BlockData:
INCBIN "maps/BetaSproutTowerCutOut1.blk"
-; 0xacc4d
-SproutTower2F_BlockData: ; 0xacc4d
+SproutTower2F_BlockData:
INCBIN "maps/SproutTower2F.blk"
-; 0xacc9d
-BetaSproutTowerCutOut2_BlockData: ; 0xacc9d
+BetaSproutTowerCutOut2_BlockData:
INCBIN "maps/BetaSproutTowerCutOut2.blk"
-; 0xacca7
-SproutTower3F_BlockData: ; 0xacca7
+SproutTower3F_BlockData:
INCBIN "maps/SproutTower3F.blk"
-; 0xaccf7
-BetaSproutTowerCutOut3_BlockData: ; 0xaccf7
+BetaSproutTowerCutOut3_BlockData:
INCBIN "maps/BetaSproutTowerCutOut3.blk"
-; 0xacd01
-RadioTower1F_BlockData: ; 0xacd01
+RadioTower1F_BlockData:
INCBIN "maps/RadioTower1F.blk"
-; 0xacd25
-RadioTower2F_BlockData: ; 0xacd25
+RadioTower2F_BlockData:
INCBIN "maps/RadioTower2F.blk"
-; 0xacd49
-RadioTower3F_BlockData: ; 0xacd49
+RadioTower3F_BlockData:
INCBIN "maps/RadioTower3F.blk"
-; 0xacd6d
-RadioTower4F_BlockData: ; 0xacd6d
+RadioTower4F_BlockData:
INCBIN "maps/RadioTower4F.blk"
-; 0xacd91
-RadioTower5F_BlockData: ; 0xacd91
+RadioTower5F_BlockData:
INCBIN "maps/RadioTower5F.blk"
-; 0xacdb5
-NewBarkTown_BlockData: ; 0xacdb5
+NewBarkTown_BlockData:
INCBIN "maps/NewBarkTown.blk"
-; 0xace0f
-CherrygroveCity_BlockData: ; 0xace0f
+CherrygroveCity_BlockData:
INCBIN "maps/CherrygroveCity.blk"
-; 0xacec3
-VioletCity_BlockData: ; 0xacec3
+VioletCity_BlockData:
INCBIN "maps/VioletCity.blk"
-; 0xad02b
-AzaleaTown_BlockData: ; 0xad02b
+AzaleaTown_BlockData:
INCBIN "maps/AzaleaTown.blk"
-; 0xad0df
-CianwoodCity_BlockData: ; 0xad0df
+CianwoodCity_BlockData:
INCBIN "maps/CianwoodCity.blk"
-; 0xad274
-GoldenrodCity_BlockData: ; 0xad274
+GoldenrodCity_BlockData:
INCBIN "maps/GoldenrodCity.blk"
-; 0xad3dc
-OlivineCity_BlockData: ; 0xad3dc
+OlivineCity_BlockData:
INCBIN "maps/OlivineCity.blk"
-; 0xad544
-EcruteakCity_BlockData: ; 0xad544
+EcruteakCity_BlockData:
INCBIN "maps/EcruteakCity.blk"
-; 0xad6ac
-MahoganyTown_BlockData: ; 0xad6ac
+MahoganyTown_BlockData:
INCBIN "maps/MahoganyTown.blk"
-; 0xad706
-LakeofRage_BlockData: ; 0xad706
+LakeofRage_BlockData:
INCBIN "maps/LakeofRage.blk"
-; 0xad86e
-BlackthornCity_BlockData: ; 0xad86e
+BlackthornCity_BlockData:
INCBIN "maps/BlackthornCity.blk"
-; 0xad9d6
-SilverCaveOutside_BlockData: ; 0xad9d6
+SilverCaveOutside_BlockData:
INCBIN "maps/SilverCaveOutside.blk"
-; 0xadb3e
-Route6_BlockData: ; 0xadb3e
+Route6_BlockData:
INCBIN "maps/Route6.blk"
-; 0xadb98
-Route7_BlockData: ; 0xadb98
+Route7_BlockData:
INCBIN "maps/Route7.blk"
-; 0xadbf2
-Route16_BlockData: ; 0xadbf2
+Route16_BlockData:
INCBIN "maps/Route16.blk"
-; 0xadc4c
-Route18_BlockData: ; 0xadc4c
+Route18_BlockData:
INCBIN "maps/Route18.blk"
-; 0xadca6
-WarehouseEntrance_BlockData: ; 0xadca6
+WarehouseEntrance_BlockData:
INCBIN "maps/WarehouseEntrance.blk"
-; 0xaddb4
-UndergroundPathSwitchRoomEntrances_BlockData: ; 0xaddb4
+UndergroundPathSwitchRoomEntrances_BlockData:
INCBIN "maps/UndergroundPathSwitchRoomEntrances.blk"
-; 0xadec2
-GoldenrodDeptStoreB1F_BlockData: ; 0xadec2
+GoldenrodDeptStoreB1F_BlockData:
INCBIN "maps/GoldenrodDeptStoreB1F.blk"
-; 0xadf1c
-UndergroundWarehouse_BlockData: ; 0xadf1c
+UndergroundWarehouse_BlockData:
INCBIN "maps/UndergroundWarehouse.blk"
-; 0xadf76
-BetaElevator_BlockData: ; 0xadf76
+BetaElevator_BlockData:
INCBIN "maps/BetaElevator.blk"
-; 0xadf8f
-TinTower1F_BlockData: ; 0xadf8f
+TinTower1F_BlockData:
INCBIN "maps/TinTower1F.blk"
-; 0xadfe9
-TinTower2F_BlockData: ; 0xadfe9
+TinTower2F_BlockData:
INCBIN "maps/TinTower2F.blk"
-; 0xae043
-TinTower3F_BlockData: ; 0xae043
+TinTower3F_BlockData:
INCBIN "maps/TinTower3F.blk"
-; 0xae09d
-TinTower4F_BlockData: ; 0xae09d
+TinTower4F_BlockData:
INCBIN "maps/TinTower4F.blk"
-; 0xae0f7
-TinTower5F_BlockData: ; 0xae0f7
+TinTower5F_BlockData:
INCBIN "maps/TinTower5F.blk"
-; 0xae151
-TinTower6F_BlockData: ; 0xae151
+TinTower6F_BlockData:
INCBIN "maps/TinTower6F.blk"
-; 0xae1ab
-TinTower7F_BlockData: ; 0xae1ab
+TinTower7F_BlockData:
INCBIN "maps/TinTower7F.blk"
-; 0xae205
-TinTower8F_BlockData: ; 0xae205
+TinTower8F_BlockData:
INCBIN "maps/TinTower8F.blk"
-; 0xae25f
-TinTower9F_BlockData: ; 0xae25f
+TinTower9F_BlockData:
INCBIN "maps/TinTower9F.blk"
-; 0xae2b9
-TinTowerRoof_BlockData: ; 0xae2b9
+TinTowerRoof_BlockData:
INCBIN "maps/TinTowerRoof.blk"
-; 0xae313
-BurnedTower1F_BlockData: ; 0xae313
+BurnedTower1F_BlockData:
INCBIN "maps/BurnedTower1F.blk"
-; 0xae36d
-BurnedTowerB1F_BlockData: ; 0xae36d
+BurnedTowerB1F_BlockData:
INCBIN "maps/BurnedTowerB1F.blk"
-; 0xae3c7
-BetaCaveTestMap_BlockData: ; 0xae3c7
+BetaCaveTestMap_BlockData:
INCBIN "maps/BetaCaveTestMap.blk"
-; 0xae4d5
-MountMortar1FOutside_BlockData: ; 0xae4d5
+MountMortar1FOutside_BlockData:
INCBIN "maps/MountMortar1FOutside.blk"
-; 0xae63d
-MountMortar1FInside_BlockData: ; 0xae63d
+MountMortar1FInside_BlockData:
INCBIN "maps/MountMortar1FInside.blk"
-; 0xae859
-MountMortar2FInside_BlockData: ; 0xae859
+MountMortar2FInside_BlockData:
INCBIN "maps/MountMortar2FInside.blk"
-; 0xae9c1
-MountMortarB1F_BlockData: ; 0xae9c1
+MountMortarB1F_BlockData:
INCBIN "maps/MountMortarB1F.blk"
-; 0xaeb29
-IcePath1F_BlockData: ; 0xaeb29
+IcePath1F_BlockData:
INCBIN "maps/IcePath1F.blk"
-; 0xaec91
-IcePathB1F_BlockData: ; 0xaec91
+IcePathB1F_BlockData:
INCBIN "maps/IcePathB1F.blk"
-; 0xaed45
-IcePathB2FMahoganySide_BlockData: ; 0xaed45
+IcePathB2FMahoganySide_BlockData:
INCBIN "maps/IcePathB2FMahoganySide.blk"
-; 0xaed9f
-IcePathB2FBlackthornSide_BlockData: ; 0xaed9f
+IcePathB2FBlackthornSide_BlockData:
INCBIN "maps/IcePathB2FBlackthornSide.blk"
-; 0xaedcc
-IcePathB3F_BlockData: ; 0xaedcc
+IcePathB3F_BlockData:
INCBIN "maps/IcePathB3F.blk"
-; 0xaee26
-WhirlIslandNW_BlockData: ; 0xaee26
+WhirlIslandNW_BlockData:
INCBIN "maps/WhirlIslandNW.blk"
-; 0xaee53
-WhirlIslandNE_BlockData: ; 0xaee53
+WhirlIslandNE_BlockData:
INCBIN "maps/WhirlIslandNE.blk"
-; 0xaeead
-WhirlIslandSW_BlockData: ; 0xaeead
+WhirlIslandSW_BlockData:
INCBIN "maps/WhirlIslandSW.blk"
-; 0xaef07
-WhirlIslandCave_BlockData: ; 0xaef07
+WhirlIslandCave_BlockData:
INCBIN "maps/WhirlIslandCave.blk"
-; 0xaef34
-WhirlIslandSE_BlockData: ; 0xaef34
+WhirlIslandSE_BlockData:
INCBIN "maps/WhirlIslandSE.blk"
-; 0xaef61
-WhirlIslandB1F_BlockData: ; 0xaef61
+WhirlIslandB1F_BlockData:
INCBIN "maps/WhirlIslandB1F.blk"
-; 0xaf0c9
-WhirlIslandB2F_BlockData: ; 0xaf0c9
+WhirlIslandB2F_BlockData:
INCBIN "maps/WhirlIslandB2F.blk"
-; 0xaf17d
-WhirlIslandLugiaChamber_BlockData: ; 0xaf17d
+WhirlIslandLugiaChamber_BlockData:
INCBIN "maps/WhirlIslandLugiaChamber.blk"
-; 0xaf1d7
-SilverCaveRoom1_BlockData: ; 0xaf1d7
+SilverCaveRoom1_BlockData:
INCBIN "maps/SilverCaveRoom1.blk"
-; 0xaf28b
-SilverCaveRoom2_BlockData: ; 0xaf28b
+SilverCaveRoom2_BlockData:
INCBIN "maps/SilverCaveRoom2.blk"
-; 0xaf399
-SilverCaveRoom3_BlockData: ; 0xaf399
+SilverCaveRoom3_BlockData:
INCBIN "maps/SilverCaveRoom3.blk"
-; 0xaf44d
-BetaRocketHideout1_BlockData: ; 0xaf44d
+BetaRocketHideout1_BlockData:
INCBIN "maps/BetaRocketHideout1.blk"
-; 0xaf55b
-BetaRocketHideout2_BlockData: ; 0xaf55b
+BetaRocketHideout2_BlockData:
INCBIN "maps/BetaRocketHideout2.blk"
-; 0xaf669
-BetaEmptyHouse_BlockData: ; 0xaf669
+BetaEmptyHouse_BlockData:
INCBIN "maps/BetaEmptyHouse.blk"
-; 0xaf777
-BetaRocketHideout3_BlockData: ; 0xaf777
+BetaRocketHideout3_BlockData:
INCBIN "maps/BetaRocketHideout3.blk"
-; 0xaf885
-MahoganyMart1F_BlockData: ; 0xaf885
+MahoganyMart1F_BlockData:
MountMoonGiftShop_BlockData:
INCBIN "maps/MahoganyMart1F.blk"
-; 0xaf895
-TeamRocketBaseB1F_BlockData: ; 0xaf895
+TeamRocketBaseB1F_BlockData:
INCBIN "maps/TeamRocketBaseB1F.blk"
-; 0xaf91c
-TeamRocketBaseB2F_BlockData: ; 0xaf91c
+TeamRocketBaseB2F_BlockData:
INCBIN "maps/TeamRocketBaseB2F.blk"
-; 0xaf9a3
-TeamRocketBaseB3F_BlockData: ; 0xaf9a3
+TeamRocketBaseB3F_BlockData:
INCBIN "maps/TeamRocketBaseB3F.blk"
-; 0xafa2a
-BetaRoute23EarlyVersion_BlockData: ; 0xafa2a
+BetaRoute23EarlyVersion_BlockData:
INCBIN "maps/BetaRoute23EarlyVersion.blk"
-; 0xafa84
-IndigoPlateauPokeCenter1F_BlockData: ; 0xafa84
+IndigoPlateauPokeCenter1F_BlockData:
INCBIN "maps/IndigoPlateauPokeCenter1F.blk"
-; 0xafac3
-WillsRoom_BlockData: ; 0xafac3
+WillsRoom_BlockData:
INCBIN "maps/WillsRoom.blk"
-; 0xafaf0
-KogasRoom_BlockData: ; 0xafaf0
+KogasRoom_BlockData:
INCBIN "maps/KogasRoom.blk"
-; 0xafb1d
-BrunosRoom_BlockData: ; 0xafb1d
+BrunosRoom_BlockData:
INCBIN "maps/BrunosRoom.blk"
-; 0xafb4a
-KarensRoom_BlockData: ; 0xafb4a
+KarensRoom_BlockData:
INCBIN "maps/KarensRoom.blk"
-; 0xafb77
-AzaleaGym_BlockData: ; 0xafb77
+AzaleaGym_BlockData:
INCBIN "maps/AzaleaGym.blk"
-; 0xafb9f
-VioletGym_BlockData: ; 0xafb9f
+VioletGym_BlockData:
INCBIN "maps/VioletGym.blk"
-; 0xafbc7
-GoldenrodGym_BlockData: ; 0xafbc7
+GoldenrodGym_BlockData:
INCBIN "maps/GoldenrodGym.blk"
-; 0xafc21
-EcruteakGym_BlockData: ; 0xafc21
+EcruteakGym_BlockData:
INCBIN "maps/EcruteakGym.blk"
-; 0xafc4e
-MahoganyGym_BlockData: ; 0xafc4e
+MahoganyGym_BlockData:
INCBIN "maps/MahoganyGym.blk"
-; 0xafc7b
-OlivineGym_BlockData: ; 0xafc7b
+OlivineGym_BlockData:
INCBIN "maps/OlivineGym.blk"
-; 0xafca3
-BetaUnknown_BlockData: ; 0xafca3
+BetaUnknown_BlockData:
INCBIN "maps/BetaUnknown.blk"
-; 0xafcb7
-CianwoodGym_BlockData: ; 0xafcb7
+CianwoodGym_BlockData:
INCBIN "maps/CianwoodGym.blk"
-; 0xafce4
-BlackthornGym1F_BlockData: ; 0xafce4
+BlackthornGym1F_BlockData:
INCBIN "maps/BlackthornGym1F.blk"
-; 0xafd11
-BlackthornGym2F_BlockData: ; 0xafd11
+BlackthornGym2F_BlockData:
INCBIN "maps/BlackthornGym2F.blk"
-; 0xafd3e
-OlivineLighthouse1F_BlockData: ; 0xafd3e
+OlivineLighthouse1F_BlockData:
INCBIN "maps/OlivineLighthouse1F.blk"
-; 0xafd98
-OlivineLighthouse2F_BlockData: ; 0xafd98
+OlivineLighthouse2F_BlockData:
INCBIN "maps/OlivineLighthouse2F.blk"
-; 0xafdf2
-OlivineLighthouse3F_BlockData: ; 0xafdf2
+OlivineLighthouse3F_BlockData:
INCBIN "maps/OlivineLighthouse3F.blk"
-; 0xafe4c
-OlivineLighthouse4F_BlockData: ; 0xafe4c
+OlivineLighthouse4F_BlockData:
INCBIN "maps/OlivineLighthouse4F.blk"
-; 0xafea6
-OlivineLighthouse5F_BlockData: ; 0xafea6
+OlivineLighthouse5F_BlockData:
INCBIN "maps/OlivineLighthouse5F.blk"
-; 0xaff00
-OlivineLighthouse6F_BlockData: ; 0xaff00
+OlivineLighthouse6F_BlockData:
INCBIN "maps/OlivineLighthouse6F.blk"
-; 0xaff5a
--- a/maps/blockdata_3.asm
+++ b/maps/blockdata_3.asm
@@ -1,353 +1,266 @@
-BetaCave2_BlockData: ; 0xb0000
+BetaCave2_BlockData:
INCBIN "maps/BetaCave2.blk"
-; 0xb0023
-SlowpokeWellB1F_BlockData: ; 0xb0023
+SlowpokeWellB1F_BlockData:
INCBIN "maps/SlowpokeWellB1F.blk"
-; 0xb007d
-SlowpokeWellB2F_BlockData: ; 0xb007d
+SlowpokeWellB2F_BlockData:
INCBIN "maps/SlowpokeWellB2F.blk"
-; 0xb00d7
-IlexForest_BlockData: ; 0xb00d7
+IlexForest_BlockData:
INCBIN "maps/IlexForest.blk"
-; 0xb026c
-DarkCaveVioletEntrance_BlockData: ; 0xb026c
+DarkCaveVioletEntrance_BlockData:
INCBIN "maps/DarkCaveVioletEntrance.blk"
-; 0xb03d4
-DarkCaveBlackthornEntrance_BlockData: ; 0xb03d4
+DarkCaveBlackthornEntrance_BlockData:
INCBIN "maps/DarkCaveBlackthornEntrance.blk"
-; 0xb04e2
-RuinsofAlphResearchCenter_BlockData: ; 0xb04e2
+RuinsofAlphResearchCenter_BlockData:
INCBIN "maps/RuinsofAlphResearchCenter.blk"
-; 0xb04f2
-GoldenrodBikeShop_BlockData: ; 0xb04f2
+GoldenrodBikeShop_BlockData:
INCBIN "maps/GoldenrodBikeShop.blk"
-; 0xb0502
-DanceTheatre_BlockData: ; 0xb0502
+DanceTheatre_BlockData:
INCBIN "maps/DanceTheatre.blk"
-; 0xb052c
-EcruteakHouse_BlockData: ; 0xb052c
+EcruteakHouse_BlockData:
INCBIN "maps/EcruteakHouse.blk"
-; 0xb0586
-GoldenrodGameCorner_BlockData: ; 0xb0586
+GoldenrodGameCorner_BlockData:
INCBIN "maps/GoldenrodGameCorner.blk"
-; 0xb05cc
-Route35NationalParkgate_BlockData: ; 0xb05cc
+Route35NationalParkgate_BlockData:
INCBIN "maps/Route35NationalParkgate.blk"
-; 0xb05dc
-Route36NationalParkgate_BlockData: ; 0xb05dc
+Route36NationalParkgate_BlockData:
INCBIN "maps/Route36NationalParkgate.blk"
-; 0xb05f0
-FastShip1F_BlockData: ; 0xb05f0
+FastShip1F_BlockData:
INCBIN "maps/FastShip1F.blk"
-; 0xb0680
-FastShipB1F_BlockData: ; 0xb0680
+FastShipB1F_BlockData:
INCBIN "maps/FastShipB1F.blk"
-; 0xb0700
-BetaSsAquaInsideCutOut_BlockData: ; 0xb0700
+BetaSsAquaInsideCutOut_BlockData:
INCBIN "maps/BetaSsAquaInsideCutOut.blk"
-; 0xb0710
-FastShipCabins_NNW_NNE_NE_BlockData: ; 0xb0710
+FastShipCabins_NNW_NNE_NE_BlockData:
INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk"
-; 0xb0750
-FastShipCabins_SW_SSW_NW_BlockData: ; 0xb0750
+FastShipCabins_SW_SSW_NW_BlockData:
INCBIN "maps/FastShipCabins_SW_SSW_NW.blk"
-; 0xb0790
-FastShipCabins_SE_SSE_CaptainsCabin_BlockData: ; 0xb0790
+FastShipCabins_SE_SSE_CaptainsCabin_BlockData:
INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk"
-; 0xb07e5
-OlivinePort_BlockData: ; 0xb07e5
+OlivinePort_BlockData:
INCBIN "maps/OlivinePort.blk"
-; 0xb0899
-VermilionPort_BlockData: ; 0xb0899
+VermilionPort_BlockData:
INCBIN "maps/VermilionPort.blk"
-; 0xb094d
-OlivineCafe_BlockData: ; 0xb094d
+OlivineCafe_BlockData:
SafariZoneMainOffice_BlockData:
INCBIN "maps/OlivineCafe.blk"
-; 0xb095d
-KrissHouse2F_BlockData: ; 0xb095d
+KrissHouse2F_BlockData:
INCBIN "maps/KrissHouse2F.blk"
-; 0xb0969
-SaffronTrainStation_BlockData: ; 0xb0969
+SaffronTrainStation_BlockData:
INCBIN "maps/SaffronTrainStation.blk"
-; 0xb09c3
-CeruleanGym_BlockData: ; 0xb09c3
+CeruleanGym_BlockData:
INCBIN "maps/CeruleanGym.blk"
-; 0xb09eb
-VermilionGym_BlockData: ; 0xb09eb
+VermilionGym_BlockData:
INCBIN "maps/VermilionGym.blk"
-; 0xb0a18
-SaffronGym_BlockData: ; 0xb0a18
+SaffronGym_BlockData:
INCBIN "maps/SaffronGym.blk"
-; 0xb0a72
-PowerPlant_BlockData: ; 0xb0a72
+PowerPlant_BlockData:
INCBIN "maps/PowerPlant.blk"
-; 0xb0acc
-PokemonFanClub_BlockData: ; 0xb0acc
+PokemonFanClub_BlockData:
SafariZoneWardensHome_BlockData:
INCBIN "maps/PokemonFanClub.blk"
-; 0xb0ae0
-FightingDojo_BlockData: ; 0xb0ae0
+FightingDojo_BlockData:
INCBIN "maps/FightingDojo.blk"
-; 0xb0afe
-SilphCo1F_BlockData: ; 0xb0afe
+SilphCo1F_BlockData:
INCBIN "maps/SilphCo1F.blk"
-; 0xb0b1e
-ViridianGym_BlockData: ; 0xb0b1e
+ViridianGym_BlockData:
INCBIN "maps/ViridianGym.blk"
-; 0xb0b4b
-TrainerHouse1F_BlockData: ; 0xb0b4b
+TrainerHouse1F_BlockData:
INCBIN "maps/TrainerHouse1F.blk"
-; 0xb0b6e
-TrainerHouseB1F_BlockData: ; 0xb0b6e
+TrainerHouseB1F_BlockData:
INCBIN "maps/TrainerHouseB1F.blk"
-; 0xb0b96
-RedsHouse1F_BlockData: ; 0xb0b96
+RedsHouse1F_BlockData:
INCBIN "maps/RedsHouse1F.blk"
-; 0xb0ba6
-RedsHouse2F_BlockData: ; 0xb0ba6
+RedsHouse2F_BlockData:
INCBIN "maps/RedsHouse2F.blk"
-; 0xb0bb6
-OaksLab_BlockData: ; 0xb0bb6
+OaksLab_BlockData:
INCBIN "maps/OaksLab.blk"
-; 0xb0bd4
-MrFujisHouse_BlockData: ; 0xb0bd4
+MrFujisHouse_BlockData:
INCBIN "maps/MrFujisHouse.blk"
-; 0xb0be8
-LavRadioTower1F_BlockData: ; 0xb0be8
+LavRadioTower1F_BlockData:
INCBIN "maps/LavRadioTower1F.blk"
-; 0xb0c10
-SilverCaveItemRooms_BlockData: ; 0xb0c10
+SilverCaveItemRooms_BlockData:
INCBIN "maps/SilverCaveItemRooms.blk"
-; 0xb0c6a
-DayCare_BlockData: ; 0xb0c6a
+DayCare_BlockData:
INCBIN "maps/DayCare.blk"
-; 0xb0c7e
-SoulHouse_BlockData: ; 0xb0c7e
+SoulHouse_BlockData:
INCBIN "maps/SoulHouse.blk"
-; 0xb0c92
-PewterGym_BlockData: ; 0xb0c92
+PewterGym_BlockData:
INCBIN "maps/PewterGym.blk"
-; 0xb0cb5
-CeladonGym_BlockData: ; 0xb0cb5
+CeladonGym_BlockData:
INCBIN "maps/CeladonGym.blk"
-; 0xb0ce2
-BetaHouse2_BlockData: ; 0xb0ce2
+BetaHouse2_BlockData:
INCBIN "maps/BetaHouse2.blk"
-; 0xb0cf6
-CeladonCafe_BlockData: ; 0xb0cf6
+CeladonCafe_BlockData:
INCBIN "maps/CeladonCafe.blk"
-; 0xb0d0e
-BetaCeladonMansion_BlockData: ; 0xb0d0e
+BetaCeladonMansion_BlockData:
INCBIN "maps/BetaCeladonMansion.blk"
-; 0xb0d26
-RockTunnel1F_BlockData: ; 0xb0d26
+RockTunnel1F_BlockData:
INCBIN "maps/RockTunnel1F.blk"
-; 0xb0e34
-RockTunnelB1F_BlockData: ; 0xb0e34
+RockTunnelB1F_BlockData:
INCBIN "maps/RockTunnelB1F.blk"
-; 0xb0f42
-DiglettsCave_BlockData: ; 0xb0f42
+DiglettsCave_BlockData:
INCBIN "maps/DiglettsCave.blk"
-; 0xb0ff6
-MountMoon_BlockData: ; 0xb0ff6
+MountMoon_BlockData:
INCBIN "maps/MountMoon.blk"
-; 0xb107d
-SeafoamGym_BlockData: ; 0xb107d
+SeafoamGym_BlockData:
INCBIN "maps/SeafoamGym.blk"
-; 0xb1091
-MrPokemonsHouse_BlockData: ; 0xb1091
+MrPokemonsHouse_BlockData:
INCBIN "maps/MrPokemonsHouse.blk"
-; 0xb10a1
-VictoryRoadGate_BlockData: ; 0xb10a1
+VictoryRoadGate_BlockData:
INCBIN "maps/VictoryRoadGate.blk"
-; 0xb10fb
-OlivinePortPassage_BlockData: ; 0xb10fb
+OlivinePortPassage_BlockData:
VermilionPortPassage_BlockData:
INCBIN "maps/OlivinePortPassage.blk"
-; 0xb1155
-FuchsiaGym_BlockData: ; 0xb1155
+FuchsiaGym_BlockData:
INCBIN "maps/FuchsiaGym.blk"
-; 0xb1182
-SafariZoneBeta_BlockData: ; 0xb1182
+SafariZoneBeta_BlockData:
INCBIN "maps/SafariZoneBeta.blk"
-; 0xb1236
-Underground_BlockData: ; 0xb1236
+Underground_BlockData:
INCBIN "maps/Underground.blk"
-; 0xb1260
-Route39Barn_BlockData: ; 0xb1260
+Route39Barn_BlockData:
INCBIN "maps/Route39Barn.blk"
-; 0xb1270
-VictoryRoad_BlockData: ; 0xb1270
+VictoryRoad_BlockData:
INCBIN "maps/VictoryRoad.blk"
-; 0xb13d8
-Route23_BlockData: ; 0xb13d8
+Route23_BlockData:
INCBIN "maps/Route23.blk"
-; 0xb1432
-LancesRoom_BlockData: ; 0xb1432
+LancesRoom_BlockData:
INCBIN "maps/LancesRoom.blk"
-; 0xb146e
-HallOfFame_BlockData: ; 0xb146e
+HallOfFame_BlockData:
INCBIN "maps/HallOfFame.blk"
-; 0xb1491
-CopycatsHouse1F_BlockData: ; 0xb1491
+CopycatsHouse1F_BlockData:
INCBIN "maps/CopycatsHouse1F.blk"
-; 0xb14a1
-CopycatsHouse2F_BlockData: ; 0xb14a1
+CopycatsHouse2F_BlockData:
INCBIN "maps/CopycatsHouse2F.blk"
-; 0xb14b0
-GoldenrodFlowerShop_BlockData: ; 0xb14b0
+GoldenrodFlowerShop_BlockData:
INCBIN "maps/GoldenrodFlowerShop.blk"
-; 0xb14c0
-MountMoonSquare_BlockData: ; 0xb14c0
+MountMoonSquare_BlockData:
INCBIN "maps/MountMoonSquare.blk"
-; 0xb1547
-WiseTriosRoom_BlockData: ; 0xb1547
+WiseTriosRoom_BlockData:
INCBIN "maps/WiseTriosRoom.blk"
-; 0xb1557
-DragonsDen1F_BlockData: ; 0xb1557
+DragonsDen1F_BlockData:
INCBIN "maps/DragonsDen1F.blk"
-; 0xb1584
-DragonsDenB1F_BlockData: ; 0xb1584
+DragonsDenB1F_BlockData:
INCBIN "maps/DragonsDenB1F.blk"
-; 0xb16ec
-TohjoFalls_BlockData: ; 0xb16ec
+TohjoFalls_BlockData:
INCBIN "maps/TohjoFalls.blk"
-; 0xb1773
-RuinsofAlphHoOhItemRoom_BlockData: ; 0xb1773
+RuinsofAlphHoOhItemRoom_BlockData:
RuinsofAlphKabutoItemRoom_BlockData:
RuinsofAlphOmanyteItemRoom_BlockData:
RuinsofAlphAerodactylItemRoom_BlockData:
INCBIN "maps/RuinsofAlphHoOhItemRoom.blk"
-; 0xb1787
-RuinsofAlphHoOhWordRoom_BlockData: ; 0xb1787
+RuinsofAlphHoOhWordRoom_BlockData:
INCBIN "maps/RuinsofAlphHoOhWordRoom.blk"
-; 0xb17ff
-RuinsofAlphKabutoWordRoom_BlockData: ; 0xb17ff
+RuinsofAlphKabutoWordRoom_BlockData:
INCBIN "maps/RuinsofAlphKabutoWordRoom.blk"
-; 0xb1845
-RuinsofAlphOmanyteWordRoom_BlockData: ; 0xb1845
+RuinsofAlphOmanyteWordRoom_BlockData:
INCBIN "maps/RuinsofAlphOmanyteWordRoom.blk"
-; 0xb1895
-RuinsofAlphAerodactylWordRoom_BlockData: ; 0xb1895
+RuinsofAlphAerodactylWordRoom_BlockData:
INCBIN "maps/RuinsofAlphAerodactylWordRoom.blk"
-; 0xb18db
-DragonShrine_BlockData: ; 0xb18db
+DragonShrine_BlockData:
INCBIN "maps/DragonShrine.blk"
-; 0xb18f4
-BattleTower1F_BlockData: ; 0xb18f4
+BattleTower1F_BlockData:
INCBIN "maps/BattleTower1F.blk"
-; 0xb191c
-BattleTowerBattleRoom_BlockData: ; 0xb191c
+BattleTowerBattleRoom_BlockData:
INCBIN "maps/BattleTowerBattleRoom.blk"
-; 0xb192c
-GoldenrodPokeComCenter2FMobile_BlockData: ; 0xb192c
+GoldenrodPokeComCenter2FMobile_BlockData:
INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk"
-; 0xb1a2c
-MobileTradeRoomMobile_BlockData: ; 0xb1a2c
+MobileTradeRoomMobile_BlockData:
INCBIN "maps/MobileTradeRoomMobile.blk"
-; 0xb1a40
-MobileBattleRoom_BlockData: ; 0xb1a40
+MobileBattleRoom_BlockData:
INCBIN "maps/MobileBattleRoom.blk"
-; 0xb1a54
-BattleTowerHallway_BlockData: ; 0xb1a54
+BattleTowerHallway_BlockData:
INCBIN "maps/BattleTowerHallway.blk"
-; 0xb1a6a
-BattleTowerElevator_BlockData: ; 0xb1a6a
+BattleTowerElevator_BlockData:
INCBIN "maps/BattleTowerElevator.blk"
-; 0xb1a6e
-BattleTowerOutside_BlockData: ; 0xb1a6e
+BattleTowerOutside_BlockData:
INCBIN "maps/BattleTowerOutside.blk"
-; 0xb1afa
-BetaBlank_BlockData: ; 0xb1afa
+BetaBlank_BlockData:
INCBIN "maps/BetaBlank.blk"
-; 0xb1b22
-GoldenrodDeptStoreRoof_BlockData: ; 0xb1b22
+GoldenrodDeptStoreRoof_BlockData:
INCBIN "maps/GoldenrodDeptStoreRoof.blk"
-; 0xb1b42
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -1,5 +1,5 @@
-MapGroupPointers:: ; 0x94000
+MapGroupPointers::
; pointers to the first map header of each map group
dw MapGroup1
dw MapGroup2
--- a/maps/second_map_headers.asm
+++ b/maps/second_map_headers.asm
@@ -1,599 +1,599 @@
- map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST ; 0x94dd8
+ map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST
connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN
connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN
- map_header_2 CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST ; 0x94dfc
+ map_header_2 CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST
connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY
connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY
- map_header_2 VioletCity, VIOLET_CITY, $5, SOUTH | WEST | EAST ; 0x94e20
+ map_header_2 VioletCity, VIOLET_CITY, $5, SOUTH | WEST | EAST
connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY
connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY
connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY
- map_header_2 AzaleaTown, AZALEA_TOWN, $5, WEST | EAST ; 0x94e50
+ map_header_2 AzaleaTown, AZALEA_TOWN, $5, WEST | EAST
connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN
connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN
- map_header_2 CianwoodCity, CIANWOOD_CITY, $35, EAST ; 0x94e74
+ map_header_2 CianwoodCity, CIANWOOD_CITY, $35, EAST
connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY
- map_header_2 GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH ; 0x94e8c
+ map_header_2 GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH
connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY
connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY
- map_header_2 OlivineCity, OLIVINE_CITY, $35, NORTH | WEST ; 0x94eb0
+ map_header_2 OlivineCity, OLIVINE_CITY, $35, NORTH | WEST
connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY
connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY
- map_header_2 EcruteakCity, ECRUTEAK_CITY, $5, SOUTH | WEST | EAST ; 0x94ed4
+ map_header_2 EcruteakCity, ECRUTEAK_CITY, $5, SOUTH | WEST | EAST
connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY
connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY
connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY
- map_header_2 MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST ; 0x94f04
+ map_header_2 MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST
connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN
connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN
connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN
- map_header_2 LakeofRage, LAKE_OF_RAGE, $5, SOUTH ; 0x94f34
+ map_header_2 LakeofRage, LAKE_OF_RAGE, $5, SOUTH
connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE
- map_header_2 BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST ; 0x94f4c
+ map_header_2 BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST
connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY
connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY
- map_header_2 SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST ; 0x94f70
+ map_header_2 SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST
connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE
- map_header_2 Route26, ROUTE_26, $5, WEST ; 0x94f88
+ map_header_2 Route26, ROUTE_26, $5, WEST
connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26
- map_header_2 Route27, ROUTE_27, $35, WEST | EAST ; 0x94fa0
+ map_header_2 Route27, ROUTE_27, $35, WEST | EAST
connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27
connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27
- map_header_2 Route28, ROUTE_28, $2c, WEST ; 0x94fc4
+ map_header_2 Route28, ROUTE_28, $2c, WEST
connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28
- map_header_2 Route29, ROUTE_29, $5, NORTH | WEST | EAST ; 0x94fdc
+ map_header_2 Route29, ROUTE_29, $5, NORTH | WEST | EAST
connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29
connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29
connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29
- map_header_2 Route30, ROUTE_30, $5, NORTH | SOUTH ; 0x9500c
+ map_header_2 Route30, ROUTE_30, $5, NORTH | SOUTH
connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30
connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30
- map_header_2 Route31, ROUTE_31, $5, SOUTH | WEST ; 0x95030
+ map_header_2 Route31, ROUTE_31, $5, SOUTH | WEST
connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31
connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31
- map_header_2 Route32, ROUTE_32, $5, NORTH | SOUTH ; 0x95054
+ map_header_2 Route32, ROUTE_32, $5, NORTH | SOUTH
connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32
connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32
- map_header_2 Route33, ROUTE_33, $5, NORTH | WEST ; 0x95078
+ map_header_2 Route33, ROUTE_33, $5, NORTH | WEST
connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33
connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33
- map_header_2 Route34, ROUTE_34, $5, NORTH | EAST ; 0x9509c
+ map_header_2 Route34, ROUTE_34, $5, NORTH | EAST
connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34
connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34
- map_header_2 Route35, ROUTE_35, $5, NORTH | SOUTH ; 0x950c0
+ map_header_2 Route35, ROUTE_35, $5, NORTH | SOUTH
connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35
connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35
- map_header_2 Route36, ROUTE_36, $5, NORTH | SOUTH | EAST ; 0x950e4
+ map_header_2 Route36, ROUTE_36, $5, NORTH | SOUTH | EAST
connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36
connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36
connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36
- map_header_2 Route37, ROUTE_37, $5, NORTH | SOUTH ; 0x95114
+ map_header_2 Route37, ROUTE_37, $5, NORTH | SOUTH
connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37
connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37
- map_header_2 Route38, ROUTE_38, $5, WEST | EAST ; 0x95138
+ map_header_2 Route38, ROUTE_38, $5, WEST | EAST
connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38
connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38
- map_header_2 Route39, ROUTE_39, $5, SOUTH | EAST ; 0x9515c
+ map_header_2 Route39, ROUTE_39, $5, SOUTH | EAST
connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39
connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39
- map_header_2 Route40, ROUTE_40, $35, SOUTH | EAST ; 0x95180
+ map_header_2 Route40, ROUTE_40, $35, SOUTH | EAST
connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40
connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40
- map_header_2 Route41, ROUTE_41, $35, NORTH | WEST ; 0x951a4
+ map_header_2 Route41, ROUTE_41, $35, NORTH | WEST
connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41
connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41
- map_header_2 Route42, ROUTE_42, $5, WEST | EAST ; 0x951c8
+ map_header_2 Route42, ROUTE_42, $5, WEST | EAST
connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42
connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42
- map_header_2 Route43, ROUTE_43, $5, NORTH | SOUTH ; 0x951ec
+ map_header_2 Route43, ROUTE_43, $5, NORTH | SOUTH
connection north, LAKE_OF_RAGE, LakeofRage, -3, 2, 16, ROUTE_43
connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43
- map_header_2 Route44, ROUTE_44, $71, WEST | EAST ; 0x95210
+ map_header_2 Route44, ROUTE_44, $71, WEST | EAST
connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44
connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44
- map_header_2 Route45, ROUTE_45, $71, NORTH | WEST ; 0x95234
+ map_header_2 Route45, ROUTE_45, $71, NORTH | WEST
connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45
connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45
- map_header_2 Route46, ROUTE_46, $5, SOUTH | EAST ; 0x95258
+ map_header_2 Route46, ROUTE_46, $5, SOUTH | EAST
connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46
connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46
- map_header_2 PewterCity, PEWTER_CITY, $f, SOUTH | EAST ; 0x9527c
+ map_header_2 PewterCity, PEWTER_CITY, $f, SOUTH | EAST
connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY
connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY
- map_header_2 Route2, ROUTE_2, $f, NORTH | SOUTH ; 0x952a0
+ map_header_2 Route2, ROUTE_2, $f, NORTH | SOUTH
connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2
connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2
- map_header_2 ViridianCity, VIRIDIAN_CITY, $f, NORTH | SOUTH | WEST ; 0x952c4
+ map_header_2 ViridianCity, VIRIDIAN_CITY, $f, NORTH | SOUTH | WEST
connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY
connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY
connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY
- map_header_2 Route22, ROUTE_22, $2c, EAST ; 0x952f4
+ map_header_2 Route22, ROUTE_22, $2c, EAST
connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22
- map_header_2 Route1, ROUTE_1, $f, NORTH | SOUTH ; 0x9530c
+ map_header_2 Route1, ROUTE_1, $f, NORTH | SOUTH
connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1
connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1
- map_header_2 PalletTown, PALLET_TOWN, $f, NORTH | SOUTH ; 0x95330
+ map_header_2 PalletTown, PALLET_TOWN, $f, NORTH | SOUTH
connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN
connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN
- map_header_2 Route21, ROUTE_21, $43, NORTH | SOUTH ; 0x95354
+ map_header_2 Route21, ROUTE_21, $43, NORTH | SOUTH
connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21
connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21
- map_header_2 CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST ; 0x95378
+ map_header_2 CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST
connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND
connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND
- map_header_2 Route20, ROUTE_20, $43, WEST | EAST ; 0x9539c
+ map_header_2 Route20, ROUTE_20, $43, WEST | EAST
connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20
connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20
- map_header_2 Route19, ROUTE_19, $43, NORTH | WEST ; 0x953c0
+ map_header_2 Route19, ROUTE_19, $43, NORTH | WEST
connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19
connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19
- map_header_2 FuchsiaCity, FUCHSIA_CITY, $f, SOUTH | WEST | EAST ; 0x953e4
+ map_header_2 FuchsiaCity, FUCHSIA_CITY, $f, SOUTH | WEST | EAST
connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY
connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY
connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY
- map_header_2 Route18, ROUTE_18, $43, WEST | EAST ; 0x95414
+ map_header_2 Route18, ROUTE_18, $43, WEST | EAST
connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18
connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18
- map_header_2 Route17, ROUTE_17, $43, NORTH | EAST ; 0x95438
+ map_header_2 Route17, ROUTE_17, $43, NORTH | EAST
connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17
connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17
- map_header_2 Route16, ROUTE_16, $f, SOUTH | EAST ; 0x9545c
+ map_header_2 Route16, ROUTE_16, $f, SOUTH | EAST
connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16
connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16
- map_header_2 CeladonCity, CELADON_CITY, $f, WEST | EAST ; 0x95480
+ map_header_2 CeladonCity, CELADON_CITY, $f, WEST | EAST
connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY
connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY
- map_header_2 Route7, ROUTE_7, $f, WEST | EAST ; 0x954a4
+ map_header_2 Route7, ROUTE_7, $f, WEST | EAST
connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7
connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7
- map_header_2 Route15, ROUTE_15, $f, WEST | EAST ; 0x954c8
+ map_header_2 Route15, ROUTE_15, $f, WEST | EAST
connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15
connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15
- map_header_2 Route14, ROUTE_14, $43, NORTH | WEST ; 0x954ec
+ map_header_2 Route14, ROUTE_14, $43, NORTH | WEST
connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14
connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14
- map_header_2 Route13, ROUTE_13, $43, NORTH | SOUTH ; 0x95510
+ map_header_2 Route13, ROUTE_13, $43, NORTH | SOUTH
connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13
connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13
- map_header_2 Route12, ROUTE_12, $43, NORTH | SOUTH | WEST ; 0x95534
+ map_header_2 Route12, ROUTE_12, $43, NORTH | SOUTH | WEST
connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12
connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12
connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12
- map_header_2 Route11, ROUTE_11, $f, WEST | EAST ; 0x95564
+ map_header_2 Route11, ROUTE_11, $f, WEST | EAST
connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11
connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11
- map_header_2 LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST ; 0x95588
+ map_header_2 LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST
connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN
connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN
connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN
- map_header_2 VermilionCity, VERMILION_CITY, $43, NORTH | EAST ; 0x955b8
+ map_header_2 VermilionCity, VERMILION_CITY, $43, NORTH | EAST
connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY
connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY
- map_header_2 Route6, ROUTE_6, $f, NORTH | SOUTH ; 0x955dc
+ map_header_2 Route6, ROUTE_6, $f, NORTH | SOUTH
connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6
connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6
- map_header_2 SaffronCity, SAFFRON_CITY, $f, NORTH | SOUTH | WEST | EAST ; 0x95600
+ map_header_2 SaffronCity, SAFFRON_CITY, $f, NORTH | SOUTH | WEST | EAST
connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY
connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY
connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY
connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY
- map_header_2 Route5, ROUTE_5, $f, NORTH | SOUTH ; 0x9563c
+ map_header_2 Route5, ROUTE_5, $f, NORTH | SOUTH
connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5
connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5
- map_header_2 CeruleanCity, CERULEAN_CITY, $f, NORTH | SOUTH | WEST | EAST ; 0x95660
+ map_header_2 CeruleanCity, CERULEAN_CITY, $f, NORTH | SOUTH | WEST | EAST
connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY
connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY
connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY
connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY
- map_header_2 Route9, ROUTE_9, $2c, SOUTH | WEST ; 0x9569c
+ map_header_2 Route9, ROUTE_9, $2c, SOUTH | WEST
connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9
connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9
- map_header_2 Route24, ROUTE_24, $2c, NORTH | SOUTH ; 0x956c0
+ map_header_2 Route24, ROUTE_24, $2c, NORTH | SOUTH
connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24
connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24
- map_header_2 Route25, ROUTE_25, $2c, SOUTH ; 0x956e4
+ map_header_2 Route25, ROUTE_25, $2c, SOUTH
connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25
- map_header_2 Route3, ROUTE_3, $2c, WEST | EAST ; 0x956fc
+ map_header_2 Route3, ROUTE_3, $2c, WEST | EAST
connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3
connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3
- map_header_2 Route4, ROUTE_4, $2c, WEST | EAST ; 0x95720
+ map_header_2 Route4, ROUTE_4, $2c, WEST | EAST
connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4
connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4
- map_header_2 Route8, ROUTE_8, $2c, WEST | EAST ; 0x95744
+ map_header_2 Route8, ROUTE_8, $2c, WEST | EAST
connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8
connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8
- map_header_2 Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH ; 0x95768
+ map_header_2 Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH
connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH
connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH
- map_header_2 Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH ; 0x9578c
+ map_header_2 Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH
connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH
- map_header_2 Route23, ROUTE_23, $f, NONE ; 0x957b0
- map_header_2 SproutTower1F, SPROUT_TOWER_1F, $0, NONE ; 0x957bc
- map_header_2 SproutTower2F, SPROUT_TOWER_2F, $0, NONE ; 0x957c8
- map_header_2 SproutTower3F, SPROUT_TOWER_3F, $0, NONE ; 0x957d4
- map_header_2 TinTower1F, TIN_TOWER_1F, $0, NONE ; 0x957e0
- map_header_2 TinTower2F, TIN_TOWER_2F, $0, NONE ; 0x957ec
- map_header_2 TinTower3F, TIN_TOWER_3F, $0, NONE ; 0x957f8
- map_header_2 TinTower4F, TIN_TOWER_4F, $0, NONE ; 0x95804
- map_header_2 TinTower5F, TIN_TOWER_5F, $0, NONE ; 0x95810
- map_header_2 TinTower6F, TIN_TOWER_6F, $0, NONE ; 0x9581c
- map_header_2 TinTower7F, TIN_TOWER_7F, $0, NONE ; 0x95828
- map_header_2 TinTower8F, TIN_TOWER_8F, $0, NONE ; 0x95834
- map_header_2 TinTower9F, TIN_TOWER_9F, $0, NONE ; 0x95840
- map_header_2 BurnedTower1F, BURNED_TOWER_1F, $0, NONE ; 0x9584c
- map_header_2 BurnedTowerB1F, BURNED_TOWER_B1F, $9, NONE ; 0x95858
- map_header_2 NationalPark, NATIONAL_PARK, $0, NONE ; 0x95864
- map_header_2 NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $0, NONE ; 0x95870
- map_header_2 RadioTower1F, RADIO_TOWER_1F, $0, NONE ; 0x9587c
- map_header_2 RadioTower2F, RADIO_TOWER_2F, $0, NONE ; 0x95888
- map_header_2 RadioTower3F, RADIO_TOWER_3F, $0, NONE ; 0x95894
- map_header_2 RadioTower4F, RADIO_TOWER_4F, $0, NONE ; 0x958a0
- map_header_2 RadioTower5F, RADIO_TOWER_5F, $0, NONE ; 0x958ac
- map_header_2 RuinsofAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, NONE ; 0x958b8
- map_header_2 RuinsofAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, NONE ; 0x958c4
- map_header_2 RuinsofAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, NONE ; 0x958d0
- map_header_2 RuinsofAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, NONE ; 0x958dc
- map_header_2 RuinsofAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, NONE ; 0x958e8
- map_header_2 RuinsofAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, NONE ; 0x958f4
- map_header_2 RuinsofAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, NONE ; 0x95900
- map_header_2 RuinsofAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, NONE ; 0x9590c
- map_header_2 RuinsofAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, NONE ; 0x95918
- map_header_2 RuinsofAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, NONE ; 0x95924
- map_header_2 RuinsofAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, NONE ; 0x95930
- map_header_2 RuinsofAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, NONE ; 0x9593c
- map_header_2 RuinsofAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, NONE ; 0x95948
- map_header_2 RuinsofAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, NONE ; 0x95954
- map_header_2 RuinsofAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, NONE ; 0x95960
- map_header_2 UnionCave1F, UNION_CAVE_1F, $9, NONE ; 0x9596c
- map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, NONE ; 0x95978
- map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, NONE ; 0x95984
- map_header_2 SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $9, NONE ; 0x95990
- map_header_2 SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $9, NONE ; 0x9599c
- map_header_2 OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $0, NONE ; 0x959a8
- map_header_2 OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $0, NONE ; 0x959b4
- map_header_2 OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $0, NONE ; 0x959c0
- map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, NONE ; 0x959cc
- map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, NONE ; 0x959d8
- map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, NONE ; 0x959e4
- map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, NONE ; 0x959f0
- map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, NONE ; 0x959fc
- map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, NONE ; 0x95a08
- map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, NONE ; 0x95a14
- map_header_2 IlexForest, ILEX_FOREST, $5, NONE ; 0x95a20
- map_header_2 WarehouseEntrance, WAREHOUSE_ENTRANCE, $0, NONE ; 0x95a2c
- map_header_2 UndergroundPathSwitchRoomEntrances, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, $0, NONE ; 0x95a38
- map_header_2 GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $0, NONE ; 0x95a44
- map_header_2 UndergroundWarehouse, UNDERGROUND_WAREHOUSE, $0, NONE ; 0x95a50
- map_header_2 MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $9, NONE ; 0x95a5c
- map_header_2 MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $9, NONE ; 0x95a68
- map_header_2 MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $9, NONE ; 0x95a74
- map_header_2 MountMortarB1F, MOUNT_MORTAR_B1F, $9, NONE ; 0x95a80
- map_header_2 IcePath1F, ICE_PATH_1F, $9, NONE ; 0x95a8c
- map_header_2 IcePathB1F, ICE_PATH_B1F, $19, NONE ; 0x95a98
- map_header_2 IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, NONE ; 0x95aa4
- map_header_2 IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, NONE ; 0x95ab0
- map_header_2 IcePathB3F, ICE_PATH_B3F, $19, NONE ; 0x95abc
- map_header_2 WhirlIslandNW, WHIRL_ISLAND_NW, $9, NONE ; 0x95ac8
- map_header_2 WhirlIslandNE, WHIRL_ISLAND_NE, $9, NONE ; 0x95ad4
- map_header_2 WhirlIslandSW, WHIRL_ISLAND_SW, $9, NONE ; 0x95ae0
- map_header_2 WhirlIslandCave, WHIRL_ISLAND_CAVE, $9, NONE ; 0x95aec
- map_header_2 WhirlIslandSE, WHIRL_ISLAND_SE, $f, NONE ; 0x95af8
- map_header_2 WhirlIslandB1F, WHIRL_ISLAND_B1F, $9, NONE ; 0x95b04
- map_header_2 WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, NONE ; 0x95b10
- map_header_2 WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $f, NONE ; 0x95b1c
- map_header_2 SilverCaveRoom1, SILVER_CAVE_ROOM_1, $9, NONE ; 0x95b28
- map_header_2 SilverCaveRoom2, SILVER_CAVE_ROOM_2, $9, NONE ; 0x95b34
- map_header_2 SilverCaveRoom3, SILVER_CAVE_ROOM_3, $9, NONE ; 0x95b40
- map_header_2 SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $9, NONE ; 0x95b4c
- map_header_2 DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $9, NONE ; 0x95b58
- map_header_2 DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $9, NONE ; 0x95b64
- map_header_2 DragonsDen1F, DRAGONS_DEN_1F, $9, NONE ; 0x95b70
- map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, NONE ; 0x95b7c
- map_header_2 DragonShrine, DRAGON_SHRINE, $0, NONE ; 0x95b88
- map_header_2 TohjoFalls, TOHJO_FALLS, $9, NONE ; 0x95b94
- map_header_2 OlivinePokeCenter1F, OLIVINE_POKECENTER_1F, $0, NONE ; 0x95ba0
- map_header_2 OlivineGym, OLIVINE_GYM, $0, NONE ; 0x95bac
- map_header_2 OlivineVoltorbHouse, OLIVINE_VOLTORB_HOUSE, $0, NONE ; 0x95bb8
- map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, NONE ; 0x95bc4
- map_header_2 OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $0, NONE ; 0x95bd0
- map_header_2 OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $0, NONE ; 0x95bdc
- map_header_2 OlivineCafe, OLIVINE_CAFE, $0, NONE ; 0x95be8
- map_header_2 OlivineMart, OLIVINE_MART, $0, NONE ; 0x95bf4
- map_header_2 Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $0, NONE ; 0x95c00
- map_header_2 Route39Barn, ROUTE_39_BARN, $0, NONE ; 0x95c0c
- map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, NONE ; 0x95c18
- map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, NONE ; 0x95c24
- map_header_2 MahoganyGym, MAHOGANY_GYM, $0, NONE ; 0x95c30
- map_header_2 MahoganyPokeCenter1F, MAHOGANY_POKECENTER_1F, $0, NONE ; 0x95c3c
- map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, NONE ; 0x95c48
- map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, NONE ; 0x95c54
- map_header_2 MountMoon, MOUNT_MOON, $9, NONE ; 0x95c60
- map_header_2 Underground, UNDERGROUND, $0, NONE ; 0x95c6c
- map_header_2 RockTunnel1F, ROCK_TUNNEL_1F, $9, NONE ; 0x95c78
- map_header_2 RockTunnelB1F, ROCK_TUNNEL_B1F, $9, NONE ; 0x95c84
- map_header_2 SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $0, NONE ; 0x95c90
- map_header_2 SafariZoneBeta, SAFARI_ZONE_BETA, $13, NONE ; 0x95c9c
- map_header_2 VictoryRoad, VICTORY_ROAD, $1d, NONE ; 0x95ca8
- map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, NONE ; 0x95cb4
- map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, NONE ; 0x95cc0
- map_header_2 EcruteakPokeCenter1F, ECRUTEAK_POKECENTER_1F, $0, NONE ; 0x95ccc
- map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, NONE ; 0x95cd8
- map_header_2 DanceTheatre, DANCE_THEATRE, $0, NONE ; 0x95ce4
- map_header_2 EcruteakMart, ECRUTEAK_MART, $0, NONE ; 0x95cf0
- map_header_2 EcruteakGym, ECRUTEAK_GYM, $0, NONE ; 0x95cfc
- map_header_2 EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $0, NONE ; 0x95d08
- map_header_2 BlackthornGym1F, BLACKTHORN_GYM_1F, $0, NONE ; 0x95d14
- map_header_2 BlackthornGym2F, BLACKTHORN_GYM_2F, $0, NONE ; 0x95d20
- map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, NONE ; 0x95d2c
- map_header_2 BlackthornDodrioTradeHouse, BLACKTHORN_DODRIO_TRADE_HOUSE, $0, NONE ; 0x95d38
- map_header_2 BlackthornMart, BLACKTHORN_MART, $0, NONE ; 0x95d44
- map_header_2 BlackthornPokeCenter1F, BLACKTHORN_POKECENTER_1F, $0, NONE ; 0x95d50
- map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, NONE ; 0x95d5c
- map_header_2 CinnabarPokeCenter1F, CINNABAR_POKECENTER_1F, $0, NONE ; 0x95d68
- map_header_2 CinnabarPokeCenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, NONE ; 0x95d74
- map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, NONE ; 0x95d80
- map_header_2 SeafoamGym, SEAFOAM_GYM, $9, NONE ; 0x95d8c
- map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, NONE ; 0x95d98
- map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, NONE ; 0x95da4
- map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, NONE ; 0x95db0
- map_header_2 CeruleanPokeCenter1F, CERULEAN_POKECENTER_1F, $0, NONE ; 0x95dbc
- map_header_2 CeruleanPokeCenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, NONE ; 0x95dc8
- map_header_2 CeruleanGym, CERULEAN_GYM, $0, NONE ; 0x95dd4
- map_header_2 CeruleanMart, CERULEAN_MART, $0, NONE ; 0x95de0
- map_header_2 Route10PokeCenter1F, ROUTE_10_POKECENTER_1F, $0, NONE ; 0x95dec
- map_header_2 Route10PokeCenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, NONE ; 0x95df8
- map_header_2 PowerPlant, POWER_PLANT, $0, NONE ; 0x95e04
- map_header_2 BillsHouse, BILLS_HOUSE, $0, NONE ; 0x95e10
- map_header_2 AzaleaPokeCenter1F, AZALEA_POKECENTER_1F, $0, NONE ; 0x95e1c
- map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, NONE ; 0x95e28
- map_header_2 AzaleaMart, AZALEA_MART, $0, NONE ; 0x95e34
- map_header_2 KurtsHouse, KURTS_HOUSE, $0, NONE ; 0x95e40
- map_header_2 AzaleaGym, AZALEA_GYM, $0, NONE ; 0x95e4c
- map_header_2 LakeofRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, NONE ; 0x95e58
- map_header_2 LakeofRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, NONE ; 0x95e64
- map_header_2 Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $0, NONE ; 0x95e70
- map_header_2 Route43Gate, ROUTE_43_GATE, $0, NONE ; 0x95e7c
- map_header_2 VioletMart, VIOLET_MART, $0, NONE ; 0x95e88
- map_header_2 VioletGym, VIOLET_GYM, $0, NONE ; 0x95e94
- map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, NONE ; 0x95ea0
- map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, NONE ; 0x95eac
- map_header_2 VioletPokeCenter1F, VIOLET_POKECENTER_1F, $0, NONE ; 0x95eb8
- map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, NONE ; 0x95ec4
- map_header_2 Route32RuinsofAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, NONE ; 0x95ed0
- map_header_2 Route32PokeCenter1F, ROUTE_32_POKECENTER_1F, $0, NONE ; 0x95edc
- map_header_2 Route35Goldenrodgate, ROUTE_35_GOLDENROD_GATE, $0, NONE ; 0x95ee8
- map_header_2 Route35NationalParkgate, ROUTE_35_NATIONAL_PARK_GATE, $0, NONE ; 0x95ef4
- map_header_2 Route36RuinsofAlphgate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, NONE ; 0x95f00
- map_header_2 Route36NationalParkgate, ROUTE_36_NATIONAL_PARK_GATE, $0, NONE ; 0x95f0c
- map_header_2 GoldenrodGym, GOLDENROD_GYM, $0, NONE ; 0x95f18
- map_header_2 GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $0, NONE ; 0x95f24
- map_header_2 GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $0, NONE ; 0x95f30
- map_header_2 GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $0, NONE ; 0x95f3c
- map_header_2 GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $0, NONE ; 0x95f48
- map_header_2 GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $0, NONE ; 0x95f54
- map_header_2 GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $0, NONE ; 0x95f60
- map_header_2 GoldenrodNameRatersHouse, GOLDENROD_NAME_RATERS_HOUSE, $0, NONE ; 0x95f6c
- map_header_2 GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $0, NONE ; 0x95f78
- map_header_2 GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $0, NONE ; 0x95f84
- map_header_2 GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $0, NONE ; 0x95f90
- map_header_2 GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $0, NONE ; 0x95f9c
- map_header_2 GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $0, NONE ; 0x95fa8
- map_header_2 GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $0, NONE ; 0x95fb4
- map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, NONE ; 0x95fc0
- map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, NONE ; 0x95fcc
- map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, NONE ; 0x95fd8
- map_header_2 GoldenrodPokeCenter1F, GOLDENROD_POKECENTER_1F, $0, NONE ; 0x95fe4
- map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, NONE ; 0x95ff0
- map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, NONE ; 0x95ffc
- map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, NONE ; 0x96008
- map_header_2 DayCare, DAY_CARE, $0, NONE ; 0x96014
- map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, NONE ; 0x96020
- map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, NONE ; 0x9602c
- map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, NONE ; 0x96038
- map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, NONE ; 0x96044
- map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, NONE ; 0x96050
- map_header_2 VermilionMart, VERMILION_MART, $0, NONE ; 0x9605c
- map_header_2 VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $0, NONE ; 0x96068
- map_header_2 VermilionGym, VERMILION_GYM, $0, NONE ; 0x96074
- map_header_2 Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $0, NONE ; 0x96080
- map_header_2 Route6UndergroundEntrance, ROUTE_6_UNDERGROUND_ENTRANCE, $0, NONE ; 0x9608c
- map_header_2 RedsHouse1F, REDS_HOUSE_1F, $0, NONE ; 0x96098
- map_header_2 RedsHouse2F, REDS_HOUSE_2F, $0, NONE ; 0x960a4
- map_header_2 BluesHouse, BLUES_HOUSE, $0, NONE ; 0x960b0
- map_header_2 OaksLab, OAKS_LAB, $0, NONE ; 0x960bc
- map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, NONE ; 0x960c8
- map_header_2 PewterGym, PEWTER_GYM, $0, NONE ; 0x960d4
- map_header_2 PewterMart, PEWTER_MART, $0, NONE ; 0x960e0
- map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, NONE ; 0x960ec
- map_header_2 PewterPokeCEnter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, NONE ; 0x960f8
- map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, NONE ; 0x96104
- map_header_2 OlivinePort, OLIVINE_PORT, $a, NONE ; 0x96110
- map_header_2 VermilionPort, VERMILION_PORT, $a, NONE ; 0x9611c
- map_header_2 FastShip1F, FAST_SHIP_1F, $0, NONE ; 0x96128
- map_header_2 FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $0, NONE ; 0x96134
- map_header_2 FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $0, NONE ; 0x96140
- map_header_2 FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $0, NONE ; 0x9614c
- map_header_2 FastShipB1F, FAST_SHIP_B1F, $0, NONE ; 0x96158
- map_header_2 OlivinePortPassage, OLIVINE_PORT_PASSAGE, $0, NONE ; 0x96164
- map_header_2 VermilionPortPassage, VERMILION_PORT_PASSAGE, $0, NONE ; 0x96170
- map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, NONE ; 0x9617c
- map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, NONE ; 0x96188
- map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, NONE ; 0x96194
- map_header_2 IndigoPlateauPokeCenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, NONE ; 0x961a0
- map_header_2 WillsRoom, WILLS_ROOM, $0, NONE ; 0x961ac
- map_header_2 KogasRoom, KOGAS_ROOM, $0, NONE ; 0x961b8
- map_header_2 BrunosRoom, BRUNOS_ROOM, $0, NONE ; 0x961c4
- map_header_2 KarensRoom, KARENS_ROOM, $0, NONE ; 0x961d0
- map_header_2 LancesRoom, LANCES_ROOM, $0, NONE ; 0x961dc
- map_header_2 HallOfFame, HALL_OF_FAME, $0, NONE ; 0x961e8
- map_header_2 FuchsiaMart, FUCHSIA_MART, $0, NONE ; 0x961f4
- map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, NONE ; 0x96200
- map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, NONE ; 0x9620c
- map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, NONE ; 0x96218
- map_header_2 FuchsiaPokeCenter1F, FUCHSIA_POKECENTER_1F, $0, NONE ; 0x96224
- map_header_2 FuchsiaPokeCenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, NONE ; 0x96230
- map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, NONE ; 0x9623c
- map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, NONE ; 0x96248
- map_header_2 LavenderPokeCenter1F, LAVENDER_POKECENTER_1F, $0, NONE ; 0x96254
- map_header_2 LavenderPokeCenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, NONE ; 0x96260
- map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, NONE ; 0x9626c
- map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, NONE ; 0x96278
- map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, NONE ; 0x96284
- map_header_2 LavenderMart, LAVENDER_MART, $0, NONE ; 0x96290
- map_header_2 SoulHouse, SOUL_HOUSE, $0, NONE ; 0x9629c
- map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, NONE ; 0x962a8
- map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, NONE ; 0x962b4
- map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, NONE ; 0x962c0
- map_header_2 SilverCavePokeCenter1F, SILVER_CAVE_POKECENTER_1F, $0, NONE ; 0x962cc
- map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, NONE ; 0x962d8
- map_header_2 PokeCenter2F, POKECENTER_2F, $0, NONE ; 0x962e4
- map_header_2 TradeCenter, TRADE_CENTER, $0, NONE ; 0x962f0
- map_header_2 Colosseum, COLOSSEUM, $0, NONE ; 0x962fc
- map_header_2 TimeCapsule, TIME_CAPSULE, $0, NONE ; 0x96308
- map_header_2 MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $0, NONE ; 0x96314
- map_header_2 MobileBattleRoom, MOBILE_BATTLE_ROOM, $0, NONE ; 0x96320
- map_header_2 CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $0, NONE ; 0x9632c
- map_header_2 CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $0, NONE ; 0x96338
- map_header_2 CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $0, NONE ; 0x96344
- map_header_2 CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $0, NONE ; 0x96350
- map_header_2 CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $0, NONE ; 0x9635c
- map_header_2 CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $0, NONE ; 0x96368
- map_header_2 CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $0, NONE ; 0x96374
- map_header_2 CeladonMansion1F, CELADON_MANSION_1F, $0, NONE ; 0x96380
- map_header_2 CeladonMansion2F, CELADON_MANSION_2F, $0, NONE ; 0x9638c
- map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, NONE ; 0x96398
- map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, NONE ; 0x963a4
- map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, NONE ; 0x963b0
- map_header_2 CeladonPokeCenter1F, CELADON_POKECENTER_1F, $0, NONE ; 0x963bc
- map_header_2 CeladonPokeCenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, NONE ; 0x963c8
- map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, NONE ; 0x963d4
- map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, NONE ; 0x963e0
- map_header_2 CeladonGym, CELADON_GYM, $0, NONE ; 0x963ec
- map_header_2 CeladonCafe, CELADON_CAFE, $0, NONE ; 0x963f8
- map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, NONE ; 0x96404
- map_header_2 Route16Gate, ROUTE_16_GATE, $0, NONE ; 0x96410
- map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, NONE ; 0x9641c
- map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, NONE ; 0x96428
- map_header_2 ManiasHouse, MANIAS_HOUSE, $0, NONE ; 0x96434
- map_header_2 CianwoodGym, CIANWOOD_GYM, $0, NONE ; 0x96440
- map_header_2 CianwoodPokeCenter1F, CIANWOOD_POKECENTER_1F, $0, NONE ; 0x9644c
- map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, NONE ; 0x96458
- map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, NONE ; 0x96464
- map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, NONE ; 0x96470
- map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, NONE ; 0x9647c
- map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, NONE ; 0x96488
- map_header_2 BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $0, NONE ; 0x96494
- map_header_2 BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $0, NONE ; 0x964a0
- map_header_2 BattleTowerHallway, BATTLE_TOWER_HALLWAY, $0, NONE ; 0x964ac
- map_header_2 Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $0, NONE ; 0x964b8
- map_header_2 BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $5, NONE ; 0x964c4
- map_header_2 ViridianGym, VIRIDIAN_GYM, $0, NONE ; 0x964d0
- map_header_2 ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $0, NONE ; 0x964dc
- map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, NONE ; 0x964e8
- map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, NONE ; 0x964f4
- map_header_2 ViridianMart, VIRIDIAN_MART, $0, NONE ; 0x96500
- map_header_2 ViridianPokeCenter1F, VIRIDIAN_POKECENTER_1F, $0, NONE ; 0x9650c
- map_header_2 ViridianPokeCenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, NONE ; 0x96518
- map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, NONE ; 0x96524
- map_header_2 Route2Gate, ROUTE_2_GATE, $0, NONE ; 0x96530
- map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, NONE ; 0x9653c
- map_header_2 ElmsLab, ELMS_LAB, $0, NONE ; 0x96548
- map_header_2 KrissHouse1F, KRISS_HOUSE_1F, $0, NONE ; 0x96554
- map_header_2 KrissHouse2F, KRISS_HOUSE_2F, $0, NONE ; 0x96560
- map_header_2 KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $0, NONE ; 0x9656c
- map_header_2 ElmsHouse, ELMS_HOUSE, $0, NONE ; 0x96578
- map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, NONE ; 0x96584
- map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, NONE ; 0x96590
- map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, NONE ; 0x9659c
- map_header_2 Route2946Gate, ROUTE_29_46_GATE, $0, NONE ; 0x965a8
- map_header_2 FightingDojo, FIGHTING_DOJO, $0, NONE ; 0x965b4
- map_header_2 SaffronGym, SAFFRON_GYM, $0, NONE ; 0x965c0
- map_header_2 SaffronMart, SAFFRON_MART, $0, NONE ; 0x965cc
- map_header_2 SaffronPokeCenter1F, SAFFRON_POKECENTER_1F, $0, NONE ; 0x965d8
- map_header_2 SaffronPokeCenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, NONE ; 0x965e4
- map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, NONE ; 0x965f0
- map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, NONE ; 0x965fc
- map_header_2 SilphCo1F, SILPH_CO_1F, $0, NONE ; 0x96608
- map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, NONE ; 0x96614
- map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, NONE ; 0x96620
- map_header_2 Route5UndergroundEntrance, ROUTE_5_UNDERGROUND_ENTRANCE, $0, NONE ; 0x9662c
- map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, NONE ; 0x96638
- map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, NONE ; 0x96644
- map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, NONE ; 0x96650
- map_header_2 CherrygrovePokeCenter1F, CHERRYGROVE_POKECENTER_1F, $0, NONE ; 0x9665c
- map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, NONE ; 0x96668
- map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, NONE ; 0x96674
- map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, NONE ; 0x96680
- map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, NONE ; 0x9668c
- map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, NONE ; 0x96698
- map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, NONE ; 0x966a4
+ map_header_2 Route23, ROUTE_23, $f, NONE
+ map_header_2 SproutTower1F, SPROUT_TOWER_1F, $0, NONE
+ map_header_2 SproutTower2F, SPROUT_TOWER_2F, $0, NONE
+ map_header_2 SproutTower3F, SPROUT_TOWER_3F, $0, NONE
+ map_header_2 TinTower1F, TIN_TOWER_1F, $0, NONE
+ map_header_2 TinTower2F, TIN_TOWER_2F, $0, NONE
+ map_header_2 TinTower3F, TIN_TOWER_3F, $0, NONE
+ map_header_2 TinTower4F, TIN_TOWER_4F, $0, NONE
+ map_header_2 TinTower5F, TIN_TOWER_5F, $0, NONE
+ map_header_2 TinTower6F, TIN_TOWER_6F, $0, NONE
+ map_header_2 TinTower7F, TIN_TOWER_7F, $0, NONE
+ map_header_2 TinTower8F, TIN_TOWER_8F, $0, NONE
+ map_header_2 TinTower9F, TIN_TOWER_9F, $0, NONE
+ map_header_2 BurnedTower1F, BURNED_TOWER_1F, $0, NONE
+ map_header_2 BurnedTowerB1F, BURNED_TOWER_B1F, $9, NONE
+ map_header_2 NationalPark, NATIONAL_PARK, $0, NONE
+ map_header_2 NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $0, NONE
+ map_header_2 RadioTower1F, RADIO_TOWER_1F, $0, NONE
+ map_header_2 RadioTower2F, RADIO_TOWER_2F, $0, NONE
+ map_header_2 RadioTower3F, RADIO_TOWER_3F, $0, NONE
+ map_header_2 RadioTower4F, RADIO_TOWER_4F, $0, NONE
+ map_header_2 RadioTower5F, RADIO_TOWER_5F, $0, NONE
+ map_header_2 RuinsofAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, NONE
+ map_header_2 RuinsofAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, NONE
+ map_header_2 RuinsofAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, NONE
+ map_header_2 RuinsofAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, NONE
+ map_header_2 RuinsofAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, NONE
+ map_header_2 RuinsofAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, NONE
+ map_header_2 RuinsofAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, NONE
+ map_header_2 RuinsofAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, NONE
+ map_header_2 RuinsofAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, NONE
+ map_header_2 RuinsofAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, NONE
+ map_header_2 RuinsofAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, NONE
+ map_header_2 RuinsofAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, NONE
+ map_header_2 RuinsofAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, NONE
+ map_header_2 RuinsofAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, NONE
+ map_header_2 RuinsofAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, NONE
+ map_header_2 UnionCave1F, UNION_CAVE_1F, $9, NONE
+ map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, NONE
+ map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, NONE
+ map_header_2 SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $9, NONE
+ map_header_2 SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $9, NONE
+ map_header_2 OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $0, NONE
+ map_header_2 OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $0, NONE
+ map_header_2 OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $0, NONE
+ map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, NONE
+ map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, NONE
+ map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, NONE
+ map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, NONE
+ map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, NONE
+ map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, NONE
+ map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, NONE
+ map_header_2 IlexForest, ILEX_FOREST, $5, NONE
+ map_header_2 WarehouseEntrance, WAREHOUSE_ENTRANCE, $0, NONE
+ map_header_2 UndergroundPathSwitchRoomEntrances, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, $0, NONE
+ map_header_2 GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $0, NONE
+ map_header_2 UndergroundWarehouse, UNDERGROUND_WAREHOUSE, $0, NONE
+ map_header_2 MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $9, NONE
+ map_header_2 MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $9, NONE
+ map_header_2 MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $9, NONE
+ map_header_2 MountMortarB1F, MOUNT_MORTAR_B1F, $9, NONE
+ map_header_2 IcePath1F, ICE_PATH_1F, $9, NONE
+ map_header_2 IcePathB1F, ICE_PATH_B1F, $19, NONE
+ map_header_2 IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, NONE
+ map_header_2 IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, NONE
+ map_header_2 IcePathB3F, ICE_PATH_B3F, $19, NONE
+ map_header_2 WhirlIslandNW, WHIRL_ISLAND_NW, $9, NONE
+ map_header_2 WhirlIslandNE, WHIRL_ISLAND_NE, $9, NONE
+ map_header_2 WhirlIslandSW, WHIRL_ISLAND_SW, $9, NONE
+ map_header_2 WhirlIslandCave, WHIRL_ISLAND_CAVE, $9, NONE
+ map_header_2 WhirlIslandSE, WHIRL_ISLAND_SE, $f, NONE
+ map_header_2 WhirlIslandB1F, WHIRL_ISLAND_B1F, $9, NONE
+ map_header_2 WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, NONE
+ map_header_2 WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $f, NONE
+ map_header_2 SilverCaveRoom1, SILVER_CAVE_ROOM_1, $9, NONE
+ map_header_2 SilverCaveRoom2, SILVER_CAVE_ROOM_2, $9, NONE
+ map_header_2 SilverCaveRoom3, SILVER_CAVE_ROOM_3, $9, NONE
+ map_header_2 SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $9, NONE
+ map_header_2 DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $9, NONE
+ map_header_2 DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $9, NONE
+ map_header_2 DragonsDen1F, DRAGONS_DEN_1F, $9, NONE
+ map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, NONE
+ map_header_2 DragonShrine, DRAGON_SHRINE, $0, NONE
+ map_header_2 TohjoFalls, TOHJO_FALLS, $9, NONE
+ map_header_2 OlivinePokeCenter1F, OLIVINE_POKECENTER_1F, $0, NONE
+ map_header_2 OlivineGym, OLIVINE_GYM, $0, NONE
+ map_header_2 OlivineVoltorbHouse, OLIVINE_VOLTORB_HOUSE, $0, NONE
+ map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, NONE
+ map_header_2 OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $0, NONE
+ map_header_2 OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $0, NONE
+ map_header_2 OlivineCafe, OLIVINE_CAFE, $0, NONE
+ map_header_2 OlivineMart, OLIVINE_MART, $0, NONE
+ map_header_2 Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $0, NONE
+ map_header_2 Route39Barn, ROUTE_39_BARN, $0, NONE
+ map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, NONE
+ map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, NONE
+ map_header_2 MahoganyGym, MAHOGANY_GYM, $0, NONE
+ map_header_2 MahoganyPokeCenter1F, MAHOGANY_POKECENTER_1F, $0, NONE
+ map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, NONE
+ map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, NONE
+ map_header_2 MountMoon, MOUNT_MOON, $9, NONE
+ map_header_2 Underground, UNDERGROUND, $0, NONE
+ map_header_2 RockTunnel1F, ROCK_TUNNEL_1F, $9, NONE
+ map_header_2 RockTunnelB1F, ROCK_TUNNEL_B1F, $9, NONE
+ map_header_2 SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $0, NONE
+ map_header_2 SafariZoneBeta, SAFARI_ZONE_BETA, $13, NONE
+ map_header_2 VictoryRoad, VICTORY_ROAD, $1d, NONE
+ map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, NONE
+ map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, NONE
+ map_header_2 EcruteakPokeCenter1F, ECRUTEAK_POKECENTER_1F, $0, NONE
+ map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, NONE
+ map_header_2 DanceTheatre, DANCE_THEATRE, $0, NONE
+ map_header_2 EcruteakMart, ECRUTEAK_MART, $0, NONE
+ map_header_2 EcruteakGym, ECRUTEAK_GYM, $0, NONE
+ map_header_2 EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $0, NONE
+ map_header_2 BlackthornGym1F, BLACKTHORN_GYM_1F, $0, NONE
+ map_header_2 BlackthornGym2F, BLACKTHORN_GYM_2F, $0, NONE
+ map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, NONE
+ map_header_2 BlackthornDodrioTradeHouse, BLACKTHORN_DODRIO_TRADE_HOUSE, $0, NONE
+ map_header_2 BlackthornMart, BLACKTHORN_MART, $0, NONE
+ map_header_2 BlackthornPokeCenter1F, BLACKTHORN_POKECENTER_1F, $0, NONE
+ map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, NONE
+ map_header_2 CinnabarPokeCenter1F, CINNABAR_POKECENTER_1F, $0, NONE
+ map_header_2 CinnabarPokeCenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, NONE
+ map_header_2 SeafoamGym, SEAFOAM_GYM, $9, NONE
+ map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, NONE
+ map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, NONE
+ map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, NONE
+ map_header_2 CeruleanPokeCenter1F, CERULEAN_POKECENTER_1F, $0, NONE
+ map_header_2 CeruleanPokeCenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 CeruleanGym, CERULEAN_GYM, $0, NONE
+ map_header_2 CeruleanMart, CERULEAN_MART, $0, NONE
+ map_header_2 Route10PokeCenter1F, ROUTE_10_POKECENTER_1F, $0, NONE
+ map_header_2 Route10PokeCenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 PowerPlant, POWER_PLANT, $0, NONE
+ map_header_2 BillsHouse, BILLS_HOUSE, $0, NONE
+ map_header_2 AzaleaPokeCenter1F, AZALEA_POKECENTER_1F, $0, NONE
+ map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, NONE
+ map_header_2 AzaleaMart, AZALEA_MART, $0, NONE
+ map_header_2 KurtsHouse, KURTS_HOUSE, $0, NONE
+ map_header_2 AzaleaGym, AZALEA_GYM, $0, NONE
+ map_header_2 LakeofRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, NONE
+ map_header_2 LakeofRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, NONE
+ map_header_2 Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $0, NONE
+ map_header_2 Route43Gate, ROUTE_43_GATE, $0, NONE
+ map_header_2 VioletMart, VIOLET_MART, $0, NONE
+ map_header_2 VioletGym, VIOLET_GYM, $0, NONE
+ map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, NONE
+ map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, NONE
+ map_header_2 VioletPokeCenter1F, VIOLET_POKECENTER_1F, $0, NONE
+ map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, NONE
+ map_header_2 Route32RuinsofAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, NONE
+ map_header_2 Route32PokeCenter1F, ROUTE_32_POKECENTER_1F, $0, NONE
+ map_header_2 Route35Goldenrodgate, ROUTE_35_GOLDENROD_GATE, $0, NONE
+ map_header_2 Route35NationalParkgate, ROUTE_35_NATIONAL_PARK_GATE, $0, NONE
+ map_header_2 Route36RuinsofAlphgate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, NONE
+ map_header_2 Route36NationalParkgate, ROUTE_36_NATIONAL_PARK_GATE, $0, NONE
+ map_header_2 GoldenrodGym, GOLDENROD_GYM, $0, NONE
+ map_header_2 GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $0, NONE
+ map_header_2 GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $0, NONE
+ map_header_2 GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $0, NONE
+ map_header_2 GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $0, NONE
+ map_header_2 GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $0, NONE
+ map_header_2 GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $0, NONE
+ map_header_2 GoldenrodNameRatersHouse, GOLDENROD_NAME_RATERS_HOUSE, $0, NONE
+ map_header_2 GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $0, NONE
+ map_header_2 GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $0, NONE
+ map_header_2 GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $0, NONE
+ map_header_2 GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $0, NONE
+ map_header_2 GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $0, NONE
+ map_header_2 GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $0, NONE
+ map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, NONE
+ map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, NONE
+ map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, NONE
+ map_header_2 GoldenrodPokeCenter1F, GOLDENROD_POKECENTER_1F, $0, NONE
+ map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, NONE
+ map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, NONE
+ map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, NONE
+ map_header_2 DayCare, DAY_CARE, $0, NONE
+ map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, NONE
+ map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, NONE
+ map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, NONE
+ map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, NONE
+ map_header_2 VermilionMart, VERMILION_MART, $0, NONE
+ map_header_2 VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $0, NONE
+ map_header_2 VermilionGym, VERMILION_GYM, $0, NONE
+ map_header_2 Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $0, NONE
+ map_header_2 Route6UndergroundEntrance, ROUTE_6_UNDERGROUND_ENTRANCE, $0, NONE
+ map_header_2 RedsHouse1F, REDS_HOUSE_1F, $0, NONE
+ map_header_2 RedsHouse2F, REDS_HOUSE_2F, $0, NONE
+ map_header_2 BluesHouse, BLUES_HOUSE, $0, NONE
+ map_header_2 OaksLab, OAKS_LAB, $0, NONE
+ map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, NONE
+ map_header_2 PewterGym, PEWTER_GYM, $0, NONE
+ map_header_2 PewterMart, PEWTER_MART, $0, NONE
+ map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, NONE
+ map_header_2 PewterPokeCEnter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, NONE
+ map_header_2 OlivinePort, OLIVINE_PORT, $a, NONE
+ map_header_2 VermilionPort, VERMILION_PORT, $a, NONE
+ map_header_2 FastShip1F, FAST_SHIP_1F, $0, NONE
+ map_header_2 FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $0, NONE
+ map_header_2 FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $0, NONE
+ map_header_2 FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $0, NONE
+ map_header_2 FastShipB1F, FAST_SHIP_B1F, $0, NONE
+ map_header_2 OlivinePortPassage, OLIVINE_PORT_PASSAGE, $0, NONE
+ map_header_2 VermilionPortPassage, VERMILION_PORT_PASSAGE, $0, NONE
+ map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, NONE
+ map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, NONE
+ map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, NONE
+ map_header_2 IndigoPlateauPokeCenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, NONE
+ map_header_2 WillsRoom, WILLS_ROOM, $0, NONE
+ map_header_2 KogasRoom, KOGAS_ROOM, $0, NONE
+ map_header_2 BrunosRoom, BRUNOS_ROOM, $0, NONE
+ map_header_2 KarensRoom, KARENS_ROOM, $0, NONE
+ map_header_2 LancesRoom, LANCES_ROOM, $0, NONE
+ map_header_2 HallOfFame, HALL_OF_FAME, $0, NONE
+ map_header_2 FuchsiaMart, FUCHSIA_MART, $0, NONE
+ map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, NONE
+ map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, NONE
+ map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, NONE
+ map_header_2 FuchsiaPokeCenter1F, FUCHSIA_POKECENTER_1F, $0, NONE
+ map_header_2 FuchsiaPokeCenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, NONE
+ map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, NONE
+ map_header_2 LavenderPokeCenter1F, LAVENDER_POKECENTER_1F, $0, NONE
+ map_header_2 LavenderPokeCenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, NONE
+ map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, NONE
+ map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, NONE
+ map_header_2 LavenderMart, LAVENDER_MART, $0, NONE
+ map_header_2 SoulHouse, SOUL_HOUSE, $0, NONE
+ map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, NONE
+ map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, NONE
+ map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, NONE
+ map_header_2 SilverCavePokeCenter1F, SILVER_CAVE_POKECENTER_1F, $0, NONE
+ map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, NONE
+ map_header_2 PokeCenter2F, POKECENTER_2F, $0, NONE
+ map_header_2 TradeCenter, TRADE_CENTER, $0, NONE
+ map_header_2 Colosseum, COLOSSEUM, $0, NONE
+ map_header_2 TimeCapsule, TIME_CAPSULE, $0, NONE
+ map_header_2 MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $0, NONE
+ map_header_2 MobileBattleRoom, MOBILE_BATTLE_ROOM, $0, NONE
+ map_header_2 CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $0, NONE
+ map_header_2 CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $0, NONE
+ map_header_2 CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $0, NONE
+ map_header_2 CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $0, NONE
+ map_header_2 CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $0, NONE
+ map_header_2 CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $0, NONE
+ map_header_2 CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $0, NONE
+ map_header_2 CeladonMansion1F, CELADON_MANSION_1F, $0, NONE
+ map_header_2 CeladonMansion2F, CELADON_MANSION_2F, $0, NONE
+ map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, NONE
+ map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, NONE
+ map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, NONE
+ map_header_2 CeladonPokeCenter1F, CELADON_POKECENTER_1F, $0, NONE
+ map_header_2 CeladonPokeCenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, NONE
+ map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, NONE
+ map_header_2 CeladonGym, CELADON_GYM, $0, NONE
+ map_header_2 CeladonCafe, CELADON_CAFE, $0, NONE
+ map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, NONE
+ map_header_2 Route16Gate, ROUTE_16_GATE, $0, NONE
+ map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, NONE
+ map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, NONE
+ map_header_2 ManiasHouse, MANIAS_HOUSE, $0, NONE
+ map_header_2 CianwoodGym, CIANWOOD_GYM, $0, NONE
+ map_header_2 CianwoodPokeCenter1F, CIANWOOD_POKECENTER_1F, $0, NONE
+ map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, NONE
+ map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, NONE
+ map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, NONE
+ map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, NONE
+ map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, NONE
+ map_header_2 BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $0, NONE
+ map_header_2 BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $0, NONE
+ map_header_2 BattleTowerHallway, BATTLE_TOWER_HALLWAY, $0, NONE
+ map_header_2 Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $0, NONE
+ map_header_2 BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $5, NONE
+ map_header_2 ViridianGym, VIRIDIAN_GYM, $0, NONE
+ map_header_2 ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $0, NONE
+ map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, NONE
+ map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, NONE
+ map_header_2 ViridianMart, VIRIDIAN_MART, $0, NONE
+ map_header_2 ViridianPokeCenter1F, VIRIDIAN_POKECENTER_1F, $0, NONE
+ map_header_2 ViridianPokeCenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, NONE
+ map_header_2 Route2Gate, ROUTE_2_GATE, $0, NONE
+ map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, NONE
+ map_header_2 ElmsLab, ELMS_LAB, $0, NONE
+ map_header_2 KrissHouse1F, KRISS_HOUSE_1F, $0, NONE
+ map_header_2 KrissHouse2F, KRISS_HOUSE_2F, $0, NONE
+ map_header_2 KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $0, NONE
+ map_header_2 ElmsHouse, ELMS_HOUSE, $0, NONE
+ map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, NONE
+ map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, NONE
+ map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, NONE
+ map_header_2 Route2946Gate, ROUTE_29_46_GATE, $0, NONE
+ map_header_2 FightingDojo, FIGHTING_DOJO, $0, NONE
+ map_header_2 SaffronGym, SAFFRON_GYM, $0, NONE
+ map_header_2 SaffronMart, SAFFRON_MART, $0, NONE
+ map_header_2 SaffronPokeCenter1F, SAFFRON_POKECENTER_1F, $0, NONE
+ map_header_2 SaffronPokeCenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, NONE
+ map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, NONE
+ map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, NONE
+ map_header_2 SilphCo1F, SILPH_CO_1F, $0, NONE
+ map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, NONE
+ map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, NONE
+ map_header_2 Route5UndergroundEntrance, ROUTE_5_UNDERGROUND_ENTRANCE, $0, NONE
+ map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, NONE
+ map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, NONE
+ map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, NONE
+ map_header_2 CherrygrovePokeCenter1F, CHERRYGROVE_POKECENTER_1F, $0, NONE
+ map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, NONE
+ map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, NONE
+ map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, NONE
+ map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, NONE
+ map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, NONE
+ map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, NONE