Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rest of the givepokeitem/checkpokeitem references

This commit is contained in:
mid-kid 2018-05-06 13:48:04 +02:00
parent c82deab86f
commit acdb302035
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/script_constants.asm
View File

@ -22,7 +22,7 @@ NUM_MEM_BUFFERS EQU const_value
const HAVE_AMOUNT ; 1 const HAVE_AMOUNT ; 1
const HAVE_LESS ; 2 const HAVE_LESS ; 2
; checkpokeitem return values ; checkpokemail return values
const_def const_def
const POKEMAIL_WRONG_MAIL ; 0 const POKEMAIL_WRONG_MAIL ; 0
const POKEMAIL_CORRECT ; 1 const POKEMAIL_CORRECT ; 1

4
docs/event_commands.md
View File

@ -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> ## `$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> ## `$31`: <code>checkevent <i>event_flag</i></code>

12
engine/overworld/scripting.asm
View File

@ -112,8 +112,8 @@ ScriptCommandTable:
dw Script_checkpoke ; 2c dw Script_checkpoke ; 2c
dw Script_givepoke ; 2d dw Script_givepoke ; 2d
dw Script_giveegg ; 2e dw Script_giveegg ; 2e
dw Script_givepokeitem ; 2f dw Script_givepokemail ; 2f
dw Script_checkpokeitem ; 30 dw Script_checkpokemail ; 30
dw Script_checkevent ; 31 dw Script_checkevent ; 31
dw Script_clearevent ; 32 dw Script_clearevent ; 32
dw Script_setevent ; 33 dw Script_setevent ; 33
@ -2019,7 +2019,7 @@ Script_stringtotext:
ld de, wStringBuffer2 ld de, wStringBuffer2
jp ConvertMemToText jp ConvertMemToText
Script_givepokeitem: Script_givepokemail:
; script command 0x2f ; script command 0x2f
; parameters: pointer ; parameters: pointer
@ -2037,10 +2037,10 @@ Script_givepokeitem:
ld a, [wScriptBank] ld a, [wScriptBank]
call FarCopyBytes call FarCopyBytes
pop bc pop bc
farcall GivePokeItem farcall GivePokeMail
ret ret
Script_checkpokeitem: Script_checkpokemail:
; script command 0x30 ; script command 0x30
; parameters: pointer ; parameters: pointer
@ -2050,7 +2050,7 @@ Script_checkpokeitem:
ld d, a ld d, a
ld a, [wScriptBank] ld a, [wScriptBank]
ld b, a ld b, a
farcall CheckPokeItem farcall CheckPokeMail
ret ret
Script_giveitem: Script_giveitem:

4
engine/pokemon/mail.asm
View File

@ -124,7 +124,7 @@ GetMailboxCount: ; 44648
jp CloseSRAM jp CloseSRAM
; 44654 ; 44654
CheckPokeItem:: ; 44654 CheckPokeMail:: ; 44654
push bc push bc
push de push de
farcall SelectMonFromParty farcall SelectMonFromParty
@ -194,7 +194,7 @@ CheckPokeItem:: ; 44654
; 446cc ; 446cc
GivePokeItem:: ; 446cc GivePokeMail:: ; 446cc
ld a, [wPartyCount] ld a, [wPartyCount]
dec a dec a
push af push af

2
macros/legacy.asm
View File

@ -51,6 +51,8 @@ reloadmapmusic EQUS "dontrestartmapmusic"
resetfuncs EQUS "endall" resetfuncs EQUS "endall"
storetext EQUS "battletowertext" storetext EQUS "battletowertext"
displaylocation EQUS "landmarktotext" displaylocation EQUS "landmarktotext"
givepokeitem EQUS "givepokemail"
checkpokeitem EQUS "checkpokemail"
; macros/scripts/maps.asm ; macros/scripts/maps.asm