pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove original maps and object events (#1)

Browse Source
This commit is contained in:
xCrystal
2023-07-25 15:33:08 +02:00
parent 60cacea4b0
commit 5147904f78
790 changed files with 175 additions and 88149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/pokemon/caught_data.asm
View File

@@ -76,8 +76,6 @@ CheckPartyFullAfterContest:
call GetPartyLocation
ld a, [hl]
and CAUGHT_GENDER_MASK
ld b, LANDMARK_NATIONAL_PARK
or b
ld [hl], a
xor a
ld [wContestMonSpecies], a
@@ -136,8 +134,6 @@ CheckPartyFullAfterContest:
ld hl, sBoxMon1CaughtLocation
ld a, [hl]
and CAUGHT_GENDER_MASK
ld b, LANDMARK_NATIONAL_PARK
or b
ld [hl], a
call CloseSRAM
xor a
@@ -178,18 +174,6 @@ SetBoxmonOrEggmonCaughtData:
ld b, a
ld a, [wMapNumber]
ld c, a
cp MAP_POKECENTER_2F
jr nz, .NotPokecenter2F
ld a, b
cp GROUP_POKECENTER_2F
jr nz, .NotPokecenter2F
ld a, [wBackupMapGroup]
ld b, a
ld a, [wBackupMapNumber]
ld c, a
.NotPokecenter2F:
call GetWorldMapLocation
ld b, a
ld a, [wPlayerGender]