Remove most static wram addresses. Use labels instead.

For unknown addresses, use "w<address>".

Label overleads are still an issue.
This commit is contained in:
yenatch 2014-05-26 14:04:56 -07:00
parent 52ba96f5f4
commit 40c17c906b
290 changed files with 8262 additions and 7759 deletions

View file

@ -56,7 +56,7 @@ _BillThankYouText:: ; 8d3f5 (23:53f5)
_SSTicketReceivedText:: ; 8d499 (23:5499)
text $52, " received"
line "an @"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_SSTicketNoRoomText:: ; 8d4b0 (23:54b0)

View file

@ -14,7 +14,7 @@ _DaisyOfferMapText::
_GotMapText::
text $52," got a"
line "@"
TX_RAM $CF4B
TX_RAM wcf4b
text "!@@"
_DaisyBagFullText::

View file

@ -42,7 +42,7 @@ _TM41PreText:: ; a5afd (29:5afd)
_ReceivedTM41Text:: ; a5b5a (29:5b5a)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM41ExplanationText:: ; a5b6e (29:5b6e)

View file

@ -10,7 +10,7 @@ _TM18PreReceiveText:: ; 9c814 (27:4814)
_ReceivedTM18Text:: ; 9c85a (27:485a)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM18ExplanationText:: ; 9c86e (27:486e)

View file

@ -16,13 +16,13 @@ _CeladonMartRoofText_484f3:: ; 9cbcc (27:4bcc)
_CeladonMartRoofText_484f9:: ; 9cc06 (27:4c06)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_CeladonMartRoofText_484fe:: ; 9cc1a (27:4c1a)
db $0
para "@"
TX_RAM $cf4b
TX_RAM wcf4b
text " contains"
line "ICE BEAM!"
@ -42,13 +42,13 @@ _CeladonMartRoofText_48504:: ; 9cc5a (27:4c5a)
_CeladonMartRoofText_4850a:: ; 9cc91 (27:4c91)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_CeladonMartRoofText_4850f:: ; 9cca5 (27:4ca5)
db $0
para "@"
TX_RAM $cf4b
TX_RAM wcf4b
text " contains"
line "ROCK SLIDE!"
@ -123,7 +123,7 @@ _VendingMachineText4:: ; 9ce96 (27:4e96)
done
_VendingMachineText5:: ; 9ceaf (27:4eaf)
TX_RAM $cf4b
TX_RAM wcf4b
db $0
line "popped out!"
done

View file

@ -44,7 +44,7 @@ _CeladonDinerText_491a7:: ; 9e003 (27:6003)
_ReceivedCoinCaseText:: ; 9e07a (27:607a)
text $52, " received"
line "a @"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_CoinCaseNoRoomText:: ; 9e090 (27:6090)

View file

@ -64,7 +64,7 @@ _CeladonGymText9:: ; 9d481 (27:5481)
_ReceivedTM21Text:: ; 9d50c (27:550c)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM21ExplanationText:: ; 9d520 (27:5520)

View file

@ -96,7 +96,7 @@ _GaryText_76120:: ; 863ca (21:63ca)
line "much since you"
cont "first left with"
cont "@"
TX_RAM $cd6d
TX_RAM wcd6d
text "!"
para $52, ", you have"

View file

@ -44,7 +44,7 @@ _BlaineBadgeText:: ; a0946 (28:4946)
_ReceivedTM38Text:: ; a09a8 (28:49a8)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM38ExplanationText:: ; a09bc (28:49bc)

View file

@ -30,7 +30,7 @@ _Lab4Text_75dd5:: ; a118d (28:518d)
line "back to life!"
para "It was @"
TX_RAM $cf4b
TX_RAM wcf4b
db $0
line "like I think!"
prompt
@ -38,12 +38,12 @@ _Lab4Text_75dd5:: ; a118d (28:518d)
_Lab4Text_610ae:: ; a11d6 (28:51d6)
text "Oh! That is"
line "@"
TX_RAM $cd6d
TX_RAM wcd6d
text "!"
para "It is fossil of"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text ", a"
cont "#MON that is"
cont "already extinct!"
@ -60,7 +60,7 @@ _Lab4Text_610b3:: ; a1259 (28:5259)
para $52, " handed"
line "over @"
TX_RAM $cd6d
TX_RAM wcd6d
text "!"
prompt

View file

@ -9,7 +9,7 @@ _TM35PreReceiveText:: ; a0f09 (28:4f09)
_ReceivedTM35Text:: ; a0f48 (28:4f48)
text $52, " received "
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM35ExplanationText:: ; a0f5d (28:4f5d)

View file

@ -29,7 +29,7 @@ _TM31PreReceiveText:: ; a1636 (28:5636)
_ReceivedTM31Text:: ; a1675 (28:5675)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM31ExplanationText1:: ; a1689 (28:5689)

View file

@ -13,7 +13,7 @@ _DayCareMText_56414:: ; 8abd4 (22:6bd4)
_DayCareMText_56419:: ; 8abf0 (22:6bf0)
text "Fine, I'll look"
line "after @"
TX_RAM $cd6d
TX_RAM wcd6d
db $0
cont "for a while."
prompt
@ -25,7 +25,7 @@ _DayCareMText_5641e:: ; 8ac19 (22:6c19)
_DayCareMText_56423:: ; 8ac32 (22:6c32)
text "Your @"
TX_RAM $cd6d
TX_RAM wcd6d
db $0
line "has grown a lot!"
@ -33,7 +33,7 @@ _DayCareMText_56423:: ; 8ac32 (22:6c32)
line "grown by @"
DayCareMText_8ac67:: ; 8ac67 (22:6c67)
TX_NUM $cd3e,$1,$3
TX_NUM wTrainerEngageDistance,$1,$3
text "!"
para "Aren't I great?"
@ -57,7 +57,7 @@ _DayCareMText_5642d:: ; 8acae (22:6cae)
_DayCareMText_56432:: ; 8acc1 (22:6cc1)
text "Back already?"
line "Your @"
TX_RAM $cd6d
TX_RAM wcd6d
db $0
cont "needs some more"
cont "time with me."

View file

@ -85,7 +85,7 @@ FanClubChairStoryText::
ReceivedBikeVoucherText::
text $52, " received"
line "a @"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
ExplainBikeVoucherText::

View file

@ -19,7 +19,7 @@ _FuchsiaHouse3Text_561c2:: ; a06e8 (28:46e8)
para $52, " received"
line "a @"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_FuchsiaHouse3Text_56212:: ; a0737 (28:4737)

View file

@ -27,7 +27,7 @@ _UnnamedText_75590:: ; a0069 (28:4069)
_ReceivedTM06Text:: ; a00eb (28:40eb)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM06ExplanationText:: ; a00ff (28:40ff)

View file

@ -48,7 +48,7 @@ _LavenderHouse1Text_1d94c:: ; 99f97 (26:5f97)
_ReceivedFluteText:: ; 99ffb (26:5ffb)
text $52, " received"
line "a @"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_FluteExplanationText:: ; 9a011 (26:6011)

View file

@ -8,7 +8,7 @@ _TM29PreReceiveText:: ; a24fe (28:64fe)
_ReceivedTM29Text:: ; a252a (28:652a)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM29ExplanationText:: ; a253e (28:653e)

View file

@ -11,7 +11,7 @@ _MtMoon3Text_49f64:: ; 80979 (20:4979)
_MtMoon3Text_49f6f:: ; 80995 (20:4995)
text $52, " got the"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_MtMoon3Text_49f7f:: ; 809a8 (20:49a8)

View file

@ -14,7 +14,7 @@ _NameRaterText_1dab8:: ; 9a361 (26:6361)
prompt
_NameRaterText_1dabd:: ; 9a37f (26:637f)
TX_RAM $cd6d
TX_RAM wcd6d
text ", is it?"
line "That is a decent"
cont "nickname!"
@ -35,7 +35,7 @@ _NameRaterText_1dac7:: ; 9a404 (26:6404)
text "OK! This #MON"
line "has been renamed"
cont "@"
TX_RAM $cee9
TX_RAM wHPBarMaxHP
text "!"
para "That's a better"
@ -48,14 +48,14 @@ _NameRaterText_1dacc:: ; 9a44c (26:644c)
done
_NameRaterText_1dad1:: ; 9a46b (26:646b)
TX_RAM $cd6d
TX_RAM wcd6d
text ", is it?"
line "That is a truly"
cont "impeccable name!"
para "Take good care of"
line "@"
TX_RAM $cd6d
TX_RAM wcd6d
text "!"
done

View file

@ -51,7 +51,7 @@ _OaksLabMonEnergeticText:: ; 94e80 (25:4e80)
_OaksLabReceivedMonText:: ; 94ea0 (25:4ea0)
text $52, " received"
line "a @"
TX_RAM $cd6d
TX_RAM wcd6d
text "!@@"
_OaksLabLastMonText:: ; 94eb6 (25:4eb6)
@ -240,7 +240,7 @@ _OaksLabRivalPickingMonText:: ; 95444 (25:5444)
_OaksLabRivalReceivedMonText:: ; 95461 (25:5461)
text $53, " received"
line "a @"
TX_RAM $cd6d
TX_RAM wcd6d
text "!@@"
_OaksLabRivalChallengeText:: ; 95477 (25:5477)

View file

@ -15,7 +15,7 @@ _Route1ViridianMartSampleText:: ; 8d5bf (23:55bf)
_Route1Text_1cae8:: ; 8d643 (23:5643)
text $52, " got"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_Route1Text_1caee:: ; 8d652 (23:5652)

View file

@ -18,7 +18,7 @@ _Route12HouseText_564c5:: ; 8ca00 (23:4a00)
para $52, " received"
line "a @"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_Route12HouseText_564ca:: ; 8ca4f (23:4a4f)

View file

@ -2,12 +2,12 @@ _VictoryRoadGuardText1:: ; 9261e (24:661e)
text "You can pass here"
line "only if you have"
cont "the @"
TX_RAM $cd6d
TX_RAM wcd6d
text "!"
para "You don't have the"
line "@"
TX_RAM $cd6d
TX_RAM wcd6d
text " yet!"
para "You have to have"
@ -18,12 +18,12 @@ _VictoryRoadGuardText2:: ; 92696 (24:6696)
text "You can pass here"
line "only if you have"
cont "the @"
TX_RAM $cd6d
TX_RAM wcd6d
text "!"
para "Oh! That is the"
line "@"
TX_RAM $cd6d
TX_RAM wcd6d
text "!@@"
_VictoryRoadGuardText_513a3:: ; 926dd (24:66dd)

View file

@ -12,7 +12,7 @@ _Route24Text_51515:: ; 92755 (24:6755)
_Route24Text_5151a:: ; 92779 (24:6779)
text $52, " received"
line "a @"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_Route24Text_51521:: ; 9278f (24:678f)

View file

@ -17,7 +17,7 @@ _SecretHouseText_4a350:: ; 858a4 (21:58a4)
_ReceivedHM03Text:: ; 85943 (21:5943)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_HM03ExplanationText:: ; 85957 (21:5957)

View file

@ -22,7 +22,7 @@ _SilphCoPresidentText:: ; 84e9b (21:4e9b)
_ReceivedSilphCoMasterBallText:: ; 84f63 (21:4f63)
text $52, " got a"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_SilphCo10Text_6231c:: ; 84f74 (21:4f74)

View file

@ -12,7 +12,7 @@ _SilphCo2Text_59ded:: ; 82454 (20:6454)
_ReceivedTM36Text:: ; 824ba (20:64ba)
text $52, " got"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM36ExplanationText:: ; 824c9 (20:64c9)

View file

@ -33,7 +33,7 @@ _ReceivingHM01Text:: ; 81347 (20:5347)
_ReceivedHM01Text:: ; 8140d (20:540d)
text $52, " got"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_SSAnne7Text_61932:: ; 8141c (20:541c)

View file

@ -18,7 +18,7 @@ _VermilionHouse2Text_560b6:: ; 9c554 (27:4554)
para $52, " received"
line "an @"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_VermilionHouse2Text_560bb:: ; 9c5a4 (27:45a4)

View file

@ -26,7 +26,7 @@ _VermilionGymText_5cb77:: ; 9c069 (27:4069)
_ReceivedTM24Text:: ; 9c0e0 (27:40e0)
text $52, " received "
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_TM24ExplanationText:: ; 9c0f5 (27:40f5)

View file

@ -44,7 +44,7 @@ _WardenThankYouText:: ; 9e51b (27:651b)
_ReceivedHM04Text:: ; 9e5a2 (27:65a2)
text $52, " received"
line "@"
TX_RAM $cf4b
TX_RAM wcf4b
text "!@@"
_HM04ExplanationText:: ; 9e5b6 (27:65b6)