ref: 43b5f90457a9a6c5df6baa561afdcefe2c08456f
parent: e2c15b0b922c906113cd9d5fa0681fb629721583
author: Rangi <[email protected]>
date: Tue Feb 27 14:33:38 EST 2018
Replace "Map<MapName>Signpost<#>Script" labels
--- a/engine/events/card_key.asm
+++ b/engine/events/card_key.asm
@@ -35,5 +35,5 @@
.CardKeyScript: ; 0x507af
closetext
- farjump MapRadioTower3FSignpost2Script
+ farjump CardKeySlotScript
; 0x507b4
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -40,7 +40,7 @@
.Scene1:
end
-MapBattleTower1FSignpost0Script:
+BattleTower1FRulesSign:
opentext
writetext Text_ReadBattleTowerRules
yesorno
@@ -802,7 +802,7 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script
+ bg_event 6, 6, BGEVENT_READ, BattleTower1FRulesSign
db 5 ; object events
object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -133,9 +133,9 @@
CeladonGameCornerLighterScript:
jumptext CeladonGameCornerLighterText
-MapCeladonGameCornerSignpost9Script:
+CeladonGameCornerSodaCanScript:
opentext
- writetext UnknownText_0x72567
+ writetext CeladonGameCornerSodaCanText
waitbutton
special CardFlip
closetext
@@ -270,7 +270,7 @@
line "here."
done
-UnknownText_0x72567:
+CeladonGameCornerSodaCanText:
text "A can of soda…"
para "Someone must be"
@@ -298,7 +298,7 @@
bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
- bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script
+ bg_event 6, 9, BGEVENT_READ, CeladonGameCornerSodaCanScript
bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript
bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -39,7 +39,7 @@
CeladonMansionManagersSuiteSign:
jumptext CeladonMansionManagersSuiteSignText
-CeladonMansion1fBookshelf:
+CeladonMansion1FBookshelf:
jumpstd picturebookshelf
CeladonMansionManagerText:
@@ -86,8 +86,8 @@
db 3 ; bg events
bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign
- bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf
- bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf
+ bg_event 0, 3, BGEVENT_READ, CeladonMansion1FBookshelf
+ bg_event 2, 3, BGEVENT_READ, CeladonMansion1FBookshelf
db 4 ; object events
object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -6,8 +6,8 @@
CeladonMansion2FComputer:
jumptext CeladonMansion2FComputerText
-CeladonMansion2FSign:
- jumptext CeladonMansion2FSignText
+CeladonMansion2FMeetingRoomSign:
+ jumptext CeladonMansion2FMeetingRoomSignText
CeladonMansion2FBookshelf:
jumpstd difficultbookshelf
@@ -42,7 +42,7 @@
para "…"
done
-CeladonMansion2FSignText:
+CeladonMansion2FMeetingRoomSignText:
text "GAME FREAK"
line "MEETING ROOM"
done
@@ -60,7 +60,7 @@
db 3 ; bg events
bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer
- bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign
+ bg_event 5, 8, BGEVENT_UP, CeladonMansion2FMeetingRoomSign
bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf
db 0 ; object events
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -69,17 +69,17 @@
CeladonMansion3FFisherScript:
jumptextfaceplayer CeladonMansion3FFisherText
-MapCeladonMansion3FSignpost0Script:
- jumptext UnknownText_0x7190b
+CeladonMansion3FDevRoomSign:
+ jumptext CeladonMansion3FDevRoomSignText
-MapCeladonMansion3FSignpost1Script:
- jumptext UnknownText_0x71928
+CeladonMansion3FDrawing:
+ jumptext CeladonMansion3FDrawingText
-MapCeladonMansion3FSignpost2Script:
- jumptext UnknownText_0x71952
+CeladonMansion3FGameProgram:
+ jumptext CeladonMansion3FGameProgramText
-MapCeladonMansion3FSignpost3Script:
- jumptext UnknownText_0x71996
+CeladonMansion3FReferenceMaterial:
+ jumptext CeladonMansion3FReferenceMaterialText
UnknownText_0x716ce:
text "Is that right?"
@@ -161,18 +161,18 @@
para "Oh, I love them!"
done
-UnknownText_0x7190b:
+CeladonMansion3FDevRoomSignText:
text "GAME FREAK"
line "DEVELOPMENT ROOM"
done
-UnknownText_0x71928:
+CeladonMansion3FDrawingText:
text "It's a detailed"
line "drawing of a"
cont "pretty girl."
done
-UnknownText_0x71952:
+CeladonMansion3FGameProgramText:
text "It's the game"
line "program. Messing"
@@ -180,7 +180,7 @@
line "a bug in the game!"
done
-UnknownText_0x71996:
+CeladonMansion3FReferenceMaterialText:
text "It's crammed with"
line "reference materi-"
cont "als. There's even"
@@ -199,10 +199,10 @@
db 0 ; coord events
db 4 ; bg events
- bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
- bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
- bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
- bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
+ bg_event 5, 8, BGEVENT_UP, CeladonMansion3FDevRoomSign
+ bg_event 4, 3, BGEVENT_UP, CeladonMansion3FDrawing
+ bg_event 1, 6, BGEVENT_UP, CeladonMansion3FGameProgram
+ bg_event 1, 3, BGEVENT_UP, CeladonMansion3FReferenceMaterial
db 4 ; object events
object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -9,8 +9,8 @@
CeladonMansionRoofFisherScript:
jumptextfaceplayer CeladonMansionRoofFisherText
-MapCeladonMansionRoofSignpost0Script:
- jumptext UnknownText_0x71aa1
+CeladonMansionRoofGraffiti:
+ jumptext CeladonMansionRoofGraffitiText
CeladonMansionRoofFisherText:
text "High places--I do"
@@ -23,7 +23,7 @@
line "me is smoke!"
done
-UnknownText_0x71aa1:
+CeladonMansionRoofGraffitiText:
text "There's graffiti"
line "on the wall…"
@@ -42,7 +42,7 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
+ bg_event 6, 1, BGEVENT_LEFT, CeladonMansionRoofGraffiti
db 1 ; object events
object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -43,12 +43,12 @@
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
end
-MapColosseumSignpost1Script:
+ColosseumConsoleScript:
special Colosseum
newloadmap MAPSETUP_LINKRETURN
end
-ChrisScript_0x193499:
+CableClubFriendScript:
opentext
writetext .FriendReadyText
waitbutton
@@ -70,9 +70,9 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
- bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script
+ bg_event 4, 4, BGEVENT_RIGHT, ColosseumConsoleScript
+ bg_event 5, 4, BGEVENT_LEFT, ColosseumConsoleScript
db 2 ; object events
- object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+ object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+ object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -132,8 +132,8 @@
DanceTheatreGrannyScript:
jumptextfaceplayer DanceTheatreGrannyText
-MapDanceTheatreSignpost1Script:
- jumptext FancyPanelText
+DanceTheatreFancyPanel:
+ jumptext DanceTheatreFancyPanelText
KimonoGirlNaoko2SeenText:
text "You have lovely"
@@ -329,7 +329,7 @@
cont "thing is possible."
done
-FancyPanelText:
+DanceTheatreFancyPanelText:
text "It's a fancy panel"
line "that's decorated"
cont "with flowers."
@@ -345,8 +345,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
- bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
+ bg_event 5, 6, BGEVENT_UP, DanceTheatreFancyPanel
+ bg_event 6, 6, BGEVENT_UP, DanceTheatreFancyPanel
db 9 ; object events
object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -171,7 +171,7 @@
special RestartMapMusic
end
-MapDragonsDenB1FSignpost0Script:
+DragonShrineSignpost:
jumptext DragonShrineSignpostText
DragonsDenB1FCalcium:
@@ -415,7 +415,7 @@
coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene
db 4 ; bg events
- bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
+ bg_event 18, 24, BGEVENT_READ, DragonShrineSignpost
bg_event 33, 29, BGEVENT_ITEM, DragonsDenB1FHiddenRevive
bg_event 21, 17, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion
bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -10,12 +10,12 @@
FightingDojoBlackBelt:
jumptextfaceplayer FightingDojoBlackBeltText
-MapFightingDojoSignpost0Script:
- jumptext FightingDojoSign0Text
-
-MapFightingDojoSignpost1Script:
+FightingDojoSign1:
jumptext FightingDojoSign1Text
+FightingDojoSign2:
+ jumptext FightingDojoSign2Text
+
FightingDojoFocusBand:
itemball FOCUS_BAND
@@ -30,12 +30,12 @@
cont "training."
done
-FightingDojoSign0Text:
+FightingDojoSign1Text:
text "What goes around"
line "comes around!"
done
-FightingDojoSign1Text:
+FightingDojoSign2Text:
text "Enemies on every"
line "side!"
done
@@ -50,8 +50,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script
- bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script
+ bg_event 4, 0, BGEVENT_READ, FightingDojoSign1
+ bg_event 5, 0, BGEVENT_READ, FightingDojoSign2
db 2 ; object events
object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -39,12 +39,12 @@
closetext
end
-; possibly unused
-UnknownScript_0x54781:
- jumptext UnknownText_0x548c0
+GoldenrodBikeShopJustReleasedCompactBike:
+; unused
+ jumptext GoldenrodBikeShopJustReleasedCompactBikeText
-MapGoldenrodBikeShopSignpost8Script:
- jumptext UnknownText_0x548ed
+GoldenrodBikeShopBicycle:
+ jumptext GoldenrodBikeShopBicycleText
UnknownText_0x54787:
text "…sigh… I moved"
@@ -88,7 +88,7 @@
done
; possibly unused
-UnknownText_0x548c0:
+GoldenrodBikeShopJustReleasedCompactBikeText:
text "Just released!"
para "First-rate compact"
@@ -95,7 +95,7 @@
line "BICYCLES!"
done
-UnknownText_0x548ed:
+GoldenrodBikeShopBicycleText:
text "It's a shiny new"
line "BICYCLE!"
done
@@ -110,15 +110,15 @@
db 0 ; coord events
db 9 ; bg events
- bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
- bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
- bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
- bg_event 0, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
- bg_event 1, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
- bg_event 0, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
- bg_event 1, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
- bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
- bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+ bg_event 1, 2, BGEVENT_READ, GoldenrodBikeShopBicycle
+ bg_event 0, 3, BGEVENT_READ, GoldenrodBikeShopBicycle
+ bg_event 1, 3, BGEVENT_READ, GoldenrodBikeShopBicycle
+ bg_event 0, 5, BGEVENT_READ, GoldenrodBikeShopBicycle
+ bg_event 1, 5, BGEVENT_READ, GoldenrodBikeShopBicycle
+ bg_event 0, 6, BGEVENT_READ, GoldenrodBikeShopBicycle
+ bg_event 1, 6, BGEVENT_READ, GoldenrodBikeShopBicycle
+ bg_event 6, 6, BGEVENT_READ, GoldenrodBikeShopBicycle
+ bg_event 7, 6, BGEVENT_READ, GoldenrodBikeShopBicycle
db 1 ; object events
object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -3,7 +3,7 @@
db 0 ; callbacks
-MapGoldenrodDeptStoreElevatorSignpost0Script:
+GoldenrodDeptStoreElevatorScript:
opentext
elevator Elevator_0x566e0
closetext
@@ -62,6 +62,6 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script
+ bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStoreElevatorScript
db 0 ; object events
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -403,8 +403,8 @@
GoldenrodUndergroundCoinCase:
itemball COIN_CASE
-MapGoldenrodUndergroundSignpost1Script:
- jumptext UnknownText_0x7c91a
+GoldenrodUndergroundNoEntrySign:
+ jumptext GoldenrodUndergroundNoEntryText
GoldenrodUndergroundHiddenParlyzHeal:
hiddenitem PARLYZ_HEAL, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL
@@ -639,7 +639,7 @@
line "today."
done
-UnknownText_0x7c91a:
+GoldenrodUndergroundNoEntryText:
text "NO ENTRY BEYOND"
line "THIS POINT"
done
@@ -659,7 +659,7 @@
db 5 ; bg events
bg_event 18, 6, BGEVENT_READ, BasementDoorScript
- bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
+ bg_event 19, 6, BGEVENT_READ, GoldenrodUndergroundNoEntrySign
bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -424,10 +424,10 @@
; unused
jumpstd strengthboulder
-MapIlexForestSignpost0Script:
- jumptext Text_IlexForestSignpost0
+IlexForestSignpost:
+ jumptext IlexForestSignpostText
-MapIlexForestSignpost4Script:
+IlexForestShrineScript:
checkevent EVENT_FOREST_IS_RESTLESS
iftrue .ForestIsRestless
jump .DontDoCelebiEvent
@@ -843,7 +843,7 @@
cont "forest's guardian?"
done
-Text_IlexForestSignpost0:
+IlexForestSignpostText:
text "ILEX FOREST is"
line "so overgrown with"
@@ -946,11 +946,11 @@
db 0 ; coord events
db 5 ; bg events
- bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script
+ bg_event 3, 17, BGEVENT_READ, IlexForestSignpost
bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther
bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion
bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal
- bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script
+ bg_event 8, 22, BGEVENT_UP, IlexForestShrineScript
db 11 ; object events
object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -125,19 +125,19 @@
LakeOfRageCooltrainerFScript:
jumptextfaceplayer LakeOfRageCooltrainerFText
-MapLakeOfRageSignpost0Script:
- jumptext UnknownText_0x708d7
+LakeOfRageSign:
+ jumptext LakeOfRageSignText
-MapLakeOfRageSignpost1Script:
+MagikarpHouseSignScript:
opentext
- writetext UnknownText_0x70903
+ writetext FishingGurusHouseSignText
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x700b8
+ iftrue .MagikarpLengthRecord
waitbutton
closetext
end
-UnknownScript_0x700b8:
+.MagikarpLengthRecord:
buttonsound
special MagikarpHouseSign
closetext
@@ -480,13 +480,13 @@
cont "That's too bad."
done
-UnknownText_0x708d7:
+LakeOfRageSignText:
text "LAKE OF RAGE,"
line "also known as"
cont "GYARADOS LAKE."
done
-UnknownText_0x70903:
+FishingGurusHouseSignText:
text "FISHING GURU'S"
line "HOUSE"
done
@@ -501,8 +501,8 @@
db 0 ; coord events
db 5 ; bg events
- bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script
- bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script
+ bg_event 21, 27, BGEVENT_READ, LakeOfRageSign
+ bg_event 25, 31, BGEVENT_READ, MagikarpHouseSignScript
bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -23,21 +23,21 @@
faceplayer
opentext
checkflag ENGINE_EXPN_CARD
- iftrue .UnknownScript_0x7ee8e
+ iftrue .GotExpnCard
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .UnknownScript_0x7ee80
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x7effb
waitbutton
closetext
end
-.UnknownScript_0x7ee80:
+.ReturnedMachinePart:
writetext UnknownText_0x7f0a1
buttonsound
stringtotext .expncardname, MEM_BUFFER_1
scall .UnknownScript_0x7ee94
setflag ENGINE_EXPN_CARD
-.UnknownScript_0x7ee8e:
+.GotExpnCard:
writetext UnknownText_0x7f141
waitbutton
closetext
@@ -66,14 +66,15 @@
closetext
end
-MapLavRadioTower1FSignpost0Script:
- jumptext UnknownText_0x7f2e3
+LavRadioTower1FDirectory:
+ jumptext LavRadioTower1FDirectoryText
-MapLavRadioTower1FSignpost1Script:
- jumptext UnknownText_0x7f32d
+LavRadioTower1FPokeFluteSign:
+ jumptext LavRadioTower1FPokeFluteSignText
-UnknownScript_0x7eebc:
- jumptext UnknownText_0x7f36b
+LavRadioTower1FReferenceLibrary:
+; unreferenced
+ jumptext LavRadioTower1FReferenceLibraryText
LavRadioTower1FReceptionistText:
text "Welcome!"
@@ -191,7 +192,7 @@
cont "off the air!"
done
-UnknownText_0x7f2e3:
+LavRadioTower1FDirectoryText:
text "1F RECEPTION"
line "2F SALES"
@@ -202,7 +203,7 @@
line " OFFICE"
done
-UnknownText_0x7f32d:
+LavRadioTower1FPokeFluteSignText:
text "Perk Up #MON"
line "with Mellow Sounds"
@@ -210,7 +211,7 @@
line "on CHANNEL 20"
done
-UnknownText_0x7f36b:
+LavRadioTower1FReferenceLibraryText:
text "Wow! A full rack"
line "of #MON CDs and"
cont "videos."
@@ -229,8 +230,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
- bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
+ bg_event 11, 0, BGEVENT_READ, LavRadioTower1FDirectory
+ bg_event 5, 0, BGEVENT_READ, LavRadioTower1FPokeFluteSign
db 5 ; object events
object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -17,7 +17,7 @@
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
end
-MapMobileBattleRoomSignpost0Script:
+MobileBattleRoomConsoleScript:
refreshscreen
special Function1037c2
ifequal $1, .one
@@ -74,6 +74,6 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
+ bg_event 4, 2, BGEVENT_UP, MobileBattleRoomConsoleScript
db 0 ; object events
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -17,7 +17,7 @@
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
end
-MapMobileTradeRoomSignpost0Script:
+MobileTradeRoomConsoleScript:
refreshscreen
special Function1037c2
writetext MobileTradeRoom_EstablishingCommsText
@@ -42,6 +42,6 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script
+ bg_event 4, 2, BGEVENT_UP, MobileTradeRoomConsoleScript
db 0 ; object events
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -143,13 +143,13 @@
setevent EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
end
-MapMrPokemonsHouseSignpost1Script:
+MrPokemonsHouse_ForeignMagazines:
jumptext MrPokemonsHouse_ForeignMagazinesText
-MapMrPokemonsHouseSignpost3Script:
+MrPokemonsHouse_BrokenComputer:
jumptext MrPokemonsHouse_BrokenComputerText
-MapMrPokemonsHouseSignpost4Script:
+MrPokemonsHouse_StrangeCoins:
jumptext MrPokemonsHouse_StrangeCoinsText
MrPokemonsHouse_PlayerWalksToMrPokemon:
@@ -380,11 +380,11 @@
db 0 ; coord events
db 5 ; bg events
- bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
- bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
- bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
- bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
- bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script
+ bg_event 0, 1, BGEVENT_READ, MrPokemonsHouse_ForeignMagazines
+ bg_event 1, 1, BGEVENT_READ, MrPokemonsHouse_ForeignMagazines
+ bg_event 6, 1, BGEVENT_READ, MrPokemonsHouse_BrokenComputer
+ bg_event 7, 1, BGEVENT_READ, MrPokemonsHouse_BrokenComputer
+ bg_event 6, 4, BGEVENT_READ, MrPokemonsHouse_StrangeCoins
db 2 ; object events
object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -287,14 +287,14 @@
closetext
end
-MapNationalParkSignpost0Script:
- jumptext UnknownText_0x5c750
+NationalParkRelaxationSquareSign:
+ jumptext NationalParkRelaxationSquareText
-MapNationalParkSignpost1Script:
- jumptext UnknownText_0x5c771
+NationalParkBattleNoticeSign:
+ jumptext NationalParkBattleNoticeText
-MapNationalParkSignpost3Script:
- jumptext UnknownText_0x5c7c6
+NationalParkTrainerTipsSign:
+ jumptext NationalParkTrainerTipsText
NationalParkParlyzHeal:
itemball PARLYZ_HEAL
@@ -487,12 +487,12 @@
cont "because I'm cute!"
done
-UnknownText_0x5c750:
+NationalParkRelaxationSquareText:
text "RELAXATION SQUARE"
line "NATIONAL PARK"
done
-UnknownText_0x5c771:
+NationalParkBattleNoticeText:
text "What is this"
line "notice?"
@@ -503,7 +503,7 @@
line "WARDEN'S OFFICE"
done
-UnknownText_0x5c7c6:
+NationalParkTrainerTipsText:
text "TRAINER TIPS"
para "Print out MAIL by"
@@ -523,10 +523,10 @@
db 0 ; coord events
db 4 ; bg events
- bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script
- bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script
+ bg_event 14, 44, BGEVENT_READ, NationalParkRelaxationSquareSign
+ bg_event 27, 31, BGEVENT_READ, NationalParkBattleNoticeSign
bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal
- bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script
+ bg_event 12, 4, BGEVENT_READ, NationalParkTrainerTipsSign
db 14 ; object events
object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -97,14 +97,14 @@
closetext
end
-MapNationalParkBugContestSignpost0Script:
- jumptext UnknownText_0x5cba7
+NationalParkBugContestRelaxationSquareSign:
+ jumptext NationalParkBugContestRelaxationSquareText
-MapNationalParkBugContestSignpost1Script:
- jumptext UnknownText_0x5cbc8
+NationalParkBugContestBattleNoticeSign:
+ jumptext NationalParkBugContestBattleNoticeText
-MapNationalParkBugContestSignpost3Script:
- jumptext UnknownText_0x5cc1d
+NationalParkBugContestTrainerTipsSign:
+ jumptext NationalParkBugContestTrainerTipsText
NationalParkBugContestParlyzHeal:
itemball PARLYZ_HEAL
@@ -194,12 +194,12 @@
line "for sure."
done
-UnknownText_0x5cba7:
+NationalParkBugContestRelaxationSquareText:
text "RELAXATION SQUARE"
line "NATIONAL PARK"
done
-UnknownText_0x5cbc8:
+NationalParkBugContestBattleNoticeText:
text "What is this"
line "notice?"
@@ -210,7 +210,7 @@
line "WARDEN'S OFFICE"
done
-UnknownText_0x5cc1d:
+NationalParkBugContestTrainerTipsText:
text "TRAINER TIPS"
para "Print out MAIL by"
@@ -230,10 +230,10 @@
db 0 ; coord events
db 4 ; bg events
- bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script
- bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script
+ bg_event 14, 44, BGEVENT_READ, NationalParkBugContestRelaxationSquareSign
+ bg_event 27, 31, BGEVENT_READ, NationalParkBugContestBattleNoticeSign
bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
- bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script
+ bg_event 12, 4, BGEVENT_READ, NationalParkBugContestTrainerTipsSign
db 12 ; object events
object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -128,14 +128,14 @@
NewBarkTownSign:
jumptext NewBarkTownSignText
-MapNewBarkTownSignpost1Script:
- jumptext PlayersHouseSignText
+NewBarkTownPlayersHouseSign:
+ jumptext NewBarkTownPlayersHouseSignText
-MapNewBarkTownSignpost2Script:
- jumptext ElmsLabSignText
+NewBarkTownElmsLabSign:
+ jumptext NewBarkTownElmsLabSignText
-MapNewBarkTownSignpost3Script:
- jumptext ElmsHouseSignText
+NewBarkTownElmsHouseSign:
+ jumptext NewBarkTownElmsHouseSignText
Movement_TeacherRunsToYou1_NBT:
step LEFT
@@ -267,15 +267,15 @@
cont "Beginning Blow"
done
-PlayersHouseSignText:
+NewBarkTownPlayersHouseSignText:
text "<PLAYER>'s House"
done
-ElmsLabSignText:
+NewBarkTownElmsLabSignText:
text "ELM #MON LAB"
done
-ElmsHouseSignText:
+NewBarkTownElmsHouseSignText:
text "ELM'S HOUSE"
done
@@ -294,9 +294,9 @@
db 4 ; bg events
bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
- bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script
- bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script
- bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script
+ bg_event 11, 5, BGEVENT_READ, NewBarkTownPlayersHouseSign
+ bg_event 3, 3, BGEVENT_READ, NewBarkTownElmsLabSign
+ bg_event 9, 13, BGEVENT_READ, NewBarkTownElmsHouseSign
db 3 ; object events
object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -581,7 +581,7 @@
setmapscene TIME_CAPSULE, SCENE_DEFAULT
end
-MapPokecenter2FSignpost0Script:
+Pokecenter2FLinkRecordSign:
refreshscreen
special DisplayLinkRecord
closetext
@@ -1034,7 +1034,7 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script
+ bg_event 7, 3, BGEVENT_READ, Pokecenter2FLinkRecordSign
db 4 ; object events
object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -112,10 +112,10 @@
closetext
end
-MapPokemonFanClubSignpost0Script:
+PokemonFanClubListenSign:
jumptext PokemonFanClubListenSignText
-MapPokemonFanClubSignpost1Script:
+PokemonFanClubBraggingSign:
jumptext PokemonFanClubBraggingSignText
UnknownText_0x191881:
@@ -304,8 +304,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script
- bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script
+ bg_event 7, 0, BGEVENT_READ, PokemonFanClubListenSign
+ bg_event 9, 0, BGEVENT_READ, PokemonFanClubBraggingSign
db 6 ; object events
object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubPresidentScript, -1
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -194,11 +194,11 @@
closetext
end
-MapRadioTower1FSignpost0Script:
- jumptext UnknownText_0x5d5e7
+RadioTower1FDirectory:
+ jumptext RadioTower1FDirectoryText
-MapRadioTower1FSignpost1Script:
- jumptext UnknownText_0x5d631
+RadioTower1FLuckyChannelSign:
+ jumptext RadioTower1FLuckyChannelSignText
MovementData_0x5ce71:
step RIGHT
@@ -448,7 +448,7 @@
cont "warn the others…"
done
-UnknownText_0x5d5e7:
+RadioTower1FDirectoryText:
text "1F RECEPTION"
line "2F SALES"
@@ -459,7 +459,7 @@
line " OFFICE"
done
-UnknownText_0x5d631:
+RadioTower1FLuckyChannelSignText:
text "LUCKY CHANNEL!"
para "Win with #MON"
@@ -481,8 +481,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script
- bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script
+ bg_event 3, 0, BGEVENT_READ, RadioTower1FDirectory
+ bg_event 13, 0, BGEVENT_READ, RadioTower1FLuckyChannelSign
db 6 ; object events
object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FReceptionistScript, -1
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -17,6 +17,7 @@
db 0 ; callbacks
UnknownScript_0x5d6fd:
+; unused
end
RadioTower2FSuperNerdScript:
@@ -324,14 +325,14 @@
closetext
end
-MapRadioTower2FSignpost0Script:
- jumptext UnknownText_0x5e426
+RadioTower2FSalesSign:
+ jumptext RadioTower2FSalesSignText
-MapRadioTower2FSignpost1Script:
- jumptext UnknownText_0x5e430
+RadioTower2FOaksPKMNTalkSign:
+ jumptext RadioTower2FOaksPKMNTalkSignText
-MapRadioTower2FSignpost5Script:
- jumptext UnknownText_0x5e463
+RadioTower2FPokemonRadioSign:
+ jumptext RadioTower2FPokemonRadioSignText
RadioTower2FBookshelf:
jumpstd magazinebookshelf
@@ -691,11 +692,11 @@
line "BLUE CARD!"
done
-UnknownText_0x5e426:
+RadioTower2FSalesSignText:
text "2F SALES"
done
-UnknownText_0x5e430:
+RadioTower2FOaksPKMNTalkSignText:
text "PROF.OAK'S #MON"
line "TALK"
@@ -703,7 +704,7 @@
line "on the Air!"
done
-UnknownText_0x5e463:
+RadioTower2FPokemonRadioSignText:
text "Anywhere, Anytime"
line "#MON Radio"
done
@@ -718,12 +719,12 @@
db 0 ; coord events
db 6 ; bg events
- bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script
- bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script
+ bg_event 3, 0, BGEVENT_READ, RadioTower2FSalesSign
+ bg_event 5, 0, BGEVENT_READ, RadioTower2FOaksPKMNTalkSign
bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf
bg_event 10, 1, BGEVENT_READ, RadioTower2FBookshelf
bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf
- bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script
+ bg_event 13, 0, BGEVENT_READ, RadioTower2FPokemonRadioSign
db 11 ; object events
object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -124,9 +124,9 @@
closetext
end
-MapRadioTower3FSignpost2Script::
+CardKeySlotScript::
opentext
- writetext UnknownText_0x5eaa4
+ writetext RadioTower3FCardKeySlotText
waitbutton
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue .UsedCardKey
@@ -148,11 +148,11 @@
waitsfx
end
-MapRadioTower3FSignpost0Script:
- jumptext UnknownText_0x5ead6
+RadioTower3FPersonnelSign:
+ jumptext RadioTower3FPersonnelSignText
-MapRadioTower3FSignpost1Script:
- jumptext UnknownText_0x5eae4
+RadioTower3FPokemonMusicSign:
+ jumptext RadioTower3FPokemonMusicSignText
RadioTower3FSuperNerdText:
text "We have recordings"
@@ -307,7 +307,7 @@
cont "I need from here."
done
-UnknownText_0x5eaa4:
+RadioTower3FCardKeySlotText:
text "It's the CARD KEY"
line "slot."
done
@@ -317,11 +317,11 @@
line "the CARD KEY."
done
-UnknownText_0x5ead6:
+RadioTower3FPersonnelSignText:
text "3F PERSONNEL"
done
-UnknownText_0x5eae4:
+RadioTower3FPokemonMusicSignText:
text "#MON MUSIC with"
line "Host DJ BEN"
done
@@ -337,9 +337,9 @@
db 0 ; coord events
db 3 ; bg events
- bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script
- bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script
- bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script
+ bg_event 3, 0, BGEVENT_READ, RadioTower3FPersonnelSign
+ bg_event 9, 0, BGEVENT_READ, RadioTower3FPokemonMusicSign
+ bg_event 14, 2, BGEVENT_UP, CardKeySlotScript
db 7 ; object events
object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -97,11 +97,11 @@
closetext
end
-MapRadioTower4FSignpost0Script:
- jumptext UnknownText_0x5effe
+RadioTower4FProductionSign:
+ jumptext RadioTower4FProductionSignText
-MapRadioTower4FSignpost1Script:
- jumptext UnknownText_0x5f00d
+RadioTower4FStudio2Sign:
+ jumptext RadioTower4FStudio2SignText
RadioTower4FFisherText:
text "I listened to the"
@@ -235,11 +235,11 @@
cont "stop TEAM ROCKET?"
done
-UnknownText_0x5effe:
+RadioTower4FProductionSignText:
text "4F PRODUCTION"
done
-UnknownText_0x5f00d:
+RadioTower4FStudio2SignText:
text "4F STUDIO 2"
done
@@ -255,8 +255,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script
- bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script
+ bg_event 7, 0, BGEVENT_READ, RadioTower4FProductionSign
+ bg_event 15, 0, BGEVENT_READ, RadioTower4FStudio2Sign
db 7 ; object events
object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -142,11 +142,11 @@
RadioTower5FUltraBall:
itemball ULTRA_BALL
-MapRadioTower5FSignpost0Script:
- jumptext SignpostRadioTower5FOffice
+RadioTower5FDirectorsOfficeSign:
+ jumptext RadioTower5FDirectorsOfficeSignText
-MapRadioTower5FSignpost2Script:
- jumptext SignpostRadioTower5FStudio
+RadioTower5FStudio1Sign:
+ jumptext RadioTower5FStudio1SignText
RadioTower5FBookshelf:
jumpstd magazinebookshelf
@@ -409,12 +409,12 @@
line "to our music?"
done
-SignpostRadioTower5FOffice:
+RadioTower5FDirectorsOfficeSignText:
text "5F DIRECTOR'S"
line " OFFICE"
done
-SignpostRadioTower5FStudio:
+RadioTower5FStudio1SignText:
text "5F STUDIO 1"
done
@@ -430,9 +430,9 @@
coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene
db 5 ; bg events
- bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
- bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
- bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
+ bg_event 3, 0, BGEVENT_READ, RadioTower5FDirectorsOfficeSign
+ bg_event 11, 0, BGEVENT_READ, RadioTower5FStudio1Sign
+ bg_event 15, 0, BGEVENT_READ, RadioTower5FStudio1Sign
bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf
bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -49,8 +49,8 @@
Route2Sign:
jumptext Route2SignText
-MapRoute2Signpost1Script:
- jumptext UnknownText_0x1ac49f
+Route2DiglettsCaveSign:
+ jumptext Route2DiglettsCaveSignText
Route2DireHit:
itemball DIRE_HIT
@@ -140,7 +140,7 @@
line "PEWTER CITY"
done
-UnknownText_0x1ac49f:
+Route2DiglettsCaveSignText:
text "DIGLETT'S CAVE"
done
@@ -158,7 +158,7 @@
db 6 ; bg events
bg_event 7, 51, BGEVENT_READ, Route2Sign
- bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script
+ bg_event 11, 9, BGEVENT_READ, Route2DiglettsCaveSign
bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal
bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -53,8 +53,8 @@
closetext
end
-MapRoute3Signpost0Script:
- jumptext UnknownText_0x1ae163
+Route3MtMoonSquareSign:
+ jumptext Route3MtMoonSquareSignText
FirebreatherOtisSeenText:
text "Ah! The weather's"
@@ -123,7 +123,7 @@
line "trainer…"
done
-UnknownText_0x1ae163:
+Route3MtMoonSquareSignText:
text "MT.MOON SQUARE"
para "Just go up the"
@@ -139,7 +139,7 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 49, 13, BGEVENT_READ, MapRoute3Signpost0Script
+ bg_event 49, 13, BGEVENT_READ, Route3MtMoonSquareSign
db 4 ; object events
object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -470,8 +470,9 @@
closetext
end
+Route34IlexForestSign:
; unused
- jumptext MapRoute34UnusedSignpostText
+ jumptext Route34IlexForestSignText
Route34Sign:
jumptext Route34SignText
@@ -724,7 +725,8 @@
line "startled us."
done
-MapRoute34UnusedSignpostText:
+Route34IlexForestSignText:
+; unused
text "ILEX FOREST"
line "THROUGH THE GATE"
done
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -200,8 +200,8 @@
Route35NationalParkGateYoungsterScript:
jumptextfaceplayer Route35NationalParkGateYoungsterText
-MapRoute36NationalParkGateSignpost0Script:
- jumptext UnknownText_0x6a90e
+BugCatchingContestExplanationSign:
+ jumptext BugCatchingContestExplanationText
Route35NationalParkGate_GetDayOfWeek:
jumpstd daytotext
@@ -415,7 +415,7 @@
cont "test going to be?"
done
-UnknownText_0x6a90e:
+BugCatchingContestExplanationText:
text "The Bug-Catching"
line "Contest is held on"
@@ -447,7 +447,7 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
+ bg_event 5, 0, BGEVENT_READ, BugCatchingContestExplanationSign
db 3 ; object events
object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -859,7 +859,7 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
+ bg_event 6, 0, BGEVENT_READ, BugCatchingContestExplanationSign
db 12 ; object events
object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -45,7 +45,7 @@
closetext
end
-MapRuinsOfAlphAerodactylChamberSignpost2Script:
+RuinsOfAlphAerodactylChamberPuzzle:
refreshscreen
writebyte UNOWNPUZZLE_AERODACTYL
special UnownPuzzle
@@ -72,25 +72,25 @@
warpcheck
end
-MapRuinsOfAlphAerodactylChamberSignpost1Script:
- jumptext UnknownText_0x58ec2
+RuinsOfAlphAerodactylChamberAncientReplica:
+ jumptext RuinsOfAlphAerodactylChamberAncientReplicaText
-MapRuinsOfAlphAerodactylChamberSignpost3Script:
- jumptext UnknownText_0x58ee7
+RuinsOfAlphAerodactylChamberDescriptionSign:
+ jumptext RuinsOfAlphAerodactylChamberDescriptionText
-MapRuinsOfAlphAerodactylChamberSignpost4Script:
+RuinsOfAlphAerodactylChamberWallPatternLeft:
opentext
- writetext UnknownText_0x58e4f
+ writetext RuinsOfAlphAerodactylChamberWallPatternLeftText
writebyte UNOWNWORDS_LIGHT
special DisplayUnownWords
closetext
end
-MapRuinsOfAlphAerodactylChamberSignpost5Script:
+RuinsOfAlphAerodactylChamberWallPatternRight:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
iftrue .WallOpen
opentext
- writetext UnknownText_0x58e81
+ writetext RuinsOfAlphAerodactylChamberWallPatternRightText
writebyte UNOWNWORDS_LIGHT
special DisplayUnownWords
closetext
@@ -98,7 +98,7 @@
.WallOpen:
opentext
- writetext UnknownText_0x58ea2
+ writetext RuinsOfAlphAerodactylChamberWallHoleText
waitbutton
closetext
end
@@ -107,33 +107,33 @@
skyfall_top
step_end
-UnknownText_0x58e4f:
+RuinsOfAlphAerodactylChamberWallPatternLeftText:
text "Patterns appeared"
line "on the walls…"
done
+RuinsOfAlphAerodactylChamberUnownText:
; unused
-UnusedText_0x58e70:
text "It's UNOWN text!"
done
-UnknownText_0x58e81:
+RuinsOfAlphAerodactylChamberWallPatternRightText:
text "Patterns appeared"
line "on the walls…"
done
-UnknownText_0x58ea2:
+RuinsOfAlphAerodactylChamberWallHoleText:
text "There's a big hole"
line "in the wall!"
done
-UnknownText_0x58ec2:
+RuinsOfAlphAerodactylChamberAncientReplicaText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-UnknownText_0x58ee7:
+RuinsOfAlphAerodactylChamberDescriptionText:
text "This flying #-"
line "MON attacked its"
@@ -154,11 +154,11 @@
db 0 ; coord events
db 6 ; bg events
- bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
- bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
- bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
- bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script
- bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
- bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
+ bg_event 2, 3, BGEVENT_READ, RuinsOfAlphAerodactylChamberAncientReplica
+ bg_event 5, 3, BGEVENT_READ, RuinsOfAlphAerodactylChamberAncientReplica
+ bg_event 3, 2, BGEVENT_UP, RuinsOfAlphAerodactylChamberPuzzle
+ bg_event 4, 2, BGEVENT_UP, RuinsOfAlphAerodactylChamberDescriptionSign
+ bg_event 3, 0, BGEVENT_UP, RuinsOfAlphAerodactylChamberWallPatternLeft
+ bg_event 4, 0, BGEVENT_UP, RuinsOfAlphAerodactylChamberWallPatternRight
db 0 ; object events
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -21,10 +21,10 @@
RuinsOfAlphAerodactylItemRoomEnergyRoot:
itemball ENERGY_ROOT
-MapRuinsOfAlphAerodactylItemRoomSignpost1Script:
- jumptext UnknownText_0x59ac1
+RuinsOfAlphAerodactylItemRoomAncientReplica:
+ jumptext RuinsOfAlphAerodactylItemRoomAncientReplicaText
-UnknownText_0x59ac1:
+RuinsOfAlphAerodactylItemRoomAncientReplicaText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
@@ -42,8 +42,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
- bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
+ bg_event 2, 1, BGEVENT_READ, RuinsOfAlphAerodactylItemRoomAncientReplica
+ bg_event 5, 1, BGEVENT_READ, RuinsOfAlphAerodactylItemRoomAncientReplica
db 4 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -46,7 +46,7 @@
closetext
end
-MapRuinsOfAlphHoOhChamberSignpost2Script:
+RuinsOfAlphHoOhChamberPuzzle:
refreshscreen
writebyte UNOWNPUZZLE_HO_OH
special UnownPuzzle
@@ -73,25 +73,25 @@
warpcheck
end
-MapRuinsOfAlphHoOhChamberSignpost1Script:
- jumptext UnknownText_0x58685
+RuinsOfAlphHoOhChamberAncientReplica:
+ jumptext RuinsOfAlphHoOhChamberAncientReplicaText
-MapRuinsOfAlphHoOhChamberSignpost3Script:
- jumptext UnknownText_0x586aa
+RuinsOfAlphHoOhChamberDescriptionSign:
+ jumptext RuinsOfAlphHoOhChamberDescriptionText
-MapRuinsOfAlphHoOhChamberSignpost4Script:
+RuinsOfAlphHoOhChamberWallPatternLeft:
opentext
- writetext UnknownText_0x58612
+ writetext RuinsOfAlphHoOhChamberWallPatternLeftText
writebyte UNOWNWORDS_HO_OH
special DisplayUnownWords
closetext
end
-MapRuinsOfAlphHoOhChamberSignpost5Script:
+RuinsOfAlphHoOhChamberWallPatternRight:
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue .WallOpen
opentext
- writetext UnknownText_0x58644
+ writetext RuinsOfAlphHoOhChamberWallPatternRightText
writebyte UNOWNWORDS_HO_OH
special DisplayUnownWords
closetext
@@ -99,7 +99,7 @@
.WallOpen:
opentext
- writetext UnknownText_0x58665
+ writetext RuinsOfAlphHoOhChamberWallHoleText
waitbutton
closetext
end
@@ -108,33 +108,33 @@
skyfall_top
step_end
-UnknownText_0x58612:
+RuinsOfAlphHoOhChamberWallPatternLeftText:
text "Patterns appeared"
line "on the walls…"
done
+RuinsOfAlphHoOhChamberUnownText:
; unused
-UnusedText_0x58633:
text "It's UNOWN text!"
done
-UnknownText_0x58644:
+RuinsOfAlphHoOhChamberWallPatternRightText:
text "Patterns appeared"
line "on the walls…"
done
-UnknownText_0x58665:
+RuinsOfAlphHoOhChamberWallHoleText:
text "There's a big hole"
line "in the wall!"
done
-UnknownText_0x58685:
+RuinsOfAlphHoOhChamberAncientReplicaText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-UnknownText_0x586aa:
+RuinsOfAlphHoOhChamberDescriptionText:
text "A #MON that"
line "flew gracefully on"
@@ -155,11 +155,11 @@
db 0 ; coord events
db 6 ; bg events
- bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
- bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
- bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
- bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script
- bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
- bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
+ bg_event 2, 3, BGEVENT_READ, RuinsOfAlphHoOhChamberAncientReplica
+ bg_event 5, 3, BGEVENT_READ, RuinsOfAlphHoOhChamberAncientReplica
+ bg_event 3, 2, BGEVENT_UP, RuinsOfAlphHoOhChamberPuzzle
+ bg_event 4, 2, BGEVENT_UP, RuinsOfAlphHoOhChamberDescriptionSign
+ bg_event 3, 0, BGEVENT_UP, RuinsOfAlphHoOhChamberWallPatternLeft
+ bg_event 4, 0, BGEVENT_UP, RuinsOfAlphHoOhChamberWallPatternRight
db 0 ; object events
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -21,10 +21,10 @@
RuinsOfAlphHoOhItemRoomCharcoal:
itemball CHARCOAL
-MapRuinsOfAlphHoOhItemRoomSignpost1Script:
- jumptext UnknownText_0x59923
+RuinsOfAlphHoOhItemRoomAncientReplica:
+ jumptext RuinsOfAlphHoOhItemRoomAncientReplicaText
-UnknownText_0x59923:
+RuinsOfAlphHoOhItemRoomAncientReplicaText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
@@ -42,8 +42,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
- bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
+ bg_event 2, 1, BGEVENT_READ, RuinsOfAlphHoOhItemRoomAncientReplica
+ bg_event 5, 1, BGEVENT_READ, RuinsOfAlphHoOhItemRoomAncientReplica
db 4 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -52,7 +52,7 @@
RuinsOfAlphKabutoChamberReceptionistScript:
jumptextfaceplayer RuinsOfAlphKabutoChamberReceptionistText
-MapRuinsOfAlphKabutoChamberSignpost2Script:
+RuinsOfAlphKabutoChamberPuzzle:
refreshscreen
writebyte UNOWNPUZZLE_KABUTO
special UnownPuzzle
@@ -110,25 +110,25 @@
closetext
end
-MapRuinsOfAlphKabutoChamberSignpost1Script:
- jumptext UnknownText_0x58b1a
+RuinsOfAlphKabutoChamberAncientReplica:
+ jumptext RuinsOfAlphKabutoChamberAncientReplicaText
-MapRuinsOfAlphKabutoChamberSignpost3Script:
- jumptext UnknownText_0x58b3f
+RuinsOfAlphKabutoChamberDescriptionSign:
+ jumptext RuinsOfAlphKabutoChamberDescriptionText
-MapRuinsOfAlphKabutoChamberSignpost4Script:
+RuinsOfAlphKabutoChamberWallPatternLeft:
opentext
- writetext UnknownText_0x58aa7
+ writetext RuinsOfAlphKabutoChamberWallPatternLeftText
writebyte UNOWNWORDS_ESCAPE
special DisplayUnownWords
closetext
end
-MapRuinsOfAlphKabutoChamberSignpost5Script:
+RuinsOfAlphKabutoChamberWallPatternRight:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue .WallOpen
opentext
- writetext UnknownText_0x58ad9
+ writetext RuinsOfAlphKabutoChamberWallPatternRightText
writebyte UNOWNWORDS_ESCAPE
special DisplayUnownWords
closetext
@@ -136,7 +136,7 @@
.WallOpen:
opentext
- writetext UnknownText_0x58afa
+ writetext RuinsOfAlphKabutoChamberWallHoleText
waitbutton
closetext
end
@@ -200,8 +200,8 @@
cont "this wall here…"
done
-; unused
UnusedText_0x58a03:
+; unused
text "The patterns on"
line "the wall appear to"
cont "be words!"
@@ -219,33 +219,33 @@
line "yet…"
done
-UnknownText_0x58aa7:
+RuinsOfAlphKabutoChamberWallPatternLeftText:
text "Patterns appeared"
line "on the walls…"
done
+RuinsOfAlphKabutoChamberUnownText:
; unused
-UnusedText_0x58ac8:
text "It's UNOWN text!"
done
-UnknownText_0x58ad9:
+RuinsOfAlphKabutoChamberWallPatternRightText:
text "Patterns appeared"
line "on the walls…"
done
-UnknownText_0x58afa:
+RuinsOfAlphKabutoChamberWallHoleText:
text "There's a big hole"
line "in the wall!"
done
-UnknownText_0x58b1a:
+RuinsOfAlphKabutoChamberAncientReplicaText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-UnknownText_0x58b3f:
+RuinsOfAlphKabutoChamberDescriptionText:
text "A #MON that hid"
line "on the sea floor."
@@ -266,12 +266,12 @@
db 0 ; coord events
db 6 ; bg events
- bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
- bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
- bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script
- bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script
- bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script
- bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script
+ bg_event 2, 3, BGEVENT_READ, RuinsOfAlphKabutoChamberAncientReplica
+ bg_event 5, 3, BGEVENT_READ, RuinsOfAlphKabutoChamberAncientReplica
+ bg_event 3, 2, BGEVENT_UP, RuinsOfAlphKabutoChamberPuzzle
+ bg_event 4, 2, BGEVENT_UP, RuinsOfAlphKabutoChamberDescriptionSign
+ bg_event 3, 0, BGEVENT_UP, RuinsOfAlphKabutoChamberWallPatternLeft
+ bg_event 4, 0, BGEVENT_UP, RuinsOfAlphKabutoChamberWallPatternRight
db 2 ; object events
object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -21,10 +21,10 @@
RuinsOfAlphKabutoItemRoomEnergypowder:
itemball ENERGYPOWDER
-MapRuinsOfAlphKabutoItemRoomSignpost1Script:
- jumptext UnknownText_0x599ad
+RuinsOfAlphKabutoItemRoomAncientReplica:
+ jumptext RuinsOfAlphKabutoItemRoomAncientReplicaText
-UnknownText_0x599ad:
+RuinsOfAlphKabutoItemRoomAncientReplicaText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
@@ -42,8 +42,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
- bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
+ bg_event 2, 1, BGEVENT_READ, RuinsOfAlphKabutoItemRoomAncientReplica
+ bg_event 5, 1, BGEVENT_READ, RuinsOfAlphKabutoItemRoomAncientReplica
db 4 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -46,7 +46,7 @@
closetext
end
-MapRuinsOfAlphOmanyteChamberSignpost2Script:
+RuinsOfAlphOmanyteChamberPuzzle:
refreshscreen
writebyte UNOWNPUZZLE_OMANYTE
special UnownPuzzle
@@ -73,25 +73,25 @@
warpcheck
end
-MapRuinsOfAlphOmanyteChamberSignpost1Script:
- jumptext UnknownText_0x58d01
+RuinsOfAlphOmanyteChamberAncientReplica:
+ jumptext RuinsOfAlphOmanyteChamberAncientReplicaText
-MapRuinsOfAlphOmanyteChamberSignpost3Script:
- jumptext UnknownText_0x58d26
+RuinsOfAlphOmanyteChamberDescriptionSign:
+ jumptext RuinsOfAlphOmanyteChamberDescriptionText
-MapRuinsOfAlphOmanyteChamberSignpost4Script:
+RuinsOfAlphOmanyteChamberWallPatternLeft:
opentext
- writetext UnknownText_0x58c8e
+ writetext RuinsOfAlphOmanyteChamberWallPatternLeftText
writebyte UNOWNWORDS_WATER
special DisplayUnownWords
closetext
end
-MapRuinsOfAlphOmanyteChamberSignpost5Script:
+RuinsOfAlphOmanyteChamberWallPatternRight:
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue .WallOpen
opentext
- writetext UnknownText_0x58cc0
+ writetext RuinsOfAlphOmanyteChamberWallPatternRightText
writebyte UNOWNWORDS_WATER
special DisplayUnownWords
closetext
@@ -99,7 +99,7 @@
.WallOpen:
opentext
- writetext UnknownText_0x58ce1
+ writetext RuinsOfAlphOmanyteChamberWallHoleText
waitbutton
closetext
end
@@ -108,33 +108,33 @@
skyfall_top
step_end
-UnknownText_0x58c8e:
+RuinsOfAlphOmanyteChamberWallPatternLeftText:
text "Patterns appeared"
line "on the walls…"
done
+RuinsOfAlphOmanyteChamberUnownText:
; unused
-UnusedText_0x58caf:
text "It's UNOWN text!"
done
-UnknownText_0x58cc0:
+RuinsOfAlphOmanyteChamberWallPatternRightText:
text "Patterns appeared"
line "on the walls…"
done
-UnknownText_0x58ce1:
+RuinsOfAlphOmanyteChamberWallHoleText:
text "There's a big hole"
line "in the wall!"
done
-UnknownText_0x58d01:
+RuinsOfAlphOmanyteChamberAncientReplicaText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
done
-UnknownText_0x58d26:
+RuinsOfAlphOmanyteChamberDescriptionText:
text "This #MON"
line "drifted in the"
@@ -155,11 +155,11 @@
db 0 ; coord events
db 6 ; bg events
- bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
- bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
- bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script
- bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script
- bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script
- bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script
+ bg_event 2, 3, BGEVENT_READ, RuinsOfAlphOmanyteChamberAncientReplica
+ bg_event 5, 3, BGEVENT_READ, RuinsOfAlphOmanyteChamberAncientReplica
+ bg_event 3, 2, BGEVENT_UP, RuinsOfAlphOmanyteChamberPuzzle
+ bg_event 4, 2, BGEVENT_UP, RuinsOfAlphOmanyteChamberDescriptionSign
+ bg_event 3, 0, BGEVENT_UP, RuinsOfAlphOmanyteChamberWallPatternLeft
+ bg_event 4, 0, BGEVENT_UP, RuinsOfAlphOmanyteChamberWallPatternRight
db 0 ; object events
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -21,10 +21,10 @@
RuinsOfAlphOmanyteItemRoomStarPiece:
itemball STAR_PIECE
-MapRuinsOfAlphOmanyteItemRoomSignpost1Script:
- jumptext UnknownText_0x59a37
+RuinsOfAlphOmanyteItemRoomAncientReplica:
+ jumptext RuinsOfAlphOmanyteItemRoomAncientReplicaText
-UnknownText_0x59a37:
+RuinsOfAlphOmanyteItemRoomAncientReplicaText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
@@ -42,8 +42,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
- bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
+ bg_event 2, 1, BGEVENT_READ, RuinsOfAlphOmanyteItemRoomAncientReplica
+ bg_event 5, 1, BGEVENT_READ, RuinsOfAlphOmanyteItemRoomAncientReplica
db 4 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -130,7 +130,7 @@
closetext
end
-MapRuinsOfAlphResearchCenterSignpost1Script:
+RuinsOfAlphResearchCenterComputer:
opentext
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
iftrue .SkipChecking
@@ -137,18 +137,18 @@
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, .GotAllUnown
.SkipChecking:
- writetext UnknownText_0x597b6
+ writetext RuinsOfAlphResearchCenterComputerText1
waitbutton
closetext
end
.GotAllUnown:
- writetext UnknownText_0x597d9
+ writetext RuinsOfAlphResearchCenterComputerText2
waitbutton
closetext
end
-MapRuinsOfAlphResearchCenterSignpost2Script:
+RuinsOfAlphResearchCenterPrinter:
opentext
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
iftrue .SkipChecking
@@ -155,23 +155,24 @@
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, .PrinterAvailable
.SkipChecking:
- writetext UnknownText_0x5980e
+ writetext RuinsOfAlphResearchCenterDoesntWorkText
waitbutton
closetext
end
.PrinterAvailable:
- writetext UnknownText_0x5982d
+ writetext RuinsOfAlphResearchCenterUnownPrinterText
waitbutton
special UnownPrinter
closetext
end
-UnreferencedScript_0x59269:
- jumptext UnusedText_0x59848
+RuinsOfAlphResearchCenterPhoto:
+; unreferenced
+ jumptext RuinsOfAlphResearchCenterProfSilktreePhotoText
-MapRuinsOfAlphResearchCenterSignpost0Script:
- jumptext UnknownText_0x59886
+RuinsOfAlphResearchCenterBookshelf:
+ jumptext RuinsOfAlphResearchCenterAcademicBooksText
MovementData_0x5926f:
step UP
@@ -347,7 +348,7 @@
line "deepens…"
done
-UnknownText_0x597b6:
+RuinsOfAlphResearchCenterComputerText1:
text "RUINS OF ALPH"
para "Exploration"
@@ -354,7 +355,7 @@
line "Year 10"
done
-UnknownText_0x597d9:
+RuinsOfAlphResearchCenterComputerText2:
text "Mystery #MON"
line "Name: UNOWN"
@@ -362,18 +363,18 @@
line "kinds found."
done
-UnknownText_0x5980e:
+RuinsOfAlphResearchCenterDoesntWorkText:
text "This doesn't seem"
line "to work yet."
done
-UnknownText_0x5982d:
+RuinsOfAlphResearchCenterUnownPrinterText:
text "UNOWN may be"
line "printed out."
done
+RuinsOfAlphResearchCenterProfSilktreePhotoText:
; unused
-UnusedText_0x59848:
text "It's a photo of"
line "the RESEARCH"
@@ -381,7 +382,7 @@
line "PROF.SILKTREE."
done
-UnknownText_0x59886:
+RuinsOfAlphResearchCenterAcademicBooksText:
text "There are many"
line "academic books."
@@ -400,9 +401,9 @@
db 0 ; coord events
db 3 ; bg events
- bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script
- bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script
- bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script
+ bg_event 6, 5, BGEVENT_READ, RuinsOfAlphResearchCenterBookshelf
+ bg_event 3, 4, BGEVENT_READ, RuinsOfAlphResearchCenterComputer
+ bg_event 7, 1, BGEVENT_READ, RuinsOfAlphResearchCenterPrinter
db 3 ; object events
object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -37,8 +37,8 @@
SproutTower1FParlyzHeal:
itemball PARLYZ_HEAL
-MapSproutTower1FSignpost1Script:
- jumptext UnknownText_0x1846d6
+SproutTower1FStatue:
+ jumptext SproutTower1FStatueText
SageChowSeenText:
text "We stand guard in"
@@ -93,7 +93,7 @@
line "ing upstairs."
done
-UnknownText_0x1846d6:
+SproutTower1FStatueText:
text "A #MON statue…"
para "It looks very"
@@ -113,8 +113,8 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
- bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
+ bg_event 7, 15, BGEVENT_READ, SproutTower1FStatue
+ bg_event 12, 15, BGEVENT_READ, SproutTower1FStatue
db 6 ; object events
object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -30,8 +30,8 @@
closetext
end
-MapSproutTower2FSignpost0Script:
- jumptext UnknownText_0x1848c8
+SproutTower2FStatue:
+ jumptext SproutTower2FStatueText
SproutTower2FXAccuracy:
itemball X_ACCURACY
@@ -75,7 +75,7 @@
line "well enough."
done
-UnknownText_0x1848c8:
+SproutTower2FStatueText:
text "A #MON statue…"
para "It looks very"
@@ -94,7 +94,7 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script
+ bg_event 12, 15, BGEVENT_READ, SproutTower2FStatue
db 3 ; object events
object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -123,11 +123,11 @@
closetext
end
-MapSproutTower3FSignpost3Script:
- jumptext UnknownText_0x184f37
+SproutTower3FPainting:
+ jumptext SproutTower3FPaintingText
-MapSproutTower3FSignpost5Script:
- jumptext UnknownText_0x184f61
+SproutTower3FStatue:
+ jumptext SproutTower3FStatueText
SproutTower3FPotion:
itemball POTION
@@ -314,13 +314,13 @@
line "on your journey."
done
-UnknownText_0x184f37:
+SproutTower3FPaintingText:
text "It's a powerful"
line "painting of a"
cont "BELLSPROUT."
done
-UnknownText_0x184f61:
+SproutTower3FStatueText:
text "A #MON statue…"
para "It looks very"
@@ -337,12 +337,12 @@
coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947
db 6 ; bg events
- bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
- bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
- bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
- bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
- bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
- bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
+ bg_event 8, 1, BGEVENT_READ, SproutTower3FStatue
+ bg_event 11, 1, BGEVENT_READ, SproutTower3FStatue
+ bg_event 9, 0, BGEVENT_READ, SproutTower3FPainting
+ bg_event 10, 0, BGEVENT_READ, SproutTower3FPainting
+ bg_event 5, 15, BGEVENT_READ, SproutTower3FStatue
+ bg_event 14, 15, BGEVENT_READ, SproutTower3FStatue
db 7 ; object events
object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -500,17 +500,17 @@
closetext
end
-MapTeamRocketBaseB1FSignpost5Script:
- jumptext SecurityCameraText
+TeamRocketBaseB1FSecurityCamera:
+ jumptext TeamRocketBaseB1FSecurityCameraText
-MapTeamRocketBaseB1FSignpost7Script:
+TeamRocketBaseB1FBookshelf:
jumpstd teamrocketoath
-MapTeamRocketBaseB1FSignpost0Script:
+TeamRocketBaseB1FSecretSwitch:
opentext
checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS
- iftrue UnknownScript_0x6cabe
- writetext UnknownText_0x6cdad
+ iftrue .SecretSwitchOff
+ writetext TeamRocketBaseB1FSecretSwitchText
playsound SFX_TALLY
waitbutton
closetext
@@ -522,8 +522,8 @@
setevent EVENT_SECURITY_CAMERA_5
end
-UnknownScript_0x6cabe:
- writetext UnknownText_0x6cdd0
+.SecretSwitchOff:
+ writetext TeamRocketBaseB1FSwitchOffText
waitbutton
closetext
end
@@ -706,7 +706,7 @@
cont "courage and walk."
done
-SecurityCameraText:
+TeamRocketBaseB1FSecurityCameraText:
text "It's a PERSIAN"
line "statue…"
@@ -714,12 +714,12 @@
line "shiny."
done
-UnknownText_0x6cdad:
+TeamRocketBaseB1FSecretSwitchText:
text "A secret switch!"
line "Better press it."
done
-UnknownText_0x6cdd0:
+TeamRocketBaseB1FSwitchOffText:
text "The switch is"
line "turned off."
done
@@ -770,14 +770,14 @@
coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22
db 9 ; bg events
- bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
- bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 22, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 20, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
- bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
+ bg_event 19, 11, BGEVENT_READ, TeamRocketBaseB1FSecretSwitch
+ bg_event 24, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+ bg_event 6, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+ bg_event 8, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+ bg_event 22, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+ bg_event 24, 5, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+ bg_event 20, 11, BGEVENT_READ, TeamRocketBaseB1FBookshelf
+ bg_event 21, 11, BGEVENT_READ, TeamRocketBaseB1FBookshelf
bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
db 6 ; object events
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -34,19 +34,19 @@
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
end
-MapTimeCapsuleSignpost1Script:
+TimeCapsuleConsoleScript:
special TimeCapsule
newloadmap MAPSETUP_LINKRETURN
end
-ChrisScript_0x19351a:
+TimeCapsuleFriendScript:
opentext
- writetext UnknownText_0x193521
+ writetext .FriendReadyText
waitbutton
closetext
end
-UnknownText_0x193521:
+.FriendReadyText:
text "Your friend is"
line "ready."
done
@@ -61,9 +61,9 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script
- bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script
+ bg_event 4, 4, BGEVENT_RIGHT, TimeCapsuleConsoleScript
+ bg_event 5, 4, BGEVENT_LEFT, TimeCapsuleConsoleScript
db 2 ; object events
- object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+ object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TimeCapsuleFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+ object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TimeCapsuleFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -34,12 +34,13 @@
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
end
-MapTradeCenterSignpost1Script:
+TradeCenterConsoleScript:
special TradeCenter
newloadmap MAPSETUP_LINKRETURN
end
-ChrisScript_0x19340b:
+TradeCenterFriendScript:
+; unreferenced
opentext
writetext .FriendReadyText
waitbutton
@@ -61,9 +62,9 @@
db 0 ; coord events
db 2 ; bg events
- bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script
- bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script
+ bg_event 4, 4, BGEVENT_RIGHT, TradeCenterConsoleScript
+ bg_event 5, 4, BGEVENT_LEFT, TradeCenterConsoleScript
db 2 ; object events
- object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+ object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+ object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -25,14 +25,14 @@
TrainerHouse1FGentlemanScript:
jumptextfaceplayer TrainerHouse1FGentlemanText
-MapTrainerHouse1FSignpost0Script:
- jumptext UnknownText_0x9b1f4
+TrainerHouseSign1:
+ jumptext TrainerHouseSign1Text
-MapTrainerHouse1FSignpost1Script:
- jumptext UnknownText_0x9b25d
+TrainerHouseSign2:
+ jumptext TrainerHouseSign2Text
-MapTrainerHouse1FSignpost2Script:
- jumptext UnknownText_0x9b2c1
+TrainerHouseIllegibleBook:
+ jumptext TrainerHouseIllegibleText
TrainerHouse1FReceptionistText:
text "Welcome to TRAINER"
@@ -101,7 +101,7 @@
cont "battles."
done
-UnknownText_0x9b1f4:
+TrainerHouseSign1Text:
text "Practice battles"
line "are held in the"
@@ -113,7 +113,7 @@
cont "participate."
done
-UnknownText_0x9b25d:
+TrainerHouseSign2Text:
text "There are no rules"
line "or regulations for"
@@ -124,7 +124,7 @@
line "goes!"
done
-UnknownText_0x9b2c1:
+TrainerHouseIllegibleText:
text "…What's this?"
line "A strategy memo?"
@@ -146,9 +146,9 @@
db 0 ; coord events
db 3 ; bg events
- bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script
- bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script
- bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script
+ bg_event 5, 0, BGEVENT_READ, TrainerHouseSign1
+ bg_event 7, 0, BGEVENT_READ, TrainerHouseSign2
+ bg_event 7, 10, BGEVENT_READ, TrainerHouseIllegibleBook
db 5 ; object events
object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -91,8 +91,8 @@
closetext
end
-MapVermilionGymSignpost14Script:
- jumptext UnknownText_0x19261e
+VermilionGymTrashCan:
+ jumptext VermilionGymTrashCanText
VermilionGymStatue:
checkflag ENGINE_THUNDERBADGE
@@ -253,7 +253,7 @@
line "nervous."
done
-UnknownText_0x19261e:
+VermilionGymTrashCanText:
text "Nope! Nothing here"
line "but trash."
done
@@ -268,21 +268,21 @@
db 0 ; coord events
db 17 ; bg events
- bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
- bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+ bg_event 1, 7, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 3, 7, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 5, 7, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 7, 7, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 9, 7, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 1, 9, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 3, 9, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 5, 9, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 7, 9, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 9, 9, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 1, 11, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 3, 11, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 5, 11, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 7, 11, BGEVENT_READ, VermilionGymTrashCan
+ bg_event 9, 11, BGEVENT_READ, VermilionGymTrashCan
bg_event 3, 15, BGEVENT_READ, VermilionGymStatue
bg_event 6, 15, BGEVENT_READ, VermilionGymStatue