From b3e38f1246cfcbb1a16b37b6e7e26328cbb796b5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 15 Jun 2020 17:41:02 -0400 Subject: Remove Crystal-only CaughtData --- engine/pokemon/caught_data.asm | 130 ------------------------------------- engine/pokemon/caught_nickname.asm | 130 +++++++++++++++++++++++++++++++++++++ engine/pokemon/move_mon.asm | 8 +-- 3 files changed, 134 insertions(+), 134 deletions(-) delete mode 100644 engine/pokemon/caught_data.asm create mode 100644 engine/pokemon/caught_nickname.asm (limited to 'engine') diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm deleted file mode 100644 index 408e284a..00000000 --- a/engine/pokemon/caught_data.asm +++ /dev/null @@ -1,130 +0,0 @@ -CheckPartyFullAfterContest: - ld a, [wContestMon] - and a - jp z, .DidntCatchAnything - ld [wCurPartySpecies], a - ld [wCurSpecies], a - call GetBaseData - ld hl, wPartyCount - ld a, [hl] - cp PARTY_LENGTH - jp nc, .TryAddToBox - inc a - ld [hl], a - ld c, a - ld b, 0 - add hl, bc - ld a, [wContestMon] - ld [hli], a - ld [wCurSpecies], a - ld a, -1 - ld [hl], a - ld hl, wPartyMon1Species - ld a, [wPartyCount] - dec a - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld d, h - ld e, l - ld hl, wContestMon - ld bc, PARTYMON_STRUCT_LENGTH - call CopyBytes - ld a, [wPartyCount] - dec a - ld hl, wPartyMonOT - call SkipNames - ld d, h - ld e, l - ld hl, wPlayerName - call CopyBytes - ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a - call GetPokemonName - ld hl, wStringBuffer1 - ld de, wMonOrItemNameBuffer - ld bc, MON_NAME_LENGTH - call CopyBytes - call GiveANickname_YesNo - jr c, .Party_SkipNickname - ld a, [wPartyCount] - dec a - ld [wCurPartyMon], a - xor a - ld [wMonType], a - ld de, wMonOrItemNameBuffer - callfar InitNickname - -.Party_SkipNickname: - ld a, [wPartyCount] - dec a - ld hl, wPartyMonNicknames - call SkipNames - ld d, h - ld e, l - ld hl, wMonOrItemNameBuffer - call CopyBytes - xor a - ld [wContestMonSpecies], a - and a - ld [wScriptVar], a - ret - -.TryAddToBox: - ld a, BANK(sBoxCount) - call OpenSRAM - ld hl, sBoxCount - ld a, [hl] - cp MONS_PER_BOX - call CloseSRAM - jr nc, .BoxFull - xor a - ld [wCurPartyMon], a - ld hl, wContestMon - ld de, wBufferMon - ld bc, BOXMON_STRUCT_LENGTH - call CopyBytes - ld hl, wPlayerName - ld de, wBufferMonOT - ld bc, NAME_LENGTH - call CopyBytes - callfar InsertPokemonIntoBox - ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a - call GetPokemonName - call GiveANickname_YesNo - ld hl, wStringBuffer1 - jr c, .Box_SkipNickname - ld a, BOXMON - ld [wMonType], a - ld de, wMonOrItemNameBuffer - callfar InitNickname - ld hl, wMonOrItemNameBuffer - -.Box_SkipNickname: - ld a, BANK(sBoxMonNicknames) - call OpenSRAM - ld de, sBoxMonNicknames - ld bc, MON_NAME_LENGTH - call CopyBytes - call CloseSRAM - -.BoxFull: - xor a - ld [wContestMon], a - ld a, BUGCONTEST_BOXED_MON - ld [wScriptVar], a - ret - -.DidntCatchAnything: - ld a, BUGCONTEST_NO_CATCH - ld [wScriptVar], a - ret - -GiveANickname_YesNo: - ld hl, CaughtAskNicknameText - call PrintText - jp YesNoBox - -CaughtAskNicknameText: - text_far _CaughtAskNicknameText - text_end diff --git a/engine/pokemon/caught_nickname.asm b/engine/pokemon/caught_nickname.asm new file mode 100644 index 00000000..408e284a --- /dev/null +++ b/engine/pokemon/caught_nickname.asm @@ -0,0 +1,130 @@ +CheckPartyFullAfterContest: + ld a, [wContestMon] + and a + jp z, .DidntCatchAnything + ld [wCurPartySpecies], a + ld [wCurSpecies], a + call GetBaseData + ld hl, wPartyCount + ld a, [hl] + cp PARTY_LENGTH + jp nc, .TryAddToBox + inc a + ld [hl], a + ld c, a + ld b, 0 + add hl, bc + ld a, [wContestMon] + ld [hli], a + ld [wCurSpecies], a + ld a, -1 + ld [hl], a + ld hl, wPartyMon1Species + ld a, [wPartyCount] + dec a + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l + ld hl, wContestMon + ld bc, PARTYMON_STRUCT_LENGTH + call CopyBytes + ld a, [wPartyCount] + dec a + ld hl, wPartyMonOT + call SkipNames + ld d, h + ld e, l + ld hl, wPlayerName + call CopyBytes + ld a, [wCurPartySpecies] + ld [wNamedObjectIndexBuffer], a + call GetPokemonName + ld hl, wStringBuffer1 + ld de, wMonOrItemNameBuffer + ld bc, MON_NAME_LENGTH + call CopyBytes + call GiveANickname_YesNo + jr c, .Party_SkipNickname + ld a, [wPartyCount] + dec a + ld [wCurPartyMon], a + xor a + ld [wMonType], a + ld de, wMonOrItemNameBuffer + callfar InitNickname + +.Party_SkipNickname: + ld a, [wPartyCount] + dec a + ld hl, wPartyMonNicknames + call SkipNames + ld d, h + ld e, l + ld hl, wMonOrItemNameBuffer + call CopyBytes + xor a + ld [wContestMonSpecies], a + and a + ld [wScriptVar], a + ret + +.TryAddToBox: + ld a, BANK(sBoxCount) + call OpenSRAM + ld hl, sBoxCount + ld a, [hl] + cp MONS_PER_BOX + call CloseSRAM + jr nc, .BoxFull + xor a + ld [wCurPartyMon], a + ld hl, wContestMon + ld de, wBufferMon + ld bc, BOXMON_STRUCT_LENGTH + call CopyBytes + ld hl, wPlayerName + ld de, wBufferMonOT + ld bc, NAME_LENGTH + call CopyBytes + callfar InsertPokemonIntoBox + ld a, [wCurPartySpecies] + ld [wNamedObjectIndexBuffer], a + call GetPokemonName + call GiveANickname_YesNo + ld hl, wStringBuffer1 + jr c, .Box_SkipNickname + ld a, BOXMON + ld [wMonType], a + ld de, wMonOrItemNameBuffer + callfar InitNickname + ld hl, wMonOrItemNameBuffer + +.Box_SkipNickname: + ld a, BANK(sBoxMonNicknames) + call OpenSRAM + ld de, sBoxMonNicknames + ld bc, MON_NAME_LENGTH + call CopyBytes + call CloseSRAM + +.BoxFull: + xor a + ld [wContestMon], a + ld a, BUGCONTEST_BOXED_MON + ld [wScriptVar], a + ret + +.DidntCatchAnything: + ld a, BUGCONTEST_NO_CATCH + ld [wScriptVar], a + ret + +GiveANickname_YesNo: + ld hl, CaughtAskNicknameText + call PrintText + jp YesNoBox + +CaughtAskNicknameText: + text_far _CaughtAskNicknameText + text_end diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index b1988f68..36c74140 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -235,10 +235,10 @@ endr ; PokerusStatus ld [de], a inc de - ; CaughtData/CaughtTime/CaughtLevel + ; Unused1 ld [de], a inc de - ; CaughtGender/CaughtLocation + ; Unused2 ld [de], a inc de @@ -298,10 +298,10 @@ endr ; PokerusStatus ld [de], a inc de - ; CaughtData/CaughtTime/CaughtLevel + ; Unused1 ld [de], a inc de - ; CaughtGender/CaughtLocation + ; Unused2 ld [de], a inc de -- cgit v1.2.3