diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/data_83FECCC.s | 52 | ||||
-rw-r--r-- | data/mystery_gift_menu.s | 54 |
2 files changed, 39 insertions, 67 deletions
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index dae35f9b3..203b1ee9d 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -644,7 +644,7 @@ gUnknown_8415F3D:: @ 8415F3D gUnknown_8415F4A:: @ 8415F4A .incbin "baserom.gba", 0x415F4A, 0x7 -gUnknown_8415F51:: @ 8415F51 +gText_PickOKExit:: @ 8415F51 .incbin "baserom.gba", 0x415F51, 0x15 gUnknown_8415F66:: @ 8415F66 @@ -2252,10 +2252,10 @@ gUnknown_841D18D:: @ 841D18D gUnknown_841D198:: @ 841D198 .incbin "baserom.gba", 0x41D198, 0xCB8 -gUnknown_841DE50:: @ 841DE50 +gJPText_MysteryGift:: @ 841DE50 .string "$" -gUnknown_841DE51:: @ 841DE51 +gJPText_DecideStop:: @ 841DE51 .string "$" gUnknown_841DE52:: @ 841DE52 @@ -2432,16 +2432,18 @@ gFameCheckerBillName:: @ 841E5F3 gFameCheckerMrFujiName:: @ 841E5F8 .string "FUJI$" -gUnknown_841E5FD:: @ 841E5FD - .string "A variety of events will be imported\nover Wireless Communication.$" +gText_VarietyOfEventsImportedWireless:: @ 841E5FD + .string "A variety of events will be imported\n" + .string "over Wireless Communication.$" -gUnknown_841E63F:: @ 841E63F - .string "Read the WONDER CARDS in your\npossession.$" +gText_WonderCardsInPossession:: @ 841E63F + .string "Read the WONDER CARDS in your\n" + .string "possession.$" -gUnknown_841E669:: @ 841E669 +gText_ReadNewsThatArrived:: @ 841E669 .string "Read the NEWS that arrived.$" -gUnknown_841E685:: @ 841E685 +gText_ReturnToTitle:: @ 841E685 .string "Return to the title screen.$" gUnknown_841E6A1:: @ 841E6A1 @@ -2576,11 +2578,35 @@ gUnknown_841ED7B:: @ 841ED7B gUnknown_841ED9C:: @ 841ED9C .incbin "baserom.gba", 0x41ED9C, 0x21 -gUnknown_841EDBD:: @ 841EDBD - .incbin "baserom.gba", 0x41EDBD, 0xD +gText_MysteryGift:: @ 841EDBD + .string "MYSTERY GIFT$" -gUnknown_841EDCA:: @ 841EDCA - .incbin "baserom.gba", 0x41EDCA, 0x61 +gText_PickOKCancel:: @ 841EDCA + .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}EXIT$" + +gText_WonderCards:: + .string "WONDER CARDS$" + +gText_WonderNews:: + .string "WONDER NEWS$" + +gText_WirelessCommunication:: + .string "WIRELESS COMMUNICATION$" + +gText_Friend2:: + .string "FRIEND$" + +gText_Exit3:: + .string "EXIT$" + +gText_Receive:: + .string "RECEIVE$" + +gText_Send:: + .string "SEND$" + +gText_Toss:: + .string "TOSS$" gUnknown_841EE2B:: @ 841EE2B .incbin "baserom.gba", 0x41EE2B, 0x17 diff --git a/data/mystery_gift_menu.s b/data/mystery_gift_menu.s deleted file mode 100644 index 7f891e2e5..000000000 --- a/data/mystery_gift_menu.s +++ /dev/null @@ -1,54 +0,0 @@ - .section .rodata - - .align 2 - -sWindowTemplate_PromptYesOrNo_Width28:: @ 8466D90 - .incbin "baserom.gba", 0x466D90, 0x8 - -sWindowTemplate_PromptYesOrNo_Width20:: @ 8466D98 - .incbin "baserom.gba", 0x466D98, 0x8 - -sMysteryGiftMenuWindowTemplate:: @ 8466DA0 - .incbin "baserom.gba", 0x466DA0, 0x8 - -sWindowTemplate_ThreeOptions:: @ 8466DA8 - .incbin "baserom.gba", 0x466DA8, 0x8 - -sWindowTemplate_YesNoBox:: @ 8466DB0 - .incbin "baserom.gba", 0x466DB0, 0x8 - -sWindowTemplate_7by8:: @ 8466DB8 - .incbin "baserom.gba", 0x466DB8, 0x8 - -sWindowTemplate_7by6:: @ 8466DC0 - .incbin "baserom.gba", 0x466DC0, 0x8 - -sWindowTemplate_7by4:: @ 8466DC8 - .incbin "baserom.gba", 0x466DC8, 0x8 - -sListMenuItems_CardsOrNews:: @ 8466DD0 - .incbin "baserom.gba", 0x466DD0, 0x18 - -sListMenuItems_WirelessOrFriend:: @ 8466DE8 - .incbin "baserom.gba", 0x466DE8, 0x18 - -sListMenuTemplate_ThreeOptions:: @ 8466E00 - .incbin "baserom.gba", 0x466E00, 0x78 - -sListMenu_ReceiveSendToss:: @ 8466E78 - .incbin "baserom.gba", 0x466E78, 0x18 - -sListMenu_ReceiveToss:: @ 8466E90 - .incbin "baserom.gba", 0x466E90, 0x18 - -sListMenu_ReceiveSend:: @ 8466EA8 - .incbin "baserom.gba", 0x466EA8, 0x18 - -sListMenu_Receive:: @ 8466EC0 - .incbin "baserom.gba", 0x466EC0, 0x28 - -sMG_Ereader_TextColor_1:: @ 8466EE8 - .incbin "baserom.gba", 0x466EE8, 0x8 - -sMG_Ereader_TextColor_2:: @ 8466EF0 - .incbin "baserom.gba", 0x466EF0, 0x10 |