diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-23 16:29:30 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-23 16:29:30 -0500 |
| commit | 99e66c25577e367d6c7ca75fea8b466b54c3317a (patch) | |
| tree | 56183dddfd540a395086a7540060c374f9541723 /macros | |
| parent | 1a054661ecac2d6075961e486213b6880c0afc4e (diff) | |
Rename some labels
- Remove "Buffer" suffix from some byte and word quantities
- Change "Ptr" to "Pointer"
Fixes #789
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/legacy.asm | 51 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 6 |
2 files changed, 29 insertions, 28 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index a561b3fca..18ee9f872 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -176,31 +176,32 @@ readmoney: MACRO getmoney \2, \1 ENDM -RAM2MEM EQUS "getnum" -loadfont EQUS "opentext" -loadmenudata EQUS "loadmenu" -loadmenuheader EQUS "loadmenu" -writebackup EQUS "closewindow" -interpretmenu EQUS "_2dmenu" -interpretmenu2 EQUS "verticalmenu" -buttonsound EQUS "promptbutton" -battlecheck EQUS "randomwildmon" -loadtrainerdata EQUS "loadtemptrainer" -loadpokedata EQUS "loadwildmon" -returnafterbattle EQUS "reloadmapafterbattle" -trainerstatus EQUS "trainerflagaction" -talkaftercancel EQUS "endifjustbattled" -talkaftercheck EQUS "checkjustbattled" -playrammusic EQUS "encountermusic" -reloadmapmusic EQUS "dontrestartmapmusic" -resetfuncs EQUS "endall" -storetext EQUS "battletowertext" -displaylocation EQUS "landmarktotext" -givepokeitem EQUS "givepokemail" -checkpokeitem EQUS "checkpokemail" -passtoengine EQUS "autoinput" -verbosegiveitem2 EQUS "verbosegiveitemvar" -loadbytec2cf EQUS "writeunusedbytebuffer" +RAM2MEM EQUS "getnum" +loadfont EQUS "opentext" +loadmenudata EQUS "loadmenu" +loadmenuheader EQUS "loadmenu" +writebackup EQUS "closewindow" +interpretmenu EQUS "_2dmenu" +interpretmenu2 EQUS "verticalmenu" +buttonsound EQUS "promptbutton" +battlecheck EQUS "randomwildmon" +loadtrainerdata EQUS "loadtemptrainer" +loadpokedata EQUS "loadwildmon" +returnafterbattle EQUS "reloadmapafterbattle" +trainerstatus EQUS "trainerflagaction" +talkaftercancel EQUS "endifjustbattled" +talkaftercheck EQUS "checkjustbattled" +playrammusic EQUS "encountermusic" +reloadmapmusic EQUS "dontrestartmapmusic" +resetfuncs EQUS "endall" +storetext EQUS "battletowertext" +displaylocation EQUS "landmarktotext" +givepokeitem EQUS "givepokemail" +checkpokeitem EQUS "checkpokemail" +passtoengine EQUS "autoinput" +verbosegiveitem2 EQUS "verbosegiveitemvar" +loadbytec2cf EQUS "writeunusedbyte" +writeunusedbytebuffer EQUS "writeunusedbyte" ; macros/scripts/maps.asm diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index f3e2acf4d..4e71035b3 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -489,9 +489,9 @@ closetext: MACRO db closetext_command ENDM - const writeunusedbytebuffer_command ; $4a -writeunusedbytebuffer: MACRO - db writeunusedbytebuffer_command + const writeunusedbyte_command ; $4a +writeunusedbyte: MACRO + db writeunusedbyte_command db \1 ; byte ENDM |