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

Finish Route 24/25

Browse Source
This commit is contained in:
GriffinR
2020-02-25 02:53:14 -05:00
parent 15dbc58959
commit 20118dbc31
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route24/scripts.inc
+19 -17
View File
@@ -1,3 +1,5 @@
.equ LOCALID_ROCKET, 1
Route24_MapScripts:: @ 816861F Route24_MapScripts:: @ 816861F
.byte 0 .byte 0
@@ -10,7 +12,7 @@ Route24_EventScript_Rocket:: @ 8168620
checkitemspace ITEM_NUGGET, 1 checkitemspace ITEM_NUGGET, 1
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq Route24_EventScript_NoRoomForNugget goto_if_eq Route24_EventScript_NoRoomForNugget
call Route24_EventScript_ReceiveNugget call Route24_EventScript_BattleRocket
release release
end end
@@ -39,61 +41,61 @@ Route24_EventScript_RocketTriggerRight:: @ 816866C
Route24_EventScript_RocketTrigger:: @ 8168678 Route24_EventScript_RocketTrigger:: @ 8168678
textcolor 0 textcolor 0
compare VAR_TEMP_1, 0 compare VAR_TEMP_1, 0
call_if_eq EventScript_1686FD call_if_eq Route24_EventScript_RocketApproachPlayer
compare VAR_TEMP_1, 1 compare VAR_TEMP_1, 1
call_if_eq EventScript_168708 call_if_eq Route24_EventScript_RocketMotionToPlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox Route24_Text_JustEarnedFabulousPrize msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET, 1 checkitemspace ITEM_NUGGET, 1
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq EventScript_168713 goto_if_eq Route24_EventScript_NoRoomForNuggetTrigger
call Route24_EventScript_ReceiveNugget call Route24_EventScript_BattleRocket
releaseall releaseall
end end
Route24_EventScript_ReceiveNugget:: @ 81686B9 Route24_EventScript_BattleRocket:: @ 81686B9
giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET
message Route24_Text_JoinTeamRocket message Route24_Text_JoinTeamRocket
waitmessage waitmessage
playbgm MUS_ROCKET, 0 playbgm MUS_ROCKET, 0
waitbuttonpress waitbuttonpress
setvar VAR_LAST_TALKED, 1 setvar VAR_LAST_TALKED, LOCALID_ROCKET
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat
msgbox Route24_Text_YoudBecomeTopRocketLeader msgbox Route24_Text_YoudBecomeTopRocketLeader
setvar VAR_MAP_SCENE_ROUTE24, 1 setvar VAR_MAP_SCENE_ROUTE24, 1
return return
EventScript_1686FD:: @ 81686FD Route24_EventScript_RocketApproachPlayer:: @ 81686FD
applymovement 1, Route24_Movement_WalkLeft applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer
waitmovement 0 waitmovement 0
return return
EventScript_168708:: @ 8168708 Route24_EventScript_RocketMotionToPlayer:: @ 8168708
applymovement 1, Movement_WalkInPlaceFastestLeft applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
EventScript_168713:: @ 8168713 Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713
msgbox Route24_Text_YouDontHaveAnyRoom msgbox Route24_Text_YouDontHaveAnyRoom
closemessage closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown
waitmovement 0 waitmovement 0
compare VAR_TEMP_1, 0 compare VAR_TEMP_1, 0
call_if_eq EventScript_168733 call_if_eq Route24_EventScript_RocketWalkBackToPos
release release
end end
EventScript_168733:: @ 8168733 Route24_EventScript_RocketWalkBackToPos:: @ 8168733
applymovement 1, Movement_168740 applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos
waitmovement 0 waitmovement 0
return return
Route24_Movement_WalkLeft:: @ 816873E Route24_Movement_RocketApproachPlayer:: @ 816873E
walk_left walk_left
step_end step_end
Movement_168740:: @ 8168740 Route24_Movement_RocketWalkBackToPos:: @ 8168740
walk_right walk_right
walk_in_place_fastest_left walk_in_place_fastest_left
step_end step_end
data/maps/Route25_SeaCottage/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ Route25_SeaCottage_MapScripts:: @ 8170523
Route25_SeaCottage_OnTransition:: @ 8170529 Route25_SeaCottage_OnTransition:: @ 8170529
call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill
call_if_set FLAG_GOT_SS_TICKET, EventScript_170547 call_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket
end end
Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C
@@ -18,7 +18,7 @@ Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C
setobjectxyperm LOCALID_BILL_HUMAN, 3, 3 setobjectxyperm LOCALID_BILL_HUMAN, 3, 3
return return
EventScript_170547:: @ 8170547 Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket:: @ 8170547
setflag RETURN_AFTER_SS_TICKET setflag RETURN_AFTER_SS_TICKET
return return