Adding Cinnabar Volcano, editing a few encounters

This commit is contained in:
MementoMartha 2022-09-27 12:09:22 +01:00
parent 0b65243c75
commit 4eaae2ab9d
35 changed files with 215 additions and 120 deletions

View file

@ -174,6 +174,8 @@ SetPal_Overworld:
ld a, [wCurMap]
cp SEAFOAM_ISLANDS_1F
jr z, .seafoam
cp CINNABAR_VOLCANO
jr z, .volcano
cp SEAFOAM_ISLANDS_B1F
jr c, .caveDefault
cp SEAFOAM_ISLANDS_B4F + 1
@ -190,6 +192,9 @@ SetPal_Overworld:
.seafoam
ld a, PAL_0F - 1
jr .town
.volcano
ld a, PAL_REDMON - 1
jr .town
; used when a Pokemon is the only thing on the screen
; such as evolution, trading and the Hall of Fame
@ -283,7 +288,7 @@ BadgeBlkDataLengths:
DeterminePaletteID:
bit TRANSFORMED, a ; a is battle status 3
ld a, PAL_GREYMON ; if the mon has used Transform, use Ditto's palette
ld a, PAL_PURPLEMON ; if the mon has used Transform, use Ditto's palette
ret nz
ld a, [hl]
DeterminePaletteIDOutOfBattle: