diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-02-06 22:28:31 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-02-06 22:28:31 +0100 |
| commit | f3360193892c5452416305fa50d17f1c7b7b1411 (patch) | |
| tree | 5aec7b6bbaaa0382c988ba09ed750d027e64d029 | |
| parent | f0b0d33d2e66c8a0e52051eb5e57dec9389ac859 (diff) | |
Create macros/scripts.asm
| -rwxr-xr-x | src/constants/overworld_script_constants.asm | 2 | ||||
| -rwxr-xr-x | src/macros.asm | 1 | ||||
| -rw-r--r-- | src/macros/code.asm | 4 | ||||
| -rw-r--r-- | src/macros/scripts.asm | 7 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/constants/overworld_script_constants.asm b/src/constants/overworld_script_constants.asm index fed849d..b6a2327 100755 --- a/src/constants/overworld_script_constants.asm +++ b/src/constants/overworld_script_constants.asm @@ -1,5 +1,3 @@ -start_script EQUS "rst $20" - OWScript_EndScriptLoop1_index EQU $00 OWScript_CloseTextBox_index EQU $01 OWScript_PrintTextString_index EQU $02 diff --git a/src/macros.asm b/src/macros.asm index 8b27b1f..837bfb2 100755 --- a/src/macros.asm +++ b/src/macros.asm @@ -1,4 +1,5 @@ INCLUDE "macros/audio.asm" INCLUDE "macros/code.asm" INCLUDE "macros/data.asm" +INCLUDE "macros/scripts.asm" INCLUDE "macros/wram.asm" diff --git a/src/macros/code.asm b/src/macros/code.asm index 7338e6e..7431fa3 100644 --- a/src/macros/code.asm +++ b/src/macros/code.asm @@ -96,7 +96,3 @@ ENDM sgb: MACRO db \1 * 8 + \2 ; sgb_command * 8 + length ENDM - -run_script: MACRO - db \1_index -ENDM diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm new file mode 100644 index 0000000..9c46f96 --- /dev/null +++ b/src/macros/scripts.asm @@ -0,0 +1,7 @@ +start_script EQUS "rst $20" + +run_script: MACRO + db \1_index +ENDM + +; TODO: macros for scripts (constants/overworld_scripts_constants.asm) |