ref: 12070ca50067d3abe36a730190f88ee43f2cace9
parent: b2f5362ec3582a94269212e26676d81ddbf47cdf
parent: 4e4d9c908362a7c69f7c2839c3c678da797373d5
author: yenatch <[email protected]>
date: Sat Mar 10 11:16:03 EST 2018
Merge pull request #496 from Rangi42/master Label more map scripts; document more bugs [ready to merge]
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -283,12 +283,13 @@
add_hm WHIRLPOOL ; f8
add_hm WATERFALL ; f9
NUM_HMS = const_value - HM01
- const ITEM_FA ; fa
add_mt FLAMETHROWER
add_mt THUNDERBOLT
add_mt ICE_BEAM
NUM_TM_HM_TUTOR = __enum__ + -1
+
+ const ITEM_FA ; fa
USE_SCRIPT_VAR EQU $00
ITEM_FROM_MEM EQU $ff
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -37,6 +37,9 @@
; day-care
MAX_DAY_CARE_EXP EQU $500000
+; hall of fame
+HOF_MASTER_COUNT EQU 200
+
; bug-catching contest
BUG_CONTEST_MINUTES EQU 20
BUG_CONTEST_SECONDS EQU 0
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -16,6 +16,7 @@
db \4
ENDM
+; Connections go in order: north, south, west, east
connection: MACRO
;\1: direction
;\2: map name
--- a/data/phone/text/bill.asm
+++ b/data/phone/text/bill.asm
@@ -28,7 +28,7 @@
line "SERVICE."
done
-BillPhoneGeneriText: ; 0x1b44fe
+BillPhoneGenericText: ; 0x1b44fe
text "Who's calling?"
para "<PLAY_G>, is it?"
--- /dev/null
+++ b/data/phone/text/trainers.asm
@@ -1,0 +1,1991 @@
+UnknownText_0x1b4dc5: ; 0x1b4dc5
+ text "Hello. This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Good morning,"
+ line "<PLAY_G>!"
+ done
+
+UnknownText_0x1b4ded: ; 0x1b4ded
+ text "Hello. This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "How's it going,"
+ line "<PLAY_G>?"
+ done
+
+UnknownText_0x1b4e16: ; 0x1b4e16
+ text "Hello. This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Good evening,"
+ line "<PLAY_G>!"
+ done
+
+UnknownText_0x1b4e3e: ; 0x1b4e3e
+ text "<PLAY_G>, good"
+ line "morning!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "How are you doing?"
+ done
+
+UnknownText_0x1b4e72: ; 0x1b4e72
+ text "<PLAY_G>, howdy!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Isn't it nice out?"
+ done
+
+UnknownText_0x1b4e9e: ; 0x1b4e9e
+ text "<PLAY_G>, good"
+ line "evening!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Got a minute?"
+ done
+
+UnknownText_0x1b4ecd: ; 0x1b4ecd
+ text "How are your"
+ line "#MON doing?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text " is"
+ line "so curious, it's a"
+
+ para "problem. Maybe"
+ line "it's like me…"
+ done
+
+UnknownText_0x1b4f21: ; 0x1b4f21
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh! Good morning,"
+ line "<PLAYER>."
+ done
+
+UnknownText_0x1b4f4d: ; 0x1b4f4d
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh! Good day,"
+ line "<PLAYER>."
+ done
+
+UnknownText_0x1b4f75: ; 0x1b4f75
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh! Good evening,"
+ line "<PLAYER>."
+ done
+
+UnknownText_0x1b4fa1: ; 0x1b4fa1
+ text "Hello, <PLAYER>."
+ line "Good morning."
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Were you asleep?"
+ done
+
+UnknownText_0x1b4fda: ; 0x1b4fda
+ text "Hi, <PLAYER>."
+ line "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "How are you doing?"
+ done
+
+UnknownText_0x1b5004: ; 0x1b5004
+ text "Hi, <PLAYER>."
+ line "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Were you awake?"
+ done
+
+UnknownText_0x1b502b: ; 0x1b502b
+ text "Keeping your"
+ line "#MON happy?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text " is"
+ line "healthy. It eats a"
+ cont "lot every day."
+ done
+
+UnknownText_0x1b5073: ; 0x1b5073
+ text "Yeah, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Huh? What's up,"
+ line "<PLAYER>?"
+ done
+
+UnknownText_0x1b509b: ; 0x1b509b
+ text "Yeah, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Huh? What's up"
+ line "<PLAYER>?"
+ done
+
+UnknownText_0x1b50c2: ; 0x1b50c2
+ text "Yeah, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Huh? What's up"
+ line "<PLAYER>?"
+ done
+
+UnknownText_0x1b50e9: ; 0x1b50e9
+ text "Yo, <PLAYER>!"
+ line "You awake?"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "How's it going?"
+ done
+
+UnknownText_0x1b511a: ; 0x1b511a
+ text "Yo, <PLAYER>! You"
+ line "free right now?"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "How's it going?"
+ done
+
+UnknownText_0x1b5154: ; 0x1b5154
+ text "Yo, <PLAYER>!"
+ line "Were you asleep?"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "How's it going?"
+ done
+
+UnknownText_0x1b518b: ; 0x1b518b
+ text "How are your"
+ line "#MON doing?"
+
+ para "My #MON are a"
+ line "bit too energetic."
+
+ para "@"
+ text_from_ram wStringBuffer4
+ text ","
+ line "especially."
+
+ para "Every time it"
+ line "spots a trainer,"
+ cont "it has to battle."
+
+ para "It gets to be a"
+ line "bit much for me!"
+ done
+
+UnknownText_0x1b522b: ; 0x1b522b
+ text "My @"
+ text_from_ram wStringBuffer4
+ text "'s"
+ line "looking tougher"
+ cont "than ever."
+
+ para "It looks even"
+ line "tougher than me!"
+ done
+
+UnknownText_0x1b5270: ; 0x1b5270
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking…"
+
+ para "Hi, <PLAY_G>!"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b52a5: ; 0x1b52a5
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking…"
+
+ para "Hi, <PLAY_G>!"
+ done
+
+UnknownText_0x1b52cc: ; 0x1b52cc
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking…"
+
+ para "Hi, <PLAY_G>!"
+ line "Good evening!"
+ done
+
+UnknownText_0x1b5301: ; 0x1b5301
+ text "<PLAY_G>, good"
+ line "morning!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "How are you doing?"
+ done
+
+UnknownText_0x1b5335: ; 0x1b5335
+ text "Hi, <PLAY_G>!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "How are you doing?"
+ done
+
+UnknownText_0x1b535f: ; 0x1b535f
+ text "<PLAY_G>, good"
+ line "evening!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "How are you doing?"
+ done
+
+UnknownText_0x1b5393: ; 0x1b5393
+ text "How are your"
+ line "#MON doing?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text "'s"
+ line "doing as great as"
+ cont "ever."
+
+ para "Let's keep at it"
+ line "and become #MON"
+ cont "CHAMPS!"
+ done
+
+UnknownText_0x1b53f7: ; 0x1b53f7
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh, <PLAY_G>."
+ line "Good morning."
+
+ para ""
+ done
+
+UnknownText_0x1b5424: ; 0x1b5424
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh. Hi, <PLAY_G>."
+ done
+
+UnknownText_0x1b5446: ; 0x1b5446
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh, <PLAY_G>."
+ line "Good evening."
+ done
+
+UnknownText_0x1b5472: ; 0x1b5472
+ text "Good morning,"
+ line "<PLAY_G>!"
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Were you sleeping?"
+ done
+
+UnknownText_0x1b54a6: ; 0x1b54a6
+ text "<PLAY_G>, hi!"
+ line "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Do you have some"
+ line "time?"
+ done
+
+UnknownText_0x1b54d4: ; 0x1b54d4
+ text "Hi, <PLAY_G>."
+ line "Good evening."
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "I hope you were"
+ line "awake."
+ done
+
+UnknownText_0x1b5510: ; 0x1b5510
+ text "Are you the kind"
+ line "of person who goes"
+
+ para "to #MON CENTERS"
+ line "often?"
+
+ para "I go every day."
+ line "Watching out for"
+
+ para "the health of your"
+ line "#MON is a basic"
+
+ para "part of being a"
+ line "#MON trainer."
+ done
+
+UnknownText_0x1b55ae: ; 0x1b55ae
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, <PLAY_G>?"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b55da: ; 0x1b55da
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, <PLAY_G>? Hi!"
+ done
+
+UnknownText_0x1b55fc: ; 0x1b55fc
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, <PLAY_G>?"
+ line "Good evening!"
+ done
+
+UnknownText_0x1b5628: ; 0x1b5628
+ text "Oh, <PLAY_G>?"
+
+ para "Tweet! Yeah, it's"
+ line "me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b564c: ; 0x1b564c
+ text "Oh, <PLAY_G>?"
+
+ para "Tweet! Yeah, it's"
+ line "me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b5670: ; 0x1b5670
+ text "Oh, <PLAY_G>?"
+
+ para "Tweet! Yeah, it's"
+ line "me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b5694: ; 0x1b5694
+ text "Are your #MON"
+ line "still cooking?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text " has"
+ line "too much energy."
+
+ para "Once it takes off,"
+ line "it won't come back"
+ cont "for a while."
+ done
+
+UnknownText_0x1b5702: ; 0x1b5702
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh. Hi, <PLAYER>."
+ line "What's up?"
+ done
+
+UnknownText_0x1b572e: ; 0x1b572e
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, hi, <PLAYER>,"
+ line "what's up?"
+ done
+
+UnknownText_0x1b575a: ; 0x1b575a
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, hi, <PLAYER>,"
+ line "what's up?"
+ done
+
+UnknownText_0x1b5786: ; 0x1b5786
+ text "You're slow! Hurry"
+ line "up and answer!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b57b7: ; 0x1b57b7
+ text "You're slow! Hurry"
+ line "up and answer!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b57e8: ; 0x1b57e8
+ text "You're slow! Hurry"
+ line "up and answer!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b5819: ; 0x1b5819
+ text "Hey, how are your"
+ line "#MON doing?"
+
+ para "What? Great?"
+ line "I see…"
+
+ para "What? My #MON?"
+
+ para "Of course they're"
+ line "doing great! What"
+
+ para "kind of a question"
+ line "is that?"
+ done
+
+UnknownText_0x1b589a: ; 0x1b589a
+ text "Hi, @"
+ text_from_ram wStringBuffer3
+ text " here!"
+
+ para "Oh, <PLAYER>? You"
+ line "doing well?"
+ done
+
+UnknownText_0x1b58c2: ; 0x1b58c2
+ text "Hi, @"
+ text_from_ram wStringBuffer3
+ text " here!"
+
+ para "Oh, <PLAYER>? You"
+ line "doing well?"
+ done
+
+UnknownText_0x1b58ea: ; 0x1b58ea
+ text "Hi, @"
+ text_from_ram wStringBuffer3
+ text " here!"
+
+ para "Oh, <PLAYER>? You"
+ line "doing well?"
+ done
+
+UnknownText_0x1b5912: ; 0x1b5912
+ text "Yo, <PLAYER>!"
+ line "How're you doing?"
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text ","
+ line "got a minute?"
+ done
+
+UnknownText_0x1b5948: ; 0x1b5948
+ text "Yo, <PLAYER>! How's"
+ line "it going?"
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Got a minute?"
+ done
+
+UnknownText_0x1b597c: ; 0x1b597c
+ text "Yo, <PLAYER>!"
+ line "How're you doing?"
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text ","
+ line "got a minute?"
+ done
+
+UnknownText_0x1b59b2: ; 0x1b59b2
+ text "How are your"
+ line "#MON doing?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text "'s"
+ line "raring to go, just"
+ cont "like always."
+
+ para "It's the only one"
+ line "I have. I'm going"
+
+ para "to become a great"
+ line "trainer with it!"
+ done
+
+UnknownText_0x1b5a3b: ; 0x1b5a3b
+ text "Hello? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking."
+
+ para "Oh. Hi, <PLAY_G>!"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b5a74: ; 0x1b5a74
+ text "Hello? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking."
+
+ para "Oh, hi, <PLAY_G>!"
+ done
+
+UnknownText_0x1b5a9f: ; 0x1b5a9f
+ text "Hello? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking."
+
+ para "Oh, hi, <PLAY_G>!"
+ line "Good evening!"
+ done
+
+UnknownText_0x1b5ad8: ; 0x1b5ad8
+ text "<PLAY_G>, good"
+ line "morning!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Isn't it nice out?"
+ done
+
+UnknownText_0x1b5b0b: ; 0x1b5b0b
+ text "<PLAY_G>, howdy!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Isn't it nice out?"
+ done
+
+UnknownText_0x1b5b37: ; 0x1b5b37
+ text "Good evening,"
+ line "<PLAY_G>!"
+
+ para "It's me, @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Were you awake?"
+ done
+
+UnknownText_0x1b5b68: ; 0x1b5b68
+ text "How are your"
+ line "#MON doing?"
+
+ para "My #MON have"
+ line "too much energy to"
+
+ para "burn. It gets to"
+ line "be a problem."
+
+ para "Of all my #MON,"
+ line "@"
+ text_from_ram wStringBuffer4
+ text " is the"
+ cont "hardest to handle."
+
+ para "Working with it is"
+ line "exhausting."
+ done
+
+UnknownText_0x1b5c10: ; 0x1b5c10
+ text "Yes? Ah, <PLAY_G>."
+
+ para "You're courteous"
+ line "enough to state"
+
+ para "your name when you"
+ line "call on the phone."
+ done
+
+UnknownText_0x1b5c63: ; 0x1b5c63
+ text "Yes? Ah, <PLAY_G>."
+
+ para "You're courteous"
+ line "enough to state"
+
+ para "your name when you"
+ line "call on the phone."
+ done
+
+UnknownText_0x1b5cb6: ; 0x1b5cb6
+ text "Yes? Ah, <PLAY_G>."
+
+ para "You're courteous"
+ line "enough to state"
+
+ para "your name when you"
+ line "call on the phone."
+ done
+
+UnknownText_0x1b5d09: ; 0x1b5d09
+ text "Hiya, it's Uncle"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b5d21: ; 0x1b5d21
+ text "Hiya, it's Uncle"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b5d39: ; 0x1b5d39
+ text "Hiya, it's Uncle"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b5d51: ; 0x1b5d51
+ text "Are you taking"
+ line "good care of your"
+
+ para "#MON? You have"
+ line "to be good to your"
+ cont "partners!"
+ done
+
+UnknownText_0x1b5d9f: ; 0x1b5d9f
+ text "Hello, @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "speaking."
+
+ para "Oh, <PLAY_G>."
+ line "Good morning."
+ done
+
+UnknownText_0x1b5dcc: ; 0x1b5dcc
+ text "Hello, @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "speaking."
+
+ para "Oh, <PLAY_G>."
+ line "How are you?"
+ done
+
+UnknownText_0x1b5df8: ; 0x1b5df8
+ text "Hello, @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "speaking."
+
+ para "Oh, <PLAY_G>."
+ line "Good evening."
+ done
+
+UnknownText_0x1b5e25: ; 0x1b5e25
+ text "Good morning,"
+ line "<PLAY_G>."
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Were you sleeping?"
+ done
+
+UnknownText_0x1b5e59: ; 0x1b5e59
+ text "Hi, <PLAY_G>."
+ line "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "How are things"
+ line "going for you?"
+ done
+
+UnknownText_0x1b5e8e: ; 0x1b5e8e
+ text "Good evening,"
+ line "<PLAY_G>."
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Are you awake?"
+ done
+
+UnknownText_0x1b5ebe: ; 0x1b5ebe
+ text "I had some time,"
+ line "so I called you."
+
+ para "So anyway, how are"
+ line "your #MON?"
+
+ para "Me, I take my"
+ line "@"
+ text_from_ram wStringBuffer4
+ text " to the"
+
+ para "#MON CENTER in"
+ line "VIOLET every day,"
+
+ para "so it's doing just"
+ line "fantastic!"
+
+ para "I'm friends with"
+ line "the receptionist!"
+ done
+
+UnknownText_0x1b5f7a: ; 0x1b5f7a
+ text "Yeah, @"
+ text_from_ram wStringBuffer3
+ text " the"
+ line "HIKER here."
+
+ para "Ah, <PLAYER>!"
+ done
+
+UnknownText_0x1b5f9e: ; 0x1b5f9e
+ text "Yeah, @"
+ text_from_ram wStringBuffer3
+ text " the"
+ line "HIKER here."
+
+ para "Ah, <PLAYER>,"
+ line "right?"
+ done
+
+UnknownText_0x1b5fc9: ; 0x1b5fc9
+ text "Yeah, @"
+ text_from_ram wStringBuffer3
+ text " the"
+ line "HIKER here."
+
+ para "Ah, <PLAYER>, isn't"
+ line "it?"
+ done
+
+UnknownText_0x1b5ff6: ; 0x1b5ff6
+ text "Yo, <PLAYER>?"
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "the HIKER!"
+ done
+
+UnknownText_0x1b6017: ; 0x1b6017
+ text "Hey, is this"
+ line "<PLAYER>?"
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "the HIKER!"
+ done
+
+UnknownText_0x1b6041: ; 0x1b6041
+ text "<PLAYER>, you still"
+ line "awake?"
+
+ para "This is @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "the HIKER!"
+ done
+
+UnknownText_0x1b606f: ; 0x1b606f
+ text "Are your #MON"
+ line "as feisty as ever?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text " and"
+ line "me--we have energy"
+
+ para "to burn. We hike"
+ line "up mountains every"
+
+ para "day to work out"
+ line "all our energy."
+ done
+
+UnknownText_0x1b60f5: ; 0x1b60f5
+ text "Yes? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking."
+
+ para "Hey, <PLAY_G>!"
+ done
+
+UnknownText_0x1b611b: ; 0x1b611b
+ text "Yes? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking."
+
+ para "This must be"
+ line "<PLAY_G>."
+ done
+
+UnknownText_0x1b6149: ; 0x1b6149
+ text "Yes? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " speaking."
+
+ para "Ah, <PLAY_G>!"
+ done
+
+UnknownText_0x1b616e: ; 0x1b616e
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "<PLAY_G>, right?"
+ done
+
+UnknownText_0x1b618f: ; 0x1b618f
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "<PLAY_G>, what are"
+ line "you doing?"
+ done
+
+UnknownText_0x1b61bd: ; 0x1b61bd
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "<PLAY_G>, sorry to"
+ line "call you so late."
+ done
+
+UnknownText_0x1b61f2: ; 0x1b61f2
+ text "How do you raise"
+ line "your #MON?"
+
+ para "I do all sorts"
+ line "of things, like"
+
+ para "leaving them in"
+ line "DAY-CARE and"
+
+ para "toughening them up"
+ line "with items."
+ done
+
+UnknownText_0x1b626a: ; 0x1b626a
+ text "Hello? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, <PLAY_G>!"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b6296: ; 0x1b6296
+ text "Hello? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, <PLAY_G>!"
+ line "Hi, how are you?"
+ done
+
+UnknownText_0x1b62c5: ; 0x1b62c5
+ text "Hello? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, <PLAY_G>!"
+ line "Good evening!"
+ done
+
+UnknownText_0x1b62f1: ; 0x1b62f1
+ text "<PLAY_G>?"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Good morning!"
+ done
+
+UnknownText_0x1b630e: ; 0x1b630e
+ text "<PLAY_G>?"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text ". Is"
+ line "this a bad time?"
+ done
+
+UnknownText_0x1b6331: ; 0x1b6331
+ text "<PLAY_G>?"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "Got time to chat?"
+ done
+
+UnknownText_0x1b6352: ; 0x1b6352
+ text "Are your #MON"
+ line "still tough?"
+
+ para "I train every day"
+ line "with @"
+ text_from_ram wStringBuffer4
+ text "."
+ done
+
+UnknownText_0x1b638c: ; 0x1b638c
+ text "Hello? @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "here…"
+
+ para "Hey, <PLAY_G>!"
+ done
+
+UnknownText_0x1b63a8: ; 0x1b63a8
+ text "Hello? @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "here…"
+
+ para "Wow, <PLAY_G>!"
+ done
+
+UnknownText_0x1b63c4: ; 0x1b63c4
+ text "Hello? @"
+ text_from_ram wStringBuffer3
+ text_start
+ line "here…"
+
+ para "Yippee, <PLAY_G>!"
+ done
+
+UnknownText_0x1b63e3: ; 0x1b63e3
+ text "Uh, hello."
+ line "<PLAY_G>?"
+
+ para "It's your pal,"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b6407: ; 0x1b6407
+ text "Uh, hello,"
+ line "<PLAY_G>?"
+
+ para "It's your buddy"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b642c: ; 0x1b642c
+ text "Uh, hello,"
+ line "<PLAY_G>?"
+
+ para "It's your sidekick"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b6454: ; 0x1b6454
+ text "Yeah, hello."
+ line "This is @"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "…Huh, <PLAY_G>? Yo!"
+ done
+
+UnknownText_0x1b647e: ; 0x1b647e
+ text "Yeah, hello, you"
+ line "got @"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "…Huh, <PLAY_G>? Yo!"
+ done
+
+UnknownText_0x1b64a8: ; 0x1b64a8
+ text "Yeah, hello, you"
+ line "got @"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "…Huh, <PLAY_G>? Yo!"
+ done
+
+UnknownText_0x1b64d2: ; 0x1b64d2
+ text "Yeah, hello?"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " calling."
+
+ para "What are you up"
+ line "to, <PLAY_G>?"
+ done
+
+UnknownText_0x1b6506: ; 0x1b6506
+ text "Yeah, hello?"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " calling."
+
+ para "Where are you now,"
+ line "<PLAY_G>?"
+ done
+
+UnknownText_0x1b6539: ; 0x1b6539
+ text "Yeah, hello?"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " calling."
+
+ para "Are you awake now,"
+ line "<PLAY_G>?"
+ done
+
+UnknownText_0x1b656c: ; 0x1b656c
+ text "I bet your #MON"
+ line "are a lot stronger"
+ cont "than before."
+ done
+
+UnknownText_0x1b659d: ; 0x1b659d
+ text "Yup, it's @"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Is this <PLAY_G>?"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b65c7: ; 0x1b65c7
+ text "Yup, it's @"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Is that <PLAY_G>?"
+ done
+
+UnknownText_0x1b65e3: ; 0x1b65e3
+ text "Yup, it's @"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Is that <PLAY_G>?"
+ line "Good evening!"
+ done
+
+UnknownText_0x1b660d: ; 0x1b660d
+ text "Hello! It's me,"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b6624: ; 0x1b6624
+ text "Hello! It's me,"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b663b: ; 0x1b663b
+ text "Hello! It's me,"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b6652: ; 0x1b6652
+ text "<PLAY_G>, are you"
+ line "raising your"
+ cont "#MON properly?"
+
+ para "I read in a book"
+ line "that you should"
+
+ para "raise any #MON"
+ line "you catch with"
+ cont "love and care."
+ done
+
+UnknownText_0x1b66c8: ; 0x1b66c8
+ text "Hi, @"
+ text_from_ram wStringBuffer3
+ text " on the"
+ line "line."
+
+ para "Hey! It's <PLAY_G>!"
+ done
+
+UnknownText_0x1b66ec: ; 0x1b66ec
+ text "Hi, @"
+ text_from_ram wStringBuffer3
+ text " on the"
+ line "line."
+
+ para "I know!"
+ line "It's <PLAY_G>!"
+ done
+
+UnknownText_0x1b6713: ; 0x1b6713
+ text "Hi, @"
+ text_from_ram wStringBuffer3
+ text " on the"
+ line "line."
+
+ para "<PLAY_G>?"
+ line "What's up?"
+ done
+
+UnknownText_0x1b6738: ; 0x1b6738
+ text "Uh, <PLAY_G>?"
+
+ para "It's me!"
+ line "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b6757: ; 0x1b6757
+ text "Uh, <PLAY_G>?"
+
+ para "It's me!"
+ line "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b6776: ; 0x1b6776
+ text "Uh, <PLAY_G>?"
+
+ para "It's me!"
+ line "It's me, @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b6795: ; 0x1b6795
+ text "My @"
+ text_from_ram wStringBuffer4
+ text " is"
+ line "so full of energy,"
+
+ para "it's a little"
+ line "scary."
+
+ para "How are your"
+ line "#MON doing?"
+ done
+
+UnknownText_0x1b67e2: ; 0x1b67e2
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Hi, <PLAY_G>!"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b680e: ; 0x1b680e
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Hi, <PLAY_G>, good"
+ line "day!"
+ done
+
+UnknownText_0x1b6836: ; 0x1b6836
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Hi, <PLAY_G>, good"
+ line "evening!"
+ done
+
+UnknownText_0x1b6862: ; 0x1b6862
+ text "Hi, <PLAY_G>, good"
+ line "morning!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "How are you?"
+ done
+
+UnknownText_0x1b6890: ; 0x1b6890
+ text "Hi, <PLAY_G>, good"
+ line "day!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "How are you?"
+ done
+
+UnknownText_0x1b68ba: ; 0x1b68ba
+ text "Hi, <PLAY_G>, good"
+ line "evening!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "."
+ line "How are you?"
+ done
+
+UnknownText_0x1b68e8: ; 0x1b68e8
+ text "How are your"
+ line "#MON doing?"
+
+ para "You know PROF.OAK,"
+ line "so of course your"
+ cont "#MON are fine!"
+
+ para "My #MON are"
+ line "doing well too."
+
+ para "But then, I am"
+ line "trying to become a"
+
+ para "#MON professor,"
+ line "so that shouldn't"
+ cont "be a big surprise."
+ done
+
+UnknownText_0x1b69a8: ; 0x1b69a8
+ text "Hi, <PLAY_G>?"
+
+ para "Good morning pika."
+ line "What's up pika?"
+ done
+
+UnknownText_0x1b69d2: ; 0x1b69d2
+ text "Hi, <PLAY_G>?"
+
+ para "Good day pika,"
+ line "what's up pika?"
+ done
+
+UnknownText_0x1b69f8: ; 0x1b69f8
+ text "Hi, <PLAY_G>?"
+
+ para "Good evening pika,"
+ line "what's up pika?"
+ done
+
+UnknownText_0x1b6a22: ; 0x1b6a22
+ text "<PLAY_G> pika, good"
+ line "morning!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text ", how"
+ line "pika are you?"
+ done
+
+UnknownText_0x1b6a56: ; 0x1b6a56
+ text "<PLAY_G> pika, good"
+ line "pika day!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text ", how"
+ line "pika are you?"
+ done
+
+UnknownText_0x1b6a8b: ; 0x1b6a8b
+ text "<PLAY_G> pika, good"
+ line "evening!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text ". Were"
+ line "you pika awake?"
+ done
+
+UnknownText_0x1b6ac2: ; 0x1b6ac2
+ text "You have to hear"
+ line "this! My lovable"
+
+ para "@"
+ text_from_ram wStringBuffer4
+ text " looked"
+ line "at me and grinned!"
+
+ para "It must be because"
+ line "our hearts beat"
+ cont "together as one!"
+ done
+
+UnknownText_0x1b6b39: ; 0x1b6b39
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, Good morning,"
+ line "<PLAY_G>."
+ done
+
+UnknownText_0x1b6b65: ; 0x1b6b65
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "That voice…"
+ line "<PLAY_G>, right?"
+ done
+
+UnknownText_0x1b6b92: ; 0x1b6b92
+ text "Hello, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "This must be"
+ line "<PLAY_G>!"
+ done
+
+UnknownText_0x1b6bb9: ; 0x1b6bb9
+ text "Hello!"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "Good morning! The"
+ line "weather's great!"
+ done
+
+UnknownText_0x1b6bef: ; 0x1b6bef
+ text "Hello!"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "What a perfect day"
+ line "for fishing!"
+ done
+
+UnknownText_0x1b6c23: ; 0x1b6c23
+ text "Hello!"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "It's a great night"
+ line "for fishing!"
+ done
+
+UnknownText_0x1b6c56: ; 0x1b6c56
+ text "How's your trip"
+ line "coming along?"
+
+ para "I can't complain"
+ line "about my fishing!"
+ done
+
+UnknownText_0x1b6c96: ; 0x1b6c96
+ text "Yes? @"
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "Ah, <PLAYER>. What"
+ line "can I do for you?"
+ done
+
+UnknownText_0x1b6cc6: ; 0x1b6cc6
+ text "Yes? @"
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "Ah, <PLAYER>. What"
+ line "can I do for you?"
+ done
+
+UnknownText_0x1b6cf6: ; 0x1b6cf6
+ text "Yes? @"
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "Ah, <PLAYER>. What"
+ line "can I do for you?"
+ done
+
+UnknownText_0x1b6d26: ; 0x1b6d26
+ text "Hiya, <PLAYER>. How"
+ line "are you doing?"
+
+ para "Hey! It's me,"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b6d57: ; 0x1b6d57
+ text "Hiya, <PLAYER>, how"
+ line "are you doing?"
+
+ para "Hey, it's me,"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b6d88: ; 0x1b6d88
+ text "Hiya, <PLAYER>, how"
+ line "are you doing?"
+
+ para "Hey, it's me,"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b6db9: ; 0x1b6db9
+ text "Oh yeah, I saw you"
+ line "coming out of a"
+
+ para "#MON CENTER the"
+ line "other day."
+
+ para "You heal your"
+ line "#MON regularly,"
+
+ para "don't you?"
+ line "I'm impressed."
+
+ para "Heh, my @"
+ text_from_ram wStringBuffer4
+ text_start
+ line "is so tough, it"
+
+ para "doesn't need to go"
+ line "to #MON CENTERS"
+ cont "often. Heheh!"
+ done
+
+UnknownText_0x1b6e7c: ; 0x1b6e7c
+ text "Yes? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh, <PLAY_G>."
+ line "Good morning."
+ done
+
+UnknownText_0x1b6ea6: ; 0x1b6ea6
+ text "Yes? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh, <PLAY_G>."
+ line "Hello."
+ done
+
+UnknownText_0x1b6ec9: ; 0x1b6ec9
+ text "Yes? This is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "."
+
+ para "Oh, <PLAY_G>, good"
+ line "evening."
+ done
+
+UnknownText_0x1b6ef3: ; 0x1b6ef3
+ text "Is this <PLAY_G>?"
+
+ para "Good morning. This"
+ line "is @"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b6f1c: ; 0x1b6f1c
+ text "Is this <PLAY_G>?"
+
+ para "Hi, it's @"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b6f37: ; 0x1b6f37
+ text "Is this <PLAY_G>?"
+
+ para "Good evening. This"
+ line "is @"
+ text_from_ram wStringBuffer3
+ text "."
+ done
+
+UnknownText_0x1b6f60: ; 0x1b6f60
+ text "Are your #MON"
+ line "doing well?"
+
+ para "I hope you take"
+ line "them to a #MON"
+ cont "CENTER every day."
+
+ para "Don't push them"
+ line "too hard."
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text " is"
+ line "cute and lively"
+
+ para "precisely because"
+ line "I take it to a"
+
+ para "#MON CENTER"
+ line "every day."
+ done
+
+UnknownText_0x1b7019: ; 0x1b7019
+ text "Yes, hello?"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " here!"
+
+ para "Morning, <PLAY_G>!"
+
+ para "Are you using bird"
+ line "#MON?"
+ done
+
+UnknownText_0x1b7057: ; 0x1b7057
+ text "Yes, hello?"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " here!"
+
+ para "Hi, <PLAY_G>!"
+
+ para "Are your bird"
+ line "#MON flying?"
+ done
+
+UnknownText_0x1b7092: ; 0x1b7092
+ text "Yes, hello?"
+ line "@"
+ text_from_ram wStringBuffer3
+ text " here!"
+
+ para "Evening, <PLAY_G>!"
+ line "Are you letting"
+
+ para "your bird #MON"
+ line "see some action?"
+ done
+
+UnknownText_0x1b70e7: ; 0x1b70e7
+ text "Good morning,"
+ line "<PLAY_G>!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b7112: ; 0x1b7112
+ text "Hi, <PLAY_G>!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "Remember me?"
+ done
+
+UnknownText_0x1b7132: ; 0x1b7132
+ text "Good evening,"
+ line "<PLAY_G>!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "Are you free now?"
+ done
+
+UnknownText_0x1b7161: ; 0x1b7161
+ text "Are you and your"
+ line "#MON fine?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text_start
+ line "looks like it will"
+
+ para "get tough enough"
+ line "to face and beat"
+
+ para "the legendary bird"
+ line "#MON!"
+ done
+
+UnknownText_0x1b71d5: ; 0x1b71d5
+ text "Hello, you have"
+ line "reached @"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Ah, <PLAY_G>."
+ done
+
+UnknownText_0x1b71fc: ; 0x1b71fc
+ text "Hello, you have"
+ line "reached @"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Ah, <PLAY_G>, is"
+ line "it?"
+ done
+
+UnknownText_0x1b722a: ; 0x1b722a
+ text "Hello, you have"
+ line "reached @"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Ah, if it isn't"
+ line "<PLAY_G>."
+ done
+
+UnknownText_0x1b725c: ; 0x1b725c
+ text "Ah, it's @"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Have you got a"
+ line "moment?"
+ done
+
+UnknownText_0x1b7283: ; 0x1b7283
+ text "Ah, it's @"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Can you talk now?"
+ done
+
+UnknownText_0x1b72a5: ; 0x1b72a5
+ text "Ah, it's @"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Sorry for calling"
+ line "so late."
+ done
+
+UnknownText_0x1b72d0: ; 0x1b72d0
+ text "Have your #MON"
+ line "grown any?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text " has"
+ line "grown quite a bit."
+ done
+
+UnknownText_0x1b730b: ; 0x1b730b
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "<PLAYER>! Beautiful"
+ line "morning, hey?"
+ done
+
+UnknownText_0x1b7331: ; 0x1b7331
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "<PLAYER>! Beautiful"
+ line "weather, hey?"
+ done
+
+UnknownText_0x1b7357: ; 0x1b7357
+ text_from_ram wStringBuffer3
+ text " here…"
+
+ para "<PLAYER>! Beautiful"
+ line "moonlight, hey?"
+ done
+
+UnknownText_0x1b737f: ; 0x1b737f
+ text "Hey, <PLAYER>!"
+ line "This is @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b7397: ; 0x1b7397
+ text "Hey, <PLAYER>!"
+ line "This is @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b73af: ; 0x1b73af
+ text "Hey, <PLAYER>!"
+ line "This is @"
+ text_from_ram wStringBuffer3
+ text "!"
+ done
+
+UnknownText_0x1b73c7: ; 0x1b73c7
+ text "Yup, yup!"
+ line "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Hah, and here's"
+ line "<PLAY_G>!"
+ done
+
+UnknownText_0x1b73ef: ; 0x1b73ef
+ text "Yup, yup!"
+ line "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Hah, and here's"
+ line "<PLAY_G>!"
+ done
+
+UnknownText_0x1b7417: ; 0x1b7417
+ text "Yup, yup!"
+ line "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Hah, and here's"
+ line "<PLAY_G>!"
+ done
+
+UnknownText_0x1b743f: ; 0x1b743f
+ text "<PLAY_G>, it's"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Have you had a"
+ line "proper breakfast?"
+ done
+
+UnknownText_0x1b746f: ; 0x1b746f
+ text "<PLAY_G>, it's"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Have you had a"
+ line "proper lunch?"
+ done
+
+UnknownText_0x1b749b: ; 0x1b749b
+ text "<PLAY_G>, it's"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "!"
+
+ para "Have you had a"
+ line "proper dinner?"
+ done
+
+UnknownText_0x1b74c8: ; 0x1b74c8
+ text "Are your #MON"
+ line "looking good?"
+
+ para "My @"
+ text_from_ram wStringBuffer4
+ text " and"
+ line "me--we're looking"
+
+ para "mighty dandy!"
+ line "Hahahah!"
+ done
+
+UnknownText_0x1b751a: ; 0x1b751a
+ text "Yes, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh. Hi, <PLAY_G>!"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b7548: ; 0x1b7548
+ text "Yes, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, hi, <PLAY_G>!"
+ line "Yahoo!"
+ done
+
+UnknownText_0x1b756f: ; 0x1b756f
+ text "Yes, this is"
+ line "@"
+ text_from_ram wStringBuffer3
+ text "…"
+
+ para "Oh, hi, <PLAY_G>!"
+ done
+
+UnknownText_0x1b758f: ; 0x1b758f
+ text "<PLAY_G>!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "Good morning!"
+ done
+
+UnknownText_0x1b75ac: ; 0x1b75ac
+ text "<PLAY_G>!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "Working hard?"
+ done
+
+UnknownText_0x1b75c9: ; 0x1b75c9
+ text "<PLAY_G>!"
+
+ para "It's @"
+ text_from_ram wStringBuffer3
+ text "!"
+ line "Were you up?"
+ done
+
+UnknownText_0x1b75e5: ; 0x1b75e5
+ text "Are you raising"
+ line "your #MON?"
+
+ para "Hey, @"
+ text_from_ram wStringBuffer3
+ text "'s"
+ line "@"
+ text_from_ram wStringBuffer4
+ text " is"
+ cont "looking good!"
+ done
+
+UnusedPhoneText: ; 0x1b7624
+ text "Good morning."
+ done
--- a/data/phone/text/trainers1.asm
+++ /dev/null
@@ -1,1991 +1,0 @@
-UnknownText_0x1b4dc5: ; 0x1b4dc5
- text "Hello. This is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Good morning,"
- line "<PLAY_G>!"
- done
-
-UnknownText_0x1b4ded: ; 0x1b4ded
- text "Hello. This is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "How's it going,"
- line "<PLAY_G>?"
- done
-
-UnknownText_0x1b4e16: ; 0x1b4e16
- text "Hello. This is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Good evening,"
- line "<PLAY_G>!"
- done
-
-UnknownText_0x1b4e3e: ; 0x1b4e3e
- text "<PLAY_G>, good"
- line "morning!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "How are you doing?"
- done
-
-UnknownText_0x1b4e72: ; 0x1b4e72
- text "<PLAY_G>, howdy!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "Isn't it nice out?"
- done
-
-UnknownText_0x1b4e9e: ; 0x1b4e9e
- text "<PLAY_G>, good"
- line "evening!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "Got a minute?"
- done
-
-UnknownText_0x1b4ecd: ; 0x1b4ecd
- text "How are your"
- line "#MON doing?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text " is"
- line "so curious, it's a"
-
- para "problem. Maybe"
- line "it's like me…"
- done
-
-UnknownText_0x1b4f21: ; 0x1b4f21
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh! Good morning,"
- line "<PLAYER>."
- done
-
-UnknownText_0x1b4f4d: ; 0x1b4f4d
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh! Good day,"
- line "<PLAYER>."
- done
-
-UnknownText_0x1b4f75: ; 0x1b4f75
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh! Good evening,"
- line "<PLAYER>."
- done
-
-UnknownText_0x1b4fa1: ; 0x1b4fa1
- text "Hello, <PLAYER>."
- line "Good morning."
-
- para "This is @"
- text_from_ram wStringBuffer3
- text "."
- line "Were you asleep?"
- done
-
-UnknownText_0x1b4fda: ; 0x1b4fda
- text "Hi, <PLAYER>."
- line "This is @"
- text_from_ram wStringBuffer3
- text "."
-
- para "How are you doing?"
- done
-
-UnknownText_0x1b5004: ; 0x1b5004
- text "Hi, <PLAYER>."
- line "This is @"
- text_from_ram wStringBuffer3
- text "."
-
- para "Were you awake?"
- done
-
-UnknownText_0x1b502b: ; 0x1b502b
- text "Keeping your"
- line "#MON happy?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text " is"
- line "healthy. It eats a"
- cont "lot every day."
- done
-
-UnknownText_0x1b5073: ; 0x1b5073
- text "Yeah, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Huh? What's up,"
- line "<PLAYER>?"
- done
-
-UnknownText_0x1b509b: ; 0x1b509b
- text "Yeah, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Huh? What's up"
- line "<PLAYER>?"
- done
-
-UnknownText_0x1b50c2: ; 0x1b50c2
- text "Yeah, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Huh? What's up"
- line "<PLAYER>?"
- done
-
-UnknownText_0x1b50e9: ; 0x1b50e9
- text "Yo, <PLAYER>!"
- line "You awake?"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- line "How's it going?"
- done
-
-UnknownText_0x1b511a: ; 0x1b511a
- text "Yo, <PLAYER>! You"
- line "free right now?"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- line "How's it going?"
- done
-
-UnknownText_0x1b5154: ; 0x1b5154
- text "Yo, <PLAYER>!"
- line "Were you asleep?"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- line "How's it going?"
- done
-
-UnknownText_0x1b518b: ; 0x1b518b
- text "How are your"
- line "#MON doing?"
-
- para "My #MON are a"
- line "bit too energetic."
-
- para "@"
- text_from_ram wStringBuffer4
- text ","
- line "especially."
-
- para "Every time it"
- line "spots a trainer,"
- cont "it has to battle."
-
- para "It gets to be a"
- line "bit much for me!"
- done
-
-UnknownText_0x1b522b: ; 0x1b522b
- text "My @"
- text_from_ram wStringBuffer4
- text "'s"
- line "looking tougher"
- cont "than ever."
-
- para "It looks even"
- line "tougher than me!"
- done
-
-UnknownText_0x1b5270: ; 0x1b5270
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking…"
-
- para "Hi, <PLAY_G>!"
- line "Good morning!"
- done
-
-UnknownText_0x1b52a5: ; 0x1b52a5
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking…"
-
- para "Hi, <PLAY_G>!"
- done
-
-UnknownText_0x1b52cc: ; 0x1b52cc
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking…"
-
- para "Hi, <PLAY_G>!"
- line "Good evening!"
- done
-
-UnknownText_0x1b5301: ; 0x1b5301
- text "<PLAY_G>, good"
- line "morning!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "How are you doing?"
- done
-
-UnknownText_0x1b5335: ; 0x1b5335
- text "Hi, <PLAY_G>!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "How are you doing?"
- done
-
-UnknownText_0x1b535f: ; 0x1b535f
- text "<PLAY_G>, good"
- line "evening!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "How are you doing?"
- done
-
-UnknownText_0x1b5393: ; 0x1b5393
- text "How are your"
- line "#MON doing?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text "'s"
- line "doing as great as"
- cont "ever."
-
- para "Let's keep at it"
- line "and become #MON"
- cont "CHAMPS!"
- done
-
-UnknownText_0x1b53f7: ; 0x1b53f7
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh, <PLAY_G>."
- line "Good morning."
-
- para ""
- done
-
-UnknownText_0x1b5424: ; 0x1b5424
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh. Hi, <PLAY_G>."
- done
-
-UnknownText_0x1b5446: ; 0x1b5446
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh, <PLAY_G>."
- line "Good evening."
- done
-
-UnknownText_0x1b5472: ; 0x1b5472
- text "Good morning,"
- line "<PLAY_G>!"
-
- para "This is @"
- text_from_ram wStringBuffer3
- text "."
- line "Were you sleeping?"
- done
-
-UnknownText_0x1b54a6: ; 0x1b54a6
- text "<PLAY_G>, hi!"
- line "This is @"
- text_from_ram wStringBuffer3
- text "."
-
- para "Do you have some"
- line "time?"
- done
-
-UnknownText_0x1b54d4: ; 0x1b54d4
- text "Hi, <PLAY_G>."
- line "Good evening."
-
- para "This is @"
- text_from_ram wStringBuffer3
- text "."
-
- para "I hope you were"
- line "awake."
- done
-
-UnknownText_0x1b5510: ; 0x1b5510
- text "Are you the kind"
- line "of person who goes"
-
- para "to #MON CENTERS"
- line "often?"
-
- para "I go every day."
- line "Watching out for"
-
- para "the health of your"
- line "#MON is a basic"
-
- para "part of being a"
- line "#MON trainer."
- done
-
-UnknownText_0x1b55ae: ; 0x1b55ae
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, <PLAY_G>?"
- line "Good morning!"
- done
-
-UnknownText_0x1b55da: ; 0x1b55da
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, <PLAY_G>? Hi!"
- done
-
-UnknownText_0x1b55fc: ; 0x1b55fc
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, <PLAY_G>?"
- line "Good evening!"
- done
-
-UnknownText_0x1b5628: ; 0x1b5628
- text "Oh, <PLAY_G>?"
-
- para "Tweet! Yeah, it's"
- line "me, @"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b564c: ; 0x1b564c
- text "Oh, <PLAY_G>?"
-
- para "Tweet! Yeah, it's"
- line "me, @"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b5670: ; 0x1b5670
- text "Oh, <PLAY_G>?"
-
- para "Tweet! Yeah, it's"
- line "me, @"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b5694: ; 0x1b5694
- text "Are your #MON"
- line "still cooking?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text " has"
- line "too much energy."
-
- para "Once it takes off,"
- line "it won't come back"
- cont "for a while."
- done
-
-UnknownText_0x1b5702: ; 0x1b5702
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh. Hi, <PLAYER>."
- line "What's up?"
- done
-
-UnknownText_0x1b572e: ; 0x1b572e
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, hi, <PLAYER>,"
- line "what's up?"
- done
-
-UnknownText_0x1b575a: ; 0x1b575a
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, hi, <PLAYER>,"
- line "what's up?"
- done
-
-UnknownText_0x1b5786: ; 0x1b5786
- text "You're slow! Hurry"
- line "up and answer!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b57b7: ; 0x1b57b7
- text "You're slow! Hurry"
- line "up and answer!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b57e8: ; 0x1b57e8
- text "You're slow! Hurry"
- line "up and answer!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b5819: ; 0x1b5819
- text "Hey, how are your"
- line "#MON doing?"
-
- para "What? Great?"
- line "I see…"
-
- para "What? My #MON?"
-
- para "Of course they're"
- line "doing great! What"
-
- para "kind of a question"
- line "is that?"
- done
-
-UnknownText_0x1b589a: ; 0x1b589a
- text "Hi, @"
- text_from_ram wStringBuffer3
- text " here!"
-
- para "Oh, <PLAYER>? You"
- line "doing well?"
- done
-
-UnknownText_0x1b58c2: ; 0x1b58c2
- text "Hi, @"
- text_from_ram wStringBuffer3
- text " here!"
-
- para "Oh, <PLAYER>? You"
- line "doing well?"
- done
-
-UnknownText_0x1b58ea: ; 0x1b58ea
- text "Hi, @"
- text_from_ram wStringBuffer3
- text " here!"
-
- para "Oh, <PLAYER>? You"
- line "doing well?"
- done
-
-UnknownText_0x1b5912: ; 0x1b5912
- text "Yo, <PLAYER>!"
- line "How're you doing?"
-
- para "This is @"
- text_from_ram wStringBuffer3
- text ","
- line "got a minute?"
- done
-
-UnknownText_0x1b5948: ; 0x1b5948
- text "Yo, <PLAYER>! How's"
- line "it going?"
-
- para "This is @"
- text_from_ram wStringBuffer3
- text "."
- line "Got a minute?"
- done
-
-UnknownText_0x1b597c: ; 0x1b597c
- text "Yo, <PLAYER>!"
- line "How're you doing?"
-
- para "This is @"
- text_from_ram wStringBuffer3
- text ","
- line "got a minute?"
- done
-
-UnknownText_0x1b59b2: ; 0x1b59b2
- text "How are your"
- line "#MON doing?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text "'s"
- line "raring to go, just"
- cont "like always."
-
- para "It's the only one"
- line "I have. I'm going"
-
- para "to become a great"
- line "trainer with it!"
- done
-
-UnknownText_0x1b5a3b: ; 0x1b5a3b
- text "Hello? This is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking."
-
- para "Oh. Hi, <PLAY_G>!"
- line "Good morning!"
- done
-
-UnknownText_0x1b5a74: ; 0x1b5a74
- text "Hello? This is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking."
-
- para "Oh, hi, <PLAY_G>!"
- done
-
-UnknownText_0x1b5a9f: ; 0x1b5a9f
- text "Hello? This is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking."
-
- para "Oh, hi, <PLAY_G>!"
- line "Good evening!"
- done
-
-UnknownText_0x1b5ad8: ; 0x1b5ad8
- text "<PLAY_G>, good"
- line "morning!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "Isn't it nice out?"
- done
-
-UnknownText_0x1b5b0b: ; 0x1b5b0b
- text "<PLAY_G>, howdy!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "Isn't it nice out?"
- done
-
-UnknownText_0x1b5b37: ; 0x1b5b37
- text "Good evening,"
- line "<PLAY_G>!"
-
- para "It's me, @"
- text_from_ram wStringBuffer3
- text "."
- line "Were you awake?"
- done
-
-UnknownText_0x1b5b68: ; 0x1b5b68
- text "How are your"
- line "#MON doing?"
-
- para "My #MON have"
- line "too much energy to"
-
- para "burn. It gets to"
- line "be a problem."
-
- para "Of all my #MON,"
- line "@"
- text_from_ram wStringBuffer4
- text " is the"
- cont "hardest to handle."
-
- para "Working with it is"
- line "exhausting."
- done
-
-UnknownText_0x1b5c10: ; 0x1b5c10
- text "Yes? Ah, <PLAY_G>."
-
- para "You're courteous"
- line "enough to state"
-
- para "your name when you"
- line "call on the phone."
- done
-
-UnknownText_0x1b5c63: ; 0x1b5c63
- text "Yes? Ah, <PLAY_G>."
-
- para "You're courteous"
- line "enough to state"
-
- para "your name when you"
- line "call on the phone."
- done
-
-UnknownText_0x1b5cb6: ; 0x1b5cb6
- text "Yes? Ah, <PLAY_G>."
-
- para "You're courteous"
- line "enough to state"
-
- para "your name when you"
- line "call on the phone."
- done
-
-UnknownText_0x1b5d09: ; 0x1b5d09
- text "Hiya, it's Uncle"
- line "@"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b5d21: ; 0x1b5d21
- text "Hiya, it's Uncle"
- line "@"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b5d39: ; 0x1b5d39
- text "Hiya, it's Uncle"
- line "@"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b5d51: ; 0x1b5d51
- text "Are you taking"
- line "good care of your"
-
- para "#MON? You have"
- line "to be good to your"
- cont "partners!"
- done
-
-UnknownText_0x1b5d9f: ; 0x1b5d9f
- text "Hello, @"
- text_from_ram wStringBuffer3
- text_start
- line "speaking."
-
- para "Oh, <PLAY_G>."
- line "Good morning."
- done
-
-UnknownText_0x1b5dcc: ; 0x1b5dcc
- text "Hello, @"
- text_from_ram wStringBuffer3
- text_start
- line "speaking."
-
- para "Oh, <PLAY_G>."
- line "How are you?"
- done
-
-UnknownText_0x1b5df8: ; 0x1b5df8
- text "Hello, @"
- text_from_ram wStringBuffer3
- text_start
- line "speaking."
-
- para "Oh, <PLAY_G>."
- line "Good evening."
- done
-
-UnknownText_0x1b5e25: ; 0x1b5e25
- text "Good morning,"
- line "<PLAY_G>."
-
- para "This is @"
- text_from_ram wStringBuffer3
- text "."
- line "Were you sleeping?"
- done
-
-UnknownText_0x1b5e59: ; 0x1b5e59
- text "Hi, <PLAY_G>."
- line "This is @"
- text_from_ram wStringBuffer3
- text "."
-
- para "How are things"
- line "going for you?"
- done
-
-UnknownText_0x1b5e8e: ; 0x1b5e8e
- text "Good evening,"
- line "<PLAY_G>."
-
- para "This is @"
- text_from_ram wStringBuffer3
- text "."
- line "Are you awake?"
- done
-
-UnknownText_0x1b5ebe: ; 0x1b5ebe
- text "I had some time,"
- line "so I called you."
-
- para "So anyway, how are"
- line "your #MON?"
-
- para "Me, I take my"
- line "@"
- text_from_ram wStringBuffer4
- text " to the"
-
- para "#MON CENTER in"
- line "VIOLET every day,"
-
- para "so it's doing just"
- line "fantastic!"
-
- para "I'm friends with"
- line "the receptionist!"
- done
-
-UnknownText_0x1b5f7a: ; 0x1b5f7a
- text "Yeah, @"
- text_from_ram wStringBuffer3
- text " the"
- line "HIKER here."
-
- para "Ah, <PLAYER>!"
- done
-
-UnknownText_0x1b5f9e: ; 0x1b5f9e
- text "Yeah, @"
- text_from_ram wStringBuffer3
- text " the"
- line "HIKER here."
-
- para "Ah, <PLAYER>,"
- line "right?"
- done
-
-UnknownText_0x1b5fc9: ; 0x1b5fc9
- text "Yeah, @"
- text_from_ram wStringBuffer3
- text " the"
- line "HIKER here."
-
- para "Ah, <PLAYER>, isn't"
- line "it?"
- done
-
-UnknownText_0x1b5ff6: ; 0x1b5ff6
- text "Yo, <PLAYER>?"
-
- para "This is @"
- text_from_ram wStringBuffer3
- text_start
- line "the HIKER!"
- done
-
-UnknownText_0x1b6017: ; 0x1b6017
- text "Hey, is this"
- line "<PLAYER>?"
-
- para "This is @"
- text_from_ram wStringBuffer3
- text_start
- line "the HIKER!"
- done
-
-UnknownText_0x1b6041: ; 0x1b6041
- text "<PLAYER>, you still"
- line "awake?"
-
- para "This is @"
- text_from_ram wStringBuffer3
- text_start
- line "the HIKER!"
- done
-
-UnknownText_0x1b606f: ; 0x1b606f
- text "Are your #MON"
- line "as feisty as ever?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text " and"
- line "me--we have energy"
-
- para "to burn. We hike"
- line "up mountains every"
-
- para "day to work out"
- line "all our energy."
- done
-
-UnknownText_0x1b60f5: ; 0x1b60f5
- text "Yes? This is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking."
-
- para "Hey, <PLAY_G>!"
- done
-
-UnknownText_0x1b611b: ; 0x1b611b
- text "Yes? This is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking."
-
- para "This must be"
- line "<PLAY_G>."
- done
-
-UnknownText_0x1b6149: ; 0x1b6149
- text "Yes? This is"
- line "@"
- text_from_ram wStringBuffer3
- text " speaking."
-
- para "Ah, <PLAY_G>!"
- done
-
-UnknownText_0x1b616e: ; 0x1b616e
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "<PLAY_G>, right?"
- done
-
-UnknownText_0x1b618f: ; 0x1b618f
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "<PLAY_G>, what are"
- line "you doing?"
- done
-
-UnknownText_0x1b61bd: ; 0x1b61bd
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "<PLAY_G>, sorry to"
- line "call you so late."
- done
-
-UnknownText_0x1b61f2: ; 0x1b61f2
- text "How do you raise"
- line "your #MON?"
-
- para "I do all sorts"
- line "of things, like"
-
- para "leaving them in"
- line "DAY-CARE and"
-
- para "toughening them up"
- line "with items."
- done
-
-UnknownText_0x1b626a: ; 0x1b626a
- text "Hello? This is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, <PLAY_G>!"
- line "Good morning!"
- done
-
-UnknownText_0x1b6296: ; 0x1b6296
- text "Hello? This is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, <PLAY_G>!"
- line "Hi, how are you?"
- done
-
-UnknownText_0x1b62c5: ; 0x1b62c5
- text "Hello? This is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, <PLAY_G>!"
- line "Good evening!"
- done
-
-UnknownText_0x1b62f1: ; 0x1b62f1
- text "<PLAY_G>?"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "."
- line "Good morning!"
- done
-
-UnknownText_0x1b630e: ; 0x1b630e
- text "<PLAY_G>?"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text ". Is"
- line "this a bad time?"
- done
-
-UnknownText_0x1b6331: ; 0x1b6331
- text "<PLAY_G>?"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "."
- line "Got time to chat?"
- done
-
-UnknownText_0x1b6352: ; 0x1b6352
- text "Are your #MON"
- line "still tough?"
-
- para "I train every day"
- line "with @"
- text_from_ram wStringBuffer4
- text "."
- done
-
-UnknownText_0x1b638c: ; 0x1b638c
- text "Hello? @"
- text_from_ram wStringBuffer3
- text_start
- line "here…"
-
- para "Hey, <PLAY_G>!"
- done
-
-UnknownText_0x1b63a8: ; 0x1b63a8
- text "Hello? @"
- text_from_ram wStringBuffer3
- text_start
- line "here…"
-
- para "Wow, <PLAY_G>!"
- done
-
-UnknownText_0x1b63c4: ; 0x1b63c4
- text "Hello? @"
- text_from_ram wStringBuffer3
- text_start
- line "here…"
-
- para "Yippee, <PLAY_G>!"
- done
-
-UnknownText_0x1b63e3: ; 0x1b63e3
- text "Uh, hello."
- line "<PLAY_G>?"
-
- para "It's your pal,"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b6407: ; 0x1b6407
- text "Uh, hello,"
- line "<PLAY_G>?"
-
- para "It's your buddy"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b642c: ; 0x1b642c
- text "Uh, hello,"
- line "<PLAY_G>?"
-
- para "It's your sidekick"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b6454: ; 0x1b6454
- text "Yeah, hello."
- line "This is @"
- text_from_ram wStringBuffer3
- text "."
-
- para "…Huh, <PLAY_G>? Yo!"
- done
-
-UnknownText_0x1b647e: ; 0x1b647e
- text "Yeah, hello, you"
- line "got @"
- text_from_ram wStringBuffer3
- text "."
-
- para "…Huh, <PLAY_G>? Yo!"
- done
-
-UnknownText_0x1b64a8: ; 0x1b64a8
- text "Yeah, hello, you"
- line "got @"
- text_from_ram wStringBuffer3
- text "."
-
- para "…Huh, <PLAY_G>? Yo!"
- done
-
-UnknownText_0x1b64d2: ; 0x1b64d2
- text "Yeah, hello?"
- line "@"
- text_from_ram wStringBuffer3
- text " calling."
-
- para "What are you up"
- line "to, <PLAY_G>?"
- done
-
-UnknownText_0x1b6506: ; 0x1b6506
- text "Yeah, hello?"
- line "@"
- text_from_ram wStringBuffer3
- text " calling."
-
- para "Where are you now,"
- line "<PLAY_G>?"
- done
-
-UnknownText_0x1b6539: ; 0x1b6539
- text "Yeah, hello?"
- line "@"
- text_from_ram wStringBuffer3
- text " calling."
-
- para "Are you awake now,"
- line "<PLAY_G>?"
- done
-
-UnknownText_0x1b656c: ; 0x1b656c
- text "I bet your #MON"
- line "are a lot stronger"
- cont "than before."
- done
-
-UnknownText_0x1b659d: ; 0x1b659d
- text "Yup, it's @"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Is this <PLAY_G>?"
- line "Good morning!"
- done
-
-UnknownText_0x1b65c7: ; 0x1b65c7
- text "Yup, it's @"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Is that <PLAY_G>?"
- done
-
-UnknownText_0x1b65e3: ; 0x1b65e3
- text "Yup, it's @"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Is that <PLAY_G>?"
- line "Good evening!"
- done
-
-UnknownText_0x1b660d: ; 0x1b660d
- text "Hello! It's me,"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b6624: ; 0x1b6624
- text "Hello! It's me,"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b663b: ; 0x1b663b
- text "Hello! It's me,"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b6652: ; 0x1b6652
- text "<PLAY_G>, are you"
- line "raising your"
- cont "#MON properly?"
-
- para "I read in a book"
- line "that you should"
-
- para "raise any #MON"
- line "you catch with"
- cont "love and care."
- done
-
-UnknownText_0x1b66c8: ; 0x1b66c8
- text "Hi, @"
- text_from_ram wStringBuffer3
- text " on the"
- line "line."
-
- para "Hey! It's <PLAY_G>!"
- done
-
-UnknownText_0x1b66ec: ; 0x1b66ec
- text "Hi, @"
- text_from_ram wStringBuffer3
- text " on the"
- line "line."
-
- para "I know!"
- line "It's <PLAY_G>!"
- done
-
-UnknownText_0x1b6713: ; 0x1b6713
- text "Hi, @"
- text_from_ram wStringBuffer3
- text " on the"
- line "line."
-
- para "<PLAY_G>?"
- line "What's up?"
- done
-
-UnknownText_0x1b6738: ; 0x1b6738
- text "Uh, <PLAY_G>?"
-
- para "It's me!"
- line "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b6757: ; 0x1b6757
- text "Uh, <PLAY_G>?"
-
- para "It's me!"
- line "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b6776: ; 0x1b6776
- text "Uh, <PLAY_G>?"
-
- para "It's me!"
- line "It's me, @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b6795: ; 0x1b6795
- text "My @"
- text_from_ram wStringBuffer4
- text " is"
- line "so full of energy,"
-
- para "it's a little"
- line "scary."
-
- para "How are your"
- line "#MON doing?"
- done
-
-UnknownText_0x1b67e2: ; 0x1b67e2
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Hi, <PLAY_G>!"
- line "Good morning!"
- done
-
-UnknownText_0x1b680e: ; 0x1b680e
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Hi, <PLAY_G>, good"
- line "day!"
- done
-
-UnknownText_0x1b6836: ; 0x1b6836
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Hi, <PLAY_G>, good"
- line "evening!"
- done
-
-UnknownText_0x1b6862: ; 0x1b6862
- text "Hi, <PLAY_G>, good"
- line "morning!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "."
- line "How are you?"
- done
-
-UnknownText_0x1b6890: ; 0x1b6890
- text "Hi, <PLAY_G>, good"
- line "day!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "."
- line "How are you?"
- done
-
-UnknownText_0x1b68ba: ; 0x1b68ba
- text "Hi, <PLAY_G>, good"
- line "evening!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "."
- line "How are you?"
- done
-
-UnknownText_0x1b68e8: ; 0x1b68e8
- text "How are your"
- line "#MON doing?"
-
- para "You know PROF.OAK,"
- line "so of course your"
- cont "#MON are fine!"
-
- para "My #MON are"
- line "doing well too."
-
- para "But then, I am"
- line "trying to become a"
-
- para "#MON professor,"
- line "so that shouldn't"
- cont "be a big surprise."
- done
-
-UnknownText_0x1b69a8: ; 0x1b69a8
- text "Hi, <PLAY_G>?"
-
- para "Good morning pika."
- line "What's up pika?"
- done
-
-UnknownText_0x1b69d2: ; 0x1b69d2
- text "Hi, <PLAY_G>?"
-
- para "Good day pika,"
- line "what's up pika?"
- done
-
-UnknownText_0x1b69f8: ; 0x1b69f8
- text "Hi, <PLAY_G>?"
-
- para "Good evening pika,"
- line "what's up pika?"
- done
-
-UnknownText_0x1b6a22: ; 0x1b6a22
- text "<PLAY_G> pika, good"
- line "morning!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text ", how"
- line "pika are you?"
- done
-
-UnknownText_0x1b6a56: ; 0x1b6a56
- text "<PLAY_G> pika, good"
- line "pika day!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text ", how"
- line "pika are you?"
- done
-
-UnknownText_0x1b6a8b: ; 0x1b6a8b
- text "<PLAY_G> pika, good"
- line "evening!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text ". Were"
- line "you pika awake?"
- done
-
-UnknownText_0x1b6ac2: ; 0x1b6ac2
- text "You have to hear"
- line "this! My lovable"
-
- para "@"
- text_from_ram wStringBuffer4
- text " looked"
- line "at me and grinned!"
-
- para "It must be because"
- line "our hearts beat"
- cont "together as one!"
- done
-
-UnknownText_0x1b6b39: ; 0x1b6b39
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, Good morning,"
- line "<PLAY_G>."
- done
-
-UnknownText_0x1b6b65: ; 0x1b6b65
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "That voice…"
- line "<PLAY_G>, right?"
- done
-
-UnknownText_0x1b6b92: ; 0x1b6b92
- text "Hello, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "This must be"
- line "<PLAY_G>!"
- done
-
-UnknownText_0x1b6bb9: ; 0x1b6bb9
- text "Hello!"
- line "@"
- text_from_ram wStringBuffer3
- text " here…"
-
- para "Good morning! The"
- line "weather's great!"
- done
-
-UnknownText_0x1b6bef: ; 0x1b6bef
- text "Hello!"
- line "@"
- text_from_ram wStringBuffer3
- text " here…"
-
- para "What a perfect day"
- line "for fishing!"
- done
-
-UnknownText_0x1b6c23: ; 0x1b6c23
- text "Hello!"
- line "@"
- text_from_ram wStringBuffer3
- text " here…"
-
- para "It's a great night"
- line "for fishing!"
- done
-
-UnknownText_0x1b6c56: ; 0x1b6c56
- text "How's your trip"
- line "coming along?"
-
- para "I can't complain"
- line "about my fishing!"
- done
-
-UnknownText_0x1b6c96: ; 0x1b6c96
- text "Yes? @"
- text_from_ram wStringBuffer3
- text " here…"
-
- para "Ah, <PLAYER>. What"
- line "can I do for you?"
- done
-
-UnknownText_0x1b6cc6: ; 0x1b6cc6
- text "Yes? @"
- text_from_ram wStringBuffer3
- text " here…"
-
- para "Ah, <PLAYER>. What"
- line "can I do for you?"
- done
-
-UnknownText_0x1b6cf6: ; 0x1b6cf6
- text "Yes? @"
- text_from_ram wStringBuffer3
- text " here…"
-
- para "Ah, <PLAYER>. What"
- line "can I do for you?"
- done
-
-UnknownText_0x1b6d26: ; 0x1b6d26
- text "Hiya, <PLAYER>. How"
- line "are you doing?"
-
- para "Hey! It's me,"
- line "@"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b6d57: ; 0x1b6d57
- text "Hiya, <PLAYER>, how"
- line "are you doing?"
-
- para "Hey, it's me,"
- line "@"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b6d88: ; 0x1b6d88
- text "Hiya, <PLAYER>, how"
- line "are you doing?"
-
- para "Hey, it's me,"
- line "@"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b6db9: ; 0x1b6db9
- text "Oh yeah, I saw you"
- line "coming out of a"
-
- para "#MON CENTER the"
- line "other day."
-
- para "You heal your"
- line "#MON regularly,"
-
- para "don't you?"
- line "I'm impressed."
-
- para "Heh, my @"
- text_from_ram wStringBuffer4
- text_start
- line "is so tough, it"
-
- para "doesn't need to go"
- line "to #MON CENTERS"
- cont "often. Heheh!"
- done
-
-UnknownText_0x1b6e7c: ; 0x1b6e7c
- text "Yes? This is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh, <PLAY_G>."
- line "Good morning."
- done
-
-UnknownText_0x1b6ea6: ; 0x1b6ea6
- text "Yes? This is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh, <PLAY_G>."
- line "Hello."
- done
-
-UnknownText_0x1b6ec9: ; 0x1b6ec9
- text "Yes? This is"
- line "@"
- text_from_ram wStringBuffer3
- text "."
-
- para "Oh, <PLAY_G>, good"
- line "evening."
- done
-
-UnknownText_0x1b6ef3: ; 0x1b6ef3
- text "Is this <PLAY_G>?"
-
- para "Good morning. This"
- line "is @"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b6f1c: ; 0x1b6f1c
- text "Is this <PLAY_G>?"
-
- para "Hi, it's @"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b6f37: ; 0x1b6f37
- text "Is this <PLAY_G>?"
-
- para "Good evening. This"
- line "is @"
- text_from_ram wStringBuffer3
- text "."
- done
-
-UnknownText_0x1b6f60: ; 0x1b6f60
- text "Are your #MON"
- line "doing well?"
-
- para "I hope you take"
- line "them to a #MON"
- cont "CENTER every day."
-
- para "Don't push them"
- line "too hard."
-
- para "My @"
- text_from_ram wStringBuffer4
- text " is"
- line "cute and lively"
-
- para "precisely because"
- line "I take it to a"
-
- para "#MON CENTER"
- line "every day."
- done
-
-UnknownText_0x1b7019: ; 0x1b7019
- text "Yes, hello?"
- line "@"
- text_from_ram wStringBuffer3
- text " here!"
-
- para "Morning, <PLAY_G>!"
-
- para "Are you using bird"
- line "#MON?"
- done
-
-UnknownText_0x1b7057: ; 0x1b7057
- text "Yes, hello?"
- line "@"
- text_from_ram wStringBuffer3
- text " here!"
-
- para "Hi, <PLAY_G>!"
-
- para "Are your bird"
- line "#MON flying?"
- done
-
-UnknownText_0x1b7092: ; 0x1b7092
- text "Yes, hello?"
- line "@"
- text_from_ram wStringBuffer3
- text " here!"
-
- para "Evening, <PLAY_G>!"
- line "Are you letting"
-
- para "your bird #MON"
- line "see some action?"
- done
-
-UnknownText_0x1b70e7: ; 0x1b70e7
- text "Good morning,"
- line "<PLAY_G>!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "!"
- line "Good morning!"
- done
-
-UnknownText_0x1b7112: ; 0x1b7112
- text "Hi, <PLAY_G>!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "!"
- line "Remember me?"
- done
-
-UnknownText_0x1b7132: ; 0x1b7132
- text "Good evening,"
- line "<PLAY_G>!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "!"
- line "Are you free now?"
- done
-
-UnknownText_0x1b7161: ; 0x1b7161
- text "Are you and your"
- line "#MON fine?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text_start
- line "looks like it will"
-
- para "get tough enough"
- line "to face and beat"
-
- para "the legendary bird"
- line "#MON!"
- done
-
-UnknownText_0x1b71d5: ; 0x1b71d5
- text "Hello, you have"
- line "reached @"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Ah, <PLAY_G>."
- done
-
-UnknownText_0x1b71fc: ; 0x1b71fc
- text "Hello, you have"
- line "reached @"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Ah, <PLAY_G>, is"
- line "it?"
- done
-
-UnknownText_0x1b722a: ; 0x1b722a
- text "Hello, you have"
- line "reached @"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Ah, if it isn't"
- line "<PLAY_G>."
- done
-
-UnknownText_0x1b725c: ; 0x1b725c
- text "Ah, it's @"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Have you got a"
- line "moment?"
- done
-
-UnknownText_0x1b7283: ; 0x1b7283
- text "Ah, it's @"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Can you talk now?"
- done
-
-UnknownText_0x1b72a5: ; 0x1b72a5
- text "Ah, it's @"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Sorry for calling"
- line "so late."
- done
-
-UnknownText_0x1b72d0: ; 0x1b72d0
- text "Have your #MON"
- line "grown any?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text " has"
- line "grown quite a bit."
- done
-
-UnknownText_0x1b730b: ; 0x1b730b
- text_from_ram wStringBuffer3
- text " here…"
-
- para "<PLAYER>! Beautiful"
- line "morning, hey?"
- done
-
-UnknownText_0x1b7331: ; 0x1b7331
- text_from_ram wStringBuffer3
- text " here…"
-
- para "<PLAYER>! Beautiful"
- line "weather, hey?"
- done
-
-UnknownText_0x1b7357: ; 0x1b7357
- text_from_ram wStringBuffer3
- text " here…"
-
- para "<PLAYER>! Beautiful"
- line "moonlight, hey?"
- done
-
-UnknownText_0x1b737f: ; 0x1b737f
- text "Hey, <PLAYER>!"
- line "This is @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b7397: ; 0x1b7397
- text "Hey, <PLAYER>!"
- line "This is @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b73af: ; 0x1b73af
- text "Hey, <PLAYER>!"
- line "This is @"
- text_from_ram wStringBuffer3
- text "!"
- done
-
-UnknownText_0x1b73c7: ; 0x1b73c7
- text "Yup, yup!"
- line "It's @"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Hah, and here's"
- line "<PLAY_G>!"
- done
-
-UnknownText_0x1b73ef: ; 0x1b73ef
- text "Yup, yup!"
- line "It's @"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Hah, and here's"
- line "<PLAY_G>!"
- done
-
-UnknownText_0x1b7417: ; 0x1b7417
- text "Yup, yup!"
- line "It's @"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Hah, and here's"
- line "<PLAY_G>!"
- done
-
-UnknownText_0x1b743f: ; 0x1b743f
- text "<PLAY_G>, it's"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Have you had a"
- line "proper breakfast?"
- done
-
-UnknownText_0x1b746f: ; 0x1b746f
- text "<PLAY_G>, it's"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Have you had a"
- line "proper lunch?"
- done
-
-UnknownText_0x1b749b: ; 0x1b749b
- text "<PLAY_G>, it's"
- line "@"
- text_from_ram wStringBuffer3
- text "!"
-
- para "Have you had a"
- line "proper dinner?"
- done
-
-UnknownText_0x1b74c8: ; 0x1b74c8
- text "Are your #MON"
- line "looking good?"
-
- para "My @"
- text_from_ram wStringBuffer4
- text " and"
- line "me--we're looking"
-
- para "mighty dandy!"
- line "Hahahah!"
- done
-
-UnknownText_0x1b751a: ; 0x1b751a
- text "Yes, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh. Hi, <PLAY_G>!"
- line "Good morning!"
- done
-
-UnknownText_0x1b7548: ; 0x1b7548
- text "Yes, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, hi, <PLAY_G>!"
- line "Yahoo!"
- done
-
-UnknownText_0x1b756f: ; 0x1b756f
- text "Yes, this is"
- line "@"
- text_from_ram wStringBuffer3
- text "…"
-
- para "Oh, hi, <PLAY_G>!"
- done
-
-UnknownText_0x1b758f: ; 0x1b758f
- text "<PLAY_G>!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "!"
- line "Good morning!"
- done
-
-UnknownText_0x1b75ac: ; 0x1b75ac
- text "<PLAY_G>!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "!"
- line "Working hard?"
- done
-
-UnknownText_0x1b75c9: ; 0x1b75c9
- text "<PLAY_G>!"
-
- para "It's @"
- text_from_ram wStringBuffer3
- text "!"
- line "Were you up?"
- done
-
-UnknownText_0x1b75e5: ; 0x1b75e5
- text "Are you raising"
- line "your #MON?"
-
- para "Hey, @"
- text_from_ram wStringBuffer3
- text "'s"
- line "@"
- text_from_ram wStringBuffer4
- text " is"
- cont "looking good!"
- done
-
-UnusedPhoneText: ; 0x1b7624
- text "Good morning."
- done
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -8,7 +8,19 @@
EvosAttacks::
+; Evos+attacks data structure:
+; - Evolution methods:
+; * db EVOLVE_LEVEL, level, species
+; * db EVOLVE_ITEM, used item, species
+; * db EVOLVE_TRADE, held item (or -1 for none), species
+; * db EVOLVE_HAPPINESS, TR_* constant (ANYTIME, MORNDAY, NITE), species
+; * db EVOLVE_STAT, level, ATK_*_DEF constant (LT, GT, EQ), species
+; - db 0 ; no more evolutions
+; - Learnset (in increasing level order):
+; * db level, move
+; - db 0 ; no more level-up moves
+
BulbasaurEvosAttacks:
db EVOLVE_LEVEL, 16, IVYSAUR
db 0 ; no more evolutions
@@ -831,7 +843,7 @@
db 0 ; no more level-up moves
KadabraEvosAttacks:
- db EVOLVE_TRADE, $ff, ALAKAZAM
+ db EVOLVE_TRADE, -1, ALAKAZAM
db 0 ; no more evolutions
db 1, TELEPORT
db 1, KINESIS
@@ -875,7 +887,7 @@
db 0 ; no more level-up moves
MachokeEvosAttacks:
- db EVOLVE_TRADE, $ff, MACHAMP
+ db EVOLVE_TRADE, -1, MACHAMP
db 0 ; no more evolutions
db 1, LOW_KICK
db 1, LEER
@@ -989,7 +1001,7 @@
db 0 ; no more level-up moves
GravelerEvosAttacks:
- db EVOLVE_TRADE, $ff, GOLEM
+ db EVOLVE_TRADE, -1, GOLEM
db 0 ; no more evolutions
db 1, TACKLE
db 1, DEFENSE_CURL
@@ -1248,7 +1260,7 @@
db 0 ; no more level-up moves
HaunterEvosAttacks:
- db EVOLVE_TRADE, $ff, GENGAR
+ db EVOLVE_TRADE, -1, GENGAR
db 0 ; no more evolutions
db 1, HYPNOSIS
db 1, LICK
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,12 +1,12 @@
Trainers:
; Trainer data structure:
-; db "NAME@", TRAINERTYPE_* constant
-; 1 to 6 Pokémon:
-; * for TRAINERTYPE_NORMAL: db level, species
-; * for TRAINERTYPE_ITEM: db level, species, item
-; * for TRAINERTYPE_MOVES: db level, species, 4 moves
-; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
-; db -1 ; end
+; - db "NAME@", TRAINERTYPE_* constant
+; - 1 to 6 Pokémon:
+; * for TRAINERTYPE_NORMAL: db level, species
+; * for TRAINERTYPE_ITEM: db level, species, item
+; * for TRAINERTYPE_MOVES: db level, species, 4 moves
+; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
+; - db -1 ; end
FalknerGroup:
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -33,6 +33,7 @@
- [Magikarp length limits have a unit conversion error](#magikarp-length-limits-have-a-unit-conversion-error)
- [Magikarp lengths can be miscalculated](#magikarp-lengths-can-be-miscalculated)
- [Battle transitions fail to account for the enemy's level](#battle-transitions-fail-to-account-for-the-enemys-level)
+- [A "HOF Master!" title for 200-Time Famers is defined but inaccessible](#a-hof-master-title-for-200-time-famers-is-defined-but-inaccessible)
- [Slot machine payout sound effects cut each other off](#slot-machine-payout-sound-effects-cut-each-other-off)
- [Team Rocket battle music is not used for Executives or Scientists](#team-rocket-battle-music-is-not-used-for-executives-or-scientists)
- [No bump noise if standing on tile `$3E`](#no-bump-noise-if-standing-on-tile-3e)
@@ -47,6 +48,7 @@
- [Using a Park Ball in normal battles has a corrupt animation](#using-a-park-ball-in-normal-battles-has-a-corrupt-animation)
- [`HELD_CATCH_CHANCE` has no effect](#held_catch_chance-has-no-effect)
- [Only the first three `EvosAttacks` evolution entries can have Stone compatibility reported correctly](#only-the-first-three-evosattacks-evolution-entries-can-have-stone-compatibility-reported-correctly)
+- [`EVOLVE_STAT` can break Stone compatibility reporting](#evolve_stat-can-break-stone-compatibility-reporting)
- [`ScriptCall` can overflow `wScriptStack` and crash](#scriptcall-can-overflow-wscriptstack-and-crash)
- [`LoadSpriteGFX` does not limit the capacity of `UsedSprites`](#loadspritegfx-does-not-limit-the-capacity-of-usedsprites)
- [`ChooseWildEncounter` doesn't really validate the wild Pokémon species](#choosewildencounter-doesnt-really-validate-the-wild-pokémon-species)
@@ -897,6 +899,26 @@
*To do:* Fix this bug.
+## A "HOF Master!" title for 200-Time Famers is defined but inaccessible
+
+([Video](https://www.youtube.com/watch?v=iHkWubvxmSg))
+
+This is a bug with `_HallOfFamePC.DisplayMonAndStrings` in [engine/events/halloffame.asm](/engine/events/halloffame.asm):
+
+```asm
+ ld a, [wHallOfFameTempWinCount]
+ cp HOF_MASTER_COUNT + 1 ; should be HOF_MASTER_COUNT
+ jr c, .print_num_hof
+ ld de, .HOFMaster
+ hlcoord 1, 2
+ call PlaceString
+ hlcoord 13, 2
+ jr .finish
+```
+
+**Fix:** Change `HOF_MASTER_COUNT + 1` to `HOF_MASTER_COUNT`.
+
+
## Slot machine payout sound effects cut each other off
([Video](https://www.youtube.com/watch?v=ojq3xqfRF6I))
@@ -1278,6 +1300,39 @@
```
**Fix:** Change `ld bc, 10` to `ld bc, wStringBuffer2 - wStringBuffer1` to support up to six Stone entries.
+
+
+## `EVOLVE_STAT` can break Stone compatibility reporting
+
+This is a bug with `PlacePartyMonEvoStoneCompatibility.DetermineCompatibility` in [engine/party_menu.asm](/engine/party_menu.asm):
+
+```asm
+.loop2
+ ld a, [hli]
+ and a
+ jr z, .nope
+ inc hl
+ inc hl
+ cp EVOLVE_ITEM
+ jr nz, .loop2
+```
+
+**Fix:**
+
+```asm
+.loop2
+ ld a, [hli]
+ and a
+ jr z, .nope
+ cp EVOLVE_STAT
+ jr nz, .not_four_bytes
+ inc hl
+.not_four_bytes
+ inc hl
+ inc hl
+ cp EVOLVE_ITEM
+ jr nz, .loop2
+```
## `ScriptCall` can overflow `wScriptStack` and crash
--- a/engine/clock_reset.asm
+++ b/engine/clock_reset.asm
@@ -220,8 +220,8 @@
ret
; 20160 (8:4160)
-; unused
.unreferenced ; 20160
+; unused
ld a, [wBuffer3]
ld b, a
call Coord2Tile
@@ -243,10 +243,12 @@
ret
; 2017c (8:417c)
-String_2017c: ; 2017c
+UnreferencedString_HourJP: ; 2017c
+; unused
db "じ@" ; HR
; 2017e
-String_2017e: ; 2017e
+UnreferencedString_MinuteJP: ; 2017e
+; unused
db "ふん@" ; MIN
; 20181
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -482,11 +482,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_365ad
+ ld hl, IntroPalette2
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_365ad
+ ld hl, IntroPalette2
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -555,11 +555,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_e5edd
+ ld hl, IntroPalette1
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_e5edd
+ ld hl, IntroPalette1
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -621,11 +621,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_365ad
+ ld hl, IntroPalette2
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_365ad
+ ld hl, IntroPalette2
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -728,12 +728,12 @@
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_e5edd
+ ld hl, IntroPalette1
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_e5edd
+ ld hl, IntroPalette1
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -886,11 +886,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_365ad
+ ld hl, IntroPalette2
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_365ad
+ ld hl, IntroPalette2
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -1013,11 +1013,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_e5edd
+ ld hl, IntroPalette1
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_e5edd
+ ld hl, IntroPalette1
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -1122,11 +1122,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_e77dd
+ ld hl, IntroPalette5
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_e77dd
+ ld hl, IntroPalette5
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -1196,11 +1196,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_e6d6d
+ ld hl, IntroPalette4
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_e6d6d
+ ld hl, IntroPalette4
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -1270,11 +1270,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_e77dd
+ ld hl, IntroPalette5
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_e77dd
+ ld hl, IntroPalette5
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -1440,11 +1440,11 @@
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
- ld hl, Palette_e679d
+ ld hl, IntroPalette3
ld de, wBGPals1
ld bc, 16 palettes
call CopyBytes
- ld hl, Palette_e679d
+ ld hl, IntroPalette3
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
@@ -2086,7 +2086,7 @@
INCBIN "gfx/intro/003.tilemap.lz"
; e5edd
-Palette_e5edd: ; e5edd
+IntroPalette1: ; e5edd
INCLUDE "gfx/intro/intro_1.pal"
; e5f5d
@@ -2122,7 +2122,7 @@
INCBIN "gfx/intro/007.tilemap.lz"
; e65ad
-Palette_365ad: ; e65ad
+IntroPalette2: ; e65ad
INCLUDE "gfx/intro/intro_2.pal"
; e662d
@@ -2138,7 +2138,7 @@
INCBIN "gfx/intro/015.tilemap.lz"
; e679d
-Palette_e679d: ; e679d
+IntroPalette3: ; e679d
INCLUDE "gfx/intro/intro_3.pal"
; e681d
@@ -2154,7 +2154,7 @@
INCBIN "gfx/intro/011.tilemap.lz"
; e6d6d
-Palette_e6d6d: ; e6d6d
+IntroPalette4: ; e6d6d
INCLUDE "gfx/intro/intro_4.pal"
; e6ded
@@ -2182,7 +2182,7 @@
INCBIN "gfx/intro/013.tilemap.lz"
; e77dd
-Palette_e77dd: ; e77dd
+IntroPalette5: ; e77dd
INCLUDE "gfx/intro/intro_5.pal"
IntroUnownBackGFX: ; e785d
--- a/engine/crystal_layouts.asm
+++ b/engine/crystal_layouts.asm
@@ -54,7 +54,7 @@
MG_Mobile_Layout_LoadPals: ; 49351 (12:5351)
ld de, wBGPals1
- ld hl, Palette_493e1
+ ld hl, Palette_MysteryGiftMobile
ld bc, 5 palettes
ld a, BANK(wBGPals1)
call FarCopyWRAM
@@ -111,7 +111,7 @@
ret
; 493e1 (12:53e1)
-Palette_493e1: ; 493e1
+Palette_MysteryGiftMobile: ; 493e1
INCLUDE "gfx/mystery_gift/mg_mobile.pal"
; 49409
--- a/engine/debug.asm
+++ b/engine/debug.asm
@@ -181,13 +181,13 @@
push af
ld a, BANK(wBGPals2)
ld [rSVBK], a
- ld hl, Palette_819f4
+ ld hl, Palette_DebugBG
ld de, wBGPals2
ld bc, 16 palettes
call CopyBytes
ld a, 1 << rBGPI_AUTO_INCREMENT
ld [rBGPI], a
- ld hl, Palette_819f4
+ ld hl, Palette_DebugBG
ld c, 8 palettes
xor a
.asm_819c8
@@ -196,7 +196,7 @@
jr nz, .asm_819c8
ld a, 1 << rOBPI_AUTO_INCREMENT
ld [rOBPI], a
- ld hl, Palette_81a34
+ ld hl, Palette_DebugOB
ld c, 8 palettes
.asm_819d6
ld a, [hli]
@@ -216,10 +216,10 @@
ret
; 819f4
-Palette_819f4: ; 819f4
+Palette_DebugBG: ; 819f4
INCLUDE "gfx/debug/bg.pal"
-Palette_81a34: ; 81a34
+Palette_DebugOB: ; 81a34
INCLUDE "gfx/debug/ob.pal"
; 81a74
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -1334,7 +1334,7 @@
dec a
jr nz, .loop2
.skip
- ld de, String_1709a4
+ ld de, String_MysteryJP
ld a, NAME_LENGTH_JAPANESE
.compare_loop
push af
@@ -1375,8 +1375,8 @@
ret
; 1709a4 (5c:49a4)
-String_1709a4: ; 1709a4
- db "なぞナゾ@@"
+String_MysteryJP: ; 1709a4
+ db "なぞナゾ@@" ; MYSTERY
Function1709aa: ; 1709aa (5c:49aa) BattleTowerAction $0f
ld a, [rSVBK]
@@ -1400,7 +1400,7 @@
jr nc, .invalid
ld e, a
ld d, 0
- ld hl, Jumptable_1709e7
+ ld hl, .jumptable
add hl, de
add hl, de
ld a, [hli]
@@ -1417,7 +1417,7 @@
ret
; 1709e7 (5c:49e7)
-Jumptable_1709e7: ; 1709e7
+.jumptable: ; 1709e7
dw .NoAction
dw .NoAction
dw .DoAction1
@@ -1519,11 +1519,11 @@
; 170a9c
Function170a9c: ; 170a9c (5c:4a9c) BattleTowerAction $11
- ld c, $0
+ ld c, FALSE
jr asm_170aa2
Function170aa0: ; 170aa0 (5c:4aa0) BattleTowerAction $12
- ld c, $1
+ ld c, TRUE
asm_170aa2: ; 170aa2 (5c:4aa2)
ld a, $5
call GetSRAMBank
--- 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/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -18,7 +18,7 @@
ld hl, wHallOfFameCount
ld a, [hl]
- cp 200
+ cp HOF_MASTER_COUNT
jr nc, .ok
inc [hl]
.ok
@@ -355,7 +355,7 @@
.DisplayMonAndStrings:
; Print the number of times the player has entered the Hall of Fame.
-; If that number is above 200, print "HOF Master!" instead.
+; If that number is at least HOF_MASTER_COUNT, print "HOF Master!" instead.
ld a, [wHallOfFameMonCounter]
cp PARTY_LENGTH
jr nc, .fail
@@ -376,7 +376,7 @@
pop hl
call DisplayHOFMon
ld a, [wHallOfFameTempWinCount]
- cp 200 + 1
+ cp HOF_MASTER_COUNT + 1 ; should be HOF_MASTER_COUNT
jr c, .print_num_hof
ld de, .HOFMaster
hlcoord 1, 2
--- a/engine/link_trade.asm
+++ b/engine/link_trade.asm
@@ -11,7 +11,7 @@
; 16d42e
Function16d42e: ; 16d42e
- ld hl, Tilemap_16d465
+ ld hl, Tilemap_MobileTradeBorderFullscreen
decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes
@@ -34,13 +34,13 @@
ret
; 16d465
-Tilemap_16d465:
+Tilemap_MobileTradeBorderFullscreen:
INCBIN "gfx/trade/border_mobile_fullscreen.tilemap"
-Tilemap_16d5cd:
+Tilemap_CableTradeBorderTop:
INCBIN "gfx/trade/border_cable_top.tilemap"
-Tilemap_16d5f5:
+Tilemap_CableTradeBorderBottom:
INCBIN "gfx/trade/border_cable_bottom.tilemap"
_LinkTextbox: ; 16d61d
@@ -152,11 +152,11 @@
Function16d6ae: ; 16d6ae
call Function16d42e
- ld hl, Tilemap_16d5cd
+ ld hl, Tilemap_CableTradeBorderTop
decoord 0, 0
ld bc, 2 * SCREEN_WIDTH
call CopyBytes
- ld hl, Tilemap_16d5f5
+ ld hl, Tilemap_CableTradeBorderBottom
decoord 0, 16
ld bc, 2 * SCREEN_WIDTH
call CopyBytes
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -1420,7 +1420,7 @@
call WaitBGMap
call Function1057d7
hlcoord 3, 8
- ld de, String_10572e
+ ld de, String_PressAToLink_BToCancel_JP
call PlaceString
call WaitBGMap
call Function10578c
@@ -1451,9 +1451,9 @@
ld a, c
ld [wd265], a
ld hl, Text_CardNotRegistered
- jr c, asm_105726
+ jr c, PrintTextAndExit_JP
ld hl, Text_ListedCardAsNumber
- jr asm_105726
+ jr PrintTextAndExit_JP
Function1056eb: ; 1056eb (41:56eb)
ld c, 16
@@ -1487,7 +1487,7 @@
Function105712: ; 105712 (41:5712)
call Function105777
ld hl, Text_MGLinkCanceled
- jr asm_105726
+ jr PrintTextAndExit_JP
Function10571a: ; 10571a (41:571a)
call Function105777
@@ -1495,7 +1495,7 @@
call PrintText
jp Function105688
-asm_105726: ; 105726 (41:5726)
+PrintTextAndExit_JP: ; 105726 (41:5726)
call PrintText
ld a, LCDC_DEFAULT
ld [rLCDC], a
@@ -1502,11 +1502,11 @@
ret
; 10572e (41:572e)
-String_10572e: ; 10572e
- db "エーボタン¯おすと"
+String_PressAToLink_BToCancel_JP: ; 10572e
+ db "エーボタン<WO>おすと"
next "つうしん<PKMN>おこなわれるよ!"
- next "ビーボタン¯おすと"
- next "つうしん¯ちゅうし します"
+ next "ビーボタン<WO>おすと"
+ next "つうしん<WO>ちゅうし します"
db "@"
; 10575e
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -169,7 +169,7 @@
jump .main
.main ; 0xbcfe7
- farwritetext BillPhoneGeneriText
+ farwritetext BillPhoneGenericText
buttonsound
checkcode VAR_BOXSPACE
vartomem MEM_BUFFER_0
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -211,7 +211,8 @@
call FarString
ret
-String_44331: ; 44331
+UnreferencedPOKeString: ; 44331
+; unused
db "#@"
GetDexEntryPointer: ; 44333
--- a/engine/start_menu.asm
+++ b/engine/start_menu.asm
@@ -1595,7 +1595,7 @@
lb bc, 5, SCREEN_WIDTH - 2
call ClearBox
hlcoord 1, 12
- ld de, String_1316b
+ ld de, String_MoveWhere
call PlaceString
jp .joy_loop
.b_button
@@ -1771,7 +1771,7 @@
db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON
; 1316b
-String_1316b: ; 1316b
+String_MoveWhere: ; 1316b
db "Where?@"
; 13172
@@ -1871,13 +1871,13 @@
xor a
ld [hBGMapMode], a
hlcoord 0, 10
- ld de, String_132ba
+ ld de, String_MoveType_Top
call PlaceString
hlcoord 0, 11
- ld de, String_132c2
+ ld de, String_MoveType_Bottom
call PlaceString
hlcoord 12, 12
- ld de, String_132ca
+ ld de, String_MoveAtk
call PlaceString
ld a, [wCurMove]
ld b, a
@@ -1900,7 +1900,7 @@
jr .description
.no_power
- ld de, String_132cf
+ ld de, String_MoveNoPower
call PlaceString
.description
@@ -1911,16 +1911,16 @@
ret
; 132ba
-String_132ba: ; 132ba
+String_MoveType_Top: ; 132ba
db "┌─────┐@"
; 132c2
-String_132c2: ; 132c2
+String_MoveType_Bottom: ; 132c2
db "│TYPE/└@"
; 132ca
-String_132ca: ; 132ca
+String_MoveAtk: ; 132ca
db "ATK/@"
; 132cf
-String_132cf: ; 132cf
+String_MoveNoPower: ; 132cf
db "---@"
; 132d3
--- a/home/rst.asm
+++ b/home/rst.asm
@@ -1,24 +1,24 @@
; rst vectors
-SECTION "rst0",ROM0
+SECTION "rst0", ROM0
di
jp Start
-SECTION "rst8",ROM0
+SECTION "rst8", ROM0 ; rst FarCall
jp FarCall_hl
-SECTION "rst10",ROM0
+SECTION "rst10", ROM0 ; rst Bankswitch
ld [hROMBank], a
ld [MBC3RomBank], a
ret
-SECTION "rst18",ROM0
+SECTION "rst18", ROM0
rst $38
-SECTION "rst20",ROM0
+SECTION "rst20", ROM0
rst $38
-SECTION "rst28",ROM0
+SECTION "rst28", ROM0 ; rst JumpTable
push de
ld e, a
ld d, 0
@@ -30,8 +30,8 @@
pop de
jp hl
-; SECTION "rst30",ROM0
+; SECTION "rst30", ROM0
; rst30 is midst rst28
-SECTION "rst38",ROM0
+SECTION "rst38", ROM0
rst $38
--- a/main.asm
+++ b/main.asm
@@ -560,7 +560,7 @@
INCLUDE "data/phone/text/mom.asm"
INCLUDE "data/phone/text/bill.asm"
INCLUDE "data/phone/text/elm.asm"
-INCLUDE "data/phone/text/trainers1.asm"
+INCLUDE "data/phone/text/trainers.asm"
SECTION "Miscellaneous Text", ROMX
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -37,6 +37,7 @@
done
AzaleaPokecenter1FUnusedText:
+; unreferenced
text "This BILL guy"
line "created the system"
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -143,7 +143,7 @@
closetext
end
-WoosterScript:
+UnusedWoosterScript:
; unused
faceplayer
opentext
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -40,7 +40,7 @@
.Scene1:
end
-MapBattleTower1FSignpost0Script:
+BattleTower1FRulesSign:
opentext
writetext Text_ReadBattleTowerRules
yesorno
@@ -51,7 +51,7 @@
closetext
end
-ReceptionistScript_0x9e3e2:
+BattleTower1FReceptionistScript:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
@@ -63,7 +63,7 @@
ifnotequal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
-Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
+Script_Menu_ChallengeExplanationCancel:
writetext Text_WantToGoIntoABattleRoom
writebyte TRUE
special Menu_ChallengeExplanationCancel
@@ -71,7 +71,7 @@
ifequal 2, Script_BattleTowerExplanation
jump Script_BattleTowerHopeToServeYouAgain
-Script_ChooseChallenge: ; 0x9e40f
+Script_ChooseChallenge:
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction
special CheckForBattleTowerRules
@@ -117,7 +117,7 @@
warpcheck
end
-Script_GivePlayerHisPrize: ; 0x9e47a
+Script_GivePlayerHisPrize:
writebyte BATTLETOWERACTION_1C
special BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD
@@ -131,17 +131,17 @@
closetext
end
-Script_YourPackIsStuffedFull: ; 0x9e498
+Script_YourPackIsStuffedFull:
writetext Text_YourPackIsStuffedFull
waitbutton
closetext
end
-Script_BattleTowerIntroductionYesNo: ; 0x9e49e
+Script_BattleTowerIntroductionYesNo:
writetext Text_WouldYouLikeToHearAboutTheBattleTower
yesorno
iffalse Script_BattleTowerSkipExplanation
-Script_BattleTowerExplanation: ; 0x9e4a5
+Script_BattleTowerExplanation:
writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation:
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
@@ -159,7 +159,7 @@
closetext
end
-Script_WaitButton: ; 0x9e4bb
+Script_WaitButton:
waitbutton
closetext
end
@@ -223,12 +223,12 @@
waitbutton
jump Script_BattleTowerHopeToServeYouAgain
-Script_AMonLevelExceeds: ; 0x9e542
+Script_AMonLevelExceeds:
writetext Text_AMonLevelExceeds
waitbutton
jump Script_Menu_ChallengeExplanationCancel
-Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
+Script_MayNotEnterABattleRoomUnderL70:
writetext Text_MayNotEnterABattleRoomUnderL70
waitbutton
jump Script_Menu_ChallengeExplanationCancel
@@ -244,7 +244,7 @@
waitbutton
jump Script_BattleTowerHopeToServeYouAgain
-YoungsterScript_0x9e55d:
+BattleTower1FYoungsterScript:
faceplayer
opentext
writetext Text_BattleTowerYoungster
@@ -253,13 +253,13 @@
turnobject BATTLETOWER1F_YOUNGSTER, RIGHT
end
-CooltrainerFScript_0x9e568:
+BattleTower1FCooltrainerFScript:
jumptextfaceplayer Text_BattleTowerCooltrainerF
-BugCatcherScript_0x9e56b:
+BattleTower1FBugCatcherScript:
jumptextfaceplayer Text_BattleTowerBugCatcher
-GrannyScript_0x9e56e:
+BattleTower1FGrannyScript:
jumptextfaceplayer Text_BattleTowerGranny
MovementData_BattleTower1FWalkToElevator:
@@ -346,7 +346,7 @@
turn_head RIGHT
step_end
-Text_BattleTowerWelcomesYou: ; 0x9e5ab
+Text_BattleTowerWelcomesYou:
text "BATTLE TOWER"
line "welcomes you!"
@@ -354,17 +354,17 @@
line "to a BATTLE ROOM."
done
-Text_WantToGoIntoABattleRoom: ; 0x9e5ea
+Text_WantToGoIntoABattleRoom:
text "Want to go into a"
line "BATTLE ROOM?"
done
-Text_RightThisWayToYourBattleRoom: ; 0x9e60a
+Text_RightThisWayToYourBattleRoom:
text "Right this way to"
line "your BATTLE ROOM."
done
-Text_BattleTowerIntroduction_1: ; 0x9e62f
+Text_BattleTowerIntroduction_1:
text "BATTLE TOWER is a"
line "facility made for"
cont "#MON battles."
@@ -424,7 +424,7 @@
para ""
done
-Text_BattleTowerIntroduction_2: ; 0x9e886
+Text_BattleTowerIntroduction_2:
text "BATTLE TOWER is a"
line "facility made for"
cont "#MON battles."
@@ -460,7 +460,7 @@
para ""
done
-Text_ReceivedAListOfLeadersOnTheHonorRoll: ; 0x9e9eb
+Text_ReceivedAListOfLeadersOnTheHonorRoll:
text "Received a list of"
line "LEADERS on the"
cont "HONOR ROLL."
@@ -468,18 +468,18 @@
para ""
done
-Text_PleaseConfirmOnThisMonitor: ; 0x9ea1b
+Text_PleaseConfirmOnThisMonitor:
text "Please confirm on"
line "this monitor."
done
-Text_ThankYou: ; 0x9ea3c
+Text_ThankYou:
text "Thank you!"
para ""
done
-Text_ThanksForVisiting: ; 0x9ea49
+Text_ThanksForVisiting:
text "Thanks for"
line "visiting!"
done
@@ -502,7 +502,7 @@
para ""
done
-Text_CongratulationsYouveBeatenAllTheTrainers: ; 0x9eaef
+Text_CongratulationsYouveBeatenAllTheTrainers:
text "Congratulations!"
para "You've beaten all"
@@ -522,7 +522,7 @@
line "CENTER?"
done
-Text_PlayerGotFive: ; 0x9eb7e
+Text_PlayerGotFive:
text "<PLAYER> got five"
line "@"
text_from_ram wStringBuffer4
@@ -531,7 +531,7 @@
text_waitbutton
db "@"
-Text_YourPackIsStuffedFull: ; 0x9eb94
+Text_YourPackIsStuffedFull:
text "Oops, your PACK is"
line "stuffed full."
@@ -539,7 +539,7 @@
line "and come back."
done
-Text_YourRegistrationIsComplete: ; 0x9ebd6
+Text_YourRegistrationIsComplete:
text "Your registration"
line "is complete."
@@ -546,17 +546,17 @@
para "Please come again!"
done
-Text_WeHopeToServeYouAgain: ; 0x9ec09
+Text_WeHopeToServeYouAgain:
text "We hope to serve"
line "you again."
done
-Text_PleaseStepThisWay: ; 0x9ec26
+Text_PleaseStepThisWay:
text "Please step this"
line "way."
done
-Text_WouldYouLikeToHearAboutTheBattleTower: ; 0x9ec3d
+Text_WouldYouLikeToHearAboutTheBattleTower:
text "Would you like to"
line "hear about the"
cont "BATTLE TOWER?"
@@ -582,12 +582,12 @@
cont "deleted. OK?"
done
-Text_CheckTheLeaderHonorRoll: ; 0x9ed1e
+Text_CheckTheLeaderHonorRoll:
text "Check the LEADER"
line "HONOR ROLL?"
done
-Text_ReadBattleTowerRules: ; 0x9ed3c
+Text_ReadBattleTowerRules:
text "BATTLE TOWER rules"
line "are written here."
@@ -594,7 +594,7 @@
para "Read the rules?"
done
-Text_BattleTowerRules: ; 0x9ed72
+Text_BattleTowerRules:
text "Three #MON may"
line "enter battles."
@@ -626,13 +626,13 @@
line "invalid."
done
-Text_YourMonWillBeHealedToFullHealth: ; 0x9ee92
+Text_YourMonWillBeHealedToFullHealth:
text "Your #MON will"
line "be healed to full"
cont "health."
done
-Text_NextUpOpponentNo: ; 0x9eebc
+Text_NextUpOpponentNo:
text "Next up, opponent"
line "no.@"
text_from_ram wStringBuffer3
@@ -647,7 +647,7 @@
line "the CENTER."
done
-Text_SaveBeforeEnteringBattleRoom: ; 0x9ef1f
+Text_SaveBeforeEnteringBattleRoom:
text "Before entering"
line "the BATTLE ROOM,"
@@ -655,7 +655,7 @@
line "be saved."
done
-Text_SaveAndEndTheSession: ; 0x9ef5e
+Text_SaveAndEndTheSession:
text "SAVE and end the"
line "session?"
done
@@ -668,7 +668,7 @@
line "the previous ROOM."
done
-Text_CancelYourBattleRoomChallenge: ; 0x9efbf
+Text_CancelYourBattleRoomChallenge:
text "Cancel your BATTLE"
line "ROOM challenge?"
done
@@ -699,7 +699,7 @@
line "tomorrow."
done
-Text_TooMuchTimeElapsedNoRegister: ; 0x9f0c1
+Text_TooMuchTimeElapsedNoRegister:
text "Sorry, but it's"
line "not possible to"
@@ -730,7 +730,7 @@
cont "challenge."
done
-Text_AMonLevelExceeds: ; 0x9f1e5
+Text_AMonLevelExceeds:
text "One or more of"
line "your #MON's"
cont "levels exceeds @"
@@ -738,7 +738,7 @@
text "."
done
-Text_MayNotEnterABattleRoomUnderL70: ; 0x9f217
+Text_MayNotEnterABattleRoomUnderL70:
text_from_ram wcd49
text " may not"
line "enter a BATTLE"
@@ -750,7 +750,7 @@
text "."
done
-Text_BattleTowerYoungster: ; 0x9f264
+Text_BattleTowerYoungster:
text "Destroyed by the"
line "first opponent in"
@@ -758,7 +758,7 @@
line "I'm no good…"
done
-Text_BattleTowerCooltrainerF: ; 0x9f2a4
+Text_BattleTowerCooltrainerF:
text "There are lots of"
line "BATTLE ROOMS, but"
@@ -766,7 +766,7 @@
line "them all!"
done
-Text_BattleTowerGranny: ; 0x9f2e3
+Text_BattleTowerGranny:
text "It's a grueling"
line "task, not being"
@@ -780,7 +780,7 @@
line "winning battles."
done
-Text_BattleTowerBugCatcher: ; 0x9f35b
+Text_BattleTowerBugCatcher:
text "I'm trying to see"
line "how far I can go"
@@ -802,11 +802,11 @@
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
- object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
- object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
- object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
- object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
+ object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FReceptionistScript, -1
+ object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BattleTower1FYoungsterScript, -1
+ object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTower1FCooltrainerFScript, -1
+ object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BattleTower1FBugCatcherScript, -1
+ object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FGrannyScript, -1
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-.EnterBattleRoom: ; 0x9f419
+.EnterBattleRoom:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom
setscene SCENE_FINISHED
@@ -16,10 +16,10 @@
.DummyScene:
end
-Script_BattleRoom: ; 0x9f421
+Script_BattleRoom:
applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn
; beat all 7 opponents in a row
-Script_BattleRoomLoop: ; 0x9f425
+Script_BattleRoomLoop:
writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
special LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
@@ -55,13 +55,13 @@
writetext Text_NextUpOpponentNo
yesorno
iffalse Script_DontBattleNextOpponent
-Script_ContinueAndBattleNextOpponent: ; 0x9f477
+Script_ContinueAndBattleNextOpponent:
closetext
applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent
applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway
jump Script_BattleRoomLoop
-Script_DontBattleNextOpponent: ; 0x9f483
+Script_DontBattleNextOpponent:
writetext Text_SaveAndEndTheSession
yesorno
iffalse Script_DontSaveAndEndTheSession
@@ -75,7 +75,7 @@
waitsfx
special FadeOutPalettes
special Reset
-Script_DontSaveAndEndTheSession: ; 0x9f4a3
+Script_DontSaveAndEndTheSession:
writetext Text_CancelYourBattleRoomChallenge
yesorno
iffalse Script_ContinueAndBattleNextOpponent
@@ -101,7 +101,7 @@
closetext
end
-Script_BeatenAllTrainers: ; 0x9f4d9
+Script_BeatenAllTrainers:
pause 60
special BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, 7, 7
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -35,7 +35,7 @@
; enter different rooms for different levels to battle against
; at least it should look like that
; because all warps lead to the same room
-.WalkToChosenBattleRoom: ; 0x9f5dc
+.WalkToChosenBattleRoom:
ifequal 3, .L30L40
ifequal 4, .L30L40
ifequal 5, .L50L60
@@ -47,23 +47,23 @@
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
jump .EnterBattleRoom
-.L30L40: ; 0x9f603
+.L30L40:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room
jump .EnterBattleRoom
-.L50L60: ; 0x9f60a
+.L50L60:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room
jump .EnterBattleRoom
-.L70L80: ; 0x9f611
+.L70L80:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room
jump .EnterBattleRoom
-.L90L100: ; 0x9f618
+.L90L100:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room
jump .EnterBattleRoom
-.EnterBattleRoom: ; 0x9f61f
+.EnterBattleRoom:
faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST
opentext
writetext Text_PleaseStepThisWay
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -27,10 +27,11 @@
BattleTowerOutsideSailorScript:
jumptextfaceplayer BattleTowerOutsideSailorText
-MapBattleTowerOutsideSignpost0Script:
- jumptext BattleTowerOutsideText_UltimateChallenge
+BattleTowerOutsideSign:
+ jumptext BattleTowerOutsideSignText
-BattleTowerOutsideUnusedText1:
+BattleTowerOutsideYoungsterText_NotYetOpen:
+; unreferenced
text "Wow, the BATTLE"
line "TOWER is huge! My"
@@ -38,7 +39,8 @@
line "looking up at it."
done
-BattleTowerOutsideUnusedText2:
+BattleTowerOutsideYoungsterText_Mobile:
+; unreferenced
text "Wow, the BATTLE"
line "TOWER is huge!"
@@ -61,7 +63,8 @@
cont "in there!"
done
-BattleTowerOutsideUnusedText3:
+BattleTowerOutsideBuenaText_NotYetOpen:
+; unreferenced
text "What on earth do"
line "they do here?"
@@ -83,7 +86,8 @@
line "battle…"
done
-BattleTowerOutsideUnusedText4:
+BattleTowerOutsideSailorText_Mobile:
+; unreferenced
text "Ehehehe…"
line "I sneaked out of"
cont "work to come here."
@@ -104,12 +108,12 @@
line "all. That I must!"
done
-BattleTowerOutsideText_BattleTower:
+BattleTowerOutsideSignText_NotYetOpen:
; unused; originally shown when the Battle Tower was closed
text "BATTLE TOWER"
done
-BattleTowerOutsideText_UltimateChallenge:
+BattleTowerOutsideSignText:
text "BATTLE TOWER"
para "Take the Ultimate"
@@ -139,7 +143,7 @@
db 0 ; coord events
db 1 ; bg events
- bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script
+ bg_event 10, 10, BGEVENT_READ, BattleTowerOutsideSign
db 4 ; object events
object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -12,15 +12,15 @@
faceplayer
opentext
checkevent EVENT_GOT_EEVEE
- iftrue UnknownScript_0x54c1f
+ iftrue .GotEevee
writetext UnknownText_0x54c74
yesorno
- iffalse UnknownScript_0x54c19
+ iffalse .Refused
writetext UnknownText_0x54d3f
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
- ifequal PARTY_LENGTH, UnknownScript_0x54c13
+ ifequal PARTY_LENGTH, .NoRoom
writetext UnknownText_0x54dae
playsound SFX_CAUGHT_MON
waitsfx
@@ -31,19 +31,19 @@
closetext
end
-UnknownScript_0x54c13:
+.NoRoom:
writetext UnknownText_0x54e02
waitbutton
closetext
end
-UnknownScript_0x54c19:
+.Refused:
writetext UnknownText_0x54e2d
waitbutton
closetext
end
-UnknownScript_0x54c1f:
+.GotEevee:
writetext UnknownText_0x54e42
waitbutton
closetext
@@ -53,13 +53,13 @@
faceplayer
opentext
checkevent EVENT_MET_BILL
- iffalse UnknownScript_0x54c33
+ iffalse .HaventMetBill
writetext UnknownText_0x54ea8
waitbutton
closetext
end
-UnknownScript_0x54c33:
+.HaventMetBill:
writetext UnknownText_0x54f4e
waitbutton
closetext
@@ -69,11 +69,11 @@
faceplayer
opentext
checkcellnum PHONE_BILL
- iftrue UnknownScript_0x54c58
+ iftrue .GotBillsNumber
writetext UnknownText_0x54f9e
askforphonenumber PHONE_BILL
- ifequal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
- ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
+ ifequal PHONE_CONTACTS_FULL, .NoRoom
+ ifequal PHONE_CONTACT_REFUSED, .Refused
waitsfx
addcellnum PHONE_BILL
writetext UnknownText_0x54fd9
@@ -80,22 +80,22 @@
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
buttonsound
-UnknownScript_0x54c58: ;0x54c58
+.GotBillsNumber:
writetext UnknownText_0x55069
waitbutton
closetext
end
-UnknownScript_0x54c5e:
+.Refused:
writetext UnknownText_0x54ff3
waitbutton
closetext
end
-UnknownScript_0x54c64:
+.NoRoom:
writetext UnknownText_0x55046
buttonsound
- jump UnknownScript_0x54c5e
+ jump .Refused
BillsHouseBookshelf1:
jumpstd picturebookshelf
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -104,13 +104,13 @@
waitbutton
closetext
checkcode VAR_FACING
- ifequal UP, .Movement
+ ifequal UP, .Movement2
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
- jump UnknownScript_0x18622a
+ jump .Finish
-.Movement:
+.Movement2:
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2
-UnknownScript_0x18622a:
+.Finish:
disappear BURNEDTOWERB1F_EUSINE
playsound SFX_EXIT_BUILDING
waitsfx
@@ -155,7 +155,8 @@
remove_sliding
step_end
-MovementData_0x18624f:
+BurnedTowerUnusedMovement:
+; unreferenced
set_sliding
big_step DOWN
remove_sliding
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -158,8 +158,8 @@
line "a sales clerk."
done
+CeladonCityLassText_Mobile:
; unused
-CeladonCityUnusedPokeComCenterText:
text "I love being"
line "surrounded by tall"
cont "buildings!"
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-ClerkScript_0x70bad:
+CeladonDeptStore2FClerk1Script:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1
@@ -16,7 +16,7 @@
closetext
end
-ClerkScript_0x70bb5:
+CeladonDeptStore2FClerk2Script:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2
@@ -81,7 +81,7 @@
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
db 4 ; object events
- object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
- object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
+ object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FClerk1Script, -1
+ object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FClerk2Script, -1
object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -10,7 +10,7 @@
db 0 ; callbacks
-ClerkScript_0x70d29:
+CeladonDeptStore3FClerkScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_CELADON_3F
@@ -107,7 +107,7 @@
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
db 5 ; object events
- object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
+ object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FClerkScript, -1
object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x70f0d:
+CeladonDeptStore4FClerkScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_CELADON_4F
@@ -63,6 +63,6 @@
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
db 3 ; object events
- object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
+ object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FClerkScript, -1
object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -10,7 +10,7 @@
db 0 ; callbacks
-ClerkScript_0x71004:
+CeladonDeptStore5FClerk1Script:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1
@@ -17,7 +17,7 @@
closetext
end
-ClerkScript_0x7100c:
+CeladonDeptStore5FClerk2Script:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2
@@ -84,8 +84,8 @@
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
db 5 ; object events
- object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
- object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
+ object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FClerk1Script, -1
+ object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FClerk2Script, -1
object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -133,16 +133,16 @@
CeladonGameCornerLighterScript:
jumptext CeladonGameCornerLighterText
-MapCeladonGameCornerSignpost9Script:
+CeladonGameCornerSodaCanScript:
opentext
- writetext UnknownText_0x72567
+ writetext CeladonGameCornerSodaCanText
waitbutton
special CardFlip
closetext
end
-MovementData_0x721cd:
-; unused
+CeladonGameCornerUnusedMovementData:
+; unreferenced
step RIGHT
turn_head LEFT
step_end
@@ -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/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -11,7 +11,7 @@
db 0 ; callbacks
-ErikaScript_0x72a6a:
+CeladonGymErikaScript:
faceplayer
opentext
checkflag ENGINE_RAINBOWBADGE
@@ -35,13 +35,13 @@
setflag ENGINE_RAINBOWBADGE
.FightDone:
checkevent EVENT_GOT_TM19_GIGA_DRAIN
- iftrue .AfterTM
+ iftrue .GotGigaDrain
writetext ErikaExplainTMText
buttonsound
verbosegiveitem TM_GIGA_DRAIN
- iffalse .AfterTM
+ iffalse .GotGigaDrain
setevent EVENT_GOT_TM19_GIGA_DRAIN
-.AfterTM:
+.GotGigaDrain:
writetext ErikaAfterBattleText
waitbutton
closetext
@@ -279,7 +279,7 @@
bg_event 6, 15, BGEVENT_READ, CeladonGymStatue
db 6 ; object events
- object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
+ object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGymErikaScript, -1
object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
--- 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
@@ -9,17 +9,17 @@
db 0 ; callbacks
-CooltrainerMScript_0x71670:
+CeladonMansion3FCooltrainerMScript:
faceplayer
opentext
writetext UnknownText_0x716ce
checkcode VAR_DEXCAUGHT
- ifgreater NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
+ ifgreater NUM_POKEMON - 2 - 1, .CompletedPokedex ; ignore Mew and Celebi
waitbutton
closetext
end
-UnknownScript_0x7167e:
+.CompletedPokedex:
buttonsound
writetext UnknownText_0x71725
playsound SFX_DEX_FANFARE_230_PLUS
@@ -33,31 +33,32 @@
setevent EVENT_ENABLE_DIPLOMA_PRINTING
end
-GymGuyScript_0x71696:
+CeladonMansion3FGymGuyScript:
faceplayer
opentext
checkevent EVENT_ENABLE_DIPLOMA_PRINTING
- iftrue UnknownScript_0x716a4
+ iftrue .CanPrintDiploma
writetext UnknownText_0x717b4
waitbutton
closetext
end
-UnknownScript_0x716a4:
+.CanPrintDiploma:
writetext UnknownText_0x717d8
yesorno
- iffalse UnknownScript_0x716b0
+ iffalse .Refused
special PrintDiploma
closetext
end
-UnknownScript_0x716b0:
+.Refused:
writetext UnknownText_0x71830
waitbutton
closetext
end
-UnknownScript_0x716b6:
+.CancelPrinting:
+; unused
writetext UnknownText_0x71863
waitbutton
closetext
@@ -69,17 +70,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 +162,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 +181,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,13 +200,13 @@
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
- object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
+ object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FCooltrainerMScript, -1
+ object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FGymGuyScript, -1
object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -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/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -6,30 +6,30 @@
db 0 ; callbacks
-PharmacistScript_0x71afd:
+CeladonMansionRoofHousePharmacistScript:
faceplayer
opentext
checkevent EVENT_GOT_TM03_CURSE
- iftrue UnknownScript_0x71b21
+ iftrue .GotCurse
writetext UnknownText_0x71b27
buttonsound
checktime NITE
- iftrue UnknownScript_0x71b14
+ iftrue .Night
writetext UnknownText_0x71b4a
waitbutton
closetext
end
-UnknownScript_0x71b14:
+.Night:
writetext UnknownText_0x71ba3
buttonsound
verbosegiveitem TM_CURSE
- iffalse UnknownScript_0x71b25
+ iffalse .NoRoom
setevent EVENT_GOT_TM03_CURSE
-UnknownScript_0x71b21:
+.GotCurse:
writetext UnknownText_0x71db3
waitbutton
-UnknownScript_0x71b25:
+.NoRoom:
closetext
end
@@ -126,4 +126,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
+ object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofHousePharmacistScript, -1
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -10,10 +10,10 @@
db 0 ; callbacks
-NurseScript_0x71e22:
+CeladonPokecenter1FNurseScript:
jumpstd pokecenternurse
-GentlemanScript_0x71e25:
+CeladonPokecenter1FGentlemanScript:
jumpstd happinesschecknpc
CeladonPokecenter1FCooltrainerFScript:
@@ -156,8 +156,8 @@
db 0 ; bg events
db 5 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
- object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FNurseScript, -1
+ object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FGentlemanScript, -1
object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -21,9 +21,9 @@
end
.GruntRunsOutScript:
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsDownMovement
playsound SFX_TACKLE
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement
playmusic MUSIC_ROCKET_ENCOUNTER
opentext
writetext UnknownText_0x1884fb
@@ -30,17 +30,17 @@
waitbutton
closetext
showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884f7
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntBacksAwayMovement
opentext
writetext UnknownText_0x188574
waitbutton
closetext
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884f5
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntMovesCloseMovement
opentext
writetext UnknownText_0x1885a5
waitbutton
closetext
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884e8
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsOutMovement
playsound SFX_EXIT_BUILDING
disappear CERULEANGYM_ROCKET
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
@@ -56,7 +56,7 @@
pause 15
end
-MistyScript_0x188432:
+CeruleanGymMistyScript:
faceplayer
opentext
checkflag ENGINE_CASCADEBADGE
@@ -161,7 +161,7 @@
trainertotext MISTY, MISTY1, MEM_BUFFER_1
jumpstd gymstatue2
-MovementData_0x1884e3:
+CeruleanGymGruntRunsDownMovement:
big_step DOWN
big_step DOWN
big_step DOWN
@@ -168,12 +168,12 @@
big_step DOWN
step_end
-MovementData_0x1884e8:
+CeruleanGymGruntRunsOutMovement:
big_step RIGHT
big_step DOWN
step_end
-MovementData_0x1884eb:
+CeruleanGymGruntRunsIntoYouMovement:
fix_facing
set_sliding
jump_step UP
@@ -185,11 +185,11 @@
step DOWN
step_end
-MovementData_0x1884f5:
+CeruleanGymGruntMovesCloseMovement:
big_step DOWN
step_end
-MovementData_0x1884f7:
+CeruleanGymGruntBacksAwayMovement:
fix_facing
slow_step UP
remove_fixed_facing
@@ -376,7 +376,7 @@
db 6 ; object events
object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
- object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
+ object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanGymMistyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -8,21 +8,21 @@
db 0 ; callbacks
-NurseScript_0x18820f:
+CeruleanPokecenter1FNurseScript:
jumpstd pokecenternurse
-SuperNerdScript_0x188212:
+CeruleanPokecenter1FSuperNerdScript:
special Mobile_DummyReturnFalse
iftrue .mobile
- jumptextfaceplayer UnknownText_0x188221
+ jumptextfaceplayer CeruleanPokecenter1FSuperNerdText
.mobile
- jumptextfaceplayer UnknownText_0x18828c
+ jumptextfaceplayer CeruleanPokecenter1FSuperNerdText_Mobile
CeruleanPokecenter1FGymGuyScript:
jumptextfaceplayer CeruleanPokecenter1FGymGuyText
-UnknownText_0x188221:
+CeruleanPokecenter1FSuperNerdText:
text "For battles, I'd"
line "much rather use"
@@ -34,7 +34,7 @@
cont "caught #MON."
done
-UnknownText_0x18828c:
+CeruleanPokecenter1FSuperNerdText_Mobile:
text "Do you battle by"
line "mobile phone?"
@@ -73,6 +73,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
- object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FNurseScript, -1
+ object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FSuperNerdScript, -1
object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -15,17 +15,17 @@
CeruleanTradeSpeechHouseGrampsScript:
jumptextfaceplayer CeruleanTradeSpeechHouseGrampsText
-RhydonScript_0x188139:
+CeruleanTradeSpeechHouseRhydonScript:
opentext
- writetext UnknownText_0x18819c
+ writetext CeruleanTradeSpeechHouseRhydonText
cry KANGASKHAN
waitbutton
closetext
end
-ZubatScript_0x188143:
+CeruleanTradeSpeechHouseZubatScript:
opentext
- writetext UnknownText_0x1881b5
+ writetext CeruleanTradeSpeechHouseZubatText
cry ZUBAT
waitbutton
closetext
@@ -42,12 +42,12 @@
text "Ah… I'm so happy…"
done
-UnknownText_0x18819c:
+CeruleanTradeSpeechHouseRhydonText:
text "KANGASKHAN: Garu"
line "garuu."
done
-UnknownText_0x1881b5:
+CeruleanTradeSpeechHouseZubatText:
text "ZUBAT: Zuba zubaa."
done
@@ -65,5 +65,5 @@
db 4 ; object events
object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
- object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
- object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1
+ object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseRhydonScript, -1
+ object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseZubatScript, -1
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -110,7 +110,7 @@
turnobject PLAYER, RIGHT
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
- writetext UnknownText_0x19c4e2
+ writetext CherrygroveRivalText_Seen
waitbutton
closetext
checkevent EVENT_GOT_TOTODILE_FROM_ELM
@@ -430,7 +430,7 @@
line "when you like."
done
-UnknownText_0x19c4e2:
+CherrygroveRivalText_Seen:
text "<……> <……> <……>"
para "You got a #MON"
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -7,16 +7,16 @@
db 0 ; callbacks
-YoungsterScript_0x196cb2:
+CherrygroveEvolutionSpeechHouseYoungsterScript:
opentext
- writetext UnknownText_0x196cc3
+ writetext CherrygroveEvolutionSpeechHouseYoungsterText
waitbutton
closetext
end
-LassScript_0x196cb9:
+CherrygroveEvolutionSpeechHouseLassScript:
opentext
- writetext UnknownText_0x196cfc
+ writetext CherrygroveEvolutionSpeechHouseLassText
waitbutton
closetext
end
@@ -24,7 +24,7 @@
CherrygroveEvolutionSpeechHouseBookshelf:
jumpstd magazinebookshelf
-UnknownText_0x196cc3:
+CherrygroveEvolutionSpeechHouseYoungsterText:
text "#MON gain expe-"
line "rience in battle"
@@ -32,7 +32,7 @@
line "form."
done
-UnknownText_0x196cfc:
+CherrygroveEvolutionSpeechHouseLassText:
text "#MON change?"
para "I would be shocked"
@@ -53,5 +53,5 @@
bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
db 2 ; object events
- object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
- object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1
+ object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CherrygroveEvolutionSpeechHouseLassScript, -1
+ object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveEvolutionSpeechHouseYoungsterScript, -1
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -8,31 +8,31 @@
db 0 ; callbacks
-ClerkScript_0x19680a:
+CherrygroveMartClerkScript:
opentext
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
- iftrue UnknownScript_0x196817
+ iftrue .PokeBallsInStock
pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE
closetext
end
-UnknownScript_0x196817:
+.PokeBallsInStock:
pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE_DEX
closetext
end
-CooltrainerMScript_0x19681d:
+CherrygroveMartCooltrainerMScript:
faceplayer
opentext
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
- iftrue UnknownScript_0x19682b
- writetext UnknownText_0x196834
+ iftrue .PokeBallsInStock
+ writetext CherrygroveMartCooltrainerMText
waitbutton
closetext
end
-UnknownScript_0x19682b:
- writetext UnknownText_0x196873
+.PokeBallsInStock:
+ writetext CherrygroveMartCooltrainerMText_PokeBallsInStock
waitbutton
closetext
end
@@ -40,7 +40,7 @@
CherrygroveMartYoungsterScript:
jumptextfaceplayer CherrygroveMartYoungsterText
-UnknownText_0x196834:
+CherrygroveMartCooltrainerMText:
text "They're fresh out"
line "of # BALLS!"
@@ -48,7 +48,7 @@
line "more of them?"
done
-UnknownText_0x196873:
+CherrygroveMartCooltrainerMText_PokeBallsInStock:
text "# BALLS are in"
line "stock! Now I can"
cont "catch #MON!"
@@ -81,6 +81,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
- object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartClerkScript, -1
+ object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartCooltrainerMScript, -1
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-NurseScript_0x19696d:
+CherrygrovePokecenter1FNurseScript:
jumpstd pokecenternurse
CherrygrovePokecenter1FFisherScript:
@@ -18,18 +18,18 @@
CherrygrovePokecenter1FGentlemanScript:
jumptextfaceplayer CherrygrovePokecenter1FGentlemanText
-TeacherScript_0x196976:
+CherrygrovePokecenter1FTeacherScript:
faceplayer
opentext
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
- iftrue UnknownScript_0x196984
- writetext UnknownText_0x1969f1
+ iftrue .CommCenterOpen
+ writetext CherrygrovePokecenter1FTeacherText
waitbutton
closetext
end
-UnknownScript_0x196984:
- writetext UnknownText_0x196a46
+.CommCenterOpen:
+ writetext CherrygrovePokecenter1FTeacherText_CommCenterOpen
waitbutton
closetext
end
@@ -48,7 +48,7 @@
cont "to use."
done
-UnknownText_0x1969f1:
+CherrygrovePokecenter1FTeacherText:
text "The COMMUNICATION"
line "CENTER upstairs"
cont "was just built."
@@ -57,7 +57,7 @@
line "finishing it up."
done
-UnknownText_0x196a46:
+CherrygrovePokecenter1FTeacherText_CommCenterOpen:
text "The COMMUNICATION"
line "CENTER upstairs"
cont "was just built."
@@ -79,7 +79,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FNurseScript, -1
object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
- object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1
+ object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FTeacherScript, -1
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -40,11 +40,11 @@
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
- applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
+ applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneApproachMovement
turnobject PLAYER, DOWN
pause 15
playsound SFX_WARP_FROM
- applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
+ applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneDepartMovement
disappear CIANWOODCITY_SUICUNE
pause 10
setscene SCENE_CIANWOODCITY_NOTHING
@@ -55,7 +55,7 @@
setevent EVENT_FOUGHT_EUSINE
playmusic MUSIC_MYSTICALMAN_ENCOUNTER
appear CIANWOODCITY_EUSINE
- applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00e7
+ applymovement CIANWOODCITY_EUSINE, CianwoodCityEusineApproachMovement
opentext
writetext EusineSuicuneText
waitbutton
@@ -71,7 +71,7 @@
writetext EusineAfterText
waitbutton
closetext
- applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec
+ applymovement CIANWOODCITY_EUSINE, CianwoodCityEusineDepartMovement
disappear CIANWOODCITY_EUSINE
pause 20
special FadeOutMusic
@@ -118,8 +118,9 @@
CianwoodCityLass:
jumptextfaceplayer CianwoodCityLassText
-CianwoodCityUnknownScript:
- jumptextfaceplayer CianwoodCityUnknownText
+CianwoodCityUnusedScript:
+; unreferenced
+ jumptextfaceplayer CianwoodCityUnusedText
CianwoodCitySign:
jumptext CianwoodCitySignText
@@ -148,7 +149,7 @@
CianwoodCityHiddenMaxEther:
hiddenitem MAX_ETHER, EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER
-MovementData_0x1a00da:
+CianwoodCitySuicuneApproachMovement:
set_sliding
fast_jump_step DOWN
fast_jump_step DOWN
@@ -156,7 +157,7 @@
remove_sliding
step_end
-MovementData_0x1a00e0:
+CianwoodCitySuicuneDepartMovement:
set_sliding
fast_jump_step RIGHT
fast_jump_step UP
@@ -165,7 +166,7 @@
remove_sliding
step_end
-MovementData_0x1a00e7:
+CianwoodCityEusineApproachMovement:
step UP
step UP
step UP
@@ -172,7 +173,7 @@
step UP
step_end
-MovementData_0x1a00ec:
+CianwoodCityEusineDepartMovement:
step DOWN
step DOWN
step DOWN
@@ -264,8 +265,8 @@
line "MON."
done
-; possibly unused
-CianwoodCityUnknownText:
+CianwoodCityUnusedText:
+; unused
text "There are several"
line "islands between"
cont "here and OLIVINE."
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -14,7 +14,7 @@
db 0 ; callbacks
-ChuckScript_0x9d60f:
+CianwoodGymChuckScript:
faceplayer
opentext
checkevent EVENT_BEAT_CHUCK
@@ -317,7 +317,7 @@
bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue
db 9 ; object events
- object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
+ object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CianwoodGymChuckScript, -1
object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -6,13 +6,13 @@
db 0 ; callbacks
-FishingGuruScript_0x9e0e0:
+CianwoodPhotoStudioFishingGuruScript:
faceplayer
opentext
- writetext UnknownText_0x9e0f9
+ writetext CianwoodPhotoStudioFishingGuruText_Question
yesorno
- iffalse UnknownScript_0x9e0f3
- writetext UnknownText_0x9e142
+ iffalse .Refused
+ writetext CianwoodPhotoStudioFishingGuruText_Yes
waitbutton
special PhotoStudio
waitbutton
@@ -19,13 +19,13 @@
closetext
end
-UnknownScript_0x9e0f3:
- writetext UnknownText_0x9e156
+.Refused:
+ writetext CianwoodPhotoStudioFishingGuruText_No
waitbutton
closetext
end
-UnknownText_0x9e0f9:
+CianwoodPhotoStudioFishingGuruText_Question:
text "You have magnifi-"
line "cent #MON with"
cont "you."
@@ -34,11 +34,11 @@
line "for a souvenir?"
done
-UnknownText_0x9e142:
+CianwoodPhotoStudioFishingGuruText_Yes:
text "OK! Big smile now!"
done
-UnknownText_0x9e156:
+CianwoodPhotoStudioFishingGuruText_No:
text "Oh, that's too"
line "bad. I thought it"
@@ -58,4 +58,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
+ object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPhotoStudioFishingGuruScript, -1
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-NurseScript_0x9dbcf:
+CianwoodPokecenter1FNurseScript:
jumpstd pokecenternurse
CianwoodPokecenter1FLassScript:
@@ -89,7 +89,8 @@
cont "looking at you!"
done
-UnknownText_0x9ddf2:
+CianwoodPokecenter1FUnusedText1:
+; unreferenced
text "Don't you get the"
line "urge to show off"
@@ -103,7 +104,8 @@
line "in VIOLET."
done
-UnknownText_0x9de66:
+CianwoodPokecenter1FUnusedText2:
+; unreferenced
text "I've been battling"
line "my pal in VIOLET"
@@ -142,7 +144,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FNurseScript, -1
object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-NurseScript_0x1ab32c:
+CinnabarPokecenter1FNurseScript:
jumpstd pokecenternurse
CinnabarPokecenter1FCooltrainerFScript:
@@ -45,6 +45,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FNurseScript, -1
object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -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/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -11,25 +11,25 @@
CopycatsHouse1FPokefanMScript:
jumptextfaceplayer CopycatsHouse1FPokefanMText
-PokefanFScript_0x18ad16:
+CopycatsHouse1FPokefanFScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x18ad24
- writetext UnknownText_0x18ad95
+ iftrue .ReturnedMachinePart
+ writetext CopycatsHouse1FPokefanFText
waitbutton
closetext
end
-UnknownScript_0x18ad24:
- writetext UnknownText_0x18add3
+.ReturnedMachinePart:
+ writetext CopycatsHouse1FPokefanFText_ReturnedMachinePart
waitbutton
closetext
end
-ClefairyScript_0x18ad2a:
+CopycatsHouse1FBlisseyScript:
opentext
- writetext UnknownText_0x18ae4b
+ writetext CopycatsHouse1FBlisseyText
cry BLISSEY
waitbutton
closetext
@@ -46,7 +46,7 @@
line "around here."
done
-UnknownText_0x18ad95:
+CopycatsHouse1FPokefanFText:
text "My daughter is so"
line "self-centered…"
@@ -54,7 +54,7 @@
line "friends."
done
-UnknownText_0x18add3:
+CopycatsHouse1FPokefanFText_ReturnedMachinePart:
text "She recently lost"
line "the # DOLL that"
@@ -66,7 +66,7 @@
cont "better at mimicry…"
done
-UnknownText_0x18ae4b:
+CopycatsHouse1FBlisseyText:
text "BLISSEY: Bliisii!"
done
@@ -84,5 +84,5 @@
db 3 ; object events
object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
- object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
- object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1
+ object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanFScript, -1
+ object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FBlisseyScript, -1
--- 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/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -6,21 +6,21 @@
db 0 ; callbacks
-PokedexScript_0x7b1e4:
+DayOfWeekSiblingsHousePokedexScript:
opentext
- writetext UnknownText_0x7b1f9
+ writetext DayOfWeekSiblingsHousePokedexText1
yesorno
- iffalse UnknownText_0x7b1f7
- writetext UnknownText_0x7b222
+ iffalse .End
+ writetext DayOfWeekSiblingsHousePokedexText2
yesorno
- iffalse UnknownText_0x7b1f7
- writetext UnknownText_0x7b2b9
+ iffalse .End
+ writetext DayOfWeekSiblingsHousePokedexText3
waitbutton
-UnknownText_0x7b1f7:
+.End:
closetext
end
-UnknownText_0x7b1f9:
+DayOfWeekSiblingsHousePokedexText1:
text "There's something"
line "written here."
@@ -27,7 +27,7 @@
para "Read it?"
done
-UnknownText_0x7b222:
+DayOfWeekSiblingsHousePokedexText2:
text "To my brothers and"
line "sisters:"
@@ -45,7 +45,7 @@
para "Keep reading?"
done
-UnknownText_0x7b2b9:
+DayOfWeekSiblingsHousePokedexText3:
text "Monday, MONICA"
line "ROUTE 40"
@@ -80,4 +80,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
+ object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayOfWeekSiblingsHousePokedexScript, -1
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -154,7 +154,7 @@
writetext DragonShrineIUnderstandText
waitbutton
closetext
- applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0
+ applymovement DRAGONSHRINE_CLAIR, DragonShrineClairTwoSlowStepsRightMovement
opentext
writetext DragonShrineHereRisingBadgeText
waitbutton
@@ -170,9 +170,9 @@
writetext DragonShrineRisingBadgeExplanationText
waitbutton
closetext
- applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
+ applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkAway1Movement
turnobject DRAGONSHRINE_CLAIR, UP
- applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
+ applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkAway2Movement
turnobject PLAYER, UP
opentext
writetext DragonShrineElderScoldsClairText
@@ -182,7 +182,7 @@
writetext DragonShrineSpeechlessText
waitbutton
closetext
- applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3
+ applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkOutMovement
playsound SFX_ENTER_DOOR
disappear DRAGONSHRINE_CLAIR
waitsfx
@@ -349,12 +349,12 @@
turn_head DOWN
step_end
-MovementData_0x18d2ce:
+DragonShrineElderWalkAway1Movement:
slow_step RIGHT
slow_step RIGHT
step_end
-MovementData_0x18d2d1:
+DragonShrineElderWalkAway2Movement:
slow_step RIGHT
turn_head DOWN
step_end
@@ -377,12 +377,12 @@
remove_fixed_facing
step_end
-MovementData_0x18d2e0:
+DragonShrineClairTwoSlowStepsRightMovement:
slow_step RIGHT
slow_step RIGHT
step_end
-MovementData_0x18d2e3:
+DragonShrineClairWalkOutMovement:
step DOWN
step DOWN
step DOWN
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -125,10 +125,9 @@
closetext
end
-PokeBallScript_0x18c95a:
-; This whole script is written out rather than as an
-; item fragment because it's left over from the GS
-; event.
+DragonsDenB1FDragonFangScript:
+; This whole script is written out rather than as an itemball
+; because it's left over from the GS event.
giveitem DRAGON_FANG
iffalse .BagFull
disappear DRAGONSDENB1F_POKE_BALL1
@@ -151,7 +150,7 @@
closetext
end
-SilverScript_0x18c97e:
+DragonsDenB1FSilverScript:
playmusic MUSIC_RIVAL_ENCOUNTER
faceplayer
opentext
@@ -171,7 +170,7 @@
special RestartMapMusic
end
-MapDragonsDenB1FSignpost0Script:
+DragonShrineSignpost:
jumptext DragonShrineSignpostText
DragonsDenB1FCalcium:
@@ -415,15 +414,15 @@
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
db 9 ; object events
- object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
+ object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FDragonFangScript, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
- object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
+ object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FSilverScript, EVENT_RIVAL_DRAGONS_DEN
object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -12,7 +12,7 @@
db 0 ; callbacks
AcademyEarl:
- applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d
+ applymovement EARLSPOKEMONACADEMY_EARL, AcademyEarlSpinMovement
faceplayer
opentext
writetext UnknownText_0x68b3b
@@ -145,7 +145,7 @@
AcademyBookshelf:
jumpstd difficultbookshelf
-MovementData_0x68b2d:
+AcademyEarlSpinMovement:
turn_head DOWN
turn_head LEFT
turn_head UP
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -26,37 +26,37 @@
EcruteakCityGramps3Script:
jumptextfaceplayer EcruteakCityGramps3Text
-EcruteakCityLassScript:
- jumptextfaceplayer EcruteakCityLassText
+EcruteakCityLass1Script:
+ jumptextfaceplayer EcruteakCityLass1Text
-LassScript_0x1a4015:
+EcruteakCityLass2Script:
faceplayer
opentext
checkevent EVENT_RELEASED_THE_BEASTS
- iftrue UnknownScript_0x1a4023
- writetext UnknownText_0x1a421a
+ iftrue .ReleasedBeasts
+ writetext EcruteakCityLass2Text
waitbutton
closetext
end
-UnknownScript_0x1a4023:
- writetext UnknownText_0x1a4269
+.ReleasedBeasts:
+ writetext EcruteakCityLass2Text_ReleasedBeasts
waitbutton
closetext
end
-FisherScript_0x1a4029:
+EcruteakCityFisherScript:
faceplayer
opentext
checkevent EVENT_JASMINE_RETURNED_TO_GYM
- iftrue UnknownScript_0x1a4037
- writetext UnknownText_0x1a42ac
+ iftrue .JasmineReturned
+ writetext EcruteakCityFisherText
waitbutton
closetext
end
-UnknownScript_0x1a4037:
- writetext UnknownText_0x1a4325
+.JasmineReturned:
+ writetext EcruteakCityFisherText_JasmineReturned
waitbutton
closetext
end
@@ -89,7 +89,7 @@
hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION
UnusedMissingDaughterText:
-; This text is neither used nor referenced in the final game.
+; unused
text "Oh, no. Oh, no…"
para "My daughter is"
@@ -132,7 +132,7 @@
cont "nice, I hear."
done
-EcruteakCityLassText:
+EcruteakCityLass1Text:
text "I'm going to prac-"
line "tice at the DANCE"
@@ -140,7 +140,7 @@
line "join me?"
done
-UnknownText_0x1a421a:
+EcruteakCityLass2Text:
text "The tower that"
line "used to be here…"
@@ -149,7 +149,7 @@
cont "taller."
done
-UnknownText_0x1a4269:
+EcruteakCityLass2Text_ReleasedBeasts:
text "Three big #MON"
line "ran off in differ-"
cont "ent directions."
@@ -156,7 +156,7 @@
cont "What were they?"
done
-UnknownText_0x1a42ac:
+EcruteakCityFisherText:
text "I heard a rumor"
line "about OLIVINE"
cont "LIGHTHOUSE."
@@ -169,7 +169,7 @@
cont "are in trouble."
done
-UnknownText_0x1a4325:
+EcruteakCityFisherText_JasmineReturned:
text "The #MON at"
line "OLIVINE LIGHTHOUSE"
cont "has been cured."
@@ -292,8 +292,8 @@
db 7 ; object events
object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1
object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1
- object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1
- object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1
- object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1
+ object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLass1Script, -1
+ object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityLass2Script, -1
+ object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityFisherScript, -1
object_event 10, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1
object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -21,7 +21,7 @@
.DummyScene:
end
-MortyScript_0x99d58:
+EcruteakGymMortyScript:
faceplayer
opentext
checkevent EVENT_BEAT_MORTY
@@ -80,14 +80,14 @@
jumpstd radiotowerrockets
EcruteakGymClosed:
- applymovement PLAYER, MovementData_0x99e5d
- applymovement ECRUTEAKGYM_GRAMPS, MovementData_0x99e63
+ applymovement PLAYER, EcruteakGymPlayerStepUpMovement
+ applymovement ECRUTEAKGYM_GRAMPS, EcruteakGymGrampsSlowStepDownMovement
opentext
writetext UnknownText_0x9a49c
waitbutton
closetext
follow PLAYER, ECRUTEAKGYM_GRAMPS
- applymovement PLAYER, MovementData_0x99e5f
+ applymovement PLAYER, EcruteakGymPlayerSlowStepDownMovement
stopfollow
special FadeOutPalettes
playsound SFX_ENTER_DOOR
@@ -163,17 +163,17 @@
trainertotext MORTY, MORTY1, MEM_BUFFER_1
jumpstd gymstatue2
-MovementData_0x99e5d:
+EcruteakGymPlayerStepUpMovement:
step UP
step_end
-MovementData_0x99e5f:
+EcruteakGymPlayerSlowStepDownMovement:
fix_facing
slow_step DOWN
remove_fixed_facing
step_end
-MovementData_0x99e63:
+EcruteakGymGrampsSlowStepDownMovement:
slow_step DOWN
step_end
@@ -429,7 +429,7 @@
bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue
db 7 ; object events
- object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
+ object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, EcruteakGymMortyScript, -1
object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x99c3b:
+EcruteakMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_ECRUTEAK
closetext
@@ -55,6 +55,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartClerkScript, -1
object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -64,7 +64,7 @@
EcruteakTinTowerEntrance_CoordEvent_DontMove:
end
-SageScript_0x98062:
+EcruteakTinTowerEntranceSageScript:
faceplayer
opentext
checkevent EVENT_CLEARED_RADIO_TOWER
@@ -71,13 +71,13 @@
iftrue .CheckForClearBell
checkflag ENGINE_FOGBADGE
iftrue .BlockPassage_GotFogBadge
- writetext UnknownText_0x980d1
+ writetext EcruteakTinTowerEntranceSageText
waitbutton
closetext
end
.BlockPassage_GotFogBadge:
- writetext UnknownText_0x98131
+ writetext EcruteakTinTowerEntranceSageText_GotFogBadge
waitbutton
closetext
end
@@ -86,16 +86,16 @@
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue .AllowedThrough
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue .Event000
+ iftrue .RangClearBell
checkitem CLEAR_BELL
- iftrue .RingClearBell
- writetext UnknownText_0x981a4
+ iftrue .GotClearBell
+ writetext EcruteakTinTowerEntranceSageText_NoClearBell
waitbutton
closetext
end
-.RingClearBell:
- writetext UnknownText_0x98250
+.GotClearBell:
+ writetext EcruteakTinTowerEntranceSageText_HearsClearBell
waitbutton
closetext
setscene SCENE_FINISHED
@@ -105,29 +105,29 @@
end
.AllowedThrough:
- writetext UnknownText_0x9837e
+ writetext EcruteakTinTowerEntranceSageText_PleaseDoGoOn
waitbutton
closetext
end
-.Event000:
- writetext UnknownText_0x98391
+.RangClearBell:
+ writetext EcruteakTinTowerEntranceSageText_HeardClearBell
waitbutton
closetext
end
-SageScript_0x980b0:
+EcruteakTinTowerEntranceWanderingSageScript:
faceplayer
opentext
checkevent EVENT_GOT_CLEAR_BELL
iftrue .GotClearBell
- writetext UnknownText_0x9840b
+ writetext EcruteakTinTowerEntranceWanderingSageText
waitbutton
closetext
end
.GotClearBell:
- writetext UnknownText_0x9846f
+ writetext EcruteakTinTowerEntranceWanderingSageText_GotClearBell
waitbutton
closetext
end
@@ -149,7 +149,7 @@
turn_head DOWN
step_end
-UnknownText_0x980d1:
+EcruteakTinTowerEntranceSageText:
text "TIN TOWER is off"
line "limits to anyone"
@@ -160,7 +160,7 @@
line "have to leave."
done
-UnknownText_0x98131:
+EcruteakTinTowerEntranceSageText_GotFogBadge:
text "TIN TOWER is off"
line "limits to anyone"
@@ -174,7 +174,7 @@
cont "right through."
done
-UnknownText_0x981a4:
+EcruteakTinTowerEntranceSageText_NoClearBell:
text "A momentous event"
line "has occurred."
@@ -192,7 +192,7 @@
line "understand…"
done
-UnknownText_0x98250:
+EcruteakTinTowerEntranceSageText_HearsClearBell:
text "A momentous event"
line "has occurred."
@@ -226,11 +226,11 @@
para "Please, do go on."
done
-UnknownText_0x9837e:
+EcruteakTinTowerEntranceSageText_PleaseDoGoOn:
text "Please, do go on."
done
-UnknownText_0x98391:
+EcruteakTinTowerEntranceSageText_HeardClearBell:
text "That bell's chime"
line "is indicative of"
cont "the bearer's soul."
@@ -244,7 +244,7 @@
para "Please, do go on."
done
-UnknownText_0x9840b:
+EcruteakTinTowerEntranceWanderingSageText:
text "The TIN TOWER"
line "ahead is a nine-"
@@ -256,7 +256,7 @@
cont "see it."
done
-UnknownText_0x9846f:
+EcruteakTinTowerEntranceWanderingSageText_GotClearBell:
text "The TIN TOWER"
line "shook! A #MON"
@@ -292,7 +292,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
- object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
- object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
+ object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_1
+ object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_2
+ object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceWanderingSageScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -152,7 +152,7 @@
writetext LabWhereGoingText
waitbutton
closetext
- applymovement PLAYER, MovementData_0x78f70
+ applymovement PLAYER, ElmsLab_CantLeaveMovement
end
CyndaquilPokeBallScript:
@@ -619,7 +619,7 @@
turn_head LEFT
step_end
-MovementData_0x78f70:
+ElmsLab_CantLeaveMovement:
step UP
step_end
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -40,7 +40,7 @@
setscene SCENE_DEFAULT
end
-SailorScript_0x75160:
+FastShip1FSailor1Script:
faceplayer
opentext
checkevent EVENT_FAST_SHIP_HAS_ARRIVED
@@ -47,13 +47,13 @@
iftrue .Arrived
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
iftrue .Olivine
- writetext UnknownText_0x7523b
+ writetext FastShip1FSailor1Text_ToVermilion
waitbutton
closetext
end
.Olivine:
- writetext UnknownText_0x7529b
+ writetext FastShip1FSailor1Text_ToOlivine
waitbutton
closetext
end
@@ -61,7 +61,7 @@
.Arrived:
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
iftrue ._Olivine
- writetext UnknownText_0x754be
+ writetext FastShip1FSailor1Text_InVermilion
waitbutton
closetext
scall .LetThePlayerOut
@@ -74,7 +74,7 @@
end
._Olivine:
- writetext UnknownText_0x7548d
+ writetext FastShip1FSailor1Text_InOlivine
waitbutton
closetext
scall .LetThePlayerOut
@@ -98,24 +98,24 @@
applymovement PLAYER, MovementData_0x75238
end
-SailorScript_0x751d0:
+FastShip1FSailor2Script:
faceplayer
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue .Vermilion
- writetext UnknownText_0x752f9
+ writetext FastShip1FSailor2Text_FirstTime
waitbutton
closetext
end
.Vermilion:
- writetext UnknownText_0x7534f
+ writetext FastShip1FSailor2Text
waitbutton
closetext
end
-FastShip1FSailorScript:
- jumptextfaceplayer FastShip1FSailorText
+FastShip1FSailor3Script:
+ jumptextfaceplayer FastShip1FSailor3Text
WorriedGrandpaSceneRight:
moveobject FASTSHIP1F_GENTLEMAN, 20, 6
@@ -205,7 +205,7 @@
step UP
step_end
-UnknownText_0x7523b:
+FastShip1FSailor1Text_ToVermilion:
text "FAST SHIP S.S.AQUA"
line "is en route to"
cont "VERMILION CITY."
@@ -215,7 +215,7 @@
cont "we arrive."
done
-UnknownText_0x7529b:
+FastShip1FSailor1Text_ToOlivine:
text "FAST SHIP S.S.AQUA"
line "is en route to"
cont "OLIVINE CITY."
@@ -225,7 +225,7 @@
cont "we arrive."
done
-UnknownText_0x752f9:
+FastShip1FSailor2Text_FirstTime:
text "Here's your cabin."
para "If your #MON"
@@ -236,7 +236,7 @@
line "them."
done
-UnknownText_0x7534f:
+FastShip1FSailor2Text:
text "Here's your cabin."
para "You can heal your"
@@ -248,7 +248,7 @@
cont "you're sleeping."
done
-FastShip1FSailorText:
+FastShip1FSailor3Text:
text "The passengers are"
line "all trainers."
@@ -271,13 +271,13 @@
line "know!"
done
-UnknownText_0x7548d:
+FastShip1FSailor1Text_InOlivine:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "OLIVINE CITY."
done
-UnknownText_0x754be:
+FastShip1FSailor1Text_InVermilion:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "VERMILION CITY."
@@ -307,7 +307,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
- object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
- object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1
+ object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor1Script, -1
+ object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor2Script, -1
+ object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor3Script, -1
object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -25,10 +25,10 @@
.DummyScene1:
end
-UnknownScript_0x7673c:
+FastShipB1FSailorBlocksLeft:
checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
- iftrue UnknownScript_0x76766
- applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876
+ iftrue FastShipB1FAlreadyBlocked
+ applymovement FASTSHIPB1F_SAILOR2, FashShipB1FSailorBlocksLeftMovement
moveobject FASTSHIPB1F_SAILOR1, 30, 6
appear FASTSHIPB1F_SAILOR1
pause 5
@@ -35,10 +35,10 @@
disappear FASTSHIPB1F_SAILOR2
end
-UnknownScript_0x76751:
+FastShipB1FSailorBlocksRight:
checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT
- iftrue UnknownScript_0x76766
- applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871
+ iftrue FastShipB1FAlreadyBlocked
+ applymovement FASTSHIPB1F_SAILOR1, FashShipB1FSailorBlocksRightMovement
moveobject FASTSHIPB1F_SAILOR2, 31, 6
appear FASTSHIPB1F_SAILOR2
pause 5
@@ -45,18 +45,18 @@
disappear FASTSHIPB1F_SAILOR1
end
-UnknownScript_0x76766:
+FastShipB1FAlreadyBlocked:
end
-SailorScript_0x76767:
+FastShipB1FSailorScript:
faceplayer
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
- iftrue UnknownScript_0x767a0
+ iftrue .FirstTime
checkevent EVENT_FAST_SHIP_LAZY_SAILOR
- iftrue UnknownScript_0x7678d
+ iftrue .LazySailor
checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
- iftrue UnknownScript_0x76787
+ iftrue .AlreadyInformed
writetext UnknownText_0x7687b
waitbutton
closetext
@@ -64,21 +64,21 @@
clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
end
-UnknownScript_0x76787:
+.AlreadyInformed:
writetext UnknownText_0x76907
waitbutton
closetext
end
-UnknownScript_0x7678d:
+.LazySailor:
writetext UnknownText_0x7692e
checkevent EVENT_FAST_SHIP_FOUND_GIRL
- iffalse UnknownScript_0x76799
+ iffalse .NotFoundGirl
waitbutton
closetext
end
-UnknownScript_0x76799:
+.NotFoundGirl:
buttonsound
writetext UnknownText_0x7696d
waitbutton
@@ -85,7 +85,7 @@
closetext
end
-UnknownScript_0x767a0:
+.FirstTime:
writetext UnknownText_0x7699d
waitbutton
closetext
@@ -204,7 +204,7 @@
FashShipB1FTrashcan:
jumpstd trashcan
-MovementData_0x76871:
+FashShipB1FSailorBlocksRightMovement:
fix_facing
big_step RIGHT
remove_fixed_facing
@@ -211,7 +211,7 @@
turn_head DOWN
step_end
-MovementData_0x76876:
+FashShipB1FSailorBlocksLeftMovement:
fix_facing
big_step LEFT
remove_fixed_facing
@@ -454,15 +454,15 @@
warp_event 31, 13, FAST_SHIP_1F, 12
db 2 ; coord events
- coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c
- coord_event 31, 7, SCENE_DEFAULT, UnknownScript_0x76751
+ coord_event 30, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksLeft
+ coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight
db 1 ; bg events
bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
db 12 ; object events
- object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
- object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
+ object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
+ object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -78,7 +78,7 @@
closetext
end
-SailorScript_0x755f1:
+FastShipLazySailorScript:
playmusic MUSIC_HIKER_ENCOUNTER
faceplayer
opentext
@@ -98,15 +98,15 @@
setevent EVENT_FAST_SHIP_LAZY_SAILOR
setmapscene FAST_SHIP_B1F, SCENE_FINISHED
checkcode VAR_FACING
- ifequal RIGHT, UnknownScript_0x75629
- applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
+ ifequal RIGHT, .Movement2
+ applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement1
playsound SFX_EXIT_BUILDING
disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR
waitsfx
end
-UnknownScript_0x75629:
- applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x7563c
+.Movement2:
+ applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement2
playsound SFX_EXIT_BUILDING
disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR
waitsfx
@@ -115,7 +115,7 @@
FastShipCabins_NNW_NNE_NETrashcan:
jumpstd trashcan
-MovementData_0x75637:
+FastShipLazySailorLeavesMovement1:
step LEFT
step LEFT
step UP
@@ -122,7 +122,7 @@
step UP
step_end
-MovementData_0x7563c:
+FastShipLazySailorLeavesMovement2:
step DOWN
step LEFT
step LEFT
@@ -284,6 +284,6 @@
object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
- object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
+ object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipLazySailorScript, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -16,7 +16,7 @@
db 0 ; callbacks
-Unreferenced_0x75ea6:
+.UnreferencedDummyScene:
end
SSAquaCaptain:
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -80,19 +80,19 @@
waitbutton
closetext
checkevent EVENT_FAST_SHIP_HAS_ARRIVED
- iftrue UnknownScript_0x75ae1
+ iftrue .AlreadyArrived
checkevent EVENT_FAST_SHIP_FOUND_GIRL
- iftrue UnknownScript_0x75ae2
+ iftrue .CanArrive
checkevent EVENT_FAST_SHIP_FIRST_TIME
- iftrue UnknownScript_0x75ae2
-UnknownScript_0x75ae1:
+ iftrue .CanArrive
+.AlreadyArrived:
end
-UnknownScript_0x75ae2:
+.CanArrive:
playsound SFX_ELEVATOR_END
pause 30
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
- iftrue UnknownScript_0x75af7
+ iftrue .ArrivedOlivine
opentext
writetext FastShipArrivedVermilionText
waitbutton
@@ -100,7 +100,7 @@
setevent EVENT_FAST_SHIP_HAS_ARRIVED
end
-UnknownScript_0x75af7:
+.ArrivedOlivine:
opentext
writetext FastShipArrivedOlivineText
waitbutton
--- 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/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -154,7 +154,7 @@
end
.CindyAfterScript:
- writetext UnknownText_0x19620c
+ writetext PicnickerCindyAfterText
waitbutton
closetext
end
@@ -188,7 +188,7 @@
end
.BarryAfterScript:
- writetext UnknownText_0x19626b
+ writetext CamperBarryAfterText
waitbutton
closetext
end
@@ -334,7 +334,7 @@
line "I wanted to win!"
done
-UnknownText_0x19620c:
+PicnickerCindyAfterText:
text "You must be"
line "getting tired."
done
@@ -351,7 +351,7 @@
line "right on! Dang!"
done
-UnknownText_0x19626b:
+CamperBarryAfterText:
text "Hey, you. Was my"
line "disguise cute or"
cont "what, huh?"
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x195ce8:
+FuchsiaMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_FUCHSIA
closetext
@@ -47,6 +47,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaMartClerkScript, -1
object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -13,7 +13,7 @@
.DummyScene:
end
-NurseScript_0x196459:
+FuchsiaPokecenter1FNurseScript:
jumpstd pokecenternurse
FuchsiaPokecenter1FCooltrainerMScript:
@@ -22,27 +22,27 @@
FuchsiaPokecenter1FCooltrainerFScript:
jumptextfaceplayer FuchsiaPokecenter1FCooltrainerFText
-JanineImpersonatorScript_0x196462:
+FuchsiaPokecenter1FJanineImpersonatorScript:
faceplayer
opentext
- writetext UnknownText_0x19652e
+ writetext FuchsiaPokecenter1FJanineImpersonatorText1
waitbutton
closetext
- applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
+ applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, FuchsiaPokecenter1FJanineImpersonatorSpinMovement
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
special LoadUsedSpritesGFX
opentext
- writetext UnknownText_0x19654e
+ writetext FuchsiaPokecenter1FJanineImpersonatorText2
waitbutton
closetext
- applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
+ applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, FuchsiaPokecenter1FJanineImpersonatorSpinMovement
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
special LoadUsedSpritesGFX
end
-MovementData_0x196486:
+FuchsiaPokecenter1FJanineImpersonatorSpinMovement:
turn_head DOWN
turn_head LEFT
turn_head UP
@@ -76,12 +76,12 @@
cont "looked identical."
done
-UnknownText_0x19652e:
+FuchsiaPokecenter1FJanineImpersonatorText1:
text "I'm JANINE! Hocus-"
line "pocus… Poof!"
done
-UnknownText_0x19654e:
+FuchsiaPokecenter1FJanineImpersonatorText2:
text "See? I look just"
line "like her now!"
done
@@ -99,7 +99,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FNurseScript, -1
object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1
- object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1
+ object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FJanineImpersonatorScript, -1
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -6,17 +6,17 @@
db 0 ; callbacks
-UnknownScript_0x5474f:
+.UnreferencedDummyScene:
end
-ClerkScript_0x54750:
+GoldenrodBikeShopClerkScript:
faceplayer
opentext
checkevent EVENT_GOT_BICYCLE
- iftrue UnknownScript_0x54775
+ iftrue .GotBicycle
writetext UnknownText_0x54787
yesorno
- iffalse UnknownScript_0x5477b
+ iffalse .Refused
writetext UnknownText_0x547f8
buttonsound
waitsfx
@@ -27,24 +27,24 @@
itemnotify
setflag ENGINE_BIKE_SHOP_CALL_ENABLED
setevent EVENT_GOT_BICYCLE
-UnknownScript_0x54775:
+.GotBicycle:
writetext UnknownText_0x5485f
waitbutton
closetext
end
-UnknownScript_0x5477b:
+.Refused:
writetext UnknownText_0x54898
waitbutton
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
+ object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodBikeShopClerkScript, -1
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -161,34 +161,34 @@
GoldenrodCityYoungster1Script:
jumptextfaceplayer GoldenrodCityYoungster1Text
-CooltrainerFScript_0x1989e9:
+GoldenrodCityCooltrainerF1Script:
faceplayer
opentext
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue .ClearedRadioTower
- writetext UnknownText_0x198ae6
+ writetext GoldenrodCityCooltrainerF1Text
waitbutton
closetext
end
.ClearedRadioTower:
- writetext UnknownText_0x198b2d
+ writetext GoldenrodCityCooltrainerF1Text_ClearedRadioTower
waitbutton
closetext
end
-CooltrainerFScript_0x1989fd:
+GoldenrodCityCooltrainerF2Script:
faceplayer
opentext
checkflag ENGINE_RADIO_CARD
iftrue .GotRadioCard
- writetext UnknownText_0x198b73
+ writetext GoldenrodCityCooltrainerF2Text
waitbutton
closetext
end
.GotRadioCard:
- writetext UnknownText_0x198c14
+ writetext GoldenrodCityCooltrainerF2Text_GotRadioCard
waitbutton
closetext
end
@@ -297,7 +297,7 @@
line "anywhere."
done
-UnknownText_0x198ae6:
+GoldenrodCityCooltrainerF1Text:
text "Is that man in"
line "black dressed up"
@@ -305,7 +305,7 @@
line "member? How silly!"
done
-UnknownText_0x198b2d:
+GoldenrodCityCooltrainerF1Text_ClearedRadioTower:
text "Was that man in"
line "black really part"
@@ -313,7 +313,7 @@
line "can't believe it!"
done
-UnknownText_0x198b73:
+GoldenrodCityCooltrainerF2Text:
text "The RADIO TOWER in"
line "GOLDENROD CITY is"
cont "a landmark."
@@ -329,7 +329,7 @@
line "serve as a radio."
done
-UnknownText_0x198c14:
+GoldenrodCityCooltrainerF2Text_GotRadioCard:
text "Oh, your #GEAR"
line "works as a radio!"
done
@@ -588,8 +588,8 @@
db 15 ; object events
object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityCooltrainerF1Script, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityCooltrainerF2Script, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 19, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 17, 10, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 11, 27, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -10,7 +10,7 @@
db 0 ; callbacks
-ClerkScript_0x55b5d:
+GoldenrodDeptStore2FClerk1Script:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_1
@@ -17,7 +17,7 @@
closetext
end
-ClerkScript_0x55b65:
+GoldenrodDeptStore2FClerk2Script:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_2
@@ -39,8 +39,8 @@
GoldenrodDeptStore2FElevatorButton:
jumpstd elevatorbutton
+GoldenrodDeptStore2FUnusedText1:
; unused
-UnusedText_0x55b7c:
text "We intend to sell"
line "items for #MON"
cont "to hold."
@@ -50,8 +50,8 @@
cont "MON hold it."
done
+GoldenrodDeptStore2FUnusedText2:
; unused
-UnusedText_0x55bd3:
text "By giving #MON"
line "items to hold, I"
@@ -113,8 +113,8 @@
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
db 5 ; object events
- object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1
- object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1
+ object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FClerk1Script, -1
+ object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FClerk2Script, -1
object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1
object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x55db8:
+GoldenrodDeptStore3FClerkScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F
@@ -69,6 +69,6 @@
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
db 3 ; object events
- object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1
+ object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FClerkScript, -1
object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-ClerkScript_0x55ee9:
+GoldenrodDeptStore4FClerkScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F
@@ -22,10 +22,10 @@
GoldenrodDeptStore4FBugCatcherScript:
jumptextfaceplayer GoldenrodDeptStore4FBugCatcherText
-GameboyKidScript_0x55ef7:
+GoldenrodDeptStore4FGameboyKidScript:
faceplayer
opentext
- writetext UnknownText_0x55f74
+ writetext GoldenrodDeptStore4FGameboyKidText
waitbutton
closetext
turnobject GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
@@ -51,7 +51,7 @@
line "#MON's DEFENSE."
done
-UnknownText_0x55f74:
+GoldenrodDeptStore4FGameboyKidText:
text "Some #MON"
line "evolve only by"
@@ -90,7 +90,7 @@
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
db 4 ; object events
- object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
+ object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FClerkScript, -1
object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
- object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1
+ object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FGameboyKidScript, -1
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -22,7 +22,7 @@
appear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return
-ClerkScript_0x5609c:
+GoldenrodDeptStore5FClerkScript:
faceplayer
opentext
checkevent EVENT_GOT_TM02_HEADBUTT
@@ -56,7 +56,7 @@
closetext
end
-ReceptionistScript_0x560ce:
+GoldenrodDeptStore5FReceptionistScript:
faceplayer
opentext
checkcode VAR_WEEKDAY
@@ -230,9 +230,9 @@
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
db 6 ; object events
- object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1
+ object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FClerkScript, -1
object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1
object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1
- object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
+ object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FReceptionistScript, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -12,19 +12,19 @@
db 0 ; scene scripts
db 2 ; callbacks
- callback MAPCALLBACK_TILES, UnknownScript_0x7d781
- callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
+ callback MAPCALLBACK_TILES, .ClearBoxes
+ callback MAPCALLBACK_NEWMAP, .Unblock
-UnknownScript_0x7d781:
+.ClearBoxes:
checkevent EVENT_RECEIVED_CARD_KEY
- iftrue UnknownScript_0x7d78a
- jump UnknownScript_0x7d791
+ iftrue .GotCardKey
+ jump .Continue
-UnknownScript_0x7d78a:
+.GotCardKey:
changeblock 16, 4, $0d ; floor
- jump UnknownScript_0x7d791
+ jump .Continue
-UnknownScript_0x7d791:
+.Continue:
checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
iftrue .Layout2
checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
@@ -40,7 +40,7 @@
changeblock 10, 12, $0d ; floor
return
-UnknownScript_0x7d7ac:
+.Unblock:
clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
return
@@ -53,7 +53,7 @@
GoldenrodDeptStoreB1FBlackBelt3Script:
jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt3Text
-MachopScript_0x7d7b9:
+GoldenrodDeptStoreB1FMachopScript:
opentext
writetext UnknownText_0x7d8bb
cry MACHOKE
@@ -127,4 +127,4 @@
object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
- object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1
+ object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FMachopScript, -1
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -3,9 +3,9 @@
db 0 ; callbacks
-MapGoldenrodDeptStoreElevatorSignpost0Script:
+GoldenrodDeptStoreElevatorScript:
opentext
- elevator Elevator_0x566e0
+ elevator GoldenrodDeptStoreElevatorData
closetext
iffalse .Done
pause 5
@@ -41,7 +41,7 @@
.Done:
end
-Elevator_0x566e0:
+GoldenrodDeptStoreElevatorData:
db 7 ; floors
elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F
elevfloor FLOOR_1F, 4, GOLDENROD_DEPT_STORE_1F
@@ -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/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -37,7 +37,7 @@
setevent EVENT_GOLDENROD_SALE_ON
return
-ClerkScript_0x5673f:
+GoldenrodDeptStoreRoofClerkScript:
opentext
pokemart MARTTYPE_ROOFTOP, 0
closetext
@@ -46,7 +46,7 @@
GoldenrodDeptStoreRoofPokefanFScript:
jumptextfaceplayer GoldenrodDeptStoreRoofPokefanFText
-FisherScript_0x56749:
+GoldenrodDeptStoreRoofFisherScript:
faceplayer
opentext
writetext UnknownText_0x567d2
@@ -58,7 +58,7 @@
GoldenrodDeptStoreRoofTwinScript:
jumptextfaceplayer GoldenrodDeptStoreRoofTwinText
-SuperNerdScript_0x56757:
+GoldenrodDeptStoreRoofSuperNerdScript:
opentext
writetext UnknownText_0x56867
waitbutton
@@ -224,11 +224,11 @@
bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine
db 8 ; object events
- object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
+ object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofClerkScript, EVENT_GOLDENROD_SALE_OFF
object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
- object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
+ object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofFisherScript, -1
object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON
- object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
+ object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofSuperNerdScript, EVENT_GOLDENROD_SALE_ON
object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF
object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF
object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -19,7 +19,7 @@
.DummyScene1:
end
-WhitneyScript_0x5400c:
+GoldenrodGymWhitneyScript:
faceplayer
checkevent EVENT_BEAT_WHITNEY
iftrue .FightDone
@@ -51,7 +51,7 @@
checkevent EVENT_GOT_TM45_ATTRACT
iftrue .GotAttract
checkflag ENGINE_PLAINBADGE
- iftrue .GotBadge
+ iftrue .GotPlainBadge
writetext WhitneyWhatDoYouWantText
buttonsound
waitsfx
@@ -61,11 +61,11 @@
setflag ENGINE_PLAINBADGE
checkcode VAR_BADGES
scall GoldenrodGymActivateRockets
-.GotBadge:
+.GotPlainBadge:
writetext WhitneyPlainBadgeText
buttonsound
verbosegiveitem TM_ATTRACT
- iffalse .NoRoom
+ iffalse .NoRoomForAttract
setevent EVENT_GOT_TM45_ATTRACT
writetext WhitneyAttractText
waitbutton
@@ -75,7 +75,7 @@
.GotAttract:
writetext WhitneyGoodCryText
waitbutton
-.NoRoom:
+.NoRoomForAttract:
closetext
end
@@ -392,7 +392,7 @@
bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue
db 6 ; object events
- object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
+ object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymWhitneyScript, -1
object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -8,51 +8,51 @@
db 0 ; callbacks
-TeacherScript_0x54953:
+GoldenrodHappinessRaterTeacherScript:
faceplayer
opentext
special GetFirstPokemonHappiness
- writetext UnknownText_0x549a3
+ writetext GoldenrodHappinessRaterTeacherText
buttonsound
- ifgreater 250 - 1, UnknownScript_0x54973
- ifgreater 200 - 1, UnknownScript_0x54979
- ifgreater 150 - 1, UnknownScript_0x5497f
- ifgreater 100 - 1, UnknownScript_0x54985
- ifgreater 50 - 1, UnknownScript_0x5498b
- jump UnknownScript_0x54991
+ ifgreater 250 - 1, .LovesYouALot
+ ifgreater 200 - 1, .ReallyTrustsYou
+ ifgreater 150 - 1, .SortOfHappy
+ ifgreater 100 - 1, .QuiteCute
+ ifgreater 50 - 1, .NotUsedToYou
+ jump .LooksMean
-UnknownScript_0x54973:
- writetext UnknownText_0x549fc
+.LovesYouALot:
+ writetext GoldenrodHappinessRatingText_LovesYouALot
waitbutton
closetext
end
-UnknownScript_0x54979:
- writetext UnknownText_0x54a2c
+.ReallyTrustsYou:
+ writetext GoldenrodHappinessRatingText_ReallyTrustsYou
waitbutton
closetext
end
-UnknownScript_0x5497f:
- writetext UnknownText_0x54a5a
+.SortOfHappy:
+ writetext GoldenrodHappinessRatingText_SortOfHappy
waitbutton
closetext
end
-UnknownScript_0x54985:
- writetext UnknownText_0x54a8e
+.QuiteCute:
+ writetext GoldenrodHappinessRatingText_QuiteCute
waitbutton
closetext
end
-UnknownScript_0x5498b:
- writetext UnknownText_0x54a9f
+.NotUsedToYou:
+ writetext GoldenrodHappinessRatingText_NotUsedToYou
waitbutton
closetext
end
-UnknownScript_0x54991:
- writetext UnknownText_0x54ad1
+.LooksMean:
+ writetext GoldenrodHappinessRatingText_LooksMean
waitbutton
closetext
end
@@ -69,7 +69,7 @@
HappinessRatersHouseRadio:
jumpstd radio2
-UnknownText_0x549a3:
+GoldenrodHappinessRaterTeacherText:
text "If you treat your"
line "#MON nicely,"
@@ -82,35 +82,35 @@
text "…"
done
-UnknownText_0x549fc:
+GoldenrodHappinessRatingText_LovesYouALot:
text "It looks really"
line "happy! It must"
cont "love you a lot."
done
-UnknownText_0x54a2c:
+GoldenrodHappinessRatingText_ReallyTrustsYou:
text "I get the feeling"
line "that it really"
cont "trusts you."
done
-UnknownText_0x54a5a:
+GoldenrodHappinessRatingText_SortOfHappy:
text "It's friendly to-"
line "ward you. It looks"
cont "sort of happy."
done
-UnknownText_0x54a8e:
+GoldenrodHappinessRatingText_QuiteCute:
text "It's quite cute."
done
-UnknownText_0x54a9f:
+GoldenrodHappinessRatingText_NotUsedToYou:
text "You should treat"
line "it better. It's"
cont "not used to you."
done
-UnknownText_0x54ad1:
+GoldenrodHappinessRatingText_LooksMean:
text "It doesn't seem to"
line "like you at all."
cont "It looks mean."
@@ -149,6 +149,6 @@
bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio
db 3 ; object events
- object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
+ object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTeacherScript, -1
object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -11,7 +11,7 @@
.DummyScene:
end
-OfficerScript_0x550ec:
+GoldenrodMagnetTrainStationOfficerScript:
faceplayer
opentext
checkevent EVENT_RESTORED_POWER_TO_KANTO
@@ -177,5 +177,5 @@
db 0 ; bg events
db 2 ; object events
- object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
+ object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationOfficerScript, -1
object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -10,7 +10,7 @@
db 0 ; callbacks
-NurseScript_0x60f91:
+GoldenrodPokecenter1FNurseScript:
jumpstd pokecenternurse
GoldenrodPokecenter1F_GSBallSceneLeft:
@@ -83,7 +83,7 @@
GoldenrodPokecenter1FLassScript:
jumptextfaceplayer GoldenrodPokecenter1FLassText
-PokefanFScript_0x61024:
+GoldenrodPokecenter1FPokefanF:
faceplayer
opentext
writetext UnknownText_0x623fb
@@ -90,27 +90,27 @@
waitbutton
writetext UnknownText_0x6248c
yesorno
- iffalse UnknownScript_0x6104b
+ iffalse .NoEonMail
takeitem EON_MAIL
- iffalse UnknownScript_0x6104b
+ iffalse .NoEonMail
writetext UnknownText_0x62549
waitbutton
writetext UnknownText_0x624a4
waitbutton
verbosegiveitem REVIVE
- iffalse UnknownScript_0x61051
+ iffalse .NoRoom
writetext UnknownText_0x624e9
waitbutton
closetext
end
-UnknownScript_0x6104b:
+.NoEonMail:
writetext UnknownText_0x62509
waitbutton
closetext
end
-UnknownScript_0x61051:
+.NoRoom:
giveitem EON_MAIL
writetext UnknownText_0x6252a
waitbutton
@@ -818,8 +818,8 @@
db 0 ; bg events
db 5 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FNurseScript, -1
object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
- object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1
+ object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FPokefanF, -1
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -152,7 +152,7 @@
closetext
end
-GrannyScript_0x7c132:
+BitterMerchantScript:
opentext
checkcode VAR_WEEKDAY
ifequal SUNDAY, .Open
@@ -164,7 +164,7 @@
closetext
end
-GrampsScript_0x7c146:
+BargainMerchantScript:
opentext
checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
iftrue GoldenrodUndergroundScript_ShopClosed
@@ -239,10 +239,10 @@
writetext UnknownText_0x7c6d8
waitbutton
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x7c2bb
+ iftrue EitherHaircutBrotherScript_SlightlyHappier
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
- iftrue UnknownScript_0x7c2c4
- jump UnknownScript_0x7c2cd
+ iftrue EitherHaircutBrotherScript_Happier
+ jump EitherHaircutBrotherScript_MuchHappier
.Refused:
writetext UnknownText_0x7c6ea
@@ -322,10 +322,10 @@
writetext UnknownText_0x7c82a
waitbutton
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x7c2bb
+ iftrue EitherHaircutBrotherScript_SlightlyHappier
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
- iftrue UnknownScript_0x7c2c4
- jump UnknownScript_0x7c2cd
+ iftrue EitherHaircutBrotherScript_Happier
+ jump EitherHaircutBrotherScript_MuchHappier
.Refused:
writetext UnknownText_0x7c842
@@ -345,7 +345,7 @@
closetext
end
-UnknownScript_0x7c2bb:
+EitherHaircutBrotherScript_SlightlyHappier:
writetext HaircutBrosText_SlightlyHappier
special PlayCurMonCry
waitbutton
@@ -352,7 +352,7 @@
closetext
end
-UnknownScript_0x7c2c4:
+EitherHaircutBrotherScript_Happier:
writetext HaircutBrosText_Happier
special PlayCurMonCry
waitbutton
@@ -359,7 +359,7 @@
closetext
end
-UnknownScript_0x7c2cd:
+EitherHaircutBrotherScript_MuchHappier:
writetext HaircutBrosText_MuchHappier
special PlayCurMonCry
waitbutton
@@ -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
@@ -670,7 +670,7 @@
object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
- object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
+ object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BargainMerchantScript, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
- object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY
+ object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BitterMerchantScript, EVENT_GOLDENROD_UNDERGROUND_GRANNY
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -110,10 +110,10 @@
.false14
return
-SuperNerdScript_0x7ca7a:
+GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript:
jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText
-TeacherScript_0x7ca7d:
+GoldenrodUndergroundSwitchRoomEntrancesTeacherScript:
jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
UndergroundSilverScene1:
@@ -961,8 +961,8 @@
object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 19, 12, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
- object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
+ object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundSwitchRoomEntrancesTeacherScript, -1
+ object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript, -1
object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -66,11 +66,11 @@
closetext
end
-GentlemanScript_0x7d9bf:
+GoldenrodUndergroundWarehouseDirectorScript:
faceplayer
opentext
checkevent EVENT_RECEIVED_CARD_KEY
- iftrue UnknownScript_0x7d9de
+ iftrue .GotCardKey
writetext UnknownText_0x7dbc6
buttonsound
verbosegiveitem CARD_KEY
@@ -80,7 +80,7 @@
clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
writetext UnknownText_0x7dc5b
buttonsound
-UnknownScript_0x7d9de:
+.GotCardKey:
writetext UnknownText_0x7dc8d
waitbutton
closetext
@@ -224,7 +224,7 @@
object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+ object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundWarehouseDirectorScript, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
--- 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/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -134,10 +134,10 @@
PlateauRivalScriptDone:
end
-NurseScript_0x18012c:
+IndigoPlateauPokecenter1FNurseScript:
jumpstd pokecenternurse
-ClerkScript_0x18012f:
+IndigoPlateauPokecenter1FClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_INDIGO_PLATEAU
closetext
@@ -316,8 +316,8 @@
db 0 ; bg events
db 6 ; object events
- object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1
- object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1
+ object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FNurseScript, -1
+ object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FClerkScript, -1
object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1
object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -28,7 +28,7 @@
return
.KarensDoorLocksBehindYou:
- applymovement PLAYER, KarensMovementData_0x18078e
+ applymovement PLAYER, KarensRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
@@ -71,7 +71,7 @@
closetext
end
-KarensMovementData_0x18078e:
+KarensRoom_EnterMovement:
step UP
step UP
step UP
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -28,7 +28,7 @@
return
.KogasDoorLocksBehindYou:
- applymovement PLAYER, KogasMovementData_0x18078e
+ applymovement PLAYER, KogasRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
@@ -71,7 +71,7 @@
closetext
end
-KogasMovementData_0x18078e:
+KogasRoom_EnterMovement:
step UP
step UP
step UP
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -32,7 +32,7 @@
.Done:
return
-KurtScript_0x18e178:
+Kurt1:
faceplayer
opentext
checkevent EVENT_KURT_GAVE_YOU_LURE_BALL
@@ -312,7 +312,7 @@
setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
end
-KurtScript_0x18e3bd:
+Kurt2:
faceplayer
opentext
checkevent EVENT_GAVE_GS_BALL_TO_KURT
@@ -693,8 +693,8 @@
bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue
db 5 ; object events
- object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
+ object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Kurt1, EVENT_KURTS_HOUSE_KURT_1
object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
- object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
+ object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Kurt2, EVENT_KURTS_HOUSE_KURT_2
object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -41,9 +41,9 @@
appear LAKEOFRAGE_WESLEY
return
-LanceScript_0x70022:
+LakeOfRageLanceScript:
checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
- iftrue UnknownScript_0x70057
+ iftrue .AskAgainForHelp
opentext
writetext UnknownText_0x70157
buttonsound
@@ -50,8 +50,8 @@
faceplayer
writetext UnknownText_0x701b4
yesorno
- iffalse UnknownScript_0x7004e
-UnknownScript_0x70035:
+ iffalse .RefusedToHelp
+.AgreedToHelp:
writetext UnknownText_0x702c6
waitbutton
closetext
@@ -63,7 +63,7 @@
setmapscene MAHOGANY_MART_1F, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
end
-UnknownScript_0x7004e:
+.RefusedToHelp:
writetext UnknownText_0x70371
waitbutton
closetext
@@ -70,15 +70,15 @@
setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
end
-UnknownScript_0x70057:
+.AskAgainForHelp:
faceplayer
opentext
writetext UnknownText_0x703a5
yesorno
- iffalse UnknownScript_0x7004e
- jump UnknownScript_0x70035
+ iffalse .RefusedToHelp
+ jump .AgreedToHelp
-GyaradosScript_0x70063:
+RedGyarados:
opentext
writetext UnknownText_0x703cb
pause 15
@@ -87,9 +87,9 @@
loadwildmon GYARADOS, 30
writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
startbattle
- ifequal $1, UnknownScript_0x7007a
+ ifequal $1, .NotBeaten
disappear LAKEOFRAGE_GYARADOS
-UnknownScript_0x7007a:
+.NotBeaten:
reloadmapafterbattle
opentext
giveitem RED_SCALE
@@ -103,18 +103,18 @@
appear LAKEOFRAGE_LANCE
end
-GrampsScript_0x7008e:
+LakeOfRageGrampsScript:
faceplayer
opentext
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x7009c
- writetext UnknownText_0x703f8
+ iftrue .ClearedRocketHideout
+ writetext LakeOfRageGrampsText
waitbutton
closetext
end
-UnknownScript_0x7009c:
- writetext UnknownText_0x70421
+.ClearedRocketHideout:
+ writetext LakeOfRageGrampsText_ClearedRocketHideout
waitbutton
closetext
end
@@ -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
@@ -319,7 +319,7 @@
line "RED SCALE."
done
-UnknownText_0x703f8:
+LakeOfRageGrampsText:
text "The GYARADOS are"
line "angry!"
@@ -326,7 +326,7 @@
para "It's a bad omen!"
done
-UnknownText_0x70421:
+LakeOfRageGrampsText_ClearedRocketHideout:
text "Hahah! The MAGI-"
line "KARP are biting!"
done
@@ -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,15 +501,15 @@
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
db 12 ; object events
- object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
- object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1
+ object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE
+ object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageGrampsScript, -1
object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1
object_event 25, 29, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1
object_event 30, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
@@ -516,7 +516,7 @@
object_event 24, 26, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
- object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
+ object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RedGyarados, EVENT_LAKE_OF_RAGE_RED_GYARADOS
object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -6,90 +6,91 @@
db 0 ; callbacks
-FishingGuruScript_0x19a6ae:
+MagikarpLengthRaterScript:
faceplayer
opentext
checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
- iftrue UnknownScript_0x19a6fe
+ iftrue .GetReward
checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
- iftrue UnknownScript_0x19a6e0
+ iftrue .AskedForMagikarp
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x19a6d7
+ iftrue .ClearedRocketHideout
checkevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
- iftrue UnknownScript_0x19a6d1
- writetext UnknownText_0x19a72e
+ iftrue .ExplainedHistory
+ writetext MagikarpLengthRaterText_LakeOfRageHistory
waitbutton
closetext
setevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
end
-UnknownScript_0x19a6d1:
- writetext UnknownText_0x19a84d
+.ExplainedHistory:
+ writetext MagikarpLengthRaterText_MenInBlack
waitbutton
closetext
end
-UnknownScript_0x19a6d7:
- writetext UnknownText_0x19a890
+.ClearedRocketHideout:
+ writetext MagikarpLengthRaterText_WorldsLargestMagikarp
waitbutton
closetext
setevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
end
-UnknownScript_0x19a6e0:
+.AskedForMagikarp:
writebyte MAGIKARP
special FindPartyMonThatSpecies
- iffalse UnknownScript_0x19a6d7
- writetext UnknownText_0x19a93e
+ iffalse .ClearedRocketHideout
+ writetext MagikarpLengthRaterText_YouHaveAMagikarp
waitbutton
special CheckMagikarpLength
- ifequal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
- ifequal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
- ifequal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
+ ifequal MAGIKARPLENGTH_NOT_MAGIKARP, .NotMagikarp
+ ifequal MAGIKARPLENGTH_REFUSED, .Refused
+ ifequal MAGIKARPLENGTH_TOO_SHORT, .TooShort
; MAGIKARPLENGTH_BEAT_RECORD
- jump UnknownScript_0x19a6fe
+ jump .GetReward
-UnknownScript_0x19a6fe:
- writetext UnknownText_0x19a977
+.GetReward:
+ writetext MagikarpLengthRaterText_Memento
buttonsound
verbosegiveitem ELIXER
- iffalse UnknownScript_0x19a711
- writetext UnknownText_0x19a9c3
+ iffalse .NoRoom
+ writetext MagikarpLengthRaterText_Bonus
waitbutton
closetext
clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
end
-UnknownScript_0x19a711:
+.NoRoom:
closetext
setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
end
-UnknownScript_0x19a716:
- writetext UnknownText_0x19aa01
+.TooShort:
+ writetext MagikarpLengthRaterText_TooShort
waitbutton
closetext
end
-UnknownScript_0x19a71c:
- writetext UnknownText_0x19aa5c
+.NotMagikarp:
+ writetext MagikarpLengthRaterText_NotMagikarp
waitbutton
closetext
end
-UnknownScript_0x19a722:
- writetext UnknownText_0x19aa79
+.Refused:
+ writetext MagikarpLengthRaterText_Refused
waitbutton
closetext
end
-UnknownScript_0x19a728:
- jumptext UnknownText_0x19aabc
+LakeOfRageMagikarpHouseUnusedRecordSign:
+; unused
+ jumptext LakeOfRageMagikarpHouseUnusedRecordText
MagikarpHouseBookshelf:
jumpstd difficultbookshelf
-UnknownText_0x19a72e:
+MagikarpLengthRaterText_LakeOfRageHistory:
text "LAKE OF RAGE is"
line "actually a crater"
@@ -118,7 +119,7 @@
line "what's happening."
done
-UnknownText_0x19a84d:
+MagikarpLengthRaterText_MenInBlack:
text "The LAKE hasn't"
line "been normal since"
@@ -126,7 +127,7 @@
line "black arrived."
done
-UnknownText_0x19a890:
+MagikarpLengthRaterText_WorldsLargestMagikarp:
text "LAKE OF RAGE is"
line "back to normal."
@@ -143,7 +144,7 @@
cont "you do."
done
-UnknownText_0x19a93e:
+MagikarpLengthRaterText_YouHaveAMagikarp:
text "Ah, you have a"
line "MAGIKARP! Let's"
@@ -151,7 +152,7 @@
line "baby is."
done
-UnknownText_0x19a977:
+MagikarpLengthRaterText_Memento:
text "Wow! This one is"
line "outstanding!"
@@ -162,7 +163,7 @@
line "memento!"
done
-UnknownText_0x19a9c3:
+MagikarpLengthRaterText_Bonus:
text "The record is the"
line "important thing."
@@ -170,7 +171,7 @@
line "a bonus!"
done
-UnknownText_0x19aa01:
+MagikarpLengthRaterText_TooShort:
text "Wow! This one is"
line "outstanding!"
@@ -181,12 +182,12 @@
line "before."
done
-UnknownText_0x19aa5c:
+MagikarpLengthRaterText_NotMagikarp:
text "What? That's not a"
line "MAGIKARP!"
done
-UnknownText_0x19aa79:
+MagikarpLengthRaterText_Refused:
text "Oh… So you didn't"
line "get one good"
@@ -194,7 +195,7 @@
line "Maybe next time."
done
-UnknownText_0x19aabc:
+LakeOfRageMagikarpHouseUnusedRecordText:
text "CURRENT RECORD"
para "@"
@@ -218,4 +219,4 @@
bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf
db 1 ; object events
- object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
+ object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MagikarpLengthRaterScript, -1
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -30,7 +30,7 @@
return
.LancesDoorLocksBehindYou:
- applymovement PLAYER, LancesRoom_PlayerWalksInMovementData
+ applymovement PLAYER, LancesRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
@@ -44,12 +44,12 @@
Script_ApproachLanceFromLeft:
special FadeOutMusic
applymovement PLAYER, MovementData_ApproachLanceFromLeft
- jump LanceScript_0x180e7b
+ jump LancesRoomLanceScript
Script_ApproachLanceFromRight:
special FadeOutMusic
applymovement PLAYER, MovementData_ApproachLanceFromRight
-LanceScript_0x180e7b:
+LancesRoomLanceScript:
turnobject LANCESROOM_LANCE, LEFT
opentext
writetext LanceBattleIntroText
@@ -128,7 +128,7 @@
warpfacing UP, HALL_OF_FAME, 4, 13
end
-LancesRoom_PlayerWalksInMovementData:
+LancesRoom_EnterMovement:
step UP
step UP
step UP
@@ -351,6 +351,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1
+ object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LancesRoomLanceScript, -1
object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -16,34 +16,34 @@
LavRadioTower1FOfficerScript:
jumptextfaceplayer LavRadioTower1FOfficerText
-LavRadioTower1FSuperNerdScript:
- jumptextfaceplayer LavRadioTower1FSuperNerdText
+LavRadioTower1FSuperNerd1Script:
+ jumptextfaceplayer LavRadioTower1FSuperNerd1Text
-GentlemanScript_0x7ee6c:
+LavRadioTower1FGentlemanScript:
faceplayer
opentext
checkflag ENGINE_EXPN_CARD
- iftrue .UnknownScript_0x7ee8e
+ iftrue .GotExpnCard
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .UnknownScript_0x7ee80
- writetext UnknownText_0x7effb
+ iftrue .ReturnedMachinePart
+ writetext LavRadioTower1FGentlemanText
waitbutton
closetext
end
-.UnknownScript_0x7ee80:
- writetext UnknownText_0x7f0a1
+.ReturnedMachinePart:
+ writetext LavRadioTower1FGentlemanText_ReturnedMachinePart
buttonsound
stringtotext .expncardname, MEM_BUFFER_1
- scall .UnknownScript_0x7ee94
+ scall .receiveitem
setflag ENGINE_EXPN_CARD
-.UnknownScript_0x7ee8e:
- writetext UnknownText_0x7f141
+.GotExpnCard:
+ writetext LavRadioTower1FGentlemanText_GotExpnCard
waitbutton
closetext
end
-.UnknownScript_0x7ee94:
+.receiveitem:
jumpstd receiveitem
end
@@ -50,30 +50,31 @@
.expncardname
db "EXPN CARD@"
-SuperNerdScript_0x7eea2:
+LavRadioTower1FSuperNerd2Script:
faceplayer
opentext
checkflag ENGINE_EXPN_CARD
- iftrue UnknownScript_0x7eeb0
- writetext UnknownText_0x7f193
+ iftrue .GotExpnCard
+ writetext LavRadioTower1FSuperNerd2Text
waitbutton
closetext
end
-UnknownScript_0x7eeb0:
- writetext UnknownText_0x7f248
+.GotExpnCard:
+ writetext LavRadioTower1FSuperNerd2Text_GotExpnCard
waitbutton
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!"
@@ -98,7 +99,7 @@
line "up our security."
done
-LavRadioTower1FSuperNerdText:
+LavRadioTower1FSuperNerd1Text:
text "Many people are"
line "hard at work here"
@@ -110,7 +111,7 @@
cont "on good shows."
done
-UnknownText_0x7effb:
+LavRadioTower1FGentlemanText:
text "Oh, no, no, no!"
para "We've been off the"
@@ -128,7 +129,7 @@
para "I'll be ruined!"
done
-UnknownText_0x7f0a1:
+LavRadioTower1FGentlemanText_ReturnedMachinePart:
text "Ah! So you're the"
line "<PLAY_G> who solved"
@@ -145,7 +146,7 @@
line "as my thanks."
done
-UnknownText_0x7f141:
+LavRadioTower1FGentlemanText_GotExpnCard:
text "With that thing,"
line "you can tune into"
@@ -155,7 +156,7 @@
para "Gahahahaha!"
done
-UnknownText_0x7f193:
+LavRadioTower1FSuperNerd2Text:
text "Hey there!"
para "I am the super"
@@ -174,7 +175,7 @@
line "better get one!"
done
-UnknownText_0x7f248:
+LavRadioTower1FSuperNerd2Text_GotExpnCard:
text "Hey there!"
para "I am the super"
@@ -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,12 +230,12 @@
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
object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
- object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
- object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
- object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1
+ object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd1Script, -1
+ object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FGentlemanScript, -1
+ object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd2Script, -1
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x7eb1c:
+LavenderMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_LAVENDER
closetext
@@ -57,6 +57,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartClerkScript, -1
object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -19,6 +19,7 @@
end
LavenderNameRaterUnusedBookshelf:
+; unused
jumpstd difficultbookshelf
LavenderNameRater_MapEvents:
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-NurseScript_0x7e6a0:
+LavenderPokecenter1FNurseScript:
jumpstd pokecenternurse
LavenderPokecenter1FGentlemanScript:
@@ -18,18 +18,18 @@
LavenderPokecenter1FTeacherScript:
jumptextfaceplayer LavenderPokecenter1FTeacherText
-YoungsterScript_0x7e6a9:
+LavenderPokecenter1FYoungsterScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x7e6b7
- writetext UnknownText_0x7e779
+ iftrue .ReturnedMachinePart
+ writetext LavenderPokecenter1FYoungsterText
waitbutton
closetext
end
-UnknownScript_0x7e6b7:
- writetext UnknownText_0x7e7ed
+.ReturnedMachinePart:
+ writetext LavenderPokecenter1FYoungsterText_ReturnedMachinePart
waitbutton
closetext
end
@@ -53,7 +53,7 @@
cont "to tune into it."
done
-UnknownText_0x7e779:
+LavenderPokecenter1FYoungsterText:
text "If the POWER PLANT"
line "isn't running, the"
@@ -65,7 +65,7 @@
cont "can't broadcast…"
done
-UnknownText_0x7e7ed:
+LavenderPokecenter1FYoungsterText_ReturnedMachinePart:
text "The DIRECTOR of"
line "the RADIO STATION"
cont "sure was happy."
@@ -91,7 +91,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FNurseScript, -1
object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
- object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1
+ object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FYoungsterScript, -1
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -12,7 +12,7 @@
db 0 ; callbacks
-PryceScript_0x199a9e:
+MahoganyGymPryceScript:
faceplayer
opentext
checkevent EVENT_BEAT_PRYCE
@@ -384,7 +384,7 @@
bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue
db 7 ; object events
- object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1
+ object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MahoganyGymPryceScript, -1
object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -17,7 +17,7 @@
end
.LanceUncoversStaircase:
- priorityjump UnknownScript_0x6c38f
+ priorityjump MahoganyMart1FLanceUncoversStaircaseScript
end
.MahoganyMart1FStaircase:
@@ -29,38 +29,38 @@
changeblock 6, 2, $1e ; stairs
return
-PharmacistScript_0x6c367:
+MahogayMart1FPharmacistScript:
faceplayer
opentext
checkevent EVENT_DECIDED_TO_HELP_LANCE
- iftrue UnknownScript_0x6c375
+ iftrue .LanceEntered
pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1
closetext
end
-UnknownScript_0x6c375:
- writetext UnknownText_0x6c46b
+.LanceEntered:
+ writetext MahogayMart1FPharmacistText_LanceEntered
waitbutton
closetext
end
-BlackBeltScript_0x6c37b:
+MahogayMart1FBlackBeltScript:
faceplayer
opentext
checkevent EVENT_DECIDED_TO_HELP_LANCE
- iftrue UnknownScript_0x6c389
- writetext UnknownText_0x6c494
+ iftrue .LanceEntered
+ writetext MahogayMart1FBlackBeltText
waitbutton
closetext
end
-UnknownScript_0x6c389:
- writetext UnknownText_0x6c501
+.LanceEntered:
+ writetext MahogayMart1FBlackBeltText_LanceEntered
waitbutton
closetext
end
-UnknownScript_0x6c38f:
+MahoganyMart1FLanceUncoversStaircaseScript:
pause 15
opentext
writetext UnknownText_0x6c52a
@@ -103,7 +103,7 @@
waitsfx
end
-GrannyScript_0x6c3ee:
+MahogayMart1FGrannyScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2
@@ -164,13 +164,13 @@
line "eat in MAHOGANY!"
done
-UnknownText_0x6c46b:
+MahogayMart1FPharmacistText_LanceEntered:
text "Arrgh… You found"
line "the secret stair-"
cont "way…"
done
-UnknownText_0x6c494:
+MahogayMart1FBlackBeltText:
text "Heheh! The experi-"
line "ment worked like a"
cont "charm."
@@ -182,7 +182,7 @@
line "moneymakers."
done
-UnknownText_0x6c501:
+MahogayMart1FBlackBeltText_LanceEntered:
text "Urrgh…"
para "That guy's dragon"
@@ -231,8 +231,8 @@
db 0 ; bg events
db 5 ; object events
- object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
- object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
+ object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION
+ object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
- object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
+ object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-NurseScript_0x19a356:
+MahoganyPokecenter1FNurseScript:
jumpstd pokecenternurse
MahoganyPokecenter1FPokefanMScript:
@@ -64,7 +64,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FNurseScript, -1
object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -10,26 +10,28 @@
MahoganyRedGyaradosSpeechHouseBlackBeltScript:
jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText
-TeacherScript_0x199982:
+MahoganyRedGyaradosSpeechHouseTeacherScript:
faceplayer
opentext
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
- iftrue UnknownScript_0x199990
- writetext UnknownText_0x199a0e
+ iftrue .RocketsInRadioTower
+ writetext MahoganyRedGyaradosSpeechHouseTeacherText
waitbutton
closetext
end
-UnknownScript_0x199990:
- writetext UnknownText_0x199a3d
+.RocketsInRadioTower:
+ writetext MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower
waitbutton
closetext
end
-UnknownScript_0x195996:
+MahoganyRedGyaradosSpeechHouseUnusedBookshelf1:
+; unused
jumpstd picturebookshelf
-UnknownScript_0x195999:
+MahoganyRedGyaradosSpeechHouseUnusedBookshelf2:
+; unused
jumpstd magazinebookshelf
MahoganyRedGyaradosSpeechHouseBlackBeltText:
@@ -44,13 +46,13 @@
line "in that lake…"
done
-UnknownText_0x199a0e:
+MahoganyRedGyaradosSpeechHouseTeacherText:
text "My favorite radio"
line "program? I'd say"
cont "#MON MUSIC."
done
-UnknownText_0x199a3d:
+MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower:
text "I've been hearing"
line "laughter on the"
@@ -71,4 +73,4 @@
db 2 ; object events
object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
- object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
+ object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseTeacherScript, -1
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -22,7 +22,7 @@
setflag ENGINE_FLYPOINT_MAHOGANY
return
-UnknownScript_0x190013:
+MahoganyTownTryARageCandyBarScript:
showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15
applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900a9
follow PLAYER, MAHOGANYTOWN_POKEFAN_M
@@ -29,74 +29,74 @@
applymovement PLAYER, MovementData_0x1900a7
stopfollow
turnobject PLAYER, RIGHT
- scall UnknownScript_0x19002f
+ scall RageCandyBarMerchantScript
applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
end
-PokefanMScript_0x19002e:
+MahoganyTownPokefanMScript:
faceplayer
-UnknownScript_0x19002f:
+RageCandyBarMerchantScript:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x190039
- scall UnknownScript_0x190040
+ iftrue .ClearedRocketHideout
+ scall .SellRageCandyBars
end
-UnknownScript_0x190039:
+.ClearedRocketHideout:
opentext
- writetext UnknownText_0x1901a6
+ writetext RageCandyBarMerchantText_SoldOut
waitbutton
closetext
end
-UnknownScript_0x190040:
+.SellRageCandyBars:
opentext
- writetext UnknownText_0x1900b0
+ writetext RageCandyBarMerchantText_TryOne
special PlaceMoneyTopRight
yesorno
- iffalse UnknownScript_0x190072
+ iffalse .Refused
checkmoney YOUR_MONEY, 300
- ifequal HAVE_LESS, UnknownScript_0x19006c
+ ifequal HAVE_LESS, .NotEnoughMoney
giveitem RAGECANDYBAR
- iffalse UnknownScript_0x190078
+ iffalse .NoRoom
waitsfx
playsound SFX_TRANSACTION
takemoney YOUR_MONEY, 300
special PlaceMoneyTopRight
- writetext UnknownText_0x19014a
+ writetext RageCandyBarMerchantText_SavorIt
waitbutton
closetext
end
-UnknownScript_0x19006c:
- writetext UnknownText_0x19015b
+.NotEnoughMoney:
+ writetext RageCandyBarMerchantText_NotEnoughMoney
waitbutton
closetext
end
-UnknownScript_0x190072:
- writetext UnknownText_0x190178
+.Refused:
+ writetext RageCandyBarMerchantText_Refused
waitbutton
closetext
end
-UnknownScript_0x190078:
+.NoRoom:
writetext UnknownText_0x190188
waitbutton
closetext
end
-GrampsScript_0x19007e:
+MahoganyTownGrampsScript:
faceplayer
opentext
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x19008c
- writetext UnknownText_0x1901e5
+ iftrue .ClearedRocketHideout
+ writetext MahoganyTownGrampsText
waitbutton
closetext
end
-UnknownScript_0x19008c:
- writetext UnknownText_0x19021d
+.ClearedRocketHideout:
+ writetext MahoganyTownGrampsText_ClearedRocketHideout
waitbutton
closetext
end
@@ -138,7 +138,7 @@
turn_head DOWN
step_end
-UnknownText_0x1900b0:
+RageCandyBarMerchantText_TryOne:
text "Hiya, kid!"
para "I see you're new"
@@ -155,16 +155,16 @@
cont "¥300! Want one?"
done
-UnknownText_0x19014a:
+RageCandyBarMerchantText_SavorIt:
text "Good! Savor it!"
done
-UnknownText_0x19015b:
+RageCandyBarMerchantText_NotEnoughMoney:
text "You don't have"
line "enough money."
done
-UnknownText_0x190178:
+RageCandyBarMerchantText_Refused:
text "Oh, fine then…"
done
@@ -173,7 +173,7 @@
line "room for this."
done
-UnknownText_0x1901a6:
+RageCandyBarMerchantText_SoldOut:
text "RAGECANDYBAR's"
line "sold out."
@@ -182,13 +182,13 @@
cont "kiddo."
done
-UnknownText_0x1901e5:
+MahoganyTownGrampsText:
text "Are you off to see"
line "the GYARADOS ram-"
cont "page at the LAKE?"
done
-UnknownText_0x19021d:
+MahoganyTownGrampsText_ClearedRocketHideout:
text "MAGIKARP have"
line "returned to LAKE"
cont "OF RAGE."
@@ -253,8 +253,8 @@
warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3
db 2 ; coord events
- coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013
- coord_event 19, 9, SCENE_DEFAULT, UnknownScript_0x190013
+ coord_event 19, 8, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript
+ coord_event 19, 9, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript
db 4 ; bg events
bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
@@ -263,7 +263,7 @@
bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign
db 4 ; object events
- object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
- object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
+ object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownPokefanMScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
+ object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownGrampsScript, -1
object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -95,7 +95,8 @@
closetext
end
-UnknownScript_0x9d300:
+ManiasHouseUnusedBookshelf:
+; unused
jumpstd picturebookshelf
ManiaText_AskLookAfterShuckle:
--- 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/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -12,13 +12,13 @@
db 0 ; callbacks
-BlackBeltScript_0x7e1f6:
+MountMortarB1FKiyoScript:
faceplayer
opentext
checkevent EVENT_GOT_TYROGUE_FROM_KIYO
- iftrue UnknownScript_0x7e231
+ iftrue .GotTyrogue
checkevent EVENT_BEAT_BLACKBELT_KIYO
- iftrue UnknownScript_0x7e217
+ iftrue .BeatKiyo
writetext UnknownText_0x7e24d
waitbutton
closetext
@@ -28,24 +28,24 @@
reloadmapafterbattle
setevent EVENT_BEAT_BLACKBELT_KIYO
opentext
-UnknownScript_0x7e217:
+.BeatKiyo:
writetext UnknownText_0x7e2c0
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
- ifequal PARTY_LENGTH, UnknownScript_0x7e237
+ ifequal PARTY_LENGTH, .NoRoom
writetext UnknownText_0x7e355
playsound SFX_CAUGHT_MON
waitsfx
givepoke TYROGUE, 10
setevent EVENT_GOT_TYROGUE_FROM_KIYO
-UnknownScript_0x7e231:
+.GotTyrogue:
writetext UnknownText_0x7e36a
waitbutton
closetext
end
-UnknownScript_0x7e237:
+.NoRoom:
writetext UnknownText_0x7e3df
waitbutton
closetext
@@ -148,7 +148,7 @@
object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
- object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
+ object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MountMortarB1FKiyoScript, -1
object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
--- 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
@@ -25,20 +25,20 @@
NationalParkPokefanFScript:
jumptextfaceplayer NationalParkPokefanFText
-TeacherScript_0x5c008:
+NationalParkTeacher1Script:
faceplayer
opentext
checkevent EVENT_GOT_QUICK_CLAW
- iftrue UnknownScript_0x5c01d
- writetext UnknownText_0x5c265
+ iftrue .GotQuickClaw
+ writetext NationalParkTeacher1Text
buttonsound
verbosegiveitem QUICK_CLAW
- iffalse UnknownScript_0x5c021
+ iffalse .NoRoom
setevent EVENT_GOT_QUICK_CLAW
-UnknownScript_0x5c01d:
- writetext UnknownText_0x5c30d
+.GotQuickClaw:
+ writetext NationalParkTeacher1Text_GotQuickClaw
waitbutton
-UnknownScript_0x5c021:
+.NoRoom:
closetext
end
@@ -48,8 +48,8 @@
NationalParkYoungster2Script:
jumptextfaceplayer NationalParkYoungster2Text
-NationalParkTeacherScript:
- jumptextfaceplayer NationalParkTeacherText
+NationalParkTeacher2Script:
+ jumptextfaceplayer NationalParkTeacher2Text
NationalParkPersian:
faceplayer
@@ -60,10 +60,10 @@
closetext
end
-GameboyKidScript_0x5c037:
+NationalParkGameboyKidScript:
faceplayer
opentext
- writetext UnknownText_0x5c42a
+ writetext NationalParkGameboyKidText
waitbutton
closetext
turnobject NATIONALPARK_GAMEBOY_KID, DOWN
@@ -77,29 +77,29 @@
endifjustbattled
opentext
checkflag ENGINE_JACK
- iftrue UnknownScript_0x5c088
+ iftrue .Rematch
checkcellnum PHONE_SCHOOLBOY_JACK
- iftrue UnknownScript_0x5c108
+ iftrue .NumberAccepted
checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
- iftrue UnknownScript_0x5c071
+ iftrue .AskAgain
writetext UnknownText_0x5c4f3
buttonsound
setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
- scall UnknownScript_0x5c0fc
- jump UnknownScript_0x5c074
+ scall .AskNumber1
+ jump .RequestNumber
-UnknownScript_0x5c071:
- scall UnknownScript_0x5c100
-UnknownScript_0x5c074:
+.AskAgain:
+ scall .AskNumber2
+.RequestNumber:
askforphonenumber PHONE_SCHOOLBOY_JACK
- ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
- ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
- scall UnknownScript_0x5c104
- jump UnknownScript_0x5c108
+ scall .RegisteredNumber
+ jump .NumberAccepted
-UnknownScript_0x5c088:
- scall UnknownScript_0x5c114
+.Rematch:
+ scall .RematchStd
winlosstext SchoolboyJack1BeatenText, 0
copybytetovar wJackFightCount
ifequal 4, .Fight4
@@ -158,31 +158,31 @@
clearflag ENGINE_JACK
end
-UnknownScript_0x5c0fc:
+.AskNumber1:
jumpstd asknumber1m
end
-UnknownScript_0x5c100:
+.AskNumber2:
jumpstd asknumber2m
end
-UnknownScript_0x5c104:
+.RegisteredNumber:
jumpstd registerednumberm
end
-UnknownScript_0x5c108:
+.NumberAccepted:
jumpstd numberacceptedm
end
-UnknownScript_0x5c10c:
+.NumberDeclined:
jumpstd numberdeclinedm
end
-UnknownScript_0x5c110:
+.PhoneFull:
jumpstd phonefullm
end
-UnknownScript_0x5c114:
+.RematchStd:
jumpstd rematchm
end
@@ -205,74 +205,74 @@
endifjustbattled
opentext
checkflag ENGINE_BEVERLY_HAS_NUGGET
- iftrue UnknownScript_0x5c177
+ iftrue .GiveNugget
checkcellnum PHONE_POKEFAN_BEVERLY
- iftrue UnknownScript_0x5c19b
+ iftrue .NumberAccepted
checkpoke MARILL
- iffalse UnknownScript_0x5c189
+ iffalse .NoMarill
checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
- iftrue UnknownScript_0x5c160
+ iftrue .AskAgain
writetext UnknownText_0x5c5bd
buttonsound
setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
- scall UnknownScript_0x5c18f
- jump UnknownScript_0x5c163
+ scall .AskNumber1
+ jump .RequestNumber
-UnknownScript_0x5c160:
- scall UnknownScript_0x5c193
-UnknownScript_0x5c163:
+.AskAgain:
+ scall .AskNumber2
+.RequestNumber:
askforphonenumber PHONE_POKEFAN_BEVERLY
- ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
- ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
- scall UnknownScript_0x5c197
- jump UnknownScript_0x5c19b
+ scall .RegisteredNumber
+ jump .NumberAccepted
-UnknownScript_0x5c177:
- scall UnknownScript_0x5c1a7
+.GiveNugget:
+ scall .Gift
verbosegiveitem NUGGET
- iffalse UnknownScript_0x5c186
+ iffalse .NoRoom
clearflag ENGINE_BEVERLY_HAS_NUGGET
- jump UnknownScript_0x5c19b
+ jump .NumberAccepted
-UnknownScript_0x5c186:
- jump UnknownScript_0x5c1ab
+.NoRoom:
+ jump .PackFull
-UnknownScript_0x5c189:
+.NoMarill:
writetext UnknownText_0x5c68a
waitbutton
closetext
end
-UnknownScript_0x5c18f:
+.AskNumber1:
jumpstd asknumber1f
end
-UnknownScript_0x5c193:
+.AskNumber2:
jumpstd asknumber2f
end
-UnknownScript_0x5c197:
+.RegisteredNumber:
jumpstd registerednumberf
end
-UnknownScript_0x5c19b:
+.NumberAccepted:
jumpstd numberacceptedf
end
-UnknownScript_0x5c19f:
+.NumberDeclined:
jumpstd numberdeclinedf
end
-UnknownScript_0x5c1a3:
+.PhoneFull:
jumpstd phonefullf
end
-UnknownScript_0x5c1a7:
+.Gift:
jumpstd giftf
end
-UnknownScript_0x5c1ab:
+.PackFull:
jumpstd packfullf
end
@@ -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
@@ -322,7 +322,7 @@
cont "It cheers me up."
done
-UnknownText_0x5c265:
+NationalParkTeacher1Text:
text "Pay attention,"
line "please!"
@@ -342,7 +342,7 @@
line "this."
done
-UnknownText_0x5c30d:
+NationalParkTeacher1Text_GotQuickClaw:
text "Let a #MON hold"
line "that QUICK CLAW."
@@ -363,7 +363,7 @@
cont "sticker if I win."
done
-NationalParkTeacherText:
+NationalParkTeacher2Text:
text "I take walks in"
line "the PARK, but I"
@@ -378,7 +378,7 @@
text "PERSIAN: Fufushaa!"
done
-UnknownText_0x5c42a:
+NationalParkGameboyKidText:
text "I'm printing out"
line "my #DEX."
@@ -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,18 +523,18 @@
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
object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
- object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
+ object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher1Script, -1
object_event 11, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1
object_event 10, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1
- object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacherScript, -1
+ object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher2Script, -1
object_event 26, 40, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1
object_event 27, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1
object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
@@ -541,5 +541,5 @@
object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
- object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
+ object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkGameboyKidScript, -1
object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -17,7 +17,7 @@
db 0 ; callbacks
-YoungsterScript_0x5c8ec:
+BugCatchingContestant1AScript:
faceplayer
opentext
writetext UnknownText_0x5c94c
@@ -25,7 +25,7 @@
closetext
end
-YoungsterScript_0x5c8f4:
+BugCatchingContestant2AScript:
faceplayer
opentext
writetext UnknownText_0x5c973
@@ -33,7 +33,7 @@
closetext
end
-RockerScript_0x5c8fc:
+BugCatchingContestant3AScript:
faceplayer
opentext
writetext UnknownText_0x5c9a3
@@ -41,7 +41,7 @@
closetext
end
-PokefanMScript_0x5c904:
+BugCatchingContestant4AScript:
faceplayer
opentext
writetext UnknownText_0x5c9cc
@@ -49,7 +49,7 @@
closetext
end
-YoungsterScript_0x5c90c:
+BugCatchingContestant5AScript:
faceplayer
opentext
writetext UnknownText_0x5ca15
@@ -57,7 +57,7 @@
closetext
end
-YoungsterScript_0x5c914:
+BugCatchingContestant6AScript:
faceplayer
opentext
writetext UnknownText_0x5ca52
@@ -65,7 +65,7 @@
closetext
end
-LassScript_0x5c91c:
+BugCatchingContestant7AScript:
faceplayer
opentext
writetext UnknownText_0x5ca8f
@@ -73,7 +73,7 @@
closetext
end
-YoungsterScript_0x5c924:
+BugCatchingContestant8AScript:
faceplayer
opentext
writetext UnknownText_0x5cac8
@@ -81,7 +81,7 @@
closetext
end
-YoungsterScript_0x5c92c:
+BugCatchingContestant9AScript:
faceplayer
opentext
writetext UnknownText_0x5cb25
@@ -89,7 +89,7 @@
closetext
end
-YoungsterScript_0x5c934:
+BugCatchingContestant10AScript:
faceplayer
opentext
writetext UnknownText_0x5cb64
@@ -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,21 +230,21 @@
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
- object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
- object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
- object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
- object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
- object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A
- object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
- object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
- object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
- object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
+ object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1AScript, EVENT_BUG_CATCHING_CONTESTANT_1A
+ object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2AScript, EVENT_BUG_CATCHING_CONTESTANT_2A
+ object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant3AScript, EVENT_BUG_CATCHING_CONTESTANT_3A
+ object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant4AScript, EVENT_BUG_CATCHING_CONTESTANT_4A
+ object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant5AScript, EVENT_BUG_CATCHING_CONTESTANT_5A
+ object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant6AScript, EVENT_BUG_CATCHING_CONTESTANT_6A
+ object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant7AScript, EVENT_BUG_CATCHING_CONTESTANT_7A
+ object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant8AScript, EVENT_BUG_CATCHING_CONTESTANT_8A
+ object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant9AScript, EVENT_BUG_CATCHING_CONTESTANT_9A
+ object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant10AScript, EVENT_BUG_CATCHING_CONTESTANT_10A
object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
--- 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/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -8,17 +8,17 @@
db 0 ; callbacks
-SailorScript_0x9c8c1:
+OlivineCafeStrengthSailorScript:
faceplayer
opentext
checkevent EVENT_GOT_HM04_STRENGTH
- iftrue UnknownScript_0x9c8d3
- writetext UnknownText_0x9c8df
+ iftrue .GotStrength
+ writetext OlivineCafeStrengthSailorText
buttonsound
verbosegiveitem HM_STRENGTH
setevent EVENT_GOT_HM04_STRENGTH
-UnknownScript_0x9c8d3:
- writetext UnknownText_0x9c965
+.GotStrength:
+ writetext OlivineCafeStrengthSailorText_GotStrength
waitbutton
closetext
end
@@ -29,7 +29,7 @@
OlivineCafeSailorScript:
jumptextfaceplayer OlivineCafeSailorText
-UnknownText_0x9c8df:
+OlivineCafeStrengthSailorText:
text "Hah! Your #MON"
line "sure look like"
cont "lightweights!"
@@ -43,7 +43,7 @@
cont "STRENGTH!"
done
-UnknownText_0x9c965:
+OlivineCafeStrengthSailorText_GotStrength:
text "On the sea, the"
line "only thing you can"
@@ -88,6 +88,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
+ object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeStrengthSailorScript, -1
object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -22,7 +22,7 @@
setflag ENGINE_FLYPOINT_OLIVINE
return
-UnknownScript_0x1a8833:
+OlivineCityRivalSceneTop:
turnobject PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
@@ -46,7 +46,7 @@
special LoadUsedSpritesGFX
end
-UnknownScript_0x1a886b:
+OlivineCityRivalSceneBottom:
turnobject PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
@@ -73,18 +73,18 @@
OlivineCitySailor1Script:
jumptextfaceplayer OlivineCitySailor1Text
-StandingYoungsterScript_0x1a88a6:
+OlivineCityStandingYoungsterScript:
faceplayer
opentext
random 2
- ifequal 0, UnknownScript_0x1a88b4
- writetext UnknownText_0x1a8b04
+ ifequal 0, .FiftyFifty
+ writetext OlivineCityStandingYoungsterPokegearText
waitbutton
closetext
end
-UnknownScript_0x1a88b4:
- writetext UnknownText_0x1a8b41
+.FiftyFifty:
+ writetext OlivineCityStandingYoungsterPokedexText
waitbutton
closetext
end
@@ -223,7 +223,7 @@
line "ship can sail."
done
-UnknownText_0x1a8b04:
+OlivineCityStandingYoungsterPokegearText:
text "That thing you"
line "have--it's a #-"
cont "GEAR, right? Wow,"
@@ -230,7 +230,7 @@
cont "that's cool."
done
-UnknownText_0x1a8b41:
+OlivineCityStandingYoungsterPokedexText:
text "Wow, you have a"
line "#DEX!"
@@ -303,8 +303,8 @@
warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2
db 2 ; coord events
- coord_event 13, 12, SCENE_DEFAULT, UnknownScript_0x1a8833
- coord_event 13, 13, SCENE_DEFAULT, UnknownScript_0x1a886b
+ coord_event 13, 12, SCENE_DEFAULT, OlivineCityRivalSceneTop
+ coord_event 13, 13, SCENE_DEFAULT, OlivineCityRivalSceneBottom
db 7 ; bg events
bg_event 17, 11, BGEVENT_READ, OlivineCitySign
@@ -317,6 +317,6 @@
db 4 ; object events
object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1
- object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1
+ object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineCityStandingYoungsterScript, -1
object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1
object_event 10, 11, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -7,7 +7,7 @@
db 0 ; callbacks
-JasmineScript_0x9c12f:
+OlivineGymJasmineScript:
faceplayer
opentext
checkevent EVENT_BEAT_JASMINE
@@ -209,5 +209,5 @@
bg_event 6, 13, BGEVENT_READ, OlivineGymStatue
db 2 ; object events
- object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
+ object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymJasmineScript, EVENT_OLIVINE_GYM_JASMINE
object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -10,9 +10,9 @@
OlivineHouseBetaTeacherScript:
jumptextfaceplayer OlivineHouseBetaTeacherText
-RhydonScript_0x9c592:
+OlivineHouseBetaRhydonScript:
opentext
- writetext UnknownText_0x9c5f0
+ writetext OlivineHouseBetaRhydonText
cry RHYDON
waitbutton
closetext
@@ -33,7 +33,7 @@
cont "medicine for me."
done
-UnknownText_0x9c5f0:
+OlivineHouseBetaRhydonText:
text "RHYDON: Gugooh!"
done
@@ -52,4 +52,4 @@
db 2 ; object events
object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
- object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1
+ object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaRhydonScript, -1
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -106,7 +106,7 @@
.HasProtein:
opentext
- writetext UnknownText_0x5b1b6
+ writetext SailorHueyGiveProteinText
waitbutton
verbosegiveitem PROTEIN
iffalse .PackFull
@@ -162,8 +162,8 @@
line "I lose!"
done
+SailorHueyUnusedText:
; unused
-UnusedText_0x5b0be:
text "What power!"
line "How would you like"
@@ -193,7 +193,7 @@
line "ordinary medicine."
done
-UnknownText_0x5b1b6:
+SailorHueyGiveProteinText:
text "Man! You're as"
line "tough as ever!"
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -97,7 +97,8 @@
closetext
end
-UnknownScript_0x60c39:
+OlivineLighthouseUnusedDummyScript:
+; unused
end
OlivineLighthouseAmphy:
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x9cac7:
+OlivineMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_OLIVINE
closetext
@@ -55,6 +55,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartClerkScript, -1
object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -9,10 +9,10 @@
db 0 ; callbacks
-NurseScript_0x9c002:
+OlivinePokecenter1FNurseScript:
jumpstd pokecenternurse
-FishingGuruScript_0x9c005:
+OlivinePokecenter1FFishingGuruScript:
jumpstd happinesschecknpc
OlivinePokecenter1FFisherScript:
@@ -58,7 +58,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1
- object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FNurseScript, -1
+ object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFishingGuruScript, -1
object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -29,11 +29,11 @@
blackoutmod OLIVINE_CITY
end
-SailorScript_0x748c0:
+OlivinePortSailorAtGangwayScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x74919
+ iftrue OlivinePortAlreadyRodeScript
writetext UnknownText_0x74a55
waitbutton
closetext
@@ -47,7 +47,7 @@
special FadeOutPalettes
waitsfx
checkevent EVENT_FAST_SHIP_FIRST_TIME
- iffalse UnknownScript_0x7490a
+ iffalse .FirstTime
clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
clearevent EVENT_BEAT_COOLTRAINERM_SEAN
@@ -59,7 +59,7 @@
clearevent EVENT_BEAT_SAILOR_GARRETT
clearevent EVENT_BEAT_FISHER_JONAH
clearevent EVENT_BEAT_BLACKBELT_WAI
-UnknownScript_0x7490a:
+.FirstTime:
clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
appear OLIVINEPORT_SAILOR1
setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP
@@ -66,44 +66,44 @@
warp FAST_SHIP_1F, 25, 1
end
-UnknownScript_0x74919:
+OlivinePortAlreadyRodeScript:
writetext UnknownText_0x74a80
waitbutton
closetext
end
-UnknownScript_0x7491f:
+OlivinePortWalkUpToShipScript:
turnobject OLIVINEPORT_SAILOR3, RIGHT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x7498b
+ iftrue .skip
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
- iftrue UnknownScript_0x7498b
+ iftrue .skip
turnobject PLAYER, LEFT
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
- iffalse UnknownScript_0x7494e
+ iffalse .FirstTime
checkcode VAR_WEEKDAY
- ifequal SUNDAY, UnknownScript_0x74977
- ifequal SATURDAY, UnknownScript_0x74977
- ifequal TUESDAY, UnknownScript_0x74981
- ifequal WEDNESDAY, UnknownScript_0x74981
- ifequal THURSDAY, UnknownScript_0x74981
-UnknownScript_0x7494e:
+ ifequal SUNDAY, .NextShipMonday
+ ifequal SATURDAY, .NextShipMonday
+ ifequal TUESDAY, .NextShipFriday
+ ifequal WEDNESDAY, .NextShipFriday
+ ifequal THURSDAY, .NextShipFriday
+.FirstTime:
writetext UnknownText_0x74a9c
yesorno
- iffalse UnknownScript_0x74992
+ iffalse OlivinePortNotRidingMoveAwayScript
writetext UnknownText_0x74ada
buttonsound
checkitem S_S_TICKET
- iffalse UnknownScript_0x7496d
+ iffalse .NoTicket
writetext UnknownText_0x74b11
waitbutton
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74a37
- jump SailorScript_0x748c0
+ jump OlivinePortSailorAtGangwayScript
-UnknownScript_0x7496d:
+.NoTicket:
writetext UnknownText_0x74b41
waitbutton
closetext
@@ -110,7 +110,7 @@
applymovement PLAYER, MovementData_0x74a34
end
-UnknownScript_0x74977:
+.NextShipMonday:
writetext UnknownText_0x74ba8
waitbutton
closetext
@@ -117,7 +117,7 @@
applymovement PLAYER, MovementData_0x74a34
end
-UnknownScript_0x74981:
+.NextShipFriday:
writetext UnknownText_0x74bce
waitbutton
closetext
@@ -124,16 +124,16 @@
applymovement PLAYER, MovementData_0x74a34
end
-UnknownScript_0x7498b:
+.skip:
end
-UnknownScript_0x7498c:
+OlivinePortNotRidingScript:
writetext UnknownText_0x74af6
waitbutton
closetext
end
-UnknownScript_0x74992:
+OlivinePortNotRidingMoveAwayScript:
writetext UnknownText_0x74af6
waitbutton
closetext
@@ -140,92 +140,92 @@
applymovement PLAYER, MovementData_0x74a34
end
-SailorScript_0x7499c:
+OlivinePortSailorAfterHOFScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x74919
+ iftrue OlivinePortAlreadyRodeScript
checkevent EVENT_FAST_SHIP_FIRST_TIME
- iffalse UnknownScript_0x749c0
+ iffalse .FirstTime
checkcode VAR_WEEKDAY
- ifequal SUNDAY, UnknownScript_0x749f2
- ifequal SATURDAY, UnknownScript_0x749f2
- ifequal TUESDAY, UnknownScript_0x749f8
- ifequal WEDNESDAY, UnknownScript_0x749f8
- ifequal THURSDAY, UnknownScript_0x749f8
-UnknownScript_0x749c0:
+ ifequal SUNDAY, .NextShipMonday
+ ifequal SATURDAY, .NextShipMonday
+ ifequal TUESDAY, .NextShipFriday
+ ifequal WEDNESDAY, .NextShipFriday
+ ifequal THURSDAY, .NextShipFriday
+.FirstTime:
writetext UnknownText_0x74a9c
yesorno
- iffalse UnknownScript_0x7498c
+ iffalse OlivinePortNotRidingScript
writetext UnknownText_0x74ada
buttonsound
checkitem S_S_TICKET
- iffalse UnknownScript_0x749ec
+ iffalse .NoTicket
writetext UnknownText_0x74b11
waitbutton
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkcode VAR_FACING
- ifequal RIGHT, UnknownScript_0x749e5
+ ifequal RIGHT, .Right
applymovement PLAYER, MovementData_0x74a3f
- jump SailorScript_0x748c0
+ jump OlivinePortSailorAtGangwayScript
-UnknownScript_0x749e5:
+.Right:
applymovement PLAYER, MovementData_0x74a49
- jump SailorScript_0x748c0
+ jump OlivinePortSailorAtGangwayScript
-UnknownScript_0x749ec:
+.NoTicket:
writetext UnknownText_0x74b41
waitbutton
closetext
end
-UnknownScript_0x749f2:
+.NextShipMonday:
writetext UnknownText_0x74ba8
waitbutton
closetext
end
-UnknownScript_0x749f8:
+.NextShipFriday:
writetext UnknownText_0x74bce
waitbutton
closetext
end
-OlivinePortSailorScript:
- jumptextfaceplayer OlivinePortSailorText
+OlivinePortSailorBeforeHOFScript:
+ jumptextfaceplayer OlivinePortSailorBeforeHOFText
-FishingGuruScript_0x74a01:
+OlivinePortFishingGuru1Script:
faceplayer
opentext
- writetext UnknownText_0x74bf4
+ writetext OlivinePortFishingGuru1Text
waitbutton
closetext
turnobject OLIVINEPORT_FISHING_GURU1, UP
end
-FishingGuruScript_0x74a0c:
+OlivinePortFishingGuru2Script:
faceplayer
opentext
- writetext UnknownText_0x74c35
+ writetext OlivinePortFishingGuru2Text
waitbutton
closetext
turnobject OLIVINEPORT_FISHING_GURU2, UP
end
-YoungsterScript_0x74a17:
+OlivinePortYoungsterScript:
faceplayer
opentext
- writetext UnknownText_0x74c76
+ writetext OlivinePortYoungsterText
waitbutton
closetext
turnobject OLIVINEPORT_YOUNGSTER, DOWN
end
-CooltrainerFScript_0x74a22:
+OlivinePortCooltrainerFScript:
faceplayer
opentext
- writetext UnknownText_0x74ca2
+ writetext OlivinePortCooltrainerFText
waitbutton
closetext
turnobject OLIVINEPORT_COOLTRAINER_F, DOWN
@@ -344,7 +344,7 @@
line "sail next Friday."
done
-UnknownText_0x74bf4:
+OlivinePortFishingGuru1Text:
text "SHELLDER are easy"
line "to catch here."
@@ -352,7 +352,7 @@
line "rare elsewhere."
done
-UnknownText_0x74c35:
+OlivinePortFishingGuru2Text:
text "How many RODS do"
line "you have?"
@@ -361,13 +361,13 @@
cont "#MON."
done
-UnknownText_0x74c76:
+OlivinePortYoungsterText:
text "S.S.AQUA uses jets"
line "to skim over the"
cont "waves!"
done
-UnknownText_0x74ca2:
+OlivinePortCooltrainerFText:
text "There are lots of"
line "#MON in KANTO."
@@ -374,7 +374,7 @@
para "I wish I could go…"
done
-OlivinePortSailorText:
+OlivinePortSailorBeforeHOFText:
text "We don't want you"
line "to fall into the"
@@ -390,16 +390,16 @@
warp_event 7, 23, FAST_SHIP_1F, 1
db 1 ; coord events
- coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f
+ coord_event 7, 15, SCENE_DEFAULT, OlivinePortWalkUpToShipScript
db 1 ; bg events
bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
db 7 ; object events
- object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
- object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
- object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
- object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
- object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
- object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
- object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+ object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorAtGangwayScript, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
+ object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorBeforeHOFScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+ object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorAfterHOFScript, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+ object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortFishingGuru1Script, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+ object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortFishingGuru2Script, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+ object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortYoungsterScript, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+ object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortCooltrainerFScript, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -21,12 +21,12 @@
PewterCityBugCatcherScript:
jumptextfaceplayer PewterCityBugCatcherText
-GrampsScript_0x18c00f:
+PewterCityGrampsScript:
faceplayer
opentext
checkevent EVENT_GOT_SILVER_WING
- iftrue UnknownScript_0x18c023
- writetext UnknownText_0x18c0c6
+ iftrue .GotSilverWing
+ writetext PewterCityGrampsText
buttonsound
verbosegiveitem SILVER_WING
setevent EVENT_GOT_SILVER_WING
@@ -33,8 +33,8 @@
closetext
end
-UnknownScript_0x18c023:
- writetext UnknownText_0x18c1aa
+.GotSilverWing:
+ writetext PewterCityGrampsText_GotSilverWing
waitbutton
closetext
end
@@ -60,10 +60,10 @@
PewterCityMartSign:
jumpstd martsign
-FruitTreeScript_0x18c03e:
+PewterCityFruitTree1:
fruittree FRUITTREE_PEWTER_CITY_1
-FruitTreeScript_0x18c040:
+PewterCityFruitTree2:
fruittree FRUITTREE_PEWTER_CITY_2
PewterCityCooltrainerFText:
@@ -83,7 +83,7 @@
line "night."
done
-UnknownText_0x18c0c6:
+PewterCityGrampsText:
text "Ah, you came all"
line "the way out here"
cont "from JOHTO?"
@@ -105,7 +105,7 @@
cont "I found in JOHTO."
done
-UnknownText_0x18c1aa:
+PewterCityGrampsText_GotSilverWing:
text "Going to new, un-"
line "known places and"
cont "seeing new people…"
@@ -174,6 +174,6 @@
db 5 ; object events
object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
- object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1
- object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1
- object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1
+ object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterCityGrampsScript, -1
+ object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterCityFruitTree1, -1
+ object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterCityFruitTree2, -1
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-BrockScript_0x1a2864:
+PewterGymBrockScript:
faceplayer
opentext
checkflag ENGINE_BOULDERBADGE
@@ -220,6 +220,6 @@
bg_event 7, 11, BGEVENT_READ, PewterGymStatue
db 3 ; object events
- object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1
+ object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PewterGymBrockScript, -1
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x1a2dcb:
+PewterMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_PEWTER
closetext
@@ -55,6 +55,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartClerkScript, -1
object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -10,7 +10,7 @@
db 0 ; callbacks
-NurseScript_0x1a2ee7:
+PewterPokecenter1FNurseScript:
jumpstd pokecenternurse
PewterPokecenter1FTeacherScript:
@@ -78,7 +78,7 @@
db 0 ; bg events
db 5 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FNurseScript, -1
object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -18,26 +18,26 @@
.DummyScene1:
end
-UnknownScript_0x7a4d8:
+MeetMomLeftScript:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-UnknownScript_0x7a4db:
+MeetMomRightScript:
playmusic MUSIC_MOM
showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
turnobject PLAYER, LEFT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x7a4f2
+ iffalse .OnRight
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
- jump UnknownScript_0x7a4f6
+ jump MeetMomScript
-UnknownScript_0x7a4f2:
+.OnRight:
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe
-UnknownScript_0x7a4f6:
+MeetMomScript:
opentext
writetext UnknownText_0x7a604
buttonsound
stringtotext GearName, MEM_BUFFER_1
- scall UnknownScript_0x7a57e
+ scall PlayersHouse1FReceiveItemStd
setflag ENGINE_POKEGEAR
setflag ENGINE_PHONE_CARD
addcellnum PHONE_MOM
@@ -47,103 +47,103 @@
writetext UnknownText_0x7a6bd
buttonsound
special SetDayOfWeek
-UnknownScript_0x7a519:
+.SetDayOfWeek:
writetext UnknownText_0x7a742
yesorno
- iffalse UnknownScript_0x7a52a
+ iffalse .WrongDay
special InitialSetDSTFlag
yesorno
- iffalse UnknownScript_0x7a519
- jump UnknownScript_0x7a531
+ iffalse .SetDayOfWeek
+ jump .DayOfWeekDone
-UnknownScript_0x7a52a:
+.WrongDay:
special InitialClearDSTFlag
yesorno
- iffalse UnknownScript_0x7a519
-UnknownScript_0x7a531:
+ iffalse .SetDayOfWeek
+.DayOfWeekDone:
writetext UnknownText_0x7a763
yesorno
- iffalse UnknownScript_0x7a542
- jump UnknownScript_0x7a53b
+ iffalse .ExplainPhone
+ jump .KnowPhone
-UnknownScript_0x7a53b:
+.KnowPhone:
writetext UnknownText_0x7a7cb
buttonsound
- jump UnknownScript_0x7a549
+ jump .FinishPhone
-UnknownScript_0x7a542:
+.ExplainPhone:
writetext UnknownText_0x7a807
buttonsound
- jump UnknownScript_0x7a549
+ jump .FinishPhone
-UnknownScript_0x7a549:
+.FinishPhone:
writetext UnknownText_0x7a850
waitbutton
closetext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x7a55d
+ iftrue .FromRight
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
- iffalse UnknownScript_0x7a564
- jump UnknownScript_0x7a56b
+ iffalse .FromLeft
+ jump .Finish
-UnknownScript_0x7a55d:
+.FromRight:
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600
- jump UnknownScript_0x7a56b
+ jump .Finish
-UnknownScript_0x7a564:
+.FromLeft:
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602
- jump UnknownScript_0x7a56b
+ jump .Finish
-UnknownScript_0x7a56b:
+.Finish:
special RestartMapMusic
turnobject PLAYERSHOUSE1F_MOM1, LEFT
end
-UnknownScript_0x7a572:
+MeetMomTalkedScript:
playmusic MUSIC_MOM
- jump UnknownScript_0x7a4f6
+ jump MeetMomScript
GearName:
db "#GEAR@"
-UnknownScript_0x7a57e:
+PlayersHouse1FReceiveItemStd:
jumpstd receiveitem
end
-MomScript_0x7a582:
+MomScript:
faceplayer
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkscene
- iffalse UnknownScript_0x7a572 ; SCENE_DEFAULT
+ iffalse MeetMomTalkedScript ; SCENE_DEFAULT
opentext
checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
- iftrue UnknownScript_0x7a5af
+ iftrue .FirstTimeBanking
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
- iftrue UnknownScript_0x7a5b8
+ iftrue .BankOfMom
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
- iftrue UnknownScript_0x7a5b5
+ iftrue .GaveMysteryEgg
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
- iftrue UnknownScript_0x7a5a9
+ iftrue .GotAPokemon
writetext UnknownText_0x7a8b5
waitbutton
closetext
end
-UnknownScript_0x7a5a9:
+.GotAPokemon:
writetext UnknownText_0x7a8e5
waitbutton
closetext
end
-UnknownScript_0x7a5af:
+.FirstTimeBanking:
writetext UnknownText_0x7a957
waitbutton
closetext
end
-UnknownScript_0x7a5b5:
+.GaveMysteryEgg:
setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
-UnknownScript_0x7a5b8:
+.BankOfMom:
setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
special BankOfMom
waitbutton
@@ -392,8 +392,8 @@
warp_event 9, 0, PLAYERS_HOUSE_2F, 1
db 2 ; coord events
- coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8
- coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db
+ coord_event 8, 4, SCENE_DEFAULT, MeetMomLeftScript
+ coord_event 9, 4, SCENE_DEFAULT, MeetMomRightScript
db 4 ; bg events
bg_event 0, 1, BGEVENT_READ, StoveScript
@@ -402,8 +402,8 @@
bg_event 4, 1, BGEVENT_READ, TVScript
db 5 ; object events
- object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1
- object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
- object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
- object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1
+ object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -581,13 +581,13 @@
setmapscene TIME_CAPSULE, SCENE_DEFAULT
end
-MapPokecenter2FSignpost0Script:
+Pokecenter2FLinkRecordSign:
refreshscreen
special DisplayLinkRecord
closetext
end
-OfficerScript_0x192c9a:
+Pokecenter2FOfficerScript:
faceplayer
opentext
checkevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
@@ -1034,10 +1034,10 @@
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
object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
- object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
+ object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Pokecenter2FOfficerScript, EVENT_MYSTERY_GIFT_DELIVERY_GUY
--- a/maps/PokecomCenterAdminOfficeMobile.asm
+++ b/maps/PokecomCenterAdminOfficeMobile.asm
@@ -17,36 +17,36 @@
PokecomCenterAdminOfficeMobileScientist3Script:
jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist3Text
-PokecomCenterAdminOfficeMobileSignpost0Script:
+PokecomCenterAdminOfficeMobileComputer1:
opentext
- writetext UnknownText_0x627ee
+ writetext PokecomCenterAdminOfficeMobileComputer1Text
waitbutton
-UnknownScript_0x625df:
+.loop:
reloadmappart
- loadmenu MenuHeader_0x62602
+ loadmenu .Computer1MenuHeader
verticalmenu
closewindow
- ifequal 1, UnknownScript_0x625f0
- ifequal 2, UnknownScript_0x625f8
- jump UnknownScript_0x62600
+ ifequal 1, .PokeComClub
+ ifequal 2, .MobileCenter
+ jump .Quit
-UnknownScript_0x625f0:
+.PokeComClub:
opentext
- writetext UnknownText_0x62828
+ writetext PokecomCenterAdminOfficeMobileComputer1Text_PokeComClub
waitbutton
- jump UnknownScript_0x625df
+ jump .loop
-UnknownScript_0x625f8:
+.MobileCenter:
opentext
- writetext UnknownText_0x628f4
+ writetext PokecomCenterAdminOfficeMobileComputer1Text_MobileCenter
waitbutton
- jump UnknownScript_0x625df
+ jump .loop
-UnknownScript_0x62600:
+.Quit:
closetext
end
-MenuHeader_0x62602:
+.Computer1MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 15, 8
dw .MenuData
@@ -59,36 +59,36 @@
db "モバイルセンター@" ; MOBILE CENTER
db "やめる@" ; QUIT
-PokecomCenterAdminOfficeMobileSignpost1Script:
+PokecomCenterAdminOfficeMobileComputer2:
opentext
- writetext UnknownText_0x62989
+ writetext PokecomCenterAdminOfficeMobileComputer2Text
waitbutton
-UnknownScript_0x62629:
+.loop:
reloadmappart
- loadmenu MenuHeader_0x6264c
+ loadmenu .Computer2MenuHeader
verticalmenu
closewindow
- ifequal 1, UnknownScript_0x6263a
- ifequal 2, UnknownScript_0x62642
- jump UnknownScript_0x6264a
+ ifequal 1, .UsePhone
+ ifequal 2, .DontUsePhone
+ jump .Quit
-UnknownScript_0x6263a:
+.UsePhone:
opentext
- writetext UnknownText_0x629ae
+ writetext PokecomCenterAdminOfficeMobileComputer2Text_UsePhone
waitbutton
- jump UnknownScript_0x62629
+ jump .loop
-UnknownScript_0x62642:
+.DontUsePhone:
opentext
- writetext UnknownText_0x62a5a
+ writetext PokecomCenterAdminOfficeMobileComputer2Text_DontUsePhone
waitbutton
- jump UnknownScript_0x62629
+ jump .loop
-UnknownScript_0x6264a:
+.Quit:
closetext
end
-MenuHeader_0x6264c:
+.Computer2MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 15, 8
dw .MenuData
@@ -101,8 +101,8 @@
db "でんわ<GA>つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT
-PokecomCenterAdminOfficeMobileSignpost2Script:
- jumptext UnknownText_0x62b26
+PokecomCenterAdminOfficeMobileComputer3:
+ jumptext PokecomCenterAdminOfficeMobileComputer3Text
PokecomCenterAdminOfficeMobileScientist1Text:
text "#COM CENTER and"
@@ -144,7 +144,7 @@
cont "less technology."
done
-UnknownText_0x627ee:
+PokecomCenterAdminOfficeMobileComputer1Text:
text "It's a notice"
line "about where MOBILE"
@@ -152,7 +152,7 @@
line "used…"
done
-UnknownText_0x62828:
+PokecomCenterAdminOfficeMobileComputer1Text_PokeComClub:
text "There's a #COM"
line "CLUB upstairs in"
@@ -174,7 +174,7 @@
cont "you."
done
-UnknownText_0x628f4:
+PokecomCenterAdminOfficeMobileComputer1Text_MobileCenter:
text "To use the TRADE"
line "CORNER or read the"
@@ -189,13 +189,13 @@
line "connecting there."
done
-UnknownText_0x62989:
+PokecomCenterAdminOfficeMobileComputer2Text:
text "It's a notice"
line "about using the"
cont "phone…"
done
-UnknownText_0x629ae:
+PokecomCenterAdminOfficeMobileComputer2Text_UsePhone:
text "Please ensure that"
line "your phone and"
@@ -211,7 +211,7 @@
cont "while linking."
done
-UnknownText_0x62a5a:
+PokecomCenterAdminOfficeMobileComputer2Text_DontUsePhone:
text "If the server is"
line "busy, it may not"
@@ -232,7 +232,7 @@
cont "instructions."
done
-UnknownText_0x62b26:
+PokecomCenterAdminOfficeMobileComputer3Text:
text "The ADMINISTRATION"
line "OFFICE received an"
cont "e-mail. It says…"
@@ -270,9 +270,9 @@
db 0 ; coord events
db 3 ; bg events
- bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost0Script
- bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost1Script
- bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost2Script
+ bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer1
+ bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer2
+ bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer3
db 3 ; object events
object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -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/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -43,11 +43,11 @@
setscene SCENE_POWERPLANT_NOTHING
end
-OfficerScript_0x188df5:
+PowerPlantOfficerScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
+ iftrue .ReturnedMachinePart
checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
iftrue .MetManager
writetext UnknownText_0x188ee0
@@ -61,71 +61,71 @@
closetext
end
-.ReturnedPart:
+.ReturnedMachinePart:
writetext UnknownText_0x188fa2
waitbutton
closetext
end
-GymGuyScript_0x188e15:
+PowerPlantGymGuy1Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x188fcf
waitbutton
closetext
end
-.ReturnedPart:
+.ReturnedMachinePart:
writetext UnknownText_0x189038
waitbutton
closetext
end
-GymGuyScript_0x188e29:
+PowerPlantGymGuy2Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x189079
waitbutton
closetext
end
-.ReturnedPart:
+.ReturnedMachinePart:
writetext UnknownText_0x1890ef
waitbutton
closetext
end
-OfficerScript_0x188e3d:
+PowerPlantGymGuy3Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x18910e
waitbutton
closetext
end
-.ReturnedPart:
+.ReturnedMachinePart:
writetext UnknownText_0x18917f
waitbutton
closetext
end
-GymGuyScript_0x188e51:
+PowerPlantGymGuy4Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x1891c2
waitbutton
closetext
end
-.ReturnedPart:
+.ReturnedMachinePart:
writetext UnknownText_0x189225
waitbutton
closetext
@@ -135,9 +135,9 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
+ iftrue .ReturnedMachinePart
checkitem MACHINE_PART
- iftrue .HoldingPart
+ iftrue .FoundMachinePart
checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
iftrue .MetManager
writetext UnknownText_0x189264
@@ -156,7 +156,7 @@
closetext
end
-.HoldingPart:
+.FoundMachinePart:
writetext UnknownText_0x18936e
buttonsound
takeitem MACHINE_PART
@@ -166,9 +166,9 @@
setevent EVENT_ROUTE_24_ROCKET
setevent EVENT_RESTORED_POWER_TO_KANTO
clearevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
-.ReturnedPart:
+.ReturnedMachinePart:
checkevent EVENT_GOT_TM07_ZAP_CANNON
- iftrue .GotTM
+ iftrue .GotZapCannon
writetext UnknownText_0x1893c4
buttonsound
verbosegiveitem TM_ZAP_CANNON
@@ -180,7 +180,7 @@
closetext
end
-.GotTM:
+.GotZapCannon:
writetext UnknownText_0x189475
waitbutton
closetext
@@ -401,10 +401,10 @@
bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf
db 7 ; object events
- object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
- object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
- object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
- object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1
- object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1
+ object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficerScript, -1
+ object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy1Script, -1
+ object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy2Script, -1
+ object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy3Script, -1
+ object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy4Script, -1
object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1
object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -27,7 +27,7 @@
closetext
end
-GentlemanScript_0x5cd3d:
+RadioTower1FLuckyNumberManScript:
faceplayer
opentext
writetext UnknownText_0x5ceba
@@ -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
@@ -489,5 +489,5 @@
object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FLuckyNumberManScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower1FRadioCardWomanScript, EVENT_GOLDENROD_CITY_CIVILIANS
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -16,24 +16,25 @@
db 0 ; callbacks
-UnknownScript_0x5d6fd:
+RadioTower2FUnusedDummyScene:
+; unused
end
RadioTower2FSuperNerdScript:
jumptextfaceplayer RadioTower2FSuperNerdText
-TeacherScript_0x5d701:
+RadioTower2FTeacherScript:
faceplayer
opentext
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue .Rockets
- writetext UnknownText_0x5d956
+ writetext RadioTower2FTeacherText
waitbutton
closetext
end
.Rockets:
- writetext UnknownText_0x5d983
+ writetext RadioTower2FTeacherText_Rockets
waitbutton
closetext
end
@@ -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
@@ -347,13 +348,13 @@
cont "where. Tune in!"
done
-UnknownText_0x5d956:
+RadioTower2FTeacherText:
text "Lullabies on the"
line "radio may make"
cont "#MON sleep."
done
-UnknownText_0x5d983:
+RadioTower2FTeacherText_Rockets:
text "Why would they"
line "want to take over"
cont "the RADIO TOWER?"
@@ -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,16 +719,16 @@
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
- object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1
+ object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower2FTeacherScript, -1
object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -26,23 +26,23 @@
RadioTower3FSuperNerdScript:
jumptextfaceplayer RadioTower3FSuperNerdText
-GymGuyScript_0x5e556:
+RadioTower3FGymGuyScript:
faceplayer
opentext
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue .NoRockets
- writetext UnknownText_0x5e682
+ writetext RadioTower3FGymGuyText_Rockets
waitbutton
closetext
end
.NoRockets:
- writetext UnknownText_0x5e6eb
+ writetext RadioTower3FGymGuyText
waitbutton
closetext
end
-CooltrainerFScript_0x5e56a:
+RadioTower3FCooltrainerFScript:
faceplayer
opentext
checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
@@ -124,20 +124,20 @@
closetext
end
-MapRadioTower3FSignpost2Script::
+CardKeySlotScript::
opentext
- writetext UnknownText_0x5eaa4
+ writetext RadioTower3FCardKeySlotText
waitbutton
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue .UsedCardKey
checkitem CARD_KEY
- iftrue UnknownScript_0x5e605
+ iftrue .HaveCardKey
.UsedCardKey:
closetext
end
-UnknownScript_0x5e605:
- writetext UnknownText_0x5eabc
+.HaveCardKey:
+ writetext InsertedTheCardKeyText
waitbutton
setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
playsound SFX_ENTER_DOOR
@@ -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"
@@ -165,7 +165,7 @@
line "200 kinds."
done
-UnknownText_0x5e682:
+RadioTower3FGymGuyText_Rockets:
text "To trainers, #-"
line "MON are their"
cont "beloved partners."
@@ -177,7 +177,7 @@
line "#MON."
done
-UnknownText_0x5e6eb:
+RadioTower3FGymGuyText:
text "We run 24 hours a"
line "day to broadcast"
@@ -307,21 +307,21 @@
cont "I need from here."
done
-UnknownText_0x5eaa4:
+RadioTower3FCardKeySlotText:
text "It's the CARD KEY"
line "slot."
done
-UnknownText_0x5eabc:
+InsertedTheCardKeyText:
text "<PLAYER> inserted"
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,14 +337,14 @@
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
- object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1
- object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1
+ object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower3FGymGuyScript, -1
+ object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower3FCooltrainerFScript, -1
object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -15,33 +15,33 @@
RadioTower4FFisherScript:
jumptextfaceplayer RadioTower4FFisherText
-TeacherScript_0x5eb85:
+RadioTower4FDJMaryScript:
faceplayer
opentext
checkevent EVENT_GOT_PINK_BOW_FROM_MARY
- iftrue UnknownScript_0x5ebac
+ iftrue .GotPinkBow
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x5eb99
- writetext UnknownText_0x5ec68
+ iftrue .ClearedRockets
+ writetext RadioTower4FDJMaryText
waitbutton
closetext
end
-UnknownScript_0x5eb99:
- writetext UnknownText_0x5ecab
+.ClearedRockets:
+ writetext RadioTower4FDJMaryText_ClearedRockets
buttonsound
verbosegiveitem PINK_BOW
- iffalse UnknownScript_0x5ebb0
- writetext UnknownText_0x5ecef
+ iffalse .NoRoom
+ writetext RadioTower4FDJMaryText_GivePinkBow
waitbutton
closetext
setevent EVENT_GOT_PINK_BOW_FROM_MARY
end
-UnknownScript_0x5ebac:
- writetext UnknownText_0x5ed2c
+.GotPinkBow:
+ writetext RadioTower4FDJMaryText_After
waitbutton
-UnknownScript_0x5ebb0:
+.NoRoom:
closetext
end
@@ -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"
@@ -112,7 +112,7 @@
line "broadcast there."
done
-UnknownText_0x5ec68:
+RadioTower4FDJMaryText:
text "MARY: Why? Why do"
line "I have to suffer"
cont "through this?"
@@ -120,7 +120,7 @@
para "MEOWTH, help me!"
done
-UnknownText_0x5ecab:
+RadioTower4FDJMaryText_ClearedRockets:
text "MARY: Oh! You're"
line "my little savior!"
@@ -128,7 +128,7 @@
line "as my thanks?"
done
-UnknownText_0x5ecef:
+RadioTower4FDJMaryText_GivePinkBow:
text "MARY: It's just"
line "right for #MON"
@@ -136,7 +136,7 @@
line "type moves."
done
-UnknownText_0x5ed2c:
+RadioTower4FDJMaryText_After:
text "MARY: Please tune"
line "into me on PROF."
@@ -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,12 +255,12 @@
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
- object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1
+ object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower4FDJMaryScript, -1
object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -77,7 +77,7 @@
end
RadioTower5FRocketBossScene:
- applymovement PLAYER, MovementData_0x60125
+ applymovement PLAYER, RadioTower5FPlayerTwoStepsLeftMovement
playmusic MUSIC_ROCKET_ENCOUNTER
turnobject RADIOTOWER5F_ROCKET, RIGHT
opentext
@@ -142,11 +142,11 @@
RadioTower5FUltraBall:
itemball ULTRA_BALL
-MapRadioTower5FSignpost0Script:
- jumptext SignpostRadioTower5FOffice
+RadioTower5FDirectorsOfficeSign:
+ jumptext RadioTower5FDirectorsOfficeSignText
-MapRadioTower5FSignpost2Script:
- jumptext SignpostRadioTower5FStudio
+RadioTower5FStudio1Sign:
+ jumptext RadioTower5FStudio1SignText
RadioTower5FBookshelf:
jumpstd magazinebookshelf
@@ -185,7 +185,7 @@
step UP
step_end
-MovementData_0x60125:
+RadioTower5FPlayerTwoStepsLeftMovement:
step LEFT
step LEFT
step_end
@@ -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/Route1.asm
+++ b/maps/Route1.asm
@@ -33,7 +33,7 @@
Route1Sign:
jumptext Route1SignText
-FruitTreeScript_0x1ac581:
+Route1FruitTree:
fruittree FRUITTREE_ROUTE_1
SchoolboyDannySeenText:
@@ -91,4 +91,4 @@
db 3 ; object events
object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
- object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
+ object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route1FruitTree, -1
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -9,24 +9,24 @@
db 0 ; callbacks
-NurseScript_0x188bd4:
+Route10Pokecenter1FNurseScript:
jumpstd pokecenternurse
Route10Pokecenter1FGentlemanScript:
jumptextfaceplayer Route10Pokecenter1FGentlemanText
-GymGuyScript_0x188bda:
+Route10Pokecenter1FGymGuyScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188be8
- writetext UnknownText_0x188c26
+ iftrue .ReturnedMachinePart
+ writetext Route10Pokecenter1FGymGuyText
waitbutton
closetext
end
-UnknownScript_0x188be8:
- writetext UnknownText_0x188c9e
+.ReturnedMachinePart:
+ writetext Route10Pokecenter1FGymGuyText_ReturnedMachinePart
waitbutton
closetext
end
@@ -42,7 +42,7 @@
line "convenient."
done
-UnknownText_0x188c26:
+Route10Pokecenter1FGymGuyText:
text "The POWER PLANT's"
line "MANAGER is looking"
@@ -56,7 +56,7 @@
line "was stolen."
done
-UnknownText_0x188c9e:
+Route10Pokecenter1FGymGuyText_ReturnedMachinePart:
text "I hear TEAM ROCKET"
line "got back together"
@@ -91,7 +91,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FNurseScript, -1
object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
- object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1
+ object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGymGuyScript, -1
object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -57,7 +57,7 @@
Route11Sign:
jumptext Route11SignText
-FruitTreeScript_0x68055:
+Route11FruitTree:
fruittree FRUITTREE_ROUTE_11
Route11HiddenRevive:
@@ -159,4 +159,4 @@
object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1
- object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1
+ object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route11FruitTree, -1
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -6,29 +6,29 @@
db 0 ; callbacks
-FishingGuruScript_0x7f484:
+Route12SuperRodHouseFishingGuruScript:
faceplayer
opentext
checkevent EVENT_GOT_SUPER_ROD
- iftrue UnknownScript_0x7f4a0
+ iftrue .GotSuperRod
writetext UnknownText_0x7f4af
yesorno
- iffalse UnknownScript_0x7f4a6
+ iffalse .Refused
writetext UnknownText_0x7f52f
buttonsound
verbosegiveitem SUPER_ROD
- iffalse UnknownScript_0x7f4aa
+ iffalse .NoRoom
setevent EVENT_GOT_SUPER_ROD
-UnknownScript_0x7f4a0:
+.GotSuperRod:
writetext UnknownText_0x7f57c
waitbutton
closetext
end
-UnknownScript_0x7f4a6:
+.Refused:
writetext UnknownText_0x7f5ec
waitbutton
-UnknownScript_0x7f4aa:
+.NoRoom:
closetext
end
@@ -89,4 +89,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
+ object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route12SuperRodHouseFishingGuruScript, -1
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -13,22 +13,22 @@
Route16GateOfficerScript:
jumptextfaceplayer Route16GateOfficerText
-UnknownScript_0x733ed:
+Route16GateBicycleCheck:
checkitem BICYCLE
- iffalse UnknownScript_0x733f3
+ iffalse .NoBicycle
end
-UnknownScript_0x733f3:
+.NoBicycle:
showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15
turnobject PLAYER, UP
opentext
- writetext UnknownText_0x73496
+ writetext Route16GateCannotPassText
waitbutton
closetext
- applymovement PLAYER, MovementData_0x73405
+ applymovement PLAYER, Route16GateCannotPassMovement
end
-MovementData_0x73405:
+Route16GateCannotPassMovement:
step RIGHT
turn_head LEFT
step_end
@@ -48,7 +48,7 @@
line "a ship or train."
done
-UnknownText_0x73496:
+Route16GateCannotPassText:
text "Hey! Whoa! Stop!"
para "You can't go out"
@@ -68,8 +68,8 @@
warp_event 9, 5, ROUTE_16, 3
db 2 ; coord events
- coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed
- coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x733ed
+ coord_event 5, 4, SCENE_DEFAULT, Route16GateBicycleCheck
+ coord_event 5, 5, SCENE_DEFAULT, Route16GateBicycleCheck
db 0 ; bg events
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -13,22 +13,22 @@
Route17Route18GateOfficerScript:
jumptextfaceplayer Route17Route18GateOfficerText
-UnknownScript_0x73611:
+Route17Route18GateBicycleCheck:
checkitem BICYCLE
- iffalse UnknownScript_0x73617
+ iffalse .NoBicycle
end
-UnknownScript_0x73617:
+.NoBicycle:
showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15
turnobject PLAYER, UP
opentext
- writetext UnknownText_0x7364d
+ writetext Route17Route18GateCannotPassText
waitbutton
closetext
- applymovement PLAYER, MovementData_0x73629
+ applymovement PLAYER, Route17Route18GateCannotPassMovement
end
-MovementData_0x73629:
+Route17Route18GateCannotPassMovement:
step RIGHT
turn_head LEFT
step_end
@@ -38,7 +38,7 @@
line "Uphill Starts Here"
done
-UnknownText_0x7364d:
+Route17Route18GateCannotPassText:
text "Hang on! Don't you"
line "have a BICYCLE?"
@@ -59,8 +59,8 @@
warp_event 9, 5, ROUTE_18, 2
db 2 ; coord events
- coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611
- coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x73611
+ coord_event 5, 4, SCENE_DEFAULT, Route17Route18GateBicycleCheck
+ coord_event 5, 5, SCENE_DEFAULT, Route17Route18GateBicycleCheck
db 0 ; bg events
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -68,34 +68,34 @@
closetext
end
-FisherScript_0x19ea4d:
+Route19Fisher1Script:
faceplayer
opentext
checkevent EVENT_CINNABAR_ROCKS_CLEARED
- iftrue UnknownScript_0x19ea5b
- writetext UnknownText_0x19ecaf
+ iftrue .RocksCleared
+ writetext Route19Fisher1Text
waitbutton
closetext
end
-UnknownScript_0x19ea5b:
- writetext UnknownText_0x19ed24
+.RocksCleared:
+ writetext Route19Fisher1Text_RocksCleared
waitbutton
closetext
end
-FisherScript_0x19ea61:
+Route19Fisher2Script:
faceplayer
opentext
checkevent EVENT_CINNABAR_ROCKS_CLEARED
iftrue .RocksCleared
- writetext Route19FisherText1
+ writetext Route19Fisher2Text
waitbutton
closetext
end
.RocksCleared:
- writetext Route19FisherText2
+ writetext Route19Fisher2Text_RocksCleared
waitbutton
closetext
end
@@ -185,7 +185,7 @@
cont "love the sea."
done
-UnknownText_0x19ecaf:
+Route19Fisher1Text:
text "Sorry. This road"
line "is closed for"
cont "construction."
@@ -197,18 +197,18 @@
line "from PALLET TOWN."
done
-UnknownText_0x19ed24:
+Route19Fisher1Text_RocksCleared:
text "I'm all sweaty."
line "Time for a swim!"
done
-Route19FisherText1:
+Route19Fisher2Text:
text "Who knows how long"
line "it would take to"
cont "move this boulder…"
done
-Route19FisherText2:
+Route19Fisher2Text_RocksCleared:
text "The roadwork is"
line "finally finished."
@@ -249,5 +249,5 @@
object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1
object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1
object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1
- object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1
- object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1
+ object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, Route19Fisher1Script, -1
+ object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, Route19Fisher2Script, -1
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -6,23 +6,23 @@
db 0 ; callbacks
-OfficerScript_0x1ab3f6:
+Route19FuchsiaGateOfficerScript:
faceplayer
opentext
checkevent EVENT_CINNABAR_ROCKS_CLEARED
iftrue .RocksCleared
- writetext UnknownText_0x1ab40a
+ writetext Route19FuchsiaGateOfficerText
waitbutton
closetext
end
.RocksCleared:
- writetext UnknownText_0x1ab48a
+ writetext Route19FuchsiaGateOfficerText_RocksCleared
waitbutton
closetext
end
-UnknownText_0x1ab40a:
+Route19FuchsiaGateOfficerText:
text "CINNABAR's volcano"
line "erupted."
@@ -35,7 +35,7 @@
cont "are safe…"
done
-UnknownText_0x1ab48a:
+Route19FuchsiaGateOfficerText_RocksCleared:
text "No CINNABAR citi-"
line "zens were injured"
@@ -57,4 +57,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
+ object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route19FuchsiaGateOfficerScript, -1
--- 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
@@ -64,7 +64,7 @@
Route2Elixer:
itemball ELIXER
-FruitTreeScript_0x1ac306:
+Route2FruitTree:
fruittree FRUITTREE_ROUTE_2
Route2HiddenMaxEther:
@@ -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
@@ -172,4 +172,4 @@
object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
- object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1
+ object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -6,7 +6,7 @@
db 0 ; callbacks
-RocketScript_0x1adbfa:
+Route24RocketScript:
faceplayer
playmusic MUSIC_ROCKET_ENCOUNTER
opentext
@@ -126,4 +126,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
+ object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route24RocketScript, EVENT_ROUTE_24_ROCKET
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -246,7 +246,7 @@
Route26Sign:
jumptext Route26SignText
-FruitTreeScript_0x1a4ec2:
+Route26FruitTree:
fruittree FRUITTREE_ROUTE_26
Route26MaxElixer:
@@ -430,5 +430,5 @@
object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1
object_event 13, 79, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1
object_event 10, 92, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1
- object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1
+ object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route26FruitTree, -1
object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -6,7 +6,7 @@
db 0 ; callbacks
-TeacherScript_0x7b125:
+Route26HealHouseTeacherScript:
faceplayer
opentext
writetext UnknownText_0x7b14d
@@ -60,4 +60,4 @@
bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf
db 1 ; object events
- object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
+ object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route26HealHouseTeacherScript, -1
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -22,17 +22,17 @@
.DummyScene1:
end
-UnknownScript_0x1a0873:
+FirstStepIntoKantoLeftScene:
turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
applymovement ROUTE27_FISHER, MovementData_0x1a0a66
- jump UnknownScript_0x1a088c
+ jump FirstStepIntoKantoScene_Continue
-UnknownScript_0x1a0881:
+FirstStepIntoKantoRightScene:
turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
applymovement ROUTE27_FISHER, MovementData_0x1a0a69
-UnknownScript_0x1a088c:
+FirstStepIntoKantoScene_Continue:
turnobject PLAYER, RIGHT
opentext
writetext Route27FisherHeyText
@@ -474,8 +474,8 @@
warp_event 36, 5, TOHJO_FALLS, 2
db 2 ; coord events
- coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873
- coord_event 19, 10, SCENE_DEFAULT, UnknownScript_0x1a0881
+ coord_event 18, 10, SCENE_DEFAULT, FirstStepIntoKantoLeftScene
+ coord_event 19, 10, SCENE_DEFAULT, FirstStepIntoKantoRightScene
db 1 ; bg events
bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -145,7 +145,7 @@
Route29FisherScript:
jumptextfaceplayer Route29FisherText
-CooltrainerMScript_0x1a1031:
+Route29CooltrainerMScript:
faceplayer
opentext
checktime DAY
@@ -153,13 +153,13 @@
checktime NITE
iftrue .nite
.day_morn
- writetext Text_WaitingForNight
+ writetext Route29CooltrainerMText_WaitingForNight
waitbutton
closetext
end
.nite
- writetext Text_WaitingForMorning
+ writetext Route29CooltrainerMText_WaitingForMorning
waitbutton
closetext
end
@@ -331,7 +331,7 @@
line "daytime."
done
-Text_WaitingForNight:
+Route29CooltrainerMText_WaitingForNight:
text "I'm waiting for"
line "#MON that"
@@ -339,7 +339,7 @@
line "night."
done
-Text_WaitingForMorning:
+Route29CooltrainerMText_WaitingForMorning:
text "I'm waiting for"
line "#MON that"
@@ -433,6 +433,6 @@
object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1
object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1
- object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1
+ object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29CooltrainerMScript, -1
object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -6,20 +6,20 @@
db 0 ; callbacks
-FisherScript_0x9b847:
+Route2NuggetHouseFisherScript:
faceplayer
opentext
checkevent EVENT_GOT_NUGGET_FROM_GUY
- iftrue .GotItem
- writetext UnknownText_0x9b865
+ iftrue .GotNugget
+ writetext Route2NuggetHouseFisherText
buttonsound
verbosegiveitem NUGGET
- iffalse .Done
+ iffalse .NoRoom
setevent EVENT_GOT_NUGGET_FROM_GUY
-.GotItem:
- writetext UnknownText_0x9b8e5
+.GotNugget:
+ writetext Route2NuggetHouseFisherText_GotNugget
waitbutton
-.Done:
+.NoRoom:
closetext
end
@@ -27,7 +27,7 @@
; unused
jumpstd difficultbookshelf
-UnknownText_0x9b865:
+Route2NuggetHouseFisherText:
text "Hi! Wow, I'm glad"
line "to see you."
@@ -40,7 +40,7 @@
cont "little present."
done
-UnknownText_0x9b8e5:
+Route2NuggetHouseFisherText_GotNugget:
text "That's a NUGGET."
para "I can't give you"
@@ -62,4 +62,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
+ object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2NuggetHouseFisherScript, -1
--- 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/Route32.asm
+++ b/maps/Route32.asm
@@ -541,8 +541,8 @@
line "CENTER."
done
-; might not be referenced anywhere
Route32CooltrainerMText_UnusedSproutTower:
+; unused
text "Have you gone to"
line "SPROUT TOWER?"
@@ -679,7 +679,7 @@
line "as you can, kid!"
done
-; --- start a segment of possibly unused texts
+; --- start a segment of unused text
Route32UnusedFisher1SeenText:
text "I keep catching"
@@ -720,7 +720,7 @@
line "#MON."
done
-; --- end a segment of possibly unused texts
+; --- end a segment of unused texts
FisherHenrySeenText:
text "My #MON?"
@@ -835,8 +835,8 @@
cont "in VIOLET CITY."
done
-; unused
Route32UnusedText:
+; unused
text "The fishermen"
line "yelled at me for"
cont "bugging them…"
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -8,34 +8,34 @@
db 0 ; callbacks
-NurseScript_0x69b52:
+Route32Pokecenter1FNurseScript:
jumpstd pokecenternurse
-FishingGuruScript_0x69b55:
+Route32Pokecenter1FFishingGuruScript:
faceplayer
opentext
checkevent EVENT_GOT_OLD_ROD
- iftrue UnknownScript_0x69b7a
- writetext UnknownText_0x69b83
+ iftrue .GotOldRod
+ writetext Route32Pokecenter1FFishingGuruText_Question
yesorno
- iffalse UnknownScript_0x69b74
- writetext UnknownText_0x69be8
+ iffalse .Refused
+ writetext Route32Pokecenter1FFishingGuruText_Yes
buttonsound
verbosegiveitem OLD_ROD
- writetext UnknownText_0x69c1b
+ writetext Route32Pokecenter1FFishingGuruText_GiveOldRod
waitbutton
closetext
setevent EVENT_GOT_OLD_ROD
end
-UnknownScript_0x69b74:
- writetext UnknownText_0x69c6c
+.Refused:
+ writetext Route32Pokecenter1FFishingGuruText_No
waitbutton
closetext
end
-UnknownScript_0x69b7a:
- writetext UnknownText_0x69c8d
+.GotOldRod:
+ writetext Route32Pokecenter1FFishingGuruText_After
waitbutton
closetext
end
@@ -43,7 +43,7 @@
Route32Pokecenter1FCooltrainerFScript:
jumptextfaceplayer Route32Pokecenter1FCooltrainerFText
-UnknownText_0x69b83:
+Route32Pokecenter1FFishingGuruText_Question:
text "This is a great"
line "fishing spot."
@@ -55,7 +55,7 @@
line "of my RODS?"
done
-UnknownText_0x69be8:
+Route32Pokecenter1FFishingGuruText_Yes:
text "Heh, that's good"
line "to hear."
@@ -63,7 +63,7 @@
line "angler too!"
done
-UnknownText_0x69c1b:
+Route32Pokecenter1FFishingGuruText_GiveOldRod:
text "Fishing is great!"
para "If there's water,"
@@ -73,12 +73,12 @@
line "your ROD."
done
-UnknownText_0x69c6c:
+Route32Pokecenter1FFishingGuruText_No:
text "Oh. That's rather"
line "disappointing…"
done
-UnknownText_0x69c8d:
+Route32Pokecenter1FFishingGuruText_After:
text "Yo, kid. How are"
line "they biting?"
done
@@ -105,6 +105,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1
- object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FNurseScript, -1
+ object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FFishingGuruScript, -1
object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -139,7 +139,7 @@
Route33Sign:
jumptext Route33SignText
-Route33FruitTreeScript:
+Route33FruitTree:
fruittree FRUITTREE_ROUTE_33
HikerAnthony2SeenText:
@@ -206,4 +206,4 @@
db 3 ; object events
object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
- object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
+ object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTree, -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/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -33,7 +33,7 @@
stopfollow
turnobject PLAYER, DOWN
opentext
- writetext UnknownText_0x62e41
+ writetext Route34IlexForestGateTeacher_ForestIsRestless
waitbutton
closetext
applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a
@@ -40,7 +40,7 @@
.skip:
end
-TeacherScript_0x62d63:
+Route34IlexForestGateTeacherScript:
faceplayer
opentext
checkevent EVENT_FOREST_IS_RESTLESS
@@ -47,13 +47,13 @@
iftrue .ForestIsRestless
checkevent EVENT_GOT_TM12_SWEET_SCENT
iftrue .GotSweetScent
- writetext UnknownText_0x62d9d
+ writetext Route34IlexForestGateTeacherText
buttonsound
verbosegiveitem TM_SWEET_SCENT
iffalse .NoRoom
setevent EVENT_GOT_TM12_SWEET_SCENT
.GotSweetScent:
- writetext UnknownText_0x62df6
+ writetext Route34IlexForestGateTeacher_GotSweetScent
waitbutton
.NoRoom:
closetext
@@ -60,14 +60,14 @@
end
.ForestIsRestless:
- writetext UnknownText_0x62e41
+ writetext Route34IlexForestGateTeacher_ForestIsRestless
buttonsound
closetext
end
-IlexGateButterfree:
+Route34IlexForestGateButterfreeScript:
opentext
- writetext UnknownText_0x62e83
+ writetext Route34IlexForestGateButterfreeText
cry BUTTERFREE
waitbutton
closetext
@@ -86,7 +86,7 @@
step RIGHT
step_end
-UnknownText_0x62d9d:
+Route34IlexForestGateTeacherText:
text "Oh, honey. You're"
line "making a #DEX?"
@@ -97,7 +97,7 @@
line "this TM."
done
-UnknownText_0x62df6:
+Route34IlexForestGateTeacher_GotSweetScent:
text "It's SWEET SCENT."
para "Use it wherever"
@@ -107,7 +107,7 @@
line "enticed by it."
done
-UnknownText_0x62e41:
+Route34IlexForestGateTeacher_ForestIsRestless:
text "Something's wrong"
line "in ILEX FOREST…"
@@ -115,7 +115,7 @@
line "away right now."
done
-UnknownText_0x62e83:
+Route34IlexForestGateButterfreeText:
text "BUTTERFREE: Freeh!"
done
@@ -148,7 +148,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
- object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1
+ object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
+ object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateButterfreeScript, -1
object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
- object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
+ object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -271,7 +271,7 @@
Route35TMRollout:
itemball TM_ROLLOUT
-FruitTreeScript_0x19ca7e:
+Route35FruitTree:
fruittree FRUITTREE_ROUTE_35
CamperIvanSeenText:
@@ -484,5 +484,5 @@
object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1
object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1
- object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
+ object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route35FruitTree, -1
object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-OfficerScript_0x69d37:
+RandyScript:
faceplayer
opentext
checkevent EVENT_GOT_HP_UP_FROM_RANDY
@@ -73,18 +73,18 @@
db 0
-PokefanFScript_0x69dc6:
+Route35GoldenrodGatePokefanFScript:
faceplayer
opentext
checkevent EVENT_FOUGHT_SUDOWOODO
- iftrue .aftersudowoodo
- writetext UnknownText_0x6a00a
+ iftrue .FoughtSudowoodo
+ writetext Route35GoldenrodGatePokefanFText
waitbutton
closetext
end
-.aftersudowoodo
- writetext UnknownText_0x6a09a
+.FoughtSudowoodo
+ writetext Route35GoldenrodGatePokefanFText_FoughtSudowoodo
waitbutton
closetext
end
@@ -159,7 +159,7 @@
cont "what'd I say?"
done
-UnknownText_0x6a00a:
+Route35GoldenrodGatePokefanFText:
text "A strange tree is"
line "blocking the road."
@@ -173,7 +173,7 @@
line "SQUIRTBOTTLE."
done
-UnknownText_0x6a09a:
+Route35GoldenrodGatePokefanFText_FoughtSudowoodo:
text "I like the #MON"
line "Lullaby they play"
cont "on the radio."
@@ -207,6 +207,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
- object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
+ object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RandyScript, -1
+ object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGatePokefanFScript, -1
object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -77,7 +77,7 @@
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47
end
-OfficerScript_0x6a204:
+Route35OfficerScriptContest:
checkcode VAR_WEEKDAY
ifequal SUNDAY, Route35NationalParkGate_NoContestToday
ifequal MONDAY, Route35NationalParkGate_NoContestToday
@@ -187,7 +187,7 @@
Route35NationalParkGate_NoContestToday:
jumptextfaceplayer UnknownText_0x6a894
-OfficerScript_0x6a2ca:
+Route35NationalParkGateOfficerScript:
faceplayer
opentext
checkflag ENGINE_DAILY_BUG_CONTEST
@@ -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,9 +447,9 @@
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
+ object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35OfficerScriptContest, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
- object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+ object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateOfficerScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -148,18 +148,18 @@
closetext
end
-LassScript_0x1940e0:
+Route36LassScript:
faceplayer
opentext
checkevent EVENT_FOUGHT_SUDOWOODO
iftrue .ClearedSudowoodo
- writetext UnknownText_0x194626
+ writetext Route36LassText
waitbutton
closetext
end
.ClearedSudowoodo:
- writetext UnknownText_0x19469e
+ writetext Route36LassText_ClearedSudowoodo
waitbutton
closetext
end
@@ -521,7 +521,7 @@
line "opened…"
done
-UnknownText_0x194626:
+Route36LassText:
text "An odd tree is"
line "blocking the way"
cont "to GOLDENROD CITY."
@@ -533,7 +533,7 @@
line "be done about it."
done
-UnknownText_0x19469e:
+Route36LassText_ClearedSudowoodo:
text "That odd tree dis-"
line "appeared without a"
cont "trace."
@@ -680,7 +680,7 @@
object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
- object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
+ object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36LassScript, -1
object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -289,7 +289,7 @@
_ContestNotOn:
jumptextfaceplayer UnknownText_0x6b370
-OfficerScript_0x6acf4:
+Route36NationalParkGateOfficerScript:
faceplayer
opentext
checkflag ENGINE_DAILY_BUG_CONTEST
@@ -303,7 +303,7 @@
jumpstd daytotext
end
-YoungsterScript_0x6ad06:
+BugCatchingContestant1BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -319,7 +319,7 @@
closetext
end
-YoungsterScript_0x6ad1a:
+BugCatchingContestant2BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -335,7 +335,7 @@
closetext
end
-RockerScript_0x6ad2e:
+BugCatchingContestant3BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -351,7 +351,7 @@
closetext
end
-PokefanMScript_0x6ad42:
+BugCatchingContestant4BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -367,7 +367,7 @@
closetext
end
-YoungsterScript_0x6ad56:
+BugCatchingContestant5BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -383,7 +383,7 @@
closetext
end
-YoungsterScript_0x6ad6a:
+BugCatchingContestant6BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -399,7 +399,7 @@
closetext
end
-LassScript_0x6ad7e:
+BugCatchingContestant7BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -415,7 +415,7 @@
closetext
end
-YoungsterScript_0x6ad92:
+BugCatchingContestant8BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -431,7 +431,7 @@
closetext
end
-YoungsterScript_0x6ada6:
+BugCatchingContestant9BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -447,7 +447,7 @@
closetext
end
-YoungsterScript_0x6adba:
+BugCatchingContestant10BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -463,8 +463,9 @@
closetext
end
-UnknownScript_0x6adce:
- jumptext UnknownText_0x6b84c
+UnusedBugCatchingContestExplanationSign:
+; duplicate of BugCatchingContestExplanationSign in Route35NationalParkGate.asm
+ jumptext UnusedBugCatchingContestExplanationText
MovementData_0x6add1:
big_step DOWN
@@ -794,10 +795,10 @@
line "win."
done
+UnusedSudowoodoText:
; This text is unused and unreferenced in the final game.
; The tree Pokémon is Sudowoodo.
; The Silph Scope 2 was later reworked into the Squirtbottle.
-UnusedSudowoodoText:
text "I hear there's a"
line "#MON that looks"
cont "just like a tree."
@@ -807,7 +808,8 @@
cont "SILPHSCOPE 2."
done
-UnknownText_0x6b84c:
+UnusedBugCatchingContestExplanationText:
+; duplicate of BugCatchingContestExplanationText in Route35NationalParkGate.asm
text "The Bug-Catching"
line "Contest is held on"
@@ -859,18 +861,18 @@
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
- object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
- object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
- object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
- object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
- object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
- object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
- object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
- object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
- object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
- object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
- object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+ object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1BScript, EVENT_BUG_CATCHING_CONTESTANT_1B
+ object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2BScript, EVENT_BUG_CATCHING_CONTESTANT_2B
+ object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant3BScript, EVENT_BUG_CATCHING_CONTESTANT_3B
+ object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant4BScript, EVENT_BUG_CATCHING_CONTESTANT_4B
+ object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant5BScript, EVENT_BUG_CATCHING_CONTESTANT_5B
+ object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant6BScript, EVENT_BUG_CATCHING_CONTESTANT_6B
+ object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant7BScript, EVENT_BUG_CATCHING_CONTESTANT_7B
+ object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant8BScript, EVENT_BUG_CATCHING_CONTESTANT_8B
+ object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant9BScript, EVENT_BUG_CATCHING_CONTESTANT_9B
+ object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant10BScript, EVENT_BUG_CATCHING_CONTESTANT_10B
+ object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36NationalParkGateOfficerScript, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -102,13 +102,13 @@
Route37Sign:
jumptext Route37SignText
-FruitTreeScript_0x1a8e09:
+Route37FruitTree1:
fruittree FRUITTREE_ROUTE_37_1
-FruitTreeScript_0x1a8e0b:
+Route37FruitTree2:
fruittree FRUITTREE_ROUTE_37_2
-FruitTreeScript_0x1a8e0d:
+Route37FruitTree3:
fruittree FRUITTREE_ROUTE_37_3
Route37HiddenEther:
@@ -250,7 +250,7 @@
object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
- object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1
+ object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree1, -1
object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
- object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1
- object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1
+ object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree2, -1
+ object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree3, -1
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -317,7 +317,7 @@
Route38TrainerTips:
jumptext Route38TrainerTipsText
-FruitTreeScript_0x1a1f33:
+Route38FruitTree:
fruittree FRUITTREE_ROUTE_38
BirdKeeperTobySeenText:
@@ -489,5 +489,5 @@
object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
- object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1
+ object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route38FruitTree, -1
object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -174,7 +174,7 @@
Route39TrainerTips:
jumptext Route39TrainerTipsText
-FruitTreeScript_0x1a5bf4:
+Route39FruitTree:
fruittree FRUITTREE_ROUTE_39
Route39HiddenNugget:
@@ -365,5 +365,5 @@
object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
- object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
+ object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39FruitTree, -1
object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-TwinScript_0x9cc76:
+Route39BarnTwin1Script:
faceplayer
opentext
checkevent EVENT_HEALED_MOOMOO
@@ -26,7 +26,7 @@
turnobject ROUTE39BARN_TWIN1, RIGHT
end
-TwinScript_0x9cc90:
+Route39BarnTwin2Script:
faceplayer
opentext
checkevent EVENT_HEALED_MOOMOO
@@ -198,6 +198,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1
- object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1
+ object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin1Script, -1
+ object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin2Script, -1
object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -76,13 +76,13 @@
Route40Lass1Script:
jumptextfaceplayer Route40Lass1Text
-PokefanMScript_0x1a61c7:
+Route40PokefanMScript:
special Mobile_DummyReturnFalse
iftrue .mobile
- jumptextfaceplayer UnknownText_0x1a646a
+ jumptextfaceplayer Route40PokefanMText
.mobile
- jumptextfaceplayer UnknownText_0x1a649b
+ jumptextfaceplayer Route40PokefanMText_Mobile
Route40Lass2Script:
jumptextfaceplayer Route40Lass2Text
@@ -241,7 +241,7 @@
line "the sea."
done
-UnknownText_0x1a646a:
+Route40PokefanMText:
text "Hm! There's a big"
line "building up ahead!"
@@ -248,7 +248,7 @@
para "What is it?"
done
-UnknownText_0x1a649b:
+Route40PokefanMText_Mobile:
text "Hm! Look at all"
line "those serious-"
cont "looking trainers"
@@ -357,6 +357,6 @@
object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1
object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
- object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1
+ object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40PokefanMScript, -1
object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -26,7 +26,7 @@
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
- applymovement ROUTE42_SUICUNE, MovementData_0x1a9356
+ applymovement ROUTE42_SUICUNE, Route42SuicuneMovement
disappear ROUTE42_SUICUNE
pause 10
setscene SCENE_ROUTE42_NOTHING
@@ -200,19 +200,19 @@
Route42SuperPotion:
itemball SUPER_POTION
-FruitTreeScript_0x1a934d:
+Route42FruitTree1:
fruittree FRUITTREE_ROUTE_42_1
-FruitTreeScript_0x1a934f:
+Route42FruitTree2:
fruittree FRUITTREE_ROUTE_42_2
-FruitTreeScript_0x1a9351:
+Route42FruitTree3:
fruittree FRUITTREE_ROUTE_42_3
Route42HiddenMaxPotion:
hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION
-MovementData_0x1a9356:
+Route42SuicuneMovement:
set_sliding
fast_jump_step UP
fast_jump_step UP
@@ -340,9 +340,9 @@
object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1
object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
- object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1
- object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1
- object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1
+ object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree1, -1
+ object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree2, -1
+ object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree3, -1
object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -316,7 +316,7 @@
Route43TrainerTips:
jumptext Route43TrainerTipsText
-FruitTreeScript_0x19d266:
+Route43FruitTree:
fruittree FRUITTREE_ROUTE_43
Route43MaxEther:
@@ -522,5 +522,5 @@
object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1
object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1
- object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
+ object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route43FruitTree, -1
object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -303,7 +303,7 @@
Route44Sign2:
jumptext Route44Sign2Text
-FruitTreeScript_0x19da40:
+Route44FruitTree:
fruittree FRUITTREE_ROUTE_44
Route44MaxRevive:
@@ -525,7 +525,7 @@
object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
object_event 41, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1
object_event 31, 14, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1
- object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
+ object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route44FruitTree, -1
object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -294,7 +294,7 @@
Route45Sign:
jumptext Route45SignText
-FruitTreeScript_0x19e294:
+Route45FruitTree:
fruittree FRUITTREE_ROUTE_45
Route45Nugget:
@@ -549,7 +549,7 @@
object_event 11, 50, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1
object_event 17, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1
object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
- object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1
+ object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route45FruitTree, -1
object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -162,10 +162,10 @@
Route46XSpeed:
itemball X_SPEED
-FruitTreeScript_0x1a978f:
+Route46FruitTree1:
fruittree FRUITTREE_ROUTE_46_1
-FruitTreeScript_0x1a9791:
+Route46FruitTree2:
fruittree FRUITTREE_ROUTE_46_2
HikerBaileySeenText:
@@ -265,6 +265,6 @@
object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
- object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
- object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
+ object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route46FruitTree1, -1
+ object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route46FruitTree2, -1
object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -72,7 +72,7 @@
Route8UndergroundPathSign:
jumptext Route8UndergroundPathSignText
-FruitTreeScript_0x6c06c:
+Route8FruitTree:
fruittree FRUITTREE_ROUTE_8
BikerDwayneSeenText:
@@ -189,4 +189,4 @@
object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1
object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1
object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1
- object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1
+ object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route8FruitTree, -1
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -45,7 +45,7 @@
closetext
end
-MapRuinsOfAlphAerodactylChamberSignpost2Script:
+RuinsOfAlphAerodactylChamberPuzzle:
refreshscreen
writebyte UNOWNPUZZLE_AERODACTYL
special UnownPuzzle
@@ -65,7 +65,7 @@
reloadmappart
playsound SFX_STRENGTH
earthquake 80
- applymovement PLAYER, MovementData_0x58e4d
+ applymovement PLAYER, RuinsOfAlphAerodactylChamberSkyfallTopMovement
playsound SFX_KINESIS
waitsfx
pause 20
@@ -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,42 +98,42 @@
.WallOpen:
opentext
- writetext UnknownText_0x58ea2
+ writetext RuinsOfAlphAerodactylChamberWallHoleText
waitbutton
closetext
end
-MovementData_0x58e4d:
+RuinsOfAlphAerodactylChamberSkyfallTopMovement:
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
@@ -66,7 +66,7 @@
reloadmappart
playsound SFX_STRENGTH
earthquake 80
- applymovement PLAYER, MovementData_0x58610
+ applymovement PLAYER, RuinsOfAlphHoOhChamberSkyfallTopMovement
playsound SFX_KINESIS
waitsfx
pause 20
@@ -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,42 +99,42 @@
.WallOpen:
opentext
- writetext UnknownText_0x58665
+ writetext RuinsOfAlphHoOhChamberWallHoleText
waitbutton
closetext
end
-MovementData_0x58610:
+RuinsOfAlphHoOhChamberSkyfallTopMovement:
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
@@ -73,7 +73,7 @@
reloadmappart
playsound SFX_STRENGTH
earthquake 80
- applymovement PLAYER, MovementData_0x587fe
+ applymovement PLAYER, RuinsOfAlphKabutoChamberSkyfallTopMovement
playsound SFX_KINESIS
waitsfx
pause 20
@@ -80,7 +80,7 @@
warpcheck
end
-ScientistScript_0x587a8:
+RuinsOfAlphKabutoChamberScientistScript:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
@@ -105,30 +105,30 @@
end
.AllUnownCaught:
- writetext UnknownText_0x594cb
+ writetext RuinsOfAlphResearchCenterScientist1Text_GotAllUnown
waitbutton
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,12 +136,12 @@
.WallOpen:
opentext
- writetext UnknownText_0x58afa
+ writetext RuinsOfAlphKabutoChamberWallHoleText
waitbutton
closetext
end
-MovementData_0x587fe:
+RuinsOfAlphKabutoChamberSkyfallTopMovement:
skyfall_top
step_end
@@ -200,8 +200,8 @@
cont "this wall here…"
done
+RuinsOfAlphKabutoChamberUnusedText:
; unused
-UnusedText_0x58a03:
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,13 +266,13 @@
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
- object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1
+ object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberScientistScript, -1
--- 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
@@ -66,7 +66,7 @@
reloadmappart
playsound SFX_STRENGTH
earthquake 80
- applymovement PLAYER, MovementData_0x58c8c
+ applymovement PLAYER, RuinsOfAlphOmanyteChamberSkyfallTopMovement
playsound SFX_KINESIS
waitsfx
pause 20
@@ -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,42 +99,42 @@
.WallOpen:
opentext
- writetext UnknownText_0x58ce1
+ writetext RuinsOfAlphOmanyteChamberWallHoleText
waitbutton
closetext
end
-MovementData_0x58c8c:
+RuinsOfAlphOmanyteChamberSkyfallTopMovement:
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/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -44,18 +44,18 @@
RuinsOfAlphOutsideScientistScene1:
turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP
turnobject PLAYER, DOWN
- jump UnknownScript_0x58044
+ jump RuinsOfAlphOutsideScientistSceneContinue
RuinsOfAlphOutsideScientistScene2:
turnobject RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
turnobject PLAYER, RIGHT
- jump UnknownScript_0x58044
+ jump RuinsOfAlphOutsideScientistSceneContinue
-ScientistScript_0x58043:
+RuinsOfAlphOutsideScientistScript:
faceplayer
-UnknownScript_0x58044:
+RuinsOfAlphOutsideScientistSceneContinue:
opentext
- writetext UnknownText_0x580c7
+ writetext RuinsOfAlphOutsideScientistText
waitbutton
closetext
playmusic MUSIC_SHOW_ME_AROUND
@@ -68,32 +68,32 @@
warpcheck
end
-FisherScript_0x58061:
+RuinsOfAlphOutsideFisherScript:
faceplayer
opentext
checkevent EVENT_TALKED_TO_RUINS_COWARD
iftrue .Next
setevent EVENT_TALKED_TO_RUINS_COWARD
- writetext UnknownText_0x583a4
+ writetext RuinsOfAlphOutsideFisherText1
buttonsound
.Next:
- writetext UnknownText_0x58420
+ writetext RuinsOfAlphOutsideFisherText2
waitbutton
closetext
end
-YoungsterScript_0x58076:
+RuinsOfAlphOutsideYoungster1Script:
faceplayer
opentext
- writetext UnknownText_0x58449
+ writetext RuinsOfAlphOutsideYoungster1Text
waitbutton
closetext
end
-YoungsterScript_0x5807e:
+RuinsOfAlphOutsideYoungster2Script:
faceplayer
opentext
- writetext UnknownText_0x5848e
+ writetext RuinsOfAlphOutsideYoungster2Text
waitbutton
closetext
turnobject RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
@@ -111,7 +111,7 @@
end
TrainerSuperNerdStan:
- trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script
+ trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, SuperNerdStanSeenText, SuperNerdStanBeatenText, 0, .Script
.Script:
endifjustbattled
@@ -121,14 +121,14 @@
closetext
end
-RuinsOfAlphOutsideSignpost0Script:
- jumptext UnknownText_0x58325
+RuinsOfAlphOutsideMysteryChamberSign:
+ jumptext RuinsOfAlphOutsideMysteryChamberSignText
-RuinsOfAlphOutsideSignpost1Script:
- jumptext UnknownText_0x58342
+RuinsOfAlphSign:
+ jumptext RuinsOfAlphSignText
-RuinsOfAlphOutsideSignpost2Script:
- jumptext UnknownText_0x58362
+RuinsOfAlphResearchCenterSign:
+ jumptext RuinsOfAlphResearchCenterSignText
MovementData_0x580ba:
step RIGHT
@@ -147,7 +147,7 @@
step UP
step_end
-UnknownText_0x580c7:
+RuinsOfAlphOutsideScientistText:
text "Hm? That's a #-"
line "DEX, isn't it?"
cont "May I see it?"
@@ -176,13 +176,13 @@
cont "DEX. Follow me."
done
-UnknownText_0x581e5:
+SuperNerdStanSeenText:
text "What do you want?"
line "I'm studying--"
cont "don't disturb me!"
done
-UnknownText_0x58217:
+SuperNerdStanBeatenText:
text "Sorry…"
line "I'm frustrated by"
@@ -221,17 +221,17 @@
line "here."
done
-UnknownText_0x58325:
+RuinsOfAlphOutsideMysteryChamberSignText:
text "MYSTERY STONE"
line "PANEL CHAMBER"
done
-UnknownText_0x58342:
+RuinsOfAlphSignText:
text "RUINS OF ALPH"
line "VISITORS WELCOME"
done
-UnknownText_0x58362:
+RuinsOfAlphResearchCenterSignText:
text "RUINS OF ALPH"
line "RESEARCH CENTER"
@@ -239,7 +239,7 @@
line "THE RUINS OF ALPH"
done
-UnknownText_0x583a4:
+RuinsOfAlphOutsideFisherText1:
text "While exploring"
line "the RUINS, we"
@@ -253,7 +253,7 @@
line "careful too."
done
-UnknownText_0x58420:
+RuinsOfAlphOutsideFisherText2:
text "The RUINS hide a"
line "huge secret!"
@@ -260,7 +260,7 @@
para "…I think…"
done
-UnknownText_0x58449:
+RuinsOfAlphOutsideYoungster1Text:
text "There are many"
line "kinds of UNOWN, so"
@@ -268,7 +268,7 @@
line "our secret codes."
done
-UnknownText_0x5848e:
+RuinsOfAlphOutsideYoungster2Text:
text "A… H… E… A… D…"
line "Hmm…"
@@ -299,13 +299,13 @@
coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene2
db 3 ; bg events
- bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
- bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script
- bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script
+ bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideMysteryChamberSign
+ bg_event 12, 16, BGEVENT_READ, RuinsOfAlphSign
+ bg_event 18, 12, BGEVENT_READ, RuinsOfAlphResearchCenterSign
db 5 ; object events
object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
- object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
- object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
- object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
- object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
+ object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideScientistScript, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
+ object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideFisherScript, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
+ object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideYoungster1Script, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
+ object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideYoungster2Script, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -40,16 +40,16 @@
pause 30
turnobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
opentext
- writetext UnknownText_0x59278
+ writetext RuinsOfAlphResearchCenterModifiedDexText
waitbutton
closetext
applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59274
opentext
- writetext UnknownText_0x592fa
+ writetext RuinsOfAlphResearchCenterDexUpgradedText
playsound SFX_ITEM
waitsfx
setflag ENGINE_UNOWN_DEX
- writetext UnknownText_0x59311
+ writetext RuinsOfAlphResearchCenterScientist3Text
waitbutton
closetext
applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276
@@ -57,23 +57,23 @@
special RestartMapMusic
end
-ScientistScript_0x591d1:
+RuinsOfAlphResearchCenterScientist3Script:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
ifequal NUM_UNOWN, .PrinterAvailable
- writetext UnknownText_0x59311
+ writetext RuinsOfAlphResearchCenterScientist3Text
waitbutton
closetext
end
.PrinterAvailable:
- writetext UnknownText_0x5935f
+ writetext RuinsOfAlphResearchCenterScientist3_PrinterAvailable
waitbutton
closetext
end
-ScientistScript_0x591e5:
+RuinsOfAlphResearchCenterScientist1Script:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
@@ -82,31 +82,31 @@
iftrue .GotUnownDex
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue .UnownAppeared
- writetext UnknownText_0x593ed
+ writetext RuinsOfAlphResearchCenterScientist1Text
waitbutton
closetext
end
.UnownAppeared:
- writetext UnknownText_0x59478
+ writetext RuinsOfAlphResearchCenterScientist1Text_UnownAppeared
waitbutton
closetext
end
.GotUnownDex:
- writetext UnknownText_0x59445
+ writetext RuinsOfAlphResearchCenterScientist1Text_GotUnownDex
waitbutton
closetext
end
.GotAllUnown:
- writetext UnknownText_0x594cb
+ writetext RuinsOfAlphResearchCenterScientist1Text_GotAllUnown
waitbutton
closetext
clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
end
-ScientistScript_0x59214:
+RuinsOfAlphResearchCenterScientist2Script:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
@@ -113,24 +113,24 @@
ifequal NUM_UNOWN, .GotAllUnown
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue .UnownAppeared
- writetext UnknownText_0x5954f
+ writetext RuinsOfAlphResearchCenterScientist2Text
waitbutton
closetext
end
.UnownAppeared:
- writetext UnknownText_0x595cb
+ writetext RuinsOfAlphResearchCenterScientist2Text_UnownAppeared
waitbutton
closetext
end
.GotAllUnown:
- writetext UnknownText_0x59769
+ writetext RuinsOfAlphResearchCenterScientist2Text_GotAllUnown
waitbutton
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 RuinsOfAlphResearchCenterComputerText
waitbutton
closetext
end
.GotAllUnown:
- writetext UnknownText_0x597d9
+ writetext RuinsOfAlphResearchCenterComputerText_GotAllUnown
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 RuinsOfAlphResearchCenterPrinterText_DoesntWork
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
@@ -188,7 +189,7 @@
step UP
step_end
-UnknownText_0x59278:
+RuinsOfAlphResearchCenterModifiedDexText:
text "Done!"
para "I modified your"
@@ -205,12 +206,12 @@
cont "they were caught."
done
-UnknownText_0x592fa:
+RuinsOfAlphResearchCenterDexUpgradedText:
text "<PLAYER>'s #DEX"
line "was upgraded."
done
-UnknownText_0x59311:
+RuinsOfAlphResearchCenterScientist3Text:
text "The UNOWN you"
line "catch will all be"
cont "recorded."
@@ -219,7 +220,7 @@
line "many kinds exist."
done
-UnknownText_0x5935f:
+RuinsOfAlphResearchCenterScientist3_PrinterAvailable:
text "You caught all the"
line "UNOWN variations?"
@@ -234,7 +235,7 @@
line "it anytime."
done
-UnknownText_0x593ed:
+RuinsOfAlphResearchCenterScientist1Text:
text "The RUINS are"
line "about 1500 years"
cont "old."
@@ -244,13 +245,13 @@
cont "built--or by whom."
done
-UnknownText_0x59445:
+RuinsOfAlphResearchCenterScientist1Text_GotUnownDex:
text "I wonder how many"
line "kinds of #MON"
cont "are in the RUINS?"
done
-UnknownText_0x59478:
+RuinsOfAlphResearchCenterScientist1Text_UnownAppeared:
text "#MON appeared"
line "in the RUINS?"
@@ -261,7 +262,7 @@
line "investigate this."
done
-UnknownText_0x594cb:
+RuinsOfAlphResearchCenterScientist1Text_GotAllUnown:
text "Our investigation,"
line "with your help, is"
@@ -275,7 +276,7 @@
line "#MON."
done
-UnknownText_0x5954f:
+RuinsOfAlphResearchCenterScientist2Text:
text "There are odd pat-"
line "terns drawn on the"
@@ -288,7 +289,7 @@
cont "of the RUINS."
done
-UnknownText_0x595cb:
+RuinsOfAlphResearchCenterScientist2Text_UnownAppeared:
text "The strange #-"
line "MON you saw in the"
cont "RUINS?"
@@ -306,8 +307,8 @@
cont "kinds of them…"
done
+RuinsOfAlphResearchCenterUnusedText1:
; unused
-UnusedText_0x59669:
text "We think something"
line "caused the cryptic"
@@ -318,8 +319,8 @@
line "studies on that."
done
+RuinsOfAlphResearchCenterUnusedText2:
; unused
-UnusedText_0x596d3:
text "According to my"
line "research…"
@@ -336,7 +337,7 @@
line "link…"
done
-UnknownText_0x59769:
+RuinsOfAlphResearchCenterScientist2Text_GotAllUnown:
text "Why did those"
line "ancient patterns"
@@ -347,7 +348,7 @@
line "deepens…"
done
-UnknownText_0x597b6:
+RuinsOfAlphResearchCenterComputerText:
text "RUINS OF ALPH"
para "Exploration"
@@ -354,7 +355,7 @@
line "Year 10"
done
-UnknownText_0x597d9:
+RuinsOfAlphResearchCenterComputerText_GotAllUnown:
text "Mystery #MON"
line "Name: UNOWN"
@@ -362,18 +363,18 @@
line "kinds found."
done
-UnknownText_0x5980e:
+RuinsOfAlphResearchCenterPrinterText_DoesntWork:
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,11 +401,11 @@
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
- object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
- object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
+ object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist1Script, -1
+ object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist2Script, -1
+ object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist3Script, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -18,34 +18,34 @@
setflag ENGINE_FLYPOINT_SAFFRON
return
-LassScript_0x19932a:
+SaffronCityLass1Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
- writetext UnknownText_0x19938d
+ iftrue .ReturnedMachinePart
+ writetext SaffronCityLass1Text
waitbutton
closetext
end
-.ReturnedPart:
- writetext UnknownText_0x19940d
+.ReturnedMachinePart:
+ writetext SaffronCityLass1Text_ReturnedMachinePart
waitbutton
closetext
end
-PokefanMScript_0x19933e:
+SaffronCityPokefanMScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
- writetext UnknownText_0x199460
+ iftrue .ReturnedMachinePart
+ writetext SaffronCityPokefanMText
waitbutton
closetext
end
-.ReturnedPart:
- writetext UnknownText_0x1994ae
+.ReturnedMachinePart:
+ writetext SaffronCityPokefanMText_ReturnedMachinePart
waitbutton
closetext
end
@@ -56,18 +56,18 @@
SaffronCityCooltrainerFScript:
jumptextfaceplayer SaffronCityCooltrainerFText
-FisherScript_0x199358:
+SaffronCityFisherScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
- writetext UnknownText_0x1995fc
+ iftrue .ReturnedMachinePart
+ writetext SaffronCityFisherText
waitbutton
closetext
end
-.ReturnedPart:
- writetext UnknownText_0x19964b
+.ReturnedMachinePart:
+ writetext SaffronCityFisherText_ReturnedMachinePart
waitbutton
closetext
end
@@ -78,8 +78,8 @@
SaffronCityYoungster2Script:
jumptextfaceplayer SaffronCityYoungster2Text
-SaffronCityLassScript:
- jumptextfaceplayer SaffronCityLassText
+SaffronCityLass2Script:
+ jumptextfaceplayer SaffronCityLass2Text
SaffronCitySign:
jumptext SaffronCitySignText
@@ -105,7 +105,7 @@
SaffronCityMartSign:
jumpstd martsign
-UnknownText_0x19938d:
+SaffronCityLass1Text:
text "A little girl who"
line "is an expert at"
@@ -119,7 +119,7 @@
line "It's confusing."
done
-UnknownText_0x19940d:
+SaffronCityLass1Text_ReturnedMachinePart:
text "The COPYCAT girl"
line "looked unhappy."
@@ -128,7 +128,7 @@
cont "DOLL--CLEFAIRY."
done
-UnknownText_0x199460:
+SaffronCityPokefanMText:
text "You came out from"
line "JOHTO?"
@@ -137,7 +137,7 @@
cont "TRAIN's running."
done
-UnknownText_0x1994ae:
+SaffronCityPokefanMText_ReturnedMachinePart:
text "You came out from"
line "JOHTO?"
@@ -173,7 +173,7 @@
line "that."
done
-UnknownText_0x1995fc:
+SaffronCityFisherText:
text "Chew… Chew…"
para "I hear there's big"
@@ -183,7 +183,7 @@
para "Chew… Chew…"
done
-UnknownText_0x19964b:
+SaffronCityFisherText_ReturnedMachinePart:
text "Chew… Chew…"
para "I hear there was"
@@ -213,7 +213,7 @@
line "over the place."
done
-SaffronCityLassText:
+SaffronCityLass2Text:
text "Our city was"
line "featured on a"
cont "radio program."
@@ -296,11 +296,11 @@
bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign
db 8 ; object events
- object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
- object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1
+ object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityLass1Script, -1
+ object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronCityPokefanMScript, -1
object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
object_event 20, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1
- object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1
+ object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityFisherScript, -1
object_event 15, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1
object_event 35, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1
- object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1
+ object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLass2Script, -1
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -11,7 +11,7 @@
db 0 ; callbacks
-SabrinaScript_0x189c2e:
+SaffronGymSabrinaScript:
faceplayer
opentext
checkflag ENGINE_MARSHBADGE
@@ -331,7 +331,7 @@
bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
db 6 ; object events
- object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
+ object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronGymSabrinaScript, -1
object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -13,7 +13,7 @@
.DummyScene:
end
-OfficerScript_0x18a81e:
+SaffronMagnetTrainStationOfficerScript:
faceplayer
opentext
checkevent EVENT_RESTORED_POWER_TO_KANTO
@@ -68,18 +68,18 @@
closetext
end
-GymGuyScript_0x18a875:
+SaffronMagnetTrainStationGymGuyScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x18a883
- writetext UnknownText_0x18a9ca
+ iftrue .ReturnedMachinePart
+ writetext SaffronMagnetTrainStationGymGuyText
waitbutton
closetext
end
-UnknownScript_0x18a883:
- writetext UnknownText_0x18aa61
+.ReturnedMachinePart:
+ writetext SaffronMagnetTrainStationGymGuyText_ReturnedMachinePart
waitbutton
closetext
end
@@ -164,7 +164,7 @@
line "again."
done
-UnknownText_0x18a9ca:
+SaffronMagnetTrainStationGymGuyText:
text "The MAGNET TRAIN"
line "is a super-modern"
@@ -180,7 +180,7 @@
cont "tricity…"
done
-UnknownText_0x18aa61:
+SaffronMagnetTrainStationGymGuyText_ReturnedMachinePart:
text "Whew…"
para "How many times"
@@ -228,7 +228,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
- object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
+ object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationOfficerScript, -1
+ object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuyScript, -1
object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x18a3bf:
+SaffronMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_SAFFRON
closetext
@@ -47,6 +47,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMartClerkScript, -1
object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -9,10 +9,10 @@
db 0 ; callbacks
-NurseScript_0x18a47d:
+SaffronPokecenter1FNurseScript:
jumpstd pokecenternurse
-TeacherScript_0x18a480:
+SaffronPokecenter1FTeacherScript:
special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x18a4a3
@@ -20,7 +20,7 @@
.mobile
jumptextfaceplayer UnknownText_0x18a532
-FisherScript_0x18a48c:
+SaffronPokecenter1FFisherScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
@@ -122,7 +122,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
- object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
- object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FNurseScript, -1
+ object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FTeacherScript, -1
+ object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FFisherScript, -1
object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -11,7 +11,7 @@
.DummyScene:
end
-BlaineScript_0x1ab4fb:
+SeafoamGymBlaineScript:
faceplayer
opentext
checkflag ENGINE_VOLCANOBADGE
@@ -166,5 +166,5 @@
db 0 ; bg events
db 2 ; object events
- object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1
+ object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SeafoamGymBlaineScript, -1
object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -7,23 +7,23 @@
db 0 ; callbacks
-SilphCoReceptionist:
+SilphCoReceptionistScript:
jumptextfaceplayer SilphCoReceptionistText
-OfficerScript_0x18abe8:
+SilphCoOfficerScript:
faceplayer
opentext
checkevent EVENT_GOT_UP_GRADE
- iftrue UnknownScript_0x18abfd
- writetext UnknownText_0x18ac36
+ iftrue .GotUpGrade
+ writetext SilphCoOfficerText
buttonsound
verbosegiveitem UP_GRADE
- iffalse UnknownScript_0x18ac01
+ iffalse .NoRoom
setevent EVENT_GOT_UP_GRADE
-UnknownScript_0x18abfd:
- writetext UnknownText_0x18aca8
+.GotUpGrade:
+ writetext SilphCoOfficerText_GotUpGrade
waitbutton
-UnknownScript_0x18ac01:
+.NoRoom:
closetext
end
@@ -33,7 +33,7 @@
cont "OFFICE BUILDING."
done
-UnknownText_0x18ac36:
+SilphCoOfficerText:
text "Only employees are"
line "permitted to go"
cont "upstairs."
@@ -45,7 +45,7 @@
line "little souvenir."
done
-UnknownText_0x18aca8:
+SilphCoOfficerText_GotUpGrade:
text "It's SILPH CO.'s"
line "latest product."
@@ -65,5 +65,5 @@
db 0 ; bg events
db 2 ; object events
- object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1
- object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1
+ object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionistScript, -1
+ object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoOfficerScript, -1
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -7,7 +7,7 @@
db 0 ; callbacks
-NurseScript_0x1ae59a:
+SilverCavePokecenter1FNurseScript:
jumpstd pokecenternurse
SilverCavePokecenter1FGrannyScript:
@@ -40,5 +40,5 @@
db 0 ; bg events
db 2 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FNurseScript, -1
object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -7,12 +7,12 @@
db 0 ; callbacks
-GymGuyScript_0x5ad0b:
+SlowpokeWellB2FGymGuyScript:
faceplayer
opentext
checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
iftrue .GotKingsRock
- writetext UnknownText_0x5ad2a
+ writetext SlowpokeWellB2FGymGuyText
buttonsound
verbosegiveitem KINGS_ROCK
iffalse .NoRoom
@@ -22,7 +22,7 @@
end
.GotKingsRock:
- writetext UnknownText_0x5adf2
+ writetext SlowpokeWellB2FGymGuyText_GotKingsRock
waitbutton
closetext
end
@@ -30,7 +30,7 @@
SlowpokeWellB2FTMRainDance:
itemball TM_RAIN_DANCE
-UnknownText_0x5ad2a:
+SlowpokeWellB2FGymGuyText:
text "I'm waiting to see"
line "SLOWPOKE's moment"
cont "of evolution."
@@ -50,7 +50,7 @@
cont "you."
done
-UnknownText_0x5adf2:
+SlowpokeWellB2FGymGuyText_GotKingsRock:
text "I'm going to be"
line "like SLOWPOKE."
@@ -70,5 +70,5 @@
db 0 ; bg events
db 2 ; object events
- object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
+ object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, SlowpokeWellB2FGymGuyScript, -1
object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -37,8 +37,8 @@
SproutTower1FParlyzHeal:
itemball PARLYZ_HEAL
-SproutTower1FBellsproutStatueScript:
- jumptext SproutTower1FBellsproutStatueText
+SproutTower1FStatue:
+ jumptext SproutTower1FStatueText
SageChowSeenText:
text "We stand guard in"
@@ -93,7 +93,7 @@
line "ing upstairs."
done
-SproutTower1FBellsproutStatueText:
+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, SproutTower1FBellsproutStatueScript
- bg_event 12, 15, BGEVENT_READ, SproutTower1FBellsproutStatueScript
+ 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
-SproutTower2FBellsproutStatueScript:
- jumptext SproutTower2FBellsproutStatueText
+SproutTower2FStatue:
+ jumptext SproutTower2FStatueText
SproutTower2FXAccuracy:
itemball X_ACCURACY
@@ -75,7 +75,7 @@
line "well enough."
done
-SproutTower2FBellsproutStatueText:
+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, SproutTower2FBellsproutStatueScript
+ 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
@@ -20,7 +20,7 @@
.DummyScene1:
end
-SproutTower3FRivalEvent:
+SproutTower3FRivalScene:
turnobject PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
@@ -123,11 +123,11 @@
closetext
end
-SproutTower3FBellsproutPaintingScript:
- jumptext SproutTower3FBellsproutPaintingText
+SproutTower3FPainting:
+ jumptext SproutTower3FPaintingText
-SproutTower3FBellsproutStatueScript:
- jumptext SproutTower3FBellsproutStatueText
+SproutTower3FStatue:
+ jumptext SproutTower3FStatueText
SproutTower3FPotion:
itemball POTION
@@ -314,13 +314,13 @@
line "on your journey."
done
-SproutTower3FBellsproutPaintingText:
+SproutTower3FPaintingText:
text "It's a powerful"
line "painting of a"
cont "BELLSPROUT."
done
-SproutTower3FBellsproutStatueText:
+SproutTower3FStatueText:
text "A #MON statue…"
para "It looks very"
@@ -334,15 +334,15 @@
warp_event 10, 14, SPROUT_TOWER_2F, 4
db 1 ; coord events
- coord_event 11, 9, SCENE_DEFAULT, SproutTower3FRivalEvent
+ coord_event 11, 9, SCENE_DEFAULT, SproutTower3FRivalScene
db 6 ; bg events
- bg_event 8, 1, BGEVENT_READ, SproutTower3FBellsproutStatueScript
- bg_event 11, 1, BGEVENT_READ, SproutTower3FBellsproutStatueScript
- bg_event 9, 0, BGEVENT_READ, SproutTower3FBellsproutPaintingScript
- bg_event 10, 0, BGEVENT_READ, SproutTower3FBellsproutPaintingScript
- bg_event 5, 15, BGEVENT_READ, SproutTower3FBellsproutStatueScript
- bg_event 14, 15, BGEVENT_READ, SproutTower3FBellsproutStatueScript
+ 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
-TeamRocketBaseB1FSecurityCameraScript:
- jumptext SecurityCameraText
+TeamRocketBaseB1FSecurityCamera:
+ jumptext TeamRocketBaseB1FSecurityCameraText
-TeamRocketBaseB1FRocketOathScript:
+TeamRocketBaseB1FBookshelf:
jumpstd teamrocketoath
-TeamRocketBaseB1FSwitchScript:
+TeamRocketBaseB1FSecretSwitch:
opentext
checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS
- iftrue .NoCameras
- writetext TeamRocketBaseB1FSecretSwitchBetterPressText
+ iftrue .SecretSwitchOff
+ writetext TeamRocketBaseB1FSecretSwitchText
playsound SFX_TALLY
waitbutton
closetext
@@ -522,8 +522,8 @@
setevent EVENT_SECURITY_CAMERA_5
end
-.NoCameras:
- writetext TeamRocketBaseB1FSwitchIsOffText
+.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
-TeamRocketBaseB1FSecretSwitchBetterPressText:
+TeamRocketBaseB1FSecretSwitchText:
text "A secret switch!"
line "Better press it."
done
-TeamRocketBaseB1FSwitchIsOffText:
+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, TeamRocketBaseB1FSwitchScript
- bg_event 24, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
- bg_event 6, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
- bg_event 8, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
- bg_event 22, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
- bg_event 24, 5, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
- bg_event 20, 11, BGEVENT_READ, TeamRocketBaseB1FRocketOathScript
- bg_event 21, 11, BGEVENT_READ, TeamRocketBaseB1FRocketOathScript
+ 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/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -45,16 +45,16 @@
changeblock 14, 12, $07 ; floor
return
-UnknownScript_0x6cf95:
+RocketBaseBossFLeft:
moveobject TEAMROCKETBASEB2F_LANCE, 9, 13
- jump UnknownScript_0x6cfac
+ jump RocketBaseBossFScript
-UnknownScript_0x6cf9c:
+RocketBaseBossFRight:
moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16
moveobject TEAMROCKETBASEB2F_ROCKET1, 21, 16
moveobject TEAMROCKETBASEB2F_DRAGON, 10, 13
moveobject TEAMROCKETBASEB2F_LANCE, 10, 13
-UnknownScript_0x6cfac:
+RocketBaseBossFScript:
appear TEAMROCKETBASEB2F_ROCKET_GIRL
appear TEAMROCKETBASEB2F_ROCKET1
opentext
@@ -140,11 +140,11 @@
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267
disappear TEAMROCKETBASEB2F_LANCE
-UnknownScript_0x6d075:
+RocketBaseCantLeaveScript:
applymovement PLAYER, MovementData_0x6d271
end
-UnknownScript_0x6d07a:
+RocketBaseLancesSideScript:
opentext
writetext UnknownText_0x6d7ea
waitbutton
@@ -235,7 +235,7 @@
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d28c
- jump UnknownScript_0x6d184
+ jump RocketBaseElectrodeScript
RocketElectrode2:
cry ELECTRODE
@@ -253,7 +253,7 @@
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d299
- jump UnknownScript_0x6d184
+ jump RocketBaseElectrodeScript
RocketElectrode3:
cry ELECTRODE
@@ -271,13 +271,13 @@
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d2a4
- jump UnknownScript_0x6d184
+ jump RocketBaseElectrodeScript
TeamRocketBaseB2FReloadMap:
reloadmapafterbattle
end
-UnknownScript_0x6d184:
+RocketBaseElectrodeScript:
moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
appear TEAMROCKETBASEB2F_LANCE
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
@@ -919,13 +919,13 @@
db 9 ; coord events
coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2
- coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf95
- coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf9c
- coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
- coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
- coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
- coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
- coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
+ coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFLeft
+ coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFRight
+ coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseCantLeaveScript
+ coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseCantLeaveScript
+ coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
+ coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
+ coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
db 23 ; bg events
bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -84,13 +84,13 @@
TeamRocketBaseB3FRocketScript:
jumptextfaceplayer TeamRocketBaseB3FRocketText
-UnknownScript_0x6e04b:
+RocketBaseBossLeft:
applymovement PLAYER, MovementData_0x6e133
- jump UnknownScript_0x6e056
+ jump RocketBaseBoss
-UnknownScript_0x6e052:
+RocketBaseBossRight:
applymovement PLAYER, MovementData_0x6e13a
-UnknownScript_0x6e056:
+RocketBaseBoss:
pause 30
showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -573,8 +573,8 @@
warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5
db 3 ; coord events
- coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b
- coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052
+ coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, RocketBaseBossLeft
+ coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, RocketBaseBossRight
coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival
db 10 ; bg 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/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -9,13 +9,13 @@
TinTower9FHPUp:
itemball HP_UP
-; unused
TinTower9FUnusedHoOhText:
+; unused
text "HO-OH: Shaoooh!"
done
-; unused
TinTower9FUnusedLugiaText:
+; unused
text "LUGIA: Gyaaan!"
done
--- 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/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -81,8 +81,9 @@
UnionCave1FAwakening:
itemball AWAKENING
-UnknownScript_0x59c08:
- jumptext UnknownText_0x59f29
+UnionCave1FUnusedSign:
+; unused
+ jumptext UnionCave1FUnusedSignText
HikerRussellSeenText:
text "You're headed to"
@@ -193,7 +194,7 @@
cont "up this cave."
done
-UnknownText_0x59f29:
+UnionCave1FUnusedSignText:
text "UNION CAVE"
done
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -41,13 +41,13 @@
VermilionSnorlax:
opentext
special SnorlaxAwake
- iftrue UnknownScript_0x1aa9ab
+ iftrue .Awake
writetext UnknownText_0x1aab64
waitbutton
closetext
end
-UnknownScript_0x1aa9ab:
+.Awake:
writetext UnknownText_0x1aab84
pause 15
cry SNORLAX
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -10,7 +10,7 @@
db 0 ; callbacks
-SurgeScript_0x1920a5:
+VermilionGymSurgeScript:
faceplayer
opentext
checkflag ENGINE_THUNDERBADGE
@@ -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,26 +268,26 @@
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
db 5 ; object events
- object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1
+ object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VermilionGymSurgeScript, -1
object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x191f7e:
+VermilionMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_VERMILION
closetext
@@ -46,6 +46,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMartClerkScript, -1
object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -9,21 +9,21 @@
db 0 ; callbacks
-NurseScript_0x191603:
+VermilionPokecenter1FNurseScript:
jumpstd pokecenternurse
-FishingGuruScript_0x191606:
+VermilionPokecenter1FFishingGuruScript:
faceplayer
opentext
checkevent EVENT_FOUGHT_SNORLAX
- iftrue UnknownScript_0x191614
- writetext UnknownText_0x191620
+ iftrue .FoughtSnorlax
+ writetext VermilionPokecenter1FFishingGuruText
waitbutton
closetext
end
-UnknownScript_0x191614:
- writetext UnknownText_0x191698
+.FoughtSnorlax:
+ writetext VermilionPokecenter1FFishingGuruText_FoughtSnorlax
waitbutton
closetext
end
@@ -34,7 +34,7 @@
VermilionPokecenter1FBugCatcherScript:
jumptextfaceplayer VermilionPokecenter1FBugCatcherText
-UnknownText_0x191620:
+VermilionPokecenter1FFishingGuruText:
text "A sleeping #MON"
line "is lying in front"
cont "of DIGLETT'S CAVE."
@@ -46,7 +46,7 @@
line "wake it up?"
done
-UnknownText_0x191698:
+VermilionPokecenter1FFishingGuruText_FoughtSnorlax:
text "There used to be a"
line "sleeping #MON"
@@ -87,7 +87,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1
- object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FNurseScript, -1
+ object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FFishingGuruScript, -1
object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -35,7 +35,7 @@
blackoutmod VERMILION_CITY
end
-VermilionPortSailorAtGangway:
+VermilionPortSailorAtGangwayScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -102,7 +102,7 @@
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74ef8
- jump VermilionPortSailorAtGangway
+ jump VermilionPortSailorAtGangwayScript
.NoTicket:
writetext UnknownText_0x74ff2
@@ -141,7 +141,7 @@
applymovement PLAYER, MovementData_0x74ef5
end
-SailorScript_0x74e97:
+VermilionPortSailorScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -164,7 +164,7 @@
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74efe
- jump VermilionPortSailorAtGangway
+ jump VermilionPortSailorAtGangwayScript
.NoTicket:
writetext UnknownText_0x74ff2
@@ -184,7 +184,7 @@
closetext
end
-SuperNerdScript_0x74ee6:
+VermilionPortSuperNerdScript:
faceplayer
opentext
writetext UnknownText_0x750a6
@@ -310,6 +310,6 @@
bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
db 3 ; object events
- object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangway, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
- object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
- object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1
+ object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangwayScript, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
+ object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorScript, -1
+ object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSuperNerdScript, -1
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -92,7 +92,7 @@
VioletCityRareCandy:
itemball RARE_CANDY
-VioletCityFruitTreeScript:
+VioletCityFruitTree:
fruittree FRUITTREE_VIOLET_CITY
VioletCityHiddenHyperPotion:
@@ -307,6 +307,6 @@
object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1
object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1
object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1
- object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1
+ object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTree, -1
object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-FalknerScript_0x683c2:
+VioletGymFalknerScript:
faceplayer
opentext
checkevent EVENT_BEAT_FALKNER
@@ -293,7 +293,7 @@
bg_event 6, 13, BGEVENT_READ, VioletGymStatue
db 4 ; object events
- object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
+ object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletGymFalknerScript, -1
object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x68295:
+VioletMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_VIOLET
closetext
@@ -58,6 +58,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartClerkScript, -1
object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -14,10 +14,10 @@
VioletNicknameSpeechHouseLassScript:
jumptextfaceplayer VioletNicknameSpeechHouseLassText
-BirdScript_0x693ef:
+VioletNicknameSpeechHouseBirdScript:
faceplayer
opentext
- writetext UnknownText_0x6947c
+ writetext VioletNicknameSpeechHouseBirdText
cry PIDGEY
waitbutton
closetext
@@ -38,7 +38,7 @@
line "STRAWBERRY!"
done
-UnknownText_0x6947c:
+VioletNicknameSpeechHouseBirdText:
text "STRAWBERRY: Pijji!"
done
@@ -56,4 +56,4 @@
db 3 ; object events
object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
- object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1
+ object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseBirdScript, -1
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-ClerkScript_0x9b5e7:
+ViridianMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_VIRIDIAN
closetext
@@ -46,6 +46,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartClerkScript, -1
object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -9,21 +9,21 @@
db 0 ; callbacks
-NurseScript_0x9b690:
+ViridianPokecenter1FNurseScript:
jumpstd pokecenternurse
-CooltrainerMScript_0x9b693:
+ViridianPokecenter1FCooltrainerMScript:
faceplayer
opentext
checkevent EVENT_BLUE_IN_CINNABAR
iftrue .BlueReturned
- writetext UnknownText_0x9b6ad
+ writetext ViridianPokecenter1FCooltrainerMText
waitbutton
closetext
end
.BlueReturned:
- writetext UnknownText_0x9b6f5
+ writetext ViridianPokecenter1FCooltrainerMText_BlueReturned
waitbutton
closetext
end
@@ -34,7 +34,7 @@
ViridianPokecenter1FBugCatcherScript:
jumptextfaceplayer ViridianPokecenter1FBugCatcherText
-UnknownText_0x9b6ad:
+ViridianPokecenter1FCooltrainerMText:
text "Where in the world"
line "is VIRIDIAN's GYM"
@@ -42,7 +42,7 @@
line "to challenge him."
done
-UnknownText_0x9b6f5:
+ViridianPokecenter1FCooltrainerMText_BlueReturned:
text "There are no GYM"
line "TRAINERS at the"
cont "VIRIDIAN GYM."
@@ -82,7 +82,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1
- object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FNurseScript, -1
+ object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerMScript, -1
object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -50,7 +50,7 @@
WiseTriosRoomSage3Script:
jumptextfaceplayer WiseTriosRoomSage3Text
-UnknownScript_0x985a3:
+WiseTriosRoom_CannotEnterTinTowerScript:
turnobject WISETRIOSROOM_SAGE3, UP
turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20
@@ -91,7 +91,7 @@
.Script:
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
- iftrue UnknownScript_0x9861b
+ iftrue .KojiAllowsPassage
pause 10
showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE6, 20
opentext
@@ -106,7 +106,7 @@
setscene SCENE_FINISHED
end
-UnknownScript_0x9861b:
+.KojiAllowsPassage:
opentext
writetext UnknownText_0x98db5
waitbutton
@@ -351,7 +351,7 @@
warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5
db 1 ; coord events
- coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3
+ coord_event 7, 4, SCENE_DEFAULT, WiseTriosRoom_CannotEnterTinTowerScript
db 0 ; bg events