diff --git a/data/menu_indicators.s b/data/menu_indicators.s index debc2cbc8..2c1c2249e 100644 --- a/data/menu_indicators.s +++ b/data/menu_indicators.s @@ -40,9 +40,7 @@ gUnknown_08614274:: @ 8614274 gUnknown_08614278:: @ 8614278 @ replacing .incbin "baserom.gba", 0x00614278, 0x4 .4byte 0x00700000 - -gUnknown_0861427C:: @ 861427C //found a pointer to this. added a new label - .incbin "baserom.gba", 0x61427C, 0x14 + .incbin "baserom.gba", 0x61427C, 0x14 //found a pointer to this. added a new label gUnknown_08614290:: @ 8614290 .incbin "baserom.gba", 0x614290, 0x18 diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 60de34b81..afc9264ac 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -4,31 +4,87 @@ .section .rodata gUnknown_08674AE4:: @ 8674AE4 - .incbin "baserom.gba", 0x674ae4, 0x32 +@ replacing .incbin "baserom.gba", 0x00674ae4, 0x32 +.string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" gUnknown_08674B16:: @ 8674B16 - .incbin "baserom.gba", 0x674b16, 0x2c +@ replacing .incbin "baserom.gba", 0x00674b16, 0x2c +.string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" gUnknown_08674B42:: @ 8674B42 - .incbin "baserom.gba", 0x674b42, 0x28 +@ replacing .incbin "baserom.gba", 0x00674b42, 0x28 +.string "The {STR_VAR_1} BERRY has already been\nobtained.$" gUnknown_08674B6A:: @ 8674B6A - .incbin "baserom.gba", 0x674b6a, 0x34 +@ replacing .incbin "baserom.gba", 0x00674b6a, 0x34 +.string "A special RIBBON was awarded to\nyour party POKéMON.$" gUnknown_08674B9E:: @ 8674B9E - .incbin "baserom.gba", 0x674b9e, 0x36 +@ replacing .incbin "baserom.gba", 0x00674b9e, 0x36 +.string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$" gUnknown_08674BD4:: @ 8674BD4 - .incbin "baserom.gba", 0x674bd4, 0x1c +@ replacing .incbin "baserom.gba", 0x00674bd4, 0x1c +.string "A rare word has been added.$" gUnknown_08674BF0:: @ 8674BF0 - .incbin "baserom.gba", 0x674bf0, 0x12 +@ replacing .incbin "baserom.gba", 0x00674bf0, 0x12 +.string "{STR_VAR_1} was sent over!$" gUnknown_08674C02:: @ 8674C02 - .incbin "baserom.gba", 0x674c02, 0x2f +@ replacing .incbin "baserom.gba", 0x00674c02, 0x2f +.string "Your party is full.\n{STR_VAR_1} could not be sent over.$" gUnknown_08674C31:: @ 8674C31 - .incbin "baserom.gba", 0x674c31, 0x55 +@ replacing .incbin "baserom.gba", 0x00674c31, 0x55 +.string "A new TRAINER has arrived in\nHOENN.$" +.string "A new adversary has arrived in the\nBATTLE TOWER.$" gUnknown_08674C86:: @ 8674C86 - .incbin "baserom.gba", 0x674c86, 0xd5a +@ replacing .incbin "baserom.gba", 0x00674c86, 0xd5a +.string "This data can’t be used in\nthis version.$" +@ replacing .incbin "baserom.gba", 0x00674caf, 0x2e +@ replacing .incbin "baserom.gba", 0x00674caf, 0x2e +.incbin "baserom.gba", 0x00674caf, 0x2e +@ replacing .incbin "baserom.gba", 0x00674cdd, 0x18d +.string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" +@ replacing .incbin "baserom.gba", 0x00674d3d, 0xa1 +.incbin "baserom.gba", 0x00674d3d, 0xa1 +@ replacing .incbin "baserom.gba", 0x00674dde, 0x8c +.string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" +.string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" +@ replacing .incbin "baserom.gba", 0x00674ec1, 0x29 +.incbin "baserom.gba", 0x00674ec1, 0x29 +@ replacing .incbin "baserom.gba", 0x00674eea, 0x14b +.string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" +.string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" +@ replacing .incbin "baserom.gba", 0x0067513c, 0x48 +.incbin "baserom.gba", 0x0067513c, 0x48 +@ replacing .incbin "baserom.gba", 0x00675184, 0x118 +.string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" +.string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" +@ replacing .incbin "baserom.gba", 0x0067533c, 0x6d +.incbin "baserom.gba", 0x0067533c, 0x6d +@ replacing .incbin "baserom.gba", 0x006753a9, 0x5d +.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" +.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +.string "Thank you for using the MYSTERY\nGIFT System.$" +.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +@ replacing .incbin "baserom.gba", 0x0067550b, 0x76 +.incbin "baserom.gba", 0x0067550b, 0x76 +@ replacing .incbin "baserom.gba", 0x00675581, 0x5d +.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" +.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +.string "Thank you for using the MYSTERY\nGIFT System.$" +.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +@ replacing .incbin "baserom.gba", 0x006756e3, 0x25 +.incbin "baserom.gba", 0x006756e3, 0x25 +@ replacing .incbin "baserom.gba", 0x00675708, 0x1d1 +.string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" +.incbin "baserom.gba", 0x006757f4, 0x6d +@ replacing .incbin "baserom.gba", 0x00675861, 0x78 +.string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" +.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +.string "Thank you for using the MYSTERY\nGIFT System.$" +.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +.string " " diff --git a/data/naming_screen.s b/data/naming_screen.s index 8a4e41de1..342597f14 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -157,8 +157,6 @@ gUnknown_0858BFD8:: @ 858BFD8 .4byte 0x858bfc0 .4byte 0x858bfc0 .4byte 0x858bfcc - -gUnknown_0858BFEC:: @ 858BFEC //found a pointer, added a new label .incbin "baserom.gba", 0x58bfec, 0x64 gUnknown_0858C050:: @ 858C050