summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/maps/RocketHideout_B1F/map.json10
-rw-r--r--data/maps/RocketHideout_B1F/scripts.inc64
-rw-r--r--data/maps/RocketHideout_B1F/text.inc30
-rw-r--r--data/maps/RocketHideout_B2F/map.json2
-rw-r--r--data/maps/RocketHideout_B2F/scripts.inc6
-rw-r--r--data/maps/RocketHideout_B2F/text.inc6
-rw-r--r--data/maps/RocketHideout_B3F/map.json4
-rw-r--r--data/maps/RocketHideout_B3F/scripts.inc12
-rw-r--r--data/maps/RocketHideout_B3F/text.inc12
-rw-r--r--data/maps/RocketHideout_B4F/map.json8
-rw-r--r--data/maps/RocketHideout_B4F/scripts.inc122
-rw-r--r--data/maps/RocketHideout_B4F/text.inc24
-rw-r--r--data/maps/RocketHideout_Elevator/map.json2
-rw-r--r--data/maps/RocketHideout_Elevator/scripts.inc78
-rw-r--r--data/maps/RocketHideout_Elevator/text.inc2
-rw-r--r--include/constants/metatile_labels.h9
16 files changed, 197 insertions, 194 deletions
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
index 586bf0f0d..4314d758f 100644
--- a/data/maps/RocketHideout_B1F/map.json
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "RocketHideout_B1F_EventScript_1611C5",
+ "script": "RocketHideout_B1F_EventScript_Grunt2",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "RocketHideout_B1F_EventScript_1611AE",
+ "script": "RocketHideout_B1F_EventScript_Grunt1",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "RocketHideout_B1F_EventScript_1611F3",
+ "script": "RocketHideout_B1F_EventScript_Grunt4",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "RocketHideout_B1F_EventScript_1611DC",
+ "script": "RocketHideout_B1F_EventScript_Grunt3",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "RocketHideout_B1F_EventScript_16120A",
+ "script": "RocketHideout_B1F_EventScript_Grunt5",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc
index c27dd99f3..ac95862a2 100644
--- a/data/maps/RocketHideout_B1F/scripts.inc
+++ b/data/maps/RocketHideout_B1F/scripts.inc
@@ -4,60 +4,60 @@ RocketHideout_B1F_MapScripts:: @ 8161195
.byte 0
RocketHideout_B1F_OnLoad:: @ 81611A0
- call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233
+ call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 RocketHideout_B1F_EventScript_SetBarrier
end
RocketHideout_B1F_OnTransition:: @ 81611AA
setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F
end
-RocketHideout_B1F_EventScript_1611AE:: @ 81611AE
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED
- msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt1:: @ 81611AE
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat
+ msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
-RocketHideout_B1F_EventScript_1611C5:: @ 81611C5
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60
- msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt2:: @ 81611C5
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat
+ msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
-RocketHideout_B1F_EventScript_1611DC:: @ 81611DC
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4
- msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt3:: @ 81611DC
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat
+ msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
-RocketHideout_B1F_EventScript_1611F3:: @ 81611F3
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8
- msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt4:: @ 81611F3
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat
+ msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
-RocketHideout_B1F_EventScript_16120A:: @ 816120A
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225
- msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt5:: @ 816120A
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, RocketHideout_B1F_Text_Grunt5Intro, RocketHideout_B1F_Text_Grunt5Defeat, RocketHideout_B1F_EventScript_DefeatedGrunt5
+ msgbox RocketHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_161225:: @ 8161225
- call EventScript_16126A
+RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225
+ call RocketHideout_B1F_EventScript_RemoveBarrier
playse SE_KI_GASYAN
special DrawWholeMapView
waitse
release
end
-EventScript_161233:: @ 8161233
- setmetatile 20, 19, 718, 1
- setmetatile 21, 19, 719, 1
- setmetatile 20, 20, 726, 1
- setmetatile 21, 20, 727, 1
- setmetatile 20, 21, 642, 0
- setmetatile 21, 21, 642, 0
+RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233
+ setmetatile 20, 19, METATILE_Hideout_Barrier_TopLeft_Floor, 1
+ setmetatile 21, 19, METATILE_Hideout_Barrier_TopRight_Floor, 1
+ setmetatile 20, 20, METATILE_Hideout_Barrier_BottomLeft, 1
+ setmetatile 21, 20, METATILE_Hideout_Barrier_BottomRight, 1
+ setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 21, 21, METATILE_Hideout_Floor_ShadeFull, 0
return
-EventScript_16126A:: @ 816126A
- setmetatile 20, 19, 642, 0
- setmetatile 21, 19, 641, 0
- setmetatile 20, 20, 642, 0
- setmetatile 21, 20, 641, 0
- setmetatile 20, 21, 642, 0
- setmetatile 21, 21, 641, 0
+RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A
+ setmetatile 20, 19, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 21, 19, METATILE_Hideout_Floor, 0
+ setmetatile 20, 20, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 21, 20, METATILE_Hideout_Floor, 0
+ setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 21, 21, METATILE_Hideout_Floor, 0
return
diff --git a/data/maps/RocketHideout_B1F/text.inc b/data/maps/RocketHideout_B1F/text.inc
index fd7647e2b..9dea66b16 100644
--- a/data/maps/RocketHideout_B1F/text.inc
+++ b/data/maps/RocketHideout_B1F/text.inc
@@ -1,53 +1,53 @@
-Text_174ECA:: @ 8174ECA
+RocketHideout_B1F_Text_Grunt1Intro:: @ 8174ECA
.string "Who are you?\n"
.string "How did you get here?$"
-Text_174EED:: @ 8174EED
+RocketHideout_B1F_Text_Grunt1Defeat:: @ 8174EED
.string "Oww!\n"
.string "Beaten!$"
-gUnknown_8174EFA:: @ 8174EFA
+RocketHideout_B1F_Text_Grunt1PostBattle:: @ 8174EFA
.string "Blast it… You're dissing TEAM\n"
.string "ROCKET, aren't you?$"
-Text_174F2C:: @ 8174F2C
+RocketHideout_B1F_Text_Grunt2Intro:: @ 8174F2C
.string "You broke into TEAM ROCKET's\n"
.string "operation? What nerve!$"
-Text_174F60:: @ 8174F60
+RocketHideout_B1F_Text_Grunt2Defeat:: @ 8174F60
.string "Boom!$"
-gUnknown_8174F66:: @ 8174F66
+RocketHideout_B1F_Text_Grunt2PostBattle:: @ 8174F66
.string "You're not going to get away with\n"
.string "this, brat!$"
-Text_174F94:: @ 8174F94
+RocketHideout_B1F_Text_Grunt3Intro:: @ 8174F94
.string "Intruder alert!$"
-Text_174FA4:: @ 8174FA4
+RocketHideout_B1F_Text_Grunt3Defeat:: @ 8174FA4
.string "I can't do it!$"
-gUnknown_8174FB3:: @ 8174FB3
+RocketHideout_B1F_Text_Grunt3PostBattle:: @ 8174FB3
.string "SILPH SCOPE? Humph!\n"
.string "I don't know where it is.$"
-Text_174FE1:: @ 8174FE1
+RocketHideout_B1F_Text_Grunt4Intro:: @ 8174FE1
.string "Why did you come here?$"
-Text_174FF8:: @ 8174FF8
+RocketHideout_B1F_Text_Grunt4Defeat:: @ 8174FF8
.string "This won't do!$"
-gUnknown_8175007:: @ 8175007
+RocketHideout_B1F_Text_Grunt4PostBattle:: @ 8175007
.string "Okay, I'll talk…\n"
.string "Take the elevator to see my BOSS.$"
-Text_17503A:: @ 817503A
+RocketHideout_B1F_Text_Grunt5Intro:: @ 817503A
.string "Are you lost, you little mouse?$"
-Text_17505A:: @ 817505A
+RocketHideout_B1F_Text_Grunt5Defeat:: @ 817505A
.string "Why…?$"
-gUnknown_8175060:: @ 8175060
+RocketHideout_B1F_Text_Grunt5PostBattle:: @ 8175060
.string "Uh-oh, that ruckus somehow opened\n"
.string "the door!$"
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index bdc600f55..2c353b5c1 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "RocketHideout_B2F_EventScript_1612A2",
+ "script": "RocketHideout_B2F_EventScript_Grunt",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc
index 07916ad03..55e7f6a2a 100644
--- a/data/maps/RocketHideout_B2F/scripts.inc
+++ b/data/maps/RocketHideout_B2F/scripts.inc
@@ -1,7 +1,7 @@
RocketHideout_B2F_MapScripts:: @ 81612A1
.byte 0
-RocketHideout_B2F_EventScript_1612A2:: @ 81612A2
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF
- msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE
+RocketHideout_B2F_EventScript_Grunt:: @ 81612A2
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat
+ msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc
index d21c21555..a27121152 100644
--- a/data/maps/RocketHideout_B2F/text.inc
+++ b/data/maps/RocketHideout_B2F/text.inc
@@ -1,11 +1,11 @@
-Text_17508C:: @ 817508C
+RocketHideout_B2F_Text_GruntIntro:: @ 817508C
.string "BOSS said you can see ghosts with\n"
.string "the SILPH SCOPE.$"
-Text_1750BF:: @ 81750BF
+RocketHideout_B2F_Text_GruntDefeat:: @ 81750BF
.string "I surrender!$"
-gUnknown_81750CC:: @ 81750CC
+RocketHideout_B2F_Text_GruntPostBattle:: @ 81750CC
.string "The TEAM ROCKET HQ has four\n"
.string "underground floors.\p"
.string "Think you can reach the BOSS?$"
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
index be88faebf..a4c1a7c72 100644
--- a/data/maps/RocketHideout_B3F/map.json
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "RocketHideout_B3F_EventScript_1612D1",
+ "script": "RocketHideout_B3F_EventScript_Grunt2",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "RocketHideout_B3F_EventScript_1612BA",
+ "script": "RocketHideout_B3F_EventScript_Grunt1",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc
index d6a57ab77..ab1fd6bb3 100644
--- a/data/maps/RocketHideout_B3F/scripts.inc
+++ b/data/maps/RocketHideout_B3F/scripts.inc
@@ -1,12 +1,12 @@
RocketHideout_B3F_MapScripts:: @ 81612B9
.byte 0
-RocketHideout_B3F_EventScript_1612BA:: @ 81612BA
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A
- msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE
+RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat
+ msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
-RocketHideout_B3F_EventScript_1612D1:: @ 81612D1
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE
- msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE
+RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat
+ msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc
index deedfce38..12a9c5a7e 100644
--- a/data/maps/RocketHideout_B3F/text.inc
+++ b/data/maps/RocketHideout_B3F/text.inc
@@ -1,25 +1,25 @@
-Text_17511A:: @ 817511A
+RocketHideout_B3F_Text_Grunt1Intro:: @ 817511A
.string "Stop meddling in TEAM ROCKET's\n"
.string "affairs or else!$"
-Text_17514A:: @ 817514A
+RocketHideout_B3F_Text_Grunt1Defeat:: @ 817514A
.string "Oof!\n"
.string "Taken down!$"
-gUnknown_817515B:: @ 817515B
+RocketHideout_B3F_Text_Grunt1PostBattle:: @ 817515B
.string "SILPH SCOPE?\n"
.string "Oh, that machine the BOSS stole.\p"
.string "It's here somewhere.$"
-Text_17519E:: @ 817519E
+RocketHideout_B3F_Text_Grunt2Intro:: @ 817519E
.string "We got word from upstairs that you\n"
.string "were coming!$"
-Text_1751CE:: @ 81751CE
+RocketHideout_B3F_Text_Grunt2Defeat:: @ 81751CE
.string "What?\n"
.string "I lost? No!$"
-gUnknown_81751E0:: @ 81751E0
+RocketHideout_B3F_Text_Grunt2PostBattle:: @ 81751E0
.string "Go ahead and go!\p"
.string "But you can't run the elevator\n"
.string "without the LIFT KEY.$"
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index 1790720b4..da6f7f569 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "RocketHideout_B4F_EventScript_161317",
+ "script": "RocketHideout_B4F_EventScript_Giovanni",
"flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "RocketHideout_B4F_EventScript_161381",
+ "script": "RocketHideout_B4F_EventScript_Grunt1",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "RocketHideout_B4F_EventScript_161418",
+ "script": "RocketHideout_B4F_EventScript_Grunt3",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "RocketHideout_B4F_EventScript_1613CE",
+ "script": "RocketHideout_B4F_EventScript_Grunt2",
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index 68671a7a8..63fff7d82 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -1,33 +1,39 @@
+.equ LOCALID_GIOVANNI, 1
+.equ LOCALID_SILPH_SCOPE, 2
+.equ LOCALID_LIFT_KEY, 4
+
+.equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1
+
RocketHideout_B4F_MapScripts:: @ 81612E8
map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad
.byte 0
RocketHideout_B4F_OnLoad:: @ 81612EE
- setvar VAR_TEMP_1, 0
- call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
- call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
- compare VAR_TEMP_1, 2
- call_if_ne EventScript_16146A
+ setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+ call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+ call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+ compare NUM_DOOR_GRUNTS_DEFEATED, 2
+ call_if_ne RocketHideout_B4F_EventScript_SetBarrier
end
-EventScript_161311:: @ 8161311
- addvar VAR_TEMP_1, 1
+RocketHideout_B4F_EventScript_CountGruntDefeated:: @ 8161311
+ addvar NUM_DOOR_GRUNTS_DEFEATED, 1
return
-RocketHideout_B4F_EventScript_161317:: @ 8161317
+RocketHideout_B4F_EventScript_Giovanni:: @ 8161317
lock
faceplayer
famechecker FAMECHECKER_GIOVANNI, 0
- message Text_175226
+ message RocketHideout_B4F_Text_GiovanniIntro
waitmessage
playbgm MUS_ROCKET, 0
waitbuttonpress
- trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318
- msgbox gUnknown_817532D
+ trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, RocketHideout_B4F_Text_GiovanniDefeat
+ msgbox RocketHideout_B4F_Text_GiovanniPostBattle
fadescreen FADE_TO_BLACK
closemessage
- removeobject 1
- addobject 2
+ removeobject LOCALID_GIOVANNI
+ addobject LOCALID_SILPH_SCOPE
clearflag FLAG_HIDE_SILPH_SCOPE
setflag FLAG_HIDE_CELADON_ROCKETS
famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
@@ -38,22 +44,22 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
RocketHideout_B4F_EventScript_SilphScope:: @ 8161363
lock
faceplayer
- removeobject 2
+ removeobject LOCALID_SILPH_SCOPE
giveitem ITEM_SILPH_SCOPE
compare VAR_RESULT, FALSE
goto_if_eq EventScript_BagIsFull
release
end
-RocketHideout_B4F_EventScript_161381:: @ 8161381
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D
- msgbox gUnknown_81754BD
+RocketHideout_B4F_EventScript_Grunt1:: @ 8161381
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, RocketHideout_B4F_Text_Grunt1Intro, RocketHideout_B4F_Text_Grunt1Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt1
+ msgbox RocketHideout_B4F_Text_Grunt1PostBattle
release
end
-EventScript_16139D:: @ 816139D
- msgbox gUnknown_81754BD
- addobject 4
+RocketHideout_B4F_EventScript_DefeatedGrunt1:: @ 816139D
+ msgbox RocketHideout_B4F_Text_Grunt1PostBattle
+ addobject LOCALID_LIFT_KEY
clearflag FLAG_HIDE_LIFT_KEY
release
end
@@ -62,65 +68,65 @@ RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD
lock
faceplayer
setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
- removeobject 4
+ removeobject LOCALID_LIFT_KEY
giveitem ITEM_LIFT_KEY
compare VAR_RESULT, FALSE
goto_if_eq EventScript_BagIsFull
release
end
-RocketHideout_B4F_EventScript_1613CE:: @ 81613CE
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9
- msgbox gUnknown_817540C, MSGBOX_AUTOCLOSE
+RocketHideout_B4F_EventScript_Grunt2:: @ 81613CE
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_Text_Grunt2Intro, RocketHideout_B4F_Text_Grunt2Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt2
+ msgbox RocketHideout_B4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1613E9:: @ 81613E9
- setvar VAR_TEMP_1, 0
- call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
- call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
- compare VAR_TEMP_1, 2
- call_if_eq EventScript_1614A1
- compare VAR_TEMP_1, 2
- call_if_eq EventScript_161462
+RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9
+ setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+ call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+ call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+ compare NUM_DOOR_GRUNTS_DEFEATED, 2
+ call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier
+ compare NUM_DOOR_GRUNTS_DEFEATED, 2
+ call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
release
end
-RocketHideout_B4F_EventScript_161418:: @ 8161418
- trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433
- msgbox gUnknown_817546A, MSGBOX_AUTOCLOSE
+RocketHideout_B4F_EventScript_Grunt3:: @ 8161418
+ trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_Text_Grunt3Intro, RocketHideout_B4F_Text_Grunt3Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt3
+ msgbox RocketHideout_B4F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_161433:: @ 8161433
- setvar VAR_TEMP_1, 0
- call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
- call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
- compare VAR_TEMP_1, 2
- call_if_eq EventScript_1614A1
- compare VAR_TEMP_1, 2
- call_if_eq EventScript_161462
+RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433
+ setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+ call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+ call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+ compare NUM_DOOR_GRUNTS_DEFEATED, 2
+ call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier
+ compare NUM_DOOR_GRUNTS_DEFEATED, 2
+ call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
release
end
-EventScript_161462:: @ 8161462
+RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462
playse SE_KI_GASYAN
special DrawWholeMapView
waitse
return
-EventScript_16146A:: @ 816146A
- setmetatile 17, 12, 718, 1
- setmetatile 18, 12, 719, 1
- setmetatile 17, 13, 726, 1
- setmetatile 18, 13, 727, 1
- setmetatile 17, 14, 642, 0
- setmetatile 18, 14, 642, 0
+RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A
+ setmetatile 17, 12, METATILE_Hideout_Barrier_TopLeft_Floor, 1
+ setmetatile 18, 12, METATILE_Hideout_Barrier_TopRight_Floor, 1
+ setmetatile 17, 13, METATILE_Hideout_Barrier_BottomLeft, 1
+ setmetatile 18, 13, METATILE_Hideout_Barrier_BottomRight, 1
+ setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 18, 14, METATILE_Hideout_Floor_ShadeFull, 0
return
-EventScript_1614A1:: @ 81614A1
- setmetatile 17, 12, 642, 0
- setmetatile 18, 12, 641, 0
- setmetatile 17, 13, 642, 0
- setmetatile 18, 13, 641, 0
- setmetatile 17, 14, 642, 0
- setmetatile 18, 14, 641, 0
+RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1
+ setmetatile 17, 12, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 18, 12, METATILE_Hideout_Floor, 0
+ setmetatile 17, 13, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 18, 13, METATILE_Hideout_Floor, 0
+ setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 18, 14, METATILE_Hideout_Floor, 0
return
diff --git a/data/maps/RocketHideout_B4F/text.inc b/data/maps/RocketHideout_B4F/text.inc
index 4ceba8968..9d11d7502 100644
--- a/data/maps/RocketHideout_B4F/text.inc
+++ b/data/maps/RocketHideout_B4F/text.inc
@@ -1,4 +1,4 @@
-Text_175226:: @ 8175226
+RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226
.string "So! I must say, I am impressed you\n"
.string "got here.\p"
.string "TEAM ROCKET captures POKéMON from\n"
@@ -9,11 +9,11 @@ Text_175226:: @ 8175226
.string "For your insolence, you will feel a\n"
.string "world of pain!$"
-Text_175318:: @ 8175318
+RocketHideout_B4F_Text_GiovanniDefeat:: @ 8175318
.string "WHAT!\n"
.string "This can't be!$"
-gUnknown_817532D:: @ 817532D
+RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D
.string "I see that you raise POKéMON with\n"
.string "utmost care.\p"
.string "A child like you would never\n"
@@ -21,36 +21,36 @@ gUnknown_817532D:: @ 817532D
.string "I shall step aside this time!\p"
.string "I hope we meet again…$"
-Text_1753D0:: @ 81753D0
+RocketHideout_B4F_Text_Grunt2Intro:: @ 81753D0
.string "I know you!\n"
.string "You ruined our plans at MT. MOON!$"
-Text_1753FE:: @ 81753FE
+RocketHideout_B4F_Text_Grunt2Defeat:: @ 81753FE
.string "Burned again!$"
-gUnknown_817540C:: @ 817540C
+RocketHideout_B4F_Text_Grunt2PostBattle:: @ 817540C
.string "Do you have something against TEAM\n"
.string "ROCKET?$"
-Text_175437:: @ 8175437
+RocketHideout_B4F_Text_Grunt3Intro:: @ 8175437
.string "How can you not see the beauty of\n"
.string "our evil?$"
-Text_175463:: @ 8175463
+RocketHideout_B4F_Text_Grunt3Defeat:: @ 8175463
.string "Ayaya!$"
-gUnknown_817546A:: @ 817546A
+RocketHideout_B4F_Text_Grunt3PostBattle:: @ 817546A
.string "BOSS!\n"
.string "I'm sorry I failed you!$"
-Text_175488:: @ 8175488
+RocketHideout_B4F_Text_Grunt1Intro:: @ 8175488
.string "The elevator doesn't work?\n"
.string "Who has the LIFT KEY?$"
-Text_1754B9:: @ 81754B9
+RocketHideout_B4F_Text_Grunt1Defeat:: @ 81754B9
.string "No!$"
-gUnknown_81754BD:: @ 81754BD
+RocketHideout_B4F_Text_Grunt1PostBattle:: @ 81754BD
.string "Oh, no!\n"
.string "I dropped the LIFT KEY!$"
diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json
index dd2191b6d..307ef90df 100644
--- a/data/maps/RocketHideout_Elevator/map.json
+++ b/data/maps/RocketHideout_Elevator/map.json
@@ -36,7 +36,7 @@
"x": 0,
"y": 2,
"elevation": 0,
- "script": "RocketHideout_Elevator_EventScript_1614D9"
+ "script": "RocketHideout_Elevator_EventScript_FloorSelect"
}
]
}
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
index f649e5c40..da059272a 100644
--- a/data/maps/RocketHideout_Elevator/scripts.inc
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -1,9 +1,9 @@
RocketHideout_Elevator_MapScripts:: @ 81614D8
.byte 0
-RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
+RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9
lockall
- goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B
+ goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, RocketHideout_Elevator_EventScript_NeedKey
setvar VAR_0x8004, 2
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
@@ -13,83 +13,71 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
setvar VAR_0x8004, 2
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
- case 0, EventScript_161530
- case 1, EventScript_16153C
- case 2, EventScript_161548
+ case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F
+ case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F
+ case 2, RocketHideout_Elevator_EventScript_FloorSelectFromB4F
end
-EventScript_161530:: @ 8161530
+RocketHideout_Elevator_EventScript_FloorSelectFromB1F:: @ 8161530
multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE
- goto EventScript_161554
-
-EventScript_16153B:: @ 816153B
+ goto RocketHideout_Elevator_EventScript_ChooseFloor
end
-EventScript_16153C:: @ 816153C
+RocketHideout_Elevator_EventScript_FloorSelectFromB2F:: @ 816153C
multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE
- goto EventScript_161554
-
-EventScript_161547:: @ 8161547
+ goto RocketHideout_Elevator_EventScript_ChooseFloor
end
-EventScript_161548:: @ 8161548
+RocketHideout_Elevator_EventScript_FloorSelectFromB4F:: @ 8161548
multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE
- goto EventScript_161554
-
-EventScript_161553:: @ 8161553
+ goto RocketHideout_Elevator_EventScript_ChooseFloor
end
-EventScript_161554:: @ 8161554
+RocketHideout_Elevator_EventScript_ChooseFloor:: @ 8161554
switch VAR_RESULT
- case 0, EventScript_161591
- case 1, EventScript_1615B9
- case 2, EventScript_1615E1
- case 3, EventScript_161609
- case 127, EventScript_161609
+ case 0, RocketHideout_Elevator_EventScript_ToB1F
+ case 1, RocketHideout_Elevator_EventScript_ToB2F
+ case 2, RocketHideout_Elevator_EventScript_ToB4F
+ case 3, RocketHideout_Elevator_EventScript_ExitFloorSelect
+ case 127, RocketHideout_Elevator_EventScript_ExitFloorSelect
end
-EventScript_161591:: @ 8161591
+RocketHideout_Elevator_EventScript_ToB1F:: @ 8161591
setvar VAR_0x8006, 3
setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25
compare VAR_ELEVATOR_FLOOR, 3
- goto_if_eq EventScript_161609
- call EventScript_16160E
+ goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+ call RocketHideout_Elevator_EventScript_MoveElevator
setvar VAR_ELEVATOR_FLOOR, 3
- goto EventScript_161609
-
-EventScript_1615B8:: @ 81615B8
+ goto RocketHideout_Elevator_EventScript_ExitFloorSelect
end
-EventScript_1615B9:: @ 81615B9
+RocketHideout_Elevator_EventScript_ToB2F:: @ 81615B9
setvar VAR_0x8006, 2
setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16
compare VAR_ELEVATOR_FLOOR, 2
- goto_if_eq EventScript_161609
- call EventScript_16160E
+ goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+ call RocketHideout_Elevator_EventScript_MoveElevator
setvar VAR_ELEVATOR_FLOOR, 2
- goto EventScript_161609
-
-EventScript_1615E0:: @ 81615E0
+ goto RocketHideout_Elevator_EventScript_ExitFloorSelect
end
-EventScript_1615E1:: @ 81615E1
+RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1
setvar VAR_0x8006, 0
setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23
compare VAR_ELEVATOR_FLOOR, 0
- goto_if_eq EventScript_161609
- call EventScript_16160E
+ goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+ call RocketHideout_Elevator_EventScript_MoveElevator
setvar VAR_ELEVATOR_FLOOR, 0
- goto EventScript_161609
-
-EventScript_161608:: @ 8161608
+ goto RocketHideout_Elevator_EventScript_ExitFloorSelect
end
-EventScript_161609:: @ 8161609
+RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
-EventScript_16160E:: @ 816160E
+RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
@@ -98,7 +86,7 @@ EventScript_16160E:: @ 816160E
setflag FLAG_TEMP_2
return
-EventScript_16161B:: @ 816161B
- msgbox gUnknown_81754DD
+RocketHideout_Elevator_EventScript_NeedKey:: @ 816161B
+ msgbox RocketHideout_Elevator_Text_AppearsToNeedAKey
releaseall
end
diff --git a/data/maps/RocketHideout_Elevator/text.inc b/data/maps/RocketHideout_Elevator/text.inc
index 89de8f918..f0e5e09f8 100644
--- a/data/maps/RocketHideout_Elevator/text.inc
+++ b/data/maps/RocketHideout_Elevator/text.inc
@@ -1,3 +1,3 @@
-gUnknown_81754DD:: @ 81754DD
+RocketHideout_Elevator_Text_AppearsToNeedAKey:: @ 81754DD
.string "It appears to need a key.$"
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 1bbc360df..2d781d402 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -68,6 +68,15 @@
#define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E
#define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F
+// Rocket Hideout, Rocket Warehouse, Silph Co, elevators
+#define METATILE_Hideout_Barrier_TopLeft_Floor 0x2CE
+#define METATILE_Hideout_Barrier_TopRight_Floor 0x2CF
+#define METATILE_Hideout_Barrier_BottomLeft 0x2D6
+#define METATILE_Hideout_Barrier_BottomRight 0x2D7
+#define METATILE_Hideout_Floor 0x281
+#define METATILE_Hideout_Floor_ShadeFull 0x282
+
+
// Cinnabar Gym
#define METATILE_CinnabarGym_Floor 0x281
#define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 01:48:44 +0000