mirror of https://github.com/pret/pokecrystal.git
Fix rest of the givepokeitem/checkpokeitem references
This commit is contained in:
parent
c82deab86f
commit
acdb302035
|
@ -22,7 +22,7 @@ NUM_MEM_BUFFERS EQU const_value
|
|||
const HAVE_AMOUNT ; 1
|
||||
const HAVE_LESS ; 2
|
||||
|
||||
; checkpokeitem return values
|
||||
; checkpokemail return values
|
||||
const_def
|
||||
const POKEMAIL_WRONG_MAIL ; 0
|
||||
const POKEMAIL_CORRECT ; 1
|
||||
|
|
|
@ -99,9 +99,9 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
|
|||
|
||||
## `$2E`: <code>giveegg <i>mon_id</i>, <i>level</i></code>
|
||||
|
||||
## `$2F`: <code>givepokeitem <i>pointer</i></code>
|
||||
## `$2F`: <code>givepokemail <i>pointer</i></code>
|
||||
|
||||
## `$30`: <code>checkpokeitem <i>pointer</i></code>
|
||||
## `$30`: <code>checkpokemail <i>pointer</i></code>
|
||||
|
||||
## `$31`: <code>checkevent <i>event_flag</i></code>
|
||||
|
||||
|
|
|
@ -112,8 +112,8 @@ ScriptCommandTable:
|
|||
dw Script_checkpoke ; 2c
|
||||
dw Script_givepoke ; 2d
|
||||
dw Script_giveegg ; 2e
|
||||
dw Script_givepokeitem ; 2f
|
||||
dw Script_checkpokeitem ; 30
|
||||
dw Script_givepokemail ; 2f
|
||||
dw Script_checkpokemail ; 30
|
||||
dw Script_checkevent ; 31
|
||||
dw Script_clearevent ; 32
|
||||
dw Script_setevent ; 33
|
||||
|
@ -2019,7 +2019,7 @@ Script_stringtotext:
|
|||
ld de, wStringBuffer2
|
||||
jp ConvertMemToText
|
||||
|
||||
Script_givepokeitem:
|
||||
Script_givepokemail:
|
||||
; script command 0x2f
|
||||
; parameters: pointer
|
||||
|
||||
|
@ -2037,10 +2037,10 @@ Script_givepokeitem:
|
|||
ld a, [wScriptBank]
|
||||
call FarCopyBytes
|
||||
pop bc
|
||||
farcall GivePokeItem
|
||||
farcall GivePokeMail
|
||||
ret
|
||||
|
||||
Script_checkpokeitem:
|
||||
Script_checkpokemail:
|
||||
; script command 0x30
|
||||
; parameters: pointer
|
||||
|
||||
|
@ -2050,7 +2050,7 @@ Script_checkpokeitem:
|
|||
ld d, a
|
||||
ld a, [wScriptBank]
|
||||
ld b, a
|
||||
farcall CheckPokeItem
|
||||
farcall CheckPokeMail
|
||||
ret
|
||||
|
||||
Script_giveitem:
|
||||
|
|
|
@ -124,7 +124,7 @@ GetMailboxCount: ; 44648
|
|||
jp CloseSRAM
|
||||
; 44654
|
||||
|
||||
CheckPokeItem:: ; 44654
|
||||
CheckPokeMail:: ; 44654
|
||||
push bc
|
||||
push de
|
||||
farcall SelectMonFromParty
|
||||
|
@ -194,7 +194,7 @@ CheckPokeItem:: ; 44654
|
|||
; 446cc
|
||||
|
||||
|
||||
GivePokeItem:: ; 446cc
|
||||
GivePokeMail:: ; 446cc
|
||||
ld a, [wPartyCount]
|
||||
dec a
|
||||
push af
|
||||
|
|
|
@ -51,6 +51,8 @@ reloadmapmusic EQUS "dontrestartmapmusic"
|
|||
resetfuncs EQUS "endall"
|
||||
storetext EQUS "battletowertext"
|
||||
displaylocation EQUS "landmarktotext"
|
||||
givepokeitem EQUS "givepokemail"
|
||||
checkpokeitem EQUS "checkpokemail"
|
||||
|
||||
|
||||
; macros/scripts/maps.asm
|
||||
|
|
Loading…
Reference in New Issue