ref: e57e1ba63b2a2d966e516c8007a18463b0964b80
parent: bd022e179e51f1bf2af6f33685819c9c8c2ebf74
author: IIMarckus <iimarckus@gmail.com>
date: Thu Jun 25 18:01:08 EDT 2015
Improve some signpost labels.
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -121,6 +121,8 @@
EVENT_GOT_UP_GRADE EQU $0de
EVENT_GOT_TM07_ZAP_CANNON EQU $0df
EVENT_GOT_TM42_DREAM_EATER EQU $0e0
+EVENT_TALKED_TO_OAK_IN_KANTO EQU $0e1
+EVENT_GOT_HP_UP_FROM_VERMILION_GUY EQU $0e2
EVENT_GOT_TM29_PSYCHIC EQU $0e3
EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE EQU $0f9
EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM EQU $0fb
@@ -196,7 +198,7 @@
EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA EQU $322
EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA EQU $323
EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA EQU $324
-EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE EQU $325
+EVENT_LISTENED_TO_INITIAL_RADIO EQU $325
EVENT_WALL_OPENED_IN_HO_OH_CHAMBER EQU $326
EVENT_WALL_OPENED_IN_KABUTO_CHAMBER EQU $327
EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER EQU $328
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -49,7 +49,7 @@
add_special Function166d6
add_special Function1672a
add_special Function16936
- add_special Function2c547
+ add_special MoveDeletion
add_special Function16218
add_special Function8cc04
add_special SpecialNameRival
--- a/event/move_deleter.asm
+++ b/event/move_deleter.asm
@@ -1,4 +1,4 @@
-Function2c547: ; 2c547
+MoveDeletion:
ld hl, UnknownText_0x2c5ef
call PrintText
call YesNoBox
@@ -58,7 +58,6 @@
ld hl, UnknownText_0x2c5d1
call PrintText
ret
-; 2c5d1
UnknownText_0x2c5d1: ; 0x2c5d1
; That #MON knows only one move.
@@ -165,4 +164,3 @@
xor a
ld [hl], a
ret
-; 2c642
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -194,41 +194,32 @@
end
; 0x198117
-MapAzaleaTownSignpost0Script: ; 0x198117
- jumptext UnknownText_0x19865a
-; 0x19811a
+AzaleaTownSign:
+ jumptext AzaleaTownSignText
-MapAzaleaTownSignpost1Script: ; 0x19811a
- jumptext UnknownText_0x198693
-; 0x19811d
+KurtsHouseSign:
+ jumptext KurtsHouseSignText
-MapAzaleaTownSignpost2Script: ; 0x19811d
- jumptext UnknownText_0x1986a1
-; 0x198120
+AzaleaGymSign:
+ jumptext AzaleaGymSignText
-MapAzaleaTownSignpost3Script: ; 0x198120
- jumptext UnknownText_0x1986e7
-; 0x198123
+SlowpokeWellSign:
+ jumptext SlowpokeWellSignText
-MapAzaleaTownSignpost4Script: ; 0x198123
- jumptext UnknownText_0x19878d
-; 0x198126
+CharcoalKilnSign:
+ jumptext CharcoalKilnSignText
-MapAzaleaTownSignpost7Script: ; 0x198126
- jumptext UnknownText_0x19879c
-; 0x198129
+AzaleaTownIlextForestSign:
+ jumptext AzaleaTownIlexForestSignText
-MapAzaleaTownSignpost5Script: ; 0x198129
+AzaleaTownPokeCenterSign:
jumpstd pokecentersign
-; 0x19812c
-MapAzaleaTownSignpost6Script: ; 0x19812c
+AzaleaTownMartSign:
jumpstd martsign
-; 0x19812f
-FruitTreeScript_0x19812f: ; 0x19812f
+WhiteApricornTree:
fruittree $14
-; 0x198131
MapAzaleaTownSignpostItem8: ; 0x198131
dw $00b1
@@ -448,7 +439,7 @@
done
; 0x19865a
-UnknownText_0x19865a: ; 0x19865a
+AzaleaTownSignText:
text "AZALEA TOWN"
line "Where People and"
@@ -455,14 +446,12 @@
para "#MON Live in"
line "Happy Harmony"
done
-; 0x198693
-UnknownText_0x198693: ; 0x198693
+KurtsHouseSignText:
text "KURT'S HOUSE"
done
-; 0x1986a1
-UnknownText_0x1986a1: ; 0x1986a1
+AzaleaGymSignText:
text "AZALEA TOWN"
line "#MON GYM"
cont "LEADER: BUGSY"
@@ -471,9 +460,8 @@
line "Bug #MON"
cont "Encyclopedia"
done
-; 0x1986e7
-UnknownText_0x1986e7: ; 0x1986e7
+SlowpokeWellSignText:
text "SLOWPOKE WELL"
para "Also known as the"
@@ -489,20 +477,17 @@
para "ended a drought"
line "400 years ago."
done
-; 0x19878d
-UnknownText_0x19878d: ; 0x19878d
+CharcoalKilnSignText:
text "CHARCOAL KILN"
done
-; 0x19879c
-UnknownText_0x19879c: ; 0x19879c
+AzaleaTownIlexForestSignText:
text "ILEX FOREST"
para "Enter through the"
line "gate."
done
-; 0x1987c1
AzaleaTown_MapEventHeader: ; 0x1987c1
; filler
@@ -527,14 +512,14 @@
; signposts
db 9
- signpost 9, 19, $0, MapAzaleaTownSignpost0Script
- signpost 9, 10, $0, MapAzaleaTownSignpost1Script
- signpost 15, 14, $0, MapAzaleaTownSignpost2Script
- signpost 7, 29, $0, MapAzaleaTownSignpost3Script
- signpost 13, 19, $0, MapAzaleaTownSignpost4Script
- signpost 9, 16, $0, MapAzaleaTownSignpost5Script
- signpost 5, 22, $0, MapAzaleaTownSignpost6Script
- signpost 9, 3, $0, MapAzaleaTownSignpost7Script
+ signpost 9, 19, $0, AzaleaTownSign
+ signpost 9, 10, $0, KurtsHouseSign
+ signpost 15, 14, $0, AzaleaGymSign
+ signpost 7, 29, $0, SlowpokeWellSign
+ signpost 13, 19, $0, CharcoalKilnSign
+ signpost 9, 16, $0, AzaleaTownPokeCenterSign
+ signpost 5, 22, $0, AzaleaTownMartSign
+ signpost 9, 3, $0, AzaleaTownIlextForestSign
signpost 6, 31, $7, MapAzaleaTownSignpostItem8
; people-events
@@ -547,7 +532,7 @@
person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
- person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19812f, $ffff
+ person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, $ffff
person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, $06bf
person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, $06fc
person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, $07a4
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -109,7 +109,7 @@
writebyte $8
special Function170687
UnknownScript_0x9e454: ; 0x9e454
- musicfadeout $0000, $8
+ 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
domaptrigger GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $0
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -127,33 +127,26 @@
loadmovesprites
end
-MapBlackthornCitySignpost0Script: ; 0x1a4765
- jumptext UnknownText_0x1a4b67
-; 0x1a4768
+BlackthornCitySign:
+ jumptext BlackthornCitySignText
-MapBlackthornCitySignpost1Script: ; 0x1a4768
- jumptext UnknownText_0x1a4b91
-; 0x1a476b
+BlackthornGymSign:
+ jumptext BlackthornGymSignText
-MapBlackthornCitySignpost2Script: ; 0x1a476b
- jumptext UnknownText_0x1a4bd9
-; 0x1a476e
+MoveDeletersHouseSign:
+ jumptext MoveDeletersHouseSignText
-MapBlackthornCitySignpost3Script: ; 0x1a476e
- jumptext UnknownText_0x1a4bef
-; 0x1a4771
+DragonDensSign:
+ jumptext DragonDensSignText
-MapBlackthornCitySignpost4Script: ; 0x1a4771
- jumptext UnknownText_0x1a4c03
-; 0x1a4774
+BlackthornCityTrainerTips:
+ jumptext BlackthornCityTrainerTipsText
-MapBlackthornCitySignpost6Script: ; 0x1a4774
+BlackthornCityPokeCenterSign:
jumpstd pokecentersign
-; 0x1a4777
-MapBlackthornCitySignpost5Script: ; 0x1a4777
+BlackthornCityMartSign:
jumpstd martsign
-; 0x1a477a
UnknownText_0x1a477a: ; 0x1a477a
text "I am sorry."
@@ -296,15 +289,14 @@
done
; 0x1a4b67
-UnknownText_0x1a4b67: ; 0x1a4b67
+BlackthornCitySignText:
text "BLACKTHORN CITY"
para "A Quiet Mountain"
line "Retreat"
done
-; 0x1a4b91
-UnknownText_0x1a4b91: ; 0x1a4b91
+BlackthornGymSignText: ; 0x1a4b91
text "BLACKTHORN CITY"
line "#MON GYM"
cont "LEADER: CLAIR"
@@ -314,19 +306,17 @@
done
; 0x1a4bd9
-UnknownText_0x1a4bd9: ; 0x1a4bd9
+MoveDeletersHouseSignText:
text "MOVE DELETER'S"
line "HOUSE"
done
-; 0x1a4bef
-UnknownText_0x1a4bef: ; 0x1a4bef
+DragonDensSignText:
text "DRAGON'S DEN"
line "AHEAD"
done
-; 0x1a4c03
-UnknownText_0x1a4c03: ; 0x1a4c03
+BlackthornCityTrainerTipsText: ; 0x1a4c03
text "TRAINER TIPS"
para "A #MON holding"
@@ -358,13 +348,13 @@
; signposts
db 7
- signpost 24, 34, $0, MapBlackthornCitySignpost0Script
- signpost 13, 17, $0, MapBlackthornCitySignpost1Script
- signpost 31, 7, $0, MapBlackthornCitySignpost2Script
- signpost 3, 21, $0, MapBlackthornCitySignpost3Script
- signpost 25, 5, $0, MapBlackthornCitySignpost4Script
- signpost 29, 16, $0, MapBlackthornCitySignpost5Script
- signpost 29, 22, $0, MapBlackthornCitySignpost6Script
+ signpost 24, 34, $0, BlackthornCitySign
+ signpost 13, 17, $0, BlackthornGymSign
+ signpost 31, 7, $0, MoveDeletersHouseSign
+ signpost 3, 21, $0, DragonDensSign
+ signpost 25, 5, $0, BlackthornCityTrainerTips
+ signpost 29, 16, $0, BlackthornCityMartSign
+ signpost 29, 22, $0, BlackthornCityPokeCenterSign
; people-events
db 9
--- a/maps/BlackthornDodrioTradeHouse.asm
+++ b/maps/BlackthornDodrioTradeHouse.asm
@@ -4,9 +4,8 @@
; callback count
db 0
-; 0x195a2a
-LassScript_0x195a2a: ; 0x195a2a
+Emy:
faceplayer
loadfont
trade $3
@@ -13,11 +12,9 @@
closetext
loadmovesprites
end
-; 0x195a31
-MapBlackthornDodrioTradeHouseSignpost1Script: ; 0x195a31
+EmysHouseBookshelf:
jumpstd magazinebookshelf
-; 0x195a34
BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34
; filler
@@ -33,10 +30,10 @@
; signposts
db 2
- signpost 1, 0, $0, MapBlackthornDodrioTradeHouseSignpost1Script
- signpost 1, 1, $0, MapBlackthornDodrioTradeHouseSignpost1Script
+ signpost 1, 0, $0, EmysHouseBookshelf
+ signpost 1, 1, $0, EmysHouseBookshelf
; people-events
db 1
- person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, LassScript_0x195a2a, $ffff
+ person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, $ffff
; 0x195a5b
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -65,9 +65,8 @@
; 0x19575e
-BoulderScript_0x19575e: ; 0x19575e
+BlackthornGymBoulder:
jumpstd strengthboulder
-; 0x195761
TrainerCooltrainermCody: ; 0x195761
; bit/flag number
@@ -201,10 +200,9 @@
db 8
person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, $ffff
person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, $ffff
- person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0706
- person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0707
- person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0708
- person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
- person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
- person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
-; 0x195947
+ person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0706
+ person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0707
+ person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0708
+ person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff
+ person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff
+ person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -137,9 +137,8 @@
jumptextfaceplayer UnknownText_0x186002
; 0x185cc2
-RockScript_0x185cc2: ; 0x185cc2
+BurnedTower1FRock:
jumpstd smashrock
-; 0x185cc5
MapBurnedTower1FSignpostItem0: ; 0x185cc5
dw $0080
@@ -339,7 +338,7 @@
; people-events
db 5
- person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, RockScript_0x185cc2, $ffff
+ person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, $ffff
person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, $0765
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
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -123,9 +123,8 @@
db TM_20, 1
; 0x186233
-BoulderScript_0x186233: ; 0x186233
+BurnedTowerB1FBoulder:
jumpstd strengthboulder
-; 0x186236
MovementData_0x186236: ; 0x186236
db $39 ; movement
@@ -269,7 +268,7 @@
; people-events
db 9
- person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BoulderScript_0x186233, $ffff
+ person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, $ffff
person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, $074a
person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, $074a
person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, $074a
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -87,18 +87,17 @@
end
; 0x730ad
-MapCeladonCafeSignpost0Script: ; 0x730ad
- jumptext UnknownText_0x73285
-; 0x730b0
+EatathonContestPoster:
+ jumptext EatathonContestPosterText
-MapCeladonCafeSignpost1Script: ; 0x730b0
+CeladonCafeTrashcan:
checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
- iftrue UnknownScript_0x730db
+ iftrue .TrashEmpty
giveitem LEFTOVERS, $1
- iffalse UnknownScript_0x730cd
+ iffalse .PackFull
loadfont
itemtotext LEFTOVERS, $0
- writetext UnknownText_0x732e7
+ writetext FoundLeftoversText
playsound SFX_ITEM
waitbutton
itemnotify
@@ -105,22 +104,19 @@
loadmovesprites
setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
end
-; 0x730cd
-UnknownScript_0x730cd: ; 0x730cd
+.PackFull
loadfont
itemtotext LEFTOVERS, $0
- writetext UnknownText_0x732e7
+ writetext FoundLeftoversText
keeptextopen
- writetext UnknownText_0x732f7
+ writetext NoRoomForLeftoversText
closetext
loadmovesprites
end
-; 0x730db
-UnknownScript_0x730db: ; 0x730db
+.TrashEmpty
jumpstd trashcan
-; 0x730de
UnknownText_0x730de: ; 0x730de
text "Hi!"
@@ -199,7 +195,7 @@
done
; 0x73285
-UnknownText_0x73285: ; 0x73285
+EatathonContestPosterText:
text "Eatathon Contest!"
line "No time limit!"
@@ -209,21 +205,18 @@
para "muncher gets it"
line "all for free!"
done
-; 0x732e7
-UnknownText_0x732e7: ; 0x732e7
+FoundLeftoversText:
text $52, " found"
line "@"
text_from_ram StringBuffer3
text "!"
done
-; 0x732f7
-UnknownText_0x732f7: ; 0x732f7
+NoRoomForLeftoversText:
text "But ", $52, " can't"
line "hold another item…"
done
-; 0x73316
CeladonCafe_MapEventHeader: ; 0x73316
; filler
@@ -239,8 +232,8 @@
; signposts
db 2
- signpost 0, 5, $0, MapCeladonCafeSignpost0Script
- signpost 1, 7, $0, MapCeladonCafeSignpost1Script
+ signpost 0, 5, $0, EatathonContestPoster
+ signpost 1, 7, $0, CeladonCafeTrashcan
; people-events
db 5
@@ -249,4 +242,3 @@
person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, $ffff
person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, $ffff
person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, $ffff
-; 0x73371
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -7,88 +7,68 @@
; callbacks
- dbw 5, UnknownScript_0x1a9f3f
-; 0x1a9f3f
+ dbw 5, .Callback
-UnknownScript_0x1a9f3f: ; 0x1a9f3f
+.Callback
setflag $003d
return
-; 0x1a9f43
FisherScript_0x1a9f43: ; 0x1a9f43
jumptextfaceplayer UnknownText_0x1a9f7d
-; 0x1a9f46
-PoliwagScript_0x1a9f46: ; 0x1a9f46
+CeladonCityPoliwrath:
loadfont
- writetext UnknownText_0x1a9fcb
+ writetext CeladonCityPoliwrathText
cry POLIWRATH
closetext
loadmovesprites
end
-; 0x1a9f50
TeacherScript_0x1a9f50: ; 0x1a9f50
jumptextfaceplayer UnknownText_0x1a9fde
-; 0x1a9f53
GrampsScript_0x1a9f53: ; 0x1a9f53
jumptextfaceplayer UnknownText_0x1aa043
-; 0x1a9f56
GrampsScript_0x1a9f56: ; 0x1a9f56
jumptextfaceplayer UnknownText_0x1aa0dc
-; 0x1a9f59
YoungsterScript_0x1a9f59: ; 0x1a9f59
jumptextfaceplayer UnknownText_0x1aa115
-; 0x1a9f5c
YoungsterScript_0x1a9f5c: ; 0x1a9f5c
jumptextfaceplayer UnknownText_0x1aa155
-; 0x1a9f5f
TeacherScript_0x1a9f5f: ; 0x1a9f5f
jumptextfaceplayer UnknownText_0x1aa1bd
-; 0x1a9f62
LassScript_0x1a9f62: ; 0x1a9f62
jumptextfaceplayer UnknownText_0x1aa306
-; 0x1a9f65
-MapCeladonCitySignpost0Script: ; 0x1a9f65
- jumptext UnknownText_0x1aa340
-; 0x1a9f68
+CeladonCitySign: ; 0x1a9f65
+ jumptext CeladonCitySignText
-MapCeladonCitySignpost1Script: ; 0x1a9f68
- jumptext UnknownText_0x1aa369
-; 0x1a9f6b
+CeladonGymSign: ; 0x1a9f68
+ jumptext CeladonGymSignText
-MapCeladonCitySignpost2Script: ; 0x1a9f6b
- jumptext UnknownText_0x1aa3a9
-; 0x1a9f6e
+CeladonCityDeptStoreSign: ; 0x1a9f6b
+ jumptext CeladonCityDeptStoreSignText
-MapCeladonCitySignpost3Script: ; 0x1a9f6e
- jumptext UnknownText_0x1aa3d4
-; 0x1a9f71
+CeladonCityMansionSign: ; 0x1a9f6e
+ jumptext CeladonCityMansionSignText
-MapCeladonCitySignpost4Script: ; 0x1a9f71
- jumptext UnknownText_0x1aa3e5
-; 0x1a9f74
+CeladonCityGameCornerSign: ; 0x1a9f71
+ jumptext CeladonCityGameCornerSignText
-MapCeladonCitySignpost5Script: ; 0x1a9f74
- jumptext UnknownText_0x1aa418
-; 0x1a9f77
+CeladonCityTrainerTips: ; 0x1a9f74
+ jumptext CeladonCityTrainerTipsText
-MapCeladonCitySignpost6Script: ; 0x1a9f77
+CeladonCityPokeCenterSign: ; 0x1a9f77
jumpstd pokecentersign
-; 0x1a9f7a
MapCeladonCitySignpostItem7: ; 0x1a9f7a
dw $00fd
db PP_UP
-
-; 0x1a9f7d
UnknownText_0x1a9f7d: ; 0x1a9f7d
text "This POLIWRATH is"
@@ -100,10 +80,9 @@
done
; 0x1a9fcb
-UnknownText_0x1a9fcb: ; 0x1a9fcb
+CeladonCityPoliwrathText:
text "POLIWRATH: Croak!"
done
-; 0x1a9fde
UnknownText_0x1a9fde: ; 0x1a9fde
text "I lost at the slot"
@@ -210,7 +189,7 @@
done
; 0x1aa340
-UnknownText_0x1aa340: ; 0x1aa340
+CeladonCitySignText: ; 0x1aa340
text "CELADON CITY"
para "The City of"
@@ -218,7 +197,7 @@
done
; 0x1aa369
-UnknownText_0x1aa369: ; 0x1aa369
+CeladonGymSignText: ; 0x1aa369
text "CELADON CITY"
line "#MON GYM"
cont "LEADER: ERIKA"
@@ -228,7 +207,7 @@
done
; 0x1aa3a9
-UnknownText_0x1aa3a9: ; 0x1aa3a9
+CeladonCityDeptStoreSignText: ; 0x1aa3a9
text "Find What You"
line "Need at CELADON"
cont "DEPT.STORE!"
@@ -235,12 +214,12 @@
done
; 0x1aa3d4
-UnknownText_0x1aa3d4: ; 0x1aa3d4
+CeladonCityMansionSignText: ; 0x1aa3d4
text "CELADON MANSION"
done
; 0x1aa3e5
-UnknownText_0x1aa3e5: ; 0x1aa3e5
+CeladonCityGameCornerSignText: ; 0x1aa3e5
text "The Playground for"
line "Everybody--CELADON"
cont "GAME CORNER"
@@ -247,7 +226,7 @@
done
; 0x1aa418
-UnknownText_0x1aa418: ; 0x1aa418
+CeladonCityTrainerTipsText: ; 0x1aa418
text "TRAINER TIPS"
para "GUARD SPEC."
@@ -284,19 +263,19 @@
; signposts
db 8
- signpost 21, 23, $0, MapCeladonCitySignpost0Script
- signpost 31, 11, $0, MapCeladonCitySignpost1Script
- signpost 9, 6, $0, MapCeladonCitySignpost2Script
- signpost 9, 13, $0, MapCeladonCitySignpost3Script
- signpost 21, 19, $0, MapCeladonCitySignpost4Script
- signpost 21, 29, $0, MapCeladonCitySignpost5Script
- signpost 9, 30, $0, MapCeladonCitySignpost6Script
+ signpost 21, 23, $0, CeladonCitySign
+ signpost 31, 11, $0, CeladonGymSign
+ signpost 9, 6, $0, CeladonCityDeptStoreSign
+ signpost 9, 13, $0, CeladonCityMansionSign
+ signpost 21, 19, $0, CeladonCityGameCornerSign
+ signpost 21, 29, $0, CeladonCityTrainerTips
+ signpost 9, 30, $0, CeladonCityPokeCenterSign
signpost 21, 37, $7, MapCeladonCitySignpostItem7
; people-events
db 9
person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, $ffff
- person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, PoliwagScript_0x1a9f46, $ffff
+ person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, $ffff
person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, $ffff
person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, $ffff
person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, $ffff
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -1,32 +1,26 @@
-CeladonDeptStore1F_MapScriptHeader: ; 0x709de
+CeladonDeptStore1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x709e0
-ReceptionistScript_0x709e0: ; 0x709e0
+ReceptionistScript_0x709e0:
jumptextfaceplayer UnknownText_0x709ef
-; 0x709e3
-GentlemanScript_0x709e3: ; 0x709e3
+GentlemanScript_0x709e3:
jumptextfaceplayer UnknownText_0x70a35
-; 0x709e6
-TeacherScript_0x709e6: ; 0x709e6
+TeacherScript_0x709e6:
jumptextfaceplayer UnknownText_0x70aa9
-; 0x709e9
-MapCeladonDeptStore1FSignpost0Script: ; 0x709e9
- jumptext UnknownText_0x70aea
-; 0x709ec
+CeladonDeptStore1FDirectory:
+ jumptext CeladonDeptStore1FDirectoryText
-MapCeladonDeptStore6FSignpost1Script: ; 0x709ec
+CeladonDeptStore1FElevatorButton:
jumpstd elevatorbutton
-; 0x709ef
-UnknownText_0x709ef: ; 0x709ef
+UnknownText_0x709ef:
text "Hello! Welcome to"
line "CELADON DEPT."
cont "STORE!"
@@ -34,9 +28,8 @@
para "The directory is"
line "on the wall."
done
-; 0x70a35
-UnknownText_0x70a35: ; 0x70a35
+UnknownText_0x70a35:
text "This DEPT.STORE is"
line "part of the same"
@@ -47,9 +40,8 @@
line "renovated at the"
cont "same time."
done
-; 0x70aa9
-UnknownText_0x70aa9: ; 0x70aa9
+UnknownText_0x70aa9:
text "This is my first"
line "time here."
@@ -58,9 +50,8 @@
para "I'm afraid I'll"
line "get lost."
done
-; 0x70aea
-UnknownText_0x70aea: ; 0x70aea
+CeladonDeptStore1FDirectoryText:
text "1F: SERVICE"
line " COUNTER"
@@ -76,9 +67,8 @@
para "6F: ROOFTOP"
line " SQUARE"
done
-; 0x70b60
-CeladonDeptStore1F_MapEventHeader: ; 0x70b60
+CeladonDeptStore1F_MapEventHeader:
; filler
db 0, 0
@@ -94,8 +84,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapCeladonDeptStore1FSignpost0Script
- signpost 0, 3, $0, MapCeladonDeptStore6FSignpost1Script
+ signpost 0, 14, $0, CeladonDeptStore1FDirectory
+ signpost 0, 3, $0, CeladonDeptStore1FElevatorButton
; people-events
db 3
@@ -102,4 +92,3 @@
person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, $ffff
person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, $ffff
person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, $ffff
-; 0x70bab
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -1,44 +1,37 @@
-CeladonDeptStore2F_MapScriptHeader: ; 0x70bab
+CeladonDeptStore2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x70bad
-ClerkScript_0x70bad: ; 0x70bad
+ClerkScript_0x70bad:
faceplayer
loadfont
pokemart $0, $0017
loadmovesprites
end
-; 0x70bb5
-ClerkScript_0x70bb5: ; 0x70bb5
+ClerkScript_0x70bb5:
faceplayer
loadfont
pokemart $0, $0018
loadmovesprites
end
-; 0x70bbd
-PokefanMScript_0x70bbd: ; 0x70bbd
+PokefanMScript_0x70bbd:
jumptextfaceplayer UnknownText_0x70bc9
-; 0x70bc0
-YoungsterScript_0x70bc0: ; 0x70bc0
+YoungsterScript_0x70bc0:
jumptextfaceplayer UnknownText_0x70c3e
-; 0x70bc3
-MapCeladonDeptStore2FSignpost0Script: ; 0x70bc3
- jumptext UnknownText_0x70c9c
-; 0x70bc6
+CeladonDeptStore2FDirectory:
+ jumptext CeladonDeptStore2FDirectoryText
-MapCeladonDeptStore2FSignpost1Script: ; 0x70bc6
+CeladonDeptStore2FElevatorButton:
jumpstd elevatorbutton
-; 0x70bc9
-UnknownText_0x70bc9: ; 0x70bc9
+UnknownText_0x70bc9:
text "I just recently"
line "became a trainer."
@@ -49,9 +42,8 @@
line "the selection of"
cont "convenient items."
done
-; 0x70c3e
-UnknownText_0x70c3e: ; 0x70c3e
+UnknownText_0x70c3e:
text "My dad's having a"
line "hard time learning"
@@ -61,9 +53,8 @@
para "supposed to be"
line "used…"
done
-; 0x70c9c
-UnknownText_0x70c9c: ; 0x70c9c
+CeladonDeptStore2FDirectoryText:
text "Top Grade Items"
line "for Trainers!"
@@ -70,9 +61,8 @@
para "2F: TRAINER'S"
line " MARKET"
done
-; 0x70cd4
-CeladonDeptStore2F_MapEventHeader: ; 0x70cd4
+CeladonDeptStore2F_MapEventHeader:
; filler
db 0, 0
@@ -87,8 +77,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapCeladonDeptStore2FSignpost0Script
- signpost 0, 3, $0, MapCeladonDeptStore2FSignpost1Script
+ signpost 0, 14, $0, CeladonDeptStore2FDirectory
+ signpost 0, 3, $0, CeladonDeptStore2FElevatorButton
; people-events
db 4
@@ -96,4 +86,3 @@
person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, $ffff
person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, $ffff
person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, $ffff
-; 0x70d27
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -1,24 +1,21 @@
-CeladonDeptStore3F_MapScriptHeader: ; 0x70d27
+CeladonDeptStore3F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x70d29
-ClerkScript_0x70d29: ; 0x70d29
+ClerkScript_0x70d29:
faceplayer
loadfont
pokemart $0, $0019
loadmovesprites
end
-; 0x70d31
-YoungsterScript_0x70d31: ; 0x70d31
+YoungsterScript_0x70d31:
jumptextfaceplayer UnknownText_0x70d53
-; 0x70d34
-GameboyKidScript_0x70d34: ; 0x70d34
+GameboyKidScript_0x70d34:
faceplayer
loadfont
writetext UnknownText_0x70d86
@@ -26,9 +23,8 @@
loadmovesprites
spriteface $4, $0
end
-; 0x70d3f
-GameboyKidScript_0x70d3f: ; 0x70d3f
+GameboyKidScript_0x70d3f:
faceplayer
loadfont
writetext UnknownText_0x70dc7
@@ -36,21 +32,17 @@
loadmovesprites
spriteface $5, $0
end
-; 0x70d4a
-SuperNerdScript_0x70d4a: ; 0x70d4a
+SuperNerdScript_0x70d4a:
jumptextfaceplayer UnknownText_0x70e61
-; 0x70d4d
-MapCeladonDeptStore3FSignpost1Script: ; 0x70d4d
+CeladonDeptStore3FElevatorButton:
jumpstd elevatorbutton
-; 0x70d50
-MapCeladonDeptStore3FSignpost0Script: ; 0x70d50
- jumptext UnknownText_0x70e85
-; 0x70d53
+CeladonDeptStore3FDirectory:
+ jumptext CeladonDeptStore3FDirectoryText
-UnknownText_0x70d53: ; 0x70d53
+UnknownText_0x70d53:
text "I can't decide"
line "which #MON I"
@@ -57,9 +49,8 @@
para "should use this TM"
line "on…"
done
-; 0x70d86
-UnknownText_0x70d86: ; 0x70d86
+UnknownText_0x70d86:
text "Uh-oh! I traded my"
line "#MON without"
@@ -66,9 +57,8 @@
para "removing the UP-"
line "GRADE from it."
done
-; 0x70dc7
-UnknownText_0x70dc7: ; 0x70dc7
+UnknownText_0x70dc7:
text "Yeah! I'm finally"
line "getting a PORYGON!"
@@ -84,23 +74,20 @@
line "turned into a dif-"
cont "ferent #MON!"
done
-; 0x70e61
-UnknownText_0x70e61: ; 0x70e61
+UnknownText_0x70e61:
text "The TM SHOP sells"
line "some rare moves."
done
-; 0x70e85
-UnknownText_0x70e85: ; 0x70e85
+CeladonDeptStore3FDirectoryText:
text "3F: TM SHOP"
para "Make Your #MON"
line "Stronger!"
done
-; 0x70eab
-CeladonDeptStore3F_MapEventHeader: ; 0x70eab
+CeladonDeptStore3F_MapEventHeader:
; filler
db 0, 0
@@ -115,8 +102,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapCeladonDeptStore3FSignpost0Script
- signpost 0, 3, $0, MapCeladonDeptStore3FSignpost1Script
+ signpost 0, 14, $0, CeladonDeptStore3FDirectory
+ signpost 0, 3, $0, CeladonDeptStore3FElevatorButton
; people-events
db 5
@@ -125,4 +112,3 @@
person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, $ffff
person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, $ffff
person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, $ffff
-; 0x70f0b
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -1,43 +1,36 @@
-CeladonDeptStore4F_MapScriptHeader: ; 0x70f0b
+CeladonDeptStore4F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x70f0d
-ClerkScript_0x70f0d: ; 0x70f0d
+ClerkScript_0x70f0d:
faceplayer
loadfont
pokemart $0, $001a
loadmovesprites
end
-; 0x70f15
-SuperNerdScript_0x70f15: ; 0x70f15
+SuperNerdScript_0x70f15:
jumptextfaceplayer UnknownText_0x70f21
-; 0x70f18
-YoungsterScript_0x70f18: ; 0x70f18
+YoungsterScript_0x70f18:
jumptextfaceplayer UnknownText_0x70f55
-; 0x70f1b
-MapCeladonDeptStore4FSignpost0Script: ; 0x70f1b
- jumptext UnknownText_0x70f8c
-; 0x70f1e
+CeladonDeptStore4FDirectory:
+ jumptext CeladonDeptStore4FDirectoryText
-MapCeladonDeptStore4FSignpost1Script: ; 0x70f1e
+CeladonDeptStore4FElevatorButton:
jumpstd elevatorbutton
-; 0x70f21
-UnknownText_0x70f21: ; 0x70f21
+UnknownText_0x70f21:
text "I'm here to buy"
line "SURF MAIL to send"
cont "to my girlfriend."
done
-; 0x70f55
-UnknownText_0x70f55: ; 0x70f55
+UnknownText_0x70f55:
text "This is the only"
line "place where you"
@@ -44,17 +37,15 @@
para "can buy LOVELY"
line "MAIL."
done
-; 0x70f8c
-UnknownText_0x70f8c: ; 0x70f8c
+CeladonDeptStore4FDirectoryText:
text "Express Yourself"
line "With Gifts!"
para "4F: WISEMAN GIFTS"
done
-; 0x70fbc
-CeladonDeptStore4F_MapEventHeader: ; 0x70fbc
+CeladonDeptStore4F_MapEventHeader:
; filler
db 0, 0
@@ -69,8 +60,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapCeladonDeptStore4FSignpost0Script
- signpost 0, 3, $0, MapCeladonDeptStore4FSignpost1Script
+ signpost 0, 14, $0, CeladonDeptStore4FDirectory
+ signpost 0, 3, $0, CeladonDeptStore4FElevatorButton
; people-events
db 3
@@ -77,4 +68,3 @@
person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, $ffff
person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, $ffff
person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, $ffff
-; 0x71002
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -1,48 +1,40 @@
-CeladonDeptStore5F_MapScriptHeader: ; 0x71002
+CeladonDeptStore5F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x71004
-ClerkScript_0x71004: ; 0x71004
+ClerkScript_0x71004:
faceplayer
loadfont
pokemart $0, $001b
loadmovesprites
end
-; 0x7100c
-ClerkScript_0x7100c: ; 0x7100c
+ClerkScript_0x7100c:
faceplayer
loadfont
pokemart $0, $001c
loadmovesprites
end
-; 0x71014
-GentlemanScript_0x71014: ; 0x71014
+GentlemanScript_0x71014:
jumptextfaceplayer UnknownText_0x71023
-; 0x71017
-SailorScript_0x71017: ; 0x71017
+SailorScript_0x71017:
jumptextfaceplayer UnknownText_0x71072
-; 0x7101a
-TeacherScript_0x7101a: ; 0x7101a
+TeacherScript_0x7101a:
jumptextfaceplayer UnknownText_0x710b6
-; 0x7101d
-MapCeladonDeptStore5FSignpost0Script: ; 0x7101d
- jumptext UnknownText_0x71100
-; 0x71020
+CeladonDeptStore5FDirectory:
+ jumptext CeladonDeptStore5FDirectoryText
-MapCeladonDeptStore5FSignpost1Script: ; 0x71020
+CeladonDeptStore5FElevatorButton:
jumpstd elevatorbutton
-; 0x71023
-UnknownText_0x71023: ; 0x71023
+UnknownText_0x71023:
text "I want to buy some"
line "items that raise"
@@ -50,9 +42,8 @@
line "I don't have"
cont "enough money…"
done
-; 0x71072
-UnknownText_0x71072: ; 0x71072
+UnknownText_0x71072:
text "I want PP UP, so I"
line "can raise the PP"
@@ -59,9 +50,8 @@
para "of moves. But you"
line "can't buy it…"
done
-; 0x710b6
-UnknownText_0x710b6: ; 0x710b6
+UnknownText_0x710b6:
text "Using items on"
line "them makes #-"
cont "MON happy."
@@ -69,14 +59,12 @@
para "They hate certain"
line "items, though…"
done
-; 0x71100
-UnknownText_0x71100: ; 0x71100
+CeladonDeptStore5FDirectoryText:
text "5F: DRUG STORE"
done
-; 0x71110
-CeladonDeptStore5F_MapEventHeader: ; 0x71110
+CeladonDeptStore5F_MapEventHeader:
; filler
db 0, 0
@@ -91,8 +79,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapCeladonDeptStore5FSignpost0Script
- signpost 0, 3, $0, MapCeladonDeptStore5FSignpost1Script
+ signpost 0, 14, $0, CeladonDeptStore5FDirectory
+ signpost 0, 3, $0, CeladonDeptStore5FElevatorButton
; people-events
db 5
@@ -101,4 +89,3 @@
person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, $ffff
person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, $ffff
person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, $ffff
-; 0x71170
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -1,4 +1,4 @@
-CeladonDeptStore6F_MapScriptHeader: ; 0x71170
+CeladonDeptStore6F_MapScriptHeader:
; trigger count
db 0
@@ -8,97 +8,84 @@
; callbacks
dbw 1, UnknownScript_0x71175
-; 0x71175
-UnknownScript_0x71175: ; 0x71175
+UnknownScript_0x71175:
changeblock $c, $0, $3
return
-; 0x7117a
-SuperNerdScript_0x7117a: ; 0x7117a
+SuperNerdScript_0x7117a:
jumptextfaceplayer UnknownText_0x712c7
-; 0x7117d
-YoungsterScript_0x7117d: ; 0x7117d
+YoungsterScript_0x7117d:
jumptextfaceplayer UnknownText_0x71310
-; 0x71180
-MapCeladonDeptStore6FSignpost5Script: ; 0x71180
+CeladonVendingMachine:
loadfont
- writetext UnknownText_0x71250
-UnknownScript_0x71184: ; 0x71184
+ writetext CeladonVendingText
+.Start
special Function24ae8
- loadmenudata MenuDataHeader_0x71203
+ loadmenudata .MenuData
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x7119a
- if_equal $2, UnknownScript_0x711b4
- if_equal $3, UnknownScript_0x711ce
+ if_equal $1, .FreshWater
+ if_equal $2, .SodaPop
+ if_equal $3, .Lemonade
loadmovesprites
end
-; 0x7119a
-UnknownScript_0x7119a: ; 0x7119a
+.FreshWater
checkmoney $0, 200
- if_equal $2, UnknownScript_0x711f5
+ if_equal $2, .NotEnoughMoney
giveitem FRESH_WATER, $1
- iffalse UnknownScript_0x711fc
+ iffalse .NotEnoughSpace
takemoney $0, 200
itemtotext FRESH_WATER, $0
- jump UnknownScript_0x711e8
-; 0x711b4
+ jump .VendItem
-UnknownScript_0x711b4: ; 0x711b4
+.SodaPop
checkmoney $0, 300
- if_equal $2, UnknownScript_0x711f5
+ if_equal $2, .NotEnoughMoney
giveitem SODA_POP, $1
- iffalse UnknownScript_0x711fc
+ iffalse .NotEnoughSpace
takemoney $0, 300
itemtotext SODA_POP, $0
- jump UnknownScript_0x711e8
-; 0x711ce
+ jump .VendItem
-UnknownScript_0x711ce: ; 0x711ce
+.Lemonade
checkmoney $0, 350
- if_equal $2, UnknownScript_0x711f5
+ if_equal $2, .NotEnoughMoney
giveitem LEMONADE, $1
- iffalse UnknownScript_0x711fc
+ iffalse .NotEnoughSpace
takemoney $0, 350
itemtotext LEMONADE, $0
- jump UnknownScript_0x711e8
-; 0x711e8
+ jump .VendItem
-UnknownScript_0x711e8: ; 0x711e8
+.VendItem
pause 10
playsound SFX_ENTER_DOOR
- writetext UnknownText_0x71274
+ writetext CeladonClangText
keeptextopen
itemnotify
- jump UnknownScript_0x71184
-; 0x711f5
+ jump .Start
-UnknownScript_0x711f5: ; 0x711f5
- writetext UnknownText_0x7128e
+.NotEnoughMoney
+ writetext CeladonVendingNoMoneyText
closetext
- jump UnknownScript_0x71184
-; 0x711fc
+ jump .Start
-UnknownScript_0x711fc: ; 0x711fc
- writetext UnknownText_0x712a7
+.NotEnoughSpace
+ writetext CeladonVendingNoSpaceText
closetext
- jump UnknownScript_0x71184
-; 0x71203
+ jump .Start
-
-MenuDataHeader_0x71203: ; 0x71203
+.MenuData
db $40 ; flags
db 02, 00 ; start coords
db 11, 19 ; end coords
- dw MenuData2_0x7120b
+ dw .MenuData2
db 1 ; default option
-; 0x7120b
-MenuData2_0x7120b: ; 0x7120b
+.MenuData2
db $80 ; flags
db 4 ; items
db "FRESH WATER ¥200@"
@@ -105,24 +92,20 @@
db "SODA POP ¥300@"
db "LEMONADE ¥350@"
db "CANCEL@"
-; 0x71249
-MapCeladonDeptStore6FSignpost0Script: ; 0x7124a
- jumptext UnknownText_0x7133e
-; 0x7124d
+CeladonDeptStore6FDirectory:
+ jumptext CeladonDeptStore6FDirectoryText
-UnknownScript_0x7124d: ; 0x7124d
+UnknownScript_0x7124d:
jumpstd elevatorbutton
-; 0x71250
-UnknownText_0x71250: ; 0x71250
+CeladonVendingText:
text "A vending machine!"
line "Here's the menu."
done
-; 0x71274
-UnknownText_0x71274: ; 0x71274
+CeladonClangText:
text "Clang!"
para "@"
@@ -130,21 +113,18 @@
db $0
line "popped out."
done
-; 0x7128e
-UnknownText_0x7128e: ; 0x7128e
+CeladonVendingNoMoneyText:
text "Oops, not enough"
line "money…"
done
-; 0x712a7
-UnknownText_0x712a7: ; 0x712a7
+CeladonVendingNoSpaceText:
text "There's no more"
line "room for stuff…"
done
-; 0x712c7
-UnknownText_0x712c7: ; 0x712c7
+UnknownText_0x712c7:
text "A vending machine"
line "with a prize rou-"
cont "lette…"
@@ -152,23 +132,20 @@
para "You never see"
line "those anymore."
done
-; 0x71310
-UnknownText_0x71310: ; 0x71310
+UnknownText_0x71310:
text "Aww! There's no"
line "games here!"
para "I wanted to play…"
done
-; 0x7133e
-UnknownText_0x7133e: ; 0x7133e
+CeladonDeptStore6FDirectoryText:
text "6F: ROOFTOP SQUARE"
line "VENDING MACHINES"
done
-; 0x71363
-CeladonDeptStore6F_MapEventHeader: ; 0x71363
+CeladonDeptStore6F_MapEventHeader:
; filler
db 0, 0
@@ -182,15 +159,14 @@
; signposts
db 6
- signpost 0, 14, $0, MapCeladonDeptStore6FSignpost0Script
- signpost 0, 3, $0, MapCeladonDeptStore6FSignpost1Script
- signpost 1, 8, $1, MapCeladonDeptStore6FSignpost5Script
- signpost 1, 9, $1, MapCeladonDeptStore6FSignpost5Script
- signpost 1, 10, $1, MapCeladonDeptStore6FSignpost5Script
- signpost 1, 11, $1, MapCeladonDeptStore6FSignpost5Script
+ signpost 0, 14, $0, CeladonDeptStore6FDirectory
+ signpost 0, 3, $0, CeladonDeptStore1FElevatorButton
+ signpost 1, 8, $1, CeladonVendingMachine
+ signpost 1, 9, $1, CeladonVendingMachine
+ signpost 1, 10, $1, CeladonVendingMachine
+ signpost 1, 11, $1, CeladonVendingMachine
; people-events
db 2
person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, $ffff
person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, $ffff
-; 0x713ab
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -6,46 +6,40 @@
db 0
; 0x713ef
-GrannyScript_0x713ef: ; 0x713ef
- jumptextfaceplayer UnknownText_0x71416
-; 0x713f2
+CeladonMansionManager:
+ jumptextfaceplayer CeladonMansionManagerText
-GrowlitheScript_0x713f2: ; 0x713f2
+CeladonMansion1FMeowth:
loadfont
- writetext UnknownText_0x71470
+ writetext CeladonMansion1FMeowthText
cry MEOWTH
closetext
loadmovesprites
end
-; 0x713fc
-ClefairyScript_0x713fc: ; 0x713fc
+CeladonMansion1FClefairy:
loadfont
- writetext UnknownText_0x7147f
+ writetext CeladonMansion1FClefairyText
cry CLEFAIRY
closetext
loadmovesprites
end
-; 0x71406
-GrowlitheScript_0x71406: ; 0x71406
+CeladonMansion1FNidoranF:
loadfont
- writetext UnknownText_0x71496
+ writetext CeladonMansion1FNidoranFText
cry NIDORAN_F
closetext
loadmovesprites
end
-; 0x71410
-MapCeladonMansion1FSignpost0Script: ; 0x71410
- jumptext UnknownText_0x714ab
-; 0x71413
+CeladonMansionManagersSuiteSign:
+ jumptext CeladonMansionManagersSuiteSignText
-MapCeladonMansion1FSignpost2Script: ; 0x71413
+CeladonMansion1fBookshelf:
jumpstd picturebookshelf
-; 0x71416
-UnknownText_0x71416: ; 0x71416
+CeladonMansionManagerText:
text "My dear #MON"
line "keep me company,"
@@ -55,30 +49,25 @@
para "MEOWTH even brings"
line "money home."
done
-; 0x71470
-UnknownText_0x71470: ; 0x71470
+CeladonMansion1FMeowthText:
text "MEOWTH: Meow!"
done
-; 0x7147f
-UnknownText_0x7147f: ; 0x7147f
+CeladonMansion1FClefairyText:
text "CLEFAIRY: Clef"
line "cleff!"
done
-; 0x71496
-UnknownText_0x71496: ; 0x71496
+CeladonMansion1FNidoranFText:
text "NIDORAN: Kya"
line "kyaoo!"
done
-; 0x714ab
-UnknownText_0x714ab: ; 0x714ab
+CeladonMansionManagersSuiteSignText:
text "CELADON MANSION"
line "MANAGER'S SUITE"
done
-; 0x714cc
CeladonMansion1F_MapEventHeader: ; 0x714cc
; filler
@@ -97,14 +86,13 @@
; signposts
db 3
- signpost 8, 5, $1, MapCeladonMansion1FSignpost0Script
- signpost 3, 0, $0, MapCeladonMansion1FSignpost2Script
- signpost 3, 2, $0, MapCeladonMansion1FSignpost2Script
+ signpost 8, 5, $1, CeladonMansionManagersSuiteSign
+ signpost 3, 0, $0, CeladonMansion1fBookshelf
+ signpost 3, 2, $0, CeladonMansion1fBookshelf
; people-events
db 4
- person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, GrannyScript_0x713ef, $ffff
- person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x713f2, $ffff
- person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, ClefairyScript_0x713fc, $ffff
- person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x71406, $ffff
-; 0x7152e
+ person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, $ffff
+ person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, $ffff
+ person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, $ffff
+ person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, $ffff
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -1,24 +1,20 @@
-CeladonMansion2F_MapScriptHeader: ; 0x7152e
+CeladonMansion2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x71530
-MapCeladonMansion2FSignpost0Script: ; 0x71530
- jumptext UnknownText_0x71539
-; 0x71533
+CeladonMansion2FComputer:
+ jumptext CeladonMansion2FComputerText
-MapCeladonMansion2FSignpost1Script: ; 0x71533
- jumptext UnknownText_0x7162c
-; 0x71536
+CeladonMansion2FSign:
+ jumptext CeladonMansion2FSignText
-MapCeladonMansion2FSignpost2Script: ; 0x71536
+CeladonMansion2FBookshelf:
jumpstd difficultbookshelf
-; 0x71539
-UnknownText_0x71539: ; 0x71539
+CeladonMansion2FComputerText:
text $52, " turned on"
line "the PC."
@@ -47,15 +43,13 @@
para "…"
done
-; 0x7162c
-UnknownText_0x7162c: ; 0x7162c
+CeladonMansion2FSignText:
text "GAME FREAK"
line "MEETING ROOM"
done
-; 0x71645
-CeladonMansion2F_MapEventHeader: ; 0x71645
+CeladonMansion2F_MapEventHeader:
; filler
db 0, 0
@@ -71,10 +65,9 @@
; signposts
db 3
- signpost 3, 0, $0, MapCeladonMansion2FSignpost0Script
- signpost 8, 5, $1, MapCeladonMansion2FSignpost1Script
- signpost 3, 2, $0, MapCeladonMansion2FSignpost2Script
+ signpost 3, 0, $0, CeladonMansion2FComputer
+ signpost 8, 5, $1, CeladonMansion2FSign
+ signpost 3, 2, $0, CeladonMansion2FBookshelf
; people-events
db 0
-; 0x7166e
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -1,4 +1,4 @@
-CeruleanCity_MapScriptHeader: ; 0x184000
+CeruleanCity_MapScriptHeader:
; trigger count
db 0
@@ -7,15 +7,13 @@
; callbacks
- dbw 5, UnknownScript_0x184005
-; 0x184005
+ dbw 5, .Callback
-UnknownScript_0x184005: ; 0x184005
+.Callback
setflag $0038
return
-; 0x184009
-CooltrainerMScript_0x184009: ; 0x184009
+CooltrainerMScript_0x184009:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -24,29 +22,25 @@
closetext
loadmovesprites
end
-; 0x184017
-UnknownScript_0x184017: ; 0x184017
+UnknownScript_0x184017:
writetext UnknownText_0x184144
closetext
loadmovesprites
end
-; 0x18401d
-SuperNerdScript_0x18401d: ; 0x18401d
+SuperNerdScript_0x18401d:
jumptextfaceplayer UnknownText_0x1841a8
-; 0x184020
-SlowpokeScript_0x184020: ; 0x184020
+CeruleanCitySlowbro:
loadfont
- writetext UnknownText_0x1841e9
+ writetext CeruleanCitySlowbroText
cry SLOWBRO
closetext
loadmovesprites
end
-; 0x18402a
-CooltrainerFScript_0x18402a: ; 0x18402a
+CooltrainerFScript_0x18402a:
faceplayer
loadfont
writetext UnknownText_0x1841fa
@@ -58,7 +52,7 @@
closetext
loadmovesprites
loadfont
- writetext UnknownText_0x1841e9
+ writetext CeruleanCitySlowbroText
cry SLOWBRO
closetext
loadmovesprites
@@ -67,9 +61,8 @@
closetext
loadmovesprites
end
-; 0x18404a
-FisherScript_0x18404a: ; 0x18404a
+FisherScript_0x18404a:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -76,21 +69,19 @@
iftrue UnknownScript_0x184058
checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
iftrue UnknownScript_0x18405e
-UnknownScript_0x184058: ; 0x184058
+UnknownScript_0x184058:
writetext UnknownText_0x18424e
closetext
loadmovesprites
end
-; 0x18405e
-UnknownScript_0x18405e: ; 0x18405e
+UnknownScript_0x18405e:
writetext UnknownText_0x184275
closetext
loadmovesprites
end
-; 0x184064
-YoungsterScript_0x184064: ; 0x184064
+YoungsterScript_0x184064:
faceplayer
loadfont
writetext UnknownText_0x1842a9
@@ -99,9 +90,8 @@
checkevent $00fa
iffalse UnknownScript_0x184072
end
-; 0x184072
-UnknownScript_0x184072: ; 0x184072
+UnknownScript_0x184072:
waitbutton
playsound SFX_SECOND_PART_OF_ITEMFINDER
waitbutton
@@ -126,47 +116,36 @@
closetext
loadmovesprites
end
-; 0x1840a1
-MapCeruleanCitySignpost0Script: ; 0x1840a1
- jumptext UnknownText_0x184312
-; 0x1840a4
+CeruleanCitySign:
+ jumptext CeruleanCitySignText
-MapCeruleanCitySignpost1Script: ; 0x1840a4
- jumptext UnknownText_0x184345
-; 0x1840a7
+CeruleanGymSign:
+ jumptext CeruleanGymSignText
-MapCeruleanCitySignpost2Script: ; 0x1840a7
- jumptext UnknownText_0x184381
-; 0x1840aa
+CeruleanBikeShopSign:
+ jumptext CeruleanBikeShopSignText
-MapCeruleanCitySignpost3Script: ; 0x1840aa
- jumptext UnknownText_0x1843cc
-; 0x1840ad
+CeruleanPoliceSign:
+ jumptext CeruleanPoliceSignText
-MapCeruleanCitySignpost4Script: ; 0x1840ad
- jumptext UnknownText_0x18443b
-; 0x1840b0
+CeruleanCapeSign:
+ jumptext CeruleanCapeSignText
-MapCeruleanCitySignpost5Script: ; 0x1840b0
- jumptext UnknownText_0x184450
-; 0x1840b3
+CeruleanLockedDoor:
+ jumptext CeruleanLockedDoorText
-MapCeruleanCitySignpost6Script: ; 0x1840b3
+CeruleanCityPokeCenterSign:
jumpstd pokecentersign
-; 0x1840b6
-MapCeruleanCitySignpost7Script: ; 0x1840b6
+CeruleanCityMartSign:
jumpstd martsign
-; 0x1840b9
-MapCeruleanCitySignpostItem8: ; 0x1840b9
+MapCeruleanCitySignpostItem8:
dw $00fa
db BERSERK_GENE
-
-; 0x1840bc
-UnknownText_0x1840bc: ; 0x1840bc
+UnknownText_0x1840bc:
text "KANTO's POWER"
line "PLANT?"
@@ -180,9 +159,8 @@
line "an accident of"
cont "some sort there."
done
-; 0x184144
-UnknownText_0x184144: ; 0x184144
+UnknownText_0x184144:
text "You're collecting"
line "every single kind"
cont "of #MON?"
@@ -191,9 +169,8 @@
line "a challenge, but"
cont "it sounds fun too."
done
-; 0x1841a8
-UnknownText_0x1841a8: ; 0x1841a8
+UnknownText_0x1841a8:
text "The CAPE in the"
line "north is a good"
@@ -200,46 +177,39 @@
para "place for dates."
line "Girls like it!"
done
-; 0x1841e9
-UnknownText_0x1841e9: ; 0x1841e9
+CeruleanCitySlowbroText:
text "SLOWBRO: Yarah?"
done
-; 0x1841fa
-UnknownText_0x1841fa: ; 0x1841fa
+UnknownText_0x1841fa:
text "My SLOWBRO and I"
line "make an awesome"
cont "combination!"
done
-; 0x184229
-UnknownText_0x184229: ; 0x184229
+UnknownText_0x184229:
text "SLOWBRO, show me"
line "your CONFUSION!"
done
-; 0x18424b
-UnknownText_0x18424b: ; 0x18424b
+UnknownText_0x18424b:
text "…"
done
-; 0x18424e
-UnknownText_0x18424e: ; 0x18424e
+UnknownText_0x18424e:
text "I'm a huge fan of"
line "CERULEAN GYM's"
cont "MISTY."
done
-; 0x184275
-UnknownText_0x184275: ; 0x184275
+UnknownText_0x184275:
text "I saw this shady"
line "guy go off toward"
cont "CERULEAN's CAPE."
done
-; 0x1842a9
-UnknownText_0x1842a9: ; 0x1842a9
+UnknownText_0x1842a9:
text "There used to be a"
line "cave here that had"
@@ -246,25 +216,22 @@
para "horribly powerful"
line "#MON in it."
done
-; 0x1842ee
-UnknownText_0x1842ee: ; 0x1842ee
+UnknownText_0x1842ee:
text "Ayuh?"
para "My ITEMFINDER is"
line "responding…"
done
-; 0x184312
-UnknownText_0x184312: ; 0x184312
+CeruleanCitySignText:
text "CERULEAN CITY"
para "A Mysterious Blue"
line "Aura Surrounds It"
done
-; 0x184345
-UnknownText_0x184345: ; 0x184345
+CeruleanGymSignText:
text "CERULEAN CITY"
line "#MON GYM"
cont "LEADER: MISTY"
@@ -272,9 +239,8 @@
para "The Tomboyish"
line "Mermaid"
done
-; 0x184381
-UnknownText_0x184381: ; 0x184381
+CeruleanBikeShopSignText:
text "There's a notice"
line "here…"
@@ -282,9 +248,8 @@
line "moved to GOLDENROD"
cont "CITY in JOHTO…"
done
-; 0x1843cc
-UnknownText_0x1843cc: ; 0x1843cc
+CeruleanPoliceSignText:
text "There's a notice"
line "here…"
@@ -296,20 +261,17 @@
para "CERULEAN POLICE"
done
-; 0x18443b
-UnknownText_0x18443b: ; 0x18443b
+CeruleanCapeSignText:
text "CERULEAN CAPE"
line "AHEAD"
done
-; 0x184450
-UnknownText_0x184450: ; 0x184450
+CeruleanLockedDoorText:
text "It's locked…"
done
-; 0x18445d
-CeruleanCity_MapEventHeader: ; 0x18445d
+CeruleanCity_MapEventHeader:
; filler
db 0, 0
@@ -327,14 +289,14 @@
; signposts
db 9
- signpost 23, 23, $0, MapCeruleanCitySignpost0Script
- signpost 25, 27, $0, MapCeruleanCitySignpost1Script
- signpost 29, 11, $0, MapCeruleanCitySignpost2Script
- signpost 17, 25, $0, MapCeruleanCitySignpost3Script
- signpost 7, 23, $0, MapCeruleanCitySignpost4Script
- signpost 29, 14, $0, MapCeruleanCitySignpost5Script
- signpost 21, 20, $0, MapCeruleanCitySignpost6Script
- signpost 29, 26, $0, MapCeruleanCitySignpost7Script
+ signpost 23, 23, $0, CeruleanCitySign
+ signpost 25, 27, $0, CeruleanGymSign
+ signpost 29, 11, $0, CeruleanBikeShopSign
+ signpost 17, 25, $0, CeruleanPoliceSign
+ signpost 7, 23, $0, CeruleanCapeSign
+ signpost 29, 14, $0, CeruleanLockedDoor
+ signpost 21, 20, $0, CeruleanCityPokeCenterSign
+ signpost 29, 26, $0, CeruleanCityMartSign
signpost 12, 2, $7, MapCeruleanCitySignpostItem8
; people-events
@@ -341,8 +303,7 @@
db 6
person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, $ffff
person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, $ffff
- person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x184020, $ffff
+ person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, $ffff
person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, $ffff
person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, $ffff
person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, $ffff
-; 0x1844fc
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -1,4 +1,4 @@
-CharcoalKiln_MapScriptHeader: ; 0x18dd18
+CharcoalKiln_MapScriptHeader:
; trigger count
db 0
@@ -5,7 +5,7 @@
; callback count
db 0
-BossScript:
+CharcoalKilnBoss:
faceplayer
loadfont
checkevent EVENT_GOT_HM01_CUT
@@ -12,54 +12,52 @@
iftrue .GotCut
checkevent EVENT_CLEARED_SLOWPOKE_WELL
iftrue .SavedSlowpoke
- writetext BossSlowpokeText
+ writetext CharcoalKilnBossText1
closetext
loadmovesprites
end
.SavedSlowpoke
- writetext BossForestText
+ writetext CharcoalKilnBossText2
closetext
loadmovesprites
end
.GotCut
- writetext BossText
+ writetext CharcoalKilnBossText3
closetext
loadmovesprites
end
-ApprenticeScript:
+CharcoalKilnApprentice:
faceplayer
loadfont
checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
- iftrue UnknownScript_0x18dd5d
+ iftrue .YoureTheCoolest
checkevent EVENT_GOT_HM01_CUT
- iftrue UnknownScript_0x18dd4e
- writetext UnknownText_0x18dee0
+ iftrue .Thanks
+ writetext CharcoalKilnApprenticeText1
closetext
loadmovesprites
end
-UnknownScript_0x18dd4e: ; 0x18dd4e
- writetext UnknownText_0x18df25
+.Thanks
+ writetext CharcoalKilnApprenticeText2
keeptextopen
verbosegiveitem CHARCOAL, 1
- iffalse UnknownScript_0x18dd61
+ iffalse .Done
setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
loadmovesprites
end
-; 0x18dd5d
-UnknownScript_0x18dd5d: ; 0x18dd5d
- writetext UnknownText_0x18df93
+.YoureTheCoolest
+ writetext CharcoalKilnApprenticeText3
closetext
-UnknownScript_0x18dd61: ; 0x18dd61
+.Done
loadmovesprites
end
-; 0x18dd63
-FarfetchdScript:
+CharcoalKilnFarfetchd:
faceplayer
loadfont
writetext FarfetchdText
@@ -68,15 +66,13 @@
loadmovesprites
end
-MapCharcoalKilnSignpost1Script: ; 0x18dd6e
+CharcoalKilnBookshelf:
jumpstd magazinebookshelf
-; 0x18dd71
-MapCharcoalKilnSignpost2Script: ; 0x18dd71
+CharcoalKilnRadio:
jumpstd radio2
-; 0x18dd74
-BossSlowpokeText:
+CharcoalKilnBossText1:
text "All the SLOWPOKE"
line "have disappeared"
cont "from the town."
@@ -90,7 +86,7 @@
cont "stay in."
done
-BossForestText:
+CharcoalKilnBossText2:
text "The SLOWPOKE have"
line "returned…"
@@ -102,7 +98,7 @@
line "is that lazy guy?"
done
-BossText:
+CharcoalKilnBossText3:
text "You chased off"
line "TEAM ROCKET and"
@@ -113,9 +109,8 @@
line "I like that. Come"
cont "train with us."
done
-; 0x18dee0
-UnknownText_0x18dee0: ; 0x18dee0
+CharcoalKilnApprenticeText1:
text "Where have all the"
line "SLOWPOKE gone?"
@@ -122,9 +117,8 @@
para "Are they out play-"
line "ing somewhere?"
done
-; 0x18df25
-UnknownText_0x18df25: ; 0x18df25
+CharcoalKilnApprenticeText2:
text "I'm sorry--I for-"
line "got to thank you."
@@ -135,9 +129,8 @@
line "would be happy to"
cont "hold that."
done
-; 0x18df93
-UnknownText_0x18df93: ; 0x18df93
+CharcoalKilnApprenticeText3:
text "The SLOWPOKE came"
line "back, and you even"
cont "found FARFETCH'D."
@@ -145,7 +138,6 @@
para "You're the cool-"
line "est, man!"
done
-; 0x18dfe5
FarfetchdText:
text "FARFETCH'D: Kwaa!"
@@ -165,12 +157,12 @@
; signposts
db 3
- signpost 1, 0, $0, MapCharcoalKilnSignpost1Script
- signpost 1, 1, $0, MapCharcoalKilnSignpost1Script
- signpost 1, 7, $0, MapCharcoalKilnSignpost2Script
+ signpost 1, 0, $0, CharcoalKilnBookshelf
+ signpost 1, 1, $0, CharcoalKilnBookshelf
+ signpost 1, 7, $0, CharcoalKilnRadio
; people-events
db 3
- person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, BossScript, $06f7
- person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, ApprenticeScript, $06f6
- person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, FarfetchdScript, $06f5
+ person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, CharcoalKilnBoss, $06f7
+ person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, CharcoalKilnApprentice, $06f6
+ person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, CharcoalKilnFarfetchd, $06f5
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -27,17 +27,15 @@
return
; 0x19c013
-GrampsScript_0x19c013: ; 0x19c013
+CherrygroveCityGuideGent: ; 0x19c013
faceplayer
loadfont
- writetext UnknownText_0x19c1e3
+ writetext GuideGentIntroText
yesorno
- iffalse UnknownScript_0x19c0a4
- jump UnknownScript_0x19c01f
-; 0x19c01f
-
-UnknownScript_0x19c01f: ; 0x19c01f
- writetext UnknownText_0x19c26f
+ iffalse .No
+ jump .Yes
+.Yes
+ writetext GuideGentTourText1
closetext
loadmovesprites
playmusic MUSIC_SHOW_ME_AROUND
@@ -44,25 +42,25 @@
follow $2, $0
applymovement $2, MovementData_0x19c195
loadfont
- writetext UnknownText_0x19c285
+ writetext GuideGentPokeCenterText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c19b
spriteface $0, $1
loadfont
- writetext UnknownText_0x19c304
+ writetext GuideGentMartText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1a3
spriteface $0, $1
loadfont
- writetext UnknownText_0x19c359
+ writetext GuideGentRoute30Text
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1ac
spriteface $0, $2
loadfont
- writetext UnknownText_0x19c3a7
+ writetext GuideGentSeaText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1b6
@@ -71,14 +69,14 @@
spriteface $2, $2
spriteface $0, $3
loadfont
- writetext UnknownText_0x19c3ec
+ writetext GuideGentGiftText
keeptextopen
stringtotext .mapcardname, $1
scall .UnknownScript_0x19c097
setflag $0001
- writetext UnknownText_0x19c438
+ writetext GotMapCardText
keeptextopen
- writetext UnknownText_0x19c451
+ writetext GuideGentPokegearText
closetext
loadmovesprites
stopfollow
@@ -99,12 +97,11 @@
db "MAP CARD@"
; 0x19c0a4
-UnknownScript_0x19c0a4: ; 0x19c0a4
- writetext UnknownText_0x19c49f
+.No
+ writetext GuideGentNoText
closetext
loadmovesprites
end
-; 0x19c0aa
UnknownScript_0x19c0aa: ; 0x19c0aa
moveperson $3, $27, $7
@@ -225,7 +222,7 @@
end
; 0x19c16e
-FisherScript_0x19c16e: ; 0x19c16e
+MysticWaterGuy: ; 0x19c16e
faceplayer
loadfont
checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
@@ -243,21 +240,18 @@
end
; 0x19c189
-MapCherrygroveCitySignpost0Script: ; 0x19c189
- jumptext UnknownText_0x19c7e0
-; 0x19c18c
+CherrygroveCitySign:
+ jumptext CherrygroveCitySignText
-MapCherrygroveCitySignpost1Script: ; 0x19c18c
- jumptext UnknownText_0x19c815
+GuideGentsHouseSign: ; 0x19c18c
+ jumptext GuideGentsHouseSignText
; 0x19c18f
-MapCherrygroveCitySignpost3Script: ; 0x19c18f
+CherrygroveCityPokeCenterSign:
jumpstd pokecentersign
-; 0x19c192
-MapCherrygroveCitySignpost2Script: ; 0x19c192
+CherrygroveCityMartSign: ; 0x19c192
jumpstd martsign
-; 0x19c195
MovementData_0x19c195: ; 0x19c195
step_left
@@ -365,9 +359,8 @@
big_step_left
big_step_left
step_end
-; 0x19c1e3
-UnknownText_0x19c1e3: ; 0x19c1e3
+GuideGentIntroText:
text "You're a rookie"
line "trainer, aren't"
cont "you? I can tell!"
@@ -380,15 +373,13 @@
line "can teach you a"
cont "few things."
done
-; 0x19c26f
-UnknownText_0x19c26f: ; 0x19c26f
+GuideGentTourText1:
text "OK, then!"
line "Follow me!"
done
-; 0x19c285
-UnknownText_0x19c285: ; 0x19c285
+GuideGentPokeCenterText:
text "This is a #MON"
line "CENTER. They heal"
@@ -401,9 +392,8 @@
para "you better learn"
line "about them."
done
-; 0x19c304
-UnknownText_0x19c304: ; 0x19c304
+GuideGentMartText:
text "This is a #MON"
line "MART."
@@ -413,9 +403,8 @@
para "#MON and other"
line "useful items."
done
-; 0x19c359
-UnknownText_0x19c359: ; 0x19c359
+GuideGentRoute30Text:
text "ROUTE 30 is out"
line "this way."
@@ -425,9 +414,8 @@
para "prized #MON"
line "there."
done
-; 0x19c3a7
-UnknownText_0x19c3a7: ; 0x19c3a7
+GuideGentSeaText:
text "This is the sea,"
line "as you can see."
@@ -435,9 +423,8 @@
line "found only in"
cont "water."
done
-; 0x19c3ec
-UnknownText_0x19c3ec: ; 0x19c3ec
+GuideGentGiftText:
text "Here…"
para "It's my house!"
@@ -447,15 +434,13 @@
para "Let me give you a"
line "small gift."
done
-; 0x19c438
-UnknownText_0x19c438: ; 0x19c438
+GotMapCardText:
text $52, "'s #GEAR"
line "now has a MAP!"
done
-; 0x19c451
-UnknownText_0x19c451: ; 0x19c451
+GuideGentPokegearText:
text "#GEAR becomes"
line "more useful as you"
cont "add CARDS."
@@ -463,9 +448,8 @@
para "I wish you luck on"
line "your journey!"
done
-; 0x19c49f
-UnknownText_0x19c49f: ; 0x19c49f
+GuideGentNoText:
text "Oh… It's something"
line "I enjoy doing…"
@@ -472,7 +456,6 @@
para "Fine. Come see me"
line "when you like."
done
-; 0x19c4e2
UnknownText_0x19c4e2: ; 0x19c4e2
text $56, " ", $56, " ", $56
@@ -588,7 +571,7 @@
done
; 0x19c7e0
-UnknownText_0x19c7e0: ; 0x19c7e0
+CherrygroveCitySignText: ; 0x19c7e0
text "CHERRYGROVE CITY"
para "The City of Cute,"
@@ -596,7 +579,7 @@
done
; 0x19c815
-UnknownText_0x19c815: ; 0x19c815
+GuideGentsHouseSignText: ; 0x19c815
text "GUIDE GENT'S HOUSE"
done
; 0x19c829
@@ -620,16 +603,16 @@
; signposts
db 4
- signpost 8, 30, $0, MapCherrygroveCitySignpost0Script
- signpost 9, 23, $0, MapCherrygroveCitySignpost1Script
- signpost 3, 24, $0, MapCherrygroveCitySignpost2Script
- signpost 3, 30, $0, MapCherrygroveCitySignpost3Script
+ signpost 8, 30, $0, CherrygroveCitySign
+ signpost 9, 23, $0, GuideGentsHouseSign
+ signpost 3, 24, $0, CherrygroveCityMartSign
+ signpost 3, 30, $0, CherrygroveCityPokeCenterSign
; people-events
db 5
- person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, GrampsScript_0x19c013, $06fe
+ person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, $06fe
person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, $06be
person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, $ffff
person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, $ffff
- person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, FisherScript_0x19c16e, $ffff
+ person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, $ffff
; 0x19c8ad
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -22,9 +22,8 @@
end
; 0x196cc0
-MapCherrygroveEvolutionSpeechHouseSignpost1Script: ; 0x196cc0
+CherrygroveEvolutionSpeechHouseBookshelf:
jumpstd magazinebookshelf
-; 0x196cc3
UnknownText_0x196cc3: ; 0x196cc3
text "#MON gain expe-"
@@ -57,8 +56,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapCherrygroveEvolutionSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapCherrygroveEvolutionSpeechHouseSignpost1Script
+ signpost 1, 0, $0, CherrygroveEvolutionSpeechHouseBookshelf
+ signpost 1, 1, $0, CherrygroveEvolutionSpeechHouseBookshelf
; people-events
db 2
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -14,9 +14,8 @@
jumptextfaceplayer UnknownText_0x196b65
; 0x196ae7
-MapCherrygroveGymSpeechHouseSignpost1Script: ; 0x196ae7
+CherrygroveGymSpeechHouseBookshelf:
jumpstd picturebookshelf
-; 0x196aea
UnknownText_0x196aea: ; 0x196aea
text "You're trying to"
@@ -60,8 +59,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapCherrygroveGymSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapCherrygroveGymSpeechHouseSignpost1Script
+ signpost 1, 0, $0, CherrygroveGymSpeechHouseBookshelf
+ signpost 1, 1, $0, CherrygroveGymSpeechHouseBookshelf
; people-events
db 2
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -123,47 +123,35 @@
UnknownScript_0x1a00bc: ; 0x1a00bc
jumptextfaceplayer UnknownText_0x1a03cc
-; 0x1a00bf
-MapCianwoodCitySignpost0Script: ; 0x1a00bf
- jumptext UnknownText_0x1a0660
-; 0x1a00c2
+CianwoodCitySign:
+ jumptext CianwoodCitySignText
-MapCianwoodCitySignpost1Script: ; 0x1a00c2
- jumptext UnknownText_0x1a068f
-; 0x1a00c5
+CianwoodGymSign:
+ jumptext CianwoodGymSignText
-MapCianwoodCitySignpost3Script: ; 0x1a00c5
- jumptext UnknownText_0x1a06d6
-; 0x1a00c8
+CianwoodPharmacySign:
+ jumptext CianwoodPharmacySignText
-MapCianwoodCitySignpost4Script: ; 0x1a00c8
- jumptext UnknownText_0x1a0725
-; 0x1a00cb
+CianwoodPhotoStudioSign:
+ jumptext CianwoodPhotoStudioSignText
-MapCianwoodCitySignpost5Script: ; 0x1a00cb
- jumptext UnknownText_0x1a0760
-; 0x1a00ce
+CianwoodPokeSeerSign:
+ jumptext CianwoodPokeSeerSignText
-MapCianwoodCitySignpost2Script: ; 0x1a00ce
+CianwoodPokeCenterSign:
jumpstd pokecentersign
-; 0x1a00d1
-RockScript_0x1a00d1: ; 0x1a00d1
+CianwoodCityRock:
jumpstd smashrock
-; 0x1a00d4
-MapCianwoodCitySignpostItem6: ; 0x1a00d4
+MapCianwoodCitySignpostItem6:
dw $00b2
db REVIVE
-
-; 0x1a00d7
-MapCianwoodCitySignpostItem7: ; 0x1a00d7
+MapCianwoodCitySignpostItem7:
dw $00b3
db MAX_ETHER
-
-; 0x1a00da
MovementData_0x1a00da: ; 0x1a00da
db $39 ; movement
@@ -368,17 +356,15 @@
para "See you around!"
done
-; 0x1a0660
-UnknownText_0x1a0660: ; 0x1a0660
+CianwoodCitySignText:
text "CIANWOOD CITY"
para "A Port Surrounded"
line "by Rough Seas"
done
-; 0x1a068f
-UnknownText_0x1a068f: ; 0x1a068f
+CianwoodGymSignText:
text "CIANWOOD CITY"
line "#MON GYM"
@@ -387,9 +373,8 @@
para "His Roaring Fists"
line "Do the Talking"
done
-; 0x1a06d6
-UnknownText_0x1a06d6: ; 0x1a06d6
+CianwoodPharmacySignText:
text "500 Years of"
line "Tradition"
@@ -399,9 +384,8 @@
para "We Await Your"
line "Medicinal Queries"
done
-; 0x1a0725
-UnknownText_0x1a0725: ; 0x1a0725
+CianwoodPhotoStudioSignText:
text "CIANWOOD CITY"
line "PHOTO STUDIO"
@@ -408,15 +392,13 @@
para "Take a Snapshot as"
line "a Keepsake!"
done
-; 0x1a0760
-UnknownText_0x1a0760: ; 0x1a0760
+CianwoodPokeSeerSignText:
text "THE # SEER"
line "AHEAD"
done
-; 0x1a0772
-CianwoodCity_MapEventHeader: ; 0x1a0772
+CianwoodCity_MapEventHeader:
; filler
db 0, 0
@@ -436,12 +418,12 @@
; signposts
db 8
- signpost 34, 20, $0, MapCianwoodCitySignpost0Script
- signpost 45, 7, $0, MapCianwoodCitySignpost1Script
- signpost 43, 24, $0, MapCianwoodCitySignpost2Script
- signpost 47, 19, $0, MapCianwoodCitySignpost3Script
- signpost 32, 8, $0, MapCianwoodCitySignpost4Script
- signpost 24, 8, $0, MapCianwoodCitySignpost5Script
+ signpost 34, 20, $0, CianwoodCitySign
+ signpost 45, 7, $0, CianwoodGymSign
+ signpost 43, 24, $0, CianwoodPokeCenterSign
+ signpost 47, 19, $0, CianwoodPharmacySign
+ signpost 32, 8, $0, CianwoodPhotoStudioSign
+ signpost 24, 8, $0, CianwoodPokeSeerSign
signpost 19, 4, $7, MapCianwoodCitySignpostItem6
signpost 29, 5, $7, MapCianwoodCitySignpostItem7
@@ -450,12 +432,12 @@
person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, $ffff
person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, $ffff
person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, $ffff
- person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff
- person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff
- person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff
- person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff
- person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff
- person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff
+ person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff
+ person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff
+ person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff
+ person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff
+ person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff
+ person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff
person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, $ffff
person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, $07ad
person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, $07ae
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -197,9 +197,8 @@
end
; 0x9d6e0
-BoulderScript_0x9d6e0: ; 0x9d6e0
+CianwoodGymBoulder:
jumpstd strengthboulder
-; 0x9d6e3
CianwoodGymStatue:
checkflag ENGINE_STORMBADGE
@@ -418,8 +417,7 @@
person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, $ffff
person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, $ffff
person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, $ffff
- person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff
- person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff
- person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff
- person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff
-; 0x9dbcd
+ person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff
+ person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff
+ person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff
+ person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -18,9 +18,8 @@
jumptextfaceplayer UnknownText_0x9e2a9
; 0x9e1b9
-MapCianwoodLugiaSpeechHouseSignpost1Script: ; 0x9e1b9
+CianwoodLugiaSpeechHouseBookshelf:
jumpstd picturebookshelf
-; 0x9e1bc
UnknownText_0x9e1bc: ; 0x9e1bc
text "You came from"
@@ -78,8 +77,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapCianwoodLugiaSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapCianwoodLugiaSpeechHouseSignpost1Script
+ signpost 1, 0, $0, CianwoodLugiaSpeechHouseBookshelf
+ signpost 1, 1, $0, CianwoodLugiaSpeechHouseBookshelf
; people-events
db 3
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -1,50 +1,45 @@
-CianwoodPharmacy_MapScriptHeader: ; 0x9df97
+CianwoodPharmacy_MapScriptHeader:
; trigger count
db 1
; triggers
- dw UnknownScript_0x9df9d, $0000
+ dw CianwoodPharmacyTrigger, $0000
; callback count
db 0
-; 0x9df9d
-UnknownScript_0x9df9d: ; 0x9df9d
+CianwoodPharmacyTrigger:
end
-; 0x9df9e
-PharmacistScript_0x9df9e: ; 0x9df9e
+CianwoodPharmacist:
faceplayer
loadfont
checkevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY
- iftrue UnknownScript_0x9dfc4
+ iftrue .Mart
checkevent $0037
- iffalse UnknownScript_0x9dfc4
- writetext UnknownText_0x9dfcd
+ iffalse .Mart
+ writetext PharmacistGiveSecretpotionText
keeptextopen
giveitem SECRETPOTION, $1
- writetext UnknownText_0x9e056
+ writetext ReceivedSecretpotionText
playsound SFX_KEY_ITEM
waitbutton
itemnotify
setevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY
- writetext UnknownText_0x9e070
+ writetext PharmacistDescribeSecretpotionText
closetext
loadmovesprites
end
-; 0x9dfc4
-UnknownScript_0x9dfc4: ; 0x9dfc4
+.Mart
pokemart $3, $0004
loadmovesprites
end
-; 0x9dfca
-MapCianwoodPharmacySignpost1Script: ; 0x9dfca
+CianwoodPharmacyBookshelf:
jumpstd difficultbookshelf
-; 0x9dfcd
-UnknownText_0x9dfcd: ; 0x9dfcd
+PharmacistGiveSecretpotionText:
text "Your #MON ap-"
line "pear to be fine."
@@ -62,15 +57,13 @@
para "This ought to do"
line "the trick."
done
-; 0x9e056
-UnknownText_0x9e056: ; 0x9e056
+ReceivedSecretpotionText:
text $52, " received"
line "SECRETPOTION."
done
-; 0x9e070
-UnknownText_0x9e070: ; 0x9e070
+PharmacistDescribeSecretpotionText:
text "My SECRETPOTION is"
line "a tad too strong."
@@ -77,9 +70,8 @@
para "I only offer it in"
line "an emergency."
done
-; 0x9e0b7
-CianwoodPharmacy_MapEventHeader: ; 0x9e0b7
+CianwoodPharmacy_MapEventHeader:
; filler
db 0, 0
@@ -93,10 +85,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapCianwoodPharmacySignpost1Script
- signpost 1, 1, $0, MapCianwoodPharmacySignpost1Script
+ signpost 1, 0, $0, CianwoodPharmacyBookshelf
+ signpost 1, 1, $0, CianwoodPharmacyBookshelf
; people-events
db 1
- person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, PharmacistScript_0x9df9e, $ffff
-; 0x9e0de
+ person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, $ffff
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -1,4 +1,4 @@
-CinnabarIsland_MapScriptHeader: ; 0x1ac9a7
+CinnabarIsland_MapScriptHeader:
; trigger count
db 0
@@ -8,50 +8,41 @@
; callbacks
dbw 5, UnknownScript_0x1ac9ac
-; 0x1ac9ac
-UnknownScript_0x1ac9ac: ; 0x1ac9ac
+UnknownScript_0x1ac9ac:
setflag $003f
return
-; 0x1ac9b0
-BlueScript_0x1ac9b0: ; 0x1ac9b0
+CinnabarIslandBlue:
faceplayer
loadfont
- writetext UnknownText_0x1ac9d2
+ writetext CinnabarIslandBlueText
closetext
loadmovesprites
playsound SFX_WARP_TO
- applymovement $2, MovementData_0x1ac9d0
+ applymovement $2, CinnabarIslandBlueTeleport
disappear $2
clearevent $0776
end
-; 0x1ac9c4
-MapCinnabarIslandSignpost1Script: ; 0x1ac9c4
- jumptext UnknownText_0x1acc73
-; 0x1ac9c7
+CinnabarIslandGymSign:
+ jumptext CinnabarIslandGymSignText
-MapCinnabarIslandSignpost2Script: ; 0x1ac9c7
- jumptext UnknownText_0x1accc2
-; 0x1ac9ca
+CinnabarIslandSign:
+ jumptext CinnabarIslandSignText
-MapCinnabarIslandSignpost0Script: ; 0x1ac9ca
+CinnabarIslandPokeCenterSign:
jumpstd pokecentersign
-; 0x1ac9cd
-MapCinnabarIslandSignpostItem3: ; 0x1ac9cd
+MapCinnabarIslandSignpostItem3:
dw $00fe
db RARE_CANDY
-
-; 0x1ac9d0
-MovementData_0x1ac9d0: ; 0x1ac9d0
+CinnabarIslandBlueTeleport:
teleport_from
step_end
-; 0x1ac9d2
-UnknownText_0x1ac9d2: ; 0x1ac9d2
+CinnabarIslandBlueText:
text "Who are you?"
para "Well, it's plain"
@@ -118,9 +109,8 @@
para "I'll take you on"
line "then."
done
-; 0x1acc73
-UnknownText_0x1acc73: ; 0x1acc73
+CinnabarIslandGymSignText:
text "There's a notice"
line "here…"
@@ -130,17 +120,15 @@
para "BLAINE"
done
-; 0x1accc2
-UnknownText_0x1accc2: ; 0x1accc2
+CinnabarIslandSignText:
text "CINNABAR ISLAND"
para "The Fiery Town of"
line "Burning Desire"
done
-; 0x1accf4
-CinnabarIsland_MapEventHeader: ; 0x1accf4
+CinnabarIsland_MapEventHeader:
; filler
db 0, 0
@@ -153,12 +141,11 @@
; signposts
db 4
- signpost 11, 12, $0, MapCinnabarIslandSignpost0Script
- signpost 11, 9, $0, MapCinnabarIslandSignpost1Script
- signpost 7, 7, $0, MapCinnabarIslandSignpost2Script
+ signpost 11, 12, $0, CinnabarIslandPokeCenterSign
+ signpost 11, 9, $0, CinnabarIslandGymSign
+ signpost 7, 7, $0, CinnabarIslandSign
signpost 1, 9, $7, MapCinnabarIslandSignpostItem3
; people-events
db 1
- person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, BlueScript_0x1ac9b0, $0775
-; 0x1acd20
+ person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, CinnabarIslandBlue, $0775
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -7,69 +7,63 @@
; callbacks
- dbw 2, UnknownScript_0x18ae9f
+ dbw 2, CopycatsHouse2FCallback
; 0x18ae9f
-UnknownScript_0x18ae9f: ; 0x18ae9f
+CopycatsHouse2FCallback:
checkflag $0063
- iftrue UnknownScript_0x18aeac
+ iftrue .Part1
disappear $7
appear $2
- jump UnknownScript_0x18aeb0
-; 0x18aeac
-
-UnknownScript_0x18aeac: ; 0x18aeac
+ jump .Done
+.Part1
disappear $2
appear $7
-UnknownScript_0x18aeb0: ; 0x18aeb0
+.Done
return
-; 0x18aeb1
-CopycatScript_0x18aeb1: ; 0x18aeb1
+Copycat:
faceplayer
checkevent EVENT_GOT_PASS_FROM_COPYCAT
- iftrue UnknownScript_0x18af6f
+ iftrue .Part15
checkevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
- iftrue UnknownScript_0x18af5b
+ iftrue .Part13
checkitem LOST_ITEM
- iftrue UnknownScript_0x18af4a
+ iftrue .Part12
checkflag $0063
- iftrue UnknownScript_0x18aed4
+ iftrue .Part1
applymovement $2, MovementData_0x18afd0
faceplayer
variablesprite $b, $1
- jump UnknownScript_0x18aedc
-; 0x18aed4
+ jump .Part2
-UnknownScript_0x18aed4: ; 0x18aed4
+.Part1
applymovement $7, MovementData_0x18afd0
faceplayer
variablesprite $b, $60
-UnknownScript_0x18aedc: ; 0x18aedc
+.Part2
special Function14209
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x18af16
+ iftrue .Part7
loadfont
checkflag $0063
- iftrue UnknownScript_0x18aef2
+ iftrue .Part3
writetext UnknownText_0x18afda
- jump UnknownScript_0x18aef5
-; 0x18aef2
+ jump .Part4
-UnknownScript_0x18aef2: ; 0x18aef2
+.Part3
writetext UnknownText_0x18b316
-UnknownScript_0x18aef5: ; 0x18aef5
+.Part4
closetext
loadmovesprites
checkflag $0063
- iftrue UnknownScript_0x18af04
+ iftrue .Part5
applymovement $2, MovementData_0x18afd0
- jump UnknownScript_0x18af08
-; 0x18af04
+ jump .Part6
-UnknownScript_0x18af04: ; 0x18af04
+.Part5
applymovement $7, MovementData_0x18afd0
-UnknownScript_0x18af08: ; 0x18af08
+.Part6
faceplayer
variablesprite $b, $28
special Function14209
@@ -78,30 +72,27 @@
closetext
loadmovesprites
end
-; 0x18af16
-UnknownScript_0x18af16: ; 0x18af16
+.Part7
loadfont
checkflag $0063
- iftrue UnknownScript_0x18af23
+ iftrue .Part8
writetext UnknownText_0x18b064
- jump UnknownScript_0x18af26
-; 0x18af23
+ jump .Part9
-UnknownScript_0x18af23: ; 0x18af23
+.Part8
writetext UnknownText_0x18b366
-UnknownScript_0x18af26: ; 0x18af26
+.Part9
closetext
loadmovesprites
checkflag $0063
- iftrue UnknownScript_0x18af35
+ iftrue .Part10
applymovement $2, MovementData_0x18afd0
- jump UnknownScript_0x18af39
-; 0x18af35
+ jump .Part11
-UnknownScript_0x18af35: ; 0x18af35
+.Part10
applymovement $7, MovementData_0x18afd0
-UnknownScript_0x18af39: ; 0x18af39
+.Part11
faceplayer
variablesprite $b, $28
special Function14209
@@ -111,9 +102,8 @@
loadmovesprites
setevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
end
-; 0x18af4a
-UnknownScript_0x18af4a: ; 0x18af4a
+.Part12
loadfont
writetext UnknownText_0x18b17f
keeptextopen
@@ -120,59 +110,54 @@
takeitem LOST_ITEM, 1
setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
clearevent $0773
- jump UnknownScript_0x18af5c
-; 0x18af5b
+ jump .Part14
-UnknownScript_0x18af5b: ; 0x18af5b
+.Part13
loadfont
-UnknownScript_0x18af5c: ; 0x18af5c
+.Part14
writetext UnknownText_0x18b1e2
keeptextopen
verbosegiveitem PASS, 1
- iffalse UnknownScript_0x18afba
+ iffalse .Part22
setevent EVENT_GOT_PASS_FROM_COPYCAT
writetext UnknownText_0x18b214
closetext
loadmovesprites
end
-; 0x18af6f
-UnknownScript_0x18af6f: ; 0x18af6f
+.Part15
checkflag $0063
- iftrue UnknownScript_0x18af80
+ iftrue .Part16
applymovement $2, MovementData_0x18afd0
faceplayer
variablesprite $b, $1
- jump UnknownScript_0x18af88
-; 0x18af80
+ jump .Part17
-UnknownScript_0x18af80: ; 0x18af80
+.Part16
applymovement $7, MovementData_0x18afd0
faceplayer
variablesprite $b, $60
-UnknownScript_0x18af88: ; 0x18af88
+.Part17
special Function14209
loadfont
checkflag $0063
- iftrue UnknownScript_0x18af98
+ iftrue .Part18
writetext UnknownText_0x18b298
- jump UnknownScript_0x18af9b
-; 0x18af98
+ jump .Part19
-UnknownScript_0x18af98: ; 0x18af98
+.Part18
writetext UnknownText_0x18b415
-UnknownScript_0x18af9b: ; 0x18af9b
+.Part19
closetext
loadmovesprites
checkflag $0063
- iftrue UnknownScript_0x18afaa
+ iftrue .Part20
applymovement $2, MovementData_0x18afd0
- jump UnknownScript_0x18afae
-; 0x18afaa
+ jump .Part21
-UnknownScript_0x18afaa: ; 0x18afaa
+.Part20
applymovement $7, MovementData_0x18afd0
-UnknownScript_0x18afae: ; 0x18afae
+.Part21
faceplayer
variablesprite $b, $28
special Function14209
@@ -179,31 +164,25 @@
loadfont
writetext UnknownText_0x18b2f5
closetext
-UnknownScript_0x18afba: ; 0x18afba
+.Part22
loadmovesprites
end
-; 0x18afbc
-MoltresScript_0x18afbc: ; 0x18afbc
+CopycatsDodrio:
loadfont
- writetext UnknownText_0x18b476
+ writetext CopycatsDodrioText1
cry DODRIO
keeptextopen
- writetext UnknownText_0x18b489
+ writetext CopycatsDodrioText2
closetext
loadmovesprites
end
-; 0x18afca
-FairyScript_0x18afca:
-MonsterScript_0x18afca:
-BirdScript_0x18afca: ; 0x18afca
- jumptext UnknownText_0x18b4c4
-; 0x18afcd
+CopycatsHouse2FDoll:
+ jumptext CopycatsHouse2FDollText
-MapCopycatsHouse2FSignpost1Script: ; 0x18afcd
+CopycatsHouse2FBookshelf:
jumpstd picturebookshelf
-; 0x18afd0
MovementData_0x18afd0: ; 0x18afd0
turn_head_down
@@ -371,12 +350,12 @@
done
; 0x18b476
-UnknownText_0x18b476: ; 0x18b476
+CopycatsDodrioText1: ; 0x18b476
text "DODRIO: Gii giii!"
done
; 0x18b489
-UnknownText_0x18b489: ; 0x18b489
+CopycatsDodrioText2: ; 0x18b489
text "MIRROR, MIRROR ON"
line "THE WALL, WHO'S"
@@ -385,13 +364,12 @@
done
; 0x18b4c4
-UnknownText_0x18b4c4: ; 0x18b4c4
+CopycatsHouse2FDollText:
text "This is a rare"
line "#MON! Huh?"
para "It's only a doll…"
done
-; 0x18b4f0
CopycatsHouse2F_MapEventHeader: ; 0x18b4f0
; filler
@@ -406,15 +384,15 @@
; signposts
db 2
- signpost 1, 0, $0, MapCopycatsHouse2FSignpost1Script
- signpost 1, 1, $0, MapCopycatsHouse2FSignpost1Script
+ signpost 1, 0, $0, CopycatsHouse2FBookshelf
+ signpost 1, 1, $0, CopycatsHouse2FBookshelf
; people-events
db 6
- person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, CopycatScript_0x18aeb1, $06ee
- person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, MoltresScript_0x18afbc, $ffff
- person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, FairyScript_0x18afca, $0773
- person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, MonsterScript_0x18afca, $ffff
- person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, BirdScript_0x18afca, $ffff
- person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, CopycatScript_0x18aeb1, $06ef
+ person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, Copycat, $06ee
+ person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, $ffff
+ person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, CopycatsHouse2FDoll, $0773
+ 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/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -22,9 +22,8 @@
db DIRE_HIT, 1
; 0x18c696
-RockScript_0x18c696: ; 0x18c696
+DarkCaveVioletEntranceRock:
jumpstd smashrock
-; 0x18c699
MapDarkCaveVioletEntranceSignpostItem0: ; 0x18c699
dw $009d
@@ -52,10 +51,10 @@
; people-events
db 8
person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, $069e
- person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff
- person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff
- person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff
- person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff
+ person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff
+ person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff
+ person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff
+ person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff
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
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -79,9 +79,8 @@
end
; 0x62fd7
-MapDayCareSignpost1Script: ; 0x62fd7
+DayCareBookshelf:
jumpstd difficultbookshelf
-; 0x62fda
UnknownText_0x62fda: ; 0x62fda
text "Gramps was looking"
@@ -186,8 +185,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapDayCareSignpost1Script
- signpost 1, 1, $0, MapDayCareSignpost1Script
+ signpost 1, 0, $0, DayCareBookshelf
+ signpost 1, 1, $0, DayCareBookshelf
; people-events
db 2
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -4,34 +4,31 @@
; callback count
db 0
-; 0x68a5c
-FisherScript_0x68a5c: ; 0x68a5c
+AcademyEarl:
applymovement $2, MovementData_0x68b2d
faceplayer
loadfont
writetext UnknownText_0x68b3b
yesorno
- iffalse UnknownScript_0x68a70
+ iffalse .Part1
writetext UnknownText_0x68bbd
yesorno
- iffalse UnknownScript_0x68a7d
-UnknownScript_0x68a70: ; 0x68a70
+ iffalse .Done
+.Part1
writetext UnknownText_0x68c51
yesorno
- iffalse UnknownScript_0x68a7d
+ iffalse .Done
writetext UnknownText_0x68c7b
closetext
loadmovesprites
end
-; 0x68a7d
-UnknownScript_0x68a7d: ; 0x68a7d
+.Done
writetext UnknownText_0x68d31
closetext
loadmovesprites
end
-; 0x68a83
YoungsterScript_0x68a83: ; 0x68a83
jumptextfaceplayer UnknownText_0x68d80
@@ -61,70 +58,61 @@
jumptextfaceplayer UnknownText_0x68e39
; 0x68a9f
-MapEarlsPokemonAcademySignpost3Script: ; 0x68a9f
+AcademyBlackboard:
loadfont
- writetext UnknownText_0x68eb2
-UnknownScript_0x68aa3: ; 0x68aa3
- loadmenudata MenuDataHeader_0x68ae1
+ writetext AcademyBlackboardText
+.Loop
+ loadmenudata .MenuHeader
interpretmenu
writebackup
- if_equal $1, UnknownScript_0x68abe
- if_equal $2, UnknownScript_0x68ac5
- if_equal $3, UnknownScript_0x68acc
- if_equal $4, UnknownScript_0x68ad3
- if_equal $5, UnknownScript_0x68ada
+ if_equal $1, .Poison
+ if_equal $2, .Paralysis
+ if_equal $3, .Sleep
+ if_equal $4, .Burn
+ if_equal $5, .Freeze
loadmovesprites
end
-; 0x68abe
-UnknownScript_0x68abe: ; 0x68abe
- writetext UnknownText_0x68efe
+.Poison
+ writetext AcademyPoisonText
closetext
- jump UnknownScript_0x68aa3
-; 0x68ac5
+ jump .Loop
-UnknownScript_0x68ac5: ; 0x68ac5
- writetext UnknownText_0x68f80
+.Paralysis
+ writetext AcademyParalysisText
closetext
- jump UnknownScript_0x68aa3
-; 0x68acc
+ jump .Loop
-UnknownScript_0x68acc: ; 0x68acc
- writetext UnknownText_0x68fe2
+.Sleep
+ writetext AcademySleepText
closetext
- jump UnknownScript_0x68aa3
-; 0x68ad3
+ jump .Loop
-UnknownScript_0x68ad3: ; 0x68ad3
- writetext UnknownText_0x69055
+.Burn
+ writetext AcademyBurnText
closetext
- jump UnknownScript_0x68aa3
-; 0x68ada
+ jump .Loop
-UnknownScript_0x68ada: ; 0x68ada
- writetext UnknownText_0x690cb
+.Freeze:
+ writetext AcademyFreezeText
closetext
- jump UnknownScript_0x68aa3
-; 0x68ae1
+ jump .Loop
-
-MenuDataHeader_0x68ae1: ; 0x68ae1
+.MenuHeader
db $40 ; flags
db 00, 00 ; start coords
db 08, 11 ; end coords
- dw MenuData2_0x68ae9
+ dw .Data
db 1 ; default option
-; 0x68ae9
-MenuData2_0x68ae9: ; 0x68ae9
+.Data
db $80 ; flags
dn 3, 2 ; rows, columns
db 5 ; spacing
- dbw BANK(UnknownText_0x68af2), UnknownText_0x68af2
+ dbw BANK(.Text), .Text
dbw $1a, $0000
-; 0x68af2
-UnknownText_0x68af2: ; 0x68af2
+.Text
db "PSN@"
db "PAR@"
db "SLP@"
@@ -131,34 +119,30 @@
db "BRN@"
db "FRZ@"
db "QUIT@"
-; 0x68b0b
-
-PokedexScript_0x68b0b: ; 0x68b0b
+AcademyNotebook:
loadfont
- writetext UnknownText_0x69136
+ writetext AcademyNotebookText
yesorno
- iffalse UnknownScript_0x68b25
- writetext UnknownText_0x69197
+ iffalse .Done
+ writetext AcademyNotebookText1
yesorno
- iffalse UnknownScript_0x68b25
- writetext UnknownText_0x69207
+ iffalse .Done
+ writetext AcademyNotebookText2
yesorno
- iffalse UnknownScript_0x68b25
- writetext UnknownText_0x69287
+ iffalse .Done
+ writetext AcademyNotebookText3
closetext
-UnknownScript_0x68b25: ; 0x68b25
+.Done
loadmovesprites
end
-; 0x68b27
-UnknownScript_0x68b27: ; 0x68b27
- jumptext UnknownText_0x69344
-; 0x68b2a
+AcademyStickerMachine:
+; unused
+ jumptext AcademyStickerMachineText
-MapEarlsPokemonAcademySignpost1Script: ; 0x68b2a
+AcademyBookshelf:
jumpstd difficultbookshelf
-; 0x68b2d
MovementData_0x68b2d: ; 0x68b2d
turn_head_down
@@ -288,7 +272,7 @@
done
; 0x68eb2
-UnknownText_0x68eb2: ; 0x68eb2
+AcademyBlackboardText:
text "The blackboard"
line "describes #MON"
@@ -295,14 +279,13 @@
para "status changes in"
line "battle."
done
-; 0x68eeb
-UnknownText_0x68eeb: ; 0x68eeb
+AcademyBlackboardText2:
+; unused
text "Read which topic?"
done
-; 0x68efe
-UnknownText_0x68efe: ; 0x68efe
+AcademyPoisonText:
text "If poisoned, a"
line "#MON steadily"
cont "loses HP."
@@ -316,9 +299,8 @@
para "To cure it, use an"
line "ANTIDOTE."
done
-; 0x68f80
-UnknownText_0x68f80: ; 0x68f80
+AcademyParalysisText:
text "Paralysis reduces"
line "speed and may"
cont "prevent movement."
@@ -327,9 +309,8 @@
line "battle, so use"
cont "a PARLYZ HEAL."
done
-; 0x68fe2
-UnknownText_0x68fe2: ; 0x68fe2
+AcademySleepText:
text "If asleep, your"
line "#MON can't make"
cont "a move."
@@ -341,9 +322,8 @@
para "Wake it up with"
line "an AWAKENING."
done
-; 0x69055
-UnknownText_0x69055: ; 0x69055
+AcademyBurnText:
text "A burn steadily"
line "consumes HP."
@@ -356,9 +336,8 @@
para "Use a BURN HEAL as"
line "the cure."
done
-; 0x690cb
-UnknownText_0x690cb: ; 0x690cb
+AcademyFreezeText:
text "If your #MON is"
line "frozen, it can't"
cont "do a thing."
@@ -369,9 +348,8 @@
para "Thaw it out with"
line "an ICE HEAL."
done
-; 0x69136
-UnknownText_0x69136: ; 0x69136
+AcademyNotebookText:
text "It's this kid's"
line "notebook…"
@@ -383,9 +361,8 @@
para "Keep reading?"
done
-; 0x69197
-UnknownText_0x69197: ; 0x69197
+AcademyNotebookText1:
text "Before throwing a"
line "# BALL, weaken"
cont "the target first."
@@ -396,9 +373,8 @@
para "Keep reading?"
done
-; 0x69207
-UnknownText_0x69207: ; 0x69207
+AcademyNotebookText2:
text "Some moves may"
line "cause confusion."
@@ -412,9 +388,8 @@
para "Keep reading?"
done
-; 0x69287
-UnknownText_0x69287: ; 0x69287
+AcademyNotebookText3:
text "People who catch"
line "and use #MON"
@@ -435,15 +410,13 @@
para "I haven't written"
line "anymore…"
done
-; 0x69344
-UnknownText_0x69344: ; 0x69344
+AcademyStickerMachineText:
text "This super machine"
line "prints data out as"
para "stickers!"
done
-; 0x69375
EarlsPokemonAcademy_MapEventHeader: ; 0x69375
; filler
@@ -459,17 +432,17 @@
; signposts
db 4
- signpost 1, 0, $0, MapEarlsPokemonAcademySignpost1Script
- signpost 1, 1, $0, MapEarlsPokemonAcademySignpost1Script
- signpost 0, 3, $0, MapEarlsPokemonAcademySignpost3Script
- signpost 0, 4, $0, MapEarlsPokemonAcademySignpost3Script
+ signpost 1, 0, $0, AcademyBookshelf
+ signpost 1, 1, $0, AcademyBookshelf
+ signpost 0, 3, $0, AcademyBlackboard
+ signpost 0, 4, $0, AcademyBlackboard
; people-events
db 6
- person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, FisherScript_0x68a5c, $06cb
+ person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, AcademyEarl, $06cb
person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, $ffff
person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, $ffff
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, PokedexScript_0x68b0b, $ffff
+ person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, $ffff
; 0x693e7
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -1,4 +1,4 @@
-EcruteakCity_MapScriptHeader: ; 0x1a4000
+EcruteakCity_MapScriptHeader:
; trigger count
db 0
@@ -8,30 +8,24 @@
; callbacks
dbw 5, UnknownScript_0x1a4005
-; 0x1a4005
-UnknownScript_0x1a4005: ; 0x1a4005
+UnknownScript_0x1a4005:
setflag $0048
return
-; 0x1a4009
-GrampsScript_0x1a4009: ; 0x1a4009
+GrampsScript_0x1a4009:
jumptextfaceplayer UnknownText_0x1a4105
-; 0x1a400c
-GrampsScript_0x1a400c: ; 0x1a400c
+GrampsScript_0x1a400c:
jumptextfaceplayer UnknownText_0x1a4147
-; 0x1a400f
-GrampsScript_0x1a400f: ; 0x1a400f
+GrampsScript_0x1a400f:
jumptextfaceplayer UnknownText_0x1a43cb
-; 0x1a4012
-LassScript_0x1a4012: ; 0x1a4012
+LassScript_0x1a4012:
jumptextfaceplayer UnknownText_0x1a41db
-; 0x1a4015
-LassScript_0x1a4015: ; 0x1a4015
+LassScript_0x1a4015:
faceplayer
loadfont
checkevent EVENT_RELEASED_THE_BEASTS
@@ -40,16 +34,14 @@
closetext
loadmovesprites
end
-; 0x1a4023
-UnknownScript_0x1a4023: ; 0x1a4023
+UnknownScript_0x1a4023:
writetext UnknownText_0x1a4269
closetext
loadmovesprites
end
-; 0x1a4029
-FisherScript_0x1a4029: ; 0x1a4029
+FisherScript_0x1a4029:
faceplayer
loadfont
checkevent EVENT_JASMINE_RETURNED_TO_GYM
@@ -58,54 +50,42 @@
closetext
loadmovesprites
end
-; 0x1a4037
-UnknownScript_0x1a4037: ; 0x1a4037
+UnknownScript_0x1a4037:
writetext UnknownText_0x1a4325
closetext
loadmovesprites
end
-; 0x1a403d
-YoungsterScript_0x1a403d: ; 0x1a403d
+YoungsterScript_0x1a403d:
jumptextfaceplayer UnknownText_0x1a4386
-; 0x1a4040
-MapEcruteakCitySignpost0Script: ; 0x1a4040
- jumptext UnknownText_0x1a44d1
-; 0x1a4043
+EcruteakCitySign:
+ jumptext EcruteakCitySignText
-MapEcruteakCitySignpost1Script: ; 0x1a4043
- jumptext UnknownText_0x1a4513
-; 0x1a4046
+TinTowerSign:
+ jumptext TinTowerSignText
-MapEcruteakCitySignpost2Script: ; 0x1a4046
- jumptext UnknownText_0x1a4548
-; 0x1a4049
+EcruteakGymSign:
+ jumptext EcruteakGymSignText
-MapEcruteakCitySignpost3Script: ; 0x1a4049
- jumptext UnknownText_0x1a458c
-; 0x1a404c
+EcruteakDanceTheaterSign:
+ jumptext EcruteakDanceTheaterSignText
-MapEcruteakCitySignpost4Script: ; 0x1a404c
- jumptext UnknownText_0x1a45a4
-; 0x1a404f
+BurnedTowerSign:
+ jumptext BurnedTowerSignText
-MapEcruteakCitySignpost5Script: ; 0x1a404f
+EcruteakCityPokeCenterSign:
jumpstd pokecentersign
-; 0x1a4052
-MapEcruteakCitySignpost6Script: ; 0x1a4052
+EcruteakCityMartSign:
jumpstd martsign
-; 0x1a4055
-MapEcruteakCitySignpostItem7: ; 0x1a4055
+MapEcruteakCitySignpostItem7:
dw $00b4
db HYPER_POTION
-
-; 0x1a4058
-UnusedMissingDaughterText: ; 0x1a4058
+UnusedMissingDaughterText:
; This text is neither used nor referenced in the final game.
text "Oh, no. Oh, no…"
@@ -126,7 +106,7 @@
line "do…?"
done
-UnknownText_0x1a4105: ; 0x1a4105
+UnknownText_0x1a4105:
text "ECRUTEAK used to"
line "have two towers:"
@@ -133,9 +113,8 @@
para "one each in the"
line "east and west."
done
-; 0x1a4147
-UnknownText_0x1a4147: ; 0x1a4147
+UnknownText_0x1a4147:
text "Ah, child."
line "Have you learned"
@@ -149,9 +128,8 @@
line "give you something"
cont "nice, I hear."
done
-; 0x1a41db
-UnknownText_0x1a41db: ; 0x1a41db
+UnknownText_0x1a41db:
text "I'm going to prac-"
line "tice at the DANCE"
@@ -158,9 +136,8 @@
para "THEATER. Care to"
line "join me?"
done
-; 0x1a421a
-UnknownText_0x1a421a: ; 0x1a421a
+UnknownText_0x1a421a:
text "The tower that"
line "used to be here…"
@@ -168,17 +145,15 @@
line "it used to be much"
cont "taller."
done
-; 0x1a4269
-UnknownText_0x1a4269: ; 0x1a4269
+UnknownText_0x1a4269:
text "Three big #MON"
line "ran off in differ-"
cont "ent directions."
cont "What were they?"
done
-; 0x1a42ac
-UnknownText_0x1a42ac: ; 0x1a42ac
+UnknownText_0x1a42ac:
text "I heard a rumor"
line "about OLIVINE"
cont "LIGHTHOUSE."
@@ -190,9 +165,8 @@
line "Sounds like they"
cont "are in trouble."
done
-; 0x1a4325
-UnknownText_0x1a4325: ; 0x1a4325
+UnknownText_0x1a4325:
text "The #MON at"
line "OLIVINE LIGHTHOUSE"
cont "has been cured."
@@ -201,9 +175,8 @@
line "sail out to sea at"
cont "night again."
done
-; 0x1a4386
-UnknownText_0x1a4386: ; 0x1a4386
+UnknownText_0x1a4386:
text "I hear #MON are"
line "rampaging at the"
@@ -210,9 +183,8 @@
para "LAKE OF RAGE. I'd"
line "like to see that."
done
-; 0x1a43cb
-UnknownText_0x1a43cb: ; 0x1a43cb
+UnknownText_0x1a43cb:
text "In the distant"
line "past…"
@@ -240,9 +212,8 @@
line "way back when."
cont "Hohoho!"
done
-; 0x1a44d1
-UnknownText_0x1a44d1: ; 0x1a44d1
+EcruteakCitySignText:
text "ECRUTEAK CITY"
line "A Historical City"
@@ -249,9 +220,8 @@
para "Where the Past"
line "Meets the Present"
done
-; 0x1a4513
-UnknownText_0x1a4513: ; 0x1a4513
+TinTowerSignText:
text "TIN TOWER"
para "A legendary #-"
@@ -258,9 +228,8 @@
line "MON is said to"
cont "roost here."
done
-; 0x1a4548
-UnknownText_0x1a4548: ; 0x1a4548
+EcruteakGymSignText:
text "ECRUTEAK CITY"
line "#MON GYM"
cont "LEADER: MORTY"
@@ -268,15 +237,13 @@
para "The Mystic Seer of"
line "the Future"
done
-; 0x1a458c
-UnknownText_0x1a458c: ; 0x1a458c
+EcruteakDanceTheaterSignText:
text "ECRUTEAK DANCE"
line "THEATER"
done
-; 0x1a45a4
-UnknownText_0x1a45a4: ; 0x1a45a4
+BurnedTowerSignText:
text "BURNED TOWER"
para "It was destroyed"
@@ -286,9 +253,8 @@
para "Please stay away,"
line "as it is unsafe."
done
-; 0x1a45fc
-EcruteakCity_MapEventHeader: ; 0x1a45fc
+EcruteakCity_MapEventHeader:
; filler
db 0, 0
@@ -315,13 +281,13 @@
; signposts
db 8
- signpost 21, 15, $0, MapEcruteakCitySignpost0Script
- signpost 10, 38, $0, MapEcruteakCitySignpost1Script
- signpost 28, 8, $0, MapEcruteakCitySignpost2Script
- signpost 21, 21, $0, MapEcruteakCitySignpost3Script
- signpost 10, 2, $0, MapEcruteakCitySignpost4Script
- signpost 27, 24, $0, MapEcruteakCitySignpost5Script
- signpost 21, 30, $0, MapEcruteakCitySignpost6Script
+ signpost 21, 15, $0, EcruteakCitySign
+ signpost 10, 38, $0, TinTowerSign
+ signpost 28, 8, $0, EcruteakGymSign
+ signpost 21, 21, $0, EcruteakDanceTheaterSign
+ signpost 10, 2, $0, BurnedTowerSign
+ signpost 27, 24, $0, EcruteakCityPokeCenterSign
+ signpost 21, 30, $0, EcruteakCityMartSign
signpost 14, 23, $7, MapEcruteakCitySignpostItem7
; people-events
@@ -333,4 +299,3 @@
person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, $ffff
person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, $ffff
person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, $07a9
-; 0x1a46d0
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -56,9 +56,8 @@
end
; 0x9a639
-MapEcruteakItemfinderHouseSignpost0Script: ; 0x9a639
+ItemFinderHouseRadio:
jumpstd radio2
-; 0x9a63c
UnknownText_0x9a63c: ; 0x9a63c
text "Ah. You're on an"
@@ -186,7 +185,7 @@
; signposts
db 1
- signpost 1, 2, $0, MapEcruteakItemfinderHouseSignpost0Script
+ signpost 1, 2, $0, ItemFinderHouseRadio
; people-events
db 2
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -14,9 +14,8 @@
jumptextfaceplayer UnknownText_0x993ec
; 0x9933a
-MapEcruteakLugiaSpeechHouseSignpost0Script: ; 0x9933a
+LugiaSpeechHouseRadio:
jumpstd radio2
-; 0x9933d
UnknownText_0x9933d: ; 0x9933d
text "This happened when"
@@ -60,7 +59,7 @@
; signposts
db 1
- signpost 1, 2, $0, MapEcruteakLugiaSpeechHouseSignpost0Script
+ signpost 1, 2, $0, LugiaSpeechHouseRadio
; people-events
db 2
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -1,28 +1,23 @@
-ElmsHouse_MapScriptHeader: ; 0x7aee9
+ElmsHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7aeeb
-TeacherScript_0x7aeeb: ; 0x7aeeb
- jumptextfaceplayer UnknownText_0x7aef7
-; 0x7aeee
+ElmsWife:
+ jumptextfaceplayer ElmsWifeText
-BugCatcherScript_0x7aeee: ; 0x7aeee
- jumptextfaceplayer UnknownText_0x7af6b
-; 0x7aef1
+ElmsSon:
+ jumptextfaceplayer ElmsSonText
-MapElmsHouseSignpost0Script: ; 0x7aef1
- jumptext UnknownText_0x7b01b
-; 0x7aef4
+ElmsHousePC:
+ jumptext ElmsHousePCText
-MapElmsHouseSignpost2Script: ; 0x7aef4
+ElmsHouseBookshelf:
jumpstd difficultbookshelf
-; 0x7aef7
-UnknownText_0x7aef7: ; 0x7aef7
+ElmsWifeText:
text "Hi, ", $14, "! My"
line "husband's always"
@@ -35,9 +30,8 @@
para "research, he even"
line "forgets to eat."
done
-; 0x7af6b
-UnknownText_0x7af6b: ; 0x7af6b
+ElmsSonText:
text "When I grow up,"
line "I'm going to help"
cont "my dad!"
@@ -46,23 +40,22 @@
line "great #MON"
cont "professor!"
done
-; 0x7afbc
-UnknownText_0x7afbc: ; 0x7afbc
+ElmsHouseLabFoodText:
+; unused
text "There's some food"
line "here. It must be"
cont "for the LAB."
done
-; 0x7afec
-UnknownText_0x7afec: ; 0x7afec
+ElmsHousePokemonFoodText:
+; unused
text "There's some food"
line "here. This must be"
cont "for #MON."
done
-; 0x7b01b
-UnknownText_0x7b01b: ; 0x7b01b
+ElmsHousePCText:
text "#MON. Where do"
line "they come from? "
@@ -85,9 +78,8 @@
line "PROF.ELM's re-"
cont "search papers."
done
-; 0x7b0ea
-ElmsHouse_MapEventHeader: ; 0x7b0ea
+ElmsHouse_MapEventHeader:
; filler
db 0, 0
@@ -101,12 +93,11 @@
; signposts
db 3
- signpost 1, 0, $0, MapElmsHouseSignpost0Script
- signpost 1, 6, $0, MapElmsHouseSignpost2Script
- signpost 1, 7, $0, MapElmsHouseSignpost2Script
+ signpost 1, 0, $0, ElmsHousePC
+ signpost 1, 6, $0, ElmsHouseBookshelf
+ signpost 1, 7, $0, ElmsHouseBookshelf
; people-events
db 2
- person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, TeacherScript_0x7aeeb, $ffff
- person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, BugCatcherScript_0x7aeee, $ffff
-; 0x7b123
+ person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, $ffff
+ person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, $ffff
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -309,18 +309,17 @@
end
; 0x78d74
-MapElmsLabSignpost0Script: ; 0x78d74
+ElmsLabHealingMachine:
loadfont
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
- iftrue UnknownScript_0x78d81
- writetext UnknownText_0x79690
+ iftrue .CanHeal
+ writetext ElmsLabHealingMachineText1
closetext
loadmovesprites
end
-; 0x78d81
-UnknownScript_0x78d81: ; 0x78d81
- writetext UnknownText_0x796aa
+.CanHeal
+ writetext ElmsLabHealingMachineText2
yesorno
iftrue UnknownScript_0x78d8a
loadmovesprites
@@ -595,7 +594,6 @@
UnknownScript_0x78f12: ; 0x78f12
applymovement $0, MovementData_0x78f72
-; 0x78f16
MeetCopScript: ; 0x78f16
applymovement $0, MovementData_0x78f74
@@ -614,60 +612,53 @@
end
; 0x78f33
-MapElmsLabSignpost14Script: ; 0x78f33
+ElmsLabWindow:
loadfont
checkflag $0043
- iftrue UnknownScript_0x78f49
+ iftrue .Normal
checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
- iftrue UnknownScript_0x78f43
- jump UnknownScript_0x78f49
-; 0x78f43
+ iftrue .BreakIn
+ jump .Normal
-UnknownScript_0x78f43: ; 0x78f43
- writetext UnknownText_0x7a231
+.BreakIn
+ writetext ElmsLabWindowText2
closetext
loadmovesprites
end
; 0x78f49
-UnknownScript_0x78f49: ; 0x78f49
- writetext UnknownText_0x7a1fd
+.Normal
+ writetext ElmsLabWindowText1
closetext
loadmovesprites
end
; 0x78f4f
-MapElmsLabSignpost5Script: ; 0x78f4f
- jumptext UnknownText_0x7a24c
-; 0x78f52
+ElmsLabTravelTip1:
+ jumptext ElmsLabTravelTip1Text
-MapElmsLabSignpost6Script: ; 0x78f52
- jumptext UnknownText_0x7a28a
-; 0x78f55
+ElmsLabTravelTip2:
+ jumptext ElmsLabTravelTip2Text
-MapElmsLabSignpost7Script: ; 0x78f55
- jumptext UnknownText_0x7a2c6
-; 0x78f58
+ElmsLabTravelTip3:
+ jumptext ElmsLabTravelTip3Text
-MapElmsLabSignpost8Script: ; 0x78f58
- jumptext UnknownText_0x7a315
-; 0x78f5b
+ElmsLabTravelTip4:
+ jumptext ElmsLabTravelTip4Text
-MapElmsLabSignpost13Script: ; 0x78f5b
- jumptext UnknownText_0x7a370
-; 0x78f5e
+ElmsLabTrashcan:
+ jumptext ElmsLabTrashcanText
-MapElmsLabSignpost15Script: ; 0x78f5e
- jumptext UnknownText_0x7a3a6
+ElmsLabPC: ; 0x78f5e
+ jumptext ElmsLabPCText
; 0x78f61
-UnknownScript_0x78f61: ; 0x78f61
+ElmsLabTrashcan2:
+; unused
jumpstd trashcan
-; 0x78f64
-MapElmsLabSignpost12Script: ; 0x78f64
+ElmsLabBookshelf:
jumpstd difficultbookshelf
-; 0x78f67
MovementData_0x78f67: ; 0x78f67
step_up
@@ -1008,7 +999,6 @@
para "number. Call me if"
line "anything comes up!"
done
-; 0x79581
ElmDirectionsText2: ; 0x79581
text "If your #MON is"
@@ -1020,19 +1010,16 @@
para "Feel free to use"
line "it anytime."
done
-; 0x795db
ElmDirectionsText3: ; 0x795db
text $14, ", I'm"
line "counting on you!"
done
-; 0x795f3
GotElmsNumberText: ; 0x795f3
text $52, " got ELM's"
line "phone number."
done
-; 0x7960d
ElmDescribesMrPokemonText: ; 0x7960d
text "MR.#MON goes"
@@ -1043,7 +1030,6 @@
line "just rare and"
cont "not very useful…"
done
-; 0x79668
ElmPokeBallText: ; 0x79668
text "It contains a"
@@ -1050,19 +1036,16 @@
line "#MON caught by"
cont "PROF.ELM."
done
-; 0x79690
-UnknownText_0x79690: ; 0x79690
+ElmsLabHealingMachineText1:
text "I wonder what this"
line "does?"
done
-; 0x796aa
-UnknownText_0x796aa: ; 0x796aa
+ElmsLabHealingMachineText2:
text "Would you like to"
line "heal your #MON?"
done
-; 0x796cd
ElmAfterTheftText1: ; 0x796cd
text "ELM: ", $14, ", this"
@@ -1429,21 +1412,19 @@
done
; 0x7a1fd
-UnknownText_0x7a1fd: ; 0x7a1fd
+ElmsLabWindowText1:
text "The window's open."
para "A pleasant breeze"
line "is blowing in."
done
-; 0x7a231
-UnknownText_0x7a231: ; 0x7a231
+ElmsLabWindowText2:
text "He broke in"
line "through here!"
done
-; 0x7a24c
-UnknownText_0x7a24c: ; 0x7a24c
+ElmsLabTravelTip1Text:
text $52, " opened a"
line "book."
@@ -1452,9 +1433,8 @@
para "Press START to"
line "open the MENU."
done
-; 0x7a28a
-UnknownText_0x7a28a: ; 0x7a28a
+ElmsLabTravelTip2Text:
text $52, " opened a"
line "book."
@@ -1463,9 +1443,8 @@
para "Record your trip"
line "with SAVE!"
done
-; 0x7a2c6
-UnknownText_0x7a2c6: ; 0x7a2c6
+ElmsLabTravelTip3Text:
text $52, " opened a"
line "book."
@@ -1475,9 +1454,8 @@
line "press SELECT to"
cont "move items."
done
-; 0x7a315
-UnknownText_0x7a315: ; 0x7a315
+ElmsLabTravelTip4Text:
text $52, " opened a"
line "book."
@@ -1489,16 +1467,14 @@
para "A Button to switch"
line "moves."
done
-; 0x7a370
-UnknownText_0x7a370: ; 0x7a370
+ElmsLabTrashcanText:
text "The wrapper from"
line "the snack PROF.ELM"
cont "ate is in there…"
done
-; 0x7a3a6
-UnknownText_0x7a3a6: ; 0x7a3a6
+ElmsLabPCText:
text "OBSERVATIONS ON"
line "#MON EVOLUTION"
@@ -1505,7 +1481,6 @@
para "…It says on the"
line "screen…"
done
-; 0x7a3de
ElmsLab_MapEventHeader: ; 0x7a3de
; filler
@@ -1529,22 +1504,22 @@
; signposts
db 16
- signpost 1, 2, $0, MapElmsLabSignpost0Script
- signpost 1, 6, $0, MapElmsLabSignpost12Script
- signpost 1, 7, $0, MapElmsLabSignpost12Script
- signpost 1, 8, $0, MapElmsLabSignpost12Script
- signpost 1, 9, $0, MapElmsLabSignpost12Script
- signpost 7, 0, $0, MapElmsLabSignpost5Script
- signpost 7, 1, $0, MapElmsLabSignpost6Script
- signpost 7, 2, $0, MapElmsLabSignpost7Script
- signpost 7, 3, $0, MapElmsLabSignpost8Script
- signpost 7, 6, $0, MapElmsLabSignpost12Script
- signpost 7, 7, $0, MapElmsLabSignpost12Script
- signpost 7, 8, $0, MapElmsLabSignpost12Script
- signpost 7, 9, $0, MapElmsLabSignpost12Script
- signpost 3, 9, $0, MapElmsLabSignpost13Script
- signpost 0, 5, $0, MapElmsLabSignpost14Script
- signpost 5, 3, $2, MapElmsLabSignpost15Script
+ signpost 1, 2, $0, ElmsLabHealingMachine
+ signpost 1, 6, $0, ElmsLabBookshelf
+ signpost 1, 7, $0, ElmsLabBookshelf
+ signpost 1, 8, $0, ElmsLabBookshelf
+ signpost 1, 9, $0, ElmsLabBookshelf
+ signpost 7, 0, $0, ElmsLabTravelTip1
+ signpost 7, 1, $0, ElmsLabTravelTip2
+ signpost 7, 2, $0, ElmsLabTravelTip3
+ signpost 7, 3, $0, ElmsLabTravelTip4
+ signpost 7, 6, $0, ElmsLabBookshelf
+ signpost 7, 7, $0, ElmsLabBookshelf
+ signpost 7, 8, $0, ElmsLabBookshelf
+ signpost 7, 9, $0, ElmsLabBookshelf
+ signpost 3, 9, $0, ElmsLabTrashcan
+ signpost 0, 5, $0, ElmsLabWindow
+ signpost 5, 3, $2, ElmsLabPC
; people-events
db 6
@@ -1554,4 +1529,3 @@
person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, $0641
person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, $0642
person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, CopScript, $0702
-; 0x7a4cc
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -382,9 +382,8 @@
end
; 0x7686e
-MapFastShipB1FSignpost0Script: ; 0x7686e
+FashShipB1FTrashcan:
jumpstd trashcan
-; 0x76871
MovementData_0x76871: ; 0x76871
fix_facing
@@ -681,7 +680,7 @@
; signposts
db 1
- signpost 9, 27, $0, MapFastShipB1FSignpost0Script
+ signpost 9, 27, $0, FashShipB1FTrashcan
; people-events
db 12
--- a/maps/FastShipCabins.asm
+++ b/maps/FastShipCabins.asm
@@ -341,9 +341,8 @@
end
; 0x76001
-MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script: ; 0x76001
+FastShipCaptainsCabinTrashcan:
jumpstd trashcan
-; 0x76004
MovementData_0x76004: ; 0x76004
big_step_right
@@ -641,7 +640,7 @@
; signposts
db 1
- signpost 25, 4, $0, MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script
+ signpost 25, 4, $0, FastShipCaptainsCabinTrashcan
; people-events
db 11
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -216,9 +216,8 @@
end
; 0x75634
-MapFastShipCabins_NNW_NNE_NESignpost2Script: ; 0x75634
+FastShipCabins_NNW_NNE_NETrashcan:
jumpstd trashcan
-; 0x75637
MovementData_0x75637: ; 0x75637
step_left
@@ -407,9 +406,9 @@
; signposts
db 3
- signpost 13, 6, $0, MapFastShipCabins_NNW_NNE_NESignpost2Script
- signpost 19, 7, $0, MapFastShipCabins_NNW_NNE_NESignpost2Script
- signpost 31, 7, $0, MapFastShipCabins_NNW_NNE_NESignpost2Script
+ signpost 13, 6, $0, FastShipCabins_NNW_NNE_NETrashcan
+ signpost 19, 7, $0, FastShipCabins_NNW_NNE_NETrashcan
+ signpost 31, 7, $0, FastShipCabins_NNW_NNE_NETrashcan
; people-events
db 7
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -341,9 +341,8 @@
end
; 0x76001
-MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script: ; 0x76001
+FastShipCaptainsCabinTrashcan:
jumpstd trashcan
-; 0x76004
MovementData_0x76004: ; 0x76004
big_step_right
@@ -641,7 +640,7 @@
; signposts
db 1
- signpost 25, 4, $0, MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script
+ signpost 25, 4, $0, FastShipCaptainsCabinTrashcan
; people-events
db 11
@@ -656,4 +655,3 @@
person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, $073b
person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b
person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a
-; 0x76730
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -132,9 +132,9 @@
end
; 0x75aac
-MapFastShipCabins_SW_SSW_NWSignpost1Script: ; 0x75aac
+FastShipBed:
loadfont
- writetext UnknownText_0x75da4
+ writetext FastShipBedText1
closetext
loadmovesprites
special Function8c0b6
@@ -146,7 +146,7 @@
special RestartMapMusic
special Function8c0ab
loadfont
- writetext UnknownText_0x75dc1
+ writetext FastShipBedText2
closetext
loadmovesprites
checkevent $0031
@@ -165,7 +165,7 @@
checkevent $002f
iftrue UnknownScript_0x75af7
loadfont
- writetext UnknownText_0x75e0f
+ writetext FastShipArrivedVermilionText
closetext
loadmovesprites
setevent $0031
@@ -174,7 +174,7 @@
UnknownScript_0x75af7: ; 0x75af7
loadfont
- writetext UnknownText_0x75dde
+ writetext FastShipArrivedOlivineText
closetext
loadmovesprites
setevent $0031
@@ -181,9 +181,8 @@
end
; 0x75b01
-MapFastShipCabins_SW_SSW_NWSignpost2Script: ; 0x75b01
+FastShipCabinsNorthwestCabinTrashcan: ; 0x75b01
jumpstd trashcan
-; 0x75b04
FirebreatherLyleSeenText: ; 0x75b04
text "I'm going to KANTO"
@@ -285,31 +284,27 @@
done
; 0x75da4
-UnknownText_0x75da4: ; 0x75da4
+FastShipBedText1:
text "A comfy bed!"
line "Time to sleep…"
done
-; 0x75dc1
-UnknownText_0x75dc1: ; 0x75dc1
+FastShipBedText2:
text "Ah, refreshed and"
line "restored!"
done
-; 0x75dde
-UnknownText_0x75dde: ; 0x75dde
+FastShipArrivedOlivineText:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "OLIVINE CITY."
done
-; 0x75e0f
-UnknownText_0x75e0f: ; 0x75e0f
+FastShipArrivedVermilionText:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "VERMILION CITY."
done
-; 0x75e42
FastShipCabins_SW_SSW_NW_MapEventHeader: ; 0x75e42
; filler
@@ -328,9 +323,9 @@
; signposts
db 3
- signpost 1, 7, $0, MapFastShipCabins_SW_SSW_NWSignpost1Script
- signpost 2, 7, $0, MapFastShipCabins_SW_SSW_NWSignpost1Script
- signpost 7, 7, $0, MapFastShipCabins_SW_SSW_NWSignpost2Script
+ signpost 1, 7, $0, FastShipBed
+ signpost 2, 7, $0, FastShipBed
+ signpost 7, 7, $0, FastShipCabinsNorthwestCabinTrashcan
; people-events
db 4
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -1,4 +1,4 @@
-FuchsiaCity_MapScriptHeader: ; 0x194b19
+FuchsiaCity_MapScriptHeader:
; trigger count
db 0
@@ -8,62 +8,48 @@
; callbacks
dbw 5, UnknownScript_0x194b1e
-; 0x194b1e
-UnknownScript_0x194b1e: ; 0x194b1e
+UnknownScript_0x194b1e:
setflag $003e
return
-; 0x194b22
-YoungsterScript_0x194b22: ; 0x194b22
+YoungsterScript_0x194b22:
jumptextfaceplayer UnknownText_0x194b45
-; 0x194b25
-PokefanMScript_0x194b25: ; 0x194b25
+PokefanMScript_0x194b25:
jumptextfaceplayer UnknownText_0x194b83
-; 0x194b28
-TeacherScript_0x194b28: ; 0x194b28
+TeacherScript_0x194b28:
jumptextfaceplayer UnknownText_0x194bd3
-; 0x194b2b
-MapFuchsiaCitySignpost0Script: ; 0x194b2b
- jumptext UnknownText_0x194c22
-; 0x194b2e
+FuchsiaCitySign:
+ jumptext FuchsiaCitySignText
-MapFuchsiaCitySignpost1Script: ; 0x194b2e
- jumptext UnknownText_0x194c4a
-; 0x194b31
+FuchsiaGymSign:
+ jumptext FuchsiaGymSignText
-MapFuchsiaCitySignpost2Script: ; 0x194b31
- jumptext UnknownText_0x194c8b
-; 0x194b34
+SafariZoneOfficeSign:
+ jumptext SafariZoneOfficeSignText
-MapFuchsiaCitySignpost3Script: ; 0x194b34
- jumptext UnknownText_0x194cd5
-; 0x194b37
+WardensHomeSign:
+ jumptext WardensHomeSignText
-MapFuchsiaCitySignpost4Script: ; 0x194b37
- jumptext UnknownText_0x194cf0
-; 0x194b3a
+SafariZoneClosedSign:
+ jumptext SafariZoneClosedSignText
-MapFuchsiaCitySignpost5Script: ; 0x194b3a
- jumptext UnknownText_0x194d37
-; 0x194b3d
+NoLitteringSign:
+ jumptext NoLitteringSignText
-MapFuchsiaCitySignpost6Script: ; 0x194b3d
+FuchsiaCityPokeCenterSign:
jumpstd pokecentersign
-; 0x194b40
-MapFuchsiaCitySignpost7Script: ; 0x194b40
+FuchsiaCityMartSign:
jumpstd martsign
-; 0x194b43
-FruitTreeScript_0x194b43: ; 0x194b43
+FruitTreeScript_0x194b43:
fruittree $1e
-; 0x194b45
-UnknownText_0x194b45: ; 0x194b45
+UnknownText_0x194b45:
text "One of the ELITE"
line "FOUR used to be"
@@ -70,9 +56,8 @@
para "the LEADER of"
line "FUCHSIA's GYM."
done
-; 0x194b83
-UnknownText_0x194b83: ; 0x194b83
+UnknownText_0x194b83:
text "KOGA's daughter"
line "succeeded him as"
@@ -80,9 +65,8 @@
line "after he joined"
cont "the ELITE FOUR."
done
-; 0x194bd3
-UnknownText_0x194bd3: ; 0x194bd3
+UnknownText_0x194bd3:
text "The SAFARI ZONE is"
line "closed… It's sad,"
@@ -90,17 +74,15 @@
line "FUCHSIA's main"
cont "attraction."
done
-; 0x194c22
-UnknownText_0x194c22: ; 0x194c22
+FuchsiaCitySignText:
text "FUCHSIA CITY"
para "Behold! It's"
line "Passion Pink!"
done
-; 0x194c4a
-UnknownText_0x194c4a: ; 0x194c4a
+FuchsiaGymSignText:
text "FUCHSIA CITY"
line "#MON GYM"
cont "LEADER: JANINE"
@@ -108,9 +90,8 @@
para "The Poisonous"
line "Ninja Master"
done
-; 0x194c8b
-UnknownText_0x194c8b: ; 0x194c8b
+SafariZoneOfficeSignText:
text "There's a notice"
line "here…"
@@ -118,15 +99,13 @@
line "is closed until"
cont "further notice."
done
-; 0x194cd5
-UnknownText_0x194cd5: ; 0x194cd5
+WardensHomeSignText:
text "SAFARI ZONE"
line "WARDEN'S HOME"
done
-; 0x194cf0
-UnknownText_0x194cf0: ; 0x194cf0
+SafariZoneClosedSignText:
text "The WARDEN is"
line "traveling abroad."
@@ -134,17 +113,15 @@
line "SAFARI ZONE is"
cont "closed."
done
-; 0x194d37
-UnknownText_0x194d37: ; 0x194d37
+NoLitteringSignText:
text "No littering."
para "Please take your"
line "waste with you."
done
-; 0x194d67
-FuchsiaCity_MapEventHeader: ; 0x194d67
+FuchsiaCity_MapEventHeader:
; filler
db 0, 0
@@ -167,14 +144,14 @@
; signposts
db 8
- signpost 15, 21, $0, MapFuchsiaCitySignpost0Script
- signpost 29, 5, $0, MapFuchsiaCitySignpost1Script
- signpost 15, 25, $0, MapFuchsiaCitySignpost2Script
- signpost 29, 27, $0, MapFuchsiaCitySignpost3Script
- signpost 5, 17, $0, MapFuchsiaCitySignpost4Script
- signpost 15, 13, $0, MapFuchsiaCitySignpost5Script
- signpost 27, 20, $0, MapFuchsiaCitySignpost6Script
- signpost 13, 6, $0, MapFuchsiaCitySignpost7Script
+ signpost 15, 21, $0, FuchsiaCitySign
+ signpost 29, 5, $0, FuchsiaGymSign
+ signpost 15, 25, $0, SafariZoneOfficeSign
+ signpost 29, 27, $0, WardensHomeSign
+ signpost 5, 17, $0, SafariZoneClosedSign
+ signpost 15, 13, $0, NoLitteringSign
+ signpost 27, 20, $0, FuchsiaCityPokeCenterSign
+ signpost 13, 6, $0, FuchsiaCityMartSign
; people-events
db 4
@@ -182,4 +159,3 @@
person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, $ffff
person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, $ffff
person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, $ffff
-; 0x194e00
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -6,7 +6,7 @@
db 0
; 0x54be4
-BillScript_0x54be4: ; 0x54be4
+BillsHouseBill:
faceplayer
loadfont
checkevent EVENT_GOT_EEVEE
@@ -51,7 +51,7 @@
end
; 0x54c25
-PokefanFScript_0x54c25: ; 0x54c25
+BillsMom: ; 0x54c25
faceplayer
loadfont
checkevent $0712
@@ -69,7 +69,7 @@
end
; 0x54c39
-TwinScript_0x54c39: ; 0x54c39
+BillsSister:
faceplayer
loadfont
checkcellnum $3
@@ -104,17 +104,14 @@
jump UnknownScript_0x54c5e
; 0x54c6b
-MapGoldenrodBillsHouseSignpost1Script: ; 0x54c6b
+BillsHouseBookshelf1:
jumpstd picturebookshelf
-; 0x54c6e
-MapGoldenrodBillsHouseSignpost0Script: ; 0x54c6e
+BillsHouseBookshelf2:
jumpstd magazinebookshelf
-; 0x54c71
-MapGoldenrodBillsHouseSignpost2Script: ; 0x54c71
+BillsHouseRadio:
jumpstd radio2
-; 0x54c74
UnknownText_0x54c74: ; 0x54c74
text "BILL: Hi, ", $52, "!"
@@ -278,13 +275,13 @@
; signposts
db 3
- signpost 1, 0, $0, MapGoldenrodBillsHouseSignpost0Script
- signpost 1, 1, $0, MapGoldenrodBillsHouseSignpost1Script
- signpost 1, 7, $0, MapGoldenrodBillsHouseSignpost2Script
+ signpost 1, 0, $0, BillsHouseBookshelf2
+ signpost 1, 1, $0, BillsHouseBookshelf1
+ signpost 1, 7, $0, BillsHouseRadio
; people-events
db 3
- person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillScript_0x54be4, $0712
- person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x54c25, $ffff
- person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, TwinScript_0x54c39, $ffff
+ 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/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -1,4 +1,4 @@
-GoldenrodCity_MapScriptHeader: ; 0x1988d0
+GoldenrodCity_MapScriptHeader:
; trigger count
db 0
@@ -10,19 +10,17 @@
dbw 5, UnknownScript_0x1988d8
dbw 2, UnknownScript_0x1988e8
-; 0x1988d8
-UnknownScript_0x1988d8: ; 0x1988d8
+UnknownScript_0x1988d8:
setflag $0046
setflag $0016
checkevent $00b9
iftrue UnknownScript_0x1988e7
clearevent $0769
-UnknownScript_0x1988e7: ; 0x1988e7
+UnknownScript_0x1988e7:
return
-; 0x1988e8
-UnknownScript_0x1988e8: ; 0x1988e8
+UnknownScript_0x1988e8:
checkevent EVENT_BEAT_ELITE_FOUR
iffalse UnknownScript_0x198908
checkitem COIN_CASE
@@ -30,20 +28,18 @@
checkcode $b
if_equal WEDNESDAY, UnknownScript_0x198900
if_equal SATURDAY, UnknownScript_0x198900
-UnknownScript_0x1988fd: ; 0x1988fd
+UnknownScript_0x1988fd:
disappear $10
return
-; 0x198900
-UnknownScript_0x198900: ; 0x198900
+UnknownScript_0x198900:
checkflag $005e
iftrue UnknownScript_0x198908
appear $10
-UnknownScript_0x198908: ; 0x198908
+UnknownScript_0x198908:
return
-; 0x198909
-PokefanMScript_0x198909: ; 0x198909
+MoveTutor:
faceplayer
loadfont
writetext UnknownText_0x199042
@@ -63,42 +59,37 @@
if_equal $2, UnknownScript_0x198949
if_equal $3, UnknownScript_0x198958
jump UnknownScript_0x1989d7
-; 0x19893a
-UnknownScript_0x19893a: ; 0x19893a
+UnknownScript_0x19893a:
writebyte $1
writetext UnknownText_0x1991cf
special Function4925b
if_equal $0, UnknownScript_0x1989a6
jump UnknownScript_0x1989d7
-; 0x198949
-UnknownScript_0x198949: ; 0x198949
+UnknownScript_0x198949:
writebyte $2
writetext UnknownText_0x1991cf
special Function4925b
if_equal $0, UnknownScript_0x1989a6
jump UnknownScript_0x1989d7
-; 0x198958
-UnknownScript_0x198958: ; 0x198958
+UnknownScript_0x198958:
writebyte $3
writetext UnknownText_0x1991cf
special Function4925b
if_equal $0, UnknownScript_0x1989a6
jump UnknownScript_0x1989d7
-; 0x198967
-MenuDataHeader_0x198967: ; 0x198967
+MenuDataHeader_0x198967:
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
dw MenuData2_0x19896f
db 1 ; default option
-; 0x19896f
-MenuData2_0x19896f: ; 0x19896f
+MenuData2_0x19896f:
db $80 ; flags
db 4 ; items
db "FLAMETHROWER@"
@@ -105,24 +96,21 @@
db "THUNDERBOLT@"
db "ICE BEAM@"
db "CANCEL@"
-; 0x19899a
-UnknownScript_0x19899a: ; 0x19899a
+UnknownScript_0x19899a:
writetext UnknownText_0x1990b4
closetext
loadmovesprites
end
-; 0x1989a0
-UnknownScript_0x1989a0: ; 0x1989a0
+UnknownScript_0x1989a0:
writetext UnknownText_0x199107
closetext
loadmovesprites
end
-; 0x1989a6
-UnknownScript_0x1989a6: ; 0x1989a6
+UnknownScript_0x1989a6:
writetext UnknownText_0x19913a
keeptextopen
takecoins 4000
@@ -136,11 +124,10 @@
if_equal $2, UnknownScript_0x1989c6
applymovement $10, MovementData_0x198a5f
jump UnknownScript_0x1989ca
-; 0x1989c6
-UnknownScript_0x1989c6: ; 0x1989c6
+UnknownScript_0x1989c6:
applymovement $10, MovementData_0x198a63
-UnknownScript_0x1989ca: ; 0x1989ca
+UnknownScript_0x1989ca:
playsound SFX_ENTER_DOOR
disappear $10
clearevent $076b
@@ -147,31 +134,26 @@
setflag $005e
waitbutton
end
-; 0x1989d7
-UnknownScript_0x1989d7: ; 0x1989d7
+UnknownScript_0x1989d7:
writetext UnknownText_0x1991a4
closetext
loadmovesprites
end
-; 0x1989dd
-UnknownScript_0x1989dd: ; 0x1989dd
+UnknownScript_0x1989dd:
writetext UnknownText_0x1991ac
closetext
loadmovesprites
end
-; 0x1989e3
-PokefanMScript_0x1989e3: ; 0x1989e3
+PokefanMScript_0x1989e3:
jumptextfaceplayer UnknownText_0x198a69
-; 0x1989e6
-YoungsterScript_0x1989e6: ; 0x1989e6
+YoungsterScript_0x1989e6:
jumptextfaceplayer UnknownText_0x198aa9
-; 0x1989e9
-CooltrainerFScript_0x1989e9: ; 0x1989e9
+CooltrainerFScript_0x1989e9:
faceplayer
loadfont
checkevent EVENT_CLEARED_RADIO_TOWER
@@ -180,16 +162,14 @@
closetext
loadmovesprites
end
-; 0x1989f7
-UnknownScript_0x1989f7: ; 0x1989f7
+UnknownScript_0x1989f7:
writetext UnknownText_0x198b2d
closetext
loadmovesprites
end
-; 0x1989fd
-CooltrainerFScript_0x1989fd: ; 0x1989fd
+CooltrainerFScript_0x1989fd:
faceplayer
loadfont
checkflag $0000
@@ -198,28 +178,23 @@
closetext
loadmovesprites
end
-; 0x198a0b
-UnknownScript_0x198a0b: ; 0x198a0b
+UnknownScript_0x198a0b:
writetext UnknownText_0x198c14
closetext
loadmovesprites
end
-; 0x198a11
-YoungsterScript_0x198a11: ; 0x198a11
+YoungsterScript_0x198a11:
jumptextfaceplayer UnknownText_0x198c36
-; 0x198a14
-LassScript_0x198a14: ; 0x198a14
+LassScript_0x198a14:
jumptextfaceplayer UnknownText_0x198c83
-; 0x198a17
-GrampsScript_0x198a17: ; 0x198a17
+GrampsScript_0x198a17:
jumptextfaceplayer UnknownText_0x198ccf
-; 0x198a1a
-RocketScript_0x198a1a: ; 0x198a1a
+RocketScript_0x198a1a:
loadfont
writetext UnknownText_0x198d0d
keeptextopen
@@ -229,88 +204,68 @@
loadmovesprites
spriteface $9, $1
end
-; 0x198a29
-RocketScript_0x198a29: ; 0x198a29
+RocketScript_0x198a29:
jumptextfaceplayer UnknownText_0x198d4e
-; 0x198a2c
-RocketScript_0x198a2c: ; 0x198a2c
+RocketScript_0x198a2c:
jumptextfaceplayer UnknownText_0x198d6d
-; 0x198a2f
-RocketScript_0x198a2f: ; 0x198a2f
+RocketScript_0x198a2f:
jumptextfaceplayer UnknownText_0x198daa
-; 0x198a32
-RocketScript_0x198a32: ; 0x198a32
+RocketScript_0x198a32:
jumptextfaceplayer UnknownText_0x198de2
-; 0x198a35
-RocketScript_0x198a35: ; 0x198a35
+RocketScript_0x198a35:
jumptextfaceplayer UnknownText_0x198e1f
-; 0x198a38
-RocketScript_0x198a38: ; 0x198a38
+RocketScript_0x198a38:
jumptextfaceplayer UnknownText_0x198e4b
-; 0x198a3b
-MapGoldenrodCitySignpost0Script: ; 0x198a3b
- jumptext UnknownText_0x198e77
-; 0x198a3e
+GoldenrodCityStationSign:
+ jumptext GoldenrodCityStationSignText
-MapGoldenrodCitySignpost1Script: ; 0x198a3e
- jumptext UnknownText_0x198e8f
-; 0x198a41
+GoldenrodCityRadioTowerSign:
+ jumptext GoldenrodCityRadioTowerSignText
-MapGoldenrodCitySignpost2Script: ; 0x198a41
- jumptext UnknownText_0x198eab
-; 0x198a44
+GoldenrodDeptStoreSign:
+ jumptext GoldenrodDeptStoreSignText
-MapGoldenrodCitySignpost3Script: ; 0x198a44
- jumptext UnknownText_0x198ee4
-; 0x198a47
+GoldenrodGymSign:
+ jumptext GoldenrodGymSignText
-MapGoldenrodCitySignpost4Script: ; 0x198a47
- jumptext UnknownText_0x198f29
-; 0x198a4a
+GoldenrodCitySign:
+ jumptext GoldenrodCitySignText
-MapGoldenrodCitySignpost5Script: ; 0x198a4a
- jumptext UnknownText_0x198f5b
-; 0x198a4d
+GoldenrodCityBikeShopSign:
+ jumptext GoldenrodCityBikeShopSignText
-MapGoldenrodCitySignpost6Script: ; 0x198a4d
- jumptext UnknownText_0x198f81
-; 0x198a50
+GoldenrodCityGameCornerSign:
+ jumptext GoldenrodCityGameCornerSignText
-MapGoldenrodCitySignpost7Script: ; 0x198a50
- jumptext UnknownText_0x198fae
-; 0x198a53
+GoldenrodCityNameRaterSign:
+ jumptext GoldenrodCityNameRaterSignText
-MapGoldenrodCitySignpost8Script: ; 0x198a53
- jumptext UnknownText_0x198fd8
-; 0x198a56
+GoldenrodCityUndergroundSignNorth:
+ jumptext GoldenrodCityUndergroundSignNorthText
-MapGoldenrodCitySignpost9Script: ; 0x198a56
- jumptext UnknownText_0x198fee
-; 0x198a59
+GoldenrodCityUndergroundSignSouth:
+ jumptext GoldenrodCityUndergroundSignSouthText
-MapGoldenrodCitySignpost10Script: ; 0x198a59
+GoldenrodCityPokeCenterSign:
jumpstd pokecentersign
-; 0x198a5c
-MapGoldenrodCitySignpost11Script: ; 0x198a5c
- jumptext UnknownText_0x199022
-; 0x198a5f
+GoldenrodCityFlowerShopSign:
+ jumptext GoldenrodCityFlowerShopSignText
-MovementData_0x198a5f: ; 0x198a5f
+MovementData_0x198a5f:
step_right
step_right
step_up
step_end
-; 0x198a63
-MovementData_0x198a63: ; 0x198a63
+MovementData_0x198a63:
step_down
step_right
step_right
@@ -317,9 +272,8 @@
step_up
step_up
step_end
-; 0x198a69
-UnknownText_0x198a69: ; 0x198a69
+UnknownText_0x198a69:
text "They built the new"
line "RADIO TOWER to"
@@ -326,9 +280,8 @@
para "replace the old,"
line "creaky one."
done
-; 0x198aa9
-UnknownText_0x198aa9: ; 0x198aa9
+UnknownText_0x198aa9:
text "I know there's a"
line "new BIKE SHOP, but"
@@ -335,9 +288,8 @@
para "I can't find it"
line "anywhere."
done
-; 0x198ae6
-UnknownText_0x198ae6: ; 0x198ae6
+UnknownText_0x198ae6:
text "Is that man in"
line "black dressed up"
@@ -344,9 +296,8 @@
para "like a TEAM ROCKET"
line "member? How silly!"
done
-; 0x198b2d
-UnknownText_0x198b2d: ; 0x198b2d
+UnknownText_0x198b2d:
text "Was that man in"
line "black really part"
@@ -353,9 +304,8 @@
para "of TEAM ROCKET? I"
line "can't believe it!"
done
-; 0x198b73
-UnknownText_0x198b73: ; 0x198b73
+UnknownText_0x198b73:
text "The RADIO TOWER in"
line "GOLDENROD CITY is"
cont "a landmark."
@@ -370,15 +320,13 @@
para "so it can also"
line "serve as a radio."
done
-; 0x198c14
-UnknownText_0x198c14: ; 0x198c14
+UnknownText_0x198c14:
text "Oh, your #GEAR"
line "works as a radio!"
done
-; 0x198c36
-UnknownText_0x198c36: ; 0x198c36
+UnknownText_0x198c36:
text "E-he-he-he…"
para "I got in trouble"
@@ -387,9 +335,8 @@
para "basement of the"
line "DEPT.STORE."
done
-; 0x198c83
-UnknownText_0x198c83: ; 0x198c83
+UnknownText_0x198c83:
text "The man at that"
line "house rates your"
cont "#MON names."
@@ -397,9 +344,8 @@
para "He can even rename"
line "your #MON."
done
-; 0x198ccf
-UnknownText_0x198ccf: ; 0x198ccf
+UnknownText_0x198ccf:
text "Whew! This is one"
line "big town. I don't"
@@ -406,27 +352,23 @@
para "know where any-"
line "thing is."
done
-; 0x198d0d
-UnknownText_0x198d0d: ; 0x198d0d
+UnknownText_0x198d0d:
text "So this is the"
line "RADIO TOWER…"
done
-; 0x198d2a
-UnknownText_0x198d2a: ; 0x198d2a
+UnknownText_0x198d2a:
text "What do you want,"
line "you pest? Scram!"
done
-; 0x198d4e
-UnknownText_0x198d4e: ; 0x198d4e
+UnknownText_0x198d4e:
text "Stay out of the"
line "way! Beat it!"
done
-; 0x198d6d
-UnknownText_0x198d6d: ; 0x198d6d
+UnknownText_0x198d6d:
text "Take over the"
line "RADIO TOWER…"
@@ -433,9 +375,8 @@
para "What? It's none of"
line "your business!"
done
-; 0x198daa
-UnknownText_0x198daa: ; 0x198daa
+UnknownText_0x198daa:
text "#MON? They're"
line "nothing more than"
@@ -442,9 +383,8 @@
para "tools for making"
line "money!"
done
-; 0x198de2
-UnknownText_0x198de2: ; 0x198de2
+UnknownText_0x198de2:
text "Our dream will"
line "soon come true…"
@@ -451,35 +391,30 @@
para "It was such a long"
line "struggle…"
done
-; 0x198e1f
-UnknownText_0x198e1f: ; 0x198e1f
+UnknownText_0x198e1f:
text "Hey, brat! You"
line "don't belong here!"
cont "Get lost!"
done
-; 0x198e4b
-UnknownText_0x198e4b: ; 0x198e4b
+UnknownText_0x198e4b:
text "Come taste the"
line "true terror of"
cont "TEAM ROCKET!"
done
-; 0x198e77
-UnknownText_0x198e77: ; 0x198e77
+GoldenrodCityStationSignText:
text "GOLDENROD CITY"
line "STATION"
done
-; 0x198e8f
-UnknownText_0x198e8f: ; 0x198e8f
+GoldenrodCityRadioTowerSignText:
text "GOLDENROD CITY"
line "RADIO TOWER"
done
-; 0x198eab
-UnknownText_0x198eab: ; 0x198eab
+GoldenrodDeptStoreSignText:
text "Full Selection of"
line "#MON Goods!"
@@ -486,9 +421,8 @@
para "GOLDENROD CITY"
line "DEPT.STORE"
done
-; 0x198ee4
-UnknownText_0x198ee4: ; 0x198ee4
+GoldenrodGymSignText:
text "GOLDENROD CITY"
line "#MON GYM"
cont "LEADER: WHITNEY"
@@ -496,64 +430,56 @@
para "The Incredibly"
line "Pretty Girl!"
done
-; 0x198f29
-UnknownText_0x198f29: ; 0x198f29
+GoldenrodCitySignText:
text "GOLDENROD CITY"
para "The Festive City"
line "of Opulent Charm"
done
-; 0x198f5b
-UnknownText_0x198f5b: ; 0x198f5b
+GoldenrodCityBikeShopSignText:
text "The World is a"
line "Cycle Path!"
cont "BIKE SHOP"
done
-; 0x198f81
-UnknownText_0x198f81: ; 0x198f81
+GoldenrodCityGameCornerSignText:
text "Your Playground!"
para "GOLDENROD CITY"
line "GAME CORNER"
done
-; 0x198fae
-UnknownText_0x198fae: ; 0x198fae
+GoldenrodCityNameRaterSignText:
text "NAME RATER"
para "Get Your #MON"
line "Nicknames Rated"
done
-; 0x198fd8
-UnknownText_0x198fd8: ; 0x198fd8
+GoldenrodCityUndergroundSignNorthText:
text "UNDERGROUND"
line "ENTRANCE"
done
-; 0x198fee
-UnknownText_0x198fee: ; 0x198fee
+GoldenrodCityUndergroundSignSouthText:
text "UNDERGROUND"
line "ENTRANCE"
done
-; 0x199004
-UnknownText_0x199004: ; 0x199004
+PokeComCenterSignText:
+; unused in the english version
text "For Mobile Tips!"
line "#COM CENTER"
done
-; 0x199022
-UnknownText_0x199022: ; 0x199022
+GoldenrodCityFlowerShopSignText:
text "Blooming Beautiful"
line "FLOWER SHOP"
done
-; 0x199042
-UnknownText_0x199042: ; 0x199042
+UnknownText_0x199042:
text "I can teach your"
line "#MON amazing"
@@ -563,21 +489,18 @@
para "Should I teach a"
line "new move?"
done
-; 0x199090
-UnknownText_0x199090: ; 0x199090
+UnknownText_0x199090:
text "It will cost you"
line "4000 coins. Okay?"
done
-; 0x1990b4
-UnknownText_0x1990b4: ; 0x1990b4
+UnknownText_0x1990b4:
text "Aww… But they're"
line "amazing…"
done
-; 0x1990ce
-UnknownText_0x1990ce: ; 0x1990ce
+UnknownText_0x1990ce:
text "Wahahah! You won't"
line "regret it!"
@@ -584,16 +507,14 @@
para "Which move should"
line "I teach?"
done
-; 0x199107
-UnknownText_0x199107: ; 0x199107
+UnknownText_0x199107:
text "Hm, too bad. I'll"
line "have to get some"
cont "cash from home…"
done
-; 0x19913a
-UnknownText_0x19913a: ; 0x19913a
+UnknownText_0x19913a:
text "If you understand"
line "what's so amazing"
@@ -601,30 +522,25 @@
line "you've made it as"
cont "a trainer."
done
-; 0x19918b
-UnknownText_0x19918b: ; 0x19918b
+UnknownText_0x19918b:
text "Wahahah!"
line "Farewell, kid!"
done
-; 0x1991a4
-UnknownText_0x1991a4: ; 0x1991a4
+UnknownText_0x1991a4:
text "B-but…"
done
-; 0x1991ac
-UnknownText_0x1991ac: ; 0x1991ac
+UnknownText_0x1991ac:
text "…You don't have"
line "enough coins here…"
done
-; 0x1991cf
-UnknownText_0x1991cf: ; 0x1991cf
+UnknownText_0x1991cf:
db $0, $57
-; 0x1991d1
-GoldenrodCity_MapEventHeader: ; 0x1991d1
+GoldenrodCity_MapEventHeader:
; filler
db 0, 0
@@ -651,18 +567,18 @@
; signposts
db 12
- signpost 14, 10, $0, MapGoldenrodCitySignpost0Script
- signpost 17, 4, $0, MapGoldenrodCitySignpost1Script
- signpost 27, 26, $0, MapGoldenrodCitySignpost2Script
- signpost 9, 26, $0, MapGoldenrodCitySignpost3Script
- signpost 18, 22, $0, MapGoldenrodCitySignpost4Script
- signpost 30, 28, $0, MapGoldenrodCitySignpost5Script
- signpost 22, 16, $0, MapGoldenrodCitySignpost6Script
- signpost 7, 12, $0, MapGoldenrodCitySignpost7Script
- signpost 6, 8, $0, MapGoldenrodCitySignpost8Script
- signpost 30, 12, $0, MapGoldenrodCitySignpost9Script
- signpost 27, 16, $1, MapGoldenrodCitySignpost10Script
- signpost 6, 30, $0, MapGoldenrodCitySignpost11Script
+ signpost 14, 10, $0, GoldenrodCityStationSign
+ signpost 17, 4, $0, GoldenrodCityRadioTowerSign
+ signpost 27, 26, $0, GoldenrodDeptStoreSign
+ signpost 9, 26, $0, GoldenrodGymSign
+ signpost 18, 22, $0, GoldenrodCitySign
+ signpost 30, 28, $0, GoldenrodCityBikeShopSign
+ signpost 22, 16, $0, GoldenrodCityGameCornerSign
+ signpost 7, 12, $0, GoldenrodCityNameRaterSign
+ signpost 6, 8, $0, GoldenrodCityUndergroundSignNorth
+ signpost 30, 12, $0, GoldenrodCityUndergroundSignSouth
+ signpost 27, 16, $1, GoldenrodCityPokeCenterSign
+ signpost 6, 30, $0, GoldenrodCityFlowerShopSign
; people-events
db 15
@@ -680,5 +596,4 @@
person_event SPRITE_ROCKET, 24, 33, $7, $0, 255, 255, $0, 0, RocketScript_0x198a32, $06ce
person_event SPRITE_ROCKET, 11, 33, $6, $0, 255, 255, $0, 0, RocketScript_0x198a35, $06ce
person_event SPRITE_ROCKET, 14, 35, $8, $0, 255, 255, $0, 0, RocketScript_0x198a38, $06ce
- person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, PokefanMScript_0x198909, $076a
-; 0x199321
+ person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, MoveTutor, $076a
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -1,42 +1,34 @@
-GoldenrodDeptStore1F_MapScriptHeader: ; 0x5597f
+GoldenrodDeptStore1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x55981
-ReceptionistScript_0x55981: ; 0x55981
+ReceptionistScript_0x55981:
jumptextfaceplayer UnknownText_0x55993
-; 0x55984
-GentlemanScript_0x55984: ; 0x55984
+GentlemanScript_0x55984:
jumptextfaceplayer UnknownText_0x559b7
-; 0x55987
-PokefanFScript_0x55987: ; 0x55987
+PokefanFScript_0x55987:
jumptextfaceplayer UnknownText_0x55a1a
-; 0x5598a
-BugCatcherScript_0x5598a: ; 0x5598a
+BugCatcherScript_0x5598a:
jumptextfaceplayer UnknownText_0x55a3a
-; 0x5598d
-MapGoldenrodDeptStore1FSignpost0Script: ; 0x5598d
- jumptext UnknownText_0x55a80
-; 0x55990
+GoldenrodDeptStore1FDirectory:
+ jumptext GoldenrodDeptStore1FDirectoryText
-MapGoldenrodDeptStore1FSignpost1Script: ; 0x55990
+GoldenrodDeptStore1FElevatorButton:
jumpstd elevatorbutton
-; 0x55993
-UnknownText_0x55993: ; 0x55993
+UnknownText_0x55993:
text "Welcome to GOLDEN-"
line "ROD DEPT.STORE."
done
-; 0x559b7
-UnknownText_0x559b7: ; 0x559b7
+UnknownText_0x559b7:
text "The DEPT.STORE"
line "has a decent se-"
cont "lection."
@@ -47,15 +39,13 @@
para "as GAME CORNER"
line "prizes."
done
-; 0x55a1a
-UnknownText_0x55a1a: ; 0x55a1a
+UnknownText_0x55a1a:
text "I'm raring to shop"
line "again today!"
done
-; 0x55a3a
-UnknownText_0x55a3a: ; 0x55a3a
+UnknownText_0x55a3a:
text "Mom's good at"
line "bargain hunting."
@@ -63,9 +53,8 @@
line "stuff at lower"
cont "prices."
done
-; 0x55a80
-UnknownText_0x55a80: ; 0x55a80
+GoldenrodDeptStore1FDirectoryText:
text "1F SERVICE COUNTER"
para "2F TRAINER'S"
@@ -82,9 +71,8 @@
para "ROOFTOP LOOKOUT"
done
-; 0x55b03
-GoldenrodDeptStore1F_MapEventHeader: ; 0x55b03
+GoldenrodDeptStore1F_MapEventHeader:
; filler
db 0, 0
@@ -100,8 +88,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapGoldenrodDeptStore1FSignpost0Script
- signpost 0, 3, $0, MapGoldenrodDeptStore1FSignpost1Script
+ signpost 0, 14, $0, GoldenrodDeptStore1FDirectory
+ signpost 0, 3, $0, GoldenrodDeptStore1FElevatorButton
; people-events
db 4
@@ -109,4 +97,3 @@
person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, $ffff
person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, $ffff
person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, $ffff
-; 0x55b5b
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -1,49 +1,41 @@
-GoldenrodDeptStore2F_MapScriptHeader: ; 0x55b5b
+GoldenrodDeptStore2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x55b5d
-ClerkScript_0x55b5d: ; 0x55b5d
+ClerkScript_0x55b5d:
faceplayer
loadfont
pokemart $0, $0005
loadmovesprites
end
-; 0x55b65
-ClerkScript_0x55b65: ; 0x55b65
+ClerkScript_0x55b65:
faceplayer
loadfont
pokemart $0, $0006
loadmovesprites
end
-; 0x55b6d
-YoungsterScript_0x55b6d: ; 0x55b6d
+YoungsterScript_0x55b6d:
jumptextfaceplayer UnknownText_0x55c25
-; 0x55b70
-CooltrainerFScript_0x55b70: ; 0x55b70
+CooltrainerFScript_0x55b70:
jumptextfaceplayer UnknownText_0x55c7b
-; 0x55b73
-GentlemanScript_0x55b73: ; 0x55b73
+GentlemanScript_0x55b73:
jumptextfaceplayer UnknownText_0x55cb7
-; 0x55b76
-MapGoldenrodDeptStore2FSignpost0Script: ; 0x55b76
- jumptext UnknownText_0x55d28
-; 0x55b79
+GoldenrodDeptStore2FDirectory:
+ jumptext GoldenrodDeptStore2FDirectoryText
-MapGoldenrodDeptStore2FSignpost1Script: ; 0x55b79
+GoldenrodDeptStore2FElevatorButton:
jumpstd elevatorbutton
-; 0x55b7c
; possibly unused
-UnknownText_0x55b7c: ; 0x55b7c
+UnknownText_0x55b7c:
text "We intend to sell"
line "items for #MON"
cont "to hold."
@@ -52,10 +44,9 @@
line "gift. Have a #-"
cont "MON hold it."
done
-; 0x55bd3
; possibly unused
-UnknownText_0x55bd3: ; 0x55bd3
+UnknownText_0x55bd3:
text "By giving #MON"
line "items to hold, I"
@@ -63,9 +54,8 @@
line "develop new battle"
cont "techniques."
done
-; 0x55c25
-UnknownText_0x55c25: ; 0x55c25
+UnknownText_0x55c25:
text "#GEAR can store"
line "up to ten phone"
cont "numbers."
@@ -74,9 +64,8 @@
line "cide which numbers"
cont "to keep."
done
-; 0x55c7b
-UnknownText_0x55c7b: ; 0x55c7b
+UnknownText_0x55c7b:
text "I got my ABRA at"
line "the GAME CORNER."
@@ -83,9 +72,8 @@
para "Now it's my best"
line "partner."
done
-; 0x55cb7
-UnknownText_0x55cb7: ; 0x55cb7
+UnknownText_0x55cb7:
text "This DEPT.STORE"
line "makes me realize"
@@ -96,9 +84,8 @@
line "is unmatched any-"
cont "where else."
done
-; 0x55d28
-UnknownText_0x55d28: ; 0x55d28
+GoldenrodDeptStore2FDirectoryText:
text "Your Travel"
line "Companion"
@@ -105,9 +92,8 @@
para "2F TRAINER'S"
line " MARKET"
done
-; 0x55d56
-GoldenrodDeptStore2F_MapEventHeader: ; 0x55d56
+GoldenrodDeptStore2F_MapEventHeader:
; filler
db 0, 0
@@ -122,8 +108,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapGoldenrodDeptStore2FSignpost0Script
- signpost 0, 3, $0, MapGoldenrodDeptStore2FSignpost1Script
+ signpost 0, 14, $0, GoldenrodDeptStore2FDirectory
+ signpost 0, 3, $0, GoldenrodDeptStore2FElevatorButton
; people-events
db 5
@@ -132,4 +118,3 @@
person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, $ffff
person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, $ffff
person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, $ffff
-; 0x55db6
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -1,36 +1,30 @@
-GoldenrodDeptStore3F_MapScriptHeader: ; 0x55db6
+GoldenrodDeptStore3F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x55db8
-ClerkScript_0x55db8: ; 0x55db8
+ClerkScript_0x55db8:
faceplayer
loadfont
pokemart $0, $0007
loadmovesprites
end
-; 0x55dc0
-SuperNerdScript_0x55dc0: ; 0x55dc0
+SuperNerdScript_0x55dc0:
jumptextfaceplayer UnknownText_0x55dcc
-; 0x55dc3
-RockerScript_0x55dc3: ; 0x55dc3
+RockerScript_0x55dc3:
jumptextfaceplayer UnknownText_0x55e15
-; 0x55dc6
-MapGoldenrodDeptStore3FSignpost0Script: ; 0x55dc6
- jumptext UnknownText_0x55e74
-; 0x55dc9
+GoldenrodDeptStore3FDirectory:
+ jumptext GoldenrodDeptStore3FDirectoryText
-MapGoldenrodDeptStore3FSignpost1Script: ; 0x55dc9
+GoldenrodDeptStore3FElevatorButton:
jumpstd elevatorbutton
-; 0x55dcc
-UnknownText_0x55dcc: ; 0x55dcc
+UnknownText_0x55dcc:
text "I, I, I'm really"
line "impatient!"
@@ -38,9 +32,8 @@
line "battle to speed up"
cont "my #MON."
done
-; 0x55e15
-UnknownText_0x55e15: ; 0x55e15
+UnknownText_0x55e15:
text "Hey! When you bat-"
line "tle, do you use X"
cont "SPECIAL?"
@@ -49,9 +42,8 @@
line "really jacks up"
cont "SPECIAL ATTACK!"
done
-; 0x55e74
-UnknownText_0x55e74: ; 0x55e74
+GoldenrodDeptStore3FDirectoryText:
text "For Victory"
line "Seekers"
@@ -58,9 +50,8 @@
para "3F BATTLE"
line " COLLECTION"
done
-; 0x55ea1
-GoldenrodDeptStore3F_MapEventHeader: ; 0x55ea1
+GoldenrodDeptStore3F_MapEventHeader:
; filler
db 0, 0
@@ -75,8 +66,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapGoldenrodDeptStore3FSignpost0Script
- signpost 0, 3, $0, MapGoldenrodDeptStore3FSignpost1Script
+ signpost 0, 14, $0, GoldenrodDeptStore3FDirectory
+ signpost 0, 3, $0, GoldenrodDeptStore3FElevatorButton
; people-events
db 3
@@ -83,4 +74,3 @@
person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, $ffff
person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, $ffff
person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, $ffff
-; 0x55ee7
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -1,28 +1,24 @@
-GoldenrodDeptStore4F_MapScriptHeader: ; 0x55ee7
+GoldenrodDeptStore4F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x55ee9
-ClerkScript_0x55ee9: ; 0x55ee9
+ClerkScript_0x55ee9:
faceplayer
loadfont
pokemart $0, $0008
loadmovesprites
end
-; 0x55ef1
-CooltrainerMScript_0x55ef1: ; 0x55ef1
+CooltrainerMScript_0x55ef1:
jumptextfaceplayer UnknownText_0x55f08
-; 0x55ef4
-BugCatcherScript_0x55ef4: ; 0x55ef4
+BugCatcherScript_0x55ef4:
jumptextfaceplayer UnknownText_0x55f52
-; 0x55ef7
-GameboyKidScript_0x55ef7: ; 0x55ef7
+GameboyKidScript_0x55ef7:
faceplayer
loadfont
writetext UnknownText_0x55f74
@@ -30,17 +26,14 @@
loadmovesprites
spriteface $5, $0
end
-; 0x55f02
-MapGoldenrodDeptStore4FSignpost0Script: ; 0x55f02
- jumptext UnknownText_0x5600d
-; 0x55f05
+GoldenrodDeptStore4FDirectory:
+ jumptext GoldenrodDeptStore4FDirectoryText
-MapGoldenrodDeptStore4FSignpost1Script: ; 0x55f05
+GoldenrodDeptStore4FElevatorButton:
jumpstd elevatorbutton
-; 0x55f08
-UnknownText_0x55f08: ; 0x55f08
+UnknownText_0x55f08:
text "Hey. I love strong"
line "#MON."
@@ -48,15 +41,13 @@
line "TEIN to crank up"
cont "their ATTACK."
done
-; 0x55f52
-UnknownText_0x55f52: ; 0x55f52
+UnknownText_0x55f52:
text "IRON adds to your"
line "#MON's DEFENSE."
done
-; 0x55f74
-UnknownText_0x55f74: ; 0x55f74
+UnknownText_0x55f74:
text "Some #MON"
line "evolve only by"
@@ -72,17 +63,15 @@
para "I heard there are"
line "others too."
done
-; 0x5600d
-UnknownText_0x5600d: ; 0x5600d
+GoldenrodDeptStore4FDirectoryText:
text "Let Us Pump Up"
line "Your #MON!"
para "4F MEDICINE BOX"
done
-; 0x56038
-GoldenrodDeptStore4F_MapEventHeader: ; 0x56038
+GoldenrodDeptStore4F_MapEventHeader:
; filler
db 0, 0
@@ -97,8 +86,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapGoldenrodDeptStore4FSignpost0Script
- signpost 0, 3, $0, MapGoldenrodDeptStore4FSignpost1Script
+ signpost 0, 14, $0, GoldenrodDeptStore4FDirectory
+ signpost 0, 3, $0, GoldenrodDeptStore4FElevatorButton
; people-events
db 4
@@ -106,4 +95,3 @@
person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, $ffff
person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, $ffff
person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, $ffff
-; 0x5608b
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -1,4 +1,4 @@
-GoldenrodDeptStore5F_MapScriptHeader: ; 0x5608b
+GoldenrodDeptStore5F_MapScriptHeader:
; trigger count
db 0
@@ -8,21 +8,18 @@
; callbacks
dbw 2, UnknownScript_0x56090
-; 0x56090
-UnknownScript_0x56090: ; 0x56090
+UnknownScript_0x56090:
checkcode $b
if_equal SUNDAY, UnknownScript_0x56099
disappear $7
return
-; 0x56099
-UnknownScript_0x56099: ; 0x56099
+UnknownScript_0x56099:
appear $7
return
-; 0x5609c
-ClerkScript_0x5609c: ; 0x5609c
+ClerkScript_0x5609c:
faceplayer
loadfont
checkevent EVENT_GOT_TM02_HEADBUTT
@@ -30,39 +27,33 @@
checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue UnknownScript_0x560c2
jump UnknownScript_0x560b6
-; 0x560ad
-UnknownScript_0x560ad: ; 0x560ad
+UnknownScript_0x560ad:
checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue UnknownScript_0x560c8
jump UnknownScript_0x560bc
-; 0x560b6
-UnknownScript_0x560b6: ; 0x560b6
+UnknownScript_0x560b6:
pokemart $0, $0009
loadmovesprites
end
-; 0x560bc
-UnknownScript_0x560bc: ; 0x560bc
+UnknownScript_0x560bc:
pokemart $0, $000a
loadmovesprites
end
-; 0x560c2
-UnknownScript_0x560c2: ; 0x560c2
+UnknownScript_0x560c2:
pokemart $0, $000b
loadmovesprites
end
-; 0x560c8
-UnknownScript_0x560c8: ; 0x560c8
+UnknownScript_0x560c8:
pokemart $0, $000c
loadmovesprites
end
-; 0x560ce
-ReceptionistScript_0x560ce: ; 0x560ce
+ReceptionistScript_0x560ce:
faceplayer
loadfont
checkcode $b
@@ -75,9 +66,8 @@
if_greater_than $95, UnknownScript_0x560ee
if_greater_than $31, UnknownScript_0x560fd
jump UnknownScript_0x56103
-; 0x560ee
-UnknownScript_0x560ee: ; 0x560ee
+UnknownScript_0x560ee:
writetext UnknownText_0x5615a
keeptextopen
verbosegiveitem TM_27, 1
@@ -85,16 +75,14 @@
setflag $005b
loadmovesprites
end
-; 0x560fd
-UnknownScript_0x560fd: ; 0x560fd
+UnknownScript_0x560fd:
writetext UnknownText_0x561a6
closetext
loadmovesprites
end
-; 0x56103
-UnknownScript_0x56103: ; 0x56103
+UnknownScript_0x56103:
writetext UnknownText_0x561d8
keeptextopen
verbosegiveitem TM_21, 1
@@ -102,17 +90,15 @@
setflag $005b
loadmovesprites
end
-; 0x56112
-UnknownScript_0x56112: ; 0x56112
+UnknownScript_0x56112:
writetext UnknownText_0x56202
closetext
-UnknownScript_0x56116: ; 0x56116
+UnknownScript_0x56116:
loadmovesprites
end
-; 0x56118
-TwinScript_0x56118: ; 0x56118
+TwinScript_0x56118:
faceplayer
loadfont
special SpecialGameboyCheck
@@ -122,20 +108,17 @@
loadmovesprites
special Function1050b9
end
-; 0x5612a
-UnknownScript_0x5612a: ; 0x5612a
+UnknownScript_0x5612a:
writetext UnknownText_0x56279
closetext
loadmovesprites
end
-; 0x56130
-LassScript_0x56130: ; 0x56130
+LassScript_0x56130:
jumptextfaceplayer UnknownText_0x562ad
-; 0x56133
-CooltrainerMScript_0x56133: ; 0x56133
+CooltrainerMScript_0x56133:
faceplayer
loadfont
trade $0
@@ -142,27 +125,22 @@
closetext
loadmovesprites
end
-; 0x5613a
-PokefanMScript_0x5613a: ; 0x5613a
+PokefanMScript_0x5613a:
jumptextfaceplayer UnknownText_0x562f3
-; 0x5613d
-MapGoldenrodDeptStore5FSignpost0Script: ; 0x5613d
- jumptext UnknownText_0x56364
-; 0x56140
+GoldenrodDeptStore5FDirectory:
+ jumptext GoldenrodDeptStore5FDirectoryText
-MapGoldenrodDeptStore5FSignpost1Script: ; 0x56140
+GoldenrodDeptStore5FElevatorButton:
jumpstd elevatorbutton
-; 0x56143
-UnknownText_0x56143: ; 0x56143
+UnknownText_0x56143:
text "Hello. Oh, your"
line "#MON…"
done
-; 0x5615a
-UnknownText_0x5615a: ; 0x5615a
+UnknownText_0x5615a:
text "It's very attached"
line "to you."
@@ -170,24 +148,21 @@
line "be perfect for a"
cont "pair like you."
done
-; 0x561a6
-UnknownText_0x561a6: ; 0x561a6
+UnknownText_0x561a6:
text "It's adorable!"
para "You should teach"
line "it good TM moves."
done
-; 0x561d8
-UnknownText_0x561d8: ; 0x561d8
+UnknownText_0x561d8:
text "It looks evil. How"
line "about this TM for"
cont "it?"
done
-; 0x56202
-UnknownText_0x56202: ; 0x56202
+UnknownText_0x56202:
text "There are sure to"
line "be TMs that are"
@@ -194,9 +169,8 @@
para "just perfect for"
line "your #MON."
done
-; 0x56241
-UnknownText_0x56241: ; 0x56241
+UnknownText_0x56241:
text "MYSTERY GIFT."
para "With just a"
@@ -203,16 +177,14 @@
line "little beep, you"
cont "get a gift."
done
-; 0x56279
-UnknownText_0x56279: ; 0x56279
+UnknownText_0x56279:
text "The MYSTERY GIFT"
line "option requires a"
cont "Game Boy Color."
done
-; 0x562ad
-UnknownText_0x562ad: ; 0x562ad
+UnknownText_0x562ad:
text "On Sundays, a lady"
line "comes to check out"
cont "#MON."
@@ -220,9 +192,8 @@
para "She even gives"
line "away TMs!"
done
-; 0x562f3
-UnknownText_0x562f3: ; 0x562f3
+UnknownText_0x562f3:
text "You can't rename a"
line "#MON you get in"
cont "a trade."
@@ -233,17 +204,15 @@
para "original trainer's"
line "feelings for it."
done
-; 0x56364
-UnknownText_0x56364: ; 0x56364
+GoldenrodDeptStore5FDirectoryText:
text "Customize Your"
line "#MON"
para "5F TM CORNER"
done
-; 0x56386
-GoldenrodDeptStore5F_MapEventHeader: ; 0x56386
+GoldenrodDeptStore5F_MapEventHeader:
; filler
db 0, 0
@@ -258,8 +227,8 @@
; signposts
db 2
- signpost 0, 14, $0, MapGoldenrodDeptStore5FSignpost0Script
- signpost 0, 3, $0, MapGoldenrodDeptStore5FSignpost1Script
+ signpost 0, 14, $0, GoldenrodDeptStore5FDirectory
+ signpost 0, 3, $0, GoldenrodDeptStore5FElevatorButton
; people-events
db 6
@@ -269,4 +238,3 @@
person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, $ffff
person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, $ffff
person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, $0763
-; 0x563f3
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -1,87 +1,77 @@
-GoldenrodDeptStore6F_MapScriptHeader: ; 0x563f3
+GoldenrodDeptStore6F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x563f5
-MapGoldenrodDeptStore6FSignpost5Script: ; 0x563f5
+GoldenrodVendingMachine:
loadfont
- writetext UnknownText_0x564cb
-UnknownScript_0x563f9: ; 0x563f9
+ writetext GoldenrodVendingText
+.Start
special Function24ae8
- loadmenudata MenuDataHeader_0x56478
+ loadmenudata .MenuData
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x5640f
- if_equal $2, UnknownScript_0x56429
- if_equal $3, UnknownScript_0x56443
+ if_equal $1, .FreshWater
+ if_equal $2, .SodaPop
+ if_equal $3, .Lemonade
loadmovesprites
end
-; 0x5640f
-UnknownScript_0x5640f: ; 0x5640f
+.FreshWater
checkmoney $0, 200
- if_equal $2, UnknownScript_0x5646a
+ if_equal $2, .NotEnoughMoney
giveitem FRESH_WATER, $1
- iffalse UnknownScript_0x56471
+ iffalse .NotEnoughSpace
takemoney $0, 200
itemtotext FRESH_WATER, $0
- jump UnknownScript_0x5645d
-; 0x56429
+ jump .VendItem
-UnknownScript_0x56429: ; 0x56429
+.SodaPop
checkmoney $0, 300
- if_equal $2, UnknownScript_0x5646a
+ if_equal $2, .NotEnoughMoney
giveitem SODA_POP, $1
- iffalse UnknownScript_0x56471
+ iffalse .NotEnoughSpace
takemoney $0, 300
itemtotext SODA_POP, $0
- jump UnknownScript_0x5645d
-; 0x56443
+ jump .VendItem
-UnknownScript_0x56443: ; 0x56443
+.Lemonade
checkmoney $0, 350
- if_equal $2, UnknownScript_0x5646a
+ if_equal $2, .NotEnoughMoney
giveitem LEMONADE, $1
- iffalse UnknownScript_0x56471
+ iffalse .NotEnoughSpace
takemoney $0, 350
itemtotext LEMONADE, $0
- jump UnknownScript_0x5645d
-; 0x5645d
+ jump .VendItem
-UnknownScript_0x5645d: ; 0x5645d
+.VendItem
pause 10
playsound SFX_ENTER_DOOR
- writetext UnknownText_0x564ef
+ writetext GoldenrodClangText
keeptextopen
itemnotify
- jump UnknownScript_0x563f9
-; 0x5646a
+ jump .Start
-UnknownScript_0x5646a: ; 0x5646a
- writetext UnknownText_0x56512
+.NotEnoughMoney
+ writetext GoldenrodVendingNoMoneyText
closetext
- jump UnknownScript_0x563f9
-; 0x56471
+ jump .Start
-UnknownScript_0x56471: ; 0x56471
- writetext UnknownText_0x5652b
+.NotEnoughSpace
+ writetext GoldenrodVendingNoSpaceText
closetext
- jump UnknownScript_0x563f9
-; 0x56478
+ jump .Start
-
-MenuDataHeader_0x56478: ; 0x56478
+.MenuData
db $40 ; flags
db 02, 00 ; start coords
db 11, 19 ; end coords
- dw MenuData2_0x56480
+ dw .MenuData2
db 1 ; default option
-; 0x56480
-MenuData2_0x56480: ; 0x56480
+.MenuData2
db $80 ; flags
db 4 ; items
db "FRESH WATER ¥200@"
@@ -88,32 +78,26 @@
db "SODA POP ¥300@"
db "LEMONADE ¥350@"
db "CANCEL@"
-; 0x564bf
-LassScript_0x564bf: ; 0x564bf
+LassScript_0x564bf:
jumptextfaceplayer UnknownText_0x5654b
-; 0x564c2
-SuperNerdScript_0x564c2: ; 0x564c2
+SuperNerdScript_0x564c2:
jumptextfaceplayer UnknownText_0x565ca
-; 0x564c5
-MapGoldenrodDeptStore6FSignpost0Script: ; 0x564c5
- jumptext UnknownText_0x5661a
-; 0x564c8
+GoldenrodDeptStore6FDirectory:
+ jumptext GoldenrodDeptStore6FDirectoryText
-MapGoldenrodDeptStore6FSignpost1Script: ; 0x564c8
+GoldenrodDeptStore6FElevatorButton:
jumpstd elevatorbutton
-; 0x564cb
-UnknownText_0x564cb: ; 0x564cb
+GoldenrodVendingText:
text "A vending machine!"
line "Here's the menu."
done
-; 0x564ef
-UnknownText_0x564ef: ; 0x564ef
+GoldenrodClangText:
text "Clang! A can of"
line "@"
text_from_ram StringBuffer3
@@ -120,21 +104,18 @@
text $55
db "popped out!"
done
-; 0x56512
-UnknownText_0x56512: ; 0x56512
+GoldenrodVendingNoMoneyText:
text "Oops, not enough"
line "money."
done
-; 0x5652b
-UnknownText_0x5652b: ; 0x5652b
+GoldenrodVendingNoSpaceText:
text "There's no more"
line "room for stuff."
done
-; 0x5654b
-UnknownText_0x5654b: ; 0x5654b
+UnknownText_0x5654b:
text "Do you listen to"
line "LUCKY CHANNEL?"
@@ -147,9 +128,8 @@
para "get different ID"
line "numbers."
done
-; 0x565ca
-UnknownText_0x565ca: ; 0x565ca
+UnknownText_0x565ca:
text "If you're tired,"
line "try the vending"
cont "machine's drinks."
@@ -157,17 +137,15 @@
para "Your #MON will"
line "love them too."
done
-; 0x5661a
-UnknownText_0x5661a: ; 0x5661a
+GoldenrodDeptStore6FDirectoryText:
text "Take a Break from"
line "Shopping!"
para "6F TRANQUIL SQUARE"
done
-; 0x5664a
-GoldenrodDeptStore6F_MapEventHeader: ; 0x5664a
+GoldenrodDeptStore6F_MapEventHeader:
; filler
db 0, 0
@@ -182,15 +160,14 @@
; signposts
db 6
- signpost 0, 14, $0, MapGoldenrodDeptStore6FSignpost0Script
- signpost 0, 3, $0, MapGoldenrodDeptStore6FSignpost1Script
- signpost 1, 8, $1, MapGoldenrodDeptStore6FSignpost5Script
- signpost 1, 9, $1, MapGoldenrodDeptStore6FSignpost5Script
- signpost 1, 10, $1, MapGoldenrodDeptStore6FSignpost5Script
- signpost 1, 11, $1, MapGoldenrodDeptStore6FSignpost5Script
+ signpost 0, 14, $0, GoldenrodDeptStore6FDirectory
+ signpost 0, 3, $0, GoldenrodDeptStore6FElevatorButton
+ signpost 1, 8, $1, GoldenrodVendingMachine
+ signpost 1, 9, $1, GoldenrodVendingMachine
+ signpost 1, 10, $1, GoldenrodVendingMachine
+ signpost 1, 11, $1, GoldenrodVendingMachine
; people-events
db 2
person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, $ffff
person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, $ffff
-; 0x56697
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -80,17 +80,17 @@
end
; 0x553cb
-UnknownScript_0x553cb: ; 0x553cb
+FlowerShopShelf1:
+; unused
jumpstd picturebookshelf
-; 0x553ce
-UnknownScript_0x553ce: ; 0x553ce
+FlowerShopShelf2:
+; unused
jumpstd magazinebookshelf
-; 0x553d1
-UnknownScript_0x553d1: ; 0x553d1
+FlowerShopRadio:
+; unused
jumpstd radio2
-; 0x553d4
UnknownText_0x553d4: ; 0x553d4
text "Have you seen that"
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -70,13 +70,11 @@
jumptextfaceplayer UnknownText_0x54b67
; 0x5499d
-MapGoldenrodHappinessRaterSignpost1Script: ; 0x5499d
+HappinessRatersHouseBookshelf:
jumpstd difficultbookshelf
-; 0x549a0
-MapGoldenrodHappinessRaterSignpost2Script: ; 0x549a0
+HappinessRatersHouseRadio:
jumpstd radio2
-; 0x549a3
UnknownText_0x549a3: ; 0x549a3
text "If you treat your"
@@ -166,9 +164,9 @@
; signposts
db 3
- signpost 1, 0, $0, MapGoldenrodHappinessRaterSignpost1Script
- signpost 1, 1, $0, MapGoldenrodHappinessRaterSignpost1Script
- signpost 1, 7, $0, MapGoldenrodHappinessRaterSignpost2Script
+ signpost 1, 0, $0, HappinessRatersHouseBookshelf
+ signpost 1, 1, $0, HappinessRatersHouseBookshelf
+ signpost 1, 7, $0, HappinessRatersHouseRadio
; people-events
db 3
--- a/maps/GoldenrodNameRatersHouse.asm
+++ b/maps/GoldenrodNameRatersHouse.asm
@@ -15,13 +15,11 @@
end
; 0x55784
-MapGoldenrodNameRatersHouseSignpost1Script: ; 0x55784
+GoldenrodNameRatersHouseBookshelf:
jumpstd difficultbookshelf
-; 0x55787
-MapGoldenrodNameRatersHouseSignpost2Script: ; 0x55787
+GoldenrodNameRatersHouseRadio:
jumpstd radio2
-; 0x5578a
INCLUDE "text/sweethoney.asm"
@@ -39,9 +37,9 @@
; signposts
db 3
- signpost 1, 0, $0, MapGoldenrodNameRatersHouseSignpost1Script
- signpost 1, 1, $0, MapGoldenrodNameRatersHouseSignpost1Script
- signpost 1, 7, $0, MapGoldenrodNameRatersHouseSignpost2Script
+ signpost 1, 0, $0, GoldenrodNameRatersHouseBookshelf
+ signpost 1, 1, $0, GoldenrodNameRatersHouseBookshelf
+ signpost 1, 7, $0, GoldenrodNameRatersHouseRadio
; people-events
db 1
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -14,17 +14,14 @@
jumptextfaceplayer UnknownText_0x556ca
; 0x55650
-MapGoldenrodPPSpeechHouseSignpost1Script: ; 0x55650
+GoldenrodPPSpeechHouseBookshelf2:
jumpstd difficultbookshelf
-; 0x55653
-MapGoldenrodPPSpeechHouseSignpost0Script: ; 0x55653
+GoldenrodPPSpeechHouseBookshelf1:
jumpstd magazinebookshelf
-; 0x55656
-MapGoldenrodPPSpeechHouseSignpost2Script: ; 0x55656
+GoldenrodPPSpeechHouseRadio:
jumpstd radio2
-; 0x55659
UnknownText_0x55659: ; 0x55659
text "Once while I was"
@@ -69,9 +66,9 @@
; signposts
db 3
- signpost 1, 0, $0, MapGoldenrodPPSpeechHouseSignpost0Script
- signpost 1, 1, $0, MapGoldenrodPPSpeechHouseSignpost1Script
- signpost 1, 7, $0, MapGoldenrodPPSpeechHouseSignpost2Script
+ signpost 1, 0, $0, GoldenrodPPSpeechHouseBookshelf1
+ signpost 1, 1, $0, GoldenrodPPSpeechHouseBookshelf2
+ signpost 1, 7, $0, GoldenrodPPSpeechHouseRadio
; people-events
db 2
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -1,20 +1,17 @@
-GuideGentsHouse_MapScriptHeader: ; 0x196c05
+GuideGentsHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x196c07
-GrampsScript_0x196c07: ; 0x196c07
- jumptextfaceplayer UnknownText_0x196c0d
-; 0x196c0a
+GuideGentsHouseGuideGent:
+ jumptextfaceplayer GuideGentsHouseGuideGentText
-MapGuideGentsHouseSignpost1Script: ; 0x196c0a
+GuideGentsHouseBookshelf:
jumpstd magazinebookshelf
-; 0x196c0d
-UnknownText_0x196c0d: ; 0x196c0d
+GuideGentsHouseGuideGentText:
text "When I was a wee"
line "lad, I was a hot-"
cont "shot trainer!"
@@ -26,9 +23,8 @@
para "Treat them all"
line "with kindness!"
done
-; 0x196c89
-GuideGentsHouse_MapEventHeader: ; 0x196c89
+GuideGentsHouse_MapEventHeader:
; filler
db 0, 0
@@ -42,10 +38,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapGuideGentsHouseSignpost1Script
- signpost 1, 1, $0, MapGuideGentsHouseSignpost1Script
+ signpost 1, 0, $0, GuideGentsHouseBookshelf
+ signpost 1, 1, $0, GuideGentsHouseBookshelf
; people-events
db 1
- person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x196c07, $06ff
-; 0x196cb0
+ person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GuideGentsHouseGuideGent, $06ff
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -77,7 +77,7 @@
; 0x7e50a
-BoulderScript_0x7e50a: ; 0x7e50a
+IcePathB1FBoulder: ; 0x7e50a
jumpstd strengthboulder
; 0x7e50d
@@ -122,9 +122,8 @@
; people-events
db 5
- person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $0709
- person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070a
- person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070b
- person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070c
+ person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $0709
+ person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070a
+ person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070b
+ person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070c
person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, $068a
-; 0x7e5a1
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -10,9 +10,8 @@
db NEVERMELTICE, 1
; 0x7e671
-RockScript_0x7e671: ; 0x7e671
+IcePathB3FRock:
jumpstd smashrock
-; 0x7e674
IcePathB3F_MapEventHeader: ; 0x7e674
; filler
@@ -32,5 +31,5 @@
; people-events
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, RockScript_0x7e671, $ffff
+ person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, $ffff
; 0x7e69e
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -482,9 +482,9 @@
db FULL_HEAL
; 0x6ee21
-UnknownScript_0x6ee21: ; 0x6ee21
+IlexForestBoulder:
+; unused
jumpstd strengthboulder
-; 0x6ee24
MapIlexForestSignpost0Script: ; 0x6ee24
jumptext UnknownText_0x6f2de
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -38,105 +38,84 @@
db 0, 0, 0 ; filler
-Doll1Script_0x7abcc: ; 0x7abcc
+Doll1:
describedecoration $1
-; 0x7abce
-Doll2Script_0x7abce: ; 0x7abce
+Doll2:
describedecoration $2
-; 0x7abd0
-BigDollScript_0x7abd0: ; 0x7abd0
+BigDoll:
describedecoration $3
-; 0x7abd2
-ConsoleScript_0x7abd2: ; 0x7abd2
+GameConsole:
describedecoration $4
-; 0x7abd4
-MapKrissHouse2FSignpost4: ; 0x7abd4
+KrissHousePoster:
dw $02cc ; event
- dw MapKrissHouse2FSignpost4Script
-; 0x7abd8
-
-MapKrissHouse2FSignpost4Script: ; 0x7abd8
+ dw .Script
+.Script
describedecoration $0
-; 0x7abda
-MapKrissHouse2FSignpost2Script: ; 0x7abda
+KrissHouseRadio:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
- iftrue UnknownScript_0x7ac07
- checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
- iftrue UnknownScript_0x7ac0a
+ iftrue .NormalRadio
+ checkevent EVENT_LISTENED_TO_INITIAL_RADIO
+ iftrue .AbbreviatedRadio
playmusic MUSIC_POKEMON_TALK
loadfont
- writetext UnknownText_0x7ac24
+ writetext KrisRadioText1
pause 45
- writetext UnknownText_0x7ac55
+ writetext KrisRadioText2
pause 45
- writetext UnknownText_0x7ac64
+ writetext KrisRadioText3
pause 45
- musicfadeout $003c, $10
- writetext UnknownText_0x7ac84
+ musicfadeout MUSIC_NEW_BARK_TOWN, $10
+ writetext KrisRadioText4
pause 45
loadmovesprites
- setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
+ setevent EVENT_LISTENED_TO_INITIAL_RADIO
end
-; 0x7ac07
-
-UnknownScript_0x7ac07: ; 0x7ac07
+.NormalRadio
jumpstd radio1
-; 0x7ac0a
-
-UnknownScript_0x7ac0a: ; 0x7ac0a
+.AbbreviatedRadio
loadfont
- writetext UnknownText_0x7ac84
+ writetext KrisRadioText4
pause 45
loadmovesprites
end
-; 0x7ac12
-
-MapKrissHouse2FSignpost3Script: ; 0x7ac12
+KrissHouseBookshelf:
jumpstd picturebookshelf
-; 0x7ac15
-MapKrissHouse2FSignpost0Script: ; 0x7ac15
+KrissHousePC:
loadfont
special Functionc2e7
- iftrue UnknownScript_0x7ac1e
+ iftrue .Warp
loadmovesprites
end
-; 0x7ac1e
-
-UnknownScript_0x7ac1e: ; 0x7ac1e
+.Warp
warp 0, 0, $0, $0
end
-; 0x7ac24
-UnknownText_0x7ac24: ; 0x7ac24
+KrisRadioText1:
text "PROF.OAK'S #MON"
line "TALK! Please tune"
cont "in next time!"
done
-; 0x7ac55
-UnknownText_0x7ac55: ; 0x7ac55
+KrisRadioText2:
text "#MON CHANNEL!"
done
-; 0x7ac64
-UnknownText_0x7ac64: ; 0x7ac64
+KrisRadioText3:
text "This is DJ MARY,"
line "your co-host!"
done
-; 0x7ac84
-UnknownText_0x7ac84: ; 0x7ac84
+KrisRadioText4:
text "#MON!"
line "#MON CHANNEL…"
done
-; 0x7ac99
KrissHouse2F_MapEventHeader: ; 0x7ac99
; filler
@@ -151,15 +130,14 @@
; signposts
db 4
- signpost 1, 2, $1, MapKrissHouse2FSignpost0Script
- signpost 1, 3, $0, MapKrissHouse2FSignpost2Script
- signpost 1, 5, $0, MapKrissHouse2FSignpost3Script
- signpost 0, 6, $5, MapKrissHouse2FSignpost4 ; 6bd4
+ signpost 1, 2, $1, KrissHousePC
+ signpost 1, 3, $0, KrissHouseRadio
+ signpost 1, 5, $0, KrissHouseBookshelf
+ signpost 0, 6, $5, KrissHousePoster
; people-events
db 4
- person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, ConsoleScript_0x7abd2, $0741
- person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1Script_0x7abcc, $0742
- person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2Script_0x7abce, $0743
- person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDollScript_0x7abd0, $0744
-; 0x7acec
+ person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, GameConsole, $0741
+ person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1, $0742
+ person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2, $0743
+ person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDoll, $0744
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -4,54 +4,45 @@
; callback count
db 0
-; 0x7acee
-CooltrainerFScript_0x7acee: ; 0x7acee
- jumptextfaceplayer UnknownText_0x7ad2f
-; 0x7acf1
+KrissNeighborsDaughter:
+ jumptextfaceplayer KrissNeighborsDaughterText
-PokefanFScript_0x7acf1: ; 0x7acf1
- jumptextfaceplayer UnknownText_0x7add4
-; 0x7acf4
+KrissNeighbor:
+ jumptextfaceplayer KrissNeighborText
-MapKrissNeighborsHouseSignpost1Script: ; 0x7acf4
+KrissNeighborsHouseBookshelf:
jumpstd magazinebookshelf
-; 0x7acf7
-MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7
+KrissNeighborsHouseRadio:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
- iftrue UnknownScript_0x7ad24
- checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
- iftrue UnknownScript_0x7ad27
+ iftrue .NormalRadio
+ checkevent EVENT_LISTENED_TO_INITIAL_RADIO
+ iftrue .AbbreviatedRadio
playmusic MUSIC_POKEMON_TALK
loadfont
- writetext UnknownText_0x7ae3b
+ writetext KrisNeighborRadioText1
pause 45
- writetext UnknownText_0x7ae6c
+ writetext KrisNeighborRadioText2
pause 45
- writetext UnknownText_0x7ae7b
+ writetext KrisNeighborRadioText3
pause 45
- musicfadeout $003c, $10
- writetext UnknownText_0x7ae9b
+ musicfadeout MUSIC_NEW_BARK_TOWN, $10
+ writetext KrisNeighborRadioText4
pause 45
loadmovesprites
- setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
+ setevent EVENT_LISTENED_TO_INITIAL_RADIO
end
-; 0x7ad24
-
-UnknownScript_0x7ad24: ; 0x7ad24
+.NormalRadio
jumpstd radio1
-; 0x7ad27
-
-UnknownScript_0x7ad27: ; 0x7ad27
+.AbbreviatedRadio
loadfont
- writetext UnknownText_0x7ae9b
+ writetext KrisNeighborRadioText4
pause 45
loadmovesprites
end
-; 0x7ad2f
-UnknownText_0x7ad2f: ; 0x7ad2f
+KrissNeighborsDaughterText:
text "PIKACHU is an"
line "evolved #MON."
@@ -69,9 +60,8 @@
line "a researcher like"
cont "him…"
done
-; 0x7add4
-UnknownText_0x7add4: ; 0x7add4
+KrissNeighborText:
text "My daughter is"
line "adamant about"
@@ -83,31 +73,26 @@
para "But then, so do I!"
done
-; 0x7ae3b
-UnknownText_0x7ae3b: ; 0x7ae3b
+KrisNeighborRadioText1:
text "PROF.OAK'S #MON"
line "TALK! Please tune"
cont "in next time!"
done
-; 0x7ae6c
-UnknownText_0x7ae6c: ; 0x7ae6c
+KrisNeighborRadioText2:
text "#MON CHANNEL!"
done
-; 0x7ae7b
-UnknownText_0x7ae7b: ; 0x7ae7b
+KrisNeighborRadioText3:
text "This is DJ MARY,"
line "your co-host!"
done
-; 0x7ae9b
-UnknownText_0x7ae9b: ; 0x7ae9b
+KrisNeighborRadioText4:
text "#MON!"
line "#MON CHANNEL…"
done
-; 0x7aeb0
KrissNeighborsHouse_MapEventHeader: ; 0x7aeb0
; filler
@@ -123,12 +108,12 @@
; signposts
db 3
- signpost 1, 0, $0, MapKrissNeighborsHouseSignpost1Script
- signpost 1, 1, $0, MapKrissNeighborsHouseSignpost1Script
- signpost 1, 7, $0, MapKrissNeighborsHouseSignpost2Script
+ signpost 1, 0, $0, KrissNeighborsHouseBookshelf
+ signpost 1, 1, $0, KrissNeighborsHouseBookshelf
+ signpost 1, 7, $0, KrissNeighborsHouseRadio
; people-events
db 2
- person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, CooltrainerFScript_0x7acee, $ffff
- person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, PokefanFScript_0x7acf1, $0793
+ 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
@@ -378,105 +378,93 @@
end
; 0x18e3ed
-TwinScript_0x18e3ed: ; 0x18e3ed
+KurtsGranddaughter1:
faceplayer
checkevent $0000
- iftrue UnknownScript_0x18e42f
+ iftrue KurtsGranddaughter2Subscript
checkevent $0001
- iftrue UnknownScript_0x18e448
+ iftrue KurtsGranddaughterFunScript
checkevent $00c0
- iftrue UnknownScript_0x18e420
+ iftrue .Lonely
checkevent $0030
- iftrue UnknownScript_0x18e427
+ iftrue .Dad
checkevent EVENT_CLEARED_SLOWPOKE_WELL
- iftrue UnknownScript_0x18e419
+ iftrue .SlowpokeBack
checkevent $06fa
- iftrue UnknownScript_0x18e420
+ iftrue .Lonely
loadfont
- writetext UnknownText_0x18e9b5
+ writetext KurtsGranddaughterSlowpokeGoneText
closetext
loadmovesprites
end
-; 0x18e419
-UnknownScript_0x18e419: ; 0x18e419
+.SlowpokeBack
loadfont
- writetext UnknownText_0x18ea0f
+ writetext KurtsGranddaughterSlowpokeBackText
closetext
loadmovesprites
end
-; 0x18e420
-UnknownScript_0x18e420: ; 0x18e420
+.Lonely
loadfont
- writetext UnknownText_0x18e9f1
+ writetext KurtsGranddaughterLonelyText
closetext
loadmovesprites
end
-; 0x18e427
-UnknownScript_0x18e427: ; 0x18e427
+.Dad
loadfont
- writetext UnknownText_0x18ea55
+ writetext KurtsGranddaughterDadText
closetext
loadmovesprites
end
-; 0x18e42e
-TwinScript_0x18e42e: ; 0x18e42e
+KurtsGranddaughter2:
faceplayer
-UnknownScript_0x18e42f: ; 0x18e42f
+KurtsGranddaughter2Subscript:
loadfont
checkevent $00bf
- iftrue UnknownScript_0x18e43f
- writetext UnknownText_0x18eab2
+ iftrue .GSBall
+ writetext KurtsGranddaughterHelpText
closetext
loadmovesprites
spriteface $6, $3
end
-; 0x18e43f
-UnknownScript_0x18e43f: ; 0x18e43f
- writetext UnknownText_0x18eb14
+.GSBall
+ writetext KurtsGranddaughterGSBallText
closetext
loadmovesprites
spriteface $6, $3
end
-; 0x18e448
-UnknownScript_0x18e448: ; 0x18e448
+KurtsGranddaughterFunScript: ; 0x18e448
loadfont
- writetext UnknownText_0x18eafc
+ writetext KurtsGranddaughterFunText
closetext
loadmovesprites
end
-; 0x18e44f
-SlowpokeScript_0x18e44f: ; 0x18e44f
+KurtsHouseSlowpoke:
faceplayer
loadfont
- writetext UnknownText_0x18eb56
+ writetext KurtsHouseSlowpokeText
cry SLOWPOKE
closetext
loadmovesprites
end
-; 0x18e45a
-MapKurtsHouseSignpost2Script: ; 0x18e45a
- jumptext UnknownText_0x18eb69
-; 0x18e45d
+KurtsHouseOakPhoto:
+ jumptext KurtsHouseOakPhotoText
-MapKurtsHouseSignpost6Script: ; 0x18e45d
- jumptext UnknownText_0x18eb7e
-; 0x18e460
+KurtsHouseCelebiStatue:
+ jumptext KurtsHouseCelebiStatueText
-MapKurtsHouseSignpost5Script: ; 0x18e460
+KurtsHouseBookshelf:
jumpstd difficultbookshelf
-; 0x18e463
-MapKurtsHouseSignpost0Script: ; 0x18e463
+KurtsHouseRadio:
jumpstd radio2
-; 0x18e466
MovementData_0x18e466: ; 0x18e466
big_step_down
@@ -666,9 +654,8 @@
para "There must be"
line "something to this!"
done
-; 0x18e9b5
-UnknownText_0x18e9b5: ; 0x18e9b5
+KurtsGranddaughterSlowpokeGoneText:
text "The SLOWPOKE are"
line "gone… Were they"
@@ -675,15 +662,13 @@
para "taken away by bad"
line "people?"
done
-; 0x18e9f1
-UnknownText_0x18e9f1: ; 0x18e9f1
+KurtsGranddaughterLonelyText:
text "Grandpa's gone…"
line "I'm so lonely…"
done
-; 0x18ea0f
-UnknownText_0x18ea0f: ; 0x18ea0f
+KurtsGranddaughterSlowpokeBackText:
text "The SLOWPOKE my"
line "dad gave me came"
@@ -690,9 +675,8 @@
para "back! Its TAIL is"
line "growing back too!"
done
-; 0x18ea55
-UnknownText_0x18ea55: ; 0x18ea55
+KurtsGranddaughterDadText:
text "Dad works at SILPH"
line "where he studies"
cont "# BALLS."
@@ -701,9 +685,8 @@
line "home with Grandpa"
cont "and SLOWPOKE."
done
-; 0x18eab2
-UnknownText_0x18eab2: ; 0x18eab2
+KurtsGranddaughterHelpText:
text "I get to help"
line "Grandpa now!"
@@ -711,15 +694,13 @@
line "BALLS for you, so"
cont "please wait!"
done
-; 0x18eafc
-UnknownText_0x18eafc: ; 0x18eafc
+KurtsGranddaughterFunText:
text "It's fun to make"
line "BALLS!"
done
-; 0x18eb14
-UnknownText_0x18eb14: ; 0x18eb14
+KurtsGranddaughterGSBallText:
text "Grandpa's checking"
line "a BALL right now."
@@ -726,26 +707,22 @@
para "So I'm waiting"
line "till he's done."
done
-; 0x18eb56
-UnknownText_0x18eb56: ; 0x18eb56
+KurtsHouseSlowpokeText:
text "SLOWPOKE: …"
line "Yawn?"
done
-; 0x18eb69
-UnknownText_0x18eb69: ; 0x18eb69
+KurtsHouseOakPhotoText:
text "…A young PROF."
line "OAK?"
done
-; 0x18eb7e
-UnknownText_0x18eb7e: ; 0x18eb7e
+KurtsHouseCelebiStatueText:
text "It's a statue of"
line "the forest's pro-"
cont "tector."
done
-; 0x18eba8
KurtsHouse_MapEventHeader: ; 0x18eba8
; filler
@@ -761,19 +738,19 @@
; signposts
db 7
- signpost 1, 6, $0, MapKurtsHouseSignpost0Script
- signpost 0, 8, $0, MapKurtsHouseSignpost2Script
- signpost 0, 9, $0, MapKurtsHouseSignpost2Script
- signpost 1, 5, $0, MapKurtsHouseSignpost5Script
- signpost 1, 2, $0, MapKurtsHouseSignpost5Script
- signpost 1, 3, $0, MapKurtsHouseSignpost5Script
- signpost 1, 4, $0, MapKurtsHouseSignpost6Script
+ signpost 1, 6, $0, KurtsHouseRadio
+ signpost 0, 8, $0, KurtsHouseOakPhoto
+ signpost 0, 9, $0, KurtsHouseOakPhoto
+ signpost 1, 5, $0, KurtsHouseBookshelf
+ signpost 1, 2, $0, KurtsHouseBookshelf
+ signpost 1, 3, $0, KurtsHouseBookshelf
+ signpost 1, 4, $0, KurtsHouseCelebiStatue
; people-events
db 5
person_event SPRITE_KURT, 6, 7, $6, $0, 255, 255, $0, 0, KurtScript_0x18e178, $073e
- person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, TwinScript_0x18e3ed, $078c
- person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x18e44f, $06fd
+ person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, KurtsGranddaughter1, $078c
+ 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, TwinScript_0x18e42e, $078d
+ person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, KurtsGranddaughter2, $078d
; 0x18ec1c
--- a/maps/LakeofRageHiddenPowerHouse.asm
+++ b/maps/LakeofRageHiddenPowerHouse.asm
@@ -1,40 +1,35 @@
-LakeofRageHiddenPowerHouse_MapScriptHeader: ; 0x19a525
+LakeofRageHiddenPowerHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19a527
-FisherScript_0x19a527: ; 0x19a527
+HiddenPowerGuy:
faceplayer
loadfont
checkevent EVENT_GOT_TM10_HIDDEN_POWER
- iftrue UnknownScript_0x19a542
- writetext UnknownText_0x19a54b
+ iftrue .AlreadyGotItem
+ writetext HiddenPowerGuyText1
keeptextopen
verbosegiveitem TM_10, 1
- iffalse UnknownScript_0x19a546
+ iffalse .Done
setevent EVENT_GOT_TM10_HIDDEN_POWER
- writetext UnknownText_0x19a5de
+ writetext HiddenPowerGuyText2
closetext
loadmovesprites
end
-; 0x19a542
-
-UnknownScript_0x19a542: ; 0x19a542
- writetext UnknownText_0x19a673
+.AlreadyGotItem
+ writetext HiddenPowerGuyText3
closetext
-UnknownScript_0x19a546: ; 0x19a546
+.Done
loadmovesprites
end
-; 0x19a548
-MapLakeofRageHiddenPowerHouseSignpost1Script: ; 0x19a548
+HiddenPowerHouseBookshelf:
jumpstd difficultbookshelf
-; 0x19a54b
-UnknownText_0x19a54b: ; 0x19a54b
+HiddenPowerGuyText1:
text "…You have strayed"
line "far…"
@@ -50,9 +45,8 @@
para "#MON."
line "Take this, child."
done
-; 0x19a5de
-UnknownText_0x19a5de: ; 0x19a5de
+HiddenPowerGuyText2:
text "Do you see it? It"
line "is HIDDEN POWER!"
@@ -65,14 +59,12 @@
cont "pend on the #-"
cont "MON using it."
done
-; 0x19a673
-UnknownText_0x19a673: ; 0x19a673
+HiddenPowerGuyText3:
text "I am meditating…"
done
-; 0x19a685
-LakeofRageHiddenPowerHouse_MapEventHeader: ; 0x19a685
+LakeofRageHiddenPowerHouse_MapEventHeader:
; filler
db 0, 0
@@ -86,10 +78,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapLakeofRageHiddenPowerHouseSignpost1Script
- signpost 1, 1, $0, MapLakeofRageHiddenPowerHouseSignpost1Script
+ signpost 1, 0, $0, HiddenPowerHouseBookshelf
+ signpost 1, 1, $0, HiddenPowerHouseBookshelf
; people-events
db 1
- person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, FisherScript_0x19a527, $ffff
-; 0x19a6ac
+ person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, $ffff
--- a/maps/LakeofRageMagikarpHouse.asm
+++ b/maps/LakeofRageMagikarpHouse.asm
@@ -95,9 +95,8 @@
jumptext UnknownText_0x19aabc
; 0x19a72b
-MapLakeofRageMagikarpHouseSignpost1Script: ; 0x19a72b
+MagikarpHouseBookshelf:
jumpstd difficultbookshelf
-; 0x19a72e
UnknownText_0x19a72e: ; 0x19a72e
text "LAKE OF RAGE is"
@@ -238,8 +237,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapLakeofRageMagikarpHouseSignpost1Script
- signpost 1, 1, $0, MapLakeofRageMagikarpHouseSignpost1Script
+ signpost 1, 0, $0, MagikarpHouseBookshelf
+ signpost 1, 1, $0, MagikarpHouseBookshelf
; people-events
db 1
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -79,7 +79,7 @@
reloadmappart
loadmovesprites
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
- musicfadeout $0038, $10
+ musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10
pause 30
showemote $0, $2, 15
spriteface $2, $0
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -1,4 +1,4 @@
-LavenderNameRater_MapScriptHeader: ; 0x7eaeb
+LavenderNameRater_MapScriptHeader:
; trigger count
db 1
@@ -7,13 +7,11 @@
; callback count
db 0
-; 0x7eaf1
-UnknownScript_0x7eaf1: ; 0x7eaf1
+UnknownScript_0x7eaf1:
end
-; 0x7eaf2
-GentlemanScript_0x7eaf2: ; 0x7eaf2
+LavenderNameRater:
faceplayer
loadfont
special SpecialNameRater
@@ -20,13 +18,12 @@
closetext
loadmovesprites
end
-; 0x7eafa
-UnknownScript_0x7eafa: ; 0x7eafa
+LavenderNameRaterBookshelf:
+; unused
jumpstd difficultbookshelf
-; 0x7eafd
-LavenderNameRater_MapEventHeader: ; 0x7eafd
+LavenderNameRater_MapEventHeader:
; filler
db 0, 0
@@ -43,5 +40,4 @@
; people-events
db 1
- person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, GentlemanScript_0x7eaf2, $ffff
-; 0x7eb1a
+ person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, $ffff
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -1,4 +1,4 @@
-LavenderTown_MapScriptHeader: ; 0x1ad6db
+LavenderTown_MapScriptHeader:
; trigger count
db 0
@@ -8,54 +8,42 @@
; callbacks
dbw 5, UnknownScript_0x1ad6e0
-; 0x1ad6e0
-UnknownScript_0x1ad6e0: ; 0x1ad6e0
+UnknownScript_0x1ad6e0:
setflag $003b
return
-; 0x1ad6e4
-PokefanMScript_0x1ad6e4: ; 0x1ad6e4
+PokefanMScript_0x1ad6e4:
jumptextfaceplayer UnknownText_0x1ad702
-; 0x1ad6e7
-TeacherScript_0x1ad6e7: ; 0x1ad6e7
+TeacherScript_0x1ad6e7:
jumptextfaceplayer UnknownText_0x1ad73a
-; 0x1ad6ea
-GrampsScript_0x1ad6ea: ; 0x1ad6ea
+GrampsScript_0x1ad6ea:
jumptextfaceplayer UnknownText_0x1ad75c
-; 0x1ad6ed
-YoungsterScript_0x1ad6ed: ; 0x1ad6ed
+YoungsterScript_0x1ad6ed:
jumptextfaceplayer UnknownText_0x1ad7ac
-; 0x1ad6f0
-MapLavenderTownSignpost0Script: ; 0x1ad6f0
- jumptext UnknownText_0x1ad7f7
-; 0x1ad6f3
+LavenderTownSign:
+ jumptext LavenderTownSignText
-MapLavenderTownSignpost1Script: ; 0x1ad6f3
- jumptext UnknownText_0x1ad81c
-; 0x1ad6f6
+KantoRadioStationSign:
+ jumptext KantoRadioStationSignText
-MapLavenderTownSignpost2Script: ; 0x1ad6f6
- jumptext UnknownText_0x1ad861
-; 0x1ad6f9
+VolunteerPokemonHouseSign:
+ jumptext VolunteerPokemonHouseSignText
-MapLavenderTownSignpost3Script: ; 0x1ad6f9
- jumptext UnknownText_0x1ad880
-; 0x1ad6fc
+SoulHouseSign:
+ jumptext SoulHouseSignText
-MapLavenderTownSignpost4Script: ; 0x1ad6fc
+LavenderPokeCenterSignText:
jumpstd pokecentersign
-; 0x1ad6ff
-MapLavenderTownSignpost5Script: ; 0x1ad6ff
+LavenderMartSignText:
jumpstd martsign
-; 0x1ad702
-UnknownText_0x1ad702: ; 0x1ad702
+UnknownText_0x1ad702:
text "That's quite some"
line "building, eh?"
@@ -62,15 +50,13 @@
para "It's KANTO's RADIO"
line "TOWER."
done
-; 0x1ad73a
-UnknownText_0x1ad73a: ; 0x1ad73a
+UnknownText_0x1ad73a:
text "KANTO has many"
line "good radio shows."
done
-; 0x1ad75c
-UnknownText_0x1ad75c: ; 0x1ad75c
+UnknownText_0x1ad75c:
text "People come from"
line "all over to pay"
@@ -78,9 +64,8 @@
line "the departed souls"
cont "of #MON."
done
-; 0x1ad7ac
-UnknownText_0x1ad7ac: ; 0x1ad7ac
+UnknownText_0x1ad7ac:
text "You need a #"
line "FLUTE to wake"
cont "sleeping #MON."
@@ -88,17 +73,15 @@
para "Every trainer has"
line "to know that!"
done
-; 0x1ad7f7
-UnknownText_0x1ad7f7: ; 0x1ad7f7
+LavenderTownSignText:
text "LAVENDER TOWN"
para "The Noble Purple"
line "Town"
done
-; 0x1ad81c
-UnknownText_0x1ad81c: ; 0x1ad81c
+KantoRadioStationSignText:
text "KANTO RADIO"
line "STATION"
@@ -106,23 +89,20 @@
line "Programs On-Air"
cont "Around the Clock!"
done
-; 0x1ad861
-UnknownText_0x1ad861: ; 0x1ad861
+VolunteerPokemonHouseSignText:
text "LAVENDER VOLUNTEER"
line "#MON HOUSE"
done
-; 0x1ad880
-UnknownText_0x1ad880: ; 0x1ad880
+SoulHouseSignText:
text "SOUL HOUSE"
para "May the Souls of"
line "#MON Rest Easy"
done
-; 0x1ad8ac
-LavenderTown_MapEventHeader: ; 0x1ad8ac
+LavenderTown_MapEventHeader:
; filler
db 0, 0
@@ -141,12 +121,12 @@
; signposts
db 6
- signpost 3, 11, $0, MapLavenderTownSignpost0Script
- signpost 7, 15, $0, MapLavenderTownSignpost1Script
- signpost 9, 3, $0, MapLavenderTownSignpost2Script
- signpost 13, 15, $0, MapLavenderTownSignpost3Script
- signpost 5, 6, $0, MapLavenderTownSignpost4Script
- signpost 5, 2, $0, MapLavenderTownSignpost5Script
+ signpost 3, 11, $0, LavenderTownSign
+ signpost 7, 15, $0, KantoRadioStationSign
+ signpost 9, 3, $0, VolunteerPokemonHouseSign
+ signpost 13, 15, $0, SoulHouseSign
+ signpost 5, 6, $0, LavenderPokeCenterSignText
+ signpost 5, 2, $0, LavenderMartSignText
; people-events
db 4
@@ -154,4 +134,3 @@
person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, $ffff
person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, $ffff
person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, $ffff
-; 0x1ad927
--- a/maps/LavenderTownSpeechHouse.asm
+++ b/maps/LavenderTownSpeechHouse.asm
@@ -10,9 +10,8 @@
jumptextfaceplayer UnknownText_0x7ea4d
; 0x7ea4a
-MapLavenderTownSpeechHouseSignpost1Script: ; 0x7ea4a
+LavenderTownSpeechHouseBookshelf:
jumpstd picturebookshelf
-; 0x7ea4d
UnknownText_0x7ea4d: ; 0x7ea4d
text "LAVENDER is a"
@@ -43,8 +42,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapLavenderTownSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapLavenderTownSpeechHouseSignpost1Script
+ signpost 1, 0, $0, LavenderTownSpeechHouseBookshelf
+ signpost 1, 1, $0, LavenderTownSpeechHouseBookshelf
; people-events
db 1
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -1,4 +1,4 @@
-MahoganyTown_MapScriptHeader: ; 0x190000
+MahoganyTown_MapScriptHeader:
; trigger count
db 2
@@ -12,22 +12,18 @@
; callbacks
dbw 5, UnknownScript_0x19000f
-; 0x19000d
-UnknownScript_0x19000d: ; 0x19000d
+UnknownScript_0x19000d:
end
-; 0x19000e
-UnknownScript_0x19000e: ; 0x19000e
+UnknownScript_0x19000e:
end
-; 0x19000f
-UnknownScript_0x19000f: ; 0x19000f
+UnknownScript_0x19000f:
setflag $0049
return
-; 0x190013
-UnknownScript_0x190013: ; 0x190013
+UnknownScript_0x190013:
showemote $0, $2, 15
applymovement $2, MovementData_0x1900a9
follow $0, $2
@@ -37,26 +33,23 @@
scall UnknownScript_0x19002f
applymovement $2, MovementData_0x1900ad
end
-; 0x19002e
-PokefanMScript_0x19002e: ; 0x19002e
+PokefanMScript_0x19002e:
faceplayer
-UnknownScript_0x19002f: ; 0x19002f
+UnknownScript_0x19002f:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x190039
scall UnknownScript_0x190040
end
-; 0x190039
-UnknownScript_0x190039: ; 0x190039
+UnknownScript_0x190039:
loadfont
writetext UnknownText_0x1901a6
closetext
loadmovesprites
end
-; 0x190040
-UnknownScript_0x190040: ; 0x190040
+UnknownScript_0x190040:
loadfont
writetext UnknownText_0x1900b0
special Function24ae8
@@ -74,30 +67,26 @@
closetext
loadmovesprites
end
-; 0x19006c
-UnknownScript_0x19006c: ; 0x19006c
+UnknownScript_0x19006c:
writetext UnknownText_0x19015b
closetext
loadmovesprites
end
-; 0x190072
-UnknownScript_0x190072: ; 0x190072
+UnknownScript_0x190072:
writetext UnknownText_0x190178
closetext
loadmovesprites
end
-; 0x190078
-UnknownScript_0x190078: ; 0x190078
+UnknownScript_0x190078:
writetext UnknownText_0x190188
closetext
loadmovesprites
end
-; 0x19007e
-GrampsScript_0x19007e: ; 0x19007e
+GrampsScript_0x19007e:
faceplayer
loadfont
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
@@ -106,62 +95,51 @@
closetext
loadmovesprites
end
-; 0x19008c
-UnknownScript_0x19008c: ; 0x19008c
+UnknownScript_0x19008c:
writetext UnknownText_0x19021d
closetext
loadmovesprites
end
-; 0x190092
-FisherScript_0x190092: ; 0x190092
+FisherScript_0x190092:
jumptextfaceplayer UnknownText_0x190276
-; 0x190095
-LassScript_0x190095: ; 0x190095
+LassScript_0x190095:
jumptextfaceplayer UnknownText_0x1902f2
-; 0x190098
-MapMahoganyTownSignpost0Script: ; 0x190098
- jumptext UnknownText_0x19032e
-; 0x19009b
+MahoganyTownSign:
+ jumptext MahoganyTownSignText
-MapMahoganyTownSignpost1Script: ; 0x19009b
- jumptext UnknownText_0x19035e
-; 0x19009e
+MahoganyTownRagecandybarSign:
+ jumptext MahoganyTownRagecandybarSignText
-MapMahoganyTownSignpost2Script: ; 0x19009e
- jumptext UnknownText_0x190391
-; 0x1900a1
+MahoganyGymSign:
+ jumptext MahoganyGymSignText
-MapMahoganyTownSignpost3Script: ; 0x1900a1
+MahoganyTownPokeCenterSign:
jumpstd pokecentersign
-; 0x1900a4
-MovementData_0x1900a4: ; 0x1900a4
+MovementData_0x1900a4:
step_down
big_step_up
turn_head_down
-MovementData_0x1900a7: ; 0x1900a7
+MovementData_0x1900a7:
step_left
step_end
-; 0x1900a9
-MovementData_0x1900a9: ; 0x1900a9
+MovementData_0x1900a9:
step_right
step_down
turn_head_left
step_end
-; 0x1900ad
-MovementData_0x1900ad: ; 0x1900ad
+MovementData_0x1900ad:
step_up
turn_head_down
step_end
-; 0x1900b0
-UnknownText_0x1900b0: ; 0x1900b0
+UnknownText_0x1900b0:
text "Hiya, kid!"
para "I see you're new"
@@ -177,31 +155,26 @@
line "be yours for just"
cont "¥300! Want one?"
done
-; 0x19014a
-UnknownText_0x19014a: ; 0x19014a
+UnknownText_0x19014a:
text "Good! Savor it!"
done
-; 0x19015b
-UnknownText_0x19015b: ; 0x19015b
+UnknownText_0x19015b:
text "You don't have"
line "enough money."
done
-; 0x190178
-UnknownText_0x190178: ; 0x190178
+UnknownText_0x190178:
text "Oh, fine then…"
done
-; 0x190188
-UnknownText_0x190188: ; 0x190188
+UnknownText_0x190188:
text "You don't have"
line "room for this."
done
-; 0x1901a6
-UnknownText_0x1901a6: ; 0x1901a6
+UnknownText_0x1901a6:
text "RAGECANDYBAR's"
line "sold out."
@@ -209,16 +182,14 @@
line "Don't bother me,"
cont "kiddo."
done
-; 0x1901e5
-UnknownText_0x1901e5: ; 0x1901e5
+UnknownText_0x1901e5:
text "Are you off to see"
line "the GYARADOS ram-"
cont "page at the LAKE?"
done
-; 0x19021d
-UnknownText_0x19021d: ; 0x19021d
+UnknownText_0x19021d:
text "MAGIKARP have"
line "returned to LAKE"
cont "OF RAGE."
@@ -227,9 +198,8 @@
line "good news for the"
cont "anglers there."
done
-; 0x190276
-UnknownText_0x190276: ; 0x190276
+UnknownText_0x190276:
text "Since you came"
line "this far, take the"
@@ -242,9 +212,8 @@
para "out LAKE OF RAGE"
line "right now."
done
-; 0x1902f2
-UnknownText_0x1902f2: ; 0x1902f2
+UnknownText_0x1902f2:
text "Visit Grandma's"
line "shop. She sells"
@@ -251,24 +220,21 @@
para "stuff that nobody"
line "else has."
done
-; 0x19032e
-UnknownText_0x19032e: ; 0x19032e
+MahoganyTownSignText:
text "MAHOGANY TOWN"
para "Welcome to the"
line "Home of the Ninja"
done
-; 0x19035e
-UnknownText_0x19035e: ; 0x19035e
+MahoganyTownRagecandybarSignText:
text "While visiting"
line "MAHOGANY TOWN, try"
cont "a RAGECANDYBAR!"
done
-; 0x190391
-UnknownText_0x190391: ; 0x190391
+MahoganyGymSignText:
text "MAHOGANY TOWN"
line "#MON GYM"
cont "LEADER: PRYCE"
@@ -276,9 +242,8 @@
para "The Teacher of"
line "Winter's Harshness"
done
-; 0x1903d8
-MahoganyTown_MapEventHeader: ; 0x1903d8
+MahoganyTown_MapEventHeader:
; filler
db 0, 0
@@ -297,10 +262,10 @@
; signposts
db 4
- signpost 5, 1, $0, MapMahoganyTownSignpost0Script
- signpost 7, 9, $0, MapMahoganyTownSignpost1Script
- signpost 13, 3, $0, MapMahoganyTownSignpost2Script
- signpost 13, 16, $0, MapMahoganyTownSignpost3Script
+ signpost 5, 1, $0, MahoganyTownSign
+ signpost 7, 9, $0, MahoganyTownRagecandybarSign
+ signpost 13, 3, $0, MahoganyGymSign
+ signpost 13, 16, $0, MahoganyTownPokeCenterSign
; people-events
db 4
@@ -308,4 +273,3 @@
person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, $ffff
person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, $0757
person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, $0736
-; 0x19044f
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -91,9 +91,8 @@
jumptext UnknownText_0x7713b
; 0x7711e
-RockScript_0x7711e: ; 0x7711e
+MtMoonSquareRock:
jumpstd smashrock
-; 0x77121
MovementData_0x77121: ; 0x77121
step_up
@@ -177,5 +176,5 @@
db 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, RockScript_0x7711e, $0778
+ person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, MtMoonSquareRock, $0778
; 0x771a6
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -64,9 +64,8 @@
end
; 0x7de79
-BoulderScript_0x7de79: ; 0x7de79
+MountMortar1FBoulder:
jumpstd strengthboulder
-; 0x7de7c
ItemFragment_0x7de7c: ; 0x7de7c
db ESCAPE_ROPE, 1
@@ -180,7 +179,7 @@
; people-events
db 10
- person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, BoulderScript_0x7de79, $ffff
+ person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, $ffff
person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, $067d
person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, $067e
person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, $067f
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -47,9 +47,8 @@
end
; 0x7e23d
-BoulderScript_0x7e23d: ; 0x7e23d
+MountMortarB1FBoulder:
jumpstd strengthboulder
-; 0x7e240
ItemFragment_0x7e240: ; 0x7e240
db HYPER_POTION, 1
@@ -163,7 +162,7 @@
db 7
person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, $0686
person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, $0687
- person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e23d, $ffff
+ person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, $ffff
person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, $ffff
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
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -1,25 +1,22 @@
-MoveDeletersHouse_MapScriptHeader: ; 0x195cb2
+MoveDeletersHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x195cb4
-SuperNerdScript_0x195cb4: ; 0x195cb4
+MoveDeleter:
faceplayer
loadfont
- special Function2c547
+ special MoveDeletion
closetext
loadmovesprites
end
-; 0x195cbc
-MapMoveDeletersHouseSignpost1Script: ; 0x195cbc
+MoveDeletersHouseBookshelf:
jumpstd difficultbookshelf
-; 0x195cbf
-MoveDeletersHouse_MapEventHeader: ; 0x195cbf
+MoveDeletersHouse_MapEventHeader:
; filler
db 0, 0
@@ -33,10 +30,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapMoveDeletersHouseSignpost1Script
- signpost 1, 1, $0, MapMoveDeletersHouseSignpost1Script
+ signpost 1, 0, $0, MoveDeletersHouseBookshelf
+ signpost 1, 1, $0, MoveDeletersHouseBookshelf
; people-events
db 1
- person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x195cb4, $ffff
-; 0x195ce6
+ person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, $ffff
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -14,36 +14,32 @@
jumptextfaceplayer UnknownText_0x7e940
; 0x7e8d0
-RhydonScript_0x7e8d0: ; 0x7e8d0
+MrFujisPsyduck:
loadfont
- writetext UnknownText_0x7e9b6
+ writetext MrFujisPsyduckText
cry PSYDUCK
closetext
loadmovesprites
end
-; 0x7e8da
-GrowlitheScript_0x7e8da: ; 0x7e8da
+MrFujisNidorino:
loadfont
- writetext UnknownText_0x7e9c9
+ writetext MrFujisNidorinoText
cry NIDORINO
closetext
loadmovesprites
end
-; 0x7e8e4
-MoltresScript_0x7e8e4: ; 0x7e8e4
+MrFujisPidgey:
loadfont
- writetext UnknownText_0x7e9da
+ writetext MrFujisPidgeyText
cry PIDGEY
closetext
loadmovesprites
end
-; 0x7e8ee
-MapMrFujisHouseSignpost1Script: ; 0x7e8ee
+MrFujisHouseBookshelf:
jumpstd difficultbookshelf
-; 0x7e8f1
UnknownText_0x7e8f1: ; 0x7e8f1
text "MR.FUJI does live"
@@ -69,20 +65,17 @@
done
; 0x7e9b6
-UnknownText_0x7e9b6: ; 0x7e9b6
+MrFujisPsyduckText:
text "PSYDUCK: Gu-guwa?"
done
-; 0x7e9c9
-UnknownText_0x7e9c9: ; 0x7e9c9
+MrFujisNidorinoText:
text "NIDORINO: Gyun!"
done
-; 0x7e9da
-UnknownText_0x7e9da: ; 0x7e9da
+MrFujisPidgeyText:
text "PIDGEY: Pijji!"
done
-; 0x7e9ea
MrFujisHouse_MapEventHeader: ; 0x7e9ea
; filler
@@ -98,14 +91,13 @@
; signposts
db 2
- signpost 1, 0, $0, MapMrFujisHouseSignpost1Script
- signpost 1, 1, $0, MapMrFujisHouseSignpost1Script
+ signpost 1, 0, $0, MrFujisHouseBookshelf
+ signpost 1, 1, $0, MrFujisHouseBookshelf
; people-events
db 5
person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, $ffff
person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, $ffff
- person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, RhydonScript_0x7e8d0, $ffff
- person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x7e8da, $ffff
- person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MoltresScript_0x7e8e4, $ffff
-; 0x7ea45
+ person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, $ffff
+ person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, $ffff
+ person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, $ffff
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -1,34 +1,31 @@
-MrPsychicsHouse_MapScriptHeader: ; 0x18a778
+MrPsychicsHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18a77a
-FishingGuruScript_0x18a77a: ; 0x18a77a
+MrPsychic:
faceplayer
loadfont
checkevent EVENT_GOT_TM29_PSYCHIC
- iftrue UnknownScript_0x18a78f
- writetext UnknownText_0x18a798
+ iftrue .AlreadyGotItem
+ writetext MrPsychicText1
keeptextopen
verbosegiveitem TM_29, 1
- iffalse UnknownScript_0x18a793
+ iffalse .Done
setevent EVENT_GOT_TM29_PSYCHIC
-UnknownScript_0x18a78f: ; 0x18a78f
- writetext UnknownText_0x18a7bb
+.AlreadyGotItem
+ writetext MrPsychicText2
closetext
-UnknownScript_0x18a793: ; 0x18a793
+.Done
loadmovesprites
end
-; 0x18a795
-MapMrPsychicsHouseSignpost1Script: ; 0x18a795
+MrPsychicsHouseBookshelf:
jumpstd difficultbookshelf
-; 0x18a798
-UnknownText_0x18a798: ; 0x18a798
+MrPsychicText1:
text "…"
para "…"
@@ -39,17 +36,15 @@
para "You wanted this!"
done
-; 0x18a7bb
-UnknownText_0x18a7bb: ; 0x18a7bb
+MrPsychicText2:
text "TM29 is PSYCHIC."
para "It may lower the"
line "target's SPCL.DEF."
done
-; 0x18a7f0
-MrPsychicsHouse_MapEventHeader: ; 0x18a7f0
+MrPsychicsHouse_MapEventHeader:
; filler
db 0, 0
@@ -63,10 +58,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapMrPsychicsHouseSignpost1Script
- signpost 1, 1, $0, MapMrPsychicsHouseSignpost1Script
+ signpost 1, 0, $0, MrPsychicsHouseBookshelf
+ signpost 1, 1, $0, MrPsychicsHouseBookshelf
; people-events
db 1
- person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, FishingGuruScript_0x18a77a, $ffff
-; 0x18a817
+ person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, $ffff
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -10,51 +10,46 @@
end
; 0x19b3c8
-OakScript_0x19b3c8: ; 0x19b3c8
+Oak:
faceplayer
loadfont
checkevent EVENT_OPENED_MT_SILVER
- iftrue UnknownScript_0x19b3ea
- checkevent $00e1
- iftrue UnknownScript_0x19b3dd
- writetext UnknownText_0x19b427
+ iftrue .CheckPokedex
+ checkevent EVENT_TALKED_TO_OAK_IN_KANTO
+ iftrue .CheckBadges
+ writetext OakWelcomeKantoText
keeptextopen
- setevent $00e1
-UnknownScript_0x19b3dd: ; 0x19b3dd
+ setevent EVENT_TALKED_TO_OAK_IN_KANTO
+.CheckBadges
checkcode $7
- if_equal $10, UnknownScript_0x19b3f7
- if_equal $8, UnknownScript_0x19b401
- jump UnknownScript_0x19b408
-; 0x19b3ea
+ if_equal 16, .OpenMtSilver
+ if_equal 8, .Complain
+ jump .AhGood
-UnknownScript_0x19b3ea: ; 0x19b3ea
- writetext UnknownText_0x19b4a2
+.CheckPokedex
+ writetext OakLabDexCheckText
closetext
special ProfOaksPCBoot
- writetext UnknownText_0x19b4c8
+ writetext OakLabGoodbyeText
closetext
loadmovesprites
end
-; 0x19b3f7
-UnknownScript_0x19b3f7: ; 0x19b3f7
- writetext UnknownText_0x19b4fc
+.OpenMtSilver
+ writetext OakOpenMtSilverText
keeptextopen
setevent EVENT_OPENED_MT_SILVER
- jump UnknownScript_0x19b3ea
-; 0x19b401
+ jump .CheckPokedex
-UnknownScript_0x19b401: ; 0x19b401
- writetext UnknownText_0x19b6a2
+.Complain
+ writetext OakNoKantoBadgesText
keeptextopen
- jump UnknownScript_0x19b3ea
-; 0x19b408
+ jump .CheckPokedex
-UnknownScript_0x19b408: ; 0x19b408
- writetext UnknownText_0x19b73c
+.AhGood
+ writetext OakYesKantoBadgesText
keeptextopen
- jump UnknownScript_0x19b3ea
-; 0x19b40f
+ jump .CheckPokedex
ScientistScript_0x19b40f: ; 0x19b40f
jumptextfaceplayer UnknownText_0x19b7fb
@@ -68,27 +63,22 @@
jumptextfaceplayer UnknownText_0x19b8a7
; 0x19b418
-MapOaksLabSignpost11Script: ; 0x19b418
+OaksLabBookshelf:
jumpstd difficultbookshelf
-; 0x19b41b
-MapOaksLabSignpost12Script: ; 0x19b41b
- jumptext UnknownText_0x19b8ea
-; 0x19b41e
+OaksLabPoster1:
+ jumptext OaksLabPoster1Text
-MapOaksLabSignpost13Script: ; 0x19b41e
- jumptext UnknownText_0x19b909
-; 0x19b421
+OaksLabPoster2:
+ jumptext OaksLabPoster2Text
-MapOaksLabSignpost14Script: ; 0x19b421
- jumptext UnknownText_0x19b945
-; 0x19b424
+OaksLabTrashcan:
+ jumptext OaksLabTrashcanText
-MapOaksLabSignpost15Script: ; 0x19b424
- jumptext UnknownText_0x19b95e
-; 0x19b427
+OaksLabPC:
+ jumptext OaksLabPCText
-UnknownText_0x19b427: ; 0x19b427
+OakWelcomeKantoText:
text "OAK: Ah, ", $14, "!"
line "It's good of you"
@@ -101,24 +91,21 @@
para "out here?"
line "Pretty tough, huh?"
done
-; 0x19b4a2
-UnknownText_0x19b4a2: ; 0x19b4a2
+OakLabDexCheckText:
text "How is your #-"
line "DEX coming?"
para "Let's see…"
done
-; 0x19b4c8
-UnknownText_0x19b4c8: ; 0x19b4c8
+OakLabGoodbyeText:
text "If you're in the"
line "area, I hope you"
cont "come visit again."
done
-; 0x19b4fc
-UnknownText_0x19b4fc: ; 0x19b4fc
+OakOpenMtSilverText:
text "OAK: Wow! That's"
line "excellent!"
@@ -158,9 +145,8 @@
para "reach MT.SILVER"
line "from there."
done
-; 0x19b6a2
-UnknownText_0x19b6a2: ; 0x19b6a2
+OakNoKantoBadgesText:
text "OAK: Hmm? You're"
line "not collecting"
cont "KANTO GYM BADGES?"
@@ -175,9 +161,8 @@
line "you challenge"
cont "them."
done
-; 0x19b73c
-UnknownText_0x19b73c: ; 0x19b73c
+OakYesKantoBadgesText:
text "OAK: Ah, you're"
line "collecting KANTO"
cont "GYM BADGES."
@@ -197,7 +182,6 @@
para "Keep trying hard,"
line $14, "!"
done
-; 0x19b7fb
UnknownText_0x19b7fb: ; 0x19b7fb
text "The PROF's #MON"
@@ -230,13 +214,12 @@
done
; 0x19b8ea
-UnknownText_0x19b8ea: ; 0x19b8ea
+OaksLabPoster1Text:
text "Press START to"
line "open the MENU."
done
-; 0x19b909
-UnknownText_0x19b909: ; 0x19b909
+OaksLabPoster2Text:
text "The SAVE option is"
line "on the MENU."
@@ -243,15 +226,13 @@
para "Use it in a timely"
line "manner."
done
-; 0x19b945
-UnknownText_0x19b945: ; 0x19b945
+OaksLabTrashcanText
text "There's nothing in"
line "here…"
done
-; 0x19b95e
-UnknownText_0x19b95e: ; 0x19b95e
+OaksLabPCText:
text "There's an e-mail"
line "message on the PC."
@@ -292,26 +273,26 @@
; signposts
db 16
- signpost 1, 6, $0, MapOaksLabSignpost11Script
- signpost 1, 7, $0, MapOaksLabSignpost11Script
- signpost 1, 8, $0, MapOaksLabSignpost11Script
- signpost 1, 9, $0, MapOaksLabSignpost11Script
- signpost 7, 0, $0, MapOaksLabSignpost11Script
- signpost 7, 1, $0, MapOaksLabSignpost11Script
- signpost 7, 2, $0, MapOaksLabSignpost11Script
- signpost 7, 3, $0, MapOaksLabSignpost11Script
- signpost 7, 6, $0, MapOaksLabSignpost11Script
- signpost 7, 7, $0, MapOaksLabSignpost11Script
- signpost 7, 8, $0, MapOaksLabSignpost11Script
- signpost 7, 9, $0, MapOaksLabSignpost11Script
- signpost 0, 4, $0, MapOaksLabSignpost12Script
- signpost 0, 5, $0, MapOaksLabSignpost13Script
- signpost 3, 9, $0, MapOaksLabSignpost14Script
- signpost 1, 0, $0, MapOaksLabSignpost15Script
+ signpost 1, 6, $0, OaksLabBookshelf
+ signpost 1, 7, $0, OaksLabBookshelf
+ signpost 1, 8, $0, OaksLabBookshelf
+ signpost 1, 9, $0, OaksLabBookshelf
+ signpost 7, 0, $0, OaksLabBookshelf
+ signpost 7, 1, $0, OaksLabBookshelf
+ signpost 7, 2, $0, OaksLabBookshelf
+ signpost 7, 3, $0, OaksLabBookshelf
+ signpost 7, 6, $0, OaksLabBookshelf
+ signpost 7, 7, $0, OaksLabBookshelf
+ signpost 7, 8, $0, OaksLabBookshelf
+ signpost 7, 9, $0, OaksLabBookshelf
+ signpost 0, 4, $0, OaksLabPoster1
+ signpost 0, 5, $0, OaksLabPoster2
+ signpost 3, 9, $0, OaksLabTrashcan
+ signpost 1, 0, $0, OaksLabPC
; people-events
db 4
- person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, OakScript_0x19b3c8, $ffff
+ person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, $ffff
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
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -1,4 +1,4 @@
-OlivineCity_MapScriptHeader: ; 0x1a8820
+OlivineCity_MapScriptHeader:
; trigger count
db 2
@@ -12,22 +12,18 @@
; callbacks
dbw 5, UnknownScript_0x1a882f
-; 0x1a882d
-UnknownScript_0x1a882d: ; 0x1a882d
+UnknownScript_0x1a882d:
end
-; 0x1a882e
-UnknownScript_0x1a882e: ; 0x1a882e
+UnknownScript_0x1a882e:
end
-; 0x1a882f
-UnknownScript_0x1a882f: ; 0x1a882f
+UnknownScript_0x1a882f:
setflag $0047
return
-; 0x1a8833
-UnknownScript_0x1a8833: ; 0x1a8833
+UnknownScript_0x1a8833:
spriteface $0, $2
showemote $0, $0, 15
special Functionc48f
@@ -50,9 +46,8 @@
variablesprite $5, $31
special Function14209
end
-; 0x1a886b
-UnknownScript_0x1a886b: ; 0x1a886b
+UnknownScript_0x1a886b:
spriteface $0, $2
showemote $0, $0, 15
special Functionc48f
@@ -75,13 +70,11 @@
variablesprite $5, $31
special Function14209
end
-; 0x1a88a3
-SailorScript_0x1a88a3: ; 0x1a88a3
+SailorScript_0x1a88a3:
jumptextfaceplayer UnknownText_0x1a8a58
-; 0x1a88a6
-StandingYoungsterScript_0x1a88a6: ; 0x1a88a6
+StandingYoungsterScript_0x1a88a6:
faceplayer
loadfont
random $2
@@ -90,63 +83,51 @@
closetext
loadmovesprites
end
-; 0x1a88b4
-UnknownScript_0x1a88b4: ; 0x1a88b4
+UnknownScript_0x1a88b4:
writetext UnknownText_0x1a8b41
closetext
loadmovesprites
end
-; 0x1a88ba
-SailorScript_0x1a88ba: ; 0x1a88ba
+SailorScript_0x1a88ba:
jumptextfaceplayer UnknownText_0x1a8b71
-; 0x1a88bd
-MapOlivineCitySignpost0Script: ; 0x1a88bd
- jumptext UnknownText_0x1a8bd0
-; 0x1a88c0
+OlivineCitySign:
+ jumptext OlivineCitySignText
-MapOlivineCitySignpost1Script: ; 0x1a88c0
- jumptext UnknownText_0x1a8c00
-; 0x1a88c3
+OlivineCityPortSign:
+ jumptext OlivineCityPortSignText
-MapOlivineCitySignpost2Script: ; 0x1a88c3
- jumptext UnknownText_0x1a8c1d
-; 0x1a88c6
+OlivineGymSign:
+ jumptext OlivineGymSignText
-MapOlivineCitySignpost3Script: ; 0x1a88c6
- jumptext UnknownText_0x1a8c60
-; 0x1a88c9
+OlivineLighthouseSign:
+ jumptext OlivineLighthouseSignText
-MapOlivineCitySignpost4Script: ; 0x1a88c9
- jumptext UnknownText_0x1a8c99
-; 0x1a88cc
+OlivineCityBattleTowerSign:
+ jumptext OlivineCityBattleTowerSignText
-MapOlivineCitySignpost5Script: ; 0x1a88cc
+OlivineCityPokeCenterSign:
jumpstd pokecentersign
-; 0x1a88cf
-MapOlivineCitySignpost6Script: ; 0x1a88cf
+OlivineCityMartSign:
jumpstd martsign
-; 0x1a88d2
-MovementData_0x1a88d2: ; 0x1a88d2
+MovementData_0x1a88d2:
step_down
step_right
step_right
step_end
-; 0x1a88d6
-MovementData_0x1a88d6: ; 0x1a88d6
+MovementData_0x1a88d6:
step_down
step_down
step_right
step_right
step_end
-; 0x1a88db
-MovementData_0x1a88db: ; 0x1a88db
+MovementData_0x1a88db:
step_right
step_right
step_right
@@ -160,9 +141,8 @@
step_up
step_up
step_end
-; 0x1a88e8
-MovementData_0x1a88e8: ; 0x1a88e8
+MovementData_0x1a88e8:
step_right
step_right
step_right
@@ -175,21 +155,18 @@
step_up
step_up
step_end
-; 0x1a88f4
-MovementData_0x1a88f4: ; 0x1a88f4
+MovementData_0x1a88f4:
step_down
turn_head_up
step_end
-; 0x1a88f7
-MovementData_0x1a88f7: ; 0x1a88f7
+MovementData_0x1a88f7:
step_up
turn_head_down
step_end
-; 0x1a88fa
-UnknownText_0x1a88fa: ; 0x1a88fa
+UnknownText_0x1a88fa:
text "…"
para "You again?"
@@ -228,9 +205,8 @@
line "make you a bit"
cont "less weak!"
done
-; 0x1a8a58
-UnknownText_0x1a8a58: ; 0x1a8a58
+UnknownText_0x1a8a58:
text "Dark roads are"
line "dangerous at"
cont "night."
@@ -247,17 +223,15 @@
para "to guide it, no"
line "ship can sail."
done
-; 0x1a8b04
-UnknownText_0x1a8b04: ; 0x1a8b04
+UnknownText_0x1a8b04:
text "That thing you"
line "have--it's a #-"
cont "GEAR, right? Wow,"
cont "that's cool."
done
-; 0x1a8b41
-UnknownText_0x1a8b41: ; 0x1a8b41
+UnknownText_0x1a8b41:
text "Wow, you have a"
line "#DEX!"
@@ -264,9 +238,8 @@
para "That is just so"
line "awesome."
done
-; 0x1a8b71
-UnknownText_0x1a8b71: ; 0x1a8b71
+UnknownText_0x1a8b71:
text "The sea is sweet!"
para "Sunsets on the sea"
@@ -276,23 +249,20 @@
line "Yo-ho! Blow the"
cont "man down!…"
done
-; 0x1a8bd0
-UnknownText_0x1a8bd0: ; 0x1a8bd0
+OlivineCitySignText:
text "OLIVINE CITY"
para "The Port Closest"
line "to Foreign Lands"
done
-; 0x1a8c00
-UnknownText_0x1a8c00: ; 0x1a8c00
+OlivineCityPortSignText:
text "OLIVINE PORT"
line "FAST SHIP PIER"
done
-; 0x1a8c1d
-UnknownText_0x1a8c1d: ; 0x1a8c1d
+OlivineGymSignText:
text "OLIVINE CITY"
line "#MON GYM"
cont "LEADER: JASMINE"
@@ -300,27 +270,23 @@
para "The Steel-Clad"
line "Defense Girl"
done
-; 0x1a8c60
-UnknownText_0x1a8c60: ; 0x1a8c60
+OlivineLighthouseSignText:
text "OLIVINE LIGHTHOUSE"
line "Also known as the"
cont "GLITTER LIGHTHOUSE"
done
-; 0x1a8c99
-UnknownText_0x1a8c99: ; 0x1a8c99
+OlivineCityBattleTowerSignText:
text "BATTLE TOWER AHEAD"
line "Opening Now!"
done
-; 0x1a8cba
-UnknownText_0x1a8cba: ; 0x1a8cba
+UnknownText_0x1a8cba:
text "BATTLE TOWER AHEAD"
done
-; 0x1a8cce
-OlivineCity_MapEventHeader: ; 0x1a8cce
+OlivineCity_MapEventHeader:
; filler
db 0, 0
@@ -345,13 +311,13 @@
; signposts
db 7
- signpost 11, 17, $0, MapOlivineCitySignpost0Script
- signpost 24, 20, $0, MapOlivineCitySignpost1Script
- signpost 11, 7, $0, MapOlivineCitySignpost2Script
- signpost 28, 30, $0, MapOlivineCitySignpost3Script
- signpost 23, 3, $0, MapOlivineCitySignpost4Script
- signpost 21, 14, $0, MapOlivineCitySignpost5Script
- signpost 17, 20, $0, MapOlivineCitySignpost6Script
+ signpost 11, 17, $0, OlivineCitySign
+ signpost 24, 20, $0, OlivineCityPortSign
+ signpost 11, 7, $0, OlivineGymSign
+ signpost 28, 30, $0, OlivineLighthouseSign
+ signpost 23, 3, $0, OlivineCityBattleTowerSign
+ signpost 21, 14, $0, OlivineCityPokeCenterSign
+ signpost 17, 20, $0, OlivineCityMartSign
; people-events
db 4
@@ -359,4 +325,3 @@
person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, $ffff
person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, $ffff
person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c3
-; 0x1a8d72
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -1,48 +1,44 @@
-OlivineGoodRodHouse_MapScriptHeader: ; 0x9c719
+OlivineGoodRodHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9c71b
-FishingGuruScript_0x9c71b: ; 0x9c71b
+GoodRodGuru:
faceplayer
loadfont
checkevent EVENT_GOT_GOOD_ROD
- iftrue UnknownScript_0x9c740
- writetext UnknownText_0x9c749
+ iftrue .AlreadyGotItem
+ writetext OfferGoodRodText
yesorno
- iffalse UnknownScript_0x9c73a
- writetext UnknownText_0x9c7db
+ iffalse .DontWantIt
+ writetext GiveGoodRodText
keeptextopen
verbosegiveitem GOOD_ROD, 1
- writetext UnknownText_0x9c807
+ writetext GaveGoodRodText
closetext
loadmovesprites
setevent EVENT_GOT_GOOD_ROD
end
-; 0x9c73a
-UnknownScript_0x9c73a: ; 0x9c73a
- writetext UnknownText_0x9c84c
+.DontWantIt
+ writetext DontWantGoodRodText
closetext
loadmovesprites
end
-; 0x9c740
-UnknownScript_0x9c740: ; 0x9c740
- writetext UnknownText_0x9c87f
+.AlreadyGotItem
+ writetext HaveGoodRodText
closetext
loadmovesprites
end
-; 0x9c746
-UnknownScript_0x9c746: ; 0x9c746
+GoodRodHouseBookshelf:
+; unused
jumpstd picturebookshelf
-; 0x9c749
-UnknownText_0x9c749: ; 0x9c749
+OfferGoodRodText:
text "OLIVINE is on the"
line "sea!"
@@ -57,16 +53,14 @@
line "face the sea and"
cont "fish?"
done
-; 0x9c7db
-UnknownText_0x9c7db: ; 0x9c7db
+GiveGoodRodText:
text "Ah, hahah!"
line "We have ourselves"
cont "a new angler!"
done
-; 0x9c807
-UnknownText_0x9c807: ; 0x9c807
+GaveGoodRodText:
text "Fish aren't found"
line "in the sea alone."
@@ -73,22 +67,19 @@
para "They go wherever"
line "there is water."
done
-; 0x9c84c
-UnknownText_0x9c84c: ; 0x9c84c
+DontWantGoodRodText:
text "Whaaat? You don't"
line "like to fish!?"
cont "Incomprehensible!"
done
-; 0x9c87f
-UnknownText_0x9c87f: ; 0x9c87f
+HaveGoodRodText:
text "How are things?"
line "Land the big one?"
done
-; 0x9c8a2
-OlivineGoodRodHouse_MapEventHeader: ; 0x9c8a2
+OlivineGoodRodHouse_MapEventHeader:
; filler
db 0, 0
@@ -105,5 +96,4 @@
; people-events
db 1
- person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x9c71b, $ffff
-; 0x9c8bf
+ person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, $ffff
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -19,13 +19,11 @@
end
; 0x9c59c
-MapOlivineHouseBetaSignpost0Script: ; 0x9c59c
+OlivineHouseBetaBookshelf1:
jumpstd picturebookshelf
-; 0x9c59f
-MapOlivineHouseBetaSignpost1Script: ; 0x9c59f
+OlivineHouseBetaBookshelf2:
jumpstd magazinebookshelf
-; 0x9c5a2
UnknownText_0x9c5a2: ; 0x9c5a2
text "When my #MON"
@@ -56,8 +54,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapOlivineHouseBetaSignpost0Script
- signpost 1, 1, $0, MapOlivineHouseBetaSignpost1Script
+ signpost 1, 0, $0, OlivineHouseBetaBookshelf1
+ signpost 1, 1, $0, OlivineHouseBetaBookshelf2
; people-events
db 2
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -1,28 +1,23 @@
-OlivinePunishmentSpeechHouse_MapScriptHeader: ; 0x9c635
+OlivinePunishmentSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9c637
-PokefanMScript_0x9c637: ; 0x9c637
- jumptextfaceplayer UnknownText_0x9c643
-; 0x9c63a
+OlivinePunishmentSpeechHouseDad:
+ jumptextfaceplayer OlivinePunishmentSpeechHouseDadText
-LassScript_0x9c63a: ; 0x9c63a
- jumptextfaceplayer UnknownText_0x9c6b1
-; 0x9c63d
+OlivinePunishmentSpeechHouseDaughter:
+ jumptextfaceplayer OlivinePunishmentSpeechHouseDaughterText
-MapOlivinePunishmentSpeechHouseSignpost1Script: ; 0x9c63d
+OlivinePunishmentSpeechHouseBookshelf2:
jumpstd picturebookshelf
-; 0x9c640
-MapOlivinePunishmentSpeechHouseSignpost0Script: ; 0x9c640
+OlivinePunishmentSpeechHouseBookshelf1:
jumpstd magazinebookshelf
-; 0x9c643
-UnknownText_0x9c643: ; 0x9c643
+OlivinePunishmentSpeechHouseDadText:
text "Along the way to"
line "CIANWOOD, there"
@@ -33,16 +28,14 @@
line "to the islands as"
cont "punishment!"
done
-; 0x9c6b1
-UnknownText_0x9c6b1: ; 0x9c6b1
+OlivinePunishmentSpeechHouseDaughterText:
text "Whenever I get in"
line "trouble, Daddy"
cont "always scares me."
done
-; 0x9c6e5
-OlivinePunishmentSpeechHouse_MapEventHeader: ; 0x9c6e5
+OlivinePunishmentSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -56,11 +49,10 @@
; signposts
db 2
- signpost 1, 0, $0, MapOlivinePunishmentSpeechHouseSignpost0Script
- signpost 1, 1, $0, MapOlivinePunishmentSpeechHouseSignpost1Script
+ signpost 1, 0, $0, OlivinePunishmentSpeechHouseBookshelf1
+ signpost 1, 1, $0, OlivinePunishmentSpeechHouseBookshelf2
; people-events
db 2
- person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, PokefanMScript_0x9c637, $ffff
- person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, LassScript_0x9c63a, $ffff
-; 0x9c719
+ person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, $ffff
+ person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, $ffff
--- a/maps/OlivineVoltorbHouse.asm
+++ b/maps/OlivineVoltorbHouse.asm
@@ -1,12 +1,11 @@
-OlivineVoltorbHouse_MapScriptHeader: ; 0x9c55a
+OlivineVoltorbHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x9c55c
-FishingGuruScript_0x9c55c: ; 0x9c55c
+Tim:
faceplayer
loadfont
trade $2
@@ -13,13 +12,11 @@
closetext
loadmovesprites
end
-; 0x9c563
-MapOlivineVoltorbHouseSignpost1Script: ; 0x9c563
+TimsHouseBookshelf:
jumpstd magazinebookshelf
-; 0x9c566
-OlivineVoltorbHouse_MapEventHeader: ; 0x9c566
+OlivineVoltorbHouse_MapEventHeader:
; filler
db 0, 0
@@ -33,10 +30,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapOlivineVoltorbHouseSignpost1Script
- signpost 1, 1, $0, MapOlivineVoltorbHouseSignpost1Script
+ signpost 1, 0, $0, TimsHouseBookshelf
+ signpost 1, 1, $0, TimsHouseBookshelf
; people-events
db 1
- person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, FishingGuruScript_0x9c55c, $ffff
-; 0x9c58d
+ person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, $ffff
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -1,4 +1,4 @@
-PewterCity_MapScriptHeader: ; 0x18c000
+PewterCity_MapScriptHeader:
; trigger count
db 0
@@ -8,22 +8,18 @@
; callbacks
dbw 5, UnknownScript_0x18c005
-; 0x18c005
-UnknownScript_0x18c005: ; 0x18c005
+UnknownScript_0x18c005:
setflag $0037
return
-; 0x18c009
-CooltrainerFScript_0x18c009: ; 0x18c009
+CooltrainerFScript_0x18c009:
jumptextfaceplayer UnknownText_0x18c042
-; 0x18c00c
-BugCatcherScript_0x18c00c: ; 0x18c00c
+BugCatcherScript_0x18c00c:
jumptextfaceplayer UnknownText_0x18c080
-; 0x18c00f
-GrampsScript_0x18c00f: ; 0x18c00f
+GrampsScript_0x18c00f:
faceplayer
loadfont
checkevent EVENT_GOT_SILVER_WING
@@ -34,52 +30,41 @@
setevent EVENT_GOT_SILVER_WING
loadmovesprites
end
-; 0x18c023
-UnknownScript_0x18c023: ; 0x18c023
+UnknownScript_0x18c023:
writetext UnknownText_0x18c1aa
closetext
loadmovesprites
end
-; 0x18c029
-MapPewterCitySignpost0Script: ; 0x18c029
- jumptext UnknownText_0x18c1ff
-; 0x18c02c
+PewterCitySign:
+ jumptext PewterCitySignText
-MapPewterCitySignpost1Script: ; 0x18c02c
- jumptext UnknownText_0x18c21e
-; 0x18c02f
+PewterGymSign:
+ jumptext PewterGymSignText
-MapPewterCitySignpost2Script: ; 0x18c02f
- jumptext UnknownText_0x18c25e
-; 0x18c032
+PewterMuseumSign:
+ jumptext PewterMuseumSignText
-MapPewterCitySignpost3Script: ; 0x18c032
- jumptext UnknownText_0x18c2a9
-; 0x18c035
+PewterCityMtMoonGiftShopSign:
+ jumptext PewterCityMtMoonGiftShopSignText
-MapPewterCitySignpost4Script: ; 0x18c035
- jumptext UnknownText_0x18c2dc
-; 0x18c038
+PewterCityWelcomeSign:
+ jumptext PewterCityWelcomeSignText
-MapPewterCitySignpost5Script: ; 0x18c038
+PewterCityPokeCenterSign:
jumpstd pokecentersign
-; 0x18c03b
-MapPewterCitySignpost6Script: ; 0x18c03b
+PewterCityMartSign:
jumpstd martsign
-; 0x18c03e
-FruitTreeScript_0x18c03e: ; 0x18c03e
+FruitTreeScript_0x18c03e:
fruittree $1c
-; 0x18c040
-FruitTreeScript_0x18c040: ; 0x18c040
+FruitTreeScript_0x18c040:
fruittree $1d
-; 0x18c042
-UnknownText_0x18c042: ; 0x18c042
+UnknownText_0x18c042:
text "Have you visited"
line "PEWTER GYM?"
@@ -86,9 +71,8 @@
para "The LEADER uses"
line "rock-type #MON."
done
-; 0x18c080
-UnknownText_0x18c080: ; 0x18c080
+UnknownText_0x18c080:
text "At night, CLEFAIRY"
line "come out to play"
cont "at MT.MOON."
@@ -96,9 +80,8 @@
para "But not every"
line "night."
done
-; 0x18c0c6
-UnknownText_0x18c0c6: ; 0x18c0c6
+UnknownText_0x18c0c6:
text "Ah, you came all"
line "the way out here"
cont "from JOHTO?"
@@ -119,9 +102,8 @@
line "to have this item"
cont "I found in JOHTO."
done
-; 0x18c1aa
-UnknownText_0x18c1aa: ; 0x18c1aa
+UnknownText_0x18c1aa:
text "Going to new, un-"
line "known places and"
cont "seeing new people…"
@@ -129,15 +111,13 @@
para "Those are the joys"
line "of travel."
done
-; 0x18c1ff
-UnknownText_0x18c1ff: ; 0x18c1ff
+PewterCitySignText:
text "PEWTER CITY"
line "A Stone Gray City"
done
-; 0x18c21e
-UnknownText_0x18c21e: ; 0x18c21e
+PewterGymSignText:
text "PEWTER CITY"
line "#MON GYM"
cont "LEADER: BROCK"
@@ -145,9 +125,8 @@
para "The Rock Solid"
line "#MON Trainer"
done
-; 0x18c25e
-UnknownText_0x18c25e: ; 0x18c25e
+PewterMuseumSignText:
text "There's a notice"
line "here…"
@@ -155,9 +134,8 @@
line "SCIENCE is closed"
cont "for renovations…"
done
-; 0x18c2a9
-UnknownText_0x18c2a9: ; 0x18c2a9
+PewterCityMtMoonGiftShopSignText:
text "There's a notice"
line "here…"
@@ -164,15 +142,13 @@
para "MT.MOON GIFT SHOP"
line "NOW OPEN!"
done
-; 0x18c2dc
-UnknownText_0x18c2dc: ; 0x18c2dc
+PewterCityWelcomeSignText:
text "WELCOME TO"
line "PEWTER CITY!"
done
-; 0x18c2f5
-PewterCity_MapEventHeader: ; 0x18c2f5
+PewterCity_MapEventHeader:
; filler
db 0, 0
@@ -189,13 +165,13 @@
; signposts
db 7
- signpost 23, 25, $0, MapPewterCitySignpost0Script
- signpost 17, 11, $0, MapPewterCitySignpost1Script
- signpost 9, 15, $0, MapPewterCitySignpost2Script
- signpost 19, 33, $0, MapPewterCitySignpost3Script
- signpost 29, 19, $0, MapPewterCitySignpost4Script
- signpost 25, 14, $0, MapPewterCitySignpost5Script
- signpost 17, 24, $0, MapPewterCitySignpost6Script
+ signpost 23, 25, $0, PewterCitySign
+ signpost 17, 11, $0, PewterGymSign
+ signpost 9, 15, $0, PewterMuseumSign
+ signpost 19, 33, $0, PewterCityMtMoonGiftShopSign
+ signpost 29, 19, $0, PewterCityWelcomeSign
+ signpost 25, 14, $0, PewterCityPokeCenterSign
+ signpost 17, 24, $0, PewterCityMartSign
; people-events
db 5
@@ -204,4 +180,3 @@
person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, $ffff
person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, $ffff
person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, $ffff
-; 0x18c378
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -1,27 +1,23 @@
-PewterSnoozeSpeechHouse_MapScriptHeader: ; 0x1a3057
+PewterSnoozeSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a3059
-GrampsScript_0x1a3059: ; 0x1a3059
+GrampsScript_0x1a3059:
jumptextfaceplayer UnknownText_0x1a305f
-; 0x1a305c
-MapPewterSnoozeSpeechHouseSignpost1Script: ; 0x1a305c
+PewterSnoozeSpeechHouseBookshelf:
jumpstd picturebookshelf
-; 0x1a305f
-UnknownText_0x1a305f: ; 0x1a305f
+UnknownText_0x1a305f:
text "I like snoozing"
line "with the radio on…"
cont "…Zzzz…"
done
-; 0x1a308a
-PewterSnoozeSpeechHouse_MapEventHeader: ; 0x1a308a
+PewterSnoozeSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -35,10 +31,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapPewterSnoozeSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapPewterSnoozeSpeechHouseSignpost1Script
+ signpost 1, 0, $0, PewterSnoozeSpeechHouseBookshelf
+ signpost 1, 1, $0, PewterSnoozeSpeechHouseBookshelf
; people-events
db 1
person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, $ffff
-; 0x1a30b1
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -141,7 +141,7 @@
end
; 0x188e65
-FisherScript_0x188e65: ; 0x188e65
+PowerPlantManager: ; 0x188e65
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -209,9 +209,8 @@
end
; 0x188ed2
-MapPowerPlantSignpost1Script: ; 0x188ed2
+PowerPlantBookshelf:
jumpstd difficultbookshelf
-; 0x188ed5
MovementData_0x188ed5: ; 0x188ed5
step_right
@@ -437,8 +436,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapPowerPlantSignpost1Script
- signpost 1, 1, $0, MapPowerPlantSignpost1Script
+ signpost 1, 0, $0, PowerPlantBookshelf
+ signpost 1, 1, $0, PowerPlantBookshelf
; people-events
db 7
@@ -447,6 +446,6 @@
person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, $ffff
person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, $ffff
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, FisherScript_0x188e65, $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/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -165,7 +165,7 @@
end
; 0x5d775
-BuenaScript_0x5d775: ; 0x5d775
+Buena:
faceplayer
loadfont
checkflag $0013
@@ -420,9 +420,8 @@
jumptext UnknownText_0x5e463
; 0x5d91e
-MapRadioTower2FSignpost4Script: ; 0x5d91e
+RadioTower2FBookshelf:
jumpstd magazinebookshelf
-; 0x5d921
MovementData_0x5d921: ; 0x5d921
slow_step_down
@@ -856,9 +855,9 @@
db 6
signpost 0, 3, $0, MapRadioTower2FSignpost0Script
signpost 0, 5, $0, MapRadioTower2FSignpost1Script
- signpost 1, 9, $0, MapRadioTower2FSignpost4Script
- signpost 1, 10, $0, MapRadioTower2FSignpost4Script
- signpost 1, 11, $0, MapRadioTower2FSignpost4Script
+ signpost 1, 9, $0, RadioTower2FBookshelf
+ signpost 1, 10, $0, RadioTower2FBookshelf
+ signpost 1, 11, $0, RadioTower2FBookshelf
signpost 0, 13, $0, MapRadioTower2FSignpost5Script
; people-events
@@ -872,6 +871,5 @@
person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, $06d1
person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, $06d0
person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, $ffff
- person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, BuenaScript_0x5d775, $ffff
+ person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, $ffff
person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, $06cf
-; 0x5e53e
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -51,7 +51,7 @@
end
; 0x60046
-GentlemanScript_0x60046: ; 0x60046
+Director:
faceplayer
loadfont
checkevent EVENT_CLEARED_RADIO_TOWER
@@ -60,7 +60,6 @@
closetext
loadmovesprites
end
-; 0x60054
UnknownScript_0x60054: ; 0x60054
writetext UnknownText_0x60824
@@ -160,9 +159,8 @@
end
; 0x600fb
-RockerScript_0x600fb: ; 0x600fb
- jumptextfaceplayer UnknownText_0x608be
-; 0x600fe
+Ben:
+ jumptextfaceplayer BenText
ItemFragment_0x600fe: ; 0x600fe
db ULTRA_BALL, 1
@@ -176,9 +174,8 @@
jumptext UnknownText_0x608f9
; 0x60106
-MapRadioTower5FSignpost4Script: ; 0x60106
+RadioTower5FBookshelf:
jumpstd magazinebookshelf
-; 0x60109
MovementData_0x60109: ; 0x60109
step_left
@@ -450,11 +447,10 @@
done
; 0x608be
-UnknownText_0x608be: ; 0x608be
+BenText:
text "BEN: Do you listen"
line "to our music?"
done
-; 0x608e0
UnknownText_0x608e0: ; 0x608e0
text "5F DIRECTOR'S"
@@ -486,14 +482,14 @@
signpost 0, 3, $0, MapRadioTower5FSignpost0Script
signpost 0, 11, $0, MapRadioTower5FSignpost2Script
signpost 0, 15, $0, MapRadioTower5FSignpost2Script
- signpost 1, 16, $0, MapRadioTower5FSignpost4Script
- signpost 1, 17, $0, MapRadioTower5FSignpost4Script
+ signpost 1, 16, $0, RadioTower5FBookshelf
+ signpost 1, 17, $0, RadioTower5FBookshelf
; people-events
db 5
- person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, GentlemanScript_0x60046, $ffff
+ person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, $ffff
person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, $06ce
person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, $06ce
- person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, RockerScript_0x600fb, $06d0
+ person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, $06d0
person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, $07cd
; 0x60980
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -1,46 +1,39 @@
-RedsHouse1F_MapScriptHeader: ; 0x19ae9c
+RedsHouse1F_MapScriptHeader:
; trigger count
db 1
; triggers
- dw UnknownScript_0x19aea2, $0000
+ dw .Trigger, $0000
; callback count
db 0
-; 0x19aea2
-UnknownScript_0x19aea2: ; 0x19aea2
+.Trigger
end
-; 0x19aea3
-RedsMomScript_0x19aea3: ; 0x19aea3
+RedsMom:
faceplayer
loadfont
checkevent EVENT_MET_REDS_MOM
- iftrue UnknownScript_0x19aeb4
- writetext UnknownText_0x19aec0
+ iftrue .MetAlready
+ writetext RedsMomText1
closetext
loadmovesprites
setevent EVENT_MET_REDS_MOM
end
-; 0x19aeb4
-
-UnknownScript_0x19aeb4: ; 0x19aeb4
- writetext UnknownText_0x19af81
+.MetAlready
+ writetext RedsMomText2
closetext
loadmovesprites
end
-; 0x19aeba
-MapRedsHouse1FSignpost2Script: ; 0x19aeba
- jumptext UnknownText_0x19afe8
-; 0x19aebd
+RedsHouse1FTV:
+ jumptext RedsHouse1FTVText
-MapRedsHouse1FSignpost1Script: ; 0x19aebd
+RedsHouse1FBookshelf:
jumpstd picturebookshelf
-; 0x19aec0
-UnknownText_0x19aec0: ; 0x19aec0
+RedsMomText1:
text "Hi!"
para "RED's been away"
@@ -60,9 +53,8 @@
line "but I do worry"
cont "about him."
done
-; 0x19af81
-UnknownText_0x19af81: ; 0x19af81
+RedsMomText2:
text "I worry about RED"
line "getting hurt or"
@@ -74,16 +66,14 @@
para "do."
done
-; 0x19afe8
-UnknownText_0x19afe8: ; 0x19afe8
+RedsHouse1FTVText:
text "They have programs"
line "that aren't shown"
cont "in JOHTO…"
done
-; 0x19b017
-RedsHouse1F_MapEventHeader: ; 0x19b017
+RedsHouse1F_MapEventHeader:
; filler
db 0, 0
@@ -98,11 +88,10 @@
; signposts
db 3
- signpost 1, 0, $0, MapRedsHouse1FSignpost1Script
- signpost 1, 1, $0, MapRedsHouse1FSignpost1Script
- signpost 1, 2, $0, MapRedsHouse1FSignpost2Script
+ signpost 1, 0, $0, RedsHouse1FBookshelf
+ signpost 1, 1, $0, RedsHouse1FBookshelf
+ signpost 1, 2, $0, RedsHouse1FTV
; people-events
db 1
- person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMomScript_0x19aea3, $ffff
-; 0x19b048
+ person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, $ffff
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -1,25 +1,21 @@
-Route10North_MapScriptHeader: ; 0x1b207e
+Route10North_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1b2080
-MapRoute10NorthSignpost0Script: ; 0x1b2080
- jumptext UnknownText_0x1b2086
-; 0x1b2083
+PowerPlantSign:
+ jumptext PowerPlantSignText
-MapRoute10NorthSignpost1Script: ; 0x1b2083
+Route10PokeCenterSign:
jumpstd pokecentersign
-; 0x1b2086
-UnknownText_0x1b2086: ; 0x1b2086
+PowerPlantSignText:
text "KANTO POWER PLANT"
done
-; 0x1b2099
-Route10North_MapEventHeader: ; 0x1b2099
+Route10North_MapEventHeader:
; filler
db 0, 0
@@ -33,9 +29,8 @@
; signposts
db 2
- signpost 11, 5, $0, MapRoute10NorthSignpost0Script
- signpost 1, 12, $0, MapRoute10NorthSignpost1Script
+ signpost 11, 5, $0, PowerPlantSign
+ signpost 1, 12, $0, Route10PokeCenterSign
; people-events
db 0
-; 0x1b20b3
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -34,9 +34,9 @@
end
; 0x7f4ac
-UnknownScript_0x7f4ac: ; 0x7f4ac
+SuperRodHouseBookshelf:
+; unused
jumpstd picturebookshelf
-; 0x7f4af
UnknownText_0x7f4af: ; 0x7f4af
text "I'm the FISHING"
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -1,20 +1,17 @@
-Route16FuchsiaSpeechHouse_MapScriptHeader: ; 0x73371
+Route16FuchsiaSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x73373
-SuperNerdScript_0x73373: ; 0x73373
+SuperNerdScript_0x73373:
jumptextfaceplayer UnknownText_0x73379
-; 0x73376
-MapRoute16FuchsiaSpeechHouseSignpost1Script: ; 0x73376
+Route16FuchsiaSpeechHouseBookshelf:
jumpstd picturebookshelf
-; 0x73379
-UnknownText_0x73379: ; 0x73379
+UnknownText_0x73379:
text "If you cruise down"
line "CYCLING ROAD, you"
@@ -21,9 +18,8 @@
para "will end up in"
line "FUCHSIA CITY."
done
-; 0x733bc
-Route16FuchsiaSpeechHouse_MapEventHeader: ; 0x733bc
+Route16FuchsiaSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -37,10 +33,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapRoute16FuchsiaSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapRoute16FuchsiaSpeechHouseSignpost1Script
+ signpost 1, 0, $0, Route16FuchsiaSpeechHouseBookshelf
+ signpost 1, 1, $0, Route16FuchsiaSpeechHouseBookshelf
; people-events
db 1
person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, $ffff
-; 0x733e3
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -27,7 +27,7 @@
end
; 0x7b14a
-MapRoute26HealSpeechHouseSignpost1Script: ; 0x7b14a
+Route26HealHouseBookshelf: ; 0x7b14a
jumpstd picturebookshelf
; 0x7b14d
@@ -64,10 +64,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapRoute26HealSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapRoute26HealSpeechHouseSignpost1Script
+ signpost 1, 0, $0, Route26HealHouseBookshelf
+ signpost 1, 1, $0, Route26HealHouseBookshelf
; people-events
db 1
person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, $ffff
-; 0x7b1e2
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -1,49 +1,44 @@
-Route27SandstormHouse_MapScriptHeader: ; 0x7b392
+Route27SandstormHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7b394
-GrannyScript_0x7b394: ; 0x7b394
+SandstormHouseWoman:
faceplayer
loadfont
checkevent EVENT_GOT_TM37_SANDSTORM
- iftrue UnknownScript_0x7b3b7
+ iftrue .AlreadyGotItem
special Function718d
- writetext UnknownText_0x7b3c6
+ writetext SandstormHouseWomanText1
keeptextopen
- if_greater_than $95, UnknownScript_0x7b3aa
- jump UnknownScript_0x7b3bd
-; 0x7b3aa
+ if_greater_than $95, .Loyal
+ jump .Disloyal
-UnknownScript_0x7b3aa: ; 0x7b3aa
- writetext UnknownText_0x7b42b
+.Loyal
+ writetext SandstormHouseWomanLoyalText
keeptextopen
verbosegiveitem TM_37, 1
- iffalse UnknownScript_0x7b3bb
+ iffalse .Done
setevent EVENT_GOT_TM37_SANDSTORM
-UnknownScript_0x7b3b7: ; 0x7b3b7
- writetext UnknownText_0x7b48f
+.AlreadyGotItem
+ writetext SandstormHouseSandstormDescription
closetext
-UnknownScript_0x7b3bb: ; 0x7b3bb
+.Done
loadmovesprites
end
-; 0x7b3bd
-UnknownScript_0x7b3bd: ; 0x7b3bd
- writetext UnknownText_0x7b51f
+.Disloyal
+ writetext SandstormHouseWomanDisloyalText
closetext
loadmovesprites
end
-; 0x7b3c3
-MapRoute27SandstormHouseSignpost1Script: ; 0x7b3c3
+SandstormHouseBookshelf:
jumpstd magazinebookshelf
-; 0x7b3c6
-UnknownText_0x7b3c6: ; 0x7b3c6
+SandstormHouseWomanText1:
text "Where are you off"
line "to with #MON?"
@@ -55,9 +50,8 @@
para "Let me see…"
done
-; 0x7b42b
-UnknownText_0x7b42b: ; 0x7b42b
+SandstormHouseWomanLoyalText:
text "Ah! Your #MON"
line "trusts you very"
cont "much."
@@ -68,9 +62,8 @@
para "Here. A gift for"
line "your journey."
done
-; 0x7b48f
-UnknownText_0x7b48f: ; 0x7b48f
+SandstormHouseSandstormDescription:
text "TM37 happens to be"
line "SANDSTORM."
@@ -84,9 +77,8 @@
para "Use it if you"
line "dare. Good luck!"
done
-; 0x7b51f
-UnknownText_0x7b51f: ; 0x7b51f
+SandstormHouseWomanDisloyalText:
text "If it doesn't come"
line "to trust you some"
@@ -97,9 +89,8 @@
line "that binds #MON"
cont "and trainers."
done
-; 0x7b592
-Route27SandstormHouse_MapEventHeader: ; 0x7b592
+Route27SandstormHouse_MapEventHeader:
; filler
db 0, 0
@@ -113,10 +104,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapRoute27SandstormHouseSignpost1Script
- signpost 1, 1, $0, MapRoute27SandstormHouseSignpost1Script
+ signpost 1, 0, $0, SandstormHouseBookshelf
+ signpost 1, 1, $0, SandstormHouseBookshelf
; people-events
db 1
- person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, GrannyScript_0x7b394, $ffff
-; 0x7b5b9
+ person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, $ffff
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28FamousSpeechHouse.asm
@@ -1,54 +1,47 @@
-Route28FamousSpeechHouse_MapScriptHeader: ; 0x1ae651
+Route28FamousSpeechHouse_MapScriptHeader:
; trigger count
db 1
; triggers
- dw UnknownScript_0x1ae657, $0000
+ dw .Trigger, $0000
; callback count
db 0
-; 0x1ae657
-UnknownScript_0x1ae657: ; 0x1ae657
+.Trigger
end
-; 0x1ae658
-CooltrainerFScript_0x1ae658: ; 0x1ae658
+Celebrity:
faceplayer
loadfont
checkevent EVENT_GOT_TM47_STEEL_WING
- iftrue UnknownScript_0x1ae66f
- writetext UnknownText_0x1ae682
+ iftrue .AlreadyGotItem
+ writetext CelebrityText1
keeptextopen
verbosegiveitem TM_47, 1
- iffalse UnknownScript_0x1ae66d
+ iffalse .Done
setevent EVENT_GOT_TM47_STEEL_WING
-UnknownScript_0x1ae66d: ; 0x1ae66d
+.Done
loadmovesprites
end
-; 0x1ae66f
-
-UnknownScript_0x1ae66f: ; 0x1ae66f
- writetext UnknownText_0x1ae6f0
+.AlreadyGotItem
+ writetext CelebrityText2
closetext
loadmovesprites
end
-; 0x1ae675
-MoltresScript_0x1ae675: ; 0x1ae675
+CelebritysFearow:
loadfont
- writetext UnknownText_0x1ae752
+ writetext CelebritysFearowText
cry FEAROW
closetext
loadmovesprites
end
-; 0x1ae67f
-MapRoute28FamousSpeechHouseSignpost1Script: ; 0x1ae67f
+CelebrityHouseBookshelf:
jumpstd magazinebookshelf
-; 0x1ae682
-UnknownText_0x1ae682: ; 0x1ae682
+CelebrityText1:
text "Oh, dear."
line "You've found me."
@@ -59,9 +52,8 @@
line "for keeping my"
cont "secret. Please?"
done
-; 0x1ae6f0
-UnknownText_0x1ae6f0: ; 0x1ae6f0
+CelebrityText2:
text "It's tough being a"
line "top celebrity."
@@ -71,14 +63,12 @@
para "I just want to be"
line "left alone…"
done
-; 0x1ae752
-UnknownText_0x1ae752: ; 0x1ae752
+CelebritysFearowText:
text "FEAROW: Feero!"
done
-; 0x1ae762
-Route28FamousSpeechHouse_MapEventHeader: ; 0x1ae762
+Route28FamousSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -92,11 +82,10 @@
; signposts
db 2
- signpost 1, 0, $0, MapRoute28FamousSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapRoute28FamousSpeechHouseSignpost1Script
+ signpost 1, 0, $0, CelebrityHouseBookshelf
+ signpost 1, 1, $0, CelebrityHouseBookshelf
; people-events
db 2
- person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1ae658, $ffff
- person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, MoltresScript_0x1ae675, $ffff
-; 0x1ae796
+ person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, $ffff
+ person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, $ffff
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetSpeechHouse.asm
@@ -22,11 +22,10 @@
UnknownScript_0x9b860: ; 0x9b860
loadmovesprites
end
-; 0x9b862
-UnknownScript_0x9b862: ; 0x9b862
+Route2NuggetSpeechHouseBookshelf:
+; unused
jumpstd difficultbookshelf
-; 0x9b865
UnknownText_0x9b865: ; 0x9b865
text "Hi! Wow, I'm glad"
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -24,9 +24,8 @@
end
; 0x196d7f
-MapRoute30BerrySpeechHouseSignpost1Script: ; 0x196d7f
+Route30BerrySpeechHouseBookshelf:
jumpstd magazinebookshelf
-; 0x196d82
UnknownText_0x196d82: ; 0x196d82
text "You know, #MON"
@@ -62,10 +61,9 @@
; signposts
db 2
- signpost 1, 0, $0, MapRoute30BerrySpeechHouseSignpost1Script
- signpost 1, 1, $0, MapRoute30BerrySpeechHouseSignpost1Script
+ signpost 1, 0, $0, Route30BerrySpeechHouseBookshelf
+ signpost 1, 1, $0, Route30BerrySpeechHouseBookshelf
; people-events
db 1
person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, $ffff
-; 0x196e47
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -1,4 +1,4 @@
-Route32_MapScriptHeader: ; 0x19044f
+Route32_MapScriptHeader:
; trigger count
db 3
@@ -14,17 +14,14 @@
dbw 2, FriedaCallback
-UnknownScript_0x190460: ; 0x190460
+UnknownScript_0x190460:
end
-; 0x190461
-UnknownScript_0x190461: ; 0x190461
+UnknownScript_0x190461:
end
-; 0x190462
-UnknownScript_0x190462: ; 0x190462
+UnknownScript_0x190462:
end
-; 0x190463
FriedaCallback:
checkcode $b
@@ -36,9 +33,9 @@
appear $e
return
-CooltrainerMScript_0x19046f: ; 0x19046f
+CooltrainerMScript_0x19046f:
faceplayer
-UnknownScript_0x190470: ; 0x190470
+UnknownScript_0x190470:
loadfont
checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
iftrue UnknownScript_0x1904a5
@@ -50,16 +47,14 @@
closetext
loadmovesprites
end
-; 0x190489
-UnknownScript_0x190489: ; 0x190489
+UnknownScript_0x190489:
writetext UnknownText_0x190820
closetext
loadmovesprites
end
-; 0x19048f
-UnknownScript_0x19048f: ; 0x19048f
+UnknownScript_0x19048f:
writetext UnknownText_0x190925
keeptextopen
verbosegiveitem MIRACLE_SEED, 1
@@ -66,24 +61,21 @@
iffalse UnknownScript_0x1904a9
setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
jump UnknownScript_0x1904a5
-; 0x19049f
-UnknownScript_0x19049f: ; 0x19049f
+UnknownScript_0x19049f:
writetext UnknownText_0x1908b0
closetext
loadmovesprites
end
-; 0x1904a5
-UnknownScript_0x1904a5: ; 0x1904a5
+UnknownScript_0x1904a5:
writetext UnknownText_0x190a15
closetext
-UnknownScript_0x1904a9: ; 0x1904a9
+UnknownScript_0x1904a9:
loadmovesprites
end
-; 0x1904ab
-UnknownScript_0x1904ab: ; 0x1904ab
+UnknownScript_0x1904ab:
spriteface $9, $2
spriteface $0, $3
loadfont
@@ -98,9 +90,8 @@
applymovement $9, MovementData_0x19078c
applymovement $9, MovementData_0x19078e
end
-; 0x1904ce
-FisherScript_0x1904ce: ; 0x1904ce
+FisherScript_0x1904ce:
faceplayer
loadfont
checkevent EVENT_GOT_TM05_ROAR
@@ -110,23 +101,21 @@
verbosegiveitem TM_05, 1
iffalse UnknownScript_0x1904e7
setevent EVENT_GOT_TM05_ROAR
-UnknownScript_0x1904e3: ; 0x1904e3
+UnknownScript_0x1904e3:
writetext UnknownText_0x19118c
closetext
-UnknownScript_0x1904e7: ; 0x1904e7
+UnknownScript_0x1904e7:
loadmovesprites
end
-; 0x1904e9
-UnknownScript_0x1904e9: ; 0x1904e9
+UnknownScript_0x1904e9:
spriteface $b, $0
spriteface $0, $1
jump UnknownScript_0x1904f3
-; 0x1904f2
-FisherScript_0x1904f2: ; 0x1904f2
+FisherScript_0x1904f2:
faceplayer
-UnknownScript_0x1904f3: ; 0x1904f3
+UnknownScript_0x1904f3:
dotrigger $2
loadfont
writetext UnknownText_0x190a59
@@ -136,16 +125,14 @@
closetext
loadmovesprites
end
-; 0x190503
-UnknownScript_0x190503: ; 0x190503
+UnknownScript_0x190503:
writetext UnknownText_0x190afc
closetext
loadmovesprites
end
-; 0x190509
-TrainerCamperRoland: ; 0x190509
+TrainerCamperRoland:
; bit/flag number
dw $41a
@@ -163,9 +150,8 @@
; script when talk again
dw CamperRolandScript
-; 0x190515
-CamperRolandScript: ; 0x190515
+CamperRolandScript:
talkaftercancel
loadfont
writetext UnknownText_0x190faa
@@ -172,9 +158,8 @@
closetext
loadmovesprites
end
-; 0x19051d
-TrainerFisherJustin: ; 0x19051d
+TrainerFisherJustin:
; bit/flag number
dw $44e
@@ -192,9 +177,8 @@
; script when talk again
dw FisherJustinScript
-; 0x190529
-FisherJustinScript: ; 0x190529
+FisherJustinScript:
talkaftercancel
loadfont
writetext UnknownText_0x190b4e
@@ -201,9 +185,8 @@
closetext
loadmovesprites
end
-; 0x190531
-TrainerFisherRalph1: ; 0x190531
+TrainerFisherRalph1:
; bit/flag number
dw $44f
@@ -221,9 +204,8 @@
; script when talk again
dw FisherRalph1Script
-; 0x19053d
-FisherRalph1Script: ; 0x19053d
+FisherRalph1Script:
writecode $17, $11
talkaftercancel
loadfont
@@ -240,11 +222,10 @@
setevent $0277
scall UnknownScript_0x1905f7
jump UnknownScript_0x190569
-; 0x190566
-UnknownScript_0x190566: ; 0x190566
+UnknownScript_0x190566:
scall UnknownScript_0x1905fb
-UnknownScript_0x190569: ; 0x190569
+UnknownScript_0x190569:
askforphonenumber $11
if_equal $1, UnknownScript_0x19060b
if_equal $2, UnknownScript_0x190607
@@ -251,9 +232,8 @@
trainertotext FISHER, RALPH1, $0
scall UnknownScript_0x1905ff
jump UnknownScript_0x190603
-; 0x19057d
-UnknownScript_0x19057d: ; 0x19057d
+UnknownScript_0x19057d:
scall UnknownScript_0x19060f
winlosstext FisherRalph1BeatenText, $0000
copybytetovar wd9fb
@@ -262,19 +242,19 @@
if_equal $2, UnknownScript_0x1905a8
if_equal $1, UnknownScript_0x1905ae
if_equal $0, UnknownScript_0x1905b4
-UnknownScript_0x19059c: ; 0x19059c
+UnknownScript_0x19059c:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1905e8
-UnknownScript_0x1905a2: ; 0x1905a2
+UnknownScript_0x1905a2:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1905db
-UnknownScript_0x1905a8: ; 0x1905a8
+UnknownScript_0x1905a8:
checkflag $004a
iftrue UnknownScript_0x1905ce
-UnknownScript_0x1905ae: ; 0x1905ae
+UnknownScript_0x1905ae:
checkflag $0048
iftrue UnknownScript_0x1905c1
-UnknownScript_0x1905b4: ; 0x1905b4
+UnknownScript_0x1905b4:
loadtrainer FISHER, RALPH1
startbattle
returnafterbattle
@@ -281,9 +261,8 @@
loadvar wd9fb, $1
clearflag $006d
end
-; 0x1905c1
-UnknownScript_0x1905c1: ; 0x1905c1
+UnknownScript_0x1905c1:
loadtrainer FISHER, RALPH2
startbattle
returnafterbattle
@@ -290,9 +269,8 @@
loadvar wd9fb, $2
clearflag $006d
end
-; 0x1905ce
-UnknownScript_0x1905ce: ; 0x1905ce
+UnknownScript_0x1905ce:
loadtrainer FISHER, RALPH3
startbattle
returnafterbattle
@@ -299,9 +277,8 @@
loadvar wd9fb, $3
clearflag $006d
end
-; 0x1905db
-UnknownScript_0x1905db: ; 0x1905db
+UnknownScript_0x1905db:
loadtrainer FISHER, RALPH4
startbattle
returnafterbattle
@@ -308,59 +285,49 @@
loadvar wd9fb, $4
clearflag $006d
end
-; 0x1905e8
-UnknownScript_0x1905e8: ; 0x1905e8
+UnknownScript_0x1905e8:
loadtrainer FISHER, RALPH5
startbattle
returnafterbattle
clearflag $006d
end
-; 0x1905f1
-UnknownScript_0x1905f1: ; 0x1905f1
+UnknownScript_0x1905f1:
writetext UnknownText_0x190c37
closetext
loadmovesprites
end
-; 0x1905f7
-UnknownScript_0x1905f7: ; 0x1905f7
+UnknownScript_0x1905f7:
jumpstd asknumber1m
end
-; 0x1905fb
-UnknownScript_0x1905fb: ; 0x1905fb
+UnknownScript_0x1905fb:
jumpstd asknumber2m
end
-; 0x1905ff
-UnknownScript_0x1905ff: ; 0x1905ff
+UnknownScript_0x1905ff:
jumpstd registerednumberm
end
-; 0x190603
-UnknownScript_0x190603: ; 0x190603
+UnknownScript_0x190603:
jumpstd numberacceptedm
end
-; 0x190607
-UnknownScript_0x190607: ; 0x190607
+UnknownScript_0x190607:
jumpstd numberdeclinedm
end
-; 0x19060b
-UnknownScript_0x19060b: ; 0x19060b
+UnknownScript_0x19060b:
jumpstd phonefullm
end
-; 0x19060f
-UnknownScript_0x19060f: ; 0x19060f
+UnknownScript_0x19060f:
jumpstd rematchm
end
-; 0x190613
-TrainerFisherHenry: ; 0x190613
+TrainerFisherHenry:
; bit/flag number
dw $452
@@ -378,9 +345,8 @@
; script when talk again
dw FisherHenryScript
-; 0x19061f
-FisherHenryScript: ; 0x19061f
+FisherHenryScript:
talkaftercancel
loadfont
writetext UnknownText_0x190df2
@@ -387,9 +353,8 @@
closetext
loadmovesprites
end
-; 0x190627
-TrainerPicnickerLiz1: ; 0x190627
+TrainerPicnickerLiz1:
; bit/flag number
dw $47e
@@ -407,9 +372,8 @@
; script when talk again
dw PicnickerLiz1Script
-; 0x190633
-PicnickerLiz1Script: ; 0x190633
+PicnickerLiz1Script:
writecode $17, $12
talkaftercancel
loadfont
@@ -424,11 +388,10 @@
setevent $0279
scall UnknownScript_0x1906e1
jump UnknownScript_0x190659
-; 0x190656
-UnknownScript_0x190656: ; 0x190656
+UnknownScript_0x190656:
scall UnknownScript_0x1906e5
-UnknownScript_0x190659: ; 0x190659
+UnknownScript_0x190659:
askforphonenumber $12
if_equal $1, UnknownScript_0x1906f5
if_equal $2, UnknownScript_0x1906f1
@@ -435,9 +398,8 @@
trainertotext PICNICKER, LIZ1, $0
scall UnknownScript_0x1906e9
jump UnknownScript_0x1906ed
-; 0x19066d
-UnknownScript_0x19066d: ; 0x19066d
+UnknownScript_0x19066d:
scall UnknownScript_0x1906f9
winlosstext PicnickerLiz1BeatenText, $0000
copybytetovar wd9fc
@@ -446,19 +408,19 @@
if_equal $2, UnknownScript_0x190698
if_equal $1, UnknownScript_0x19069e
if_equal $0, UnknownScript_0x1906a4
-UnknownScript_0x19068c: ; 0x19068c
+UnknownScript_0x19068c:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1906d8
-UnknownScript_0x190692: ; 0x190692
+UnknownScript_0x190692:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1906cb
-UnknownScript_0x190698: ; 0x190698
+UnknownScript_0x190698:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x1906be
-UnknownScript_0x19069e: ; 0x19069e
+UnknownScript_0x19069e:
checkflag $0048
iftrue UnknownScript_0x1906b1
-UnknownScript_0x1906a4: ; 0x1906a4
+UnknownScript_0x1906a4:
loadtrainer PICNICKER, LIZ1
startbattle
returnafterbattle
@@ -465,9 +427,8 @@
loadvar wd9fc, $1
clearflag $006e
end
-; 0x1906b1
-UnknownScript_0x1906b1: ; 0x1906b1
+UnknownScript_0x1906b1:
loadtrainer PICNICKER, LIZ2
startbattle
returnafterbattle
@@ -474,9 +435,8 @@
loadvar wd9fc, $2
clearflag $006e
end
-; 0x1906be
-UnknownScript_0x1906be: ; 0x1906be
+UnknownScript_0x1906be:
loadtrainer PICNICKER, LIZ3
startbattle
returnafterbattle
@@ -483,9 +443,8 @@
loadvar wd9fc, $3
clearflag $006e
end
-; 0x1906cb
-UnknownScript_0x1906cb: ; 0x1906cb
+UnknownScript_0x1906cb:
loadtrainer PICNICKER, LIZ4
startbattle
returnafterbattle
@@ -492,52 +451,43 @@
loadvar wd9fc, $4
clearflag $006e
end
-; 0x1906d8
-UnknownScript_0x1906d8: ; 0x1906d8
+UnknownScript_0x1906d8:
loadtrainer PICNICKER, LIZ5
startbattle
returnafterbattle
clearflag $006e
end
-; 0x1906e1
-UnknownScript_0x1906e1: ; 0x1906e1
+UnknownScript_0x1906e1:
jumpstd asknumber1f
end
-; 0x1906e5
-UnknownScript_0x1906e5: ; 0x1906e5
+UnknownScript_0x1906e5:
jumpstd asknumber2f
end
-; 0x1906e9
-UnknownScript_0x1906e9: ; 0x1906e9
+UnknownScript_0x1906e9:
jumpstd registerednumberf
end
-; 0x1906ed
-UnknownScript_0x1906ed: ; 0x1906ed
+UnknownScript_0x1906ed:
jumpstd numberacceptedf
end
-; 0x1906f1
-UnknownScript_0x1906f1: ; 0x1906f1
+UnknownScript_0x1906f1:
jumpstd numberdeclinedf
end
-; 0x1906f5
-UnknownScript_0x1906f5: ; 0x1906f5
+UnknownScript_0x1906f5:
jumpstd phonefullf
end
-; 0x1906f9
-UnknownScript_0x1906f9: ; 0x1906f9
+UnknownScript_0x1906f9:
jumpstd rematchf
end
-; 0x1906fd
-TrainerYoungsterAlbert: ; 0x1906fd
+TrainerYoungsterAlbert:
; bit/flag number
dw $5ab
@@ -555,9 +505,8 @@
; script when talk again
dw YoungsterAlbertScript
-; 0x190709
-YoungsterAlbertScript: ; 0x190709
+YoungsterAlbertScript:
talkaftercancel
loadfont
writetext UnknownText_0x190e82
@@ -564,9 +513,8 @@
closetext
loadmovesprites
end
-; 0x190711
-TrainerYoungsterGordon: ; 0x190711
+TrainerYoungsterGordon:
; bit/flag number
dw $5ac
@@ -584,9 +532,8 @@
; script when talk again
dw YoungsterGordonScript
-; 0x19071d
-YoungsterGordonScript: ; 0x19071d
+YoungsterGordonScript:
talkaftercancel
loadfont
writetext UnknownText_0x190f49
@@ -593,9 +540,8 @@
closetext
loadmovesprites
end
-; 0x190725
-TrainerBird_keeperPeter: ; 0x190725
+TrainerBird_keeperPeter:
; bit/flag number
dw $407
@@ -613,9 +559,8 @@
; script when talk again
dw Bird_keeperPeterScript
-; 0x190731
-Bird_keeperPeterScript: ; 0x190731
+Bird_keeperPeterScript:
talkaftercancel
loadfont
writetext UnknownText_0x1910d4
@@ -622,7 +567,6 @@
closetext
loadmovesprites
end
-; 0x190739
FriedaScript:
faceplayer
@@ -660,65 +604,53 @@
loadmovesprites
end
-ItemFragment_0x190773: ; 0x190773
+ItemFragment_0x190773:
db GREAT_BALL, 1
-; 0x190775
-ItemFragment_0x190775: ; 0x190775
+ItemFragment_0x190775:
db REPEL, 1
-; 0x190777
-MapRoute32Signpost0Script: ; 0x190777
- jumptext UnknownText_0x19133a
-; 0x19077a
+Route32Sign:
+ jumptext Route32SignText
-MapRoute32Signpost1Script: ; 0x19077a
- jumptext UnknownText_0x19135e
-; 0x19077d
+Route32RuinsSign:
+ jumptext Route32RuinsSignText
-MapRoute32Signpost2Script: ; 0x19077d
- jumptext UnknownText_0x19137b
-; 0x190780
+Route32UnionCaveSign:
+ jumptext Route32UnionCaveSignText
-MapRoute32Signpost3Script: ; 0x190780
+Route32PokeCenterSign:
jumpstd pokecentersign
-; 0x190783
-MapRoute32SignpostItem4: ; 0x190783
+MapRoute32SignpostItem4:
dw $00a5
db GREAT_BALL
-; 0x190786
-MapRoute32SignpostItem5: ; 0x190786
+MapRoute32SignpostItem5:
dw $00a6
db SUPER_POTION
-; 0x190789
-MovementData_0x190789: ; 0x190789
+MovementData_0x190789:
step_up
step_up
step_end
-; 0x19078c
-MovementData_0x19078c: ; 0x19078c
+MovementData_0x19078c:
step_down
step_end
-; 0x19078e
-MovementData_0x19078e: ; 0x19078e
+MovementData_0x19078e:
step_right
step_end
-; 0x190790
-UnknownText_0x190790: ; 0x190790
+UnknownText_0x190790:
text "Wait up!"
line "What's the hurry?"
done
-; 0x1907ab
-UnknownText_0x1907ab: ; 0x1907ab
+UnknownText_0x1907ab:
text $52, ", right?"
line "Some guy wearing"
@@ -731,10 +663,9 @@
para "you at the #MON"
line "CENTER."
done
-; 0x190820
; might not be referenced anywhere
-UnknownText_0x190820: ; 0x190820
+UnknownText_0x190820:
text "Have you gone to"
line "SPROUT TOWER?"
@@ -748,9 +679,8 @@
line "trainers. Go to"
cont "SPROUT TOWER!"
done
-; 0x1908b0
-UnknownText_0x1908b0: ; 0x1908b0
+UnknownText_0x1908b0:
text "Have you gone to"
line "the #MON GYM?"
@@ -762,9 +692,8 @@
line "passage for all"
cont "trainers!"
done
-; 0x190925
-UnknownText_0x190925: ; 0x190925
+UnknownText_0x190925:
text "You have some good"
line "#MON there."
@@ -788,9 +717,8 @@
line "power of grass-"
cont "type moves."
done
-; 0x190a15
-UnknownText_0x190a15: ; 0x190a15
+UnknownText_0x190a15:
text "Your experiences"
line "in VIOLET CITY"
@@ -797,9 +725,8 @@
para "should be useful"
line "for your journey."
done
-; 0x190a59
-UnknownText_0x190a59: ; 0x190a59
+UnknownText_0x190a59:
text "How would you like"
line "to have this"
@@ -811,35 +738,30 @@
para "You'll want this!"
done
-; 0x190acf
-UnknownText_0x190acf: ; 0x190acf
+UnknownText_0x190acf:
text "Tch! I thought"
line "kids these days"
cont "were loaded…"
done
-; 0x190afc
-UnknownText_0x190afc: ; 0x190afc
+UnknownText_0x190afc:
text "You don't want it?"
line "Then scram. Shoo!"
done
-; 0x190b21
-FisherJustinSeenText: ; 0x190b21
+FisherJustinSeenText:
text "Whoa!"
para "You made me lose"
line "that fish!"
done
-; 0x190b44
-FisherJustinBeatenText: ; 0x190b44
+FisherJustinBeatenText:
text "Sploosh!"
done
-; 0x190b4e
-UnknownText_0x190b4e: ; 0x190b4e
+UnknownText_0x190b4e:
text "Calm, collected…"
line "The essence of"
@@ -846,9 +768,8 @@
para "fishing and #-"
line "MON is the same."
done
-; 0x190b8f
-FisherRalph1SeenText: ; 0x190b8f
+FisherRalph1SeenText:
text "I'm really good at"
line "both fishing and"
cont "#MON."
@@ -856,15 +777,13 @@
para "I'm not about to"
line "lose to any kid!"
done
-; 0x190bda
-FisherRalph1BeatenText: ; 0x190bda
+FisherRalph1BeatenText:
text "Tch! I tried to"
line "rush things…"
done
-; 0x190bf8
-UnknownText_0x190bf8: ; 0x190bf8
+UnknownText_0x190bf8:
text "Fishing is a life-"
line "long passion."
@@ -871,9 +790,8 @@
para "#MON are life-"
line "long friends!"
done
-; 0x190c37
-UnknownText_0x190c37: ; 0x190c37
+UnknownText_0x190c37:
text "One, two, three…"
line "Muahahaha, what a"
@@ -883,11 +801,10 @@
para "and catch as many"
line "as you can, kid!"
done
-; 0x190c9c
; --- start a segment of possibly unused texts
-UnknownText_0x190c9c: ; 0x190c9c
+UnknownText_0x190c9c:
text "I keep catching"
line "the same #MON…"
@@ -895,35 +812,30 @@
line "will turn things"
cont "around for me."
done
-; 0x190ceb
-UnknownText_0x190ceb: ; 0x190ceb
+UnknownText_0x190ceb:
text "Nothing ever goes"
line "right for me now…"
done
-; 0x190d10
-UnknownText_0x190d10: ; 0x190d10
+UnknownText_0x190d10:
text "How come the guy"
line "next to me catches"
cont "good #MON?"
done
-; 0x190d40
-UnknownText_0x190d40: ; 0x190d40
+UnknownText_0x190d40:
text "Heh, I'm on a roll"
line "today. How about a"
cont "battle, kid?"
done
-; 0x190d73
-UnknownText_0x190d73: ; 0x190d73
+UnknownText_0x190d73:
text "Oof. I wasn't"
line "lucky that time."
done
-; 0x190d92
-UnknownText_0x190d92: ; 0x190d92
+UnknownText_0x190d92:
text "You have to have a"
line "good ROD if you"
@@ -930,22 +842,19 @@
para "want to catch good"
line "#MON."
done
-; 0x190dcf
; --- end a segment of possibly unused texts
-FisherHenrySeenText: ; 0x190dcf
+FisherHenrySeenText:
text "My #MON?"
line "Freshly caught!"
done
-; 0x190de9
-FisherHenryBeatenText: ; 0x190de9
+FisherHenryBeatenText:
text "SPLASH?"
done
-; 0x190df2
-UnknownText_0x190df2: ; 0x190df2
+UnknownText_0x190df2:
text "Freshly caught"
line "#MON are no"
@@ -952,9 +861,8 @@
para "match for properly"
line "raised ones."
done
-; 0x190e2e
-YoungsterAlbertSeenText: ; 0x190e2e
+YoungsterAlbertSeenText:
text "I haven't seen you"
line "around before."
@@ -961,14 +869,12 @@
para "So you think you"
line "are pretty tough?"
done
-; 0x190e73
-YoungsterAlbertBeatenText: ; 0x190e73
+YoungsterAlbertBeatenText:
text "You're strong!"
done
-; 0x190e82
-UnknownText_0x190e82: ; 0x190e82
+UnknownText_0x190e82:
text "I'm going to try"
line "to be the best"
cont "with my favorites."
@@ -977,9 +883,8 @@
line "same tough #MON"
cont "as everyone else."
done
-; 0x190ee8
-YoungsterGordonSeenText: ; 0x190ee8
+YoungsterGordonSeenText:
text "I found some good"
line "#MON in the"
cont "grass!"
@@ -987,40 +892,34 @@
para "I think they'll do"
line "it for me!"
done
-; 0x190f2b
-YoungsterGordonBeatenText: ; 0x190f2b
+YoungsterGordonBeatenText:
text "Darn. I thought I"
line "could win."
done
-; 0x190f49
-UnknownText_0x190f49: ; 0x190f49
+UnknownText_0x190f49:
text "The grass is full"
line "of clingy things."
done
-; 0x190f6e
-CamperRolandSeenText: ; 0x190f6e
+CamperRolandSeenText:
text "That glance…"
line "It's intriguing."
done
-; 0x190f8c
-CamperRolandBeatenText: ; 0x190f8c
+CamperRolandBeatenText:
text "Hmmm. This is"
line "disappointing."
done
-; 0x190faa
-UnknownText_0x190faa: ; 0x190faa
+UnknownText_0x190faa:
text "If you don't want"
line "to battle, just"
cont "avoid eye contact."
done
-; 0x190fdf
-PicnickerLiz1SeenText: ; 0x190fdf
+PicnickerLiz1SeenText:
text "Uh-huh. Yeah, and"
line "you know…"
@@ -1030,50 +929,43 @@
para "Oh, all right. But"
line "make it fast."
done
-; 0x19103e
-PicnickerLiz1BeatenText: ; 0x19103e
+PicnickerLiz1BeatenText:
text "Oh! I've got to"
line "relieve my anger!"
done
-; 0x191060
-UnknownText_0x191060: ; 0x191060
+UnknownText_0x191060:
text "I was having a"
line "nice chat too."
done
-; 0x19107f
-Bird_keeperPeterSeenText: ; 0x19107f
+Bird_keeperPeterSeenText:
text "That BADGE! It's"
line "from VIOLET CITY!"
para "You beat FALKNER?"
done
-; 0x1910b4
-Bird_keeperPeterBeatenText: ; 0x1910b4
+Bird_keeperPeterBeatenText:
text "I know what my"
line "weaknesses are."
done
-; 0x1910d4
-UnknownText_0x1910d4: ; 0x1910d4
+UnknownText_0x1910d4:
text "I should train"
line "again at the GYM"
cont "in VIOLET CITY."
done
-; 0x191105
; possibly unused
-UnknownText_0x191105: ; 0x191105
+UnknownText_0x191105:
text "The fishermen"
line "yelled at me for"
cont "bugging them…"
done
-; 0x191133
-UnknownText_0x191133: ; 0x191133
+UnknownText_0x191133:
text "WROOOOAR!"
line "PEOPLE RUN WHEN I"
@@ -1083,9 +975,8 @@
para "THAT PLEASES ME!"
line "NOW TAKE THIS!"
done
-; 0x19118c
-UnknownText_0x19118c: ; 0x19118c
+UnknownText_0x19118c:
text "WROOOAR!"
line "IT'S ROAR!"
@@ -1092,7 +983,6 @@
para "EVEN #MON RUN"
line "FROM A GOOD ROAR!"
done
-; 0x1911c1
MeetFriedaText:
text "FRIEDA: Yahoo!"
@@ -1142,27 +1032,24 @@
line "when it's not!"
done
-UnknownText_0x19133a: ; 0x19133a
+Route32SignText:
text "ROUTE 32"
para "VIOLET CITY -"
line "AZALEA TOWN"
done
-; 0x19135e
-UnknownText_0x19135e: ; 0x19135e
+Route32RuinsSignText:
text "RUINS OF ALPH"
line "EAST ENTRANCE"
done
-; 0x19137b
-UnknownText_0x19137b: ; 0x19137b
+Route32UnionCaveSignText:
text "UNION CAVE"
line "AHEAD"
done
-; 0x19138d
-Route32_MapEventHeader: ; 0x19138d
+Route32_MapEventHeader:
; filler
db 0, 0
@@ -1180,10 +1067,10 @@
; signposts
db 6
- signpost 5, 13, $0, MapRoute32Signpost0Script
- signpost 1, 9, $0, MapRoute32Signpost1Script
- signpost 84, 10, $0, MapRoute32Signpost2Script
- signpost 73, 12, $0, MapRoute32Signpost3Script
+ signpost 5, 13, $0, Route32Sign
+ signpost 1, 9, $0, Route32RuinsSign
+ signpost 84, 10, $0, Route32UnionCaveSign
+ signpost 73, 12, $0, Route32PokeCenterSign
signpost 67, 12, $7, MapRoute32SignpostItem4
signpost 40, 11, $7, MapRoute32SignpostItem5
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -95,7 +95,7 @@
end
; 0x9cf35
-MapRoute39FarmhouseSignpost1Script: ; 0x9cf35
+FarmhouseBookshelf:
jumpstd picturebookshelf
; 0x9cf38
@@ -223,8 +223,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapRoute39FarmhouseSignpost1Script
- signpost 1, 1, $0, MapRoute39FarmhouseSignpost1Script
+ signpost 1, 0, $0, FarmhouseBookshelf
+ signpost 1, 1, $0, FarmhouseBookshelf
; people-events
db 2
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -198,7 +198,7 @@
jumptext UnknownText_0x1a6767
; 0x1a6216
-RockScript_0x1a6216: ; 0x1a6216
+Route40Rock: ; 0x1a6216
jumpstd smashrock
; 0x1a6219
@@ -450,9 +450,9 @@
person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, $ffff
person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, $ffff
person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, $ffff
- person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff
- person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff
- person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff
+ person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff
+ person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff
+ person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff
person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, $ffff
person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, $075e
person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, $ffff
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -296,9 +296,9 @@
end
; 0x1a6909
-UnknownScript_0x1a6909: ; 0x1a6909
+Route41Rock:
+; unused
jumpstd smashrock
-; 0x1a690c
MapRoute41SignpostItem0: ; 0x1a690c
dw $00ac
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagSpeechHouse.asm
@@ -28,9 +28,8 @@
jumptextfaceplayer UnknownText_0x18b6de
; 0x18b652
-MapRoute5CleanseTagSpeechHouseSignpost1Script: ; 0x18b652
+HouseForSaleBookshelf:
jumpstd difficultbookshelf
-; 0x18b655
UnknownText_0x18b655: ; 0x18b655
text "Eeyaaaah!"
@@ -77,11 +76,10 @@
; signposts
db 2
- signpost 1, 0, $0, MapRoute5CleanseTagSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapRoute5CleanseTagSpeechHouseSignpost1Script
+ signpost 1, 0, $0, HouseForSaleBookshelf
+ signpost 1, 1, $0, HouseForSaleBookshelf
; people-events
db 2
person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, $ffff
person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, $ffff
-; 0x18b778
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -1,43 +1,36 @@
-SafariZoneWardensHome_MapScriptHeader: ; 0x1965c4
+SafariZoneWardensHome_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1965c6
-LassScript_0x1965c6: ; 0x1965c6
+WardensGranddaughter:
faceplayer
loadfont
checkevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER
- iftrue UnknownScript_0x1965d7
- writetext UnknownText_0x1965e6
+ iftrue .AlreadyMet
+ writetext WardensGranddaughterText1
closetext
loadmovesprites
setevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER
end
-; 0x1965d7
-
-UnknownScript_0x1965d7: ; 0x1965d7
- writetext UnknownText_0x196691
+.AlreadyMet
+ writetext WardensGranddaughterText2
closetext
loadmovesprites
end
-; 0x1965dd
-MapSafariZoneWardensHomeSignpost2Script: ; 0x1965dd
- jumptext UnknownText_0x1966ea
-; 0x1965e0
+WardenPhoto:
+ jumptext WardenPhotoText
-MapSafariZoneWardensHomeSignpost3Script: ; 0x1965e0
- jumptext UnknownText_0x196726
-; 0x1965e3
+SafariZonePhoto:
+ jumptext SafariZonePhotoText
-MapSafariZoneWardensHomeSignpost1Script: ; 0x1965e3
+WardensHomeBookshelf:
jumpstd picturebookshelf
-; 0x1965e6
-UnknownText_0x1965e6: ; 0x1965e6
+WardensGranddaughterText1:
text "My grandpa is the"
line "SAFARI ZONE WAR-"
cont "DEN."
@@ -54,9 +47,8 @@
line "SAFARI ZONE just"
cont "like that."
done
-; 0x196691
-UnknownText_0x196691: ; 0x196691
+WardensGranddaughterText2:
text "Many people were"
line "disappointed that"
@@ -64,9 +56,8 @@
line "down, but Grandpa"
cont "is so stubborn…"
done
-; 0x1966ea
-UnknownText_0x1966ea: ; 0x1966ea
+WardenPhotoText:
text "It's a photo of a"
line "grinning old man"
@@ -73,9 +64,8 @@
para "who's surrounded"
line "by #MON."
done
-; 0x196726
-UnknownText_0x196726: ; 0x196726
+SafariZonePhotoText:
text "It's a photo of a"
line "huge grassy plain"
@@ -82,9 +72,8 @@
para "with rare #MON"
line "frolicking in it."
done
-; 0x19676b
-SafariZoneWardensHome_MapEventHeader: ; 0x19676b
+SafariZoneWardensHome_MapEventHeader:
; filler
db 0, 0
@@ -98,12 +87,11 @@
; signposts
db 4
- signpost 1, 0, $0, MapSafariZoneWardensHomeSignpost1Script
- signpost 1, 1, $0, MapSafariZoneWardensHomeSignpost1Script
- signpost 0, 7, $0, MapSafariZoneWardensHomeSignpost2Script
- signpost 0, 9, $0, MapSafariZoneWardensHomeSignpost3Script
+ signpost 1, 0, $0, WardensHomeBookshelf
+ signpost 1, 1, $0, WardensHomeBookshelf
+ signpost 0, 7, $0, WardenPhoto
+ signpost 0, 9, $0, SafariZonePhoto
; people-events
db 1
- person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, LassScript_0x1965c6, $ffff
-; 0x19679c
+ person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, $ffff
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -1,4 +1,4 @@
-SaffronCity_MapScriptHeader: ; 0x199321
+SaffronCity_MapScriptHeader:
; trigger count
db 0
@@ -8,14 +8,12 @@
; callbacks
dbw 5, UnknownScript_0x199326
-; 0x199326
-UnknownScript_0x199326: ; 0x199326
+UnknownScript_0x199326:
setflag $003c
return
-; 0x19932a
-LassScript_0x19932a: ; 0x19932a
+LassScript_0x19932a:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -24,16 +22,14 @@
closetext
loadmovesprites
end
-; 0x199338
-UnknownScript_0x199338: ; 0x199338
+UnknownScript_0x199338:
writetext UnknownText_0x19940d
closetext
loadmovesprites
end
-; 0x19933e
-PokefanMScript_0x19933e: ; 0x19933e
+PokefanMScript_0x19933e:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -42,24 +38,20 @@
closetext
loadmovesprites
end
-; 0x19934c
-UnknownScript_0x19934c: ; 0x19934c
+UnknownScript_0x19934c:
writetext UnknownText_0x1994ae
closetext
loadmovesprites
end
-; 0x199352
-CooltrainerMScript_0x199352: ; 0x199352
+CooltrainerMScript_0x199352:
jumptextfaceplayer UnknownText_0x1994fe
-; 0x199355
-CooltrainerFScript_0x199355: ; 0x199355
+CooltrainerFScript_0x199355:
jumptextfaceplayer UnknownText_0x19958e
-; 0x199358
-FisherScript_0x199358: ; 0x199358
+FisherScript_0x199358:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -68,60 +60,47 @@
closetext
loadmovesprites
end
-; 0x199366
-UnknownScript_0x199366: ; 0x199366
+UnknownScript_0x199366:
writetext UnknownText_0x19964b
closetext
loadmovesprites
end
-; 0x19936c
-YoungsterScript_0x19936c: ; 0x19936c
+YoungsterScript_0x19936c:
jumptextfaceplayer UnknownText_0x1996a5
-; 0x19936f
-YoungsterScript_0x19936f: ; 0x19936f
+YoungsterScript_0x19936f:
jumptextfaceplayer UnknownText_0x1996e5
-; 0x199372
-LassScript_0x199372: ; 0x199372
+LassScript_0x199372:
jumptextfaceplayer UnknownText_0x199745
-; 0x199375
-MapSaffronCitySignpost0Script: ; 0x199375
- jumptext UnknownText_0x1997b7
-; 0x199378
+SaffronCitySign:
+ jumptext SaffronCitySignText
-MapSaffronCitySignpost1Script: ; 0x199378
- jumptext UnknownText_0x1997e6
-; 0x19937b
+SaffronGymSign:
+ jumptext SaffronGymSignText
-MapSaffronCitySignpost2Script: ; 0x19937b
- jumptext UnknownText_0x199829
-; 0x19937e
+FightingDojoSign:
+ jumptext FightingDojoSignText
-MapSaffronCitySignpost3Script: ; 0x19937e
- jumptext UnknownText_0x19984a
-; 0x199381
+SilphCoSign:
+ jumptext SilphCoSignText
-MapSaffronCitySignpost4Script: ; 0x199381
- jumptext UnknownText_0x199865
-; 0x199384
+MrPsychicsHouseSign:
+ jumptext MrPsychicsHouseSignText
-MapSaffronCitySignpost5Script: ; 0x199384
- jumptext UnknownText_0x199879
-; 0x199387
+SaffronCityMagnetTrainStationSign:
+ jumptext SaffronCityMagnetTrainStationSignText
-MapSaffronCitySignpost6Script: ; 0x199387
+SaffronCityPokeCenterSign:
jumpstd pokecentersign
-; 0x19938a
-MapSaffronCitySignpost7Script: ; 0x19938a
+SaffronCityMartSign:
jumpstd martsign
-; 0x19938d
-UnknownText_0x19938d: ; 0x19938d
+UnknownText_0x19938d:
text "A little girl who"
line "is an expert at"
@@ -134,9 +113,8 @@
para "conversing with."
line "It's confusing."
done
-; 0x19940d
-UnknownText_0x19940d: ; 0x19940d
+UnknownText_0x19940d:
text "The COPYCAT girl"
line "looked unhappy."
@@ -144,9 +122,8 @@
line "her favorite #"
cont "DOLL--CLEFAIRY."
done
-; 0x199460
-UnknownText_0x199460: ; 0x199460
+UnknownText_0x199460:
text "You came out from"
line "JOHTO?"
@@ -154,9 +131,8 @@
line "home if the MAGNET"
cont "TRAIN's running."
done
-; 0x1994ae
-UnknownText_0x1994ae: ; 0x1994ae
+UnknownText_0x1994ae:
text "You came out from"
line "JOHTO?"
@@ -164,9 +140,8 @@
line "home by hopping on"
cont "the MAGNET TRAIN."
done
-; 0x1994fe
-UnknownText_0x1994fe: ; 0x1994fe
+UnknownText_0x1994fe:
text "I went to the GYM,"
line "raring for battles"
cont "against trainers…"
@@ -180,9 +155,8 @@
para "Boy, I was pretty"
line "embarrassed."
done
-; 0x19958e
-UnknownText_0x19958e: ; 0x19958e
+UnknownText_0x19958e:
text "This is SILPH CO.,"
line "famous for #MON"
cont "merchandise."
@@ -193,9 +167,8 @@
para "company because of"
line "that."
done
-; 0x1995fc
-UnknownText_0x1995fc: ; 0x1995fc
+UnknownText_0x1995fc:
text "Chew… Chew…"
para "I hear there's big"
@@ -204,9 +177,8 @@
para "Chew… Chew…"
done
-; 0x19964b
-UnknownText_0x19964b: ; 0x19964b
+UnknownText_0x19964b:
text "Chew… Chew…"
para "I hear there was"
@@ -216,9 +188,8 @@
para "Chew… Chew…"
line "Haaah, I'm full!"
done
-; 0x1996a5
-UnknownText_0x1996a5: ; 0x1996a5
+UnknownText_0x1996a5:
text "Going into an"
line "alley for the"
@@ -225,9 +196,8 @@
para "first time makes"
line "me sorta anxious."
done
-; 0x1996e5
-UnknownText_0x1996e5: ; 0x1996e5
+UnknownText_0x1996e5:
text "There's a place"
line "called TRAINER"
@@ -237,9 +207,8 @@
para "gather from all"
line "over the place."
done
-; 0x199745
-UnknownText_0x199745: ; 0x199745
+UnknownText_0x199745:
text "Our city was"
line "featured on a"
cont "radio program."
@@ -251,17 +220,15 @@
line "bit embarrassing"
cont "too."
done
-; 0x1997b7
-UnknownText_0x1997b7: ; 0x1997b7
+SaffronCitySignText:
text "SAFFRON CITY"
para "Shining, Golden"
line "Land of Commerce"
done
-; 0x1997e6
-UnknownText_0x1997e6: ; 0x1997e6
+SaffronGymSignText:
text "SAFFRON CITY"
line "#MON GYM"
cont "LEADER: SABRINA"
@@ -269,34 +236,29 @@
para "The Master of"
line "Psychic #MON!"
done
-; 0x199829
-UnknownText_0x199829: ; 0x199829
+FightingDojoSignText:
text "Everyone Welcome!"
line "FIGHTING DOJO"
done
-; 0x19984a
-UnknownText_0x19984a: ; 0x19984a
+SilphCoSignText:
text "SILPH CO."
line "OFFICE BUILDING"
done
-; 0x199865
-UnknownText_0x199865: ; 0x199865
+MrPsychicsHouseSignText:
text "MR.PSYCHIC'S"
line "HOUSE"
done
-; 0x199879
-UnknownText_0x199879: ; 0x199879
+SaffronCityMagnetTrainStationSignText:
text "SAFFRON CITY"
line "MAGNET TRAIN"
cont "STATION"
done
-; 0x19989c
-SaffronCity_MapEventHeader: ; 0x19989c
+SaffronCity_MapEventHeader:
; filler
db 0, 0
@@ -323,14 +285,14 @@
; signposts
db 8
- signpost 5, 21, $0, MapSaffronCitySignpost0Script
- signpost 5, 33, $0, MapSaffronCitySignpost1Script
- signpost 5, 25, $0, MapSaffronCitySignpost2Script
- signpost 21, 15, $0, MapSaffronCitySignpost3Script
- signpost 29, 25, $0, MapSaffronCitySignpost4Script
- signpost 5, 11, $0, MapSaffronCitySignpost5Script
- signpost 29, 10, $0, MapSaffronCitySignpost6Script
- signpost 11, 26, $0, MapSaffronCitySignpost7Script
+ signpost 5, 21, $0, SaffronCitySign
+ signpost 5, 33, $0, SaffronGymSign
+ signpost 5, 25, $0, FightingDojoSign
+ signpost 21, 15, $0, SilphCoSign
+ signpost 29, 25, $0, MrPsychicsHouseSign
+ signpost 5, 11, $0, SaffronCityMagnetTrainStationSign
+ signpost 29, 10, $0, SaffronCityPokeCenterSign
+ signpost 11, 26, $0, SaffronCityMartSign
; people-events
db 8
@@ -342,4 +304,3 @@
person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, $ffff
person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, $ffff
person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, $ffff
-; 0x19997d
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -1,4 +1,4 @@
-SilverCaveOutside_MapScriptHeader: ; 0x1b2042
+SilverCaveOutside_MapScriptHeader:
; trigger count
db 0
@@ -8,33 +8,26 @@
; callbacks
dbw 5, UnknownScript_0x1b2047
-; 0x1b2047
-UnknownScript_0x1b2047: ; 0x1b2047
+UnknownScript_0x1b2047:
setflag $004c
return
-; 0x1b204b
-MapSilverCaveOutsideSignpost0Script: ; 0x1b204b
+MtSilverPokeCenterSign:
jumpstd pokecentersign
-; 0x1b204e
-MapSilverCaveOutsideSignpost1Script: ; 0x1b204e
- jumptext UnknownText_0x1b2054
-; 0x1b2051
+MtSilverSign:
+ jumptext MtSilverSignText
-MapSilverCaveOutsideSignpostItem2: ; 0x1b2051
+MapSilverCaveOutsideSignpostItem2:
dw $00b8
db FULL_RESTORE
-
-; 0x1b2054
-UnknownText_0x1b2054: ; 0x1b2054
+MtSilverSignText:
text "MT.SILVER"
done
-; 0x1b205f
-SilverCaveOutside_MapEventHeader: ; 0x1b205f
+SilverCaveOutside_MapEventHeader:
; filler
db 0, 0
@@ -48,10 +41,9 @@
; signposts
db 3
- signpost 19, 24, $0, MapSilverCaveOutsideSignpost0Script
- signpost 13, 17, $0, MapSilverCaveOutsideSignpost1Script
+ signpost 19, 24, $0, MtSilverPokeCenterSign
+ signpost 13, 17, $0, MtSilverSign
signpost 25, 9, $7, MapSilverCaveOutsideSignpostItem2
; people-events
db 0
-; 0x1b207e
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -186,9 +186,8 @@
end
; 0x5a6a0
-BoulderScript_0x5a6a0: ; 0x5a6a0
+SlowpokeWellB1FBoulder:
jumpstd strengthboulder
-; 0x5a6a3
ItemFragment_0x5a6a3: ; 0x5a6a3
db SUPER_POTION, 1
@@ -430,6 +429,6 @@
person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, $06fb
person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, $06fb
person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, $0740
- person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x5a6a0, $ffff
+ person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, $ffff
person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, $0662
; 0x5ad09
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -130,9 +130,8 @@
db X_DEFEND, 1
; 0x5a01a
-BoulderScript_0x5a01a: ; 0x5a01a
+UnionCaveB1FBoulder:
jumpstd strengthboulder
-; 0x5a01d
HikerPhillipSeenText: ; 0x5a01d
text "It's been a while"
@@ -256,6 +255,6 @@
person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, $ffff
person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, $ffff
person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, $065e
- person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, BoulderScript_0x5a01a, $ffff
+ person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, $ffff
person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, $065f
; 0x5a308
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -1,4 +1,4 @@
-VermilionCity_MapScriptHeader: ; 0x1aa97a
+VermilionCity_MapScriptHeader:
; trigger count
db 0
@@ -8,22 +8,18 @@
; callbacks
dbw 5, UnknownScript_0x1aa97f
-; 0x1aa97f
-UnknownScript_0x1aa97f: ; 0x1aa97f
+UnknownScript_0x1aa97f:
setflag $003a
return
-; 0x1aa983
-TeacherScript_0x1aa983: ; 0x1aa983
+TeacherScript_0x1aa983:
jumptextfaceplayer UnknownText_0x1aaa15
-; 0x1aa986
-GrampsScript_0x1aa986: ; 0x1aa986
+GrampsScript_0x1aa986:
jumptextfaceplayer UnknownText_0x1aaa6f
-; 0x1aa989
-MachopScript_0x1aa989: ; 0x1aa989
+VermilionMachop:
loadfont
writetext UnknownText_0x1aaaca
cry MACHOP
@@ -35,13 +31,11 @@
closetext
loadmovesprites
end
-; 0x1aa99b
-SuperNerdScript_0x1aa99b: ; 0x1aa99b
+SuperNerdScript_0x1aa99b:
jumptextfaceplayer UnknownText_0x1aab1a
-; 0x1aa99e
-BigSnorlaxScript_0x1aa99e: ; 0x1aa99e
+VermilionSnorlax:
loadfont
special SpecialSnorlaxAwake
iftrue UnknownScript_0x1aa9ab
@@ -49,9 +43,8 @@
closetext
loadmovesprites
end
-; 0x1aa9ab
-UnknownScript_0x1aa9ab: ; 0x1aa9ab
+UnknownScript_0x1aa9ab:
writetext UnknownText_0x1aab84
pause 15
cry SNORLAX
@@ -63,86 +56,72 @@
setevent EVENT_FOUGHT_SNORLAX
returnafterbattle
end
-; 0x1aa9c2
-PokefanMScript_0x1aa9c2: ; 0x1aa9c2
+VermilionGymBadgeGuy:
faceplayer
loadfont
- checkevent $00e2
- iftrue UnknownScript_0x1aa9f7
+ checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY
+ iftrue .AlreadyGotItem
checkcode $7
- if_equal $10, UnknownScript_0x1aa9ea
- if_greater_than $d, UnknownScript_0x1aa9e4
- if_greater_than $9, UnknownScript_0x1aa9de
+ if_equal 16, .AllBadges
+ if_greater_than 13, .MostBadges
+ if_greater_than 9, .SomeBadges
writetext UnknownText_0x1aabc8
closetext
loadmovesprites
end
-; 0x1aa9de
-UnknownScript_0x1aa9de: ; 0x1aa9de
+.SomeBadges
writetext UnknownText_0x1aac2b
closetext
loadmovesprites
end
-; 0x1aa9e4
-UnknownScript_0x1aa9e4: ; 0x1aa9e4
+.MostBadges
writetext UnknownText_0x1aac88
closetext
loadmovesprites
end
-; 0x1aa9ea
-UnknownScript_0x1aa9ea: ; 0x1aa9ea
+.AllBadges
writetext UnknownText_0x1aacf3
keeptextopen
verbosegiveitem HP_UP, 1
- iffalse UnknownScript_0x1aa9fb
- setevent $00e2
-UnknownScript_0x1aa9f7: ; 0x1aa9f7
+ iffalse .Done
+ setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY
+.AlreadyGotItem
writetext UnknownText_0x1aad4a
closetext
-UnknownScript_0x1aa9fb: ; 0x1aa9fb
+.Done
loadmovesprites
end
-; 0x1aa9fd
-MapVermilionCitySignpost0Script: ; 0x1aa9fd
- jumptext UnknownText_0x1aadb9
-; 0x1aaa00
+VermilionCitySign:
+ jumptext VermilionCitySignText
-MapVermilionCitySignpost1Script: ; 0x1aaa00
- jumptext UnknownText_0x1aade7
-; 0x1aaa03
+VermilionGymSign:
+ jumptext VermilionGymSignText
-MapVermilionCitySignpost2Script: ; 0x1aaa03
- jumptext UnknownText_0x1aae28
-; 0x1aaa06
+PokemonFanClubSign:
+ jumptext PokemonFanClubSignText
-MapVermilionCitySignpost3Script: ; 0x1aaa06
- jumptext UnknownText_0x1aae4e
-; 0x1aaa09
+VermilionCityDiglettsCaveSign:
+ jumptext VermilionCityDiglettsCaveSignText
-MapVermilionCitySignpost4Script: ; 0x1aaa09
- jumptext UnknownText_0x1aae5e
-; 0x1aaa0c
+VermilionCityPortSign:
+ jumptext VermilionCityPortSignText
-MapVermilionCitySignpost5Script: ; 0x1aaa0c
+VermilionCityPokeCenterSign:
jumpstd pokecentersign
-; 0x1aaa0f
-MapVermilionCitySignpost6Script: ; 0x1aaa0f
+VermilionCityMartSign:
jumpstd martsign
-; 0x1aaa12
-MapVermilionCitySignpostItem7: ; 0x1aaa12
+MapVermilionCitySignpostItem7:
dw $00fc
db FULL_HEAL
-
-; 0x1aaa15
-UnknownText_0x1aaa15: ; 0x1aaa15
+UnknownText_0x1aaa15:
text "VERMILION PORT is"
line "KANTO's seaside"
cont "gateway."
@@ -151,9 +130,8 @@
line "around the world"
cont "dock here."
done
-; 0x1aaa6f
-UnknownText_0x1aaa6f: ; 0x1aaa6f
+UnknownText_0x1aaa6f:
text "My #MON is"
line "preparing the land"
cont "for construction."
@@ -162,22 +140,19 @@
line "money to start the"
cont "project…"
done
-; 0x1aaaca
-UnknownText_0x1aaaca: ; 0x1aaaca
+UnknownText_0x1aaaca:
text "MACHOP: Guooh"
line "gogogoh!"
done
-; 0x1aaae2
-UnknownText_0x1aaae2: ; 0x1aaae2
+UnknownText_0x1aaae2:
text "A MACHOP is growl-"
line "ing while stomping"
cont "the ground flat."
done
-; 0x1aab1a
-UnknownText_0x1aab1a: ; 0x1aab1a
+UnknownText_0x1aab1a:
text "There are eight"
line "GYMS in KANTO."
@@ -185,15 +160,13 @@
line "is VERMILION's"
cont "#MON GYM."
done
-; 0x1aab64
-UnknownText_0x1aab64: ; 0x1aab64
+UnknownText_0x1aab64:
text "SNORLAX is snoring"
line "peacefully…"
done
-; 0x1aab84
-UnknownText_0x1aab84: ; 0x1aab84
+UnknownText_0x1aab84:
text "The #GEAR was"
line "placed near the"
cont "sleeping SNORLAX…"
@@ -202,9 +175,8 @@
para "SNORLAX woke up!"
done
-; 0x1aabc8
-UnknownText_0x1aabc8: ; 0x1aabc8
+UnknownText_0x1aabc8:
text "Skilled trainers"
line "gather in KANTO."
@@ -214,9 +186,8 @@
para "They won't be easy"
line "to defeat."
done
-; 0x1aac2b
-UnknownText_0x1aac2b: ; 0x1aac2b
+UnknownText_0x1aac2b:
text "You've started to"
line "collect KANTO GYM"
cont "BADGES?"
@@ -225,9 +196,8 @@
line "that the trainers"
cont "here are tough?"
done
-; 0x1aac88
-UnknownText_0x1aac88: ; 0x1aac88
+UnknownText_0x1aac88:
text "I guess you'll be"
line "finished with your"
@@ -238,9 +208,8 @@
line "you get all eight"
cont "BADGES."
done
-; 0x1aacf3
-UnknownText_0x1aacf3: ; 0x1aacf3
+UnknownText_0x1aacf3:
text "Congratulations!"
para "You got all the"
@@ -249,9 +218,8 @@
para "I've got a reward"
line "for your efforts."
done
-; 0x1aad4a
-UnknownText_0x1aad4a: ; 0x1aad4a
+UnknownText_0x1aad4a:
text "Having a variety"
line "of #MON types"
@@ -262,17 +230,15 @@
line "GYM BADGES will"
cont "help you."
done
-; 0x1aadb9
-UnknownText_0x1aadb9: ; 0x1aadb9
+VermilionCitySignText:
text "VERMILION CITY"
para "The Port of"
line "Exquisite Sunsets"
done
-; 0x1aade7
-UnknownText_0x1aade7: ; 0x1aade7
+VermilionGymSignText:
text "VERMILION CITY"
line "#MON GYM"
cont "LEADER: LT.SURGE"
@@ -280,28 +246,24 @@
para "The Lightning"
line "American"
done
-; 0x1aae28
-UnknownText_0x1aae28: ; 0x1aae28
+PokemonFanClubSignText:
text "#MON FAN CLUB"
para "All #MON Fans"
line "Welcome!"
done
-; 0x1aae4e
-UnknownText_0x1aae4e: ; 0x1aae4e
+VermilionCityDiglettsCaveSignText:
text "DIGLETT'S CAVE"
done
-; 0x1aae5e
-UnknownText_0x1aae5e: ; 0x1aae5e
+VermilionCityPortSignText:
text "VERMILION PORT"
line "ENTRANCE"
done
-; 0x1aae77
-VermilionCity_MapEventHeader: ; 0x1aae77
+VermilionCity_MapEventHeader:
; filler
db 0, 0
@@ -323,13 +285,13 @@
; signposts
db 8
- signpost 3, 25, $0, MapVermilionCitySignpost0Script
- signpost 19, 5, $0, MapVermilionCitySignpost1Script
- signpost 13, 5, $0, MapVermilionCitySignpost2Script
- signpost 9, 33, $0, MapVermilionCitySignpost3Script
- signpost 15, 27, $0, MapVermilionCitySignpost4Script
- signpost 5, 10, $0, MapVermilionCitySignpost5Script
- signpost 13, 22, $0, MapVermilionCitySignpost6Script
+ signpost 3, 25, $0, VermilionCitySign
+ signpost 19, 5, $0, VermilionGymSign
+ signpost 13, 5, $0, PokemonFanClubSign
+ signpost 9, 33, $0, VermilionCityDiglettsCaveSign
+ signpost 15, 27, $0, VermilionCityPortSign
+ signpost 5, 10, $0, VermilionCityPokeCenterSign
+ signpost 13, 22, $0, VermilionCityMartSign
signpost 19, 12, $7, MapVermilionCitySignpostItem7
; people-events
@@ -336,8 +298,7 @@
db 6
person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, $ffff
person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, $ffff
- person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, MachopScript_0x1aa989, $ffff
+ person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, $ffff
person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, $ffff
- person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, BigSnorlaxScript_0x1aa99e, $0770
- person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1aa9c2, $ffff
-; 0x1aaf25
+ person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, VermilionSnorlax, $0770
+ person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, $ffff
--- a/maps/VermilionHouseFishingSpeechHouse.asm
+++ b/maps/VermilionHouseFishingSpeechHouse.asm
@@ -1,24 +1,21 @@
-VermilionHouseFishingSpeechHouse_MapScriptHeader: ; 0x19148b
+VermilionHouseFishingSpeechHouse_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19148d
-FishingGuruScript_0x19148d: ; 0x19148d
- jumptextfaceplayer UnknownText_0x191496
-; 0x191490
+FishingDude:
+ jumptextfaceplayer FishingDudeText
-MapVermilionHouseFishingSpeechHouseSignpost0Script: ; 0x191490
- jumptext UnknownText_0x1915a3
-; 0x191493
+FishingDudesHousePhoto:
+ jumptext FishingDudesHousePhotoText
-UnknownScript_0x191493: ; 0x191493
+FishingDudesHouseBookshelf:
+; unused
jumpstd picturebookshelf
-; 0x191496
-UnknownText_0x191496: ; 0x191496
+FishingDudeText:
text "I am the FISHING"
line "DUDE, the elder of"
cont "the FISHING BROS."
@@ -41,9 +38,8 @@
line "catch the MAGIKARP"
cont "of his dreams."
done
-; 0x1915a3
-UnknownText_0x1915a3: ; 0x1915a3
+FishingDudesHousePhotoText:
text "It's a photo of"
line "people fishing…"
@@ -50,9 +46,8 @@
para "They're having a"
line "great time…"
done
-; 0x1915df
-VermilionHouseFishingSpeechHouse_MapEventHeader: ; 0x1915df
+VermilionHouseFishingSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -66,9 +61,8 @@
; signposts
db 1
- signpost 0, 3, $0, MapVermilionHouseFishingSpeechHouseSignpost0Script
+ signpost 0, 3, $0, FishingDudesHousePhoto
; people-events
db 1
- person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x19148d, $ffff
-; 0x191601
+ person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, $ffff
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -14,9 +14,8 @@
jumptextfaceplayer UnknownText_0x191f16
; 0x191ebd
-MapVermilionMagnetTrainSpeechHouseSignpost1Script: ; 0x191ebd
+VermilionMagnetTrainSpeechHouseBookshelf:
jumpstd picturebookshelf
-; 0x191ec0
UnknownText_0x191ec0: ; 0x191ec0
text "Do you know about"
@@ -49,8 +48,8 @@
; signposts
db 2
- signpost 1, 0, $0, MapVermilionMagnetTrainSpeechHouseSignpost1Script
- signpost 1, 1, $0, MapVermilionMagnetTrainSpeechHouseSignpost1Script
+ signpost 1, 0, $0, VermilionMagnetTrainSpeechHouseBookshelf
+ signpost 1, 1, $0, VermilionMagnetTrainSpeechHouseBookshelf
; people-events
db 2
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -30,7 +30,7 @@
writetext UnknownText_0x9ba29
keeptextopen
checkcode $7
- if_greater_than $7, UnknownScript_0x9ba19
+ if_greater_than 7, UnknownScript_0x9ba19
writetext UnknownText_0x9ba5f
closetext
loadmovesprites
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -1,4 +1,4 @@
-VioletCity_MapScriptHeader: ; 0x1a83b2
+VioletCity_MapScriptHeader:
; trigger count
db 0
@@ -8,14 +8,12 @@
; callbacks
dbw 5, UnknownScript_0x1a83b7
-; 0x1a83b7
-UnknownScript_0x1a83b7: ; 0x1a83b7
+UnknownScript_0x1a83b7:
setflag $0043
return
-; 0x1a83bb
-FisherScript_0x1a83bb: ; 0x1a83bb
+FisherScript_0x1a83bb:
applymovement $2, MovementData_0x1a8465
faceplayer
loadfont
@@ -23,16 +21,14 @@
yesorno
iffalse UnknownScript_0x1a83d1
jump UnknownScript_0x1a83cb
-; 0x1a83cb
-UnknownScript_0x1a83cb: ; 0x1a83cb
+UnknownScript_0x1a83cb:
writetext UnknownText_0x1a84ac
closetext
loadmovesprites
end
-; 0x1a83d1
-UnknownScript_0x1a83d1: ; 0x1a83d1
+UnknownScript_0x1a83d1:
writetext UnknownText_0x1a84cb
closetext
loadmovesprites
@@ -54,67 +50,51 @@
clearevent $06cb
waitbutton
end
-; 0x1a8403
-LassScript_0x1a8403: ; 0x1a8403
+LassScript_0x1a8403:
jumptextfaceplayer UnknownText_0x1a8529
-; 0x1a8406
-SuperNerdScript_0x1a8406: ; 0x1a8406
+SuperNerdScript_0x1a8406:
jumptextfaceplayer UnknownText_0x1a8593
-; 0x1a8409
-GrampsScript_0x1a8409: ; 0x1a8409
+GrampsScript_0x1a8409:
jumptextfaceplayer UnknownText_0x1a85ef
-; 0x1a840c
-YoungsterScript_0x1a840c: ; 0x1a840c
+YoungsterScript_0x1a840c:
jumptextfaceplayer UnknownText_0x1a8665
-; 0x1a840f
-MapVioletCitySignpost0Script: ; 0x1a840f
- jumptext UnknownText_0x1a86b2
-; 0x1a8412
+VioletCitySign:
+ jumptext VioletCitySignText
-MapVioletCitySignpost1Script: ; 0x1a8412
- jumptext UnknownText_0x1a86dc
-; 0x1a8415
+VioletGymSign:
+ jumptext VioletGymSignText
-MapVioletCitySignpost2Script: ; 0x1a8415
- jumptext UnknownText_0x1a8724
-; 0x1a8418
+SproutTowerSign:
+ jumptext SproutTowerSignText
-MapVioletCitySignpost3Script: ; 0x1a8418
- jumptext UnknownText_0x1a874d
-; 0x1a841b
+EarlsPokemonAcademySign:
+ jumptext EarlsPokemonAcademySignText
-MapVioletCitySignpost4Script: ; 0x1a841b
+VioletCityPokeCenterSign:
jumpstd pokecentersign
-; 0x1a841e
-MapVioletCitySignpost5Script: ; 0x1a841e
+VioletCityMartSign:
jumpstd martsign
-; 0x1a8421
-ItemFragment_0x1a8421: ; 0x1a8421
+ItemFragment_0x1a8421:
db PP_UP, 1
-; 0x1a8423
-ItemFragment_0x1a8423: ; 0x1a8423
+ItemFragment_0x1a8423:
db RARE_CANDY, 1
-; 0x1a8425
-FruitTreeScript_0x1a8425: ; 0x1a8425
+FruitTreeScript_0x1a8425:
fruittree $9
-; 0x1a8427
-MapVioletCitySignpostItem6: ; 0x1a8427
+MapVioletCitySignpostItem6:
dw $00b0
db HYPER_POTION
-
-; 0x1a842a
-MovementData_0x1a842a: ; 0x1a842a
+MovementData_0x1a842a:
big_step_down
big_step_down
turn_head_down
@@ -172,14 +152,12 @@
big_step_up
turn_head_down
step_end
-; 0x1a8463
-MovementData_0x1a8463: ; 0x1a8463
+MovementData_0x1a8463:
step_up
step_end
-; 0x1a8465
-MovementData_0x1a8465: ; 0x1a8465
+MovementData_0x1a8465:
turn_head_down
turn_head_left
turn_head_up
@@ -194,9 +172,8 @@
turn_head_right
turn_head_down
step_end
-; 0x1a8473
-UnknownText_0x1a8473: ; 0x1a8473
+UnknownText_0x1a8473:
text "Hello!"
line "You are trainer?"
@@ -203,29 +180,25 @@
para "Battle GYM LEADER,"
line "win you did?"
done
-; 0x1a84ac
-UnknownText_0x1a84ac: ; 0x1a84ac
+UnknownText_0x1a84ac:
text "Ooh, la la!"
line "Very indeed nice!"
done
-; 0x1a84cb
-UnknownText_0x1a84cb: ; 0x1a84cb
+UnknownText_0x1a84cb:
text "Is that so? Then"
line "study shall you!"
cont "Follow me!"
done
-; 0x1a84f9
-UnknownText_0x1a84f9: ; 0x1a84f9
+UnknownText_0x1a84f9:
text "Here, teacher I"
line "am. Good it is"
cont "you study here!"
done
-; 0x1a8529
-UnknownText_0x1a8529: ; 0x1a8529
+UnknownText_0x1a8529:
text "Ghosts are rumored"
line "to appear in"
cont "SPROUT TOWER."
@@ -236,9 +209,8 @@
para "had no effect on"
line "ghosts."
done
-; 0x1a8593
-UnknownText_0x1a8593: ; 0x1a8593
+UnknownText_0x1a8593:
text "Hey, you're a"
line "#MON trainer?"
@@ -248,9 +220,8 @@
para "you'll be ready"
line "for prime time!"
done
-; 0x1a85ef
-UnknownText_0x1a85ef: ; 0x1a85ef
+UnknownText_0x1a85ef:
text "FALKNER, from the"
line "VIOLET #MON"
@@ -263,9 +234,8 @@
para "has done a great"
line "job with it."
done
-; 0x1a8665
-UnknownText_0x1a8665: ; 0x1a8665
+UnknownText_0x1a8665:
text "I saw a wiggly"
line "tree up ahead!"
@@ -273,17 +243,15 @@
line "it squirms and"
cont "dances! Cool!"
done
-; 0x1a86b2
-UnknownText_0x1a86b2: ; 0x1a86b2
+VioletCitySignText:
text "VIOLET CITY"
para "The City of"
line "Nostalgic Scents"
done
-; 0x1a86dc
-UnknownText_0x1a86dc: ; 0x1a86dc
+VioletGymSignText:
text "VIOLET CITY"
line "#MON GYM"
cont "LEADER: FALKNER"
@@ -291,23 +259,20 @@
para "The Elegant Master"
line "of Flying #MON"
done
-; 0x1a8724
-UnknownText_0x1a8724: ; 0x1a8724
+SproutTowerSignText:
text "SPROUT TOWER"
para "Experience the"
line "Way of #MON"
done
-; 0x1a874d
-UnknownText_0x1a874d: ; 0x1a874d
+EarlsPokemonAcademySignText:
text "EARL'S #MON"
line "ACADEMY"
done
-; 0x1a8762
-VioletCity_MapEventHeader: ; 0x1a8762
+VioletCity_MapEventHeader:
; filler
db 0, 0
@@ -328,12 +293,12 @@
; signposts
db 7
- signpost 20, 24, $0, MapVioletCitySignpost0Script
- signpost 17, 15, $0, MapVioletCitySignpost1Script
- signpost 8, 24, $0, MapVioletCitySignpost2Script
- signpost 17, 27, $0, MapVioletCitySignpost3Script
- signpost 25, 32, $0, MapVioletCitySignpost4Script
- signpost 17, 10, $0, MapVioletCitySignpost5Script
+ signpost 20, 24, $0, VioletCitySign
+ signpost 17, 15, $0, VioletGymSign
+ signpost 8, 24, $0, SproutTowerSign
+ signpost 17, 27, $0, EarlsPokemonAcademySign
+ signpost 25, 32, $0, VioletCityPokeCenterSign
+ signpost 17, 10, $0, VioletCityMartSign
signpost 14, 37, $7, MapVioletCitySignpostItem6
; people-events
@@ -346,4 +311,3 @@
person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, $ffff
person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, $0643
person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, $0644
-; 0x1a8820
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -1,4 +1,4 @@
-ViridianCity_MapScriptHeader: ; 0x1a9a43
+ViridianCity_MapScriptHeader:
; trigger count
db 0
@@ -8,14 +8,12 @@
; callbacks
dbw 5, UnknownScript_0x1a9a48
-; 0x1a9a48
-UnknownScript_0x1a9a48: ; 0x1a9a48
+UnknownScript_0x1a9a48:
setflag $0036
return
-; 0x1a9a4c
-GrampsScript_0x1a9a4c: ; 0x1a9a4c
+GrampsScript_0x1a9a4c:
faceplayer
loadfont
writetext UnknownText_0x1a9aa5
@@ -25,16 +23,14 @@
closetext
loadmovesprites
end
-; 0x1a9a5b
-UnknownScript_0x1a9a5b: ; 0x1a9a5b
+UnknownScript_0x1a9a5b:
writetext UnknownText_0x1a9bb7
closetext
loadmovesprites
end
-; 0x1a9a61
-GrampsScript_0x1a9a61: ; 0x1a9a61
+GrampsScript_0x1a9a61:
faceplayer
loadfont
checkevent $0775
@@ -43,16 +39,14 @@
closetext
loadmovesprites
end
-; 0x1a9a6f
-UnknownScript_0x1a9a6f: ; 0x1a9a6f
+UnknownScript_0x1a9a6f:
writetext UnknownText_0x1a9c7e
closetext
loadmovesprites
end
-; 0x1a9a75
-FisherScript_0x1a9a75: ; 0x1a9a75
+FisherScript_0x1a9a75:
faceplayer
loadfont
checkevent EVENT_GOT_TM42_DREAM_EATER
@@ -62,43 +56,35 @@
verbosegiveitem TM_42, 1
iffalse UnknownScript_0x1a9a8e
setevent EVENT_GOT_TM42_DREAM_EATER
-UnknownScript_0x1a9a8a: ; 0x1a9a8a
+UnknownScript_0x1a9a8a:
writetext UnknownText_0x1a9d86
closetext
-UnknownScript_0x1a9a8e: ; 0x1a9a8e
+UnknownScript_0x1a9a8e:
loadmovesprites
end
-; 0x1a9a90
-YoungsterScript_0x1a9a90: ; 0x1a9a90
+YoungsterScript_0x1a9a90:
jumptextfaceplayer UnknownText_0x1a9daa
-; 0x1a9a93
-MapViridianCitySignpost0Script: ; 0x1a9a93
- jumptext UnknownText_0x1a9def
-; 0x1a9a96
+ViridianCitySign:
+ jumptext ViridianCitySignText
-MapViridianCitySignpost1Script: ; 0x1a9a96
- jumptext UnknownText_0x1a9e1b
-; 0x1a9a99
+ViridianGymSign:
+ jumptext ViridianGymSignText
-MapViridianCitySignpost2Script: ; 0x1a9a99
- jumptext UnknownText_0x1a9e60
-; 0x1a9a9c
+ViridianCityWelcomeSign:
+ jumptext ViridianCityWelcomeSignText
-MapViridianCitySignpost3Script: ; 0x1a9a9c
- jumptext UnknownText_0x1a9e99
-; 0x1a9a9f
+TrainerHouseSign:
+ jumptext TrainerHouseSignText
-MapViridianCitySignpost4Script: ; 0x1a9a9f
+ViridianCityPokeCenterSign:
jumpstd pokecentersign
-; 0x1a9aa2
-MapViridianCitySignpost5Script: ; 0x1a9aa2
+ViridianCityMartSign:
jumpstd martsign
-; 0x1a9aa5
-UnknownText_0x1a9aa5: ; 0x1a9aa5
+UnknownText_0x1a9aa5:
text "Hey, kid! I just"
line "had a double shot"
@@ -117,9 +103,8 @@
para "Do you believe me?"
done
-; 0x1a9b6f
-UnknownText_0x1a9b6f: ; 0x1a9b6f
+UnknownText_0x1a9b6f:
text "Good, good. Yes, I"
line "was something out"
@@ -126,9 +111,8 @@
para "of the ordinary,"
line "let me tell you!"
done
-; 0x1a9bb7
-UnknownText_0x1a9bb7: ; 0x1a9bb7
+UnknownText_0x1a9bb7:
text "What? You little"
line "whelp!"
@@ -138,9 +122,8 @@
para "show you a thing"
line "or two. Humph!"
done
-; 0x1a9c11
-UnknownText_0x1a9c11: ; 0x1a9c11
+UnknownText_0x1a9c11:
text "This GYM didn't"
line "have a LEADER"
cont "until recently."
@@ -151,9 +134,8 @@
para "LEADER, but he's"
line "often away."
done
-; 0x1a9c7e
-UnknownText_0x1a9c7e: ; 0x1a9c7e
+UnknownText_0x1a9c7e:
text "Are you going to"
line "battle the LEADER?"
@@ -160,9 +142,8 @@
para "Good luck to you."
line "You'll need it."
done
-; 0x1a9cc4
-UnknownText_0x1a9cc4: ; 0x1a9cc4
+UnknownText_0x1a9cc4:
text "Yawn!"
para "I must have dozed"
@@ -184,17 +165,15 @@
line "Here, you can have"
cont "this TM."
done
-; 0x1a9d86
-UnknownText_0x1a9d86: ; 0x1a9d86
+UnknownText_0x1a9d86:
text "TM42 contains"
line "DREAM EATER…"
para "…Zzzzz…"
done
-; 0x1a9daa
-UnknownText_0x1a9daa: ; 0x1a9daa
+UnknownText_0x1a9daa:
text "I heard that there"
line "are many items on"
@@ -201,17 +180,15 @@
para "the ground in"
line "VIRIDIAN FOREST."
done
-; 0x1a9def
-UnknownText_0x1a9def: ; 0x1a9def
+ViridianCitySignText:
text "VIRIDIAN CITY"
para "The Eternally"
line "Green Paradise"
done
-; 0x1a9e1b
-UnknownText_0x1a9e1b: ; 0x1a9e1b
+ViridianGymSignText:
text "VIRIDIAN CITY"
line "#MON GYM"
cont "LEADER: …"
@@ -219,9 +196,8 @@
para "The rest of the"
line "text is illegible…"
done
-; 0x1a9e60
-UnknownText_0x1a9e60: ; 0x1a9e60
+ViridianCityWelcomeSignText:
text "WELCOME TO"
line "VIRIDIAN CITY,"
@@ -228,17 +204,15 @@
para "THE GATEWAY TO"
line "INDIGO PLATEAU"
done
-; 0x1a9e99
-UnknownText_0x1a9e99: ; 0x1a9e99
+TrainerHouseSignText:
text "TRAINER HOUSE"
para "The Club for Top"
line "Trainer Battles"
done
-; 0x1a9ec9
-ViridianCity_MapEventHeader: ; 0x1a9ec9
+ViridianCity_MapEventHeader:
; filler
db 0, 0
@@ -255,12 +229,12 @@
; signposts
db 6
- signpost 17, 17, $0, MapViridianCitySignpost0Script
- signpost 7, 27, $0, MapViridianCitySignpost1Script
- signpost 1, 19, $0, MapViridianCitySignpost2Script
- signpost 15, 21, $0, MapViridianCitySignpost3Script
- signpost 25, 24, $0, MapViridianCitySignpost4Script
- signpost 19, 30, $0, MapViridianCitySignpost5Script
+ signpost 17, 17, $0, ViridianCitySign
+ signpost 7, 27, $0, ViridianGymSign
+ signpost 1, 19, $0, ViridianCityWelcomeSign
+ signpost 15, 21, $0, TrainerHouseSign
+ signpost 25, 24, $0, ViridianCityPokeCenterSign
+ signpost 19, 30, $0, ViridianCityMartSign
; people-events
db 4
@@ -268,4 +242,3 @@
person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, $ffff
person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, $ffff
person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, $ffff
-; 0x1a9f3a
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -26,9 +26,8 @@
db ESCAPE_ROPE, 1
; 0x18c41a
-BoulderScript_0x18c41a: ; 0x18c41a
+WhirlIslandB1FBoulder:
jumpstd strengthboulder
-; 0x18c41d
MapWhirlIslandB1FSignpostItem0: ; 0x18c41d
dw $0097
@@ -80,5 +79,5 @@
person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, $0693
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, BoulderScript_0x18c41a, $ffff
+ person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, $ffff
; 0x18c4b6