Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a LANDMARK_ prefix to landmark constants

Browse Source 
Resolves #697
This commit is contained in:
Rangi
2020-03-15 17:26:10 -04:00
parent 65f22544e0
commit ad50e94b50
37 changed files with 630 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/pokemon/caught_data.asm
View File

@@ -76,7 +76,7 @@ CheckPartyFullAfterContest:
call GetPartyLocation
ld a, [hl]
and CAUGHT_GENDER_MASK
ld b, NATIONAL_PARK
ld b, LANDMARK_NATIONAL_PARK
or b
ld [hl], a
xor a
@@ -136,7 +136,7 @@ CheckPartyFullAfterContest:
ld hl, sBoxMon1CaughtLocation
ld a, [hl]
and CAUGHT_GENDER_MASK
ld b, NATIONAL_PARK
ld b, LANDMARK_NATIONAL_PARK
or b
ld [hl], a
call CloseSRAM
@@ -226,7 +226,7 @@ SetGiftPartyMonCaughtData:
SetGiftMonCaughtData:
xor a
ld [hli], a
ld a, GIFT_LOCATION
ld a, LANDMARK_GIFT
rrc b
or b
ld [hl], a