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

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"