dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SilphCo_9F/scripts.inc
+8 -8
View File
@@ -1,15 +1,15 @@
SilphCo_9F_MapScripts:: @ 8161CDE
SilphCo_9F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, SilphCo_9F_OnLoad
.byte 0
SilphCo_9F_OnLoad:: @ 8161CE4
SilphCo_9F_OnLoad::
call_if_unset FLAG_SILPH_9F_DOOR_1, EventScript_Close9FDoor1
call_if_unset FLAG_SILPH_9F_DOOR_2, EventScript_Close9FDoor2
call_if_unset FLAG_SILPH_9F_DOOR_3, EventScript_Close9FDoor3
call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4
end
SilphCo_9F_EventScript_HealWoman:: @ 8161D09
SilphCo_9F_EventScript_HealWoman::
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
@@ -21,26 +21,26 @@ SilphCo_9F_EventScript_HealWoman:: @ 8161D09
release
end
SilphCo_9F_EventScript_HealWomanRocketsGone:: @ 8161D2E
SilphCo_9F_EventScript_HealWomanRocketsGone::
msgbox SilphCo_9F_Text_ThankYouSoMuch
release
end
SilphCo_9F_EventScript_FloorSign:: @ 8161D38
SilphCo_9F_EventScript_FloorSign::
msgbox SilphCo_9F_Text_FloorSign, MSGBOX_SIGN
end
SilphCo_9F_EventScript_Ed:: @ 8161D41
SilphCo_9F_EventScript_Ed::
trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat
msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_9F_EventScript_Grunt1:: @ 8161D58
SilphCo_9F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat
msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_9F_EventScript_Grunt2:: @ 8161D6F
SilphCo_9F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat
msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SilphCo_9F/text.inc
+13 -13
View File
@@ -1,47 +1,47 @@
SilphCo_9F_Text_YouShouldTakeQuickNap:: @ 8176B54
SilphCo_9F_Text_YouShouldTakeQuickNap::
.string "You look tired.\n"
.string "You should take a quick nap.$"
SilphCo_9F_Text_DontGiveUp:: @ 8176B81
SilphCo_9F_Text_DontGiveUp::
.string "Don't give up!$"
SilphCo_9F_Text_ThankYouSoMuch:: @ 8176B90
SilphCo_9F_Text_ThankYouSoMuch::
.string "Thank you so much.$"
SilphCo_9F_Text_Grunt1Intro:: @ 8176BA3
SilphCo_9F_Text_Grunt1Intro::
.string "Your POKéMON seem to adore you,\n"
.string "kid!$"
SilphCo_9F_Text_Grunt1Defeat:: @ 8176BC8
SilphCo_9F_Text_Grunt1Defeat::
.string "Ghaaah!$"
SilphCo_9F_Text_Grunt1PostBattle:: @ 8176BD0
SilphCo_9F_Text_Grunt1PostBattle::
.string "If I had started as a TRAINER at\n"
.string "your age…$"
SilphCo_9F_Text_EdIntro:: @ 8176BFB
SilphCo_9F_Text_EdIntro::
.string "Your POKéMON have weak points!\n"
.string "I can nail them!$"
SilphCo_9F_Text_EdDefeat:: @ 8176C2B
SilphCo_9F_Text_EdDefeat::
.string "You hammered me!$"
SilphCo_9F_Text_EdPostBattle:: @ 8176C3C
SilphCo_9F_Text_EdPostBattle::
.string "Exploiting weak spots does work.\n"
.string "Think about type advantages.$"
SilphCo_9F_Text_Grunt2Intro:: @ 8176C7A
SilphCo_9F_Text_Grunt2Intro::
.string "I am one of the four ROCKET\n"
.string "BROTHERS!$"
SilphCo_9F_Text_Grunt2Defeat:: @ 8176CA0
SilphCo_9F_Text_Grunt2Defeat::
.string "Warg!\n"
.string "Brothers, I lost!$"
SilphCo_9F_Text_Grunt2PostBattle:: @ 8176CB8
SilphCo_9F_Text_Grunt2PostBattle::
.string "My brothers will avenge me!$"
SilphCo_9F_Text_FloorSign:: @ 8176CD4
SilphCo_9F_Text_FloorSign::
.string "SILPH CO. HEAD OFFICE\n"
.string "9F$"