Use more LOCALID constants

This commit is contained in:
GriffinR
2021-02-10 20:20:15 -05:00
parent a34c9d09b6
commit 515dde69af
50 changed files with 372 additions and 231 deletions
+15 -7
View File
@@ -1,3 +1,11 @@
.set LOCALID_CASCADE_BADGE_GUARD, 1
.set LOCALID_THUNDER_BADGE_GUARD, 2
.set LOCALID_RAINBOW_BADGE_GUARD, 3
.set LOCALID_SOUL_BADGE_GUARD, 4
.set LOCALID_MARSH_BADGE_GUARD, 5
.set LOCALID_VOLCANO_BADGE_GUARD, 6
.set LOCALID_EARTH_BADGE_GUARD, 7
Route23_MapScripts:: @ 81684EB
map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition
.byte 0
@@ -70,7 +78,7 @@ Route23_EventScript_EarthBadgeGuard:: @ 8168572
Route23_EventScript_CascadeBadgeGuardTrigger:: @ 8168583
lockall
setvar VAR_TEMP_1, 2
setvar VAR_0x8009, 1
setvar VAR_0x8009, LOCALID_CASCADE_BADGE_GUARD
getstdstring 0, STDSTRING_CASCADE_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
@@ -78,7 +86,7 @@ Route23_EventScript_CascadeBadgeGuardTrigger:: @ 8168583
Route23_EventScript_ThunderBadgeGuardTrigger:: @ 8168598
lockall
setvar VAR_TEMP_1, 3
setvar VAR_0x8009, 2
setvar VAR_0x8009, LOCALID_THUNDER_BADGE_GUARD
getstdstring 0, STDSTRING_THUNDER_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
@@ -86,7 +94,7 @@ Route23_EventScript_ThunderBadgeGuardTrigger:: @ 8168598
Route23_EventScript_RainbowBadgeGuardTrigger:: @ 81685AD
lockall
setvar VAR_TEMP_1, 4
setvar VAR_0x8009, 3
setvar VAR_0x8009, LOCALID_RAINBOW_BADGE_GUARD
getstdstring 0, STDSTRING_RAINBOW_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
@@ -94,7 +102,7 @@ Route23_EventScript_RainbowBadgeGuardTrigger:: @ 81685AD
Route23_EventScript_SoulBadgeGuardTrigger:: @ 81685C2
lockall
setvar VAR_TEMP_1, 5
setvar VAR_0x8009, 4
setvar VAR_0x8009, LOCALID_SOUL_BADGE_GUARD
getstdstring 0, STDSTRING_SOUL_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
@@ -102,7 +110,7 @@ Route23_EventScript_SoulBadgeGuardTrigger:: @ 81685C2
Route23_EventScript_MarshBadgeGuardTrigger:: @ 81685D7
lockall
setvar VAR_TEMP_1, 6
setvar VAR_0x8009, 5
setvar VAR_0x8009, LOCALID_MARSH_BADGE_GUARD
getstdstring 0, STDSTRING_MARSH_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
@@ -110,7 +118,7 @@ Route23_EventScript_MarshBadgeGuardTrigger:: @ 81685D7
Route23_EventScript_VolcanoBadgeGuardTrigger:: @ 81685EC
lockall
setvar VAR_TEMP_1, 7
setvar VAR_0x8009, 6
setvar VAR_0x8009, LOCALID_VOLCANO_BADGE_GUARD
getstdstring 0, STDSTRING_VOLCANO_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
@@ -118,7 +126,7 @@ Route23_EventScript_VolcanoBadgeGuardTrigger:: @ 81685EC
Route23_EventScript_EarthBadgeGuardTrigger:: @ 8168601
lockall
setvar VAR_TEMP_1, 8
setvar VAR_0x8009, 7
setvar VAR_0x8009, LOCALID_EARTH_BADGE_GUARD
getstdstring 0, STDSTRING_EARTH_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end