From 948b270a83dce5f985cf347e88cd3ed0b110e1c1 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Thu, 12 Sep 2019 12:29:47 -0400 Subject: Script reversing --- src/macros/scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index b9ab4ec..9c81bda 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -46,7 +46,7 @@ ENDM const Func_d055_index ; $1d const OWScript_MovePlayer_index ; $1e const Func_cee2_index ; $1f - const Func_d080_index ; $20 + const OWScript_SetDialogName_index ; $20 const Func_d088_index ; $21 const Func_d095_index ; $22 const Func_d0be_index ; $23 -- cgit v1.2.3 From 751b28d4fee472af4d0de83ef22a1f11ec6fade6 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sun, 15 Sep 2019 21:55:11 -0400 Subject: Lots of NPC data, some temp. comments on mapdatapointers --- src/macros/scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 9c81bda..2fa15fb 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -50,7 +50,7 @@ ENDM const Func_d088_index ; $21 const Func_d095_index ; $22 const Func_d0be_index ; $23 - const Func_d0ce_index ; $24 + const OWScript_DoFrames_index ; $24 const Func_d0d9_index ; $25 const Func_d0f2_index ; $26 const Func_ce4a_index ; $27 -- cgit v1.2.3 From f3f374e6b7e26bc93c8428c8cb7b8c210223b2f4 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Mon, 23 Sep 2019 12:27:12 -0400 Subject: Fleshed out flags a lot --- src/macros/scripts.asm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 2fa15fb..2bf40e4 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -15,17 +15,17 @@ ENDM const_def const OWScript_EndScriptLoop1_index ; $00 - const OWScript_CloseTextBox_index ; $01 + const OWScript_CloseAdvancedTextBox_index ; $01 const OWScript_PrintTextString_index ; $02 const Func_ccdc_index ; $03 const OWScript_AskQuestionJump_index ; $04 const OWScript_StartBattle_index ; $05 - const Func_cd83_index ; $06 + const OWScript_PrintVariableText_index ; $06 const Func_cda8_index ; $07 const OWScript_PrintTextCloseBox_index ; $08 const Func_cdcb_index ; $09 const Func_ce26_index ; $0a - const Func_ce84_index ; $0b + const OWScript_CloseTextBox_index ; $0b const OWScript_GiveBoosterPacks_index ; $0c const Func_cf0c_index ; $0d const Func_cf12_index ; $0e @@ -41,7 +41,7 @@ ENDM const Func_d025_index ; $18 const Func_d032_index ; $19 const Func_d03f_index ; $1a - const OWScript_ScriptJump_index ; $1b + const OWScript_Jump_index ; $1b const Func_d04f_index ; $1c const Func_d055_index ; $1d const OWScript_MovePlayer_index ; $1e @@ -80,7 +80,7 @@ ENDM const Func_cd76_index ; $3f const Func_d39d_index ; $40 const Func_d3b9_index ; $41 - const Func_d3c9_index ; $42 + const OWScript_GivePCPack_index ; $42 const Func_d3d1_index ; $43 const Func_d3d4_index ; $44 const Func_d3e0_index ; $45 @@ -102,18 +102,18 @@ ENDM const OWScript_EndScriptLoop4_index ; $55 const OWScript_EndScriptLoop5_index ; $56 const OWScript_EndScriptLoop6_index ; $57 - const OWScript_CustomModifyEventFlags_index ; $58 - const Func_d460_index ; $59 - const OWScript_JumpIfFlagSet_index ; $5a - const Func_d484_index ; $5b - const Func_d49e_index ; $5c - const Func_d4a6_index ; $5d - const Func_d4ae_index ; $5e - const OWScript_SetEventFlags_index ; $5f - const Func_d4c3_index ; $60 - const Func_d4ca_index ; $61 - const OWScript_JumpIfFlagNotSet_index ; $62 - const Func_d452_index ; $63 + const OWScript_SetFlagValue_index ; $58 + const OWScript_JumpIfFlagZero1_index ; $59 + const OWScript_JumpIfFlagNonzero1_index ; $5a + const OWScript_JumpIfFlagEqual_index ; $5b + const OWScript_JumpIfFlagNotEqual_index ; $5c + const OWScript_JumpIfFlagNotLessThan_index ; $5d + const OWScript_JumpIfFlagLessThan_index ; $5e + const OWScript_MaxOutFlagValue_index ; $5f + const OWScript_ZeroOutFlagValue_index ; $60 + const OWScript_JumpIfFlagNonzero2_index ; $61 + const OWScript_JumpIfFlagZero2_index ; $62 + const OWScript_IncrementFlagValue_index ; $63 const OWScript_EndScriptLoop7_index ; $64 const OWScript_EndScriptLoop8_index ; $65 const OWScript_EndScriptLoop9_index ; $66 -- cgit v1.2.3 From 8c416b556348fe9a98e28fd0ba5628b5c74edcc8 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Thu, 3 Oct 2019 22:04:51 -0400 Subject: Ronald scripts and overworld data routines. Also made script extractor better --- src/macros/scripts.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 2bf40e4..1f36cba 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -29,8 +29,8 @@ ENDM const OWScript_GiveBoosterPacks_index ; $0c const Func_cf0c_index ; $0d const Func_cf12_index ; $0e - const Func_cf3f_index ; $0f - const Func_cf4c_index ; $10 + const OWScript_GiveCard_index ; $0f + const OWScript_TakeCard_index ; $10 const Func_cf53_index ; $11 const Func_cf7b_index ; $12 const Func_cf2d_index ; $13 -- cgit v1.2.3 From a44f17b9a15cf1a572d5e8056a69c368265729f2 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sun, 6 Oct 2019 23:00:27 -0400 Subject: Fixed a few macros that were giving weird code. Updated tcgdisasm --- src/macros/scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 1f36cba..7f2bbb5 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -81,7 +81,7 @@ ENDM const Func_d39d_index ; $40 const Func_d3b9_index ; $41 const OWScript_GivePCPack_index ; $42 - const Func_d3d1_index ; $43 + const OWScript_nop_index ; $43 const Func_d3d4_index ; $44 const Func_d3e0_index ; $45 const Func_d3fe_index ; $46 -- cgit v1.2.3 From cb88ee5a13498f060da1be80eb0cc0fcd1357a05 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Tue, 8 Oct 2019 00:20:52 -0400 Subject: Created python script to calculate progress and documented some scripts --- src/macros/scripts.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 7f2bbb5..942fb82 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -43,18 +43,18 @@ ENDM const Func_d03f_index ; $1a const OWScript_Jump_index ; $1b const Func_d04f_index ; $1c - const Func_d055_index ; $1d + const OWScript_SetPlayerDirection_index ; $1d const OWScript_MovePlayer_index ; $1e - const Func_cee2_index ; $1f + const OWScript_ShowCardReceivedScreen_index ; $1f const OWScript_SetDialogName_index ; $20 - const Func_d088_index ; $21 + const OWScript_SetNextNPCandOWSequence_index ; $21 const Func_d095_index ; $22 const Func_d0be_index ; $23 const OWScript_DoFrames_index ; $24 const Func_d0d9_index ; $25 - const Func_d0f2_index ; $26 + const OWScript_JumpIfPlayerCoordMatches_index ; $26 const Func_ce4a_index ; $27 - const Func_ceba_index ; $28 + const OWScript_GiveOneOfEachTrainerBooster_index ; $28 const Func_d103_index ; $29 const Func_d125_index ; $2a const Func_d135_index ; $2b @@ -67,12 +67,12 @@ ENDM const Func_d195_index ; $32 const Func_d1ad_index ; $33 const Func_d1b3_index ; $34 - const OWScript_EndScriptCloseText_index ; $35 + const OWScript_QuitScriptFully_index ; $35 const Func_d244_index ; $36 const Func_d24c_index ; $37 const OWScript_OpenDeckMachine_index ; $38 const Func_d271_index ; $39 - const Func_d36d_index ; $3a + const OWScript_EnterMap_index ; $3a const Func_ce6f_index ; $3b const Func_d209_index ; $3c const Func_d38f_index ; $3d @@ -93,7 +93,7 @@ ENDM const Func_d41d_index ; $4c const Func_d42f_index ; $4d const Func_d435_index ; $4e - const Func_cce4_index ; $4f + const OWScript_AskQuestionJumpDefaultYes_index ; $4f const Func_d2f6_index ; $50 const Func_d317_index ; $51 const Func_d43d_index ; $52 -- cgit v1.2.3 From 299f013b8b14184b9f06da3b89ba87ce2ba9e0f3 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sun, 13 Oct 2019 19:39:13 -0400 Subject: More scripts, start to figure out mapscripts --- src/macros/scripts.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 942fb82..42ff187 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -22,7 +22,7 @@ ENDM const OWScript_StartBattle_index ; $05 const OWScript_PrintVariableText_index ; $06 const Func_cda8_index ; $07 - const OWScript_PrintTextCloseBox_index ; $08 + const OWScript_PrintTextQuitFully_index ; $08 const Func_cdcb_index ; $09 const Func_ce26_index ; $0a const OWScript_CloseTextBox_index ; $0b @@ -42,7 +42,7 @@ ENDM const Func_d032_index ; $19 const Func_d03f_index ; $1a const OWScript_Jump_index ; $1b - const Func_d04f_index ; $1c + const OWScript_TryGiveMedalPCPacks_index ; $1c const OWScript_SetPlayerDirection_index ; $1d const OWScript_MovePlayer_index ; $1e const OWScript_ShowCardReceivedScreen_index ; $1f @@ -80,18 +80,18 @@ ENDM const Func_cd76_index ; $3f const Func_d39d_index ; $40 const Func_d3b9_index ; $41 - const OWScript_GivePCPack_index ; $42 + const OWScript_TryGivePCPack_index ; $42 const OWScript_nop_index ; $43 const Func_d3d4_index ; $44 const Func_d3e0_index ; $45 const Func_d3fe_index ; $46 const Func_d408_index ; $47 const Func_d40f_index ; $48 - const Func_d416_index ; $49 - const Func_d423_index ; $4a - const Func_d429_index ; $4b + const OWScript_PlaySFX_index ; $49 + const OWScript_PauseSong_index ; $4a + const OWScript_ResumeSong_index ; $4b const Func_d41d_index ; $4c - const Func_d42f_index ; $4d + const OWScript_WaitForSongToFinish_index ; $4d const Func_d435_index ; $4e const OWScript_AskQuestionJumpDefaultYes_index ; $4f const Func_d2f6_index ; $50 -- cgit v1.2.3 From 3ac91a513dc9351734927182e46b0acd010053cf Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Thu, 24 Oct 2019 17:45:50 -0400 Subject: Uncovered NPC Movement and named OWObjects --- src/macros/scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 42ff187..b7d07cb 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -53,7 +53,7 @@ ENDM const OWScript_DoFrames_index ; $24 const Func_d0d9_index ; $25 const OWScript_JumpIfPlayerCoordMatches_index ; $26 - const Func_ce4a_index ; $27 + const OWScript_MoveActiveNPC_index ; $27 const OWScript_GiveOneOfEachTrainerBooster_index ; $28 const Func_d103_index ; $29 const Func_d125_index ; $2a -- cgit v1.2.3 From e58e93fdb14173ae7a9edcd782f70fe67402c42f Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Fri, 25 Oct 2019 19:41:50 -0400 Subject: a bit more scripting stuff, figured out more npc data --- src/macros/scripts.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index b7d07cb..d74db03 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -24,7 +24,7 @@ ENDM const Func_cda8_index ; $07 const OWScript_PrintTextQuitFully_index ; $08 const Func_cdcb_index ; $09 - const Func_ce26_index ; $0a + const OWScript_MoveActiveNPCByDirection_index ; $0a const OWScript_CloseTextBox_index ; $0b const OWScript_GiveBoosterPacks_index ; $0c const Func_cf0c_index ; $0d @@ -73,7 +73,7 @@ ENDM const OWScript_OpenDeckMachine_index ; $38 const Func_d271_index ; $39 const OWScript_EnterMap_index ; $3a - const Func_ce6f_index ; $3b + const OWScript_MoveArbitraryNPC_index ; $3b const Func_d209_index ; $3c const Func_d38f_index ; $3d const Func_d396_index ; $3e -- cgit v1.2.3 From 3f99d5555ce7b8a2467aef9d24d7192f993343d9 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Mon, 28 Oct 2019 17:25:50 -0400 Subject: extracted a lot of challenge hall scripts --- src/macros/scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index d74db03..e21845b 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -61,7 +61,7 @@ ENDM const Func_d16b_index ; $2c const Func_cd4f_index ; $2d const Func_cd94_index ; $2e - const Func_ce52_index ; $2f + const OWScript_MoveWramNPC_index ; $2f const Func_cdd8_index ; $30 const Func_cdf5_index ; $31 const Func_d195_index ; $32 -- cgit v1.2.3 From e02184fbcd4426fd0774d0dd80268c515d8aadd1 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sat, 9 May 2020 15:36:16 -0400 Subject: changed OWScript to ScriptCommand and OWSequence to Script --- src/macros/scripts.asm | 114 ++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index e21845b..0c24463 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -5,7 +5,7 @@ run_script: MACRO ENDM ; TODO: create macros for overworld scripts after their usage and arguments are figured out. -; For example (current OWScript_GiveBoosterPacks_index): +; For example (current ScriptCommand_GiveBoosterPacks_index): ; const SCRIPT_GIVE_BOOSTER_PACKS ; $0c ;give_booster_packs: MACRO @@ -14,23 +14,23 @@ ENDM ;ENDM const_def - const OWScript_EndScriptLoop1_index ; $00 - const OWScript_CloseAdvancedTextBox_index ; $01 - const OWScript_PrintTextString_index ; $02 + const ScriptCommand_EndScriptLoop1_index ; $00 + const ScriptCommand_CloseAdvancedTextBox_index ; $01 + const ScriptCommand_PrintTextString_index ; $02 const Func_ccdc_index ; $03 - const OWScript_AskQuestionJump_index ; $04 - const OWScript_StartBattle_index ; $05 - const OWScript_PrintVariableText_index ; $06 + const ScriptCommand_AskQuestionJump_index ; $04 + const ScriptCommand_StartBattle_index ; $05 + const ScriptCommand_PrintVariableText_index ; $06 const Func_cda8_index ; $07 - const OWScript_PrintTextQuitFully_index ; $08 + const ScriptCommand_PrintTextQuitFully_index ; $08 const Func_cdcb_index ; $09 - const OWScript_MoveActiveNPCByDirection_index ; $0a - const OWScript_CloseTextBox_index ; $0b - const OWScript_GiveBoosterPacks_index ; $0c + const ScriptCommand_MoveActiveNPCByDirection_index ; $0a + const ScriptCommand_CloseTextBox_index ; $0b + const ScriptCommand_GiveBoosterPacks_index ; $0c const Func_cf0c_index ; $0d const Func_cf12_index ; $0e - const OWScript_GiveCard_index ; $0f - const OWScript_TakeCard_index ; $10 + const ScriptCommand_GiveCard_index ; $0f + const ScriptCommand_TakeCard_index ; $10 const Func_cf53_index ; $11 const Func_cf7b_index ; $12 const Func_cf2d_index ; $13 @@ -41,81 +41,81 @@ ENDM const Func_d025_index ; $18 const Func_d032_index ; $19 const Func_d03f_index ; $1a - const OWScript_Jump_index ; $1b - const OWScript_TryGiveMedalPCPacks_index ; $1c - const OWScript_SetPlayerDirection_index ; $1d - const OWScript_MovePlayer_index ; $1e - const OWScript_ShowCardReceivedScreen_index ; $1f - const OWScript_SetDialogName_index ; $20 - const OWScript_SetNextNPCandOWSequence_index ; $21 + const ScriptCommand_Jump_index ; $1b + const ScriptCommand_TryGiveMedalPCPacks_index ; $1c + const ScriptCommand_SetPlayerDirection_index ; $1d + const ScriptCommand_MovePlayer_index ; $1e + const ScriptCommand_ShowCardReceivedScreen_index ; $1f + const ScriptCommand_SetDialogName_index ; $20 + const ScriptCommand_SetNextNPCandScript_index ; $21 const Func_d095_index ; $22 const Func_d0be_index ; $23 - const OWScript_DoFrames_index ; $24 + const ScriptCommand_DoFrames_index ; $24 const Func_d0d9_index ; $25 - const OWScript_JumpIfPlayerCoordMatches_index ; $26 - const OWScript_MoveActiveNPC_index ; $27 - const OWScript_GiveOneOfEachTrainerBooster_index ; $28 + const ScriptCommand_JumpIfPlayerCoordMatches_index ; $26 + const ScriptCommand_MoveActiveNPC_index ; $27 + const ScriptCommand_GiveOneOfEachTrainerBooster_index ; $28 const Func_d103_index ; $29 const Func_d125_index ; $2a const Func_d135_index ; $2b const Func_d16b_index ; $2c const Func_cd4f_index ; $2d const Func_cd94_index ; $2e - const OWScript_MoveWramNPC_index ; $2f + const ScriptCommand_MoveWramNPC_index ; $2f const Func_cdd8_index ; $30 const Func_cdf5_index ; $31 const Func_d195_index ; $32 const Func_d1ad_index ; $33 const Func_d1b3_index ; $34 - const OWScript_QuitScriptFully_index ; $35 + const ScriptCommand_QuitScriptFully_index ; $35 const Func_d244_index ; $36 const Func_d24c_index ; $37 - const OWScript_OpenDeckMachine_index ; $38 + const ScriptCommand_OpenDeckMachine_index ; $38 const Func_d271_index ; $39 - const OWScript_EnterMap_index ; $3a - const OWScript_MoveArbitraryNPC_index ; $3b + const ScriptCommand_EnterMap_index ; $3a + const ScriptCommand_MoveArbitraryNPC_index ; $3b const Func_d209_index ; $3c const Func_d38f_index ; $3d const Func_d396_index ; $3e const Func_cd76_index ; $3f const Func_d39d_index ; $40 const Func_d3b9_index ; $41 - const OWScript_TryGivePCPack_index ; $42 - const OWScript_nop_index ; $43 + const ScriptCommand_TryGivePCPack_index ; $42 + const ScriptCommand_nop_index ; $43 const Func_d3d4_index ; $44 const Func_d3e0_index ; $45 const Func_d3fe_index ; $46 const Func_d408_index ; $47 const Func_d40f_index ; $48 - const OWScript_PlaySFX_index ; $49 - const OWScript_PauseSong_index ; $4a - const OWScript_ResumeSong_index ; $4b + const ScriptCommand_PlaySFX_index ; $49 + const ScriptCommand_PauseSong_index ; $4a + const ScriptCommand_ResumeSong_index ; $4b const Func_d41d_index ; $4c - const OWScript_WaitForSongToFinish_index ; $4d + const ScriptCommand_WaitForSongToFinish_index ; $4d const Func_d435_index ; $4e - const OWScript_AskQuestionJumpDefaultYes_index ; $4f + const ScriptCommand_AskQuestionJumpDefaultYes_index ; $4f const Func_d2f6_index ; $50 const Func_d317_index ; $51 const Func_d43d_index ; $52 - const OWScript_EndScriptLoop2_index ; $53 - const OWScript_EndScriptLoop3_index ; $54 - const OWScript_EndScriptLoop4_index ; $55 - const OWScript_EndScriptLoop5_index ; $56 - const OWScript_EndScriptLoop6_index ; $57 - const OWScript_SetFlagValue_index ; $58 - const OWScript_JumpIfFlagZero1_index ; $59 - const OWScript_JumpIfFlagNonzero1_index ; $5a - const OWScript_JumpIfFlagEqual_index ; $5b - const OWScript_JumpIfFlagNotEqual_index ; $5c - const OWScript_JumpIfFlagNotLessThan_index ; $5d - const OWScript_JumpIfFlagLessThan_index ; $5e - const OWScript_MaxOutFlagValue_index ; $5f - const OWScript_ZeroOutFlagValue_index ; $60 - const OWScript_JumpIfFlagNonzero2_index ; $61 - const OWScript_JumpIfFlagZero2_index ; $62 - const OWScript_IncrementFlagValue_index ; $63 - const OWScript_EndScriptLoop7_index ; $64 - const OWScript_EndScriptLoop8_index ; $65 - const OWScript_EndScriptLoop9_index ; $66 - const OWScript_EndScriptLoop10_index ; $67 + const ScriptCommand_EndScriptLoop2_index ; $53 + const ScriptCommand_EndScriptLoop3_index ; $54 + const ScriptCommand_EndScriptLoop4_index ; $55 + const ScriptCommand_EndScriptLoop5_index ; $56 + const ScriptCommand_EndScriptLoop6_index ; $57 + const ScriptCommand_SetFlagValue_index ; $58 + const ScriptCommand_JumpIfFlagZero1_index ; $59 + const ScriptCommand_JumpIfFlagNonzero1_index ; $5a + const ScriptCommand_JumpIfFlagEqual_index ; $5b + const ScriptCommand_JumpIfFlagNotEqual_index ; $5c + const ScriptCommand_JumpIfFlagNotLessThan_index ; $5d + const ScriptCommand_JumpIfFlagLessThan_index ; $5e + const ScriptCommand_MaxOutFlagValue_index ; $5f + const ScriptCommand_ZeroOutFlagValue_index ; $60 + const ScriptCommand_JumpIfFlagNonzero2_index ; $61 + const ScriptCommand_JumpIfFlagZero2_index ; $62 + const ScriptCommand_IncrementFlagValue_index ; $63 + const ScriptCommand_EndScriptLoop7_index ; $64 + const ScriptCommand_EndScriptLoop8_index ; $65 + const ScriptCommand_EndScriptLoop9_index ; $66 + const ScriptCommand_EndScriptLoop10_index ; $67 -- cgit v1.2.3 From 29ed945c4adce0b6bc45be3964f95393d8248390 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sat, 9 May 2020 15:49:35 -0400 Subject: changed run_script and updated script extraction tool --- src/macros/scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 0c24463..bd1a58f 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -1,6 +1,6 @@ start_script EQUS "rst $20" -run_script: MACRO +run_command: MACRO db \1_index ENDM -- cgit v1.2.3