diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-09-19 00:41:13 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-09-19 00:41:13 -0400 |
| commit | f7aea30ee8b9d1616b39defc6fb64b1c53886805 (patch) | |
| tree | dee31d564ad2c2a600186fb5a6068806e0775af8 /scripts | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Fix tools/unnamed.py and add tools/consts.py (diff) | |
| download | pokeyellow-f7aea30ee8b9d1616b39defc6fb64b1c53886805.tar.gz pokeyellow-f7aea30ee8b9d1616b39defc6fb64b1c53886805.tar.xz pokeyellow-f7aea30ee8b9d1616b39defc6fb64b1c53886805.zip | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/HallOfFame.asm | 2 | ||||
| -rw-r--r-- | scripts/IndigoPlateauLobby.asm | 2 |
2 files changed, 2 insertions, 2 deletions
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 0a532d9a..f3aedbc2 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: |