diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-22 12:06:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 12:06:17 -0500 |
| commit | 5e80a12ec9fcf2201c070712d8e2dcefe2a0e364 (patch) | |
| tree | 3d4f5e7b7c0a4a3217ed070e49b6a96bf0cd9079 /asm | |
| parent | 39efec3f1e9fc604b36b066ed7dc14e1bdb8c323 (diff) | |
| parent | c564ff9afb0a155cec1b2105ef82db99ace91b36 (diff) | |
Merge pull request #378 from PikalaxALT/rename_specials
Rename specials
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_fadetransition.s | 6 | ||||
| -rw-r--r-- | asm/macros/event.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index e882e7030..1f489ceb3 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -815,8 +815,8 @@ _08081022: _08081028: .4byte sub_8054588 thumb_func_end sub_8080FC4 - thumb_func_start sub_808102C -sub_808102C: @ 808102C + thumb_func_start DoCableClubWarp +DoCableClubWarp: @ 808102C push {lr} bl ScriptContext2_Enable bl sub_8053FF8 @@ -830,7 +830,7 @@ sub_808102C: @ 808102C bx r0 .align 2, 0 _0808104C: .4byte sub_8080FC4 - thumb_func_end sub_808102C + thumb_func_end DoCableClubWarp thumb_func_start sub_8081050 sub_8081050: @ 8081050 diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e3caa0c4f..cd2927c66 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -241,14 +241,14 @@ @ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers. .macro special function .byte 0x25 - .2byte \function + .2byte SPECIAL_\function .endm @ Calls a special function. That function's output (if any) will be written to the variable you specify. .macro specialval output, function .byte 0x26 .2byte \output - .2byte \function + .2byte SPECIAL_\function .endm @ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang). |