From 646664ff29afd8627626274a4fc12b05d584fe2c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Dec 2017 21:25:13 +0100 Subject: battle setup file is decompiled --- data/script_cmd_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/script_cmd_table.inc') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index b33db9218..a50cb6afe 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_gotobattleendscript + .4byte ScrCmd_gototrainerscript .4byte ScrCmd_checktrainerflag .4byte ScrCmd_settrainerflag .4byte ScrCmd_cleartrainerflag -- cgit v1.2.3 From 54dccc851283d4b5013c6bb9997b695bee79007d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Dec 2017 20:38:01 +0100 Subject: give batter script command names --- data/script_cmd_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/script_cmd_table.inc') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index a50cb6afe..96f42dfb0 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_gotobattleendscript - .4byte ScrCmd_gototrainerscript + .4byte ScrCmd_gotopostbattlescript + .4byte ScrCmd_gotobeatenscript .4byte ScrCmd_checktrainerflag .4byte ScrCmd_settrainerflag .4byte ScrCmd_cleartrainerflag -- cgit v1.2.3 From 173761a5a11edf32eb22453e83689587e0aee683 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Dec 2017 13:47:52 -0600 Subject: Port generic event script macros from pokeruby --- data/script_cmd_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/script_cmd_table.inc') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 96f42dfb0..07b22dda2 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -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 -- cgit v1.2.3