diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-09-15 18:10:45 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-09-15 18:10:45 -0400 |
| commit | 3520a4c99a530c7464a7e9e5b956cfcdbe4b28d6 (patch) | |
| tree | 471cc5f66e0f014d97ebe0ae2e5a98926d8774cf | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-3520a4c99a530c7464a7e9e5b956cfcdbe4b28d6.tar.gz pokeyellow-3520a4c99a530c7464a7e9e5b956cfcdbe4b28d6.tar.xz pokeyellow-3520a4c99a530c7464a7e9e5b956cfcdbe4b28d6.zip | |
Distinguish Elite 4 "meta" constants from event constants
Fixes #390
| -rw-r--r-- | constants/event_constants.asm | 6 | ||||
| -rw-r--r-- | scripts/HallOfFame.asm | 2 | ||||
| -rw-r--r-- | scripts/IndigoPlateauLobby.asm | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 9e2ebcc6..7bcef25c 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -715,7 +715,8 @@ ; Indigo Plateau events const_next $8E0 - const ELITE4_EVENTS_START +DEF INDIGO_PLATEAU_EVENTS_START EQU const_value + const_skip const EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 const_skip 4 const EVENT_AUTOWALKED_INTO_LORELEIS_ROOM @@ -735,7 +736,8 @@ const_skip const EVENT_BEAT_CHAMPION_RIVAL const_skip 5 - const ELITE4_CHAMPION_EVENTS_END + const_skip +DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1 ; Victory Road 1F events const_next $910 diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index fd13719b..45cef29c 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -40,7 +40,7 @@ HallofFameRoomScript2: ld [wLancesRoomCurScript], a ld [wHallOfFameCurScript], a ; Elite 4 events - ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 + ResetEventRange INDIGO_PLATEAU_EVENTS_START, INDIGO_PLATEAU_EVENTS_END, 1 xor a ld [wHallOfFameCurScript], a ld a, PALLET_TOWN diff --git a/scripts/IndigoPlateauLobby.asm b/scripts/IndigoPlateauLobby.asm index a9b549e3..d5c89536 100644 --- a/scripts/IndigoPlateauLobby.asm +++ b/scripts/IndigoPlateauLobby.asm @@ -11,7 +11,7 @@ IndigoPlateauLobby_Script: res 1, [hl] ret z ; Elite 4 events - ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR + ResetEventRange INDIGO_PLATEAU_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ret IndigoPlateauLobby_TextPointers: |