From 9575eba4814cfa96ae863ea2716afecbf2565b71 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 08:52:36 -0400 Subject: start to port mystery gift from emerald --- data/mystery_gift_menu.s | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 data/mystery_gift_menu.s (limited to 'data') diff --git a/data/mystery_gift_menu.s b/data/mystery_gift_menu.s deleted file mode 100644 index 9caee4467..000000000 --- a/data/mystery_gift_menu.s +++ /dev/null @@ -1,14 +0,0 @@ - .section .rodata - .align 2 - -gUnknown_8466D10:: @ 8466D10 - .incbin "baserom.gba", 0x466D10, 0x20 - -gUnknown_8466D30:: @ 8466D30 - .incbin "baserom.gba", 0x466D30, 0x30 - -gUnknown_8466D60:: @ 8466D60 - .incbin "baserom.gba", 0x466D60, 0x10 - -gUnknown_8466D70:: @ 8466D70 - .incbin "baserom.gba", 0x466D70, 0x20 -- cgit v1.2.3 From f95188d887ca8073347f13c56e5e7acf53a75ac2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 10:20:18 -0400 Subject: link_rfu_4 is part of mystery_gift_menu --- data/link_rfu_4.s | 54 ------------------------------------------------ data/mystery_gift_menu.s | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 data/link_rfu_4.s create mode 100644 data/mystery_gift_menu.s (limited to 'data') diff --git a/data/link_rfu_4.s b/data/link_rfu_4.s deleted file mode 100644 index 20f235a80..000000000 --- a/data/link_rfu_4.s +++ /dev/null @@ -1,54 +0,0 @@ - .section .rodata - - .align 2 - -gUnknown_8466D90:: @ 8466D90 - .incbin "baserom.gba", 0x466D90, 0x8 - -gUnknown_8466D98:: @ 8466D98 - .incbin "baserom.gba", 0x466D98, 0x8 - -gUnknown_8466DA0:: @ 8466DA0 - .incbin "baserom.gba", 0x466DA0, 0x8 - -gUnknown_8466DA8:: @ 8466DA8 - .incbin "baserom.gba", 0x466DA8, 0x8 - -gUnknown_8466DB0:: @ 8466DB0 - .incbin "baserom.gba", 0x466DB0, 0x8 - -gUnknown_8466DB8:: @ 8466DB8 - .incbin "baserom.gba", 0x466DB8, 0x8 - -gUnknown_8466DC0:: @ 8466DC0 - .incbin "baserom.gba", 0x466DC0, 0x8 - -gUnknown_8466DC8:: @ 8466DC8 - .incbin "baserom.gba", 0x466DC8, 0x8 - -gUnknown_8466DD0:: @ 8466DD0 - .incbin "baserom.gba", 0x466DD0, 0x18 - -gUnknown_8466DE8:: @ 8466DE8 - .incbin "baserom.gba", 0x466DE8, 0x18 - -gUnknown_8466E00:: @ 8466E00 - .incbin "baserom.gba", 0x466E00, 0x78 - -gUnknown_8466E78:: @ 8466E78 - .incbin "baserom.gba", 0x466E78, 0x18 - -gUnknown_8466E90:: @ 8466E90 - .incbin "baserom.gba", 0x466E90, 0x18 - -gUnknown_8466EA8:: @ 8466EA8 - .incbin "baserom.gba", 0x466EA8, 0x18 - -gUnknown_8466EC0:: @ 8466EC0 - .incbin "baserom.gba", 0x466EC0, 0x28 - -gUnknown_8466EE8:: @ 8466EE8 - .incbin "baserom.gba", 0x466EE8, 0x8 - -gUnknown_8466EF0:: @ 8466EF0 - .incbin "baserom.gba", 0x466EF0, 0x10 diff --git a/data/mystery_gift_menu.s b/data/mystery_gift_menu.s new file mode 100644 index 000000000..20f235a80 --- /dev/null +++ b/data/mystery_gift_menu.s @@ -0,0 +1,54 @@ + .section .rodata + + .align 2 + +gUnknown_8466D90:: @ 8466D90 + .incbin "baserom.gba", 0x466D90, 0x8 + +gUnknown_8466D98:: @ 8466D98 + .incbin "baserom.gba", 0x466D98, 0x8 + +gUnknown_8466DA0:: @ 8466DA0 + .incbin "baserom.gba", 0x466DA0, 0x8 + +gUnknown_8466DA8:: @ 8466DA8 + .incbin "baserom.gba", 0x466DA8, 0x8 + +gUnknown_8466DB0:: @ 8466DB0 + .incbin "baserom.gba", 0x466DB0, 0x8 + +gUnknown_8466DB8:: @ 8466DB8 + .incbin "baserom.gba", 0x466DB8, 0x8 + +gUnknown_8466DC0:: @ 8466DC0 + .incbin "baserom.gba", 0x466DC0, 0x8 + +gUnknown_8466DC8:: @ 8466DC8 + .incbin "baserom.gba", 0x466DC8, 0x8 + +gUnknown_8466DD0:: @ 8466DD0 + .incbin "baserom.gba", 0x466DD0, 0x18 + +gUnknown_8466DE8:: @ 8466DE8 + .incbin "baserom.gba", 0x466DE8, 0x18 + +gUnknown_8466E00:: @ 8466E00 + .incbin "baserom.gba", 0x466E00, 0x78 + +gUnknown_8466E78:: @ 8466E78 + .incbin "baserom.gba", 0x466E78, 0x18 + +gUnknown_8466E90:: @ 8466E90 + .incbin "baserom.gba", 0x466E90, 0x18 + +gUnknown_8466EA8:: @ 8466EA8 + .incbin "baserom.gba", 0x466EA8, 0x18 + +gUnknown_8466EC0:: @ 8466EC0 + .incbin "baserom.gba", 0x466EC0, 0x28 + +gUnknown_8466EE8:: @ 8466EE8 + .incbin "baserom.gba", 0x466EE8, 0x8 + +gUnknown_8466EF0:: @ 8466EF0 + .incbin "baserom.gba", 0x466EF0, 0x10 -- cgit v1.2.3 From 6cebd1f85311b1aa7321eb141521686d21bd091c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 16:52:29 -0400 Subject: through MysteryGift_HandleThreeOptionMenu --- data/mystery_gift_menu.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/mystery_gift_menu.s b/data/mystery_gift_menu.s index 20f235a80..0b7046eb1 100644 --- a/data/mystery_gift_menu.s +++ b/data/mystery_gift_menu.s @@ -11,7 +11,7 @@ gUnknown_8466D98:: @ 8466D98 gUnknown_8466DA0:: @ 8466DA0 .incbin "baserom.gba", 0x466DA0, 0x8 -gUnknown_8466DA8:: @ 8466DA8 +sWindowTemplate_ThreeOptions:: @ 8466DA8 .incbin "baserom.gba", 0x466DA8, 0x8 gUnknown_8466DB0:: @ 8466DB0 @@ -26,13 +26,13 @@ gUnknown_8466DC0:: @ 8466DC0 gUnknown_8466DC8:: @ 8466DC8 .incbin "baserom.gba", 0x466DC8, 0x8 -gUnknown_8466DD0:: @ 8466DD0 +sListMenuItems_CardsOrNews:: @ 8466DD0 .incbin "baserom.gba", 0x466DD0, 0x18 -gUnknown_8466DE8:: @ 8466DE8 +sListMenuItems_WirelessOrFriend:: @ 8466DE8 .incbin "baserom.gba", 0x466DE8, 0x18 -gUnknown_8466E00:: @ 8466E00 +sListMenuTemplate_ThreeOptions:: @ 8466E00 .incbin "baserom.gba", 0x466E00, 0x78 gUnknown_8466E78:: @ 8466E78 @@ -47,8 +47,8 @@ gUnknown_8466EA8:: @ 8466EA8 gUnknown_8466EC0:: @ 8466EC0 .incbin "baserom.gba", 0x466EC0, 0x28 -gUnknown_8466EE8:: @ 8466EE8 +sMG_Ereader_TextColor_1:: @ 8466EE8 .incbin "baserom.gba", 0x466EE8, 0x8 -gUnknown_8466EF0:: @ 8466EF0 +sMG_Ereader_TextColor_2:: @ 8466EF0 .incbin "baserom.gba", 0x466EF0, 0x10 -- cgit v1.2.3 From d3057e7ae686750f561a6b23552a072f53dd8f63 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 17:44:25 -0400 Subject: through HandleLoadWonderCardOrNews --- data/data_83FECCC.s | 4 ++-- data/mystery_gift_menu.s | 22 +++++++++++----------- data/specials.inc | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'data') diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 8fb1d4533..dae35f9b3 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -2516,10 +2516,10 @@ gUnknown_841EA3F:: @ 841EA3F gUnknown_841EA6F:: @ 841EA6F .incbin "baserom.gba", 0x41EA6F, 0x17 -gUnknown_841EA86:: @ 841EA86 +gText_WhatToDoWithCards:: @ 841EA86 .incbin "baserom.gba", 0x41EA86, 0x31 -gUnknown_841EAB7:: @ 841EAB7 +gText_WhatToDoWithNews:: @ 841EAB7 .incbin "baserom.gba", 0x41EAB7, 0x30 gUnknown_841EAE7:: @ 841EAE7 diff --git a/data/mystery_gift_menu.s b/data/mystery_gift_menu.s index 0b7046eb1..7f891e2e5 100644 --- a/data/mystery_gift_menu.s +++ b/data/mystery_gift_menu.s @@ -2,28 +2,28 @@ .align 2 -gUnknown_8466D90:: @ 8466D90 +sWindowTemplate_PromptYesOrNo_Width28:: @ 8466D90 .incbin "baserom.gba", 0x466D90, 0x8 -gUnknown_8466D98:: @ 8466D98 +sWindowTemplate_PromptYesOrNo_Width20:: @ 8466D98 .incbin "baserom.gba", 0x466D98, 0x8 -gUnknown_8466DA0:: @ 8466DA0 +sMysteryGiftMenuWindowTemplate:: @ 8466DA0 .incbin "baserom.gba", 0x466DA0, 0x8 sWindowTemplate_ThreeOptions:: @ 8466DA8 .incbin "baserom.gba", 0x466DA8, 0x8 -gUnknown_8466DB0:: @ 8466DB0 +sWindowTemplate_YesNoBox:: @ 8466DB0 .incbin "baserom.gba", 0x466DB0, 0x8 -gUnknown_8466DB8:: @ 8466DB8 +sWindowTemplate_7by8:: @ 8466DB8 .incbin "baserom.gba", 0x466DB8, 0x8 -gUnknown_8466DC0:: @ 8466DC0 +sWindowTemplate_7by6:: @ 8466DC0 .incbin "baserom.gba", 0x466DC0, 0x8 -gUnknown_8466DC8:: @ 8466DC8 +sWindowTemplate_7by4:: @ 8466DC8 .incbin "baserom.gba", 0x466DC8, 0x8 sListMenuItems_CardsOrNews:: @ 8466DD0 @@ -35,16 +35,16 @@ sListMenuItems_WirelessOrFriend:: @ 8466DE8 sListMenuTemplate_ThreeOptions:: @ 8466E00 .incbin "baserom.gba", 0x466E00, 0x78 -gUnknown_8466E78:: @ 8466E78 +sListMenu_ReceiveSendToss:: @ 8466E78 .incbin "baserom.gba", 0x466E78, 0x18 -gUnknown_8466E90:: @ 8466E90 +sListMenu_ReceiveToss:: @ 8466E90 .incbin "baserom.gba", 0x466E90, 0x18 -gUnknown_8466EA8:: @ 8466EA8 +sListMenu_ReceiveSend:: @ 8466EA8 .incbin "baserom.gba", 0x466EA8, 0x18 -gUnknown_8466EC0:: @ 8466EC0 +sListMenu_Receive:: @ 8466EC0 .incbin "baserom.gba", 0x466EC0, 0x28 sMG_Ereader_TextColor_1:: @ 8466EE8 diff --git a/data/specials.inc b/data/specials.inc index f3c71d1bd..cb39cae1e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -393,7 +393,7 @@ gSpecials:: @ 815FD60 def_special sub_812B220 def_special sub_812B234 def_special sub_812B248 - def_special sub_8143FC8 + def_special ValidateReceivedWonderNews def_special sub_810B810 def_special sub_811999C def_special sp182_move_string -- cgit v1.2.3 From 76a421f6f1787c013e8f8ba4403f5b995c648c41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 20:35:26 -0400 Subject: Port data from emerald --- data/data_83FECCC.s | 52 ++++++++++++++++++++++++++++++++++------------ data/mystery_gift_menu.s | 54 ------------------------------------------------ 2 files changed, 39 insertions(+), 67 deletions(-) delete mode 100644 data/mystery_gift_menu.s (limited to 'data') 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 -- cgit v1.2.3 From 7b4e2ec05b269b2fa8b73ecf94bae1e63965fb43 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 26 Apr 2019 08:51:05 -0400 Subject: through mevent_message --- data/data_83FECCC.s | 44 ++++++++++++++++++++++---------------------- data/specials.inc | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'data') diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 203b1ee9d..32e49ea60 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -2464,10 +2464,10 @@ gUnknown_841E794:: @ 841E794 gUnknown_841E7A3:: @ 841E7A3 .incbin "baserom.gba", 0x41E7A3, 0x19 -gUnknown_841E7BC:: @ 841E7BC +gText_CommunicationError:: @ 841E7BC .incbin "baserom.gba", 0x41E7BC, 0x15 -gUnknown_841E7D1:: @ 841E7D1 +gText_CommunicationCanceled:: @ 841E7D1 .incbin "baserom.gba", 0x41E7D1, 0x21 gUnknown_841E7F2:: @ 841E7F2 @@ -2476,46 +2476,46 @@ gUnknown_841E7F2:: @ 841E7F2 gUnknown_841E823:: @ 841E823 .incbin "baserom.gba", 0x41E823, 0x43 -gUnknown_841E866:: @ 841E866 +gText_WonderCardReceivedFrom:: @ 841E866 .incbin "baserom.gba", 0x41E866, 0x29 -gUnknown_841E88F:: @ 841E88F +gText_WonderNewsReceivedFrom:: @ 841E88F .incbin "baserom.gba", 0x41E88F, 0x2E -gUnknown_841E8BD:: @ 841E8BD +gText_WonderCardReceived:: @ 841E8BD .incbin "baserom.gba", 0x41E8BD, 0x25 -gUnknown_841E8E2:: @ 841E8E2 +gText_WonderNewsReceived:: @ 841E8E2 .incbin "baserom.gba", 0x41E8E2, 0x2A -gUnknown_841E90C:: @ 841E90C +gText_NewStampReceived:: @ 841E90C .incbin "baserom.gba", 0x41E90C, 0x1F -gUnknown_841E92B:: @ 841E92B +gText_NewTrainerReceived:: @ 841E92B .incbin "baserom.gba", 0x41E92B, 0x1B -gUnknown_841E946:: @ 841E946 +gText_AlreadyHadCard:: @ 841E946 .incbin "baserom.gba", 0x41E946, 0x22 -gUnknown_841E968:: @ 841E968 +gText_AlreadyHadNews:: @ 841E968 .incbin "baserom.gba", 0x41E968, 0x27 -gUnknown_841E98F:: @ 841E98F +gText_AlreadyHadStamp:: @ 841E98F .incbin "baserom.gba", 0x41E98F, 0x1C -gUnknown_841E9AB:: @ 841E9AB +gText_NoMoreRoomForStamps:: @ 841E9AB .incbin "baserom.gba", 0x41E9AB, 0x28 -gUnknown_841E9D3:: @ 841E9D3 +gText_RecordUploadedViaWireless:: @ 841E9D3 .incbin "baserom.gba", 0x41E9D3, 0x3A -gUnknown_841EA0D:: @ 841EA0D +gText_CantAcceptCardFromTrainer:: @ 841EA0D .incbin "baserom.gba", 0x41EA0D, 0x32 -gUnknown_841EA3F:: @ 841EA3F +gText_CantAcceptNewsFromTrainer:: @ 841EA3F .incbin "baserom.gba", 0x41EA3F, 0x30 -gUnknown_841EA6F:: @ 841EA6F +gText_NothingSentOver:: @ 841EA6F .incbin "baserom.gba", 0x41EA6F, 0x17 gText_WhatToDoWithCards:: @ 841EA86 @@ -2557,25 +2557,25 @@ gUnknown_841EC40:: @ 841EC40 gUnknown_841EC6A:: @ 841EC6A .incbin "baserom.gba", 0x41EC6A, 0x2F -gUnknown_841EC99:: @ 841EC99 +gText_IfThrowAwayCardEventWontHappen:: @ 841EC99 .incbin "baserom.gba", 0x41EC99, 0x3A -gUnknown_841ECD3:: @ 841ECD3 +gText_OkayToDiscardNews:: @ 841ECD3 .incbin "baserom.gba", 0x41ECD3, 0x26 gUnknown_841ECF9:: @ 841ECF9 .incbin "baserom.gba", 0x41ECF9, 0x36 -gUnknown_841ED2F:: @ 841ED2F +gText_DataWillBeSaved:: @ 841ED2F .incbin "baserom.gba", 0x41ED2F, 0x21 -gUnknown_841ED50:: @ 841ED50 +gText_SaveCompletedPressA:: @ 841ED50 .incbin "baserom.gba", 0x41ED50, 0x2B -gUnknown_841ED7B:: @ 841ED7B +gText_WonderCardThrownAway:: @ 841ED7B .incbin "baserom.gba", 0x41ED7B, 0x21 -gUnknown_841ED9C:: @ 841ED9C +gText_WonderNewsThrownAway:: @ 841ED9C .incbin "baserom.gba", 0x41ED9C, 0x21 gText_MysteryGift:: @ 841EDBD diff --git a/data/specials.inc b/data/specials.inc index cb39cae1e..6af1938e7 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -393,7 +393,7 @@ gSpecials:: @ 815FD60 def_special sub_812B220 def_special sub_812B234 def_special sub_812B248 - def_special ValidateReceivedWonderNews + def_special ValidateReceivedWonderCard def_special sub_810B810 def_special sub_811999C def_special sp182_move_string -- cgit v1.2.3 From 274151836b44d960ab357d861a4d79602a8722d5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 26 Apr 2019 12:49:08 -0400 Subject: Finish mystery_gift_menu.c --- data/data_83FECCC.s | 40 ++++++++++++++++++++-------------------- data/specials.inc | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'data') diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 32e49ea60..211e435ef 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -2446,22 +2446,22 @@ gText_ReadNewsThatArrived:: @ 841E669 gText_ReturnToTitle:: @ 841E685 .string "Return to the title screen.$" -gUnknown_841E6A1:: @ 841E6A1 +gText_DontHaveCardNewOneInput:: @ 841E6A1 .incbin "baserom.gba", 0x41E6A1, 0x3B -gUnknown_841E6DC:: @ 841E6DC +gText_DontHaveNewsNewOneInput:: @ 841E6DC .incbin "baserom.gba", 0x41E6DC, 0x3B -gUnknown_841E717:: @ 841E717 +gText_WhereShouldCardBeAccessed:: @ 841E717 .incbin "baserom.gba", 0x41E717, 0x2A -gUnknown_841E741:: @ 841E741 +gText_WhereShouldNewsBeAccessed:: @ 841E741 .incbin "baserom.gba", 0x41E741, 0x53 -gUnknown_841E794:: @ 841E794 +gText_Communicating:: @ 841E794 .incbin "baserom.gba", 0x41E794, 0xF -gUnknown_841E7A3:: @ 841E7A3 +gText_CommunicationCompleted:: @ 841E7A3 .incbin "baserom.gba", 0x41E7A3, 0x19 gText_CommunicationError:: @ 841E7BC @@ -2470,10 +2470,10 @@ gText_CommunicationError:: @ 841E7BC gText_CommunicationCanceled:: @ 841E7D1 .incbin "baserom.gba", 0x41E7D1, 0x21 -gUnknown_841E7F2:: @ 841E7F2 +gText_ThrowAwayWonderCard:: @ 841E7F2 .incbin "baserom.gba", 0x41E7F2, 0x31 -gUnknown_841E823:: @ 841E823 +gText_HaventReceivedCardsGift:: @ 841E823 .incbin "baserom.gba", 0x41E823, 0x43 gText_WonderCardReceivedFrom:: @ 841E866 @@ -2524,37 +2524,37 @@ gText_WhatToDoWithCards:: @ 841EA86 gText_WhatToDoWithNews:: @ 841EAB7 .incbin "baserom.gba", 0x41EAB7, 0x30 -gUnknown_841EAE7:: @ 841EAE7 +gText_SendingWonderCard:: @ 841EAE7 .incbin "baserom.gba", 0x41EAE7, 0x1A -gUnknown_841EB01:: @ 841EB01 +gText_SendingWonderNews:: @ 841EB01 .incbin "baserom.gba", 0x41EB01, 0x1F -gUnknown_841EB20:: @ 841EB20 +gText_WonderCardSentTo:: @ 841EB20 .incbin "baserom.gba", 0x41EB20, 0x26 -gUnknown_841EB46:: @ 841EB46 +gText_WonderNewsSentTo:: @ 841EB46 .incbin "baserom.gba", 0x41EB46, 0x2B -gUnknown_841EB71:: @ 841EB71 +gText_StampSentTo:: @ 841EB71 .incbin "baserom.gba", 0x41EB71, 0x1D -gUnknown_841EB8E:: @ 841EB8E +gText_GiftSentTo:: @ 841EB8E .incbin "baserom.gba", 0x41EB8E, 0x1C -gUnknown_841EBAA:: @ 841EBAA +gText_OtherTrainerHasCard:: @ 841EBAA .incbin "baserom.gba", 0x41EBAA, 0x34 -gUnknown_841EBDE:: @ 841EBDE +gText_OtherTrainerHasNews:: @ 841EBDE .incbin "baserom.gba", 0x41EBDE, 0x34 -gUnknown_841EC12:: @ 841EC12 +gText_OtherTrainerHasStamp:: @ 841EC12 .incbin "baserom.gba", 0x41EC12, 0x2E -gUnknown_841EC40:: @ 841EC40 +gText_OtherTrainerCanceled:: @ 841EC40 .incbin "baserom.gba", 0x41EC40, 0x2A -gUnknown_841EC6A:: @ 841EC6A +gText_CantSendGiftToTrainer:: @ 841EC6A .incbin "baserom.gba", 0x41EC6A, 0x2F gText_IfThrowAwayCardEventWontHappen:: @ 841EC99 @@ -2563,7 +2563,7 @@ gText_IfThrowAwayCardEventWontHappen:: @ 841EC99 gText_OkayToDiscardNews:: @ 841ECD3 .incbin "baserom.gba", 0x41ECD3, 0x26 -gUnknown_841ECF9:: @ 841ECF9 +gText_HaventReceivedGiftOkayToDiscard:: @ 841ECF9 .incbin "baserom.gba", 0x41ECF9, 0x36 gText_DataWillBeSaved:: @ 841ED2F diff --git a/data/specials.inc b/data/specials.inc index 6af1938e7..a610fcd6f 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -40,7 +40,7 @@ gSpecials:: @ 815FD60 def_special sub_8081064 def_special sub_80810CC def_special sub_80810F4 - def_special sub_80098B8 + def_special CloseLink def_special sub_80819C8 def_special sub_8081978 def_special sub_80819B8 -- cgit v1.2.3