diff options
Diffstat (limited to 'engine/caught_data.asm')
| -rw-r--r-- | engine/caught_data.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/caught_data.asm b/engine/caught_data.asm index 1f8b8cac4..56ef8a839 100644 --- a/engine/caught_data.asm +++ b/engine/caught_data.asm @@ -1,4 +1,4 @@ -CheckPartyFullAfterContest: ; 4d9e5 +Special_CheckPartyFullAfterContest: ; 4d9e5 ld a, [wContestMon] and a jp z, .DidntCatchAnything @@ -7,17 +7,17 @@ CheckPartyFullAfterContest: ; 4d9e5 call GetBaseData ld hl, PartyCount ld a, [hl] - cp 6 + cp PARTY_LENGTH jp nc, .TryAddToBox inc a ld [hl], a ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [wContestMon] ld [hli], a ld [CurSpecies], a - ld a, $ff + ld a, -1 ld [hl], a ld hl, PartyMon1Species ld a, [PartyCount] @@ -75,13 +75,13 @@ CheckPartyFullAfterContest: ; 4d9e5 ld hl, PartyMon1CaughtLocation call GetPartyLocation ld a, [hl] - and $80 - ld b, $13 + and CAUGHT_GENDER_MASK + ld b, NATIONAL_PARK or b ld [hl], a xor a ld [wContestMon], a - and a + and a ; BUGCONTEST_CAUGHT_MON ld [ScriptVar], a ret @@ -135,19 +135,19 @@ CheckPartyFullAfterContest: ; 4d9e5 call GetSRAMBank ld hl, sBoxMon1CaughtLocation ld a, [hl] - and $80 - ld b, $13 + and CAUGHT_GENDER_MASK + ld b, NATIONAL_PARK or b ld [hl], a call CloseSRAM xor a ld [wContestMon], a - ld a, $1 + ld a, BUGCONTEST_BOXED_MON ld [ScriptVar], a ret .DidntCatchAnything: ; 4db35 - ld a, $2 + ld a, BUGCONTEST_NO_CATCH ld [ScriptVar], a ret @@ -227,7 +227,7 @@ SetGiftPartyMonCaughtData: ; 4dba3 SetGiftMonCaughtData: ; 4dbaf xor a ld [hli], a - ld a, $7e + ld a, GIFT_LOCATION rrc b or b ld [hl], a @@ -239,7 +239,7 @@ SetEggMonCaughtData: ; 4dbb8 (13:5bb8) call GetPartyLocation ld a, [CurPartyLevel] push af - ld a, $1 + ld a, CAUGHT_EGG_LEVEL ld [CurPartyLevel], a call SetBoxmonOrEggmonCaughtData pop af |