diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_80DED44.s | 171 | ||||
| -rw-r--r-- | data/data_810AE24.s | 8 | ||||
| -rw-r--r-- | data/text/wonder_mail_2.inc | 248 |
3 files changed, 5 insertions, 422 deletions
diff --git a/data/data_80DED44.s b/data/data_80DED44.s index 0f0884a..5f992f8 100644 --- a/data/data_80DED44.s +++ b/data/data_80DED44.s @@ -1,174 +1,5 @@ .section .rodata - .global gUnknown_80DED48 -gUnknown_80DED48: @ 80DED48 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x04, 0x00 - .byte 0x06, 0x00, 0x05, 0x00 - .byte 0x05, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80DED60 -gUnknown_80DED60: @ 80DED60 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x16, 0x00, 0x07, 0x00 - .byte 0x06, 0x00, 0x05, 0x00 - .byte 0x05, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80DED78 -gUnknown_80DED78: @ 80DED78 - .4byte Confirm_80DED98 - .byte 0x0b, 0x00, 0x00, 0x00 - .4byte Info_80DED90 - .byte 0x0c, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global Info_80DED90 - Info_80DED90: - .string "Info\0" - .align 2,0 - - .global Confirm_80DED98 - Confirm_80DED98: - .string "Confirm\0" - - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80DEDB8 -gUnknown_80DEDB8: @ 80DEDB8 - .4byte SendThankYou_Text - .byte 0x01, 0x00, 0x00, 0x00 - .4byte GetThankYou_Text - .byte 0x02, 0x00, 0x00, 0x00 - .4byte Cancel_80DEDD8 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global Cancel_80DEDD8 - Cancel_80DEDD8: - .string "Cancel\0" - .align 2,0 - - .global GetThankYou_Text - GetThankYou_Text: - .string "Get Thank-You Mail\0" - .align 2,0 - - .global SendThankYou_Text - SendThankYou_Text: - .string "Send Thank-You Mail\0" - .align 2,0 - - .global gUnknown_80DEE08 -gUnknown_80DEE08: @ 80DEE08 - @ Thank You Mail Pelipper Menu - .4byte GameLinkCable_Text - .byte 0x03, 0x00, 0x00, 0x00 - .4byte Password_Text - .byte 0x05, 0x00, 0x00, 0x00 - .4byte Cancel_80DEDD8 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global Password_Text - Password_Text: - .string "Password\0" - .align 2,0 - - .global GameLinkCable_Text - GameLinkCable_Text: - .string "Game Link cable\0" - .align 2,0 - - .global gUnknown_80DEE44 -gUnknown_80DEE44: @ 80DEE44 - @ Game Link Cable Thank-You Mail Menu - .4byte Yes_80DEE5C - .byte 0x07, 0x00, 0x00, 0x00 - .4byte Cancel_80DEDD8 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global Yes_80DEE5C - Yes_80DEE5C: - .string "Yes\0" - .align 2,0 - - .global gUnknown_80DEE60 -gUnknown_80DEE60: @ 80DEE60 - .4byte Yes_80DEE5C - .byte 0x07, 0x00, 0x00, 0x00 - .4byte No_80DEE78 - .byte 0x08, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global No_80DEE78 - No_80DEE78: - .string "No\0" - .align 2,0 - - .global gUnknown_80DEE7C -gUnknown_80DEE7C: @ 80DEE7C - .4byte SendItem_Text - .byte 0x09, 0x00, 0x00, 0x00 - .4byte DontSendItemText - .byte 0x0a, 0x00, 0x00, 0x00 - .4byte Cancel_80DEDD8 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global DontSendItem_Text - DontSendItemText: - .string "Don~27t Send Item\0" - .align 2,0 - - .global SendItem_Text - SendItem_Text: - .string "Send Item\0" - .align 2,0 - - .global gUnknown_80DEEBC -gUnknown_80DEEBC: @ 80DEEBC - .4byte SendWOItem_Text - .byte 0x0a, 0x00, 0x00, 0x00 - .4byte Cancel_80DEDD8 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global SendWOItem_Text - SendWOItem_Text: - .string "Send w/o Item\0" - .align 2,0 - - .global gUnknown_80DEEE4 -gUnknown_80DEEE4: @ 80DEEE4 - .4byte Yes_80DEE5C - .byte 0x07, 0x00, 0x00, 0x00 - .4byte No_80DEE78 - .byte 0x08, 0x00, 0x00, 0x00 - .4byte Cancel_80DEDD8 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - - .include "data/text/wonder_mail_2.inc" - .global gUnknown_80DFBD0 gUnknown_80DFBD0: @ 80DFBD0 .byte 0x00, 0x00, 0x00, 0x00 @@ -192,7 +23,7 @@ gUnknown_80DFBEC: @ 80DFBEC .byte 0x02, 0x00, 0x02, 0x00 .byte 0x18, 0x00, 0x0e, 0x00 .byte 0x0e, 0x00, 0x00, 0x00 - .byte 0xe8, 0xfb, 0x0d, 0x08 + .4byte gUnknown_80DFBE8 .global gUnknown_80DFC04 diff --git a/data/data_810AE24.s b/data/data_810AE24.s index b31809b..a8743e5 100644 --- a/data/data_810AE24.s +++ b/data/data_810AE24.s @@ -1537,7 +1537,7 @@ gUnknown_81161E8: @ 81161E8 .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .4byte CleanFelicityBank - .4byte sub_80163A0 + .4byte FelicityBankCallback .global gUnknown_81161F8 gUnknown_81161F8: @ 81161F8 @@ -1577,9 +1577,9 @@ gUnknown_8116238: @ 8116238 .global gUnknown_8116248 gUnknown_8116248: @ 8116248 .byte 0x01, 0x00, 0x00, 0x00 - .4byte sub_8029B50 - .4byte sub_8029E60 - .4byte sub_8029C98 + .4byte CreateThankYouMailPelipper + .4byte CleanThankYouMailPelipper + .4byte ThankYouMailPelipperCallback .global gUnknown_8116258 gUnknown_8116258: @ 8116258 diff --git a/data/text/wonder_mail_2.inc b/data/text/wonder_mail_2.inc deleted file mode 100644 index b1ee6ce..0000000 --- a/data/text/wonder_mail_2.inc +++ /dev/null @@ -1,248 +0,0 @@ -gUnknown_80DEF04:: @ 80DEF04 - .string " ...Oh?\n" - .string "Something~27s gone wrong.\0" - .align 2, 0 - -gUnknown_80DEF28:: @ 80DEF28 - .string " ...Oh? The number of linked\n" - .string "GBA systems is incorrect.\n" - .string "Please try again from the start.\0" - .align 2, 0 - -gUnknown_80DEF80:: @ 80DEF80 - .string " ...Oh? It looks like your\n" - .string "friend chose a different mode.\n" - .string "Please try again from the start.\0" - .align 2, 0 - -gUnknown_80DEFDC:: @ 80DEFDC - .string " ...Oh? It looks like your\n" - .string "storage space is full. Please clear some\n" - .string "space and try again from the start.\0" - .align 2, 0 - -gUnknown_80DF044:: @ 80DF044 - .string " ...Oh?\n" - .string "I think you~27ve received this mail before.\n" - .string "You can~27t get the same mail twice.\0" - .align 2, 0 - -gUnknown_80DF0A0:: @ 80DF0A0 - .string " ...Oh?\n" - .string "I don~27t think you~27re eligible to receive\n" - .string "this mail.\0" - .align 2, 0 - -gUnknown_80DF0E0:: @ 80DF0E0 - .string " ...Oh?\n" - .string "There is no room to receive new mail.\n" - .string "Please delete some mail and try again.\0" - .align 2, 0 - -gUnknown_80DF138:: @ 80DF138 - .string " ...Oh? Your friend didn~27t\n" - .string "follow through on their side.\n" - .string "Please try again from the start.\0" - .align 2, 0 - -gUnknown_80DF194:: @ 80DF194 - .string " Your #CGThank-You Mail#R\n" - .string "has been sent.\0" - .align 2, 0 - -gUnknown_80DF1C0:: @ 80DF1C0 - .string " ...Oh?\n" - .string "This password appears to be wrong.\n" - .string "Would you like to try again?\0" - .align 2, 0 - -gUnknown_80DF208:: @ 80DF208 - .string " ...Oh? This password doesn~27t\n" - .string "appear to be for a #CGThank-You Mail#R.\0" - .align 2, 0 - -gUnknown_80DF250:: @ 80DF250 - .string ": This is the counter for\n" - .string "#CGThank-You Mail#R.#P" - .string ": Oh~2c hi~2c #CN%s#R.\n" - .string "I~27ve been waiting for you. You wanted me\n" - .string "to process a #CGThank-You Mail#R?#P" - .string ": Let me get on it right away.\0" - .align 2, 0 - -gUnknown_80DF304:: @ 80DF304 - .string " Is it OK to send this\n" - .string "#CGThank-You Mail#R?\0" - .align 2, 0 - -gUnknown_80DF330:: @ 80DF330 - .string " Please choose the\n" - .string "#CGThank-You Mail#R that you want to\n" - .string "send to your friend.\0" - .align 2, 0 - -gUnknown_80DF380:: @ 80DF380 - .string " OK. Please enter the\n" - .string "#CGThank-You Mail password#R.\0" - .align 2, 0 - -gUnknown_80DF3B4:: @ 80DF3B4 - .string " Please give this password\n" - .string "to the friend that rescued your team.#P" - .string " I also must save your\n" - .string "adventure.\0" - .align 2, 0 - -gUnknown_80DF418:: @ 80DF418 - .string " OK~2c here is your\n" - .string "#CGThank-You Mail password#R.\0" - .align 2, 0 - -gUnknown_80DF44C:: @ 80DF44C - .string " I need to save your\n" - .string "adventure.\0" - .align 2, 0 - -gUnknown_80DF46C:: @ 80DF46C - .string " There we go.\n" - .string "I~27m all done.#P" - .string " Doesn~27t it feel great to\n" - .string "be appreciated for doing something good?\n" - .string "Please keep up your rescue work!\0" - .align 2, 0 - -gUnknown_80DF4F4:: @ 80DF4F4 - .string " A #CGThank-You Mail#R has\n" - .string "arrived from your friend for your rescue\n" - .string "mission.\0" - .align 2, 0 - -gUnknown_80DF544:: @ 80DF544 - .string "#+Communicating...\n" - .string "#+Please wait with the power on.\n" - .string "#+To cancel~2c press {B_BUTTON}.\0" - .align 2, 0 - -gUnknown_80DF594:: @ 80DF594 - .string " There. I~27ve sent your\n" - .string "#CGThank-You Mail#R.\n" - .string "I need to save your adventure.\0" - .align 2, 0 - -gUnknown_80DF5E4:: @ 80DF5E4 - .string " Please connect the GBA\n" - .string "systems with a #CGGame Link cable#R.\n" - .string "Is your friend also ready?\0" - .align 2, 0 - -gUnknown_80DF63C:: @ 80DF63C - .string " There~2c all done.\n" - .string "#CN%s#R~2c I hope your friend\n" - .string "appreciates your sense of gratitude.\0" - .align 2, 0 - -gUnknown_80DF694:: @ 80DF694 - .string " The item you~27ve chosen\n" - .string "here can~27t be exchanged later.\n" - .string "Are you certain this item is OK?\0" - .align 2, 0 - -gUnknown_80DF6F0:: @ 80DF6F0 - .string " I~27ve saved your adventure. \0" - .align 2, 0 - -gUnknown_80DF710:: @ 80DF710 - .string " OK~2c please choose\n" - .string "the item to be sent.\0" - .align 2, 0 - -gUnknown_80DF73C:: @ 80DF73C - .string " ...Oh?\n" - .string "Your storage space is empty.\n" - .string "What would you like to do?\0" - .align 2, 0 - -gUnknown_80DF77C:: @ 80DF77C - .string " Would you like to choose\n" - .string "a #CGreward item#R from storage and\n" - .string "send it with your mail?\0" - .align 2, 0 - -gUnknown_80DF7D4:: @ 80DF7D4 - .string " ...Oh?\n" - .string "You~27ve already attached a #CGreward item#R\n" - .string "to this mail.#P" - .string " I~27m sorry~2c but once an item\n" - .string "has been attached to mail~2c it can~27t be\n" - .string "exchanged.\0" - .align 2, 0 - -gUnknown_80DF870:: @ 80DF870 - .string " Would you like to send it\n" - .string "again with the item you chose before?\0" - .align 2, 0 - -gUnknown_80DF8B4:: @ 80DF8B4 - .string " ...Oh?\n" - .string "You don~27t seem to have a #CGThank-You Mail#R.\0" - .align 2, 0 - -gUnknown_80DF8EC:: @ 80DF8EC - .string " Hello.\n" - .string "I handle #CGThank-You Mail#R.\n" - .string "How may I serve you?\0" - .align 2, 0 - -gUnknown_80DF928:: @ 80DF928 - .string " May I help you with\n" - .string "anything else?\0" - .align 2, 0 - -gUnknown_80DF94C:: @ 80DF94C - .string " Please come see me\n" - .string "anytime.\0" - .align 2, 0 - -gUnknown_80DF96C:: @ 80DF96C - .string " How would you like to send\n" - .string "your #CGThank-You Mail#R?\0" - .align 2, 0 - -gUnknown_80DF9A4:: @ 80DF9A4 - .string " How would you like to\n" - .string "receive your friend~27s #CGThank-You Mail#R?\0" - - .string "pksdir0\0" - .align 2, 0 - -gUnknown_80DF9F0:: @ 80DF9F0 - .string "????\0" - .align 2, 0 - -gUnknown_80DF9F8:: @ 80DF9F8 - .string " Oh~2c hello!\n" - .string "Your rescue mission went well~2c didn~27t it?\n" - .string "I wouldn~27t expect any less~2c #CG%s#R!#P" - .string " Well~2c well!\n" - .string "Here is your reward from the Pokémon\n" - .string "Rescue Organization!\0" - .align 2, 0 - -gUnknown_80DFAA8:: @ 80DFAA8 - .string " I hope you will keep on\n" - .string "rescuing your friends in\n" - .string "dire straits.#P" - .string " And now~2c I must save\n" - .string "your adventure.\0" - .align 2, 0 - -gUnknown_80DFB14:: @ 80DFB14 - .string " Oh~2c yes~2c that~27s right.\n" - .string "Please don~27t forget to send an #CGA-OK Mail#R\n" - .string "to the friend you just rescued.#P" - .string " Please give me a shout if\n" - .string "you would like to send #CGA-OK Mail#R.\0" - .align 2, 0 - - .string "pksdir0\0" - .align 2, 0 |