dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Grunts to use location-specific names

Browse Source
This commit is contained in:
GriffinR
2019-11-03 19:28:25 -05:00
committed by huderlem
parent 290df23130
commit 5c627518b3
42 changed files with 593 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/AquaHideout_1F/scripts.inc
View File

@@ -41,7 +41,7 @@ AquaHideout_1F_EventScript_SlateportHint2:: @ 82334EE
end
AquaHideout_1F_EventScript_Grunt1:: @ 82334F8
trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated
msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end

4
data/maps/AquaHideout_B1F/map.json
View File

@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
"script": "AquaHideout_B1F_EventScript_Grunt21",
"script": "AquaHideout_B1F_EventScript_Grunt5",
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
"script": "AquaHideout_B1F_EventScript_Grunt25",
"script": "AquaHideout_B1F_EventScript_Grunt7",
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
}
],

28
data/maps/AquaHideout_B1F/scripts.inc
View File

@@ -82,7 +82,7 @@ AquaHideout_B1F_EventScript_DefeatedElectrode2:: @ 8233A7C
end
AquaHideout_B1F_EventScript_Grunt2:: @ 8233A85
trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated
msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
@@ -94,7 +94,7 @@ AquaHideout_B1F_EventScript_Grunt2Defeated:: @ 8233AA0
end
AquaHideout_B1F_EventScript_Grunt3:: @ 8233AB0
trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated
msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
@@ -103,14 +103,14 @@ AquaHideout_B1F_EventScript_Grunt3Defeated:: @ 8233ACB
release
end
AquaHideout_B1F_EventScript_Grunt21:: @ 8233AD5
trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_Grunt21Intro, AquaHideout_B1F_Text_Grunt21Defeat
msgbox AquaHideout_B1F_Text_Grunt21PostBattle, MSGBOX_AUTOCLOSE
AquaHideout_B1F_EventScript_Grunt5:: @ 8233AD5
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_5, AquaHideout_B1F_Text_Grunt5Intro, AquaHideout_B1F_Text_Grunt5Defeat
msgbox AquaHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
end
AquaHideout_B1F_EventScript_Grunt25:: @ 8233AEC
trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_Grunt25Intro, AquaHideout_B1F_Text_Grunt25Defeat
msgbox AquaHideout_B1F_Text_Grunt25PostBattle, MSGBOX_AUTOCLOSE
AquaHideout_B1F_EventScript_Grunt7:: @ 8233AEC
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_7, AquaHideout_B1F_Text_Grunt7Intro, AquaHideout_B1F_Text_Grunt7Defeat
msgbox AquaHideout_B1F_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
end
AquaHideout_B1F_Text_Grunt2Intro: @ 8233B03
@@ -141,27 +141,27 @@ AquaHideout_B1F_Text_Grunt3PostBattle: @ 8233C41
.string "This was supposed to happen!\p"
.string "My mission was to just hold you up!$"
AquaHideout_B1F_Text_Grunt21Intro: @ 8233C89
AquaHideout_B1F_Text_Grunt5Intro: @ 8233C89
.string "Yawn… Keeping watch over the\n"
.string "HIDEOUT bores me. I'll take you on.$"
AquaHideout_B1F_Text_Grunt21Defeat: @ 8233CCA
AquaHideout_B1F_Text_Grunt5Defeat: @ 8233CCA
.string "Yawn…\n"
.string "Oh, I lost…$"
AquaHideout_B1F_Text_Grunt21PostBattle: @ 8233CDC
AquaHideout_B1F_Text_Grunt5PostBattle: @ 8233CDC
.string "If you scurry too much, other TEAM\n"
.string "AQUA members might get you.$"
AquaHideout_B1F_Text_Grunt25Intro: @ 8233D1B
AquaHideout_B1F_Text_Grunt7Intro: @ 8233D1B
.string "Hey!\n"
.string "You there!\p"
.string "Which do you think is cooler?\n"
.string "TEAM AQUA's uniform or TEAM MAGMA's?$"
AquaHideout_B1F_Text_Grunt25Defeat: @ 8233D6E
AquaHideout_B1F_Text_Grunt7Defeat: @ 8233D6E
.string "I lost in a cool way…$"
AquaHideout_B1F_Text_Grunt25PostBattle: @ 8233D84
AquaHideout_B1F_Text_Grunt7PostBattle: @ 8233D84
.string "If you have a cool uniform, you look\n"
.string "good even in a loss, don't you think?$"

4
data/maps/AquaHideout_B2F/map.json
View File

@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
"script": "AquaHideout_B2F_EventScript_Grunt22",
"script": "AquaHideout_B2F_EventScript_Grunt6",
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
"script": "AquaHideout_B2F_EventScript_Grunt26",
"script": "AquaHideout_B2F_EventScript_Grunt8",
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
}
],

26
data/maps/AquaHideout_B2F/scripts.inc
View File

@@ -67,7 +67,7 @@ AquaHideout_B2F_Movement_SumbarineDepartRight: @ 8233E85
step_end
AquaHideout_B2F_EventScript_Grunt4:: @ 8233E8A
trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated
msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
@@ -76,14 +76,14 @@ AquaHideout_B2F_EventScript_Grunt4Defeated:: @ 8233EA5
release
end
AquaHideout_B2F_EventScript_Grunt22:: @ 8233EAF
trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_Grunt22Intro, AquaHideout_B2F_Text_Grunt22Defeat
msgbox AquaHideout_B2F_Text_Grunt22PostBattle, MSGBOX_AUTOCLOSE
AquaHideout_B2F_EventScript_Grunt6:: @ 8233EAF
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_6, AquaHideout_B2F_Text_Grunt6Intro, AquaHideout_B2F_Text_Grunt6Defeat
msgbox AquaHideout_B2F_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
end
AquaHideout_B2F_EventScript_Grunt26:: @ 8233EC6
trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_Grunt26Intro, AquaHideout_B2F_Text_Grunt26Defeat
msgbox AquaHideout_B2F_Text_Grunt26PostBattle, MSGBOX_AUTOCLOSE
AquaHideout_B2F_EventScript_Grunt8:: @ 8233EC6
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_8, AquaHideout_B2F_Text_Grunt8Intro, AquaHideout_B2F_Text_Grunt8Defeat
msgbox AquaHideout_B2F_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
end
AquaHideout_B2F_Text_MattIntro: @ 8233EDD
@@ -127,7 +127,7 @@ AquaHideout_B2F_Text_Grunt4PostBattle: @ 8234112
.string "BOSS…\n"
.string "Is this good enough?$"
AquaHideout_B2F_Text_Grunt22Intro: @ 823412D
AquaHideout_B2F_Text_Grunt6Intro: @ 823412D
.string "Warp panels, the HIDEOUT's pride\n"
.string "and joy!\p"
.string "You're clueless about where you are,\n"
@@ -135,25 +135,25 @@ AquaHideout_B2F_Text_Grunt22Intro: @ 823412D
.string "Fluster and tire out the enemy, then\n"
.string "lower the boom! That's our plan!$"
AquaHideout_B2F_Text_Grunt22Defeat: @ 82341CE
AquaHideout_B2F_Text_Grunt6Defeat: @ 82341CE
.string "What's wrong with you?\n"
.string "You're not tired at all!$"
AquaHideout_B2F_Text_Grunt22PostBattle: @ 82341FE
AquaHideout_B2F_Text_Grunt6PostBattle: @ 82341FE
.string "That reminds me… I can't remember\n"
.string "where I put the MASTER BALL.\p"
.string "If I fail to guard it, our BOSS will\n"
.string "chew me out…$"
AquaHideout_B2F_Text_Grunt26Intro: @ 823426F
AquaHideout_B2F_Text_Grunt8Intro: @ 823426F
.string "When I joined TEAM AQUA, the first\n"
.string "thing I had to learn was how these\l"
.string "warp panels connected.$"
AquaHideout_B2F_Text_Grunt26Defeat: @ 82342CC
AquaHideout_B2F_Text_Grunt8Defeat: @ 82342CC
.string "I was too occupied thinking about\n"
.string "the warp panels…$"
AquaHideout_B2F_Text_Grunt26PostBattle: @ 82342FF
AquaHideout_B2F_Text_Grunt8PostBattle: @ 82342FF
.string "I'll have to learn about how I can\n"
.string "battle more effectively…$"

8
data/maps/JaggedPass/scripts.inc
View File

@@ -77,9 +77,9 @@ JaggedPass_EventScript_MagmaHideoutGuard:: @ 8230718
waitmovement 0
applymovement 5, Common_Movement_FacePlayer
waitmovement 0
msgbox JaggedPass_Text_Grunt30Intro, MSGBOX_DEFAULT
msgbox JaggedPass_Text_GruntIntro, MSGBOX_DEFAULT
closemessage
trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_Grunt30Defeat
trainerbattle_no_intro TRAINER_GRUNT_JAGGED_PASS, JaggedPass_Text_GruntDefeat
setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS
applymovement 5, Common_Movement_FaceOriginalDirection
waitmovement 0
@@ -226,13 +226,13 @@ JaggedPass_Text_EthanPostRematch: @ 8230C94
.string "I should get an ACRO BIKE from RYDEL\n"
.string "in MAUVILLE CITY…$"
JaggedPass_Text_Grunt30Intro: @ 8230CCB
JaggedPass_Text_GruntIntro: @ 8230CCB
.string "Wah!\n"
.string "What are you doing here?\p"
.string "What am I doing in a place like this?\p"
.string "What business is it of yours?$"
JaggedPass_Text_Grunt30Defeat: @ 8230D2D
JaggedPass_Text_GruntDefeat: @ 8230D2D
.string "Urrrgh…\p"
.string "I should've ducked into our HIDEOUT\n"
.string "right away…$"

4
data/maps/MagmaHideout_1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "MagmaHideout_1F_EventScript_Grunt38",
"script": "MagmaHideout_1F_EventScript_Grunt1",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
"script": "MagmaHideout_1F_EventScript_Grunt39",
"script": "MagmaHideout_1F_EventScript_Grunt2",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{

24
data/maps/MagmaHideout_1F/scripts.inc
View File

@@ -6,33 +6,33 @@ MagmaHideout_1F_OnTransition: @ 8239886
setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
end
MagmaHideout_1F_EventScript_Grunt38:: @ 823988C
trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_Grunt38Intro, MagmaHideout_1F_Text_Grunt38Defeat
msgbox MagmaHideout_1F_Text_Grunt38PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_1F_EventScript_Grunt1:: @ 823988C
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_1, MagmaHideout_1F_Text_Grunt1Intro, MagmaHideout_1F_Text_Grunt1Defeat
msgbox MagmaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_1F_EventScript_Grunt39:: @ 82398A3
trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_Grunt39Intro, MagmaHideout_1F_Text_Grunt39Defeat
msgbox MagmaHideout_1F_Text_Grunt39PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_1F_EventScript_Grunt2:: @ 82398A3
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_2, MagmaHideout_1F_Text_Grunt2Intro, MagmaHideout_1F_Text_Grunt2Defeat
msgbox MagmaHideout_1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_1F_Text_Grunt38Intro: @ 82398BA
MagmaHideout_1F_Text_Grunt1Intro: @ 82398BA
.string "When TEAM MAGMA has roll call, we get\n"
.string "important guarding assignments in\l"
.string "the order that we line up.\p"
.string "That's why I'm stuck off in this corner.\n"
.string "I'm always late to roll call!$"
MagmaHideout_1F_Text_Grunt38Defeat: @ 8239964
MagmaHideout_1F_Text_Grunt1Defeat: @ 8239964
.string "I'm always late for training sessions,\n"
.string "too!\p"
.string "I hate to say it, but I'm wimpy…$"
MagmaHideout_1F_Text_Grunt38PostBattle: @ 82399B1
MagmaHideout_1F_Text_Grunt1PostBattle: @ 82399B1
.string "Okay, I'll try to put a little more\n"
.string "effort into things from now on…$"
MagmaHideout_1F_Text_Grunt39Intro: @ 82399F5
MagmaHideout_1F_Text_Grunt2Intro: @ 82399F5
.string "Our leader told us to dig into\n"
.string "MT. CHIMNEY, so we dug and dug.\p"
.string "And in the course of digging, we came\n"
@@ -41,11 +41,11 @@ MagmaHideout_1F_Text_Grunt39Intro: @ 82399F5
.string "Fuhahaha!\n"
.string "I'll tell you if you beat me!$"
MagmaHideout_1F_Text_Grunt39Defeat: @ 8239ABA
MagmaHideout_1F_Text_Grunt2Defeat: @ 8239ABA
.string "Arrgh!\n"
.string "Taken down!$"
MagmaHideout_1F_Text_Grunt39PostBattle: @ 8239ACD
MagmaHideout_1F_Text_Grunt2PostBattle: @ 8239ACD
.string "I won't tell you after all.\n"
.string "You'll find out when you get there!\p"
.string "It'd be better if you saved surprises\n"

8
data/maps/MagmaHideout_2F_1R/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MagmaHideout_2F_1R_EventScript_Grunt41",
"script": "MagmaHideout_2F_1R_EventScript_Grunt4",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 6,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MagmaHideout_2F_1R_EventScript_Grunt42",
"script": "MagmaHideout_2F_1R_EventScript_Grunt5",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
"script": "MagmaHideout_2F_1R_EventScript_Grunt51",
"script": "MagmaHideout_2F_1R_EventScript_Grunt14",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MagmaHideout_2F_1R_EventScript_Grunt40",
"script": "MagmaHideout_2F_1R_EventScript_Grunt3",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
}
],

48
data/maps/MagmaHideout_2F_1R/scripts.inc
View File

@@ -1,27 +1,27 @@
MagmaHideout_2F_1R_MapScripts:: @ 8239B50
.byte 0
MagmaHideout_2F_1R_EventScript_Grunt51:: @ 8239B51
trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_Grunt51Intro, MagmaHideout_2F_1R_Text_Grunt51Defeat
msgbox MagmaHideout_2F_1R_Text_Grunt51PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_2F_1R_EventScript_Grunt14:: @ 8239B51
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_14, MagmaHideout_2F_1R_Text_Grunt14Intro, MagmaHideout_2F_1R_Text_Grunt14Defeat
msgbox MagmaHideout_2F_1R_Text_Grunt14PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_1R_EventScript_Grunt40:: @ 8239B68
trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_Grunt40Intro, MagmaHideout_2F_1R_Text_Grunt40Defeat
msgbox MagmaHideout_2F_1R_Text_Grunt40PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_2F_1R_EventScript_Grunt3:: @ 8239B68
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_3, MagmaHideout_2F_1R_Text_Grunt3Intro, MagmaHideout_2F_1R_Text_Grunt3Defeat
msgbox MagmaHideout_2F_1R_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_1R_EventScript_Grunt41:: @ 8239B7F
trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_Grunt41Intro, MagmaHideout_2F_1R_Text_Grunt41Defeat
msgbox MagmaHideout_2F_1R_Text_Grunt41PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_2F_1R_EventScript_Grunt4:: @ 8239B7F
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_4, MagmaHideout_2F_1R_Text_Grunt4Intro, MagmaHideout_2F_1R_Text_Grunt4Defeat
msgbox MagmaHideout_2F_1R_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_1R_EventScript_Grunt42:: @ 8239B96
trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_Grunt42Intro, MagmaHideout_2F_1R_Text_Grunt42Defeat
msgbox MagmaHideout_2F_1R_Text_Grunt42PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_2F_1R_EventScript_Grunt5:: @ 8239B96
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_5, MagmaHideout_2F_1R_Text_Grunt5Intro, MagmaHideout_2F_1R_Text_Grunt5Defeat
msgbox MagmaHideout_2F_1R_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_1R_Text_Grunt51Intro: @ 8239BAD
MagmaHideout_2F_1R_Text_Grunt14Intro: @ 8239BAD
.string "What, what, what?\p"
.string "Only TEAM MAGMA members are supposed\n"
.string "to be in here!\p"
@@ -30,46 +30,46 @@ MagmaHideout_2F_1R_Text_Grunt51Intro: @ 8239BAD
.string "You rouse my suspicion!\n"
.string "Battle with me!$"
MagmaHideout_2F_1R_Text_Grunt51Defeat: @ 8239C4B
MagmaHideout_2F_1R_Text_Grunt14Defeat: @ 8239C4B
.string "Aiyiyi…\n"
.string "My pride as a TEAM MAGMA member…$"
MagmaHideout_2F_1R_Text_Grunt51PostBattle: @ 8239C74
MagmaHideout_2F_1R_Text_Grunt14PostBattle: @ 8239C74
.string "If you suffer from chills, you should\n"
.string "join TEAM MAGMA.$"
MagmaHideout_2F_1R_Text_Grunt40Intro: @ 8239CAB
MagmaHideout_2F_1R_Text_Grunt3Intro: @ 8239CAB
.string "Hold it right there!\p"
.string "You don't really expect me to keep\n"
.string "my trap shut and let you waltz by me?$"
MagmaHideout_2F_1R_Text_Grunt40Defeat: @ 8239D09
MagmaHideout_2F_1R_Text_Grunt3Defeat: @ 8239D09
.string "Ooh wow!\n"
.string "I concede!$"
MagmaHideout_2F_1R_Text_Grunt40PostBattle: @ 8239D1D
MagmaHideout_2F_1R_Text_Grunt3PostBattle: @ 8239D1D
.string "Maybe it would've been better if I did\n"
.string "just let you go unchallenged…$"
MagmaHideout_2F_1R_Text_Grunt41Intro: @ 8239D62
MagmaHideout_2F_1R_Text_Grunt4Intro: @ 8239D62
.string "Ahah!\n"
.string "An intruder!$"
MagmaHideout_2F_1R_Text_Grunt41Defeat: @ 8239D75
MagmaHideout_2F_1R_Text_Grunt4Defeat: @ 8239D75
.string "Graaah!$"
MagmaHideout_2F_1R_Text_Grunt41PostBattle: @ 8239D7D
MagmaHideout_2F_1R_Text_Grunt4PostBattle: @ 8239D7D
.string "I've already lost.\p"
.string "Do I really need to keep running\n"
.string "around in a circle?$"
MagmaHideout_2F_1R_Text_Grunt42Intro: @ 8239DC5
MagmaHideout_2F_1R_Text_Grunt5Intro: @ 8239DC5
.string "Oh, oh!\n"
.string "An intruder!$"
MagmaHideout_2F_1R_Text_Grunt42Defeat: @ 8239DDA
MagmaHideout_2F_1R_Text_Grunt5Defeat: @ 8239DDA
.string "Mutter…$"
MagmaHideout_2F_1R_Text_Grunt42PostBattle: @ 8239DE2
MagmaHideout_2F_1R_Text_Grunt5PostBattle: @ 8239DE2
.string "Actually, I'm no expert at battling…$"

8
data/maps/MagmaHideout_2F_2R/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
"script": "MagmaHideout_2F_2R_EventScript_Grunt45",
"script": "MagmaHideout_2F_2R_EventScript_Grunt8",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "MagmaHideout_2F_2R_EventScript_Grunt44",
"script": "MagmaHideout_2F_2R_EventScript_Grunt7",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
"script": "MagmaHideout_2F_2R_EventScript_Grunt43",
"script": "MagmaHideout_2F_2R_EventScript_Grunt6",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MagmaHideout_2F_2R_EventScript_Grunt52",
"script": "MagmaHideout_2F_2R_EventScript_Grunt15",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{

48
data/maps/MagmaHideout_2F_2R/scripts.inc
View File

@@ -1,78 +1,78 @@
MagmaHideout_2F_2R_MapScripts:: @ 8239E07
.byte 0
MagmaHideout_2F_2R_EventScript_Grunt52:: @ 8239E08
trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_Grunt52Intro, MagmaHideout_2F_2R_Text_Grunt52Defeat
msgbox MagmaHideout_2F_2R_Text_Grunt52PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_2F_2R_EventScript_Grunt15:: @ 8239E08
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_15, MagmaHideout_2F_2R_Text_Grunt15Intro, MagmaHideout_2F_2R_Text_Grunt15Defeat
msgbox MagmaHideout_2F_2R_Text_Grunt15PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_2R_EventScript_Grunt43:: @ 8239E1F
trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_Grunt43Intro, MagmaHideout_2F_2R_Text_Grunt43Defeat
msgbox MagmaHideout_2F_2R_Text_Grunt43PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_2F_2R_EventScript_Grunt6:: @ 8239E1F
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_6, MagmaHideout_2F_2R_Text_Grunt6Intro, MagmaHideout_2F_2R_Text_Grunt6Defeat
msgbox MagmaHideout_2F_2R_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_2R_EventScript_Grunt44:: @ 8239E36
trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_Grunt44Intro, MagmaHideout_2F_2R_Text_Grunt44Defeat
msgbox MagmaHideout_2F_2R_Text_Grunt44PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_2F_2R_EventScript_Grunt7:: @ 8239E36
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_7, MagmaHideout_2F_2R_Text_Grunt7Intro, MagmaHideout_2F_2R_Text_Grunt7Defeat
msgbox MagmaHideout_2F_2R_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_2R_EventScript_Grunt45:: @ 8239E4D
trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_Grunt45Intro, MagmaHideout_2F_2R_Text_Grunt45Defeat
msgbox MagmaHideout_2F_2R_Text_Grunt45PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_2F_2R_EventScript_Grunt8:: @ 8239E4D
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_8, MagmaHideout_2F_2R_Text_Grunt8Intro, MagmaHideout_2F_2R_Text_Grunt8Defeat
msgbox MagmaHideout_2F_2R_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_2R_Text_Grunt52Intro: @ 8239E64
MagmaHideout_2F_2R_Text_Grunt15Intro: @ 8239E64
.string "I don't have a bone to pick with you.\n"
.string "I'm just following orders!$"
MagmaHideout_2F_2R_Text_Grunt52Defeat: @ 8239EA5
MagmaHideout_2F_2R_Text_Grunt15Defeat: @ 8239EA5
.string "I may have lost, but…$"
MagmaHideout_2F_2R_Text_Grunt52PostBattle: @ 8239EBB
MagmaHideout_2F_2R_Text_Grunt15PostBattle: @ 8239EBB
.string "We dug up something beyond belief!\n"
.string "And, we got the BLUE ORB!\p"
.string "All that's left is for our leader to…\n"
.string "Fufufu… Fwahahaha!$"
MagmaHideout_2F_2R_Text_Grunt43Intro: @ 8239F31
MagmaHideout_2F_2R_Text_Grunt6Intro: @ 8239F31
.string "I can't stand heat. Maybe I should've\n"
.string "joined TEAM AQUA instead…$"
MagmaHideout_2F_2R_Text_Grunt43Defeat: @ 8239F71
MagmaHideout_2F_2R_Text_Grunt6Defeat: @ 8239F71
.string "Yeah, I really may not be right for\n"
.string "TEAM MAGMA…$"
MagmaHideout_2F_2R_Text_Grunt43PostBattle: @ 8239FA1
MagmaHideout_2F_2R_Text_Grunt6PostBattle: @ 8239FA1
.string "Don't you get lonely for the sea\n"
.string "being in a place like this?$"
MagmaHideout_2F_2R_Text_Grunt44Intro: @ 8239FDE
MagmaHideout_2F_2R_Text_Grunt7Intro: @ 8239FDE
.string "You can hear tremors here sometimes.\p"
.string "Could it be the volcano rattling?\n"
.string "Or is it GROU…\p"
.string "Whoops!\n"
.string "No, no, never mind!$"
MagmaHideout_2F_2R_Text_Grunt44Defeat: @ 823A050
MagmaHideout_2F_2R_Text_Grunt7Defeat: @ 823A050
.string "You're a fiery battler.\n"
.string "Just like a volcano!$"
MagmaHideout_2F_2R_Text_Grunt44PostBattle: @ 823A07D
MagmaHideout_2F_2R_Text_Grunt7PostBattle: @ 823A07D
.string "You just happened to win this time,\n"
.string "but that doesn't matter.\p"
.string "TEAM MAGMA's goal is about to be\n"
.string "reached!$"
MagmaHideout_2F_2R_Text_Grunt45Intro: @ 823A0E4
MagmaHideout_2F_2R_Text_Grunt8Intro: @ 823A0E4
.string "One of our guys was freaking out that\n"
.string "he lost his MAGMA EMBLEM…\p"
.string "Wait a minute!\n"
.string "Was it you who found it?$"
MagmaHideout_2F_2R_Text_Grunt45Defeat: @ 823A14C
MagmaHideout_2F_2R_Text_Grunt8Defeat: @ 823A14C
.string "I'm having trouble believing this…$"
MagmaHideout_2F_2R_Text_Grunt45PostBattle: @ 823A16F
MagmaHideout_2F_2R_Text_Grunt8PostBattle: @ 823A16F
.string "I'm getting this feeling that our plan\n"
.string "is going to end in failure…$"

4
data/maps/MagmaHideout_3F_1R/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
"script": "MagmaHideout_3F_1R_EventScript_Grunt46",
"script": "MagmaHideout_3F_1R_EventScript_Grunt9",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
"script": "MagmaHideout_3F_1R_EventScript_Grunt53",
"script": "MagmaHideout_3F_1R_EventScript_Grunt16",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{

24
data/maps/MagmaHideout_3F_1R/scripts.inc
View File

@@ -1,29 +1,29 @@
MagmaHideout_3F_1R_MapScripts:: @ 823A1B2
.byte 0
MagmaHideout_3F_1R_EventScript_Grunt46:: @ 823A1B3
trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_Grunt46Intro, MagmaHideout_3F_1R_Text_Grunt46Defeat
msgbox MagmaHideout_3F_1R_Text_Grunt46PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_3F_1R_EventScript_Grunt9:: @ 823A1B3
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_9, MagmaHideout_3F_1R_Text_Grunt9Intro, MagmaHideout_3F_1R_Text_Grunt9Defeat
msgbox MagmaHideout_3F_1R_Text_Grunt9PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_3F_1R_EventScript_Grunt53:: @ 823A1CA
trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_Grunt53Intro, MagmaHideout_3F_1R_Text_Grunt53Defeat
msgbox MagmaHideout_3F_1R_Text_Grunt53PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_3F_1R_EventScript_Grunt16:: @ 823A1CA
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_16, MagmaHideout_3F_1R_Text_Grunt16Intro, MagmaHideout_3F_1R_Text_Grunt16Defeat
msgbox MagmaHideout_3F_1R_Text_Grunt16PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_3F_1R_Text_Grunt46Intro: @ 823A1E1
MagmaHideout_3F_1R_Text_Grunt9Intro: @ 823A1E1
.string "What did I do to deserve this guard\n"
.string "posting?\p"
.string "My left ear is burning up!$"
MagmaHideout_3F_1R_Text_Grunt46Defeat: @ 823A229
MagmaHideout_3F_1R_Text_Grunt9Defeat: @ 823A229
.string "I'm getting heat exhaustion…$"
MagmaHideout_3F_1R_Text_Grunt46PostBattle: @ 823A246
MagmaHideout_3F_1R_Text_Grunt9PostBattle: @ 823A246
.string "Do you think it's odd that we're wearing\n"
.string "hoods in this magma-filled volcano?$"
MagmaHideout_3F_1R_Text_Grunt53Intro: @ 823A293
MagmaHideout_3F_1R_Text_Grunt16Intro: @ 823A293
.string "We joined so we can help our leader\n"
.string "achieve his fantastic vision.\p"
.string "I don't care if you're with TEAM AQUA\n"
@@ -31,11 +31,11 @@ MagmaHideout_3F_1R_Text_Grunt53Intro: @ 823A293
.string "No one interferes with us and gets\n"
.string "away with it!$"
MagmaHideout_3F_1R_Text_Grunt53Defeat: @ 823A353
MagmaHideout_3F_1R_Text_Grunt16Defeat: @ 823A353
.string "Oh, no!\n"
.string "You're not to be trusted at all!$"
MagmaHideout_3F_1R_Text_Grunt53PostBattle: @ 823A37C
MagmaHideout_3F_1R_Text_Grunt16PostBattle: @ 823A37C
.string "Listen to me.\n"
.string "TEAM MAGMA is right!\p"
.string "Don't listen to TEAM AQUA.\n"

2
data/maps/MagmaHideout_3F_2R/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MagmaHideout_3F_2R_EventScript_Grunt47",
"script": "MagmaHideout_3F_2R_EventScript_Grunt10",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{

12
data/maps/MagmaHideout_3F_2R/scripts.inc
View File

@@ -1,12 +1,12 @@
MagmaHideout_3F_2R_MapScripts:: @ 823A3D4
.byte 0
MagmaHideout_3F_2R_EventScript_Grunt47:: @ 823A3D5
trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_Grunt47Intro, MagmaHideout_3F_2R_Text_Grunt47Defeat
msgbox MagmaHideout_3F_2R_Text_Grunt47PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_3F_2R_EventScript_Grunt10:: @ 823A3D5
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_10, MagmaHideout_3F_2R_Text_Grunt10Intro, MagmaHideout_3F_2R_Text_Grunt10Defeat
msgbox MagmaHideout_3F_2R_Text_Grunt10PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_3F_2R_Text_Grunt47Intro: @ 823A3EC
MagmaHideout_3F_2R_Text_Grunt10Intro: @ 823A3EC
.string "I understand everything our leader\n"
.string "says. But you know what?\p"
.string "Doing stuff like digging up a super-\n"
@@ -15,11 +15,11 @@ MagmaHideout_3F_2R_Text_Grunt47Intro: @ 823A3EC
.string "I think we're going a little too far.\n"
.string "What do you think?$"
MagmaHideout_3F_2R_Text_Grunt47Defeat: @ 823A4BB
MagmaHideout_3F_2R_Text_Grunt10Defeat: @ 823A4BB
.string "Yeah, I think we are doing something\n"
.string "wrong somehow.$"
MagmaHideout_3F_2R_Text_Grunt47PostBattle: @ 823A4EF
MagmaHideout_3F_2R_Text_Grunt10PostBattle: @ 823A4EF
.string "You know, losing to you cleared my mind.\p"
.string "The next time I see our leader,\n"
.string "I'm going to ask him about what we do.$"

6
data/maps/MagmaHideout_4F/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MagmaHideout_4F_EventScript_Grunt48",
"script": "MagmaHideout_4F_EventScript_Grunt11",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MagmaHideout_4F_EventScript_Grunt49",
"script": "MagmaHideout_4F_EventScript_Grunt12",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MagmaHideout_4F_EventScript_Grunt50",
"script": "MagmaHideout_4F_EventScript_Grunt13",
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{

36
data/maps/MagmaHideout_4F/scripts.inc
View File

@@ -108,19 +108,19 @@ MagmaHideout_4F_Movement_MaxieLookAround: @ 823A680
delay_16
step_end
MagmaHideout_4F_EventScript_Grunt48:: @ 823A68C
trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_Grunt48Intro, MagmaHideout_4F_Text_Grunt48Defeat
msgbox MagmaHideout_4F_Text_Grunt48PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_4F_EventScript_Grunt11:: @ 823A68C
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_11, MagmaHideout_4F_Text_Grunt11Intro, MagmaHideout_4F_Text_Grunt11Defeat
msgbox MagmaHideout_4F_Text_Grunt11PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_4F_EventScript_Grunt49:: @ 823A6A3
trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_Grunt49Intro, MagmaHideout_4F_Text_Grunt49Defeat
msgbox MagmaHideout_4F_Text_Grunt49PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_4F_EventScript_Grunt12:: @ 823A6A3
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_12, MagmaHideout_4F_Text_Grunt12Intro, MagmaHideout_4F_Text_Grunt12Defeat
msgbox MagmaHideout_4F_Text_Grunt12PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_4F_EventScript_Grunt50:: @ 823A6BA
trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_Grunt50Intro, MagmaHideout_4F_Text_Grunt50Defeat
msgbox MagmaHideout_4F_Text_Grunt50PostBattle, MSGBOX_AUTOCLOSE
MagmaHideout_4F_EventScript_Grunt13:: @ 823A6BA
trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_13, MagmaHideout_4F_Text_Grunt13Intro, MagmaHideout_4F_Text_Grunt13Defeat
msgbox MagmaHideout_4F_Text_Grunt13PostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
@@ -128,41 +128,41 @@ MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
end
MagmaHideout_4F_Text_Grunt48Intro: @ 823A6E8
MagmaHideout_4F_Text_Grunt11Intro: @ 823A6E8
.string "I want to see GROUDON, too, but they\n"
.string "won't let me see even its tail…\p"
.string "It's got me feeling really frustrated.\p"
.string "Oh, no!\n"
.string "I blabbed about GROUDON!$"
MagmaHideout_4F_Text_Grunt48Defeat: @ 823A775
MagmaHideout_4F_Text_Grunt11Defeat: @ 823A775
.string "I guess it's impossible to win if one\n"
.string "doesn't have a calm mind…$"
MagmaHideout_4F_Text_Grunt48PostBattle: @ 823A7B5
MagmaHideout_4F_Text_Grunt11PostBattle: @ 823A7B5
.string "I wonder if GROUDON even has a tail?$"
MagmaHideout_4F_Text_Grunt49Intro: @ 823A7DA
MagmaHideout_4F_Text_Grunt12Intro: @ 823A7DA
.string "Fuhahaha!\n"
.string "Soon! Very soon!\l"
.string "Our grand objective will be achieved!$"
MagmaHideout_4F_Text_Grunt49Defeat: @ 823A81B
MagmaHideout_4F_Text_Grunt12Defeat: @ 823A81B
.string "Grrr…\n"
.string "I've come so far, but now this?$"
MagmaHideout_4F_Text_Grunt49PostBattle: @ 823A841
MagmaHideout_4F_Text_Grunt12PostBattle: @ 823A841
.string "MAXIE, sir!\n"
.string "An intruder is headed your way!$"
MagmaHideout_4F_Text_Grunt50Intro: @ 823A86D
MagmaHideout_4F_Text_Grunt13Intro: @ 823A86D
.string "You're not finished yet!\n"
.string "You're not getting by me easily!$"
MagmaHideout_4F_Text_Grunt50Defeat: @ 823A8A7
MagmaHideout_4F_Text_Grunt13Defeat: @ 823A8A7
.string "Was I that easy to knock down?$"
MagmaHideout_4F_Text_Grunt50PostBattle: @ 823A8C6
MagmaHideout_4F_Text_Grunt13PostBattle: @ 823A8C6
.string "C-come on, one more match…$"
MagmaHideout_4F_Text_TabithaIntro: @ 823A8E1

8
data/maps/MossdeepCity_SpaceCenter_1F/map.json
View File

@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt32",
"script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt3",
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt16",
"script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt1",
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt33",
"script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt4",
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt23",
"script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt2",
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
},
{

54
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
View File

@@ -215,27 +215,27 @@ MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote:: @ 82231CF
releaseall
end
MossdeepCity_SpaceCenter_1F_EventScript_Grunt32:: @ 82231DA
trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_Grunt32Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt32Defeat
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt32PostBattle, MSGBOX_AUTOCLOSE
MossdeepCity_SpaceCenter_1F_EventScript_Grunt3:: @ 82231DA
trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_3, MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_SpaceCenter_1F_EventScript_Grunt16:: @ 82231F1
trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_Grunt16Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt16Defeat
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt16PostBattle, MSGBOX_AUTOCLOSE
MossdeepCity_SpaceCenter_1F_EventScript_Grunt1:: @ 82231F1
trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_1, MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_SpaceCenter_1F_EventScript_Grunt33:: @ 8223208
trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_Grunt33Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt33Defeat
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt33PostBattle, MSGBOX_AUTOCLOSE
MossdeepCity_SpaceCenter_1F_EventScript_Grunt4:: @ 8223208
trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_4, MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_SpaceCenter_1F_EventScript_Grunt23:: @ 822321F
MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: @ 822321F
lock
faceplayer
goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_Grunt23Defeated
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt23Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_Grunt23Defeat
goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_2, MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat
setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F
copyobjectxytoperm 9
switch VAR_FACING
@@ -247,8 +247,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt23:: @ 822321F
release
end
MossdeepCity_SpaceCenter_1F_EventScript_Grunt23Defeated:: @ 822326E
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt23PostBattle, MSGBOX_DEFAULT
MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated:: @ 822326E
msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT
release
end
@@ -375,52 +375,52 @@ MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel: @ 8223849
.string "In the meantime, why don't you go\n"
.string "check out the town?$"
MossdeepCity_SpaceCenter_1F_Text_Grunt32Intro: @ 822396C
MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro: @ 822396C
.string "As promised, we've come for\n"
.string "the rocket fuel!$"
MossdeepCity_SpaceCenter_1F_Text_Grunt32Defeat: @ 8223999
MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat: @ 8223999
.string "Ran out of fuel…$"
MossdeepCity_SpaceCenter_1F_Text_Grunt32PostBattle: @ 82239AA
MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle: @ 82239AA
.string "Don't think you're on a roll just\n"
.string "because you've beaten me!$"
MossdeepCity_SpaceCenter_1F_Text_Grunt16Intro: @ 82239E6
MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro: @ 82239E6
.string "We gave you fair warning!\n"
.string "There's nothing sneaky about us!$"
MossdeepCity_SpaceCenter_1F_Text_Grunt16Defeat: @ 8223A21
MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat: @ 8223A21
.string "Grrr…\n"
.string "We should've used sneaky treachery…$"
MossdeepCity_SpaceCenter_1F_Text_Grunt16PostBattle: @ 8223A4B
MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle: @ 8223A4B
.string "Okay, I get it already! The next time,\n"
.string "we'll come unannounced.$"
MossdeepCity_SpaceCenter_1F_Text_Grunt33Intro: @ 8223A8A
MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro: @ 8223A8A
.string "The rocket fuel the SPACE CENTER has\n"
.string "in storage--that's what we're after.\p"
.string "We mean to take every last bit of it!$"
MossdeepCity_SpaceCenter_1F_Text_Grunt33Defeat: @ 8223AFA
MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat: @ 8223AFA
.string "Please, can you spare some fuel?\n"
.string "Even a chintzy cup will do!$"
MossdeepCity_SpaceCenter_1F_Text_Grunt33PostBattle: @ 8223B37
MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle: @ 8223B37
.string "What are we going to do with\n"
.string "the rocket fuel?\p"
.string "How would I know?\n"
.string "Ask our leader upstairs!$"
MossdeepCity_SpaceCenter_1F_Text_Grunt23Intro: @ 8223B90
MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro: @ 8223B90
.string "Our leader said no one, but no one,\n"
.string "gets past me!$"
MossdeepCity_SpaceCenter_1F_Text_Grunt23Defeat: @ 8223BC2
MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat: @ 8223BC2
.string "Ack! Ack! Aaack!$"
MossdeepCity_SpaceCenter_1F_Text_Grunt23PostBattle: @ 8223BD3
MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle: @ 8223BD3
.string "Please, tell our leader that\n"
.string "I never abandoned my post.\l"
.string "That I stayed to the bitter end…$"

6
data/maps/MossdeepCity_SpaceCenter_2F/map.json
View File

@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt35",
"script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt6",
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt34",
"script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt5",
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt36",
"script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt7",
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
},
{

54
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

@@ -53,21 +53,21 @@ MossdeepCity_SpaceCenter_2F_Movement_PlayerExit: @ 8223E07
step_end
MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt34Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_Grunt34Defeat
applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt34Defeated
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat
applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt35Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_Grunt35Defeat
applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt35Defeated
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat
applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt36Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_Grunt36Defeat
applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_Grunt36Defeated
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat
applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated
waitmovement 0
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 2
copyobjectxytoperm 5
@@ -76,19 +76,19 @@ MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09
releaseall
end
MossdeepCity_SpaceCenter_2F_Movement_Grunt35Defeated: @ 8223E81
MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated: @ 8223E81
lock_facing_direction
walk_left
unlock_facing_direction
step_end
MossdeepCity_SpaceCenter_2F_Movement_Grunt34Defeated: @ 8223E85
MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated: @ 8223E85
lock_facing_direction
walk_down
unlock_facing_direction
step_end
MossdeepCity_SpaceCenter_2F_Movement_Grunt36Defeated: @ 8223E89
MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated: @ 8223E89
lock_facing_direction
walk_right
unlock_facing_direction
@@ -158,16 +158,16 @@ MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma:: @ 8223F34
end
@ Battle for the below 3 grunts is handled in MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts
MossdeepCity_SpaceCenter_2F_EventScript_Grunt35:: @ 8223F3E
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt35PostBattle, MSGBOX_NPC
MossdeepCity_SpaceCenter_2F_EventScript_Grunt6:: @ 8223F3E
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle, MSGBOX_NPC
end
MossdeepCity_SpaceCenter_2F_EventScript_Grunt36:: @ 8223F47
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt36PostBattle, MSGBOX_NPC
MossdeepCity_SpaceCenter_2F_EventScript_Grunt7:: @ 8223F47
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle, MSGBOX_NPC
end
MossdeepCity_SpaceCenter_2F_EventScript_Grunt34:: @ 8223F50
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt34PostBattle, MSGBOX_NPC
MossdeepCity_SpaceCenter_2F_EventScript_Grunt5:: @ 8223F50
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle, MSGBOX_NPC
end
MossdeepCity_SpaceCenter_2F_EventScript_Tabitha:: @ 8223F59
@@ -408,39 +408,39 @@ MossdeepCity_SpaceCenter_2F_Text_GoodAnswer: @ 82243FE
.string "Good answer!\n"
.string "That's what a smart person'll do!$"
MossdeepCity_SpaceCenter_2F_Text_Grunt34Intro: @ 822442D
MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro: @ 822442D
.string "A reckless go-getter, are you?\n"
.string "Okay, I'll go first!$"
MossdeepCity_SpaceCenter_2F_Text_Grunt34Defeat: @ 8224461
MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat: @ 8224461
.string "I lost!\n"
.string "But!$"
MossdeepCity_SpaceCenter_2F_Text_Grunt35Intro: @ 822446E
MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro: @ 822446E
.string "It's too soon to be relieved!\n"
.string "I'm up next!$"
MossdeepCity_SpaceCenter_2F_Text_Grunt35Defeat: @ 8224499
MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat: @ 8224499
.string "I lost, too!\n"
.string "But!$"
MossdeepCity_SpaceCenter_2F_Text_Grunt36Intro: @ 82244AB
MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro: @ 82244AB
.string "I bet you want to take a break.\n"
.string "But I'm not about to let you do that!$"
MossdeepCity_SpaceCenter_2F_Text_Grunt36Defeat: @ 82244F1
MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat: @ 82244F1
.string "We should've taken a break…\n"
.string "That's what we should've done…$"
MossdeepCity_SpaceCenter_2F_Text_Grunt35PostBattle: @ 822452C
MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle: @ 822452C
.string "Three of us here, and look at the sorry\n"
.string "mess we got ourselves into.$"
MossdeepCity_SpaceCenter_2F_Text_Grunt36PostBattle: @ 8224570
MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle: @ 8224570
.string "We three losing like this…\n"
.string "We look worse than usual by triple!$"
MossdeepCity_SpaceCenter_2F_Text_Grunt34PostBattle: @ 82245AF
MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle: @ 82245AF
.string "Are we being useful to our leader\n"
.string "at all?$"

4
data/maps/MtChimney/map.json
View File

@@ -297,7 +297,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MtChimney_EventScript_Grunt31",
"script": "MtChimney_EventScript_Grunt2",
"flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
},
{
@@ -388,7 +388,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MtChimney_EventScript_Grunt24",
"script": "MtChimney_EventScript_Grunt1",
"flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
},
{

24
data/maps/MtChimney/scripts.inc
View File

@@ -427,9 +427,9 @@ MtChimney_EventScript_Tabitha:: @ 822F06E
msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_Grunt31:: @ 822F085
trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_Grunt31Intro, MtChimney_Text_Grunt31Defeat
msgbox MtChimney_Text_Grunt31PostBattle, MSGBOX_AUTOCLOSE
MtChimney_EventScript_Grunt2:: @ 822F085
trainerbattle_single TRAINER_GRUNT_MT_CHIMNEY_2, MtChimney_Text_Grunt2Intro, MtChimney_Text_Grunt2Defeat
msgbox MtChimney_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_BusyMagmaGrunt1:: @ 822F09C
@@ -533,9 +533,9 @@ MtChimney_EventScript_Shirley:: @ 822F1DA
msgbox MtChimney_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_Grunt24:: @ 822F1F1
trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_Grunt24Intro, MtChimney_Text_Grunt24Defeat
msgbox MtChimney_Text_Grunt24PostBattle, MSGBOX_AUTOCLOSE
MtChimney_EventScript_Grunt1:: @ 822F1F1
trainerbattle_single TRAINER_GRUNT_MT_CHIMNEY_1, MtChimney_Text_Grunt1Intro, MtChimney_Text_Grunt1Defeat
msgbox MtChimney_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_Sawyer:: @ 822F208
@@ -627,32 +627,32 @@ MtChimney_Text_TabithaPostBattle: @ 822F76D
.string "Give it the METEORITE's energy!\p"
.string "Hehehe…$"
MtChimney_Text_Grunt31Intro: @ 822F7A2
MtChimney_Text_Grunt2Intro: @ 822F7A2
.string "We of TEAM MAGMA are working hard for\n"
.string "everyone's sake.\p"
.string "Like, if that thing's power made more\n"
.string "land, there'd be more places to live.\p"
.string "Everyone'd be happy!$"
MtChimney_Text_Grunt31Defeat: @ 822F83A
MtChimney_Text_Grunt2Defeat: @ 822F83A
.string "Hunh?\n"
.string "What do you mean I lost?$"
MtChimney_Text_Grunt31PostBattle: @ 822F859
MtChimney_Text_Grunt2PostBattle: @ 822F859
.string "Our BOSS says, “It will make everyone\n"
.string "happy.”\p"
.string "But why does everyone keep getting\n"
.string "in our way?$"
MtChimney_Text_Grunt24Intro: @ 822F8B6
MtChimney_Text_Grunt1Intro: @ 822F8B6
.string "If there were more land, I'd be able\n"
.string "to get a big house of my own!\p"
.string "I'm going to build it on hardened lava!$"
MtChimney_Text_Grunt24Defeat: @ 822F921
MtChimney_Text_Grunt1Defeat: @ 822F921
.string "My dream of a big house…$"
MtChimney_Text_Grunt24PostBattle: @ 822F93A
MtChimney_Text_Grunt1PostBattle: @ 822F93A
.string "A kid like you, you ought to be\n"
.string "splashing about in the waves!$"

8
data/maps/MtPyre_Summit/map.json
View File

@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MtPyre_Summit_EventScript_Grunt17",
"script": "MtPyre_Summit_EventScript_Grunt1",
"flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MtPyre_Summit_EventScript_Grunt18",
"script": "MtPyre_Summit_EventScript_Grunt2",
"flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MtPyre_Summit_EventScript_Grunt19",
"script": "MtPyre_Summit_EventScript_Grunt3",
"flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "MtPyre_Summit_EventScript_Grunt29",
"script": "MtPyre_Summit_EventScript_Grunt4",
"flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
},
{

48
data/maps/MtPyre_Summit/scripts.inc
View File

@@ -422,40 +422,40 @@ MtPyre_Summit_Movement_MaxieApproachArchie2: @ 82323F8
walk_in_place_fastest_left
step_end
MtPyre_Summit_EventScript_Grunt17:: @ 82323FD
trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_Grunt17Intro, MtPyre_Summit_Text_Grunt17Defeat
msgbox MtPyre_Summit_Text_Grunt17PostBattle, MSGBOX_AUTOCLOSE
MtPyre_Summit_EventScript_Grunt1:: @ 82323FD
trainerbattle_single TRAINER_GRUNT_MT_PYRE_1, MtPyre_Summit_Text_Grunt1Intro, MtPyre_Summit_Text_Grunt1Defeat
msgbox MtPyre_Summit_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
MtPyre_Summit_EventScript_Grunt18:: @ 8232414
trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_Grunt18Intro, MtPyre_Summit_Text_Grunt18Defeat
msgbox MtPyre_Summit_Text_Grunt18PostBattle, MSGBOX_AUTOCLOSE
MtPyre_Summit_EventScript_Grunt2:: @ 8232414
trainerbattle_single TRAINER_GRUNT_MT_PYRE_2, MtPyre_Summit_Text_Grunt2Intro, MtPyre_Summit_Text_Grunt2Defeat
msgbox MtPyre_Summit_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
MtPyre_Summit_EventScript_Grunt19:: @ 823242B
trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_Grunt19Intro, MtPyre_Summit_Text_Grunt19Defeat
msgbox MtPyre_Summit_Text_Grunt19PostBattle, MSGBOX_AUTOCLOSE
MtPyre_Summit_EventScript_Grunt3:: @ 823242B
trainerbattle_single TRAINER_GRUNT_MT_PYRE_3, MtPyre_Summit_Text_Grunt3Intro, MtPyre_Summit_Text_Grunt3Defeat
msgbox MtPyre_Summit_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
MtPyre_Summit_EventScript_Grunt29:: @ 8232442
trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_Grunt29Intro, MtPyre_Summit_Text_Grunt29Defeat
msgbox MtPyre_Summit_Text_Grunt29PostBattle, MSGBOX_AUTOCLOSE
MtPyre_Summit_EventScript_Grunt4:: @ 8232442
trainerbattle_single TRAINER_GRUNT_MT_PYRE_4, MtPyre_Summit_Text_Grunt4Intro, MtPyre_Summit_Text_Grunt4Defeat
msgbox MtPyre_Summit_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
MtPyre_Summit_Text_Grunt17Intro: @ 8232459
MtPyre_Summit_Text_Grunt1Intro: @ 8232459
.string "No! Those TEAM MAGMA goons got\n"
.string "here ahead of us!\p"
.string "We can't fall behind!$"
MtPyre_Summit_Text_Grunt17Defeat: @ 82324A0
MtPyre_Summit_Text_Grunt1Defeat: @ 82324A0
.string "I thought you were one of the MAGMAS\n"
.string "who happened to come back…$"
MtPyre_Summit_Text_Grunt17PostBattle: @ 82324E0
MtPyre_Summit_Text_Grunt1PostBattle: @ 82324E0
.string "Yeah, so you are strong…\n"
.string "But there're a lot of us!$"
MtPyre_Summit_Text_Grunt18Intro: @ 8232513
MtPyre_Summit_Text_Grunt2Intro: @ 8232513
.string "Hah!\n"
.string "Too bad for you!\p"
.string "If you came earlier, you only would've\n"
@@ -463,42 +463,42 @@ MtPyre_Summit_Text_Grunt18Intro: @ 8232513
.string "But since you arrived now, you have\n"
.string "to take on us toughies!$"
MtPyre_Summit_Text_Grunt18Defeat: @ 82325B0
MtPyre_Summit_Text_Grunt2Defeat: @ 82325B0
.string "Urgh… I should've let you take on\n"
.string "TEAM MAGMA first…$"
MtPyre_Summit_Text_Grunt18PostBattle: @ 82325E4
MtPyre_Summit_Text_Grunt2PostBattle: @ 82325E4
.string "You don't know anything!\n"
.string "So why are you messing with us?$"
MtPyre_Summit_Text_Grunt19Intro: @ 823261D
MtPyre_Summit_Text_Grunt3Intro: @ 823261D
.string "You…\n"
.string "We saw you at MT. CHIMNEY.\p"
.string "You don't belong to either TEAM,\n"
.string "so why would you be here?$"
MtPyre_Summit_Text_Grunt19Defeat: @ 8232678
MtPyre_Summit_Text_Grunt3Defeat: @ 8232678
.string "If you're going to mess with anyone,\n"
.string "let it be TEAM MAGMA…$"
MtPyre_Summit_Text_Grunt19PostBattle: @ 82326B3
MtPyre_Summit_Text_Grunt3PostBattle: @ 82326B3
.string "Heh, it doesn't matter!\n"
.string "We bought ourselves some time!\p"
.string "The BOSS should have snatched what\n"
.string "he was after!$"
MtPyre_Summit_Text_Grunt29Intro: @ 823271B
MtPyre_Summit_Text_Grunt4Intro: @ 823271B
.string "Oh, I know!\n"
.string "You tried to join TEAM MAGMA,\l"
.string "but they wouldn't have you!\p"
.string "Well, don't think that we'll let you\n"
.string "join our TEAM AQUA!$"
MtPyre_Summit_Text_Grunt29Defeat: @ 823279A
MtPyre_Summit_Text_Grunt4Defeat: @ 823279A
.string "If you want to join TEAM AQUA that\n"
.string "badly, we can consider it…$"
MtPyre_Summit_Text_Grunt29PostBattle: @ 82327D8
MtPyre_Summit_Text_Grunt4PostBattle: @ 82327D8
.string "We have a great combination going\n"
.string "with us members and our leader.$"

4
data/maps/PetalburgWoods/scripts.inc
View File

@@ -26,7 +26,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7
applymovement 3, PetalburgWoods_Movement_AquaApproachPlayer
waitmovement 0
msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe
trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe
applymovement 3, PetalburgWoods_Movement_AquaBackOff
waitmovement 0
call PetalburgWoods_EventScript_DevonResearcherPostBattle
@@ -62,7 +62,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe
trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe
applymovement 3, PetalburgWoods_Movement_AquaBackOff
waitmovement 0
call PetalburgWoods_EventScript_DevonResearcherPostBattle

4
data/maps/Route119_WeatherInstitute_1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route119_WeatherInstitute_1F_EventScript_Grunt11",
"script": "Route119_WeatherInstitute_1F_EventScript_Grunt1",
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route119_WeatherInstitute_1F_EventScript_Grunt20",
"script": "Route119_WeatherInstitute_1F_EventScript_Grunt4",
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{

24
data/maps/Route119_WeatherInstitute_1F/scripts.inc
View File

@@ -61,40 +61,40 @@ Route119_WeatherInstitute_1F_EventScript_Bed:: @ 826FB18
releaseall
end
Route119_WeatherInstitute_1F_EventScript_Grunt11:: @ 826FB29
trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_Grunt11Intro, Route119_WeatherInstitute_1F_Text_Grunt11Defeat
msgbox Route119_WeatherInstitute_1F_Text_Grunt11PostBattle, MSGBOX_AUTOCLOSE
Route119_WeatherInstitute_1F_EventScript_Grunt1:: @ 826FB29
trainerbattle_single TRAINER_GRUNT_WEATHER_INST_1, Route119_WeatherInstitute_1F_Text_Grunt1Intro, Route119_WeatherInstitute_1F_Text_Grunt1Defeat
msgbox Route119_WeatherInstitute_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
Route119_WeatherInstitute_1F_EventScript_Grunt20:: @ 826FB40
trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_Grunt20Intro, Route119_WeatherInstitute_1F_Text_Grunt20Defeat
msgbox Route119_WeatherInstitute_1F_Text_Grunt20PostBattle, MSGBOX_AUTOCLOSE
Route119_WeatherInstitute_1F_EventScript_Grunt4:: @ 826FB40
trainerbattle_single TRAINER_GRUNT_WEATHER_INST_4, Route119_WeatherInstitute_1F_Text_Grunt4Intro, Route119_WeatherInstitute_1F_Text_Grunt4Defeat
msgbox Route119_WeatherInstitute_1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
Route119_WeatherInstitute_1F_Text_Grunt11Intro: @ 826FB57
Route119_WeatherInstitute_1F_Text_Grunt1Intro: @ 826FB57
.string "The BOSS got interested in\n"
.string "the research they have going here,\l"
.string "so he sent us out.\p"
.string "You quit meddling!$"
Route119_WeatherInstitute_1F_Text_Grunt11Defeat: @ 826FBBB
Route119_WeatherInstitute_1F_Text_Grunt1Defeat: @ 826FBBB
.string "Blast it…\n"
.string "Blasted by a kid…$"
Route119_WeatherInstitute_1F_Text_Grunt11PostBattle: @ 826FBD7
Route119_WeatherInstitute_1F_Text_Grunt1PostBattle: @ 826FBD7
.string "Our BOSS knows everything.\p"
.string "But I'm just a GRUNT. What would I know\n"
.string "about what he's thinking?$"
Route119_WeatherInstitute_1F_Text_Grunt20Intro: @ 826FC34
Route119_WeatherInstitute_1F_Text_Grunt4Intro: @ 826FC34
.string "Huh?\n"
.string "What's a kid doing here?$"
Route119_WeatherInstitute_1F_Text_Grunt20Defeat: @ 826FC52
Route119_WeatherInstitute_1F_Text_Grunt4Defeat: @ 826FC52
.string "Huh?\n"
.string "I lost?!$"
Route119_WeatherInstitute_1F_Text_Grunt20PostBattle: @ 826FC60
Route119_WeatherInstitute_1F_Text_Grunt4PostBattle: @ 826FC60
.string "Oh, no…\n"
.string "I'll catch an earful for losing to a kid…\p"
.string "I should just take a nap in the bed…$"

6
data/maps/Route119_WeatherInstitute_2F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route119_WeatherInstitute_2F_EventScript_Grunt12",
"script": "Route119_WeatherInstitute_2F_EventScript_Grunt2",
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route119_WeatherInstitute_2F_EventScript_Grunt13",
"script": "Route119_WeatherInstitute_2F_EventScript_Grunt3",
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route119_WeatherInstitute_2F_EventScript_Grunt37",
"script": "Route119_WeatherInstitute_2F_EventScript_Grunt5",
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
}
],

36
data/maps/Route119_WeatherInstitute_2F/scripts.inc
View File

@@ -25,19 +25,19 @@ Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear:: @ 826FF5C
setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP
return
Route119_WeatherInstitute_2F_EventScript_Grunt37:: @ 826FF68
trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_Grunt37Intro, Route119_WeatherInstitute_2F_Text_Grunt37Defeat
msgbox Route119_WeatherInstitute_2F_Text_Grunt37PostBattle, MSGBOX_AUTOCLOSE
Route119_WeatherInstitute_2F_EventScript_Grunt5:: @ 826FF68
trainerbattle_single TRAINER_GRUNT_WEATHER_INST_5, Route119_WeatherInstitute_2F_Text_Grunt5Intro, Route119_WeatherInstitute_2F_Text_Grunt5Defeat
msgbox Route119_WeatherInstitute_2F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
end
Route119_WeatherInstitute_2F_EventScript_Grunt12:: @ 826FF7F
trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_Grunt12Intro, Route119_WeatherInstitute_2F_Text_Grunt12Defeat
msgbox Route119_WeatherInstitute_2F_Text_Grunt12PostBattle, MSGBOX_AUTOCLOSE
Route119_WeatherInstitute_2F_EventScript_Grunt2:: @ 826FF7F
trainerbattle_single TRAINER_GRUNT_WEATHER_INST_2, Route119_WeatherInstitute_2F_Text_Grunt2Intro, Route119_WeatherInstitute_2F_Text_Grunt2Defeat
msgbox Route119_WeatherInstitute_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
Route119_WeatherInstitute_2F_EventScript_Grunt13:: @ 826FF96
trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_Grunt13Intro, Route119_WeatherInstitute_2F_Text_Grunt13Defeat
msgbox Route119_WeatherInstitute_2F_Text_Grunt13PostBattle, MSGBOX_AUTOCLOSE
Route119_WeatherInstitute_2F_EventScript_Grunt3:: @ 826FF96
trainerbattle_single TRAINER_GRUNT_WEATHER_INST_3, Route119_WeatherInstitute_2F_Text_Grunt3Intro, Route119_WeatherInstitute_2F_Text_Grunt3Defeat
msgbox Route119_WeatherInstitute_2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD
@@ -211,42 +211,42 @@ Route119_WeatherInstitute_2F_EventScript_WeatherScientist:: @ 827018B
goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform
end
Route119_WeatherInstitute_2F_Text_Grunt12Intro: @ 827019C
Route119_WeatherInstitute_2F_Text_Grunt2Intro: @ 827019C
.string "The INSTITUTE created a type of\n"
.string "POKéMON that has something to do with\l"
.string "the weather. We're here to take them!$"
Route119_WeatherInstitute_2F_Text_Grunt12Defeat: @ 8270208
Route119_WeatherInstitute_2F_Text_Grunt2Defeat: @ 8270208
.string "Our plan's being spoiled by a kid?$"
Route119_WeatherInstitute_2F_Text_Grunt12PostBattle: @ 827022B
Route119_WeatherInstitute_2F_Text_Grunt2PostBattle: @ 827022B
.string "If the POKéMON they made here can\n"
.string "control the weather freely, then we of\l"
.string "TEAM AQUA definitely need it!$"
Route119_WeatherInstitute_2F_Text_Grunt13Intro: @ 8270292
Route119_WeatherInstitute_2F_Text_Grunt3Intro: @ 8270292
.string "We're TEAM AQUA!\n"
.string "We appear wherever anything rare is\l"
.string "found!$"
Route119_WeatherInstitute_2F_Text_Grunt13Defeat: @ 82702CE
Route119_WeatherInstitute_2F_Text_Grunt3Defeat: @ 82702CE
.string "You got me!$"
Route119_WeatherInstitute_2F_Text_Grunt13PostBattle: @ 82702DA
Route119_WeatherInstitute_2F_Text_Grunt3PostBattle: @ 82702DA
.string "You don't have any idea what we of\n"
.string "TEAM AQUA are working towards!\l"
.string "You stay out of our way!$"
Route119_WeatherInstitute_2F_Text_Grunt37Intro: @ 8270335
Route119_WeatherInstitute_2F_Text_Grunt5Intro: @ 8270335
.string "Don't tell me you're looking for that\n"
.string "weather POKéMON, too?\p"
.string "That's a no-no!\n"
.string "We were here to get it first!$"
Route119_WeatherInstitute_2F_Text_Grunt37Defeat: @ 827039F
Route119_WeatherInstitute_2F_Text_Grunt5Defeat: @ 827039F
.string "Oh, will you look at my POKéMON?$"
Route119_WeatherInstitute_2F_Text_Grunt37PostBattle: @ 82703C0
Route119_WeatherInstitute_2F_Text_Grunt5PostBattle: @ 82703C0
.string "Humph, so what?\n"
.string "What we want…\p"
.string "What we really want isn't here…\n"

2
data/maps/RusturfTunnel/scripts.inc
View File

@@ -312,7 +312,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
faceplayer
playbgm MUS_AQA_0, 0
msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0
trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_22D2B0
msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT
giveitem_std ITEM_DEVON_GOODS
closemessage

4
data/maps/SeafloorCavern_Room1/map.json
View File

@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "SeafloorCavern_Room1_EventScript_Grunt5",
"script": "SeafloorCavern_Room1_EventScript_Grunt1",
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "SeafloorCavern_Room1_EventScript_Grunt6",
"script": "SeafloorCavern_Room1_EventScript_Grunt2",
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
}
],

24
data/maps/SeafloorCavern_Room1/scripts.inc
View File

@@ -1,35 +1,35 @@
SeafloorCavern_Room1_MapScripts:: @ 82347EB
.byte 0
SeafloorCavern_Room1_EventScript_Grunt5:: @ 82347EC
trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_Grunt5Intro, SeafloorCavern_Room1_Text_Grunt5Defeat
msgbox SeafloorCavern_Room1_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
SeafloorCavern_Room1_EventScript_Grunt1:: @ 82347EC
trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_1, SeafloorCavern_Room1_Text_Grunt1Intro, SeafloorCavern_Room1_Text_Grunt1Defeat
msgbox SeafloorCavern_Room1_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
SeafloorCavern_Room1_EventScript_Grunt6:: @ 8234803
trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_Grunt6Intro, SeafloorCavern_Room1_Text_Grunt6Defeat
msgbox SeafloorCavern_Room1_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
SeafloorCavern_Room1_EventScript_Grunt2:: @ 8234803
trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_2, SeafloorCavern_Room1_Text_Grunt2Intro, SeafloorCavern_Room1_Text_Grunt2Defeat
msgbox SeafloorCavern_Room1_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
SeafloorCavern_Room1_Text_Grunt5Intro: @ 823481A
SeafloorCavern_Room1_Text_Grunt1Intro: @ 823481A
.string "We don't need a kid around!\n"
.string "Go on home already!$"
SeafloorCavern_Room1_Text_Grunt5Defeat: @ 823484A
SeafloorCavern_Room1_Text_Grunt1Defeat: @ 823484A
.string "I want to go home…$"
SeafloorCavern_Room1_Text_Grunt5PostBattle: @ 823485D
SeafloorCavern_Room1_Text_Grunt1PostBattle: @ 823485D
.string "I want to get a promotion so I can\n"
.string "boss around the GRUNTS…$"
SeafloorCavern_Room1_Text_Grunt6Intro: @ 8234898
SeafloorCavern_Room1_Text_Grunt2Intro: @ 8234898
.string "That submarine… It's tiny inside.\n"
.string "I'm sore all over!$"
SeafloorCavern_Room1_Text_Grunt6Defeat: @ 82348CD
SeafloorCavern_Room1_Text_Grunt2Defeat: @ 82348CD
.string "Losing makes me sore!$"
SeafloorCavern_Room1_Text_Grunt6PostBattle: @ 82348E3
SeafloorCavern_Room1_Text_Grunt2PostBattle: @ 82348E3
.string "That submarine we jacked, man,\n"
.string "it's brutal as a ride.\l"
.string "It's way too tight in there!$"

2
data/maps/SeafloorCavern_Room3/map.json
View File

@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
"script": "SeafloorCavern_Room3_EventScript_Grunt27",
"script": "SeafloorCavern_Room3_EventScript_Grunt5",
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
}
],

12
data/maps/SeafloorCavern_Room3/scripts.inc
View File

@@ -6,9 +6,9 @@ SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938
msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
end
SeafloorCavern_Room3_EventScript_Grunt27:: @ 823494F
trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_Grunt27Intro, SeafloorCavern_Room3_Text_Grunt27Defeat
msgbox SeafloorCavern_Room3_Text_Grunt27PostBattle, MSGBOX_AUTOCLOSE
SeafloorCavern_Room3_EventScript_Grunt5:: @ 823494F
trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_5, SeafloorCavern_Room3_Text_Grunt5Intro, SeafloorCavern_Room3_Text_Grunt5Defeat
msgbox SeafloorCavern_Room3_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
end
SeafloorCavern_Room3_Text_ShellyIntro: @ 8234966
@@ -36,7 +36,7 @@ SeafloorCavern_Room3_Text_ShellyPostBattle: @ 8234A8A
.string "world our BOSS has promised as\l"
.string "one of us…$"
SeafloorCavern_Room3_Text_Grunt27Intro: @ 8234B3A
SeafloorCavern_Room3_Text_Grunt5Intro: @ 8234B3A
.string "For our dream to become real, we need\n"
.string "the power of POKéMON.\p"
.string "But meddlers like you use the power of\n"
@@ -45,10 +45,10 @@ SeafloorCavern_Room3_Text_Grunt27Intro: @ 8234B3A
.string "Life just doesn't work the way we\n"
.string "need it to!$"
SeafloorCavern_Room3_Text_Grunt27Defeat: @ 8234BFE
SeafloorCavern_Room3_Text_Grunt5Defeat: @ 8234BFE
.string "Gwah!$"
SeafloorCavern_Room3_Text_Grunt27PostBattle: @ 8234C04
SeafloorCavern_Room3_Text_Grunt5PostBattle: @ 8234C04
.string "You know, we don't dare question\n"
.string "the motives of our leader.\p"
.string "But here you are, just some punk,\n"

4
data/maps/SeafloorCavern_Room4/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "SeafloorCavern_Room4_EventScript_Grunt7",
"script": "SeafloorCavern_Room4_EventScript_Grunt3",
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "SeafloorCavern_Room4_EventScript_Grunt9",
"script": "SeafloorCavern_Room4_EventScript_Grunt4",
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
}
],

24
data/maps/SeafloorCavern_Room4/scripts.inc
View File

@@ -1,35 +1,35 @@
SeafloorCavern_Room4_MapScripts:: @ 8234C9B
.byte 0
SeafloorCavern_Room4_EventScript_Grunt7:: @ 8234C9C
trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_Grunt7Intro, SeafloorCavern_Room4_Text_Grunt7Defeat
msgbox SeafloorCavern_Room4_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
SeafloorCavern_Room4_EventScript_Grunt3:: @ 8234C9C
trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_3, SeafloorCavern_Room4_Text_Grunt3Intro, SeafloorCavern_Room4_Text_Grunt3Defeat
msgbox SeafloorCavern_Room4_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
SeafloorCavern_Room4_EventScript_Grunt9:: @ 8234CB3
trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_Grunt9Intro, SeafloorCavern_Room4_Text_Grunt9Defeat
msgbox SeafloorCavern_Room4_Text_Grunt9PostBattle, MSGBOX_AUTOCLOSE
SeafloorCavern_Room4_EventScript_Grunt4:: @ 8234CB3
trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_4, SeafloorCavern_Room4_Text_Grunt4Intro, SeafloorCavern_Room4_Text_Grunt4Defeat
msgbox SeafloorCavern_Room4_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
SeafloorCavern_Room4_Text_Grunt7Intro: @ 8234CCA
SeafloorCavern_Room4_Text_Grunt3Intro: @ 8234CCA
.string "Who are you?\n"
.string "Where did you come in from?$"
SeafloorCavern_Room4_Text_Grunt7Defeat: @ 8234CF3
SeafloorCavern_Room4_Text_Grunt3Defeat: @ 8234CF3
.string "Lost it…$"
SeafloorCavern_Room4_Text_Grunt7PostBattle: @ 8234CFC
SeafloorCavern_Room4_Text_Grunt3PostBattle: @ 8234CFC
.string "I can't find the way out!\p"
.string "I'm not afraid. Don't get me wrong!$"
SeafloorCavern_Room4_Text_Grunt9Intro: @ 8234D3A
SeafloorCavern_Room4_Text_Grunt4Intro: @ 8234D3A
.string "Who are you?\n"
.string "Where do you think you're going?$"
SeafloorCavern_Room4_Text_Grunt9Defeat: @ 8234D68
SeafloorCavern_Room4_Text_Grunt4Defeat: @ 8234D68
.string "I failed to win!$"
SeafloorCavern_Room4_Text_Grunt9PostBattle: @ 8234D79
SeafloorCavern_Room4_Text_Grunt4PostBattle: @ 8234D79
.string "My partner forgot the map in that\n"
.string "submarine!\p"
.string "How's that for being useless?$"

8
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
View File

@@ -32,7 +32,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth
compare VAR_FACING, DIR_WEST
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest
trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_Grunt14Defeat
trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_1, SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat
msgbox SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious, MSGBOX_DEFAULT
closemessage
applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated
@@ -40,7 +40,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle
waitmovement 0
msgbox SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_Grunt15Defeat
trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_2, SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated
waitmovement 0
applymovement 3, Common_Movement_WalkInPlaceFastestDown
@@ -295,7 +295,7 @@ SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua: @ 820BE93
.string "Our BOSS wants those parts!\n"
.string "Shut your yap and fork them over!$"
SlateportCity_OceanicMuseum_2F_Text_Grunt14Defeat: @ 820BEE2
SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat: @ 820BEE2
.string "Awaaaah!\n"
.string "A kid beat me!$"
@@ -307,7 +307,7 @@ SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis: @ 820BF35
.string "Humph, sniveling wimp!\n"
.string "Let me take care of this!$"
SlateportCity_OceanicMuseum_2F_Text_Grunt15Defeat: @ 820BF66
SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat: @ 820BF66
.string "What?!\n"
.string "I lost, too!$"