clean up aligns

2016-09-03 14:31:43 -07:00
parent 5af8ba570c
commit f5879e72d9
108 changed files with 7867 additions and 15733 deletions
--- a/data/text/ability_description_pointers.s
+++ b/data/text/ability_description_pointers.s
@@ -1,5 +1,4 @@
-	.align 2, 0
-
+	.align 2
 gAbilityDescriptionPointers:: @ 831BAD4
 	.4byte gNoneAbilityDescription
 	.4byte gStenchAbilityDescription
--- a/data/text/contest_text_pointers.s
+++ b/data/text/contest_text_pointers.s
@@ -1,5 +1,4 @@
-	.align 2, 0
-
+	.align 2
 gContestEffectDescriptionPointers:: @ 8587C50
 	.4byte gContestEffect00hDescription
 	.4byte gContestEffect01hDescription
@@ -54,7 +53,7 @@ gContestEffectDescriptionPointers:: @ 8587C50
@ Unreferenced array of pointers to move names.
@ All of the moves except Conversion are combo starters, so this may have
@ been an early list of combo starters.
-	.align 2, 0
+	.align 2
 	.4byte gUnusedContestMoveName0
 	.4byte gUnusedContestMoveName0
 	.4byte gUnusedContestMoveName1
@@ -70,8 +69,7 @@ gContestEffectDescriptionPointers:: @ 8587C50
 	.4byte gUnusedContestMoveName11
 	.4byte gUnusedContestMoveName12

-	.align 2, 0
-
+	.align 2
 gContestMoveTypeTextPointers:: @ 8587D48
 	.4byte gContestMoveTypeCoolText
 	.4byte gContestMoveTypeBeautyText
--- a/data/text/easy_chat/easy_chat_group_actions.s
+++ b/data/text/easy_chat/easy_chat_group_actions.s
@@ -232,8 +232,7 @@ gEasyChatWord_Faint:: @ 859B243
 gEasyChatWord_Fainted:: @ 859B249
 	.string "FAINTED$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Actions:: @ 859B254
 	.4byte gEasyChatWord_Meets
 	.4byte 72 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_adjectives.s
+++ b/data/text/easy_chat/easy_chat_group_adjectives.s
@@ -106,8 +106,7 @@ gEasyChatWord_Happily:: @ 859C4C3
 gEasyChatWord_Anticipation:: @ 859C4CB
 	.string "ANTICIPATION$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Adjectives:: @ 859C4D8
 	.4byte gEasyChatWord_Wandering
 	.4byte 35 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_battle.s
+++ b/data/text/easy_chat/easy_chat_group_battle.s
@@ -187,8 +187,7 @@ gEasyChatWord_Rule:: @ 8598D04
 gEasyChatWord_Move:: @ 8598D09
 	.string "MOVE$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Battle:: @ 8598D10
 	.4byte gEasyChatWord_MatchUp
 	.4byte 53 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_conditions.s
+++ b/data/text/easy_chat/easy_chat_group_conditions.s
@@ -205,8 +205,7 @@ gEasyChatWord_Seems:: @ 859AD10
 gEasyChatWord_Badly:: @ 859AD16
 	.string "BADLY$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Conditions:: @ 859AD1C
 	.4byte gEasyChatWord_Hot
 	.4byte 13 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_endings.s
+++ b/data/text/easy_chat/easy_chat_group_endings.s
@@ -205,8 +205,7 @@ gEasyChatWord_Once:: @ 859A2C1
 gEasyChatWord_Anywhere:: @ 859A2C6
 	.string "ANYWHERE$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Endings:: @ 859A2D0
 	.4byte gEasyChatWord_Will
 	.4byte 32 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_events.s
+++ b/data/text/easy_chat/easy_chat_group_events.s
@@ -85,8 +85,7 @@ gEasyChatWord_Wireless:: @ 859C754
 gEasyChatWord_Frontier:: @ 859C75D
 	.string "FRONTIER$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Events:: @ 859C768
 	.4byte gEasyChatWord_Appeal
 	.4byte 0 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_feelings.s
+++ b/data/text/easy_chat/easy_chat_group_feelings.s
@@ -205,8 +205,7 @@ gEasyChatWord_Understand:: @ 859A7D6
 gEasyChatWord_Understands:: @ 859A7E1
 	.string "UNDERSTANDS$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Feelings:: @ 859A7F0
 	.4byte gEasyChatWord_Meet
 	.4byte 40 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_greetings.s
+++ b/data/text/easy_chat/easy_chat_group_greetings.s
@@ -124,8 +124,7 @@ gEasyChatWord_ComeOver:: @ 859913B
 gEasyChatWord_CountOn:: @ 8599145
 	.string "COUNT ON$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Greetings:: @ 8599150
 	.4byte gEasyChatWord_Thanks
 	.4byte 12 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_hobbies.s
+++ b/data/text/easy_chat/easy_chat_group_hobbies.s
@@ -160,8 +160,7 @@ gEasyChatWord_Vacation:: @ 859BACD
 gEasyChatWord_Look:: @ 859BAD6
 	.string "LOOK$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Hobbies:: @ 859BADC
 	.4byte gEasyChatWord_Idol
 	.4byte 43 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_lifestyle.s
+++ b/data/text/easy_chat/easy_chat_group_lifestyle.s
@@ -133,8 +133,7 @@ gEasyChatWord_Rental:: @ 859B737
 gEasyChatWord_World:: @ 859B73E
 	.string "WORLD$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Lifestyle:: @ 859B744
 	.4byte gEasyChatWord_Chores
 	.4byte 3 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_misc.s
+++ b/data/text/easy_chat/easy_chat_group_misc.s
@@ -124,8 +124,7 @@ gEasyChatWord_Left:: @ 859C1B4
 gEasyChatWord_Right:: @ 859C1B9
 	.string "RIGHT$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Misc:: @ 859C1C0
 	.4byte gEasyChatWord_Highs
 	.4byte 7 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_move_1.s
+++ b/data/text/easy_chat/easy_chat_group_move_1.s
@@ -1,5 +1,4 @@
-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Move1:: @ 859C8C4
 	.2byte MOVE_ABSORB
 	.2byte MOVE_AEROBLAST
--- a/data/text/easy_chat/easy_chat_group_move_2.s
+++ b/data/text/easy_chat/easy_chat_group_move_2.s
@@ -1,5 +1,4 @@
-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Move2:: @ 859C9F8
 	.2byte MOVE_ACID
 	.2byte MOVE_ACID_ARMOR
--- a/data/text/easy_chat/easy_chat_group_name_pointers.s
+++ b/data/text/easy_chat/easy_chat_group_name_pointers.s
@@ -1,5 +1,4 @@
-	.align 2, 0
-
+	.align 2
 gEasyChatGroupNamePointers:: @ 859E5D4
 	.4byte gEasyChatGroupName_Pokemon
 	.4byte gEasyChatGroupName_Trainer
--- a/data/text/easy_chat/easy_chat_group_people.s
+++ b/data/text/easy_chat/easy_chat_group_people.s
@@ -223,8 +223,7 @@ gEasyChatWord_SheIs:: @ 8599500
 gEasyChatWord_Some:: @ 8599507
 	.string "SOME$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_People:: @ 859950C
 	.4byte gEasyChatWord_Opponent
 	.4byte 13 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_pokemon.s
+++ b/data/text/easy_chat/easy_chat_group_pokemon.s
@@ -1,5 +1,4 @@
-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Pokemon:: @ 8597E9C
 	.2byte SPECIES_ABRA
 	.2byte SPECIES_ABSOL
--- a/data/text/easy_chat/easy_chat_group_pokemon2.s
+++ b/data/text/easy_chat/easy_chat_group_pokemon2.s
@@ -1,5 +1,4 @@
-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Pokemon2:: @ 859CE0C
 	.2byte SPECIES_ABRA
 	.2byte SPECIES_AERODACTYL
--- a/data/text/easy_chat/easy_chat_group_speech.s
+++ b/data/text/easy_chat/easy_chat_group_speech.s
@@ -178,8 +178,7 @@ gEasyChatWord_Instead:: @ 8599E76
 gEasyChatWord_Fantastic:: @ 8599E7E
 	.string "FANTASTIC$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Speech:: @ 8599E88
 	.4byte gEasyChatWord_Listen
 	.4byte 19 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_status.s
+++ b/data/text/easy_chat/easy_chat_group_status.s
@@ -325,8 +325,7 @@ gEasyChatWord_PurePower:: @ 8598607
 gEasyChatWord_ShieldDust:: @ 8598612
 	.string "SHIELD DUST$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Status:: @ 8598620
 	.4byte gEasyChatWord_Dark
 	.4byte 13 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_time.s
+++ b/data/text/easy_chat/easy_chat_group_time.s
@@ -133,8 +133,7 @@ gEasyChatWord_Night:: @ 859BE8B
 gEasyChatWord_Week:: @ 859BE91
 	.string "WEEK$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Time:: @ 859BE98
 	.4byte gEasyChatWord_Fall
 	.4byte 29 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_trainer.s
+++ b/data/text/easy_chat/easy_chat_group_trainer.s
@@ -79,8 +79,7 @@ gEasyChatWord_Silver:: @ 85980DF
 gEasyChatWord_Emerald:: @ 85980E6
 	.string "EMERALD$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Trainer:: @ 85980F0
 	.4byte gEasyChatWord_IChooseYou
 	.4byte 21 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_trendy_saying.s
+++ b/data/text/easy_chat/easy_chat_group_trendy_saying.s
@@ -97,8 +97,7 @@ gEasyChatWord_Young:: @ 859CC72
 gEasyChatWord_Ugly:: @ 859CC78
 	.string "UGLY$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_TrendySaying:: @ 859CC80
 	.4byte gEasyChatWord_KthxBye
 	.4byte 7 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_group_voices.s
+++ b/data/text/easy_chat/easy_chat_group_voices.s
@@ -187,8 +187,7 @@ gEasyChatWord_Gwah:: @ 85999E3
 gEasyChatWord_Wahahaha:: @ 85999E8
 	.string "WAHAHAHA$"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroup_Voices:: @ 85999F4
 	.4byte gEasyChatWord_Excl
 	.4byte 0 @ alphabetical order
--- a/data/text/easy_chat/easy_chat_groups.s
+++ b/data/text/easy_chat/easy_chat_groups.s
@@ -21,8 +21,7 @@
 	.include "data/text/easy_chat/easy_chat_group_trendy_saying.s"
 	.include "data/text/easy_chat/easy_chat_group_pokemon2.s"

-	.align 2, 0
-
+	.align 2
 gEasyChatGroups:: @ 859D004
 	.4byte gEasyChatGroup_Pokemon
 	.2byte 202 @ total number of entries
--- a/data/text/easy_chat/easy_chat_words_by_letter.s
+++ b/data/text/easy_chat/easy_chat_words_by_letter.s
@@ -2518,8 +2518,7 @@ gEasyChatWordsByLetter_UnusedJapaneseWa:: @ 859E428
 	ec_pokemon2 MACHOP
 	ec_pokemon1 MACHOP

-	.align 2, 0
-
+	.align 2
 gEasyChatWordsByLetterPointers:: @ 859E46C
 	.4byte gEasyChatWordsByLetter_Others
 	.4byte 10 @ number of entries
--- a/data/text/gift_ribbon_descriptions.s
+++ b/data/text/gift_ribbon_descriptions.s
@@ -139,8 +139,7 @@ gGiftRibbonDescriptionPart1_LoveForPokemon:: @ 8623DD4
 gGiftRibbonDescriptionPart2_LoveForPokemon:: @ 8623DE6
 	.string "love for POKéMON.$"

-	.align 2, 0
-
+	.align 2
 gGiftRibbonDescriptionPointers:: @ 8623DF8
 	.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_Champion
 	.4byte gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_Champion
--- a/data/text/move_descriptions.s
+++ b/data/text/move_descriptions.s
@@ -1060,8 +1060,7 @@ gDoomDesireMoveDescription:: @ 861C4BA
 gPsychoBoostMoveDescription:: @ 861C4EB
 	.string "Allows a full-power attack,\nbut sharply lowers SP. ATK.$"

-	.align 2, 0
-
+	.align 2
 gMoveDescriptionPointers:: @ 861C524
 	.4byte gPoundMoveDescription
 	.4byte gKarateChopMoveDescription
--- a/data/text/nature_names.s
+++ b/data/text/nature_names.s
@@ -73,8 +73,7 @@ gCarefulNatureName:: @ 861CB3F
 gQuirkyNatureName:: @ 861CB47
 	.string "QUIRKY$"

-	.align 2, 0
-
+	.align 2
 gNatureNamePointers:: @ 861CB50
 	.4byte gHardyNatureName
 	.4byte gLonelyNatureName
--- a/data/text/ribbon_descriptions.s
+++ b/data/text/ribbon_descriptions.s
@@ -55,8 +55,7 @@ gRibbonDescriptionPart1_Effort:: @ 8623981
 gRibbonDescriptionPart2_Effort:: @ 8623994
 	.string "being a hard worker.$"

-	.align 2, 0
-
+	.align 2
 gRibbonDescriptionPointers:: @ 86239AC
 	.4byte gRibbonDescriptionPart1_Champion,      gRibbonDescriptionPart2_Champion
 	.4byte gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_NormalRank