summaryrefslogtreecommitdiff
path: root/data/maps/PokemonTower_7F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/PokemonTower_7F')
-rw-r--r--data/maps/PokemonTower_7F/map.json8
-rw-r--r--data/maps/PokemonTower_7F/scripts.inc130
-rw-r--r--data/maps/PokemonTower_7F/text.inc20
3 files changed, 79 insertions, 79 deletions
diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json
index f05d1f87c..9524a236b 100644
--- a/data/maps/PokemonTower_7F/map.json
+++ b/data/maps/PokemonTower_7F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PokemonTower_7F_EventScript_16355A",
+ "script": "PokemonTower_7F_EventScript_MrFuji",
"flag": "FLAG_HIDE_TOWER_FUJI"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "PokemonTower_7F_EventScript_163586",
+ "script": "PokemonTower_7F_EventScript_Grunt1",
"flag": "FLAG_HIDE_TOWER_ROCKET_1"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "PokemonTower_7F_EventScript_16363D",
+ "script": "PokemonTower_7F_EventScript_Grunt2",
"flag": "FLAG_HIDE_TOWER_ROCKET_2"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "PokemonTower_7F_EventScript_1636D6",
+ "script": "PokemonTower_7F_EventScript_Grunt3",
"flag": "FLAG_HIDE_TOWER_ROCKET_3"
}
],
diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc
index 9f7986523..7b0d5f37a 100644
--- a/data/maps/PokemonTower_7F/scripts.inc
+++ b/data/maps/PokemonTower_7F/scripts.inc
@@ -1,66 +1,66 @@
PokemonTower_7F_MapScripts:: @ 8163559
.byte 0
-PokemonTower_7F_EventScript_16355A:: @ 816355A
+PokemonTower_7F_EventScript_MrFuji:: @ 816355A
lock
faceplayer
famechecker FAMECHECKER_MRFUJI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
setflag FLAG_HIDE_TOWER_FUJI
clearflag FLAG_HIDE_POKEHOUSE_FUJI
setflag FLAG_RESCUED_MR_FUJI
- msgbox gUnknown_817A529
+ msgbox PokemonTower_7F_Text_MrFujiThankYouFollowMe
closemessage
warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7
waitstate
release
end
-PokemonTower_7F_EventScript_163586:: @ 8163586
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1
- msgbox gUnknown_817A3AF, MSGBOX_AUTOCLOSE
+PokemonTower_7F_EventScript_Grunt1:: @ 8163586
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, PokemonTower_7F_Text_Grunt1Intro, PokemonTower_7F_Text_Grunt1Defeat, PokemonTower_7F_EventScript_DefeatedGrunt1
+ msgbox PokemonTower_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1635A1:: @ 81635A1
- msgbox gUnknown_817A3AF
+PokemonTower_7F_EventScript_DefeatedGrunt1:: @ 81635A1
+ msgbox PokemonTower_7F_Text_Grunt1PostBattle
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 10
- goto_if_eq EventScript_1635E0
+ goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitMid
compare VAR_0x8004, 11
- goto_if_eq EventScript_1635F0
+ goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitRight
compare VAR_0x8004, 9
- goto_if_eq EventScript_163600
- applymovement 2, Movement_16362C
+ goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitLeft
+ applymovement 2, PokemonTower_7F_Movement_Grunt1Exit
waitmovement 0
- goto EventScript_163616
+ goto PokemonTower_7F_EventScript_RemoveGrunt1
end
-EventScript_1635E0:: @ 81635E0
- applymovement 2, Movement_16361B
+PokemonTower_7F_EventScript_Grunt1ExitMid:: @ 81635E0
+ applymovement 2, PokemonTower_7F_Movement_Grunt1ExitMid
waitmovement 0
- goto EventScript_163616
+ goto PokemonTower_7F_EventScript_RemoveGrunt1
end
-EventScript_1635F0:: @ 81635F0
- applymovement 2, Movement_163624
+PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0
+ applymovement 2, PokemonTower_7F_Movement_Grunt1ExitRight
waitmovement 0
- goto EventScript_163616
+ goto PokemonTower_7F_EventScript_RemoveGrunt1
end
-EventScript_163600:: @ 8163600
- applymovement 2, Movement_163633
+PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600
+ applymovement 2, PokemonTower_7F_Movement_Grunt1ExitLeft
waitmovement 0
playse SE_KAIDAN
delay 25
- goto EventScript_163616
+ goto PokemonTower_7F_EventScript_RemoveGrunt1
end
-EventScript_163616:: @ 8163616
+PokemonTower_7F_EventScript_RemoveGrunt1:: @ 8163616
removeobject 2
release
end
-Movement_16361B:: @ 816361B
+PokemonTower_7F_Movement_Grunt1ExitMid:: @ 816361B
walk_down
walk_right
walk_down
@@ -71,7 +71,7 @@ Movement_16361B:: @ 816361B
walk_down
step_end
-Movement_163624:: @ 8163624
+PokemonTower_7F_Movement_Grunt1ExitRight:: @ 8163624
walk_down
walk_down
walk_down
@@ -81,7 +81,7 @@ Movement_163624:: @ 8163624
walk_down
step_end
-Movement_16362C:: @ 816362C
+PokemonTower_7F_Movement_Grunt1Exit:: @ 816362C
walk_down
walk_down
walk_down
@@ -90,7 +90,7 @@ Movement_16362C:: @ 816362C
walk_down
step_end
-Movement_163633:: @ 8163633
+PokemonTower_7F_Movement_Grunt1ExitLeft:: @ 8163633
walk_right
walk_down
walk_down
@@ -102,43 +102,43 @@ Movement_163633:: @ 8163633
walk_in_place_fastest_left
step_end
-PokemonTower_7F_EventScript_16363D:: @ 816363D
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658
- msgbox gUnknown_817A477, MSGBOX_AUTOCLOSE
+PokemonTower_7F_EventScript_Grunt2:: @ 816363D
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, PokemonTower_7F_Text_Grunt2Intro, PokemonTower_7F_Text_Grunt2Defeat, PokemonTower_7F_EventScript_DefeatedGrunt2
+ msgbox PokemonTower_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_163658:: @ 8163658
+PokemonTower_7F_EventScript_DefeatedGrunt2:: @ 8163658
famechecker FAMECHECKER_MRFUJI, 1
- msgbox gUnknown_817A477
+ msgbox PokemonTower_7F_Text_Grunt2PostBattle
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 12
- goto_if_eq EventScript_163699
+ goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitLeft
compare VAR_0x8004, 13
- goto_if_eq EventScript_1636A9
- applymovement 3, Movement_1636C6
+ goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitRight
+ applymovement 3, PokemonTower_7F_Movement_Grunt2Exit
waitmovement 0
- goto EventScript_1636B9
+ goto PokemonTower_7F_EventScript_RemoveGrunt2
end
-EventScript_163699:: @ 8163699
- applymovement 3, Movement_1636BE
+PokemonTower_7F_EventScript_Grunt2ExitLeft:: @ 8163699
+ applymovement 3, PokemonTower_7F_Movement_Grunt2ExitLeft
waitmovement 0
- goto EventScript_1636B9
+ goto PokemonTower_7F_EventScript_RemoveGrunt2
end
-EventScript_1636A9:: @ 81636A9
- applymovement 3, Movement_1636CD
+PokemonTower_7F_EventScript_Grunt2ExitRight:: @ 81636A9
+ applymovement 3, PokemonTower_7F_Movement_Grunt2ExitRight
waitmovement 0
- goto EventScript_1636B9
+ goto PokemonTower_7F_EventScript_RemoveGrunt2
end
-EventScript_1636B9:: @ 81636B9
+PokemonTower_7F_EventScript_RemoveGrunt2:: @ 81636B9
removeobject 3
release
end
-Movement_1636BE:: @ 81636BE
+PokemonTower_7F_Movement_Grunt2ExitLeft:: @ 81636BE
walk_down
walk_down
walk_down
@@ -148,7 +148,7 @@ Movement_1636BE:: @ 81636BE
walk_down
step_end
-Movement_1636C6:: @ 81636C6
+PokemonTower_7F_Movement_Grunt2Exit:: @ 81636C6
walk_down
walk_down
walk_down
@@ -157,7 +157,7 @@ Movement_1636C6:: @ 81636C6
walk_down
step_end
-Movement_1636CD:: @ 81636CD
+PokemonTower_7F_Movement_Grunt2ExitRight:: @ 81636CD
walk_left
walk_down
walk_down
@@ -168,46 +168,46 @@ Movement_1636CD:: @ 81636CD
walk_down
step_end
-PokemonTower_7F_EventScript_1636D6:: @ 81636D6
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1
- msgbox gUnknown_817A506, MSGBOX_AUTOCLOSE
+PokemonTower_7F_EventScript_Grunt3:: @ 81636D6
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, PokemonTower_7F_Text_Grunt3Intro, PokemonTower_7F_Text_Grunt3Defeat, PokemonTower_7F_EventScript_DefeatedGrunt3
+ msgbox PokemonTower_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1636F1:: @ 81636F1
- msgbox gUnknown_817A506
+PokemonTower_7F_EventScript_DefeatedGrunt3:: @ 81636F1
+ msgbox PokemonTower_7F_Text_Grunt3PostBattle
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 10
- goto_if_eq EventScript_163725
+ goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitRight
compare VAR_0x8004, 9
- goto_if_eq EventScript_163735
- applymovement 4, Movement_163754
+ goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitLeft
+ applymovement 4, PokemonTower_7F_Movement_Grunt3Exit
waitmovement 0
- goto EventScript_163745
+ goto PokemonTower_7F_EventScript_RemoveGrunt3
end
-EventScript_163725:: @ 8163725
- applymovement 4, Movement_16374C
+PokemonTower_7F_EventScript_Grunt3ExitRight:: @ 8163725
+ applymovement 4, PokemonTower_7F_Movement_Grunt3ExitRight
waitmovement 0
- goto EventScript_163745
+ goto PokemonTower_7F_EventScript_RemoveGrunt3
end
-EventScript_163735:: @ 8163735
- applymovement 4, Movement_16375B
+PokemonTower_7F_EventScript_Grunt3ExitLeft:: @ 8163735
+ applymovement 4, PokemonTower_7F_Movement_Grunt3ExitLeft
waitmovement 0
- goto EventScript_163745
+ goto PokemonTower_7F_EventScript_RemoveGrunt3
end
-EventScript_163745:: @ 8163745
+PokemonTower_7F_EventScript_RemoveGrunt3:: @ 8163745
removeobject 4
release
end
-EventScript_16374A:: @ 816374A
+PokemonTower_7F_EventScript_Unused:: @ 816374A
release
end
-Movement_16374C:: @ 816374C
+PokemonTower_7F_Movement_Grunt3ExitRight:: @ 816374C
walk_down
walk_down
walk_down
@@ -217,7 +217,7 @@ Movement_16374C:: @ 816374C
walk_down
step_end
-Movement_163754:: @ 8163754
+PokemonTower_7F_Movement_Grunt3Exit:: @ 8163754
walk_down
walk_down
walk_down
@@ -226,7 +226,7 @@ Movement_163754:: @ 8163754
walk_down
step_end
-Movement_16375B:: @ 816375B
+PokemonTower_7F_Movement_Grunt3ExitLeft:: @ 816375B
walk_right
walk_down
walk_down
diff --git a/data/maps/PokemonTower_7F/text.inc b/data/maps/PokemonTower_7F/text.inc
index d55f9c2e2..c11f66791 100644
--- a/data/maps/PokemonTower_7F/text.inc
+++ b/data/maps/PokemonTower_7F/text.inc
@@ -1,14 +1,14 @@
-Text_17A380:: @ 817A380
+PokemonTower_7F_Text_Grunt1Intro:: @ 817A380
.string "What do you want?\n"
.string "Why are you here?$"
-Text_17A3A4:: @ 817A3A4
+PokemonTower_7F_Text_Grunt1Defeat:: @ 817A3A4
.string "I give up!$"
-gUnknown_817A3AF:: @ 817A3AF
+PokemonTower_7F_Text_Grunt1PostBattle:: @ 817A3AF
.string "I'm not going to forget this!$"
-Text_17A3CD:: @ 817A3CD
+PokemonTower_7F_Text_Grunt2Intro:: @ 817A3CD
.string "This old guy marched right up to\n"
.string "our HIDEOUT.\p"
.string "Then, he starts ranting about how\n"
@@ -16,25 +16,25 @@ Text_17A3CD:: @ 817A3CD
.string "So, we're just talking it over as\n"
.string "adults.$"
-Text_17A466:: @ 817A466
+PokemonTower_7F_Text_Grunt2Defeat:: @ 817A466
.string "Please!\n"
.string "No more!$"
-gUnknown_817A477:: @ 817A477
+PokemonTower_7F_Text_Grunt2PostBattle:: @ 817A477
.string "POKéMON are only good for making\n"
.string "money. Why not use them?\p"
.string "You stay out of our business!$"
-Text_17A4CF:: @ 817A4CF
+PokemonTower_7F_Text_Grunt3Intro:: @ 817A4CF
.string "You're not saving anyone, kid!$"
-Text_17A4EE:: @ 817A4EE
+PokemonTower_7F_Text_Grunt3Defeat:: @ 817A4EE
.string "Don't fight us ROCKETS!$"
-gUnknown_817A506:: @ 817A506
+PokemonTower_7F_Text_Grunt3PostBattle:: @ 817A506
.string "You're not getting away with this!$"
-gUnknown_817A529:: @ 817A529
+PokemonTower_7F_Text_MrFujiThankYouFollowMe:: @ 817A529
.string "MR. FUJI: Heh?\n"
.string "You came to save me?\p"
.string "Thank you. But, I came here of my\n"
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-22 07:16:43 +0000