summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity_House3
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-05 14:05:29 -0500
committerhuderlem <huderlem@gmail.com>2019-11-05 16:43:57 -0600
commitd9da932dadef1ffc59a524376c8f06bcd9d12598 (patch)
tree7b0292ffdd13a7a3dce36d4b27ca5596420a7fb8 /data/maps/RustboroCity_House3
parent1d421f2f71275a6ded7622d863c20fa591851fc3 (diff)
Document Rustboro scripts
Diffstat (limited to 'data/maps/RustboroCity_House3')
-rw-r--r--data/maps/RustboroCity_House3/map.json6
-rw-r--r--data/maps/RustboroCity_House3/scripts.inc19
2 files changed, 13 insertions, 12 deletions
diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json
index 50b5f1295..66fa98833 100644
--- a/data/maps/RustboroCity_House3/map.json
+++ b/data/maps/RustboroCity_House3/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_House3_EventScript_216191",
+ "script": "RustboroCity_House3_EventScript_OldMan",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_House3_EventScript_21619A",
+ "script": "RustboroCity_House3_EventScript_OldWoman",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_House3_EventScript_2161A3",
+ "script": "RustboroCity_House3_EventScript_Pekachu",
"flag": "0"
}
],
diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc
index 04992fbba..d55166e67 100644
--- a/data/maps/RustboroCity_House3/scripts.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
@@ -1,36 +1,37 @@
RustboroCity_House3_MapScripts:: @ 8216190
.byte 0
-RustboroCity_House3_EventScript_216191:: @ 8216191
- msgbox RustboroCity_House3_Text_2161B6, MSGBOX_NPC
+RustboroCity_House3_EventScript_OldMan:: @ 8216191
+ msgbox RustboroCity_House3_Text_IGivePerfectlySuitedNicknames, MSGBOX_NPC
end
-RustboroCity_House3_EventScript_21619A:: @ 821619A
- msgbox RustboroCity_House3_Text_21622A, MSGBOX_NPC
+RustboroCity_House3_EventScript_OldWoman:: @ 821619A
+ msgbox RustboroCity_House3_Text_NamingPikachuPekachu, MSGBOX_NPC
end
-RustboroCity_House3_EventScript_2161A3:: @ 82161A3
+@ Misspelling on purpose, see nickname
+RustboroCity_House3_EventScript_Pekachu:: @ 82161A3
lock
faceplayer
waitse
playmoncry SPECIES_PIKACHU, 0
- msgbox RustboroCity_House3_Text_2162AB, MSGBOX_DEFAULT
+ msgbox RustboroCity_House3_Text_Pekachu, MSGBOX_DEFAULT
waitmoncry
release
end
-RustboroCity_House3_Text_2161B6: @ 82161B6
+RustboroCity_House3_Text_IGivePerfectlySuitedNicknames: @ 82161B6
.string "For my own POKéMON, I give them\n"
.string "perfectly suited nicknames!\p"
.string "It's my expression of, uh…\n"
.string "originality, yes, that's it!$"
-RustboroCity_House3_Text_21622A: @ 821622A
+RustboroCity_House3_Text_NamingPikachuPekachu: @ 821622A
.string "But giving the name PEKACHU to\n"
.string "a PIKACHU? It seems pointless.\p"
.string "I suppose it is good to use a name\n"
.string "that's easy to understand, but…$"
-RustboroCity_House3_Text_2162AB: @ 82162AB
+RustboroCity_House3_Text_Pekachu: @ 82162AB
.string "PEKACHU: Peka!$"