diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/script_cmd_table.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/script_cmd_table.inc')
| -rw-r--r-- | data/script_cmd_table.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index b33db9218..07b22dda2 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -94,8 +94,8 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_turnobject .4byte ScrCmd_trainerbattle .4byte ScrCmd_dotrainerbattle - .4byte ScrCmd_ontrainerbattleend - .4byte ScrCmd_ontrainerbattleendgoto + .4byte ScrCmd_gotopostbattlescript + .4byte ScrCmd_gotobeatenscript .4byte ScrCmd_checktrainerflag .4byte ScrCmd_settrainerflag .4byte ScrCmd_cleartrainerflag @@ -139,7 +139,7 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_pokemartdecoration2 .4byte ScrCmd_playslotmachine .4byte ScrCmd_setberrytree - .4byte ScrCmd_choosecontestpkmn + .4byte ScrCmd_choosecontestmon .4byte ScrCmd_startcontest .4byte ScrCmd_showcontestresults .4byte ScrCmd_contestlinktransfer |