diff options
author | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:23:44 +0100 |
---|---|---|
committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:23:44 +0100 |
commit | 7beb497d3aba7cd1bb34f2b1394bde80c1cd9807 (patch) | |
tree | a392d05e31ce2c3c614992a4a3100a65f012fd2e /data | |
parent | 9457679af8d36a140db7b8832df595e8310e6bb4 (diff) |
Uppercase MACRO and EQU(S) according to the style guide
Diffstat (limited to 'data')
-rw-r--r-- | data/items/mom_phone.asm | 2 | ||||
-rwxr-xr-x | data/map_objects.asm | 2 | ||||
-rw-r--r-- | data/odd_eggs.asm | 2 | ||||
-rw-r--r-- | data/palettes/town_map.asm | 2 | ||||
-rw-r--r-- | data/phone_contacts.asm | 2 | ||||
-rw-r--r-- | data/phone_special.asm | 2 | ||||
-rw-r--r-- | data/unown_words.asm | 2 | ||||
-rw-r--r-- | data/wild/roammon_maps.asm | 2 | ||||
-rw-r--r-- | data/wild/treemon_maps.asm | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm index 533241ca1..288a14acc 100644 --- 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 index af8b6d623..b321dcced 100755 --- 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 index a46d84bdc..f9a29f6d6 100644 --- 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 index 49fb7a9ce..1672a66ed 100644 --- 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 index 0c21049bb..c4d600edc 100644 --- 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 index c66c9ff77..e224bf43a 100644 --- 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 index e70f72356..d019975c9 100644 --- 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 index ee213bff5..bf676c3a9 100644 --- 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 index 47491c2c9..f70617117 100644 --- 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 |