From 0ae5e9b3986dbbe64870dc1ad29a63b65b96200e Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 23 Dec 2018 14:02:07 -0500 Subject: Define RANDY_OT_ID --- engine/events/shuckle.asm | 1 + engine/pokemon/move_mon.asm | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index b1c87f53a..ca8985591 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -67,6 +67,7 @@ GiveShuckle: SpecialShuckleOT: db "MANIA@" + SpecialShuckleNick: db "SHUCKIE@" diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 9ed86447a..eaa05f84a 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1,3 +1,5 @@ +RANDY_OT_ID EQU 01001 + TryAddMonToParty: ; Check if to copy wild mon or generate a new one ; Whose is it? @@ -1724,9 +1726,9 @@ GivePoke:: ld hl, wPartyMon1ID ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes - ld a, HIGH(01001) + ld a, HIGH(RANDY_OT_ID) ld [hli], a - ld [hl], LOW(01001) + ld [hl], LOW(RANDY_OT_ID) pop bc farcall SetGiftPartyMonCaughtData jr .skip_nickname -- cgit v1.2.3