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

yenatch · Dec 28, 2017 · 7beb497 · 7beb497
1 parent 9457679
commit 7beb497
Show file tree

Hide file tree

Showing 33 changed files with 425 additions and 425 deletions.
diff --git a/constants/map_constants.asm b/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

diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm
@@ -1,4 +1,4 @@
-momitem: macro
+momitem: MACRO
 ; money to trigger, cost, kind, item
 	dt \1
 	dt \2

diff --git a/data/map_objects.asm b/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

diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm
@@ -1,4 +1,4 @@
-prob: macro
+prob: MACRO
 prob_total = prob_total + (\1)
 	dw prob_total * $ffff / 100
 endm

diff --git a/data/palettes/town_map.asm b/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

diff --git a/data/phone_contacts.asm b/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

diff --git a/data/phone_special.asm b/data/phone_special.asm
@@ -1,4 +1,4 @@
-specialcall: macro
+specialcall: MACRO
 ; condition, contact, script
 	dw \1
 	db \2

diff --git a/data/unown_words.asm b/data/unown_words.asm
@@ -1,4 +1,4 @@
-unownword: macro
+unownword: MACRO
 x = 1
 	rept STRLEN(\1)
 	db STRSUB(\1, x, 1) - $40

diff --git a/data/wild/roammon_maps.asm b/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

diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
@@ -1,4 +1,4 @@
-treemon_map: macro
+treemon_map: MACRO
 	map \1
 	db  \2 ; treemon set
 endm

diff --git a/engine/battle/battle_transition.asm b/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

diff --git a/engine/pic_animation.asm b/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

diff --git a/engine/unown_puzzle.asm b/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

diff --git a/home/text.asm b/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

diff --git a/macros/base_stats.asm b/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
 

diff --git a/macros/code.asm b/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

diff --git a/macros/coords.asm b/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]

diff --git a/macros/enum.asm b/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