pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use more constants

Browse Source
This commit is contained in:
Rangi 2019-01-24 21:15:30 -05:00
parent 84b6a084cb
commit 68d4a53483
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/script_constants.asm
View File

@ -163,7 +163,7 @@ NUM_CMDQUEUE_TYPES EQU const_value
const EMOTE_ROD ; 9
const EMOTE_BOULDER_DUST ; 10
const EMOTE_GRASS_RUSTLE ; 11
EMOTE_MEM EQU -1
EMOTE_FROM_MEM EQU -1
; fruittree arguments
; FruitTreeItems indexes (see data/items/fruit_trees.asm)

14
engine/overworld/scripting.asm
View File

@ -511,7 +511,7 @@ Script_verbosegiveitem:
call Script_giveitem
call CurItemName
ld de, wStringBuffer1
ld a, 1
ld a, MEM_BUFFER_1
call CopyConvertedText
ld b, BANK(GiveItemScript)
ld de, GiveItemScript
@ -544,7 +544,7 @@ Script_verbosegiveitem2:
; parameters: item, var
call GetScriptByte
cp -1
cp ITEM_FROM_MEM
jr nz, .ok
ld a, [wScriptVar]
.ok
@ -562,7 +562,7 @@ Script_verbosegiveitem2:
ld [wScriptVar], a
call CurItemName
ld de, wStringBuffer1
ld a, 1
ld a, MEM_BUFFER_1
call CopyConvertedText
ld b, BANK(GiveItemScript)
ld de, GiveItemScript
@ -1222,7 +1222,7 @@ Script_loademote:
; parameters: bubble
call GetScriptByte
cp -1
cp EMOTE_FROM_MEM
jr nz, .not_var_emote
ld a, [wScriptVar]
.not_var_emote
@ -1249,7 +1249,7 @@ Script_showemote:
jp ScriptCall
ShowEmoteScript:
loademote EMOTE_MEM
loademote EMOTE_FROM_MEM
applymovement2 .Show
pause 0
applymovement2 .Hide
@ -2520,7 +2520,7 @@ Script_blackoutmod:
Script_dontrestartmapmusic:
; script command 0x83
ld a, 1
ld a, TRUE
ld [wDontPlayMapMusicOnReload], a
ret
@ -2547,7 +2547,7 @@ Script_delcmdqueue:
ld b, a
farcall DelCmdQueue ; no need to farcall
ret c
ld a, 1
ld a, TRUE
ld [wScriptVar], a
ret