diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
| commit | 6bd6cfcac7ae76806c8c9d940163dc3ece6a9acf (patch) | |
| tree | f71ad889881572488c2a2be299c50fc09393e1a2 /data/script_cmd_table.inc | |
| parent | 0e8d6645f84057a9eaf9e60ac9312bc259f15be1 (diff) | |
| parent | 4554b546ef1699d4b3bde9ef27e7477e620d38d9 (diff) | |
Merge remote-tracking branch 'pret/master'
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 |