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/CeruleanCity/scripts.inc
+47 -47
View File
@@ -5,42 +5,42 @@
.set LOCALID_RIVAL, 8
.set LOCALID_WOMAN, 11
CeruleanCity_MapScripts:: @ 8166471
CeruleanCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition
.byte 0
CeruleanCity_OnTransition:: @ 8166477
CeruleanCity_OnTransition::
setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY
call_if_unset FLAG_GOT_SS_TICKET, CeruleanCity_EventScript_BlockExits
end
CeruleanCity_EventScript_BlockExits:: @ 8166484
CeruleanCity_EventScript_BlockExits::
setobjectxyperm LOCALID_POLICEMAN, 30, 12
setobjectxyperm LOCALID_SLOWBRO, 26, 31
setobjectxyperm LOCALID_LASS, 27, 31
return
CeruleanCity_EventScript_RivalTriggerLeft:: @ 816649A
CeruleanCity_EventScript_RivalTriggerLeft::
lockall
setvar VAR_TEMP_1, 0
goto CeruleanCity_EventScript_Rival
end
CeruleanCity_EventScript_RivalTriggerMid:: @ 81664A6
CeruleanCity_EventScript_RivalTriggerMid::
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm LOCALID_RIVAL, 23, 0
goto CeruleanCity_EventScript_Rival
end
CeruleanCity_EventScript_RivalTriggerRight:: @ 81664B9
CeruleanCity_EventScript_RivalTriggerRight::
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm LOCALID_RIVAL, 24, 0
goto CeruleanCity_EventScript_Rival
end
CeruleanCity_EventScript_Rival:: @ 81664CC
CeruleanCity_EventScript_Rival::
textcolor 0
setvar VAR_MAP_SCENE_ROUTE22, 2
playbgm MUS_ENCOUNTER_RIVAL, 0
@@ -78,31 +78,31 @@ CeruleanCity_EventScript_Rival:: @ 81664CC
releaseall
end
CeruleanCity_EventScript_RivalSquirtle:: @ 8166582
CeruleanCity_EventScript_RivalSquirtle::
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, CeruleanCity_Text_RivalDefeat
return
CeruleanCity_EventScript_RivalBulbasaur:: @ 816658D
CeruleanCity_EventScript_RivalBulbasaur::
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, CeruleanCity_Text_RivalDefeat
return
CeruleanCity_EventScript_RivalCharmander:: @ 8166598
CeruleanCity_EventScript_RivalCharmander::
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, CeruleanCity_Text_RivalDefeat
return
CeruleanCity_EventScript_RivalStartExit:: @ 81665A3
CeruleanCity_EventScript_RivalStartExit::
applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExit
waitmovement 0
return
CeruleanCity_EventScript_RivalStartExitRight:: @ 81665B5
CeruleanCity_EventScript_RivalStartExitRight::
applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExitRight
waitmovement 0
return
CeruleanCity_Movement_PlayerWatchRivalExit:: @ 81665C7
CeruleanCity_Movement_PlayerWatchRivalExit::
delay_16
delay_8
walk_in_place_fastest_right
@@ -110,7 +110,7 @@ CeruleanCity_Movement_PlayerWatchRivalExit:: @ 81665C7
walk_in_place_fastest_down
step_end
CeruleanCity_Movement_PlayerWatchRivalExitRight:: @ 81665CD
CeruleanCity_Movement_PlayerWatchRivalExitRight::
delay_16
delay_8
walk_in_place_fastest_left
@@ -118,7 +118,7 @@ CeruleanCity_Movement_PlayerWatchRivalExitRight:: @ 81665CD
walk_in_place_fastest_down
step_end
CeruleanCity_Movement_RivalEnter:: @ 81665D3
CeruleanCity_Movement_RivalEnter::
walk_down
walk_down
walk_down
@@ -126,7 +126,7 @@ CeruleanCity_Movement_RivalEnter:: @ 81665D3
walk_down
step_end
CeruleanCity_Movement_RivalStartExit:: @ 81665D9
CeruleanCity_Movement_RivalStartExit::
walk_right
walk_down
walk_down
@@ -145,7 +145,7 @@ CeruleanCity_Movement_RivalStartExit:: @ 81665D9
walk_up
step_end
CeruleanCity_Movement_RivalStartExitRight:: @ 81665EA
CeruleanCity_Movement_RivalStartExitRight::
walk_left
walk_down
walk_down
@@ -164,7 +164,7 @@ CeruleanCity_Movement_RivalStartExitRight:: @ 81665EA
walk_up
step_end
CeruleanCity_Movement_RivalExit:: @ 81665FB
CeruleanCity_Movement_RivalExit::
walk_down
walk_down
walk_down
@@ -174,7 +174,7 @@ CeruleanCity_Movement_RivalExit:: @ 81665FB
walk_down
step_end
CeruleanCity_EventScript_Grunt:: @ 8166603
CeruleanCity_EventScript_Grunt::
lock
faceplayer
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_EventScript_GruntDefeated
@@ -187,7 +187,7 @@ CeruleanCity_EventScript_Grunt:: @ 8166603
goto CeruleanCity_EventScript_GruntDefeated
end
CeruleanCity_EventScript_GruntDefeated:: @ 816662E
CeruleanCity_EventScript_GruntDefeated::
msgbox CeruleanCity_Text_OkayIllReturnStolenTM
checkitemspace ITEM_TM28, 1
compare VAR_RESULT, FALSE
@@ -202,13 +202,13 @@ CeruleanCity_EventScript_GruntDefeated:: @ 816662E
release
end
CeruleanCity_EventScript_NoRoomForTM28:: @ 8166677
CeruleanCity_EventScript_NoRoomForTM28::
textcolor 0
msgbox CeruleanCity_Text_MakeRoomForThisCantRun
release
end
CeruleanCity_EventScript_GruntTriggerTop:: @ 8166683
CeruleanCity_EventScript_GruntTriggerTop::
lockall
setvar VAR_TEMP_1, 0
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestUp
@@ -218,7 +218,7 @@ CeruleanCity_EventScript_GruntTriggerTop:: @ 8166683
goto CeruleanCity_EventScript_GruntTrigger
end
CeruleanCity_EventScript_GruntTriggerBottom:: @ 81666A3
CeruleanCity_EventScript_GruntTriggerBottom::
lockall
setvar VAR_TEMP_1, 1
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestDown
@@ -228,7 +228,7 @@ CeruleanCity_EventScript_GruntTriggerBottom:: @ 81666A3
goto CeruleanCity_EventScript_GruntTrigger
end
CeruleanCity_EventScript_GruntTrigger:: @ 81666C3
CeruleanCity_EventScript_GruntTrigger::
textcolor 0
msgbox CeruleanCity_Text_GruntIntro
setvar VAR_LAST_TALKED, LOCALID_GRUNT
@@ -237,7 +237,7 @@ CeruleanCity_EventScript_GruntTrigger:: @ 81666C3
goto CeruleanCity_EventScript_GruntDefeated
end
CeruleanCity_EventScript_Policeman:: @ 81666E7
CeruleanCity_EventScript_Policeman::
lock
faceplayer
msgbox CeruleanCity_Text_PeopleHereWereRobbed
@@ -247,7 +247,7 @@ CeruleanCity_EventScript_Policeman:: @ 81666E7
release
end
CeruleanCity_EventScript_LittleBoy:: @ 81666FE
CeruleanCity_EventScript_LittleBoy::
lock
faceplayer
goto_if_set FLAG_GOT_SS_TICKET, CeruleanCity_EventScript_LittleBoySlowbroMoved
@@ -255,24 +255,24 @@ CeruleanCity_EventScript_LittleBoy:: @ 81666FE
release
end
CeruleanCity_EventScript_LittleBoySlowbroMoved:: @ 8166713
CeruleanCity_EventScript_LittleBoySlowbroMoved::
msgbox CeruleanCity_Text_YouCanCutDownSmallTrees
release
end
CeruleanCity_EventScript_BaldingMan:: @ 816671D
CeruleanCity_EventScript_BaldingMan::
msgbox CeruleanCity_Text_PokemonEncyclopediaAmusing, MSGBOX_NPC
end
CeruleanCity_EventScript_Youngster:: @ 8166726
CeruleanCity_EventScript_Youngster::
msgbox CeruleanCity_Text_TrainerLifeIsToughIsntIt, MSGBOX_NPC
end
CeruleanCity_EventScript_CeruleanCaveGuard:: @ 816672F
CeruleanCity_EventScript_CeruleanCaveGuard::
msgbox CeruleanCity_Text_ThisIsCeruleanCave, MSGBOX_NPC
end
CeruleanCity_EventScript_Woman:: @ 8166738
CeruleanCity_EventScript_Woman::
lock
faceplayer
msgbox CeruleanCity_Text_WantBrightRedBicycle
@@ -282,7 +282,7 @@ CeruleanCity_EventScript_Woman:: @ 8166738
release
end
CeruleanCity_EventScript_Lass:: @ 816674F
CeruleanCity_EventScript_Lass::
lock
random 3
copyvar VAR_0x8008, VAR_RESULT
@@ -307,31 +307,31 @@ CeruleanCity_EventScript_Lass:: @ 816674F
release
end
CeruleanCity_EventScript_SlowbroCommand1:: @ 81667B0
CeruleanCity_EventScript_SlowbroCommand1::
message CeruleanCity_Text_SlowbroUseSonicboom
return
CeruleanCity_EventScript_SlowbroCommand2:: @ 81667B6
CeruleanCity_EventScript_SlowbroCommand2::
message CeruleanCity_Text_SlowbroPunch
return
CeruleanCity_EventScript_SlowbroCommand3:: @ 81667BC
CeruleanCity_EventScript_SlowbroCommand3::
message CeruleanCity_Text_SlowbroWithdraw
return
CeruleanCity_EventScript_SlowbroFailed1:: @ 81667C2
CeruleanCity_EventScript_SlowbroFailed1::
msgbox CeruleanCity_Text_SlowbroPayAttention
return
CeruleanCity_EventScript_SlowbroFailed2:: @ 81667CB
CeruleanCity_EventScript_SlowbroFailed2::
msgbox CeruleanCity_Text_NoYouBlewItAgain
return
CeruleanCity_EventScript_SlowbroFailed3:: @ 81667D4
CeruleanCity_EventScript_SlowbroFailed3::
msgbox CeruleanCity_Text_HardToControlMonsObedience
return
CeruleanCity_EventScript_Slowbro:: @ 81667DD
CeruleanCity_EventScript_Slowbro::
lock
random 4
copyvar VAR_0x8008, VAR_RESULT
@@ -346,35 +346,35 @@ CeruleanCity_EventScript_Slowbro:: @ 81667DD
release
end
CeruleanCity_EventScript_SlowbroText1:: @ 8166814
CeruleanCity_EventScript_SlowbroText1::
msgbox CeruleanCity_Text_SlowbroTookSnooze
return
CeruleanCity_EventScript_SlowbroText2:: @ 816681D
CeruleanCity_EventScript_SlowbroText2::
msgbox CeruleanCity_Text_SlowbroLoafingAround
return
CeruleanCity_EventScript_SlowbroText3:: @ 8166826
CeruleanCity_EventScript_SlowbroText3::
msgbox CeruleanCity_Text_SlowbroTurnedAway
return
CeruleanCity_EventScript_SlowbroText4:: @ 816682F
CeruleanCity_EventScript_SlowbroText4::
msgbox CeruleanCity_Text_SlowbroIgnoredOrders
return
CeruleanCity_EventScript_CitySign:: @ 8166838
CeruleanCity_EventScript_CitySign::
msgbox CeruleanCity_Text_CitySign, MSGBOX_SIGN
end
CeruleanCity_EventScript_TrainerTips:: @ 8166841
CeruleanCity_EventScript_TrainerTips::
msgbox CeruleanCity_Text_TrainerTipsHeldItems, MSGBOX_SIGN
end
CeruleanCity_EventScript_BikeShopSign:: @ 816684A
CeruleanCity_EventScript_BikeShopSign::
msgbox CeruleanCity_Text_BikeShopSign, MSGBOX_SIGN
end
CeruleanCity_EventScript_GymSign:: @ 8166853
CeruleanCity_EventScript_GymSign::
lockall
famechecker FAMECHECKER_MISTY, 0
msgbox CeruleanCity_Text_GymSign
data/maps/CeruleanCity/text.inc
+33 -33
View File
@@ -1,4 +1,4 @@
CeruleanCity_Text_RivalIntro:: @ 817EAD7
CeruleanCity_Text_RivalIntro::
.string "{RIVAL}: Yo! {PLAYER}!\p"
.string "You're still struggling along back\n"
.string "here?\p"
@@ -7,12 +7,12 @@ CeruleanCity_Text_RivalIntro:: @ 817EAD7
.string "Here, let me see what you caught,\n"
.string "{PLAYER}!$"
CeruleanCity_Text_RivalDefeat:: @ 817EB71
CeruleanCity_Text_RivalDefeat::
.string "Hey!\n"
.string "Take it easy!\l"
.string "You won already!$"
CeruleanCity_Text_RivalPostBattle:: @ 817EB95
CeruleanCity_Text_RivalPostBattle::
.string "{RIVAL}: Hey, guess what?\p"
.string "I went to BILL's and got him to\n"
.string "show me his rare POKéMON.\p"
@@ -27,14 +27,14 @@ CeruleanCity_Text_RivalPostBattle:: @ 817EB95
.string "Well, I better get rolling!\n"
.string "Smell ya later!$"
CeruleanCity_Text_OhRightLittlePresentAsFavor:: @ 817ECD4
CeruleanCity_Text_OhRightLittlePresentAsFavor::
.string "Oh, yeah, right.\p"
.string "I feel sorry for you. No, really.\n"
.string "You're always plodding behind me.\p"
.string "So here, I'll give you a little\n"
.string "present as a favor.$"
CeruleanCity_Text_ExplainFameCheckerSmellYa:: @ 817ED5D
CeruleanCity_Text_ExplainFameCheckerSmellYa::
.string "A chatty gossip like you…\n"
.string "That thing's perfect.\p"
.string "I don't need it because I don't\n"
@@ -43,11 +43,11 @@ CeruleanCity_Text_ExplainFameCheckerSmellYa:: @ 817ED5D
.string "gone. Smell ya!$"
@ RB translation: "Heh! You're no match for my genius!"
CeruleanCity_Text_RivalVictory:: @ 817EDF8
CeruleanCity_Text_RivalVictory::
.string "なんたって！\n"
.string "おれは　てんさい　だからよ！$"
CeruleanCity_Text_GruntIntro:: @ 817EE0E
CeruleanCity_Text_GruntIntro::
.string "Hey! Stay out!\n"
.string "It's not your yard!\p"
.string "…Huh?\n"
@@ -55,32 +55,32 @@ CeruleanCity_Text_GruntIntro:: @ 817EE0E
.string "I'm an innocent bystander!\n"
.string "Don't you believe me?{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$"
CeruleanCity_Text_GruntDefeat:: @ 817EE70
CeruleanCity_Text_GruntDefeat::
.string "GRUNT: Stop! I give up!\n"
.string "I'll leave quietly!$"
CeruleanCity_Text_OkayIllReturnStolenTM:: @ 817EE9C
CeruleanCity_Text_OkayIllReturnStolenTM::
.string "…Okay.\n"
.string "I'll return the TM I stole.$"
CeruleanCity_Text_RecoveredTM28FromGrunt:: @ 817EEBF
CeruleanCity_Text_RecoveredTM28FromGrunt::
.string "{PLAYER} recovered TM28 from\n"
.string "the TEAM ROCKET GRUNT.$"
CeruleanCity_Text_BetterGetMovingBye:: @ 817EEED
CeruleanCity_Text_BetterGetMovingBye::
.string "I better get moving!\n"
.string "Bye!$"
CeruleanCity_Text_MakeRoomForThisCantRun:: @ 817EF07
CeruleanCity_Text_MakeRoomForThisCantRun::
.string "Make room for this!\n"
.string "I can't run until I give it to you!$"
CeruleanCity_Text_TrainerLifeIsToughIsntIt:: @ 817EF3F
CeruleanCity_Text_TrainerLifeIsToughIsntIt::
.string "You're a TRAINER, too?\p"
.string "Collecting, battling…\n"
.string "It's a tough life, isn't it?$"
CeruleanCity_Text_YouCanCutDownSmallTrees:: @ 817EF89
CeruleanCity_Text_YouCanCutDownSmallTrees::
.string "Did you know that you can CUT down\n"
.string "small trees?\p"
.string "Even that small tree in front of\n"
@@ -88,7 +88,7 @@ CeruleanCity_Text_YouCanCutDownSmallTrees:: @ 817EF89
.string "I think there's a way around it,\n"
.string "though.$"
CeruleanCity_Text_IfSlowbroWasntThereCouldCutTree:: @ 817F01D
CeruleanCity_Text_IfSlowbroWasntThereCouldCutTree::
.string "If that SLOWBRO wasn't there, you\n"
.string "could CUT down the small tree.\p"
.string "That way, you could get to the\n"
@@ -96,58 +96,58 @@ CeruleanCity_Text_IfSlowbroWasntThereCouldCutTree:: @ 817F01D
.string "I think there's a way around it,\n"
.string "though.$"
CeruleanCity_Text_PokemonEncyclopediaAmusing:: @ 817F0B2
CeruleanCity_Text_PokemonEncyclopediaAmusing::
.string "You're making an encyclopedia on\n"
.string "POKéMON? That sounds amusing.$"
CeruleanCity_Text_PeopleHereWereRobbed:: @ 817F0F1
CeruleanCity_Text_PeopleHereWereRobbed::
.string "The people here were robbed.\p"
.string "It's obvious that TEAM ROCKET is\n"
.string "behind this most heinous crime!\p"
.string "Even our POLICE FORCE has\n"
.string "trouble with the ROCKETS!$"
CeruleanCity_Text_SlowbroUseSonicboom:: @ 817F183
CeruleanCity_Text_SlowbroUseSonicboom::
.string "Okay! SLOWBRO!\n"
.string "Use SONICBOOM!$"
CeruleanCity_Text_SlowbroPayAttention:: @ 817F1A1
CeruleanCity_Text_SlowbroPayAttention::
.string "Come on, SLOWBRO, pay attention!$"
CeruleanCity_Text_SlowbroPunch:: @ 817F1C2
CeruleanCity_Text_SlowbroPunch::
.string "SLOWBRO, punch!$"
CeruleanCity_Text_NoYouBlewItAgain:: @ 817F1D2
CeruleanCity_Text_NoYouBlewItAgain::
.string "No!\n"
.string "You blew it again!$"
CeruleanCity_Text_SlowbroWithdraw:: @ 817F1E9
CeruleanCity_Text_SlowbroWithdraw::
.string "SLOWBRO, WITHDRAW!$"
CeruleanCity_Text_HardToControlMonsObedience:: @ 817F1FC
CeruleanCity_Text_HardToControlMonsObedience::
.string "No! That's wrong!\n"
.string "It's so hard to control POKéMON!\p"
.string "Your POKéMON's obedience depends\n"
.string "on your abilities as a TRAINER.$"
CeruleanCity_Text_SlowbroTookSnooze:: @ 817F270
CeruleanCity_Text_SlowbroTookSnooze::
.string "SLOWBRO took a snooze…$"
CeruleanCity_Text_SlowbroLoafingAround:: @ 817F287
CeruleanCity_Text_SlowbroLoafingAround::
.string "SLOWBRO is loafing around…$"
CeruleanCity_Text_SlowbroTurnedAway:: @ 817F2A2
CeruleanCity_Text_SlowbroTurnedAway::
.string "SLOWBRO turned away…$"
CeruleanCity_Text_SlowbroIgnoredOrders:: @ 817F2B7
CeruleanCity_Text_SlowbroIgnoredOrders::
.string "SLOWBRO ignored orders…$"
CeruleanCity_Text_WantBrightRedBicycle:: @ 817F2CF
CeruleanCity_Text_WantBrightRedBicycle::
.string "I want a bright red bicycle.\p"
.string "I'll keep it at home, so it won't\n"
.string "get dirty.$"
CeruleanCity_Text_ThisIsCeruleanCave:: @ 817F319
CeruleanCity_Text_ThisIsCeruleanCave::
.string "This is CERULEAN CAVE.\p"
.string "Horribly strong POKéMON live inside\n"
.string "there.\p"
@@ -159,23 +159,23 @@ CeruleanCity_Text_ThisIsCeruleanCave:: @ 817F319
.string "And, you would have to have\n"
.string "made a great achievement.$"
CeruleanCity_Text_CitySign:: @ 817F420
CeruleanCity_Text_CitySign::
.string "CERULEAN CITY\n"
.string "A Mysterious, Blue Aura Surrounds\l"
.string "It$"
CeruleanCity_Text_TrainerTipsHeldItems:: @ 817F453
CeruleanCity_Text_TrainerTipsHeldItems::
.string "TRAINER TIPS\p"
.string "A POKéMON can be made to hold\n"
.string "an item.\p"
.string "Some items can even be used by\n"
.string "the holding POKéMON in battle.$"
CeruleanCity_Text_BikeShopSign:: @ 817F4C5
CeruleanCity_Text_BikeShopSign::
.string "Grass and caves handled easily!\n"
.string "BIKE SHOP$"
CeruleanCity_Text_GymSign:: @ 817F4EF
CeruleanCity_Text_GymSign::
.string "CERULEAN CITY POKéMON GYM\n"
.string "LEADER: MISTY\l"
.string "The Tomboyish Mermaid!$"