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

Merge branch 'master' into movement-action

Browse Source
This commit is contained in:
cbt6 authored and GitHub committed 2022-08-15 12:54:47 +08:00
2 parents 7233b2ed0a b3c2c7291f
commit 2644dd9c21
286 files changed
+8970 -9432
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/scripts/route23.inc
+3 -5
View File
@@ -31,8 +31,7 @@ Route23_EventScript_AlreadyRecognizedBadge::
@ Duplicate of the below, only used for Boulder Badge
Route22_NorthEntrance_EventScript_BadgeGuard::
compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
goto_if_ge Route23_EventScript_AlreadyRecognizedBoulderBadge
goto_if_ge VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1, Route23_EventScript_AlreadyRecognizedBoulderBadge
switch VAR_TEMP_1
case 1, Route23_EventScript_CheckBoulderBadge
case 2, Route23_EventScript_CheckCascadeBadge
@@ -45,8 +44,7 @@ Route22_NorthEntrance_EventScript_BadgeGuard::
end
Route23_EventScript_BadgeGuard::
compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
goto_if_ge Route23_EventScript_AlreadyRecognizedBadge
goto_if_ge VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1, Route23_EventScript_AlreadyRecognizedBadge
switch VAR_TEMP_1
case 1, Route23_EventScript_CheckBoulderBadge
case 2, Route23_EventScript_CheckCascadeBadge
@@ -115,7 +113,7 @@ Route23_EventScript_RecognizeBadge::
end
Route23_EventScript_BadgeGuardTrigger::
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
applymovement VAR_0x8009, Movement_WalkInPlaceFasterLeft
waitmovement 0
switch VAR_TEMP_1