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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCity/scripts.inc
+29 -46
View File
@@ -41,7 +41,7 @@ CeruleanCity_EventScript_RivalTriggerRight::
end
CeruleanCity_EventScript_Rival::
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
setvar VAR_MAP_SCENE_ROUTE22, 2
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
@@ -49,22 +49,16 @@ CeruleanCity_EventScript_Rival::
waitmovement 0
msgbox CeruleanCity_Text_RivalIntro
setvar VAR_LAST_TALKED, LOCALID_RIVAL
compare VAR_STARTER_MON, 2
call_if_eq CeruleanCity_EventScript_RivalSquirtle
compare VAR_STARTER_MON, 1
call_if_eq CeruleanCity_EventScript_RivalBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq CeruleanCity_EventScript_RivalCharmander
call_if_eq VAR_STARTER_MON, 2, CeruleanCity_EventScript_RivalSquirtle
call_if_eq VAR_STARTER_MON, 1, CeruleanCity_EventScript_RivalBulbasaur
call_if_eq VAR_STARTER_MON, 0, CeruleanCity_EventScript_RivalCharmander
famechecker FAMECHECKER_BILL, 0
msgbox CeruleanCity_Text_RivalPostBattle
closemessage
playbgm MUS_RIVAL_EXIT, 0
compare VAR_TEMP_1, 0
call_if_eq CeruleanCity_EventScript_RivalStartExit
compare VAR_TEMP_1, 1
call_if_eq CeruleanCity_EventScript_RivalStartExit
compare VAR_TEMP_1, 2
call_if_eq CeruleanCity_EventScript_RivalStartExitRight
call_if_eq VAR_TEMP_1, 0, CeruleanCity_EventScript_RivalStartExit
call_if_eq VAR_TEMP_1, 1, CeruleanCity_EventScript_RivalStartExit
call_if_eq VAR_TEMP_1, 2, CeruleanCity_EventScript_RivalStartExitRight
msgbox CeruleanCity_Text_OhRightLittlePresentAsFavor
setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
setflag FLAG_GOT_FAME_CHECKER
@@ -105,17 +99,17 @@ CeruleanCity_EventScript_RivalStartExitRight::
CeruleanCity_Movement_PlayerWatchRivalExit::
delay_16
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
CeruleanCity_Movement_PlayerWatchRivalExitRight::
delay_16
delay_8
walk_in_place_fastest_left
walk_in_place_faster_left
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
CeruleanCity_Movement_RivalEnter::
@@ -189,9 +183,8 @@ CeruleanCity_EventScript_Grunt::
CeruleanCity_EventScript_GruntDefeated::
msgbox CeruleanCity_Text_OkayIllReturnStolenTM
checkitemspace ITEM_TM28, 1
compare VAR_RESULT, FALSE
goto_if_eq CeruleanCity_EventScript_NoRoomForTM28
checkitemspace ITEM_TM28
goto_if_eq VAR_RESULT, FALSE, CeruleanCity_EventScript_NoRoomForTM28
giveitem_msg CeruleanCity_Text_RecoveredTM28FromGrunt, ITEM_TM28
msgbox CeruleanCity_Text_BetterGetMovingBye
closemessage
@@ -203,7 +196,7 @@ CeruleanCity_EventScript_GruntDefeated::
end
CeruleanCity_EventScript_NoRoomForTM28::
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox CeruleanCity_Text_MakeRoomForThisCantRun
release
end
@@ -211,9 +204,9 @@ CeruleanCity_EventScript_NoRoomForTM28::
CeruleanCity_EventScript_GruntTriggerTop::
lockall
setvar VAR_TEMP_1, 0
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestUp
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
goto CeruleanCity_EventScript_GruntTrigger
end
@@ -221,15 +214,15 @@ CeruleanCity_EventScript_GruntTriggerTop::
CeruleanCity_EventScript_GruntTriggerBottom::
lockall
setvar VAR_TEMP_1, 1
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestDown
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
goto CeruleanCity_EventScript_GruntTrigger
end
CeruleanCity_EventScript_GruntTrigger::
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox CeruleanCity_Text_GruntIntro
setvar VAR_LAST_TALKED, LOCALID_GRUNT
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat
@@ -286,24 +279,18 @@ CeruleanCity_EventScript_Lass::
lock
random 3
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 0
call_if_eq CeruleanCity_EventScript_SlowbroCommand1
compare VAR_0x8008, 1
call_if_eq CeruleanCity_EventScript_SlowbroCommand2
compare VAR_0x8008, 2
call_if_eq CeruleanCity_EventScript_SlowbroCommand3
call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroCommand1
call_if_eq VAR_0x8008, 1, CeruleanCity_EventScript_SlowbroCommand2
call_if_eq VAR_0x8008, 2, CeruleanCity_EventScript_SlowbroCommand3
waitmessage
delay 40
playse SE_PIN
applymovement LOCALID_SLOWBRO, Movement_QuestionMark
waitmovement 0
delay 30
compare VAR_0x8008, 0
call_if_eq CeruleanCity_EventScript_SlowbroFailed1
compare VAR_0x8008, 1
call_if_eq CeruleanCity_EventScript_SlowbroFailed2
compare VAR_0x8008, 2
call_if_eq CeruleanCity_EventScript_SlowbroFailed3
call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroFailed1
call_if_eq VAR_0x8008, 1, CeruleanCity_EventScript_SlowbroFailed2
call_if_eq VAR_0x8008, 2, CeruleanCity_EventScript_SlowbroFailed3
release
end
@@ -335,14 +322,10 @@ CeruleanCity_EventScript_Slowbro::
lock
random 4
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 0
call_if_eq CeruleanCity_EventScript_SlowbroText1
compare VAR_0x8008, 1
call_if_eq CeruleanCity_EventScript_SlowbroText2
compare VAR_0x8008, 2
call_if_eq CeruleanCity_EventScript_SlowbroText3
compare VAR_0x8008, 3
call_if_eq CeruleanCity_EventScript_SlowbroText4
call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroText1
call_if_eq VAR_0x8008, 1, CeruleanCity_EventScript_SlowbroText2
call_if_eq VAR_0x8008, 2, CeruleanCity_EventScript_SlowbroText3
call_if_eq VAR_0x8008, 3, CeruleanCity_EventScript_SlowbroText4
release
end