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_3F/scripts.inc
+7 -7
View File
@@ -1,13 +1,13 @@
SilphCo_3F_MapScripts:: @ 81616C5
SilphCo_3F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, SilphCo_3F_OnLoad
.byte 0
SilphCo_3F_OnLoad:: @ 81616CB
SilphCo_3F_OnLoad::
call_if_unset FLAG_SILPH_3F_DOOR_1, EventScript_Close3FDoor1
call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2
end
SilphCo_3F_EventScript_WorkerM:: @ 81616DE
SilphCo_3F_EventScript_WorkerM::
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
@@ -16,21 +16,21 @@ SilphCo_3F_EventScript_WorkerM:: @ 81616DE
release
end
SilphCo_3F_EventScript_WorkerMRocketsGone:: @ 81616F5
SilphCo_3F_EventScript_WorkerMRocketsGone::
msgbox SilphCo_3F_Text_YouAndYourMonsSavedUs
release
end
SilphCo_3F_EventScript_FloorSign:: @ 81616FF
SilphCo_3F_EventScript_FloorSign::
msgbox SilphCo_3F_Text_FloorSign, MSGBOX_SIGN
end
SilphCo_3F_EventScript_Jose:: @ 8161708
SilphCo_3F_EventScript_Jose::
trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat
msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_3F_EventScript_Grunt:: @ 816171F
SilphCo_3F_EventScript_Grunt::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat
msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SilphCo_3F/text.inc
+9 -9
View File
@@ -1,34 +1,34 @@
SilphCo_3F_Text_WhatAmIToDo:: @ 81758AD
SilphCo_3F_Text_WhatAmIToDo::
.string "I work for SILPH CO.\n"
.string "What am I to do?$"
SilphCo_3F_Text_YouAndYourMonsSavedUs:: @ 81758D3
SilphCo_3F_Text_YouAndYourMonsSavedUs::
.string "{PLAYER}!\n"
.string "You and your POKéMON saved us!$"
SilphCo_3F_Text_GruntIntro:: @ 81758F6
SilphCo_3F_Text_GruntIntro::
.string "Quit messing with us, kid!$"
SilphCo_3F_Text_GruntDefeat:: @ 8175911
SilphCo_3F_Text_GruntDefeat::
.string "I give up!$"
SilphCo_3F_Text_GruntPostBattle:: @ 817591C
SilphCo_3F_Text_GruntPostBattle::
.string "A hint? You can open doors with\n"
.string "a CARD KEY!$"
SilphCo_3F_Text_JoseIntro:: @ 8175948
SilphCo_3F_Text_JoseIntro::
.string "I support TEAM ROCKET more than\n"
.string "I support SILPH CO.!$"
SilphCo_3F_Text_JoseDefeat:: @ 817597D
SilphCo_3F_Text_JoseDefeat::
.string "You really got me!$"
SilphCo_3F_Text_JosePostBattle:: @ 8175990
SilphCo_3F_Text_JosePostBattle::
.string "Humph…\p"
.string "TEAM ROCKET said that if I helped\n"
.string "them, they'd let me study POKéMON.$"
SilphCo_3F_Text_FloorSign:: @ 81759DC
SilphCo_3F_Text_FloorSign::
.string "SILPH CO. HEAD OFFICE\n"
.string "3F$"