diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 20:41:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 20:41:57 -0500 |
| commit | e92cc7752b5934d7501c5027057a6b7c52601bd7 (patch) | |
| tree | 85150713e1d8561415a54a45221c5b1975c91428 /data/script_cmd_table.inc | |
| parent | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (diff) | |
| parent | 736f3bbbe0d1685474364a68038554f024bff62e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'data/script_cmd_table.inc')
| -rw-r--r-- | data/script_cmd_table.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index f447d5f25..2cde7190f 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -68,15 +68,15 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_setholewarp .4byte ScrCmd_getplayerxy .4byte ScrCmd_getpartysize - .4byte ScrCmd_giveitem - .4byte ScrCmd_takeitem + .4byte ScrCmd_additem + .4byte ScrCmd_removeitem .4byte ScrCmd_checkitemspace .4byte ScrCmd_checkitem .4byte ScrCmd_checkitemtype - .4byte ScrCmd_givepcitem + .4byte ScrCmd_addpcitem .4byte ScrCmd_checkpcitem - .4byte ScrCmd_givedecoration - .4byte ScrCmd_takedecoration + .4byte ScrCmd_adddecoration + .4byte ScrCmd_removedecoration .4byte ScrCmd_checkdecor .4byte ScrCmd_checkdecorspace .4byte ScrCmd_applymovement @@ -144,8 +144,8 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_showcontestresults .4byte ScrCmd_contestlinktransfer .4byte ScrCmd_random - .4byte ScrCmd_givemoney - .4byte ScrCmd_takemoney + .4byte ScrCmd_addmoney + .4byte ScrCmd_removemoney .4byte ScrCmd_checkmoney .4byte ScrCmd_showmoneybox .4byte ScrCmd_hidemoneybox @@ -180,8 +180,8 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_addelevmenuitem .4byte ScrCmd_showelevmenu .4byte ScrCmd_checkcoins - .4byte ScrCmd_givecoins - .4byte ScrCmd_takecoins + .4byte ScrCmd_addcoins + .4byte ScrCmd_removecoins .4byte ScrCmd_setwildbattle .4byte ScrCmd_dowildbattle .4byte ScrCmd_setvaddress |