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_11F/scripts.inc
+20 -20
View File
@@ -2,15 +2,15 @@
.set LOCALID_GRUNT1, 4
.set LOCALID_GRUNT2, 6
SilphCo_11F_MapScripts:: @ 8161DEE
SilphCo_11F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, SilphCo_11F_OnLoad
.byte 0
SilphCo_11F_OnLoad:: @ 8161DF4
SilphCo_11F_OnLoad::
call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor
end
SilphCo_11F_EventScript_President:: @ 8161DFE
SilphCo_11F_EventScript_President::
lock
faceplayer
goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, SilphCo_11F_EventScript_AlreadyGotMasterBall
@@ -28,41 +28,41 @@ SilphCo_11F_EventScript_President:: @ 8161DFE
release
end
SilphCo_11F_EventScript_PresidentThanksMale:: @ 8161E59
SilphCo_11F_EventScript_PresidentThanksMale::
msgbox SilphCo_11F_Text_ThanksForSavingMeDearBoy
return
SilphCo_11F_EventScript_PresidentThanksFemale:: @ 8161E62
SilphCo_11F_EventScript_PresidentThanksFemale::
msgbox SilphCo_11F_Text_ThanksForSavingMeDearGirl
return
SilphCo_11F_EventScript_NoRoomForMasterBall:: @ 8161E6B
SilphCo_11F_EventScript_NoRoomForMasterBall::
msgbox SilphCo_11F_Text_YouHaveNoRoomForThis
release
end
SilphCo_11F_EventScript_AlreadyGotMasterBall:: @ 8161E75
SilphCo_11F_EventScript_AlreadyGotMasterBall::
msgbox SilphCo_11F_Text_ThatsOurSecretPrototype
release
end
SilphCo_11F_EventScript_Secretary:: @ 8161E7F
SilphCo_11F_EventScript_Secretary::
msgbox SilphCo_11F_Text_ThanksForRescuingUs, MSGBOX_NPC
end
SilphCo_11F_EventScript_GiovanniTriggerLeft:: @ 8161E88
SilphCo_11F_EventScript_GiovanniTriggerLeft::
lockall
setvar VAR_TEMP_1, 0
goto SilphCo_11F_EventScript_BattleGiovanni
end
SilphCo_11F_EventScript_GiovanniTriggerRight:: @ 8161E94
SilphCo_11F_EventScript_GiovanniTriggerRight::
lockall
setvar VAR_TEMP_1, 1
goto SilphCo_11F_EventScript_BattleGiovanni
end
SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0
SilphCo_11F_EventScript_BattleGiovanni::
textcolor 0
applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown
waitmovement 0
@@ -88,18 +88,18 @@ SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0
releaseall
end
SilphCo_11F_EventScript_GiovanniApproachLeft:: @ 8161F00
SilphCo_11F_EventScript_GiovanniApproachLeft::
applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachLeft
applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni
waitmovement 0
return
SilphCo_11F_EventScript_GiovanniApproachRight:: @ 8161F12
SilphCo_11F_EventScript_GiovanniApproachRight::
applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachRight
waitmovement 0
return
SilphCo_11F_Movement_GiovanniApproachLeft:: @ 8161F1D
SilphCo_11F_Movement_GiovanniApproachLeft::
walk_down
walk_down
walk_down
@@ -107,13 +107,13 @@ SilphCo_11F_Movement_GiovanniApproachLeft:: @ 8161F1D
walk_in_place_fastest_left
step_end
SilphCo_11F_Movement_GiovanniApproachRight:: @ 8161F23
SilphCo_11F_Movement_GiovanniApproachRight::
walk_down
walk_down
walk_down
step_end
SilphCo_11F_Movement_PlayerFaceGiovanni:: @ 8161F27
SilphCo_11F_Movement_PlayerFaceGiovanni::
delay_16
delay_16
delay_16
@@ -123,20 +123,20 @@ SilphCo_11F_Movement_PlayerFaceGiovanni:: @ 8161F27
step_end
@ Unused
SilphCo_11F_EventScript_Monitor:: @ 8161F2E
SilphCo_11F_EventScript_Monitor::
msgbox SilphCo_11F_Text_MonitorHasMonsOnIt, MSGBOX_SIGN
end
SilphCo_11F_EventScript_FloorSign:: @ 8161F37
SilphCo_11F_EventScript_FloorSign::
msgbox SilphCo_11F_Text_FloorSign, MSGBOX_SIGN
end
SilphCo_11F_EventScript_Grunt1:: @ 8161F40
SilphCo_11F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat
msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_11F_EventScript_Grunt2:: @ 8161F57
SilphCo_11F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat
msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SilphCo_11F/text.inc
+17 -17
View File
@@ -1,4 +1,4 @@
SilphCo_11F_Text_ThanksForSavingMeDearBoy:: @ 8176E12
SilphCo_11F_Text_ThanksForSavingMeDearBoy::
.string "PRESIDENT: Oh, dear boy!\n"
.string "Thank you for saving SILPH.\p"
.string "I will never forget you saved us in\n"
@@ -8,7 +8,7 @@ SilphCo_11F_Text_ThanksForSavingMeDearBoy:: @ 8176E12
.string "anything.\p"
.string "Here, maybe this will do.$"
SilphCo_11F_Text_ThanksForSavingMeDearGirl:: @ 8176EE7
SilphCo_11F_Text_ThanksForSavingMeDearGirl::
.string "PRESIDENT: Oh, dear girl!\n"
.string "Thank you for saving SILPH.\p"
.string "I will never forget you saved us in\n"
@@ -18,11 +18,11 @@ SilphCo_11F_Text_ThanksForSavingMeDearGirl:: @ 8176EE7
.string "anything.\p"
.string "Here, maybe this will do.$"
SilphCo_11F_Text_ObtainedMasterBallFromPresident:: @ 8176FBD
SilphCo_11F_Text_ObtainedMasterBallFromPresident::
.string "{PLAYER} obtained a MASTER BALL\n"
.string "from the PRESIDENT!$"
SilphCo_11F_Text_ThatsOurSecretPrototype:: @ 8176FEB
SilphCo_11F_Text_ThatsOurSecretPrototype::
.string "PRESIDENT: You can't buy that\n"
.string "anywhere.\p"
.string "It's our secret prototype MASTER\n"
@@ -32,16 +32,16 @@ SilphCo_11F_Text_ThatsOurSecretPrototype:: @ 8176FEB
.string "You should be quiet about using it,\n"
.string "though.$"
SilphCo_11F_Text_YouHaveNoRoomForThis:: @ 817708E
SilphCo_11F_Text_YouHaveNoRoomForThis::
.string "You have no room for this.$"
SilphCo_11F_Text_ThanksForRescuingUs:: @ 81770A9
SilphCo_11F_Text_ThanksForRescuingUs::
.string "SECRETARY: Thank you for rescuing\n"
.string "all of us.\p"
.string "We, from the PRESIDENT down,\n"
.string "are indebted to you.$"
SilphCo_11F_Text_GiovanniIntro:: @ 8177108
SilphCo_11F_Text_GiovanniIntro::
.string "Ah, {PLAYER}!\n"
.string "So we meet again!\p"
.string "The PRESIDENT and I are discussing\n"
@@ -50,11 +50,11 @@ SilphCo_11F_Text_GiovanniIntro:: @ 8177108
.string "matters…\p"
.string "Or, experience a world of pain!$"
SilphCo_11F_Text_GiovanniDefeat:: @ 81771AB
SilphCo_11F_Text_GiovanniDefeat::
.string "Arrgh!!\n"
.string "I lost again!?$"
SilphCo_11F_Text_GiovanniPostBattle:: @ 81771C2
SilphCo_11F_Text_GiovanniPostBattle::
.string "Blast it all!\n"
.string "You ruined our plans for SILPH!\p"
.string "But, TEAM ROCKET will never fall!\p"
@@ -62,33 +62,33 @@ SilphCo_11F_Text_GiovanniPostBattle:: @ 81771C2
.string "POKéMON exist for TEAM ROCKET!\p"
.string "I must go, but I shall return!$"
SilphCo_11F_Text_Grunt2Intro:: @ 817726A
SilphCo_11F_Text_Grunt2Intro::
.string "Stop right there!\n"
.string "Don't you move!$"
SilphCo_11F_Text_Grunt2Defeat:: @ 817728C
SilphCo_11F_Text_Grunt2Defeat::
.string "Don't…\n"
.string "Please!$"
SilphCo_11F_Text_Grunt2PostBattle:: @ 817729B
SilphCo_11F_Text_Grunt2PostBattle::
.string "So, you want to see my BOSS?$"
SilphCo_11F_Text_Grunt1Intro:: @ 81772B8
SilphCo_11F_Text_Grunt1Intro::
.string "Halt! Do you have an appointment\n"
.string "with my BOSS?$"
SilphCo_11F_Text_Grunt1Defeat:: @ 81772E7
SilphCo_11F_Text_Grunt1Defeat::
.string "Gaah!\n"
.string "Demolished!$"
SilphCo_11F_Text_Grunt1PostBattle:: @ 81772F9
SilphCo_11F_Text_Grunt1PostBattle::
.string "Watch your step…\n"
.string "My BOSS likes his POKéMON tough!$"
SilphCo_11F_Text_MonitorHasMonsOnIt:: @ 817732B
SilphCo_11F_Text_MonitorHasMonsOnIt::
.string "The monitor has POKéMON on it!$"
SilphCo_11F_Text_FloorSign:: @ 817734A
SilphCo_11F_Text_FloorSign::
.string "SILPH CO. HEAD OFFICE\n"
.string "11F$"