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/SSAnne_2F_Corridor/scripts.inc
+23 -23
View File
@@ -1,27 +1,27 @@
.set LOCALID_RIVAL, 1
SSAnne_2F_Corridor_MapScripts:: @ 81608DE
SSAnne_2F_Corridor_MapScripts::
.byte 0
SSAnne_2F_Corridor_EventScript_RivalTriggerLeft:: @ 81608DF
SSAnne_2F_Corridor_EventScript_RivalTriggerLeft::
lockall
setvar VAR_TEMP_1, 0
goto SSAnne_2F_Corridor_EventScript_RivalTrigger
end
SSAnne_2F_Corridor_EventScript_RivalTriggerMid:: @ 81608EB
SSAnne_2F_Corridor_EventScript_RivalTriggerMid::
lockall
setvar VAR_TEMP_1, 1
goto SSAnne_2F_Corridor_EventScript_RivalTrigger
end
SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7
SSAnne_2F_Corridor_EventScript_RivalTriggerRight::
lockall
setvar VAR_TEMP_1, 2
goto SSAnne_2F_Corridor_EventScript_RivalTrigger
end
SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903
SSAnne_2F_Corridor_EventScript_RivalTrigger::
textcolor 0
playse SE_EXIT
delay 5
@@ -61,51 +61,51 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903
releaseall
end
SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: @ 81609AD
SSAnne_2F_Corridor_EventScript_RivalApproachLeft::
applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachLeft
waitmovement 0
return
SSAnne_2F_Corridor_EventScript_RivalApproachMid:: @ 81609B8
SSAnne_2F_Corridor_EventScript_RivalApproachMid::
applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachMid
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid
waitmovement 0
return
SSAnne_2F_Corridor_EventScript_RivalApproachRight:: @ 81609CA
SSAnne_2F_Corridor_EventScript_RivalApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight
applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachRight
waitmovement 0
return
SSAnne_2F_Corridor_EventScript_RivalSquirtle:: @ 81609DC
SSAnne_2F_Corridor_EventScript_RivalSquirtle::
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, SSAnne_2F_Corridor_Text_RivalDefeat
return
SSAnne_2F_Corridor_EventScript_RivalBulbasaur:: @ 81609E7
SSAnne_2F_Corridor_EventScript_RivalBulbasaur::
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, SSAnne_2F_Corridor_Text_RivalDefeat
return
SSAnne_2F_Corridor_EventScript_RivalCharmander:: @ 81609F2
SSAnne_2F_Corridor_EventScript_RivalCharmander::
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, SSAnne_2F_Corridor_Text_RivalDefeat
return
SSAnne_2F_Corridor_EventScript_RivalExitLeft:: @ 81609FD
SSAnne_2F_Corridor_EventScript_RivalExitLeft::
applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitLeft
waitmovement 0
return
SSAnne_2F_Corridor_EventScript_RivalExitMid:: @ 8160A08
SSAnne_2F_Corridor_EventScript_RivalExitMid::
applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitMid
waitmovement 0
return
SSAnne_2F_Corridor_EventScript_RivalExitRight:: @ 8160A13
SSAnne_2F_Corridor_EventScript_RivalExitRight::
applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitRight
waitmovement 0
return
SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: @ 8160A1E
SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight::
delay_16
delay_16
delay_16
@@ -113,7 +113,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: @ 8160A1E
walk_in_place_fastest_left
step_end
SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @ 8160A24
SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid::
delay_16
delay_16
delay_16
@@ -121,13 +121,13 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @ 8160A24
walk_in_place_fastest_left
step_end
SSAnne_2F_Corridor_Movement_RivalApproachLeft:: @ 8160A2A
SSAnne_2F_Corridor_Movement_RivalApproachLeft::
walk_down
walk_down
walk_down
step_end
SSAnne_2F_Corridor_Movement_RivalApproachMid:: @ 8160A2E
SSAnne_2F_Corridor_Movement_RivalApproachMid::
walk_down
walk_down
walk_down
@@ -135,7 +135,7 @@ SSAnne_2F_Corridor_Movement_RivalApproachMid:: @ 8160A2E
walk_in_place_fastest_right
step_end
SSAnne_2F_Corridor_Movement_RivalApproachRight:: @ 8160A34
SSAnne_2F_Corridor_Movement_RivalApproachRight::
walk_down
walk_down
walk_down
@@ -144,7 +144,7 @@ SSAnne_2F_Corridor_Movement_RivalApproachRight:: @ 8160A34
delay_4
step_end
SSAnne_2F_Corridor_Movement_RivalExitLeft:: @ 8160A3B
SSAnne_2F_Corridor_Movement_RivalExitLeft::
walk_right
walk_down
walk_down
@@ -155,7 +155,7 @@ SSAnne_2F_Corridor_Movement_RivalExitLeft:: @ 8160A3B
walk_down
step_end
SSAnne_2F_Corridor_Movement_RivalExitMid:: @ 8160A44
SSAnne_2F_Corridor_Movement_RivalExitMid::
walk_down
walk_down
walk_down
@@ -165,7 +165,7 @@ SSAnne_2F_Corridor_Movement_RivalExitMid:: @ 8160A44
walk_down
step_end
SSAnne_2F_Corridor_Movement_RivalExitRight:: @ 8160A4C
SSAnne_2F_Corridor_Movement_RivalExitRight::
walk_down
walk_down
walk_down
@@ -175,6 +175,6 @@ SSAnne_2F_Corridor_Movement_RivalExitRight:: @ 8160A4C
walk_down
step_end
SSAnne_2F_Corridor_EventScript_Sailor:: @ 8160A54
SSAnne_2F_Corridor_EventScript_Sailor::
msgbox SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner, MSGBOX_NPC
end
data/maps/SSAnne_2F_Corridor/text.inc
+5 -5
View File
@@ -1,10 +1,10 @@
SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner:: @ 8172FC3
SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner::
.string "This ship, she is a luxury liner for\n"
.string "TRAINERS of the world!\p"
.string "At every port, we hold parties with\n"
.string "invited TRAINERS.$"
SSAnne_2F_Corridor_Text_RivalIntro:: @ 8173035
SSAnne_2F_Corridor_Text_RivalIntro::
.string "{RIVAL}: Bonjour!\n"
.string "{PLAYER}!\p"
.string "Imagine seeing you here!\n"
@@ -15,18 +15,18 @@ SSAnne_2F_Corridor_Text_RivalIntro:: @ 8173035
.string "Crawl around in grassy areas, and\n"
.string "look hard for them.$"
SSAnne_2F_Corridor_Text_RivalDefeat:: @ 8173110
SSAnne_2F_Corridor_Text_RivalDefeat::
.string "Humph!\p"
.string "At least you're raising your\n"
.string "POKéMON!$"
SSAnne_2F_Corridor_Text_RivalVictory:: @ 817313D
SSAnne_2F_Corridor_Text_RivalVictory::
.string "{PLAYER}‥！\n"
.string "ふなよい　してるのか！\p"
.string "もっと　からだ\n"
.string "きたえた　ほうが　いいぜ！$"
SSAnne_2F_Corridor_Text_RivalPostBattle:: @ 8173164
SSAnne_2F_Corridor_Text_RivalPostBattle::
.string "{RIVAL}: I heard there was a CUT\n"
.string "master on board.\p"
.string "But he was just a seasick old man!\p"