Skip to content

Commit 3520a4c

Browse files
committed
Distinguish Elite 4 "meta" constants from event constants
Fixes pret#390
1 parent d809d3d commit 3520a4c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

‎constants/event_constants.asm‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,8 @@
715715

716716
; Indigo Plateau events
717717
const_next $8E0
718-
const ELITE4_EVENTS_START
718+
DEF INDIGO_PLATEAU_EVENTS_START EQU const_value
719+
const_skip
719720
const EVENT_BEAT_LORELEIS_ROOM_TRAINER_0
720721
const_skip 4
721722
const EVENT_AUTOWALKED_INTO_LORELEIS_ROOM
@@ -735,7 +736,8 @@
735736
const_skip
736737
const EVENT_BEAT_CHAMPION_RIVAL
737738
const_skip 5
738-
const ELITE4_CHAMPION_EVENTS_END
739+
const_skip
740+
DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1
739741

740742
; Victory Road 1F events
741743
const_next $910

‎scripts/HallOfFame.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ HallofFameRoomScript2:
4040
ld [wLancesRoomCurScript], a
4141
ld [wHallOfFameCurScript], a
4242
; Elite 4 events
43-
ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1
43+
ResetEventRange INDIGO_PLATEAU_EVENTS_START, INDIGO_PLATEAU_EVENTS_END, 1
4444
xor a
4545
ld [wHallOfFameCurScript], a
4646
ld a, PALLET_TOWN

‎scripts/IndigoPlateauLobby.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ IndigoPlateauLobby_Script:
1111
res 1, [hl]
1212
ret z
1313
; Elite 4 events
14-
ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
14+
ResetEventRange INDIGO_PLATEAU_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
1515
ret
1616

1717
IndigoPlateauLobby_TextPointers:

0 commit comments

Comments
 (0)