diff options
Diffstat (limited to 'data/text')
-rw-r--r-- | data/text/ability_descriptions.s | 3 | ||||
-rw-r--r-- | data/text/ability_names.s | 3 | ||||
-rw-r--r-- | data/text/battle_strings.s | 309 | ||||
-rw-r--r-- | data/text/cable_club.s | 12 | ||||
-rw-r--r-- | data/text/contest_strings.s | 87 | ||||
-rw-r--r-- | data/text/easy_chat/group_name_table.s | 3 | ||||
-rw-r--r-- | data/text/easy_chat/group_orders.s | 3 | ||||
-rw-r--r-- | data/text/easy_chat/group_sizes.s | 3 | ||||
-rw-r--r-- | data/text/easy_chat/group_words.s | 3 | ||||
-rw-r--r-- | data/text/easy_chat/words_by_letter.s | 6 | ||||
-rw-r--r-- | data/text/gift_ribbon_descriptions.s | 3 | ||||
-rw-r--r-- | data/text/intro.s | 27 | ||||
-rw-r--r-- | data/text/move_descriptions.s | 3 | ||||
-rw-r--r-- | data/text/move_names.s | 3 | ||||
-rw-r--r-- | data/text/nature_names.s | 3 | ||||
-rw-r--r-- | data/text/pokedex_rating.s | 63 | ||||
-rw-r--r-- | data/text/ribbon_descriptions.s | 3 | ||||
-rw-r--r-- | data/text/roulette.s | 36 | ||||
-rw-r--r-- | data/text/save.s | 15 | ||||
-rw-r--r-- | data/text/song_names.s | 6 | ||||
-rw-r--r-- | data/text/species_names.s | 3 | ||||
-rw-r--r-- | data/text/trainer_class_names.s | 3 | ||||
-rw-r--r-- | data/text/trainer_eye_descriptions.s | 3 | ||||
-rw-r--r-- | data/text/type_names.s | 3 |
24 files changed, 202 insertions, 404 deletions
diff --git a/data/text/ability_descriptions.s b/data/text/ability_descriptions.s index e17c98040..a57225a50 100644 --- a/data/text/ability_descriptions.s +++ b/data/text/ability_descriptions.s @@ -233,8 +233,7 @@ gAbilityDescription_AirLock: @ 81FA0F6 .string "Negates weather effects.$" .align 2 - .global gAbilityDescriptions -gAbilityDescriptions: @ 81FA110 +gAbilityDescriptions:: @ 81FA110 .4byte gAbilityDescription_None .4byte gAbilityDescription_Stench .4byte gAbilityDescription_Drizzle diff --git a/data/text/ability_names.s b/data/text/ability_names.s index e108df7b4..ec0265fda 100644 --- a/data/text/ability_names.s +++ b/data/text/ability_names.s @@ -1,5 +1,4 @@ - .global gAbilityNames -gAbilityNames: @ 81FA248 +gAbilityNames:: @ 81FA248 .string "-------$", 13 .string "STENCH$", 13 .string "DRIZZLE$", 13 diff --git a/data/text/battle_strings.s b/data/text/battle_strings.s index a7fe2d9e2..49dfc2dff 100644 --- a/data/text/battle_strings.s +++ b/data/text/battle_strings.s @@ -1,5 +1,4 @@ - .global gUnknown_083FE4F4 -gUnknown_083FE4F4: @ 83FE4F4 +gUnknown_083FE4F4:: @ 83FE4F4 .4byte dp01t_00_3_getattr .4byte sub_811EC04 .4byte sub_811EC10 @@ -251,15 +250,13 @@ BattleText_FreedFrom: BattleText_KeptGoingCrash: .string "{ATTACKING_MON} kept going\nand crashed!$" - .global gUnknown_083FEE5D -gUnknown_083FEE5D: @ 83FEE5D +gUnknown_083FEE5D:: @ 83FEE5D BattleText_MistShroud: .string "{STRING 38} became\nshrouded in MIST!$" BattleText_MistProtect: .string "{STRING 16} is protected\nby MIST!$" - .global gUnknown_083FEE92 -gUnknown_083FEE92: @ 83FEE92 +gUnknown_083FEE92:: @ 83FEE92 BattleText_GetPumped: .string "{ATTACKING_MON} is getting\npumped!$" BattleText_HitRecoil: @@ -541,8 +538,7 @@ BattleText_Transformed2: BattleText_TookAttack2: .string "{DEFENDING_MON}’s {STRING 22}\ntook the attack!$" - .global gUnknown_083FFCCA -gUnknown_083FFCCA: @ 83FFCCA +gUnknown_083FFCCA:: @ 83FFCCA BattleText_PreventedSwitch: .string "{STRING 0}’s {STRING 20}\nprevents switching!\p$" BattleText_PreventedOther: @@ -560,8 +556,7 @@ BattleText_NoEffectOn: BattleText_Sharply: .string "sharply $" - .global gUnknown_083FFDB3 -gUnknown_083FFDB3: @ 83FFDB3 +gUnknown_083FFDB3:: @ 83FFDB3 BattleText_Rose: .string "rose!$" BattleText_Harshly: @@ -571,8 +566,7 @@ BattleText_Fell: BattleText_UnknownString7: .string "{ATTACKING_MON}’s {STRING 0}\n{STRING 1}$" - .global gUnknown_083FFDD3 -gUnknown_083FFDD3: @ 83FFDD3 +gUnknown_083FFDD3:: @ 83FFDD3 BattleText_UnknownString3: .string "{DEFENDING_MON}’s {STRING 0}\n{STRING 1}$" BattleText_UnknownString4: @@ -600,8 +594,7 @@ BattleText_NotEffective: BattleText_SuperEffective: .string "It’s super effective!$" - .global gUnknown_083FFEFC -gUnknown_083FFEFC: @ 83FFEFC +gUnknown_083FFEFC:: @ 83FFEFC BattleText_GotAwaySafely: .string "{PLAY_SE SE_NIGERU}Got away safely!\p$" BattleText_FledUsingItem: @@ -611,43 +604,35 @@ BattleText_FledUsingOther: BattleText_FledWild: .string "{PLAY_SE SE_NIGERU}Wild {STRING 0} fled!$" - .global gUnknown_083FFF56 -gUnknown_083FFF56: @ 83FFF56 +gUnknown_083FFF56:: @ 83FFF56 BattleText_PlayerDefeatedTrainer: .string "Player defeated\n{STRING 29}!$" - .global gUnknown_083FFF6A -gUnknown_083FFF6A: @ 83FFF6A +gUnknown_083FFF6A:: @ 83FFF6A BattleText_PlayerDefeatedTrainers: .string "Player beat {STRING 30}\nand {STRING 29}!$" - .global gUnknown_083FFF81 -gUnknown_083FFF81: @ 83FFF81 +gUnknown_083FFF81:: @ 83FFF81 BattleText_PlayerLostTrainer: .string "Player lost against\n{STRING 29}!$" - .global gUnknown_083FFF99 -gUnknown_083FFF99: @ 83FFF99 +gUnknown_083FFF99:: @ 83FFF99 BattleText_PlayerLostTrainers: .string "Player lost to {STRING 30}\nand {STRING 29}!$" - .global gUnknown_083FFFB3 -gUnknown_083FFFB3: @ 83FFFB3 +gUnknown_083FFFB3:: @ 83FFFB3 BattleText_PlayerTiedTrainer: .string "Player tied against\n{STRING 29}!$" - .global gUnknown_083FFFCB -gUnknown_083FFFCB: @ 83FFFCB +gUnknown_083FFFCB:: @ 83FFFCB BattleText_PlayerTiedTrainers: .string "Player tied against {STRING 30}\nand {STRING 29}!$" - .global gUnknown_083FFFEA -gUnknown_083FFFEA: @ 83FFFEA +gUnknown_083FFFEA:: @ 83FFFEA BattleText_FledSingle: .string "{PLAY_SE SE_NIGERU}{STRING 29} fled!$" - .global gUnknown_083FFFF7 -gUnknown_083FFFF7: @ 83FFFF7 +gUnknown_083FFFF7:: @ 83FFFF7 BattleText_FledDouble: .string "{PLAY_SE SE_NIGERU}{STRING 29} and\n{STRING 30} fled!$" BattleText_NoRunning: @@ -751,218 +736,175 @@ BattleText_ThrewBlock: BattleText_SafariOver: .string "{PLAY_SE SE_PINPON}ANNOUNCER: You’re out of\nSAFARI BALLS! Game over!\p$" - .global gUnknown_08400555 -gUnknown_08400555: @ 8400555 +gUnknown_08400555:: @ 8400555 BattleText_WildAppeared1: .string "Wild {STRING 3} appeared!\p$" - .global gUnknown_08400568 -gUnknown_08400568: @ 8400568 +gUnknown_08400568:: @ 8400568 BattleText_WildAppeared2: .string "Wild {STRING 3} appeared!\p$" - .global gUnknown_0840057B -gUnknown_0840057B: @ 840057B +gUnknown_0840057B:: @ 840057B BattleText_WildAppeared3: .string "Wild {STRING 3} appeared!{PAUSE 127}$" - .global gUnknown_08400590 -gUnknown_08400590: @ 8400590 +gUnknown_08400590:: @ 8400590 BattleText_WildDoubleAppeared: .string "Wild {STRING 5} and\n{STRING 3} appeared!\p$" - .global gUnknown_084005AA -gUnknown_084005AA: @ 84005AA +gUnknown_084005AA:: @ 84005AA BattleText_SingleWantToBattle1: .string "{STRING 25} {STRING 26}\nwould like to battle!\p$" - .global gUnknown_084005C7 -gUnknown_084005C7: @ 84005C7 +gUnknown_084005C7:: @ 84005C7 BattleText_SingleWantToBattle2: .string "{STRING 29}\nwants to battle!$" - .global gUnknown_084005DB -gUnknown_084005DB: @ 84005DB +gUnknown_084005DB:: @ 84005DB BattleText_DoubleWantToBattle: .string "{STRING 29} and {STRING 30}\nwant to battle!$" - .global gUnknown_084005F5 -gUnknown_084005F5: @ 84005F5 +gUnknown_084005F5:: @ 84005F5 BattleText_SentOutSingle1: .string "{STRING 25} {STRING 26} sent\nout {STRING 3}!$" - .global gUnknown_08400608 -gUnknown_08400608: @ 8400608 +gUnknown_08400608:: @ 8400608 BattleText_SentOutDouble1: .string "{STRING 25} {STRING 26} sent\nout {STRING 3} and {STRING 5}!$" - .global gUnknown_08400622 -gUnknown_08400622: @ 8400622 +gUnknown_08400622:: @ 8400622 BattleText_SentOutSingle2: .string "{STRING 25} {STRING 26} sent\nout {STRING 0}!$" - .global gUnknown_08400635 -gUnknown_08400635: @ 8400635 +gUnknown_08400635:: @ 8400635 BattleText_SentOutSingle3: .string "{STRING 29} sent\nout {STRING 3}!$" - .global gUnknown_08400645 -gUnknown_08400645: @ 8400645 +gUnknown_08400645:: @ 8400645 BattleText_SentOutDouble2: .string "{STRING 29} sent out\n{STRING 3} and {STRING 5}!$" - .global gUnknown_0840065C -gUnknown_0840065C: @ 840065C +gUnknown_0840065C:: @ 840065C BattleText_SentOutDouble3: .string "{STRING 29} sent out\n{STRING 7}!\p{STRING 30} sent out\n{STRING 9}!$" - .global gUnknown_0840067C -gUnknown_0840067C: @ 840067C +gUnknown_0840067C:: @ 840067C BattleText_SentOutSingle4: .string "{STRING 29} sent out\n{STRING 0}!$" - .global gUnknown_0840068C -gUnknown_0840068C: @ 840068C +gUnknown_0840068C:: @ 840068C BattleText_SentOutSingle5: .string "{STRING 31} sent out\n{STRING 0}!$" - .global gUnknown_0840069C -gUnknown_0840069C: @ 840069C +gUnknown_0840069C:: @ 840069C BattleText_SentOutSingle6: .string "Go! {STRING 2}!$" - .global gUnknown_084006A4 -gUnknown_084006A4: @ 84006A4 +gUnknown_084006A4:: @ 84006A4 BattleText_SentOutDouble4: .string "Go! {STRING 2} and\n{STRING 4}!$" - .global gUnknown_084006B3 -gUnknown_084006B3: @ 84006B3 +gUnknown_084006B3:: @ 84006B3 BattleText_SentOutSingle7: .string "Go! {STRING 0}!$" - .global gUnknown_084006BB -gUnknown_084006BB: @ 84006BB +gUnknown_084006BB:: @ 84006BB BattleText_SentOutSingle8: .string "Do it! {STRING 0}!$" - .global gUnknown_084006C6 -gUnknown_084006C6: @ 84006C6 +gUnknown_084006C6:: @ 84006C6 BattleText_SentOutSingle9: .string "Go for it, {STRING 0}!$" - .global gUnknown_084006D5 -gUnknown_084006D5: @ 84006D5 +gUnknown_084006D5:: @ 84006D5 BattleText_SentOutSingle10: .string "Your foe’s weak!\nGet’m, {STRING 0}!$" - .global gUnknown_084006F1 -gUnknown_084006F1: @ 84006F1 +gUnknown_084006F1:: @ 84006F1 BattleText_SentOutSingle11: .string "{STRING 28} sent out\n{STRING 8}!\pGo! {STRING 6}!$" - .global gUnknown_08400709 -gUnknown_08400709: @ 8400709 +gUnknown_08400709:: @ 8400709 BattleText_ComeBackSingle1: .string "{STRING 0}, that’s enough!\nCome back!$" - .global gUnknown_08400727 -gUnknown_08400727: @ 8400727 +gUnknown_08400727:: @ 8400727 BattleText_ComeBackSingle2: .string "{STRING 0}, come back!$" - .global gUnknown_08400736 -gUnknown_08400736: @ 8400736 +gUnknown_08400736:: @ 8400736 BattleText_ComeBackSingle3: .string "{STRING 0}, OK!\nCome back!$" - .global gUnknown_08400749 -gUnknown_08400749: @ 8400749 +gUnknown_08400749:: @ 8400749 BattleText_ComeBackSingle4: .string "{STRING 0}, good!\nCome back!$" - .global gUnknown_0840075E -gUnknown_0840075E: @ 840075E +gUnknown_0840075E:: @ 840075E BattleText_WithdrewPoke1: .string "{STRING 25} {STRING 26}\nwithdrew {STRING 0}!$" - .global gUnknown_08400771 -gUnknown_08400771: @ 8400771 +gUnknown_08400771:: @ 8400771 BattleText_WithdrewPoke2: .string "{STRING 29} withdrew\n{STRING 0}!$" - .global gUnknown_08400781 -gUnknown_08400781: @ 8400781 +gUnknown_08400781:: @ 8400781 BattleText_WithdrewPoke3: .string "{STRING 31} withdrew\n{STRING 0}!$" - .global gUnknown_08400791 -gUnknown_08400791: @ 8400791 +gUnknown_08400791:: @ 8400791 BattleText_Wild: .string "Wild $" - .global gUnknown_08400797 -gUnknown_08400797: @ 8400797 +gUnknown_08400797:: @ 8400797 BattleText_Foe: .string "Foe $" - .global gUnknown_0840079C -gUnknown_0840079C: @ 840079C +gUnknown_0840079C:: @ 840079C BattleText_Foe2: .string "Foe $" - .global gUnknown_084007A1 -gUnknown_084007A1: @ 84007A1 +gUnknown_084007A1:: @ 84007A1 BattleText_Ally: .string "Ally $" - .global gUnknown_084007A7 -gUnknown_084007A7: @ 84007A7 +gUnknown_084007A7:: @ 84007A7 BattleText_Foe3: .string "Foe $" - .global gUnknown_084007AC -gUnknown_084007AC: @ 84007AC +gUnknown_084007AC:: @ 84007AC BattleText_Ally2: .string "Ally $" - .global gUnknown_084007B2 -gUnknown_084007B2: @ 84007B2 +gUnknown_084007B2:: @ 84007B2 BattleText_Foe4: .string "Foe $" - .global gUnknown_084007B7 -gUnknown_084007B7: @ 84007B7 +gUnknown_084007B7:: @ 84007B7 BattleText_Ally3: .string "Ally $" - .global gUnknown_084007BD -gUnknown_084007BD: @ 84007BD +gUnknown_084007BD:: @ 84007BD BattleText_OpponentUsedMove: .string "{ATTACKING_MON} used\n{STRING 1}$" - .global gUnknown_084007C8 -gUnknown_084007C8: @ 84007C8 +gUnknown_084007C8:: @ 84007C8 BattleText_Exclamation2: @ out of order but whatever .string "!$" - .global gUnknown_084007CA -gUnknown_084007CA: @ 84007CA +gUnknown_084007CA:: @ 84007CA BattleText_Exclamation3: .string "!$" - .global gUnknown_084007CC -gUnknown_084007CC: @ 84007CC +gUnknown_084007CC:: @ 84007CC BattleText_Exclamation4: .string "!$" - .global gUnknown_084007CE -gUnknown_084007CE: @ 84007CE +gUnknown_084007CE:: @ 84007CE BattleText_Exclamation5: .string "!$" - .global gUnknown_084007D0 -gUnknown_084007D0: @ 84007D0 +gUnknown_084007D0:: @ 84007D0 BattleText_Exclamation: .string "!$" BattleStatText_HP: @@ -1022,13 +964,11 @@ BattleText_GiveNickname: BattleText_SentToPC: .string "{STRING 3} was sent to\n{STRING 35} PC.$" - .global gUnknown_084009ED -gUnknown_084009ED: @ 84009ED +gUnknown_084009ED:: @ 84009ED BattleText_Someone: .string "someone’s$" - .global gUnknown_084009F7 -gUnknown_084009F7: @ 84009F7 +gUnknown_084009F7:: @ 84009F7 BattleText_Lanette: .string "LANETTE’s$" BattleText_AddedToDex: @@ -1040,13 +980,11 @@ BattleText_Sandstorm: BattleText_BoxFull: .string "The BOX is full!\nYou can’t catch any more!\p$" - .global gUnknown_08400A78 -gUnknown_08400A78: @ 8400A78 +gUnknown_08400A78:: @ 8400A78 BattleText_EnigmaBerry: .string "ENIGMA BERRY$" - .global gUnknown_08400A85 -gUnknown_08400A85: @ 8400A85 +gUnknown_08400A85:: @ 8400A85 BattleText_Berry: .string " BERRY$" BattleText_CuredParalysis: @@ -1082,90 +1020,73 @@ BattleText_Terminator2: BattleText_WallyBall: .string "You throw a BALL now, right?\nI... I’ll do my best!$" - .global gUnknown_08400C4A -gUnknown_08400C4A: @ 8400C4A +gUnknown_08400C4A:: @ 8400C4A BattleText_StartEvo: .string "What?\n{STRING 2} is evolving!$" - .global gUnknown_08400C60 -gUnknown_08400C60: @ 8400C60 +gUnknown_08400C60:: @ 8400C60 BattleText_FinishEvo: .string "Congratulations! Your {STRING 2}\nevolved into {STRING 3}!{UNKNOWN_A}\p$" - .global gUnknown_08400C8D -gUnknown_08400C8D: @ 8400C8D +gUnknown_08400C8D:: @ 8400C8D BattleText_StopEvo: .string "Huh? {STRING 2}\nstopped evolving!\p$" - .global gUnknown_08400CA8 -gUnknown_08400CA8: @ 8400CA8 +gUnknown_08400CA8:: @ 8400CA8 BattleText_OtherMenu: .string "What should\n{STRING 15} do?$" - .global gUnknown_08400CBB -gUnknown_08400CBB: @ 8400CBB +gUnknown_08400CBB:: @ 8400CBB BattleText_PlayerMenu: .string "What will\n{STRING 32} do?$" - .global gUnknown_08400CCC -gUnknown_08400CCC: @ 8400CCC +gUnknown_08400CCC:: @ 8400CCC BattleText_WallyMenu: .string "What will\nWALLY do?$" - .global gUnknown_08400CE0 -gUnknown_08400CE0: @ 8400CE0 +gUnknown_08400CE0:: @ 8400CE0 BattleText_LinkStandby: .string "{PAUSE 16}Link standby...$" - .global gUnknown_08400CF3 -gUnknown_08400CF3: @ 8400CF3 +gUnknown_08400CF3:: @ 8400CF3 BattleText_MenuOptions: .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}FIGHT{CLEAR_TO 0x2E}BAG\nPOKéMON{CLEAR_TO 0x2E}RUN$" - .global gUnknown_08400D15 -gUnknown_08400D15: @ 8400D15 +gUnknown_08400D15:: @ 8400D15 BattleText_MenuOptionsSafari: .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}BALL{CLEAR_TO 0x2E}{POKEBLOCK}\nGO NEAR{CLEAR_TO 0x2E}RUN$" - .global gUnknown_08400D38 -gUnknown_08400D38: @ 8400D38 +gUnknown_08400D38:: @ 8400D38 BattleText_PP: .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}PP\nTYPE/$" - .global gUnknown_08400D49 -gUnknown_08400D49: @ 8400D49 +gUnknown_08400D49:: @ 8400D49 BattleText_Format: @ cant think of a better name .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}$" - .global gUnknown_08400D52 -gUnknown_08400D52: @ 8400D52 +gUnknown_08400D52:: @ 8400D52 BattleText_ForgetMove: .string "{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}{PALETTE 5}Which move should\nbe forgotten?$" - .global gUnknown_08400D7A -gUnknown_08400D7A: @ 8400D7A +gUnknown_08400D7A:: @ 8400D7A BattleText_YesNo: .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}Yes\nNo$" - .global gUnknown_08400D89 -gUnknown_08400D89: @ 8400D89 +gUnknown_08400D89:: @ 8400D89 BattleText_SwitchWhich: .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}Switch\nwhich?$" - .global gUnknown_08400D9F -gUnknown_08400D9F: @ 8400D9F +gUnknown_08400D9F:: @ 8400D9F BattleText_Format2: .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}$" BattleText_RightArrow: .string "{RIGHT_ARROW}$" - .global gUnknown_08400DAA -gUnknown_08400DAA: @ 8400DAA +gUnknown_08400DAA:: @ 8400DAA BattleText_Plus: .string "+$" - .global gUnknown_08400DAC -gUnknown_08400DAC: @ 8400DAC +gUnknown_08400DAC:: @ 8400DAC @ someone improve the formatting of this please BattleText_Dash: .string "-$" @@ -1180,18 +1101,15 @@ BattleText_SpAtk: BattleText_SpDef: .string "SP. DEF$" - .global gUnknown_08400DD6 -gUnknown_08400DD6: @ 8400DD6 +gUnknown_08400DD6:: @ 8400DD6 BattleText_SafariBalls: .string "{HIGHLIGHT RED}SAFARI BALLS$" - .global gUnknown_08400DE6 -gUnknown_08400DE6: @ 8400DE6 +gUnknown_08400DE6:: @ 8400DE6 BattleText_SafariBallsLeft: .string "{HIGHLIGHT RED}Left: $" - .global gUnknown_08400DF0 -gUnknown_08400DF0: @ 8400DF0 +gUnknown_08400DF0:: @ 8400DF0 BattleText_HighlightRed: .string "{HIGHLIGHT RED}$" BattleText_Sleep: @@ -1209,73 +1127,59 @@ BattleText_Confusion: BattleText_Love: .string "love$" - .global gUnknown_08400E23 -gUnknown_08400E23: @ 8400E23 +gUnknown_08400E23:: @ 8400E23 BattleText_Format3: .string " and $" - .global gUnknown_08400E29 -gUnknown_08400E29: @ 8400E29 +gUnknown_08400E29:: @ 8400E29 BattleText_Format4: .string ", $" - .global gUnknown_08400E2C -gUnknown_08400E2C: @ 8400E2C +gUnknown_08400E2C:: @ 8400E2C BattleText_Format5: .string " $" - .global gUnknown_08400E2E -gUnknown_08400E2E: @ 8400E2E +gUnknown_08400E2E:: @ 8400E2E BattleText_Format6: .string "\l$" - .global gUnknown_08400E30 -gUnknown_08400E30: @ 8400E30 +gUnknown_08400E30:: @ 8400E30 BattleText_Format7: .string "\n$" - .global gUnknown_08400E32 -gUnknown_08400E32: @ 8400E32 +gUnknown_08400E32:: @ 8400E32 BattleText_Format8: .string "are$" - .global gUnknown_08400E36 -gUnknown_08400E36: @ 8400E36 +gUnknown_08400E36:: @ 8400E36 BattleText_Format9: .string "are$" - .global gUnknown_08400E3A -gUnknown_08400E3A: @ 8400E3A +gUnknown_08400E3A:: @ 8400E3A BattleText_BadEGG: .string "Bad EGG$" - .global gUnknown_08400E42 -gUnknown_08400E42: @ 8400E42 +gUnknown_08400E42:: @ 8400E42 BattleText_Wally: .string "WALLY$" - .global gUnknown_08400E48 -gUnknown_08400E48: @ 8400E48 +gUnknown_08400E48:: @ 8400E48 BattleText_Win: .string "{HIGHLIGHT TRANSPARENT}Win$" - .global gUnknown_08400E4F -gUnknown_08400E4F: @ 8400E4F +gUnknown_08400E4F:: @ 8400E4F BattleText_Loss: .string "{HIGHLIGHT TRANSPARENT}Loss$" - .global gUnknown_08400E57 -gUnknown_08400E57: @ 8400E57 +gUnknown_08400E57:: @ 8400E57 BattleText_Tie: .string "{HIGHLIGHT TRANSPARENT}Tie$" - .global gUnknown_08400E5E -gUnknown_08400E5E: @ 8400E5E +gUnknown_08400E5E:: @ 8400E5E BattleText_Format10: .string " is$" - .global gUnknown_08400E62 -gUnknown_08400E62: @ 8400E62 +gUnknown_08400E62:: @ 8400E62 BattleText_Format11: .string "’s$" BattleText_Normal: @@ -1316,8 +1220,7 @@ BattleText_Dark: .string "a DARK move$" .align 2 - .global gUnknown_08400F58 -gUnknown_08400F58: @ 8400F58 +gUnknown_08400F58:: @ 8400F58 .4byte BattleStatText_HP .4byte BattleStatText_Attack .4byte BattleStatText_Defense @@ -1327,16 +1230,14 @@ gUnknown_08400F58: @ 8400F58 .4byte BattleStatText_Accuracy .4byte BattleStatText_Evasion - .global gUnknown_08400F78 -gUnknown_08400F78: @ 8400F78 +gUnknown_08400F78:: @ 8400F78 .4byte ContestStatText_TooSpicy .4byte ContestStatText_TooDry .4byte ContestStatText_TooSweet .4byte ContestStatText_TooBitter .4byte ContestStatText_TooSour - .global gUnknown_08400F8C -gUnknown_08400F8C: @ 8400F8C +gUnknown_08400F8C:: @ 8400F8C .4byte BattleText_UnknownString .4byte BattleText_GainExpPoints .4byte BattleText_GrewLevel @@ -1689,16 +1590,13 @@ gUnknown_08400F8C: @ 8400F8C .4byte BattleText_NoEffect .4byte BattleText_NoEffectOn - .global gUnknown_08401508 -gUnknown_08401508: @ 8401508 +gUnknown_08401508:: @ 8401508 .incbin "baserom.gba", 0x00401508, 0x144 - .global gUnknown_0840164C -gUnknown_0840164C: @ 840164C +gUnknown_0840164C:: @ 840164C .incbin "baserom.gba", 0x0040164c, 0x10 - .global gUnknown_0840165C -gUnknown_0840165C: @ 840165C +gUnknown_0840165C:: @ 840165C .4byte BattleText_HP .4byte BattleText_SpAtk .4byte BattleText_Attack @@ -1706,8 +1604,7 @@ gUnknown_0840165C: @ 840165C .4byte BattleText_Defense .4byte BattleStatText_Speed - .global gUnknown_08401674 -gUnknown_08401674: @ 8401674 +gUnknown_08401674:: @ 8401674 .4byte BattleText_Normal .4byte BattleText_Fighting .4byte BattleText_Flying diff --git a/data/text/cable_club.s b/data/text/cable_club.s index fe771e7a5..54f9bda5a 100644 --- a/data/text/cable_club.s +++ b/data/text/cable_club.s @@ -52,26 +52,22 @@ OldaleTown_PokemonCenter_2F_Text_1A48DD:: @ 81A48DD .string "Your {STR_VAR_1} BERRY-holding POKéMON\n" .string "can’t be traded.$" - .global gUnknown_081A490C -gUnknown_081A490C: @ 81A490C +gUnknown_081A490C:: @ 81A490C OldaleTown_PokemonCenter_2F_Text_1A490C:: @ 81A490C .string "Please wait.\n" .string "... ... B Button: Cancel$" - .global gUnknown_081A4932 -gUnknown_081A4932: @ 81A4932 +gUnknown_081A4932:: @ 81A4932 UnknownString_81A4932: @ 81A4932 .string "When all players are ready...\n" .string "A Button: Confirm B Button: Cancel$" - .global gUnknown_081A4975 -gUnknown_081A4975: @ 81A4975 +gUnknown_081A4975:: @ 81A4975 UnknownString_81A4975: @ 81A4975 .string "Start link with {STR_VAR_1} players.\n" .string "A Button: Confirm B Button: Cancel$" - .global gUnknown_081A49B6 -gUnknown_081A49B6: @ 81A49B6 +gUnknown_081A49B6:: @ 81A49B6 UnknownString_81A49B6: @ 81A49B6 .string "Awaiting linkup...\n" .string "... ... B Button: Cancel$" diff --git a/data/text/contest_strings.s b/data/text/contest_strings.s index e9a77c7c2..a83ff7e92 100644 --- a/data/text/contest_strings.s +++ b/data/text/contest_strings.s @@ -1,5 +1,4 @@ - .global gUnknown_083CA4D4 -gUnknown_083CA4D4: @ 83CA4D4 +gUnknown_083CA4D4:: @ 83CA4D4 .incbin "baserom.gba", 0x003ca4d4, 0x18 ContestString_DescHighlyAppealing: .string "A highly appealing move.$" @@ -99,8 +98,7 @@ ContestString_DescStopExcitement: .string "Temporarily stops the\ncrowd from growing excited.$" .align 1 - .global gUnknown_083CADD4 -gUnknown_083CADD4: @ 83CADD4 +gUnknown_083CADD4:: @ 83CADD4 .4byte ContestString_DescHighlyAppealing .4byte ContestString_DescStartled1 .4byte ContestString_DescGreatLock @@ -202,33 +200,27 @@ ContestString_Tough: .string "TOUGH$" .align 2 - .global gUnknown_083CAF70 -gUnknown_083CAF70: @ 83CAF70 +gUnknown_083CAF70:: @ 83CAF70 .4byte ContestString_Cool .4byte ContestString_Beauty .4byte ContestString_Cute .4byte ContestString_Smart .4byte ContestString_Tough - .global gUnknown_083CAF84 -gUnknown_083CAF84: @ 83CAF84 +gUnknown_083CAF84:: @ 83CAF84 .string "Appeal no. {NAME_END}!\nWhich move will be played?$" - .global gUnknown_083CAFAE -gUnknown_083CAFAE: @ 83CAFAE +gUnknown_083CAFAE:: @ 83CAFAE .string "Appeal no. {NAME_END}!\nBut it can’t participate!$" - .global gUnknown_083CAFD7 -gUnknown_083CAFD7: @ 83CAFD7 +gUnknown_083CAFD7:: @ 83CAFD7 .string "{STR_VAR_1} appealed with\n{STR_VAR_2}!$" .string "The other POKéMON\nmade moves.{PAUSE 60}$" - .global gUnknown_083CB00D -gUnknown_083CB00D: @ 83CB00D +gUnknown_083CB00D:: @ 83CB00D .string "{STR_VAR_1} was watching\nthe others.{PAUSE 60}$" - .global gUnknown_083CB02C -gUnknown_083CB02C: @ 83CB02C +gUnknown_083CB02C:: @ 83CB02C .string "We’re all out of\nAppeal Time!{PAUSE 60}$" .string "{STR_VAR_1}’s {STR_VAR_3}\nmove {STR_VAR_2}!{PAUSE 60}$" .string "TRICK$" @@ -285,8 +277,7 @@ ContestString_StandOutDidnt: .string "{STR_VAR_1} hasn’t made\nits appeal.{PAUSE_UNTIL_PRESS}$" .align 2 - .global gUnknown_083CB2F0 -gUnknown_083CB2F0: @ 83CB2F0 +gUnknown_083CB2F0:: @ 83CB2F0 .4byte ContestString_StandOutNone .4byte ContestString_StandOutNotMuch .4byte ContestString_StandOutLittle @@ -453,23 +444,19 @@ ContestString_MoveBackLine: ContestString_ScrambleOrder: .string "It scrambled up the\norder for the next turn.{PAUSE 60}$" - .global gUnknown_083CBD52 -gUnknown_083CBD52: @ 83CBD52 +gUnknown_083CBD52:: @ 83CBD52 ContestString_JudgeExpectantly2: .string "The JUDGE looked at\n{STR_VAR_1} expectantly.{PAUSE 60}$" - .global gUnknown_083CBD79 -gUnknown_083CBD79: @ 83CBD79 +gUnknown_083CBD79:: @ 83CBD79 ContestString_WentOverWell: .string "The appeal combo went\nover well.{PAUSE 60}$" - .global gUnknown_083CBD9D -gUnknown_083CBD9D: @ 83CBD9D +gUnknown_083CBD9D:: @ 83CBD9D ContestString_WentOverVeryWell: .string "The appeal combo went\nover very well.{PAUSE 60}$" - .global gUnknown_083CBDC6 -gUnknown_083CBDC6: @ 83CBDC6 +gUnknown_083CBDC6:: @ 83CBDC6 ContestString_AppealComboExcellently: .string "The appeal combo went\nover excellently.{PAUSE 60}$" ContestString_AvertGaze: @@ -493,8 +480,7 @@ ContestString_LeaptUp: ContestString_TrippedOver: .string "{STR_VAR_1} tripped over\nout of distraction.{PAUSE 60}$" - .global gUnknown_083CBF60 -gUnknown_083CBF60: @ 83CBF60 +gUnknown_083CBF60:: @ 83CBF60 ContestString_TooNervous: .string "{STR_VAR_1} was too\nnervous to move.{PAUSE 60}$" ContestString_MessedUp2: @@ -512,46 +498,38 @@ ContestString_BadConditionWeakAppeal: ContestString_Unaffected: .string "{STR_VAR_1} was\nunaffected.{PAUSE 60}$" - .global gUnknown_083CC075 -gUnknown_083CC075: @ 83CC075 +gUnknown_083CC075:: @ 83CC075 ContestString_DissapointedRepeat: .string "{STR_VAR_1} disappointed\nby repeating an appeal.{PAUSE 60}$" - .global gUnknown_083CC0A0 -gUnknown_083CC0A0: @ 83CC0A0 +gUnknown_083CC0A0:: @ 83CC0A0 ContestString_WentOverGreat: .string "{STR_VAR_1}’s {STR_VAR_3}\nwent over great.{PAUSE 60}$" - .global gUnknown_083CC0BC -gUnknown_083CC0BC: @ 83CC0BC +gUnknown_083CC0BC:: @ 83CC0BC ContestString_DidntGoWell: .string "{STR_VAR_1}’s {STR_VAR_3}\ndidn’t go over well here...{PAUSE 60}$" - .global gUnknown_083CC0E3 -gUnknown_083CC0E3: @ 83CC0E3 +gUnknown_083CC0E3:: @ 83CC0E3 ContestString_GotCrowdGoing: .string "{STR_VAR_1}’s {STR_VAR_3}\ngot the crowd going.{PAUSE 60}$" - .global gUnknown_083CC103 -gUnknown_083CC103: @ 83CC103 +gUnknown_083CC103:: @ 83CC103 ContestString_CantAppealNextTurn: .string "{STR_VAR_1} can’t appeal\nnext turn...{PAUSE 60}$" ContestString_AttractedAttention: .string "It attracted the crowd’s\nattention.{PAUSE 60}$" - .global gUnknown_083CC14A -gUnknown_083CC14A: @ 83CC14A +gUnknown_083CC14A:: @ 83CC14A ContestString_CrowdWatches: .string "The crowd continues to\nwatch {STR_VAR_3}.{PAUSE 60}$" - .global gUnknown_083CC16E -gUnknown_083CC16E: @ 83CC16E +gUnknown_083CC16E:: @ 83CC16E ContestString_Ignored2: .string "{STR_VAR_1}’s\n{STR_VAR_2} is ignored.{PAUSE 60}$" .align 2 - .global gUnknown_083CC188 -gUnknown_083CC188: @ 83CC188 +gUnknown_083CC188:: @ 83CC188 .4byte ContestString_MoreConscious .4byte ContestString_NoAppeal .4byte ContestString_SettleDown @@ -615,24 +593,19 @@ gUnknown_083CC188: @ 83CC188 .4byte ContestString_Unaffected .4byte ContestString_AttractedAttention - .global gUnknown_083CC280 -gUnknown_083CC280: @ 83CC280 +gUnknown_083CC280:: @ 83CC280 .string "shyness$" - .global gUnknown_083CC288 -gUnknown_083CC288: @ 83CC288 +gUnknown_083CC288:: @ 83CC288 .string "anxiety$" - .global gUnknown_083CC290 -gUnknown_083CC290: @ 83CC290 +gUnknown_083CC290:: @ 83CC290 .string "laziness$" - .global gUnknown_083CC299 -gUnknown_083CC299: @ 83CC299 +gUnknown_083CC299:: @ 83CC299 .string "hesitancy$" - .global gUnknown_083CC2A3 -gUnknown_083CC2A3: @ 83CC2A3 +gUnknown_083CC2A3:: @ 83CC2A3 ContestString_Fear: @unused .string "fear$" ContestString_Coolness: @@ -647,16 +620,14 @@ ContestString_Toughness: .string "toughness$" .align 2 - .global gUnknown_083CC2D8 -gUnknown_083CC2D8: @ 83CC2D8 +gUnknown_083CC2D8:: @ 83CC2D8 .4byte ContestString_Coolness .4byte ContestString_Beauty2 .4byte ContestString_Cuteness .4byte ContestString_Smartness .4byte ContestString_Toughness - .global gUnknown_083CC2EC -gUnknown_083CC2EC: @ 83CC2EC +gUnknown_083CC2EC:: @ 83CC2EC .string "TENSION:$" .string "COOL Move$" .string "BEAUTY Move$" diff --git a/data/text/easy_chat/group_name_table.s b/data/text/easy_chat/group_name_table.s index b431131be..7c1bfa575 100644 --- a/data/text/easy_chat/group_name_table.s +++ b/data/text/easy_chat/group_name_table.s @@ -1,6 +1,5 @@ .align 2 - .global gEasyChatGroupNames -gEasyChatGroupNames: @ 83DFE6C +gEasyChatGroupNames:: @ 83DFE6C .4byte gEasyChatGroupName_Pokemon .4byte gEasyChatGroupName_Trainer .4byte gEasyChatGroupName_Status diff --git a/data/text/easy_chat/group_orders.s b/data/text/easy_chat/group_orders.s index e4871c859..d08f70a2a 100644 --- a/data/text/easy_chat/group_orders.s +++ b/data/text/easy_chat/group_orders.s @@ -26,8 +26,7 @@ @ Japanese order so that their meaning is preserved when they are transferred @ between different language editions of the games. .align 2 - .global gEasyChatGroupOrders -gEasyChatGroupOrders: @ 83DFE14 +gEasyChatGroupOrders:: @ 83DFE14 .4byte gEasyChatGroupOrder_Pokemon .4byte gEasyChatGroupOrder_Trainer .4byte gEasyChatGroupOrder_Status diff --git a/data/text/easy_chat/group_sizes.s b/data/text/easy_chat/group_sizes.s index c3e735c63..ee89beed2 100644 --- a/data/text/easy_chat/group_sizes.s +++ b/data/text/easy_chat/group_sizes.s @@ -1,5 +1,4 @@ - .global gEasyChatGroupSizes -gEasyChatGroupSizes: @ 83DEFFA +gEasyChatGroupSizes:: @ 83DEFFA .byte 202 @ POKEMON .byte 19 @ TRAINER .byte 109 @ STATUS diff --git a/data/text/easy_chat/group_words.s b/data/text/easy_chat/group_words.s index 509c2b290..b45b767b8 100644 --- a/data/text/easy_chat/group_words.s +++ b/data/text/easy_chat/group_words.s @@ -22,8 +22,7 @@ .include "data/text/easy_chat/groups/pokemon_2/words.s" .align 2 - .global gEasyChatGroupWords -gEasyChatGroupWords: @ 83DE0E0 +gEasyChatGroupWords:: @ 83DE0E0 .4byte gEasyChatGroupWords_Pokemon .4byte gEasyChatGroupWords_Trainer .4byte gEasyChatGroupWords_Status diff --git a/data/text/easy_chat/words_by_letter.s b/data/text/easy_chat/words_by_letter.s index ab4d4df44..86fba988e 100644 --- a/data/text/easy_chat/words_by_letter.s +++ b/data/text/easy_chat/words_by_letter.s @@ -1,6 +1,5 @@ .align 1 - .global gEasyChatWordsAlphabetized -gEasyChatWordsAlphabetized: @ 83DE138 +gEasyChatWordsAlphabetized:: @ 83DE138 gEasyChatWordsByLetter_Others: ec_word EXCL ec_word EXCL_EXCL @@ -1892,8 +1891,7 @@ gEasyChatWordsByLetter_Z: gEasyChatWordsByLetter_End: .align 1 - .global gEasyChatWordsByLetter -gEasyChatWordsByLetter: @ 83DEFC2 +gEasyChatWordsByLetter:: @ 83DEFC2 ec_words_by_letter Others ec_words_by_letter A ec_words_by_letter B diff --git a/data/text/gift_ribbon_descriptions.s b/data/text/gift_ribbon_descriptions.s index 184ab6956..798d291b9 100644 --- a/data/text/gift_ribbon_descriptions.s +++ b/data/text/gift_ribbon_descriptions.s @@ -140,8 +140,7 @@ gGiftRibbonDescriptionPart2_LoveForPokemon: .string "love for POKéMON.$" .align 2 - .global gGiftRibbonDescriptions -gGiftRibbonDescriptions: @ 83E158C +gGiftRibbonDescriptions:: @ 83E158C .4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_Champion .4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_Champion .4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_Champion diff --git a/data/text/intro.s b/data/text/intro.s index 8e875eedd..5e8bce042 100644 --- a/data/text/intro.s +++ b/data/text/intro.s @@ -1,5 +1,4 @@ - .global gUnknown_081C6D78 -gUnknown_081C6D78: @ 81C6D78 +gUnknown_081C6D78:: @ 81C6D78 UnknownString_81C6D78: @ 81C6D78 .string "Hi! Sorry to keep you waiting!\p" .string "Welcome to the world of POKéMON!\p" @@ -7,13 +6,11 @@ UnknownString_81C6D78: @ 81C6D78 .string "But everyone calls me the POKéMON\n" .string "PROFESSOR.\p$" - .global gUnknown_081C6DF8 -gUnknown_081C6DF8: @ 81C6DF8 +gUnknown_081C6DF8:: @ 81C6DF8 UnknownString_81C6DF8: @ 81C6DF8 .string "This is what we call a “POKéMON.”$" - .global gUnknown_081C6E1A -gUnknown_081C6E1A: @ 81C6E1A +gUnknown_081C6E1A:: @ 81C6E1A UnknownString_81C6E1A: @ 81C6E1A .string "This world is widely inhabited by\n" .string "creatures known as POKéMON.\p" @@ -30,38 +27,32 @@ UnknownString_81C6E1A: @ 81C6E1A .string "I’ve been undertaking research.\l" .string "That’s what I do.\p$" - .global gUnknown_081C6FCB -gUnknown_081C6FCB: @ 81C6FCB +gUnknown_081C6FCB:: @ 81C6FCB UnknownString_81C6FCB: @ 81C6FCB .string "And you are?$" - .global gUnknown_081C6FD8 -gUnknown_081C6FD8: @ 81C6FD8 +gUnknown_081C6FD8:: @ 81C6FD8 UnknownString_81C6FD8: @ 81C6FD8 .string "Are you a boy?\n" .string "Or are you a girl?$" - .global gUnknown_081C6FFA -gUnknown_081C6FFA: @ 81C6FFA +gUnknown_081C6FFA:: @ 81C6FFA UnknownString_81C6FFA: @ 81C6FFA .string "All right.\n" .string "What’s your name?$" - .global gUnknown_081C7017 -gUnknown_081C7017: @ 81C7017 +gUnknown_081C7017:: @ 81C7017 UnknownString_81C7017: @ 81C7017 .string "So it’s {PLAYER}{KUN}?$" - .global gUnknown_081C7025 -gUnknown_081C7025: @ 81C7025 +gUnknown_081C7025:: @ 81C7025 UnknownString_81C7025: @ 81C7025 .string "Ah, okay!\p" .string "You’re {PLAYER}{KUN} who’s moving to my\n" .string "hometown of LITTLEROOT.\l" .string "I get it now!$" - .global gUnknown_081C7074 -gUnknown_081C7074: @ 81C7074 +gUnknown_081C7074:: @ 81C7074 UnknownString_81C7074: @ 81C7074 .string "All right, are you ready?\p" .string "Your very own adventure is about\n" diff --git a/data/text/move_descriptions.s b/data/text/move_descriptions.s index 26fb81d3b..29e325ad7 100644 --- a/data/text/move_descriptions.s +++ b/data/text/move_descriptions.s @@ -1415,8 +1415,7 @@ gMoveDescription_PsychoBoost: @ 83C099D .string "but sharply lowers SP. ATK.$" .align 2 - .global gMoveDescriptions -gMoveDescriptions: @ 83C09D8 +gMoveDescriptions:: @ 83C09D8 .4byte gMoveDescription_Pound .4byte gMoveDescription_KarateChop .4byte gMoveDescription_DoubleSlap diff --git a/data/text/move_names.s b/data/text/move_names.s index 45eb20c2a..e4895646c 100644 --- a/data/text/move_names.s +++ b/data/text/move_names.s @@ -1,5 +1,4 @@ - .global gMoveNames -gMoveNames: @ 81F8320 +gMoveNames:: @ 81F8320 .string "-$$$$$$$", 13 .string "POUND$", 13 .string "KARATE CHOP$", 13 diff --git a/data/text/nature_names.s b/data/text/nature_names.s index aed2b1372..f191f80ba 100644 --- a/data/text/nature_names.s +++ b/data/text/nature_names.s @@ -74,8 +74,7 @@ gNatureName_Quirky: @ 83C0FFB .string "QUIRKY$" .align 2 - .global gNatureNames -gNatureNames: @ 83C1004 +gNatureNames:: @ 83C1004 .4byte gNatureName_Hardy .4byte gNatureName_Lonely .4byte gNatureName_Brave diff --git a/data/text/pokedex_rating.s b/data/text/pokedex_rating.s index 5191a363f..d816799b6 100644 --- a/data/text/pokedex_rating.s +++ b/data/text/pokedex_rating.s @@ -12,131 +12,110 @@ Route101_Text_1C44DC:: @ 81C44DC .string "So, you’ve seen {STR_VAR_1} POKéMON,\n" .string "and you’ve caught {STR_VAR_2} POKéMON...$" - .global gUnknown_081C4520 -gUnknown_081C4520: @ 81C4520 +gUnknown_081C4520:: @ 81C4520 UnknownString_81C4520: @ 81C4520 .string "You should go into grassy areas more\n" .string "and look for POKéMON more carefully.$" - .global gUnknown_081C456A -gUnknown_081C456A: @ 81C456A +gUnknown_081C456A:: @ 81C456A UnknownString_81C456A: @ 81C456A .string "I guess you’re getting the hang of it.\n" .string "But, it gets harder from here.$" - .global gUnknown_081C45B0 -gUnknown_081C45B0: @ 81C45B0 +gUnknown_081C45B0:: @ 81C45B0 UnknownString_81C45B0: @ 81C45B0 .string "Some POKéMON only appear in certain\n" .string "areas. You’ll need to be persistent.$" - .global gUnknown_081C45F9 -gUnknown_081C45F9: @ 81C45F9 +gUnknown_081C45F9:: @ 81C45F9 UnknownString_81C45F9: @ 81C45F9 .string "Well, it could use more quantity, but\n" .string "this is looking more like a POKéDEX now.$" - .global gUnknown_081C4648 -gUnknown_081C4648: @ 81C4648 +gUnknown_081C4648:: @ 81C4648 UnknownString_81C4648: @ 81C4648 .string "This is coming along pretty good.\n" .string "Keep up the effort.$" - .global gUnknown_081C467E -gUnknown_081C467E: @ 81C467E +gUnknown_081C467E:: @ 81C467E UnknownString_81C467E: @ 81C467E .string "Are you using any RODS?\n" .string "There are many POKéMON in the sea.$" - .global gUnknown_081C46B9 -gUnknown_081C46B9: @ 81C46B9 +gUnknown_081C46B9:: @ 81C46B9 UnknownString_81C46B9: @ 81C46B9 .string "Instead of just catching POKéMON,\n" .string "how about making them evolve, too?$" - .global gUnknown_081C46FE -gUnknown_081C46FE: @ 81C46FE +gUnknown_081C46FE:: @ 81C46FE UnknownString_81C46FE: @ 81C46FE .string "This is going to be a fantastic POKéDEX.\n" .string "That’s the feeling I’m getting.$" - .global gUnknown_081C4747 -gUnknown_081C4747: @ 81C4747 +gUnknown_081C4747:: @ 81C4747 UnknownString_81C4747: @ 81C4747 .string "You’ve collected this many...\n" .string "Your talent is remarkable!$" - .global gUnknown_081C4780 -gUnknown_081C4780: @ 81C4780 +gUnknown_081C4780:: @ 81C4780 UnknownString_81C4780: @ 81C4780 .string "Have you visited the SAFARI ZONE?\p" .string "I hear there are some POKéMON that\n" .string "can only be caught there.$" - .global gUnknown_081C47DF -gUnknown_081C47DF: @ 81C47DF +gUnknown_081C47DF:: @ 81C47DF UnknownString_81C47DF: @ 81C47DF .string "You’ve finally reached the 100-kind\n" .string "mark. This is an impressive POKéDEX!$" - .global gUnknown_081C4828 -gUnknown_081C4828: @ 81C4828 +gUnknown_081C4828:: @ 81C4828 UnknownString_81C4828: @ 81C4828 .string "There might be POKéMON that can be\n" .string "found using ROCK SMASH.$" - .global gUnknown_081C4863 -gUnknown_081C4863: @ 81C4863 +gUnknown_081C4863:: @ 81C4863 UnknownString_81C4863: @ 81C4863 .string "You should get some more POKéMON by\n" .string "trading with others.$" - .global gUnknown_081C489C -gUnknown_081C489C: @ 81C489C +gUnknown_081C489C:: @ 81C489C UnknownString_81C489C: @ 81C489C .string "I’ve heard of POKéMON that evolve when\n" .string "they come to fully love their TRAINERS.$" - .global gUnknown_081C48EB -gUnknown_081C48EB: @ 81C48EB +gUnknown_081C48EB:: @ 81C48EB UnknownString_81C48EB: @ 81C48EB .string "I had no idea that there were so many\n" .string "POKéMON species in the HOENN region.$" - .global gUnknown_081C4936 -gUnknown_081C4936: @ 81C4936 +gUnknown_081C4936:: @ 81C4936 UnknownString_81C4936: @ 81C4936 .string "On occasion, some POKéMON appear in\n" .string "large numbers like wild outbreaks.\l" .string "Don’t miss opportunities like those.$" - .global gUnknown_081C49A2 -gUnknown_081C49A2: @ 81C49A2 +gUnknown_081C49A2:: @ 81C49A2 UnknownString_81C49A2: @ 81C49A2 .string "One can get a very good idea about the\n" .string "POKéMON of the HOENN region by looking\l" .string "through your POKéDEX.$" - .global gUnknown_081C4A06 -gUnknown_081C4A06: @ 81C4A06 +gUnknown_081C4A06:: @ 81C4A06 UnknownString_81C4A06: @ 81C4A06 .string "I’d say you already qualify as a POKéMON\n" .string "PROFESSOR, and a good one, too!$" - .global gUnknown_081C4A4F -gUnknown_081C4A4F: @ 81C4A4F +gUnknown_081C4A4F:: @ 81C4A4F UnknownString_81C4A4F: @ 81C4A4F .string "With a POKéDEX this complete, you’re\n" .string "a real professional at this!$" - .global gUnknown_081C4A91 -gUnknown_081C4A91: @ 81C4A91 +gUnknown_081C4A91:: @ 81C4A91 UnknownString_81C4A91: @ 81C4A91 .string "You’re very close to completing this\n" .string "POKéDEX. I can feel it in my bones!$" - .global gUnknown_081C4ADA -gUnknown_081C4ADA: @ 81C4ADA +gUnknown_081C4ADA:: @ 81C4ADA UnknownString_81C4ADA: @ 81C4ADA .string "Congratulations!\n" .string "Your POKéDEX is complete!$" diff --git a/data/text/ribbon_descriptions.s b/data/text/ribbon_descriptions.s index cd01103c4..ebbfc34ff 100644 --- a/data/text/ribbon_descriptions.s +++ b/data/text/ribbon_descriptions.s @@ -56,8 +56,7 @@ gRibbonDescriptionPart2_Effort: .string "being a hard worker.$" .align 2 - .global gRibbonDescriptions -gRibbonDescriptions: @ 83E113C +gRibbonDescriptions:: @ 83E113C .4byte gRibbonDescriptionPart1_Champion, gRibbonDescriptionPart2_Champion .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_NormalRank .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_SuperRank diff --git a/data/text/roulette.s b/data/text/roulette.s index 03ce9f8a9..f228cf779 100644 --- a/data/text/roulette.s +++ b/data/text/roulette.s @@ -1,64 +1,52 @@ - .global gUnknown_081C40DF -gUnknown_081C40DF: @ 81C40DF +gUnknown_081C40DF:: @ 81C40DF UnknownString_81C40DF: @ 81C40DF .string "The minimum wager at this table is {STR_VAR_1}. \n" .string "Do you want to play?$" - .global gUnknown_081C411C -gUnknown_081C411C: @ 81C411C +gUnknown_081C411C:: @ 81C411C UnknownString_81C411C: @ 81C411C .string "You don’t have enough COINS.$" - .global gUnknown_081C4139 -gUnknown_081C4139: @ 81C4139 +gUnknown_081C4139:: @ 81C4139 UnknownString_81C4139: @ 81C4139 .string "Special rate table right now!$" - .global gUnknown_081C4157 -gUnknown_081C4157: @ 81C4157 +gUnknown_081C4157:: @ 81C4157 .string "Place your wager with the + Control Pad,\n" .string "then press the A Button.$" - .global gUnknown_081C4199 -gUnknown_081C4199: @ 81C4199 +gUnknown_081C4199:: @ 81C4199 UnknownString_81C4199: @ 81C4199 .string "It’s a hit!$" - .global gUnknown_081C41A5 -gUnknown_081C41A5: @ 81C41A5 +gUnknown_081C41A5:: @ 81C41A5 UnknownString_81C41A5: @ 81C41A5 .string "Jackpot!$" - .global gUnknown_081C41AE -gUnknown_081C41AE: @ 81C41AE +gUnknown_081C41AE:: @ 81C41AE UnknownString_81C41AE: @ 81C41AE .string "Nothing doing!$" - .global gUnknown_081C41BD -gUnknown_081C41BD: @ 81C41BD +gUnknown_081C41BD:: @ 81C41BD UnknownString_81C41BD: @ 81C41BD .string "You’ve won {STR_VAR_1} COINS!$" - .global gUnknown_081C41D2 -gUnknown_081C41D2: @ 81C41D2 +gUnknown_081C41D2:: @ 81C41D2 UnknownString_81C41D2: @ 81C41D2 .string "No COINS left...$" - .global gUnknown_081C41E3 -gUnknown_081C41E3: @ 81C41E3 +gUnknown_081C41E3:: @ 81C41E3 UnknownString_81C41E3: @ 81C41E3 .string "Keep playing?$" - .global gUnknown_081C41F1 -gUnknown_081C41F1: @ 81C41F1 +gUnknown_081C41F1:: @ 81C41F1 UnknownString_81C41F1: @ 81C41F1 .string "The ROULETTE board will be cleared.$" UnknownString_81C4215: @ 81C4215 .string "You don’t have a COIN CASE.$" - .global gUnknown_081C4231 -gUnknown_081C4231: @ 81C4231 +gUnknown_081C4231:: @ 81C4231 UnknownString_81C4231: @ 81C4231 .string "Your COIN CASE is full!\n" .string "Coins can be exchanged for prizes.$" diff --git a/data/text/save.s b/data/text/save.s index d99b6667b..4f6f2a09a 100644 --- a/data/text/save.s +++ b/data/text/save.s @@ -1,30 +1,25 @@ - .global gUnknown_081C6C85 -gUnknown_081C6C85: @ 81C6C85 +gUnknown_081C6C85:: @ 81C6C85 UnknownString_81C6C85: @ 81C6C85 .string "Would you like to save the game?$" - .global gUnknown_081C6CA6 -gUnknown_081C6CA6: @ 81C6CA6 +gUnknown_081C6CA6:: @ 81C6CA6 UnknownString_81C6CA6: @ 81C6CA6 .string "There is already a saved file.\n" .string "Is it okay to overwrite it?$" - .global gUnknown_081C6CE1 -gUnknown_081C6CE1: @ 81C6CE1 +gUnknown_081C6CE1:: @ 81C6CE1 BattleTower_BattleRoom_Text_1C6CE1:: @ 81C6CE1 .string "SAVING...\n" .string "DON’T TURN OFF THE POWER.$" - .global gUnknown_081C6D05 -gUnknown_081C6D05: @ 81C6D05 +gUnknown_081C6D05:: @ 81C6D05 BattleTower_BattleRoom_Text_1C6D05:: @ 81C6D05 .string "{PLAYER} saved the game.$" UnknownString_81C6D18: @ 81C6D18 .string "Save error...$" - .global gUnknown_081C6D26 -gUnknown_081C6D26: @ 81C6D26 +gUnknown_081C6D26:: @ 81C6D26 UnknownString_81C6D26: @ 81C6D26 .string "There is a different game file that is\n" .string "already saved.\p" diff --git a/data/text/song_names.s b/data/text/song_names.s index be365ac08..29fad36e1 100644 --- a/data/text/song_names.s +++ b/data/text/song_names.s @@ -236,8 +236,7 @@ BGMName_BATTLE30: .string "BATTLE30$" .align 2 - .global gBGMNames -gBGMNames: @ 83D07AC +gBGMNames:: @ 83D07AC .word BGMName_STOP .word BGMName_TETSUJI .word BGMName_FIELD13 @@ -855,8 +854,7 @@ SEName_W063B: .string "W063B$" .align 2 - .global gSENames -gSENames: @ 83D0F78 +gSENames:: @ 83D0F78 .word SEName_STOP .word SEName_KAIFUKU .word SEName_PC_LOGON diff --git a/data/text/species_names.s b/data/text/species_names.s index 055e60d45..8a387eb38 100644 --- a/data/text/species_names.s +++ b/data/text/species_names.s @@ -1,5 +1,4 @@ - .global gSpeciesNames -gSpeciesNames: @ 81F716C +gSpeciesNames:: @ 81F716C .string "??????????$", 11 .string "BULBASAUR$", 11 .string "IVYSAUR$", 11 diff --git a/data/text/trainer_class_names.s b/data/text/trainer_class_names.s index 065c13638..8678a29a6 100644 --- a/data/text/trainer_class_names.s +++ b/data/text/trainer_class_names.s @@ -1,5 +1,4 @@ - .global gTrainerClassNames -gTrainerClassNames: @ 81F0208 +gTrainerClassNames:: @ 81F0208 .string "{PKMN} TRAINER$", 13 .string "{PKMN} TRAINER$", 13 .string "AQUA LEADER$", 13 diff --git a/data/text/trainer_eye_descriptions.s b/data/text/trainer_eye_descriptions.s index 4cab0f5e6..c0b3f2399 100644 --- a/data/text/trainer_eye_descriptions.s +++ b/data/text/trainer_eye_descriptions.s @@ -345,8 +345,7 @@ TrainerEyeDescription_68: .string "I’m still the strongest!$" .align 2 - .global gTrainerEyeDescriptions -gTrainerEyeDescriptions: @ 83E309C +gTrainerEyeDescriptions:: @ 83E309C .4byte TrainerEyeDescription_0 .4byte TrainerEyeDescription_1 .4byte TrainerEyeDescription_2 diff --git a/data/text/type_names.s b/data/text/type_names.s index 2e7bc04a3..83e85e1e1 100644 --- a/data/text/type_names.s +++ b/data/text/type_names.s @@ -1,5 +1,4 @@ - .global gTypeNames -gTypeNames: @ 81F9870 +gTypeNames:: @ 81F9870 .string "NORMAL$", 7 .string "FIGHT$", 7 .string "FLYING$", 7 |