Uppercase MACRO and EQU(S) according to the style guide

constants/map_constants.asm

@@ -1,9 +1,9 @@
-newgroup: macro
+newgroup: MACRO
 const_value = const_value + 1
 	enum_start 1
 endm
 
-mapgroup: macro
+mapgroup: MACRO
 ;\1: map id
 ;\2: height: in blocks
 ;\3: width: in blocks

data/items/mom_phone.asm

@@ -1,4 +1,4 @@
-momitem: macro
+momitem: MACRO
 ; money to trigger, cost, kind, item
 	dt \1
 	dt \2

data/map_objects.asm

@@ -1,4 +1,4 @@
-sprite_movement_data: macro
+sprite_movement_data: MACRO
 	db \1, \2, \3, \4, \5
 	dn \6, 0
 endm

data/odd_eggs.asm

@@ -1,4 +1,4 @@
-prob: macro
+prob: MACRO
 prob_total = prob_total + (\1)
 	dw prob_total * $ffff / 100
 endm

data/palettes/town_map.asm

@@ -6,7 +6,7 @@
 	const PAL_TOWNMAP_POI      ; 4
 	const PAL_TOWNMAP_POI_MTN  ; 5
 
-townmappals: macro
+townmappals: MACRO
 rept _NARG / 2
 	dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1
 	shift

data/phone_contacts.asm

@@ -1,4 +1,4 @@
-phone: macro
+phone: MACRO
 ; trainer class, trainer id, map, ?, script 1, ?, script 2
 	db  \1, \2
 	map \3

data/phone_special.asm

@@ -1,4 +1,4 @@
-specialcall: macro
+specialcall: MACRO
 ; condition, contact, script
 	dw \1
 	db \2

data/unown_words.asm

@@ -1,4 +1,4 @@
-unownword: macro
+unownword: MACRO
 x = 1
 	rept STRLEN(\1)
 	db STRSUB(\1, x, 1) - $40

data/wild/roammon_maps.asm

@@ -1,7 +1,7 @@
 ; Maps that roaming monsters can be on, and possible maps they can jump to.
 ; Notably missing are Route 40 and Route 41, which are water routes.
 
-roam_map: macro
+roam_map: MACRO
 ; map, # of other maps, other maps
 	map \1
 	db  \2

data/wild/treemon_maps.asm

@@ -1,4 +1,4 @@
-treemon_map: macro
+treemon_map: MACRO
 	map \1
 	db  \2 ; treemon set
 endm

engine/battle/battle_transition.asm

@@ -828,7 +828,7 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
 ; 8c792 (23:4792)
 
 .boxes ; 8c792
-zoombox: macro
+zoombox: MACRO
 ; width, height, start y, start x
 	db \1, \2
 	dwcoord \3, \4

engine/pic_animation.asm

@@ -56,7 +56,7 @@ pokeanim: MACRO
 	rept _NARG
 ; Workaround for a bug where macro args can't come after the start of a symbol
 if !def(\1_POKEANIM)
-\1_POKEANIM equs "PokeAnim_\1_"
+\1_POKEANIM EQUS "PokeAnim_\1_"
 endc
 	db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
 	shift
@@ -142,7 +142,7 @@ SetUpPokeAnim: ; d00b4
 ; d00da
 
 PokeAnim_SetupCommands: ; d00da
-setup_command: macro
+setup_command: MACRO
 \1_: dw \1
 endm
 	setup_command PokeAnim_Finish

engine/unown_puzzle.asm

@@ -114,7 +114,7 @@ InitUnownPuzzlePiecePositions: ; e124e
 ; e126d
 
 .PuzzlePieceInitialPositions: ; e126d
-initpuzcoord: macro
+initpuzcoord: MACRO
 rept _NARG / 2
 	db \1 puzcoord \2
 	shift
@@ -599,7 +599,7 @@ RedrawUnownPuzzlePieces: ; e14d9
 
 UnownPuzzleCoordData: ; e1559
 
-puzzle_coords: macro
+puzzle_coords: MACRO
 	dbpixel \1, \2, \3, \4
 	dwcoord \5, \6
 	db \7, \8

home/text.asm

@@ -200,7 +200,7 @@ NextChar:: ; 1083
 	jp PlaceNextChar
 
 CheckDict:: ; 1087
-dict: macro
+dict: MACRO
 if \1 == 0
 	and a
 else
@@ -209,7 +209,7 @@ endc
 	jp z, \2
 endm
 
-dict2: macro
+dict2: MACRO
 	cp \1
 	jr nz, ._\@
 	ld a, \2
@@ -309,7 +309,7 @@ Char15:: ; 117b
 ; 1186
 
 
-print_name: macro
+print_name: MACRO
 	push de
 	ld de, \1
 	jp PlaceCommandCharacter

macros/base_stats.asm

@@ -1,8 +1,8 @@
 ; Used in data/pokemon/base_stats/*.asm
 
-define: macro
+define: MACRO
 if !def(\1)
-\1 equs \2
+\1 EQUS \2
 endc
 endm
 

macros/code.asm

@@ -38,7 +38,7 @@ jumptable: MACRO
 ; Many mobile functions were dummied out in localization.
 mobile EQUS "ret"
 
-maskbits: macro
+maskbits: MACRO
 ; example usage in rejection sampling:
 ; .loop
 ; 	call Random

macros/coords.asm

@@ -1,6 +1,6 @@
-bccoord equs "coord bc,"
-decoord equs "coord de,"
-hlcoord equs "coord hl,"
+bccoord EQUS "coord bc,"
+decoord EQUS "coord de,"
+hlcoord EQUS "coord hl,"
 
 coord: MACRO
 ; register, x, y[, origin]

macros/enum.asm

@@ -1,6 +1,6 @@
 ; Enumerate variables
 
-enum_start: macro
+enum_start: MACRO
 if _NARG >= 1
 __enum__ = \1
 else
@@ -13,12 +13,12 @@ __enumdir__ = +1
 endc
 endm
 
-enum: macro
+enum: MACRO
 \1 = __enum__
 __enum__ = __enum__ + __enumdir__
 endm
 
-enum_set: macro
+enum_set: MACRO
 __enum__ = \1
 endm
 

macros/scripts/audio.asm

@@ -1,4 +1,4 @@
-musicheader: macro
+musicheader: MACRO
 	; number of tracks, track idx, address
 	dbw ((\1 - 1) << 6) + (\2 - 1), \3
 	endm
@@ -7,13 +7,13 @@ note: MACRO
 	dn (\1), (\2) - 1
 	ENDM
 
-sound: macro
+sound: MACRO
 	note \1, \2
 	db \3 ; intensity
 	dw \4 ; frequency
 	endm
 
-noise: macro
+noise: MACRO
 	note \1, \2 ; duration
 	db \3 ; intensity
 	db \4 ; frequency
@@ -23,11 +23,11 @@ noise: macro
 	enum_start $d8
 
 	enum notetype_cmd ; $d8
-octave: macro
+octave: MACRO
 	db notetype_cmd - (\1)
 	endm
 
-notetype: macro
+notetype: MACRO
 	db notetype_cmd
 	db \1 ; note_length
 	if _NARG >= 2
@@ -36,37 +36,37 @@ notetype: macro
 	endm
 
 	enum pitchoffset_cmd ; $d9
-pitchoffset: macro
+pitchoffset: MACRO
 	db pitchoffset_cmd
 	dn \1, \2 - 1 ; octave, key
 	endm
 
 	enum tempo_cmd ; $da
-tempo: macro
+tempo: MACRO
 	db tempo_cmd
 	bigdw \1 ; tempo
 	endm
 
 	enum dutycycle_cmd ; $db
-dutycycle: macro
+dutycycle: MACRO
 	db dutycycle_cmd
 	db \1 ; duty_cycle
 	endm
 
 	enum intensity_cmd ; $dc
-intensity: macro
+intensity: MACRO
 	db intensity_cmd
 	db \1 ; intensity
 	endm
 
 	enum soundinput_cmd ; $dd
-soundinput: macro
+soundinput: MACRO
 	db soundinput_cmd
 	db \1 ; input
 	endm
 
 	enum sound_duty_cmd ; $de
-sound_duty: macro
+sound_duty: MACRO
 	db sound_duty_cmd
 	if _NARG == 4
 	db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence
@@ -76,190 +76,190 @@ sound_duty: macro
 	endm
 
 	enum togglesfx_cmd ; $df
-togglesfx: macro
+togglesfx: MACRO
 	db togglesfx_cmd
 	endm
 
 	enum slidepitchto_cmd ; $e0
-slidepitchto: macro
+slidepitchto: MACRO
 	db slidepitchto_cmd
 	db \1 - 1 ; duration
 	dn \2, \3 ; octave, pitch
 	endm
 
 	enum vibrato_cmd ; $e1
-vibrato: macro
+vibrato: MACRO
 	db vibrato_cmd
 	db \1 ; delay
 	db \2 ; extent
 	endm
 
 	enum unknownmusic0xe2_cmd ; $e2
-unknownmusic0xe2: macro
+unknownmusic0xe2: MACRO
 	db unknownmusic0xe2_cmd
 	db \1 ; unknown
 	endm
 
 	enum togglenoise_cmd ; $e3
-togglenoise: macro
+togglenoise: MACRO
 	db togglenoise_cmd
 	db \1 ; id
 	endm
 
 	enum panning_cmd ; $e4
-panning: macro
+panning: MACRO
 	db panning_cmd
 	db \1 ; tracks
 	endm
 
 	enum volume_cmd ; $e5
-volume: macro
+volume: MACRO
 	db volume_cmd
 	db \1 ; volume
 	endm
 
 	enum tone_cmd ; $e6
-tone: macro
+tone: MACRO
 	db tone_cmd
 	bigdw \1 ; tone
 	endm
 
 	enum unknownmusic0xe7_cmd ; $e7
-unknownmusic0xe7: macro
+unknownmusic0xe7: MACRO
 	db unknownmusic0xe7_cmd
 	db \1 ; unknown
 	endm
 
 	enum unknownmusic0xe8_cmd ; $e8
-unknownmusic0xe8: macro
+unknownmusic0xe8: MACRO
 	db unknownmusic0xe8_cmd
 	db \1 ; unknown
 	endm
 
 	enum tempo_relative_cmd ; $e9
-tempo_relative: macro
+tempo_relative: MACRO
 	db tempo_relative_cmd
 	bigdw \1 ; value
 	endm
 
 	enum restartchannel_cmd ; $ea
-restartchannel: macro
+restartchannel: MACRO
 	db restartchannel_cmd
 	dw \1 ; address
 	endm
 
 	enum newsong_cmd ; $eb
-newsong: macro
+newsong: MACRO
 	db newsong_cmd
 	bigdw \1 ; id
 	endm
 
 	enum sfxpriorityon_cmd ; $ec
-sfxpriorityon: macro
+sfxpriorityon: MACRO
 	db sfxpriorityon_cmd
 	endm
 
 	enum sfxpriorityoff_cmd ; $ed
-sfxpriorityoff: macro
+sfxpriorityoff: MACRO
 	db sfxpriorityoff_cmd
 	endm
 
 	enum unknownmusic0xee_cmd ; $ee
-unknownmusic0xee: macro
+unknownmusic0xee: MACRO
 	db unknownmusic0xee_cmd
 	dw \1 ; address
 	endm
 
 	enum stereopanning_cmd ; $ef
-stereopanning: macro
+stereopanning: MACRO
 	db stereopanning_cmd
 	db \1 ; tracks
 	endm
 
 	enum sfxtogglenoise_cmd ; $f0
-sfxtogglenoise: macro
+sfxtogglenoise: MACRO
 	db sfxtogglenoise_cmd
 	db \1 ; id
 	endm
 
 	enum music0xf1_cmd ; $f1
-music0xf1: macro
+music0xf1: MACRO
 	db music0xf1_cmd
 	endm
 
 	enum music0xf2_cmd ; $f2
-music0xf2: macro
+music0xf2: MACRO
 	db music0xf2_cmd
 	endm
 
 	enum music0xf3_cmd ; $f3
-music0xf3: macro
+music0xf3: MACRO
 	db music0xf3_cmd
 	endm
 
 	enum music0xf4_cmd ; $f4
-music0xf4: macro
+music0xf4: MACRO
 	db music0xf4_cmd
 	endm
 
 	enum music0xf5_cmd ; $f5
-music0xf5: macro
+music0xf5: MACRO
 	db music0xf5_cmd
 	endm
 
 	enum music0xf6_cmd ; $f6
-music0xf6: macro
+music0xf6: MACRO
 	db music0xf6_cmd
 	endm
 
 	enum music0xf7_cmd ; $f7
-music0xf7: macro
+music0xf7: MACRO
 	db music0xf7_cmd
 	endm
 
 	enum music0xf8_cmd ; $f8
-music0xf8: macro
+music0xf8: MACRO
 	db music0xf8_cmd
 	endm
 
 	enum unknownmusic0xf9_cmd ; $f9
-unknownmusic0xf9: macro
+unknownmusic0xf9: MACRO
 	db unknownmusic0xf9_cmd
 	endm
 
 	enum setcondition_cmd ; $fa
-setcondition: macro
+setcondition: MACRO
 	db setcondition_cmd
 	db \1 ; condition
 	endm
 
 	enum jumpif_cmd ; $fb
-jumpif: macro
+jumpif: MACRO
 	db jumpif_cmd
 	db \1 ; condition
 	dw \2 ; address
 	endm
 
 	enum jumpchannel_cmd ; $fc
-jumpchannel: macro
+jumpchannel: MACRO
 	db jumpchannel_cmd
 	dw \1 ; address
 	endm
 
 	enum loopchannel_cmd ; $fd
-loopchannel: macro
+loopchannel: MACRO
 	db loopchannel_cmd
 	db \1 ; count
 	dw \2 ; address
 	endm
 
 	enum callchannel_cmd ; $fe
-callchannel: macro
+callchannel: MACRO
 	db callchannel_cmd
 	dw \1 ; address
 	endm
 
 	enum endchannel_cmd ; $ff
-endchannel: macro
+endchannel: MACRO
 	db endchannel_cmd
 	endm

macros/scripts/battle_anims.asm

@@ -1,4 +1,4 @@
-anim_wait: macro
+anim_wait: MACRO
 if \1 >= $d0
 	flip out
 endc
@@ -9,7 +9,7 @@ endc
 	enum_start $d0
 
 	enum anim_obj_command ; $d0
-anim_obj: macro
+anim_obj: MACRO
 	db anim_obj_command
 	db \1 ; obj
 	db (\2 << 3) + \3 ; x
@@ -18,20 +18,20 @@ anim_obj: macro
 	endm
 
 	enum anim_1gfx_command ; $d1
-anim_1gfx: macro
+anim_1gfx: MACRO
 	db anim_1gfx_command
 	db \1 ; gfx1
 	endm
 
 	enum anim_2gfx_command ; $d2
-anim_2gfx: macro
+anim_2gfx: MACRO
 	db anim_2gfx_command
 	db \1 ; gfx1
 	db \2 ; gfx2
 	endm
 
 	enum anim_3gfx_command ; $d3
-anim_3gfx: macro
+anim_3gfx: MACRO
 	db anim_3gfx_command
 	db \1 ; gfx1
 	db \2 ; gfx2
@@ -39,7 +39,7 @@ anim_3gfx: macro
 	endm
 
 	enum anim_4gfx_command ; $d4
-anim_4gfx: macro
+anim_4gfx: MACRO
 	db anim_4gfx_command
 	db \1 ; gfx1
 	db \2 ; gfx2
@@ -48,7 +48,7 @@ anim_4gfx: macro
 	endm
 
 	enum anim_5gfx_command ; $d5
-anim_5gfx: macro
+anim_5gfx: MACRO
 	db anim_5gfx_command
 	db \1 ; gfx1
 	db \2 ; gfx2
@@ -58,147 +58,147 @@ anim_5gfx: macro
 	endm
 
 	enum anim_incobj_command ; $d6
-anim_incobj: macro
+anim_incobj: MACRO
 	db anim_incobj_command
 	db \1 ; id
 	endm
 
 	enum anim_setobj_command ; $d7
-anim_setobj: macro
+anim_setobj: MACRO
 	db anim_setobj_command
 	db \1 ; id
 	db \2 ; obj
 	endm
 
 	enum anim_incbgeffect_command ; $d8
-anim_incbgeffect: macro
+anim_incbgeffect: MACRO
 	db anim_incbgeffect_command
 	db \1 ; effect
 	endm
 
 	enum anim_enemyfeetobj_command ; $d9
-anim_enemyfeetobj: macro
+anim_enemyfeetobj: MACRO
 	db anim_enemyfeetobj_command
 	endm
 
 	enum anim_playerheadobj_command ; $da
-anim_playerheadobj: macro
+anim_playerheadobj: MACRO
 	db anim_playerheadobj_command
 	endm
 
 	enum anim_checkpokeball_command ; $db
-anim_checkpokeball: macro
+anim_checkpokeball: MACRO
 	db anim_checkpokeball_command
 	endm
 
 	enum anim_transform_command ; $dc
-anim_transform: macro
+anim_transform: MACRO
 	db anim_transform_command
 	endm
 
 	enum anim_raisesub_command ; $dd
-anim_raisesub: macro
+anim_raisesub: MACRO
 	db anim_raisesub_command
 	endm
 
 	enum anim_dropsub_command ; $de
-anim_dropsub: macro
+anim_dropsub: MACRO
 	db anim_dropsub_command
 	endm
 
 	enum anim_resetobp0_command ; $df
-anim_resetobp0: macro
+anim_resetobp0: MACRO
 	db anim_resetobp0_command
 	endm
 
 	enum anim_sound_command ; $e0
-anim_sound: macro
+anim_sound: MACRO
 	db anim_sound_command
 	db (\1 << 2) | \2 ; duration, tracks
 	db \3 ; id
 	endm
 
 	enum anim_cry_command ; $e1
-anim_cry: macro
+anim_cry: MACRO
 	db anim_cry_command
 	db \1 ; pitch
 	endm
 
 	enum anim_minimizeopp_command ; $e2
-anim_minimizeopp: macro
+anim_minimizeopp: MACRO
 	db anim_minimizeopp_command
 	endm
 
 	enum anim_oamon_command ; $e3
-anim_oamon: macro
+anim_oamon: MACRO
 	db anim_oamon_command
 	endm
 
 	enum anim_oamoff_command ; $e4
-anim_oamoff: macro
+anim_oamoff: MACRO
 	db anim_oamoff_command
 	endm
 
 	enum anim_clearobjs_command ; $e5
-anim_clearobjs: macro
+anim_clearobjs: MACRO
 	db anim_clearobjs_command
 	endm
 
 	enum anim_beatup_command ; $e6
-anim_beatup: macro
+anim_beatup: MACRO
 	db anim_beatup_command
 	endm
 
 	enum anim_0xe7_command ; $e7
-anim_0xe7: macro
+anim_0xe7: MACRO
 	db anim_0xe7_command
 	endm
 
 	enum anim_updateactorpic_command ; $e8
-anim_updateactorpic: macro
+anim_updateactorpic: MACRO
 	db anim_updateactorpic_command
 	endm
 
 	enum anim_minimize_command ; $e9
-anim_minimize: macro
+anim_minimize: MACRO
 	db anim_minimize_command
 	endm
 
 	enum anim_0xea_command ; $ea
-anim_0xea: macro
+anim_0xea: MACRO
 	db anim_0xea_command
 	endm
 
 	enum anim_0xeb_command ; $eb
-anim_0xeb: macro
+anim_0xeb: MACRO
 	db anim_0xeb_command
 	endm
 
 	enum anim_0xec_command ; $ec
-anim_0xec: macro
+anim_0xec: MACRO
 	db anim_0xec_command
 	endm
 
 	enum anim_0xed_command ; $ed
-anim_0xed: macro
+anim_0xed: MACRO
 	db anim_0xed_command
 	endm
 
 	enum anim_if_param_and_command ; $ee
-anim_if_param_and: macro
+anim_if_param_and: MACRO
 	db anim_if_param_and_command
 	db \1 ; value
 	dw \2 ; address
 	endm
 
 	enum anim_jumpuntil_command ; $ef
-anim_jumpuntil: macro
+anim_jumpuntil: MACRO
 	db anim_jumpuntil_command
 	dw \1 ; address
 	endm
 
 	enum anim_bgeffect_command ; $f0
-anim_bgeffect: macro
+anim_bgeffect: MACRO
 	db anim_bgeffect_command
 	db \1 ; effect
 	db \2 ; unknown
@@ -207,88 +207,88 @@ anim_bgeffect: macro
 	endm
 
 	enum anim_bgp_command ; $f1
-anim_bgp: macro
+anim_bgp: MACRO
 	db anim_bgp_command
 	db \1 ; colors
 	endm
 
 	enum anim_obp0_command ; $f2
-anim_obp0: macro
+anim_obp0: MACRO
 	db anim_obp0_command
 	db \1 ; colors
 	endm
 
 	enum anim_obp1_command ; $f3
-anim_obp1: macro
+anim_obp1: MACRO
 	db anim_obp1_command
 	db \1 ; colors
 	endm
 
 	enum anim_clearsprites_command ; $f4
-anim_clearsprites: macro
+anim_clearsprites: MACRO
 	db anim_clearsprites_command
 	endm
 
 	enum anim_0xf5_command ; $f5
-anim_0xf5: macro
+anim_0xf5: MACRO
 	db anim_0xf5_command
 	endm
 
 	enum anim_0xf6_command ; $f6
-anim_0xf6: macro
+anim_0xf6: MACRO
 	db anim_0xf6_command
 	endm
 
 	enum anim_0xf7_command ; $f7
-anim_0xf7: macro
+anim_0xf7: MACRO
 	db anim_0xf7_command
 	endm
 
 	enum anim_if_param_equal_command ; $f8
-anim_if_param_equal: macro
+anim_if_param_equal: MACRO
 	db anim_if_param_equal_command
 	db \1 ; value
 	dw \2 ; address
 	endm
 
 	enum anim_setvar_command ; $f9
-anim_setvar: macro
+anim_setvar: MACRO
 	db anim_setvar_command
 	db \1 ; value
 	endm
 
 	enum anim_incvar_command ; $fa
-anim_incvar: macro
+anim_incvar: MACRO
 	db anim_incvar_command
 	endm
 
 	enum anim_if_var_equal_command ; $fb
-anim_if_var_equal: macro
+anim_if_var_equal: MACRO
 	db anim_if_var_equal_command
 	db \1 ; value
 	dw \2 ; address
 	endm
 
 	enum anim_jump_command ; $fc
-anim_jump: macro
+anim_jump: MACRO
 	db anim_jump_command
 	dw \1 ; address
 	endm
 
 	enum anim_loop_command ; $fd
-anim_loop: macro
+anim_loop: MACRO
 	db anim_loop_command
 	db \1 ; count
 	dw \2 ; address
 	endm
 
 	enum anim_call_command ; $fe
-anim_call: macro
+anim_call: MACRO
 	db anim_call_command
 	dw \1 ; address
 	endm
 
 	enum anim_ret_command ; $ff
-anim_ret: macro
+anim_ret: MACRO
 	db anim_ret_command
 	endm