pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Define RANDY_OT_ID

Browse Source
This commit is contained in:
Rangi 2018-12-23 14:02:07 -05:00
parent f6ecb681d5
commit 0ae5e9b398
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/events/shuckle.asm
View File

@ -67,6 +67,7 @@ GiveShuckle:
SpecialShuckleOT: SpecialShuckleOT:
db "MANIA@" db "MANIA@"
SpecialShuckleNick: SpecialShuckleNick:
db "SHUCKIE@" db "SHUCKIE@"

6
engine/pokemon/move_mon.asm
View File

@ -1,3 +1,5 @@
RANDY_OT_ID EQU 01001
TryAddMonToParty: TryAddMonToParty:
; Check if to copy wild mon or generate a new one ; Check if to copy wild mon or generate a new one
; Whose is it? ; Whose is it?
@ -1724,9 +1726,9 @@ GivePoke::
ld hl, wPartyMon1ID ld hl, wPartyMon1ID
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld a, HIGH(01001) ld a, HIGH(RANDY_OT_ID)
ld [hli], a ld [hli], a
ld [hl], LOW(01001) ld [hl], LOW(RANDY_OT_ID)
pop bc pop bc
farcall SetGiftPartyMonCaughtData farcall SetGiftPartyMonCaughtData
jr .skip_nickname jr .skip_nickname