foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Distinguish Elite 4 "meta" constants from event constants

Browse source 
Fixes #390
This commit is contained in:
Rangi 2022-09-15 18:10:45 -04:00
parent d809d3d59c
commit 3520a4c99a
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
constants/event_constants.asm
View file

@ -715,7 +715,8 @@
; Indigo Plateau events ; Indigo Plateau events
const_next $8E0 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 EVENT_BEAT_LORELEIS_ROOM_TRAINER_0
const_skip 4 const_skip 4
const EVENT_AUTOWALKED_INTO_LORELEIS_ROOM const EVENT_AUTOWALKED_INTO_LORELEIS_ROOM
@ -735,7 +736,8 @@
const_skip const_skip
const EVENT_BEAT_CHAMPION_RIVAL const EVENT_BEAT_CHAMPION_RIVAL
const_skip 5 const_skip 5
const ELITE4_CHAMPION_EVENTS_END const_skip
DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1
; Victory Road 1F events ; Victory Road 1F events
const_next $910 const_next $910

2
scripts/HallOfFame.asm
View file

@ -40,7 +40,7 @@ HallofFameRoomScript2:
ld [wLancesRoomCurScript], a ld [wLancesRoomCurScript], a
ld [wHallOfFameCurScript], a ld [wHallOfFameCurScript], a
; Elite 4 events ; Elite 4 events
ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 ResetEventRange INDIGO_PLATEAU_EVENTS_START, INDIGO_PLATEAU_EVENTS_END, 1
xor a xor a
ld [wHallOfFameCurScript], a ld [wHallOfFameCurScript], a
ld a, PALLET_TOWN ld a, PALLET_TOWN

2
scripts/IndigoPlateauLobby.asm
View file

@ -11,7 +11,7 @@ IndigoPlateauLobby_Script:
res 1, [hl] res 1, [hl]
ret z ret z
; Elite 4 events ; Elite 4 events
ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ResetEventRange INDIGO_PLATEAU_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
ret ret
IndigoPlateauLobby_TextPointers: IndigoPlateauLobby_TextPointers: