summaryrefslogtreecommitdiff
path: root/data/maps/PokemonTower_2F
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-16 13:05:26 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-16 13:05:26 -0500
commitfba3fc738ab42b938ebfc02fc88cbc88e7686590 (patch)
tree9b93a90ecace9ffd9df8dc14bb2d6314ade6b163 /data/maps/PokemonTower_2F
parentfad367402892e1c25634c4448936d84a621c341c (diff)
Document Pokemon Tower scripts
Diffstat (limited to 'data/maps/PokemonTower_2F')
-rw-r--r--data/maps/PokemonTower_2F/map.json6
-rw-r--r--data/maps/PokemonTower_2F/scripts.inc60
-rw-r--r--data/maps/PokemonTower_2F/text.inc10
3 files changed, 38 insertions, 38 deletions
diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json
index a5d1e6178..d25fb4c30 100644
--- a/data/maps/PokemonTower_2F/map.json
+++ b/data/maps/PokemonTower_2F/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PokemonTower_2F_EventScript_163286",
+ "script": "PokemonTower_2F_EventScript_Channeler",
"flag": "0"
}
],
@@ -64,7 +64,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_POKEMON_TOWER_2F",
"var_value": 0,
- "script": "PokemonTower_2F_EventScript_16328F"
+ "script": "PokemonTower_2F_EventScript_RivalTriggerRight"
},
{
"type": "trigger",
@@ -73,7 +73,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_POKEMON_TOWER_2F",
"var_value": 0,
- "script": "PokemonTower_2F_EventScript_16329B"
+ "script": "PokemonTower_2F_EventScript_RivalTriggerDown"
}
],
"bg_events": []
diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc
index 7180936fb..0042290c1 100644
--- a/data/maps/PokemonTower_2F/scripts.inc
+++ b/data/maps/PokemonTower_2F/scripts.inc
@@ -1,48 +1,48 @@
PokemonTower_2F_MapScripts:: @ 8163285
.byte 0
-PokemonTower_2F_EventScript_163286:: @ 8163286
- msgbox gUnknown_8179EAE, MSGBOX_NPC
+PokemonTower_2F_EventScript_Channeler:: @ 8163286
+ msgbox PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts, MSGBOX_NPC
end
-PokemonTower_2F_EventScript_16328F:: @ 816328F
+PokemonTower_2F_EventScript_RivalTriggerRight:: @ 816328F
lockall
setvar VAR_TEMP_1, 0
- goto EventScript_1632A7
+ goto PokemonTower_2F_EventScript_Rival
end
-PokemonTower_2F_EventScript_16329B:: @ 816329B
+PokemonTower_2F_EventScript_RivalTriggerDown:: @ 816329B
lockall
setvar VAR_TEMP_1, 1
- goto EventScript_1632A7
+ goto PokemonTower_2F_EventScript_Rival
end
-EventScript_1632A7:: @ 81632A7
+PokemonTower_2F_EventScript_Rival:: @ 81632A7
textcolor 0
playbgm MUS_RIVAL1, 0
compare VAR_TEMP_1, 0
- call_if_eq EventScript_163339
+ call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight
compare VAR_TEMP_1, 1
- call_if_eq EventScript_16334B
+ call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerDown
applymovement 1, Movement_ExclamationMark
waitmovement 0
applymovement 1, Movement_Delay48
waitmovement 0
- msgbox gUnknown_8179CFF
+ msgbox PokemonTower_2F_Text_RivalIntro
setvar VAR_LAST_TALKED, 1
compare VAR_STARTER_MON, 2
- call_if_eq EventScript_16335D
+ call_if_eq PokemonTower_2F_EventScript_RivalSquirtle
compare VAR_STARTER_MON, 1
- call_if_eq EventScript_163368
+ call_if_eq PokemonTower_2F_EventScript_RivalBulbasaur
compare VAR_STARTER_MON, 0
- call_if_eq EventScript_163373
- msgbox gUnknown_8179DD4
+ call_if_eq PokemonTower_2F_EventScript_RivalCharmander
+ msgbox PokemonTower_2F_Text_RivalPostBattle
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0
- call_if_eq EventScript_16337E
+ call_if_eq PokemonTower_2F_EventScript_RivalExitRight
compare VAR_TEMP_1, 1
- call_if_eq EventScript_163389
+ call_if_eq PokemonTower_2F_EventScript_RivalExitDown
playse SE_KAIDAN
delay 25
fadedefaultbgm
@@ -51,41 +51,41 @@ EventScript_1632A7:: @ 81632A7
releaseall
end
-EventScript_163339:: @ 8163339
+PokemonTower_2F_EventScript_RivalFacePlayerRight:: @ 8163339
applymovement 1, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
-EventScript_16334B:: @ 816334B
+PokemonTower_2F_EventScript_RivalFacePlayerDown:: @ 816334B
applymovement 1, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
-EventScript_16335D:: @ 816335D
- trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, Text_179D73
+PokemonTower_2F_EventScript_RivalSquirtle:: @ 816335D
+ trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, PokemonTower_2F_Text_RivalDefeat
return
-EventScript_163368:: @ 8163368
- trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, Text_179D73
+PokemonTower_2F_EventScript_RivalBulbasaur:: @ 8163368
+ trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, PokemonTower_2F_Text_RivalDefeat
return
-EventScript_163373:: @ 8163373
- trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, Text_179D73
+PokemonTower_2F_EventScript_RivalCharmander:: @ 8163373
+ trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, PokemonTower_2F_Text_RivalDefeat
return
-EventScript_16337E:: @ 816337E
- applymovement 1, Movement_163394
+PokemonTower_2F_EventScript_RivalExitRight:: @ 816337E
+ applymovement 1, PokemonTower_2F_Movement_RivalExitRight
waitmovement 0
return
-EventScript_163389:: @ 8163389
- applymovement 1, Movement_16339D
+PokemonTower_2F_EventScript_RivalExitDown:: @ 8163389
+ applymovement 1, PokemonTower_2F_Movement_RivalExitDown
waitmovement 0
return
-Movement_163394:: @ 8163394
+PokemonTower_2F_Movement_RivalExitRight:: @ 8163394
walk_down
walk_right
walk_right
@@ -96,7 +96,7 @@ Movement_163394:: @ 8163394
walk_in_place_fastest_right
step_end
-Movement_16339D:: @ 816339D
+PokemonTower_2F_Movement_RivalExitDown:: @ 816339D
walk_right
walk_right
walk_down
diff --git a/data/maps/PokemonTower_2F/text.inc b/data/maps/PokemonTower_2F/text.inc
index b45235d7d..d75695980 100644
--- a/data/maps/PokemonTower_2F/text.inc
+++ b/data/maps/PokemonTower_2F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8179CFF:: @ 8179CFF
+PokemonTower_2F_Text_RivalIntro:: @ 8179CFF
.string "{RIVAL}: Hey, {PLAYER}!\n"
.string "What brings you here?\l"
.string "Is your POKéMON dead?\p"
@@ -6,18 +6,18 @@ gUnknown_8179CFF:: @ 8179CFF
.string "I can at least make them faint!\n"
.string "Let's go!$"
-Text_179D73:: @ 8179D73
+PokemonTower_2F_Text_RivalDefeat:: @ 8179D73
.string "What?\n"
.string "You stinker!\p"
.string "I took it easy on you, too!$"
-Text_179DA2:: @ 8179DA2
+PokemonTower_2F_Text_179DA2:: @ 8179DA2
.string "{RIVAL}“あーあ‥!\n"
.string "ほんとに くたばっちまったぞ!\l"
.string "よわいなー!\l"
.string "もっと ちゃんと そだてて やれよ$"
-gUnknown_8179DD4:: @ 8179DD4
+PokemonTower_2F_Text_RivalPostBattle:: @ 8179DD4
.string "How's your POKéDEX coming?\n"
.string "I just caught a CUBONE!\p"
.string "I can't find the bigger MAROWAK.\n"
@@ -28,7 +28,7 @@ gUnknown_8179DD4:: @ 8179DD4
.string "unlike you.\p"
.string "Smell ya later!$"
-gUnknown_8179EAE:: @ 8179EAE
+PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts:: @ 8179EAE
.string "Even we could not identify the\n"
.string "wayward ghosts.\p"
.string "A SILPH SCOPE might be able to\n"