From f0df833f37a20745ded2b13240c692fe20d2dc1c Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 29 Dec 2017 13:34:24 -0600 Subject: [PATCH] Extract easy chat and pokemon animation --- asm/easy_chat.s | 2 +- asm/pokemon_animation.s | 2 +- data/battle_link_817C95C.s | 174 ++++++++ data/data2b.s | 2 - data/data2c.s | 2 - data/data_860A4AC.s | 50 --- data/easy_chat.s | 430 +++++++++++++++++--- data/graphics.s | 118 +++--- data/pokemon_animation.s | 240 +++++++++++ data/strings.s | 112 ++--- graphics/misc/8597C1C.pal | 7 + graphics/misc/8597C24.pal | 9 + graphics/misc/interview.pal | 19 + graphics/misc/interview_arrow.png | Bin 0 -> 160 bytes graphics/misc/interview_buttons.png | Bin 0 -> 214 bytes graphics/misc/interview_frame.png | Bin 0 -> 192 bytes graphics/misc/interview_frame_2.png | Bin 0 -> 260 bytes graphics/misc/interview_frame_green.pal | 19 + graphics/misc/interview_frame_orange.pal | 19 + graphics/misc/interview_triangle_cursor.png | Bin 0 -> 147 bytes ld_script.txt | 3 +- 21 files changed, 994 insertions(+), 214 deletions(-) create mode 100644 data/battle_link_817C95C.s delete mode 100644 data/data_860A4AC.s create mode 100644 data/pokemon_animation.s create mode 100644 graphics/misc/8597C1C.pal create mode 100644 graphics/misc/8597C24.pal create mode 100644 graphics/misc/interview.pal create mode 100644 graphics/misc/interview_arrow.png create mode 100644 graphics/misc/interview_buttons.png create mode 100644 graphics/misc/interview_frame.png create mode 100644 graphics/misc/interview_frame_2.png create mode 100644 graphics/misc/interview_frame_green.pal create mode 100644 graphics/misc/interview_frame_orange.pal create mode 100644 graphics/misc/interview_triangle_cursor.png diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 3a359c9fa..f65c379c2 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -6075,7 +6075,7 @@ _0811D19C: b _0811D1BC .pool _0811D1A8: - ldr r0, =gText_CombineTwoWordsOrPhrases + ldr r0, =gText_CombineTwoWordsOrPhrases3 str r0, [sp, 0xC] b _0811D1BC .pool diff --git a/asm/pokemon_animation.s b/asm/pokemon_animation.s index 870e658f7..a625f8511 100644 --- a/asm/pokemon_animation.s +++ b/asm/pokemon_animation.s @@ -333,7 +333,7 @@ sub_817F670: @ 817F670 movs r1, 0x3 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, =gUnknown_0860AD68 + ldr r0, =gSpriteAffineAnimTable_860AD68 str r0, [r4, 0x10] ldr r0, =gUnknown_03001274 ldr r0, [r0] diff --git a/data/battle_link_817C95C.s b/data/battle_link_817C95C.s new file mode 100644 index 000000000..24f70c79c --- /dev/null +++ b/data/battle_link_817C95C.s @@ -0,0 +1,174 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 1 +gUnknown_0860A4AC:: @ 860A4AC + .2byte 0x0044, 0x005a, 0x0075, 0x00f3, 0x0020, 0x00af, 0x00b3, 0x00ed, 0x0149, 0x0108, 0x011c, 0x0143, 0x008a, 0x0137, 0x00ad, 0x00dc + .2byte 0x000c, 0x00da, 0x00d8, 0x011b, 0x00d9, 0x0117, 0xffff, 0x00de, 0x0095, 0xffff + + .align 1 +gUnknown_0860A4E0:: @ 860A4E0 + .2byte 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0000, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001 + .2byte 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, 0x0005, 0x0004, 0x0005, 0x0001, 0x0003, 0x0001 + .2byte 0x0003, 0x0005, 0x0001, 0x0007, 0x0001, 0x0007, 0x0007, 0x0001, 0x0005, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001 + .2byte 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001 + .2byte 0x0001, 0x0007, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0004 + .2byte 0x0005, 0x0002, 0x0004, 0x0001, 0x0004, 0x0001, 0x0007, 0x0002, 0x0001, 0x0005, 0x0007, 0x0003, 0x0003, 0x0004, 0x0003, 0x0003 + .2byte 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0005, 0x0001, 0x0001, 0x0004, 0x0005, 0x0003, 0x0001, 0x0002, 0x0001, 0x0005 + .2byte 0x0004, 0x0003, 0x0006, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001, 0x0001, 0x0007 + .2byte 0x0002, 0x0002, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0001, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0007, 0x0007 + .2byte 0x0006, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0003, 0x0001, 0x0001, 0x0004, 0x0004 + .2byte 0x0003, 0x0003, 0x0003, 0x0001, 0x0004, 0x0007, 0x0007, 0x0005, 0x0007, 0x0001, 0x0007, 0x0001, 0x0005, 0x0000, 0x0004, 0x0004 + .2byte 0x0004, 0x0004, 0x0004, 0x0002, 0x0002, 0x0006, 0x0003, 0x0006, 0x0004, 0x0004, 0x0002, 0x0005, 0x0002, 0x0001, 0x0001, 0x0006 + .2byte 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0006, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003, 0x0001, 0x0001, 0x0001 + .2byte 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003 + + .align 1 +gUnknown_0860A68C:: @ 860A68C + .2byte 0x0004, 0xfffd, 0xfffa + + .align 1 +gUnknown_0860A692:: @ 860A692 + .2byte 0x0004, 0x0004, 0x0006, 0x0006, 0x0007, 0x0006, 0x0002 + + .align 1 +gUnknown_0860A6A0:: @ 860A6A0 + .2byte 0x0091, 0x0003, 0x00fa, 0x0003, 0x00be, 0x0003, 0x0080, 0x0003, 0x006e, 0x0003, 0x0098, 0x0003, 0x0143, 0x0003, 0x0123, 0x0003 + .2byte 0x007f, 0x0003, 0x014a, 0x0003, 0x0039, 0x0003, 0x0134, 0x0003, 0x0038, 0x0003, 0x003d, 0x0003, 0x015a, 0x0000, 0x0037, 0x0003 + .2byte 0x0160, 0x0003, 0x0137, 0x0003, 0x0057, 0x0003, 0x004c, 0xfffc, 0x013b, 0xfffc, 0x00ac, 0xfffc, 0x0035, 0xfffc, 0x00dd, 0xfffc + .2byte 0x007e, 0xfffc, 0x0101, 0xfffc, 0x0034, 0xfffc, 0x0133, 0xfffc, 0x012b, 0xfffc, 0x011c, 0xfffc, 0x0053, 0xfffc, 0x0007, 0xfffc + .2byte 0x004c, 0xfffc, 0xffff, 0x0000 + + .align 1 +gUnknown_0860A728:: @ 860A728 + .2byte 0x013b, 0x0003, 0x00ac, 0x0003, 0x0035, 0x0003, 0x00dd, 0x0003, 0x007e, 0x0003, 0x0101, 0x0003, 0x0034, 0x0003, 0x0133, 0x0003 + .2byte 0x012b, 0x0003, 0x011c, 0x0003, 0x0053, 0x0003, 0x0007, 0x0003, 0x004c, 0x0005, 0x00eb, 0x0003, 0x00ea, 0x0003, 0x00ec, 0x0003 + .2byte 0x0137, 0x0003, 0xffff, 0x0000 + + .align 1 +gUnknown_0860A770:: @ 860A770 + .2byte 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000 + + .align 1 +gUnknown_0860A77C:: @ 860A77C + .2byte 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000 + + .align 1 +gUnknown_0860A788:: @ 860A788 + .2byte 0x0055, 0x0003, 0x0009, 0x0003, 0x00d1, 0x0003, 0x0054, 0x0003, 0x00c0, 0x0003, 0x015f, 0x0003, 0x0056, 0x0000, 0x0057, 0x0003 + .2byte 0x0158, 0x0003, 0xffff, 0x0000 + + .align 1 +gUnknown_0860A7B0:: @ 860A7B0 + .2byte 0x0005, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003 + + .align 1 +gUnknown_0860A7BE:: @ 860A7BE + .2byte 0x0005, 0x0005, 0x0005, 0x0005, 0x0005 + + .align 1 +gUnknown_0860A7C8:: @ 860A7C8 + .2byte 0x0004 + + .align 1 +gUnknown_0860A7CA:: @ 860A7CA + .2byte 0x0005 + + .align 1 +gUnknown_0860A7CC:: @ 860A7CC + .2byte 0x0005 + + .align 1 +gUnknown_0860A7CE:: @ 860A7CE + .2byte 0x0003 + + .align 1 +gUnknown_0860A7D0:: @ 860A7D0 + .2byte 0x0003 + + .align 1 +gUnknown_0860A7D2:: @ 860A7D2 + .2byte 0x0004 + + .align 1 +gUnknown_0860A7D4:: @ 860A7D4 + .2byte 0x0003 + + .align 1 +gUnknown_0860A7D6:: @ 860A7D6 + .2byte 0x0006 + + .align 1 +gUnknown_0860A7D8:: @ 860A7D8 + .2byte 0x0006 + + .align 1 +gUnknown_0860A7DA:: @ 860A7DA + .2byte 0x0006 + + .align 1 +gUnknown_0860A7DC:: @ 860A7DC + .2byte 0x0004 + + .align 1 +gUnknown_0860A7DE:: @ 860A7DE + .2byte 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002 + + .align 1 +gUnknown_0860A7EC:: @ 860A7EC + .2byte 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004 + + .align 1 +gUnknown_0860A7FA:: @ 860A7FA + .2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff + + .align 1 +gUnknown_0860A808:: @ 860A808 + .2byte 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002 + + .align 1 +gUnknown_0860A816:: @ 860A816 + .2byte 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004 + + .align 1 +gUnknown_0860A824:: @ 860A824 + .2byte 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe + + .align 2 +gUnknown_0860A834:: @ 860A834 + .4byte gUnknown_0860A4E0 + .4byte gUnknown_0860A68C + .4byte gUnknown_0860A692 + .4byte gUnknown_0860A6A0 + .4byte gUnknown_0860A728 + .4byte gUnknown_0860A770 + .4byte gUnknown_0860A77C + .4byte gUnknown_0860A788 + .4byte gUnknown_0860A7B0 + .4byte gUnknown_0860A7BE + .4byte gUnknown_0860A7C8 + .4byte gUnknown_0860A7CA + .4byte gUnknown_0860A7CC + .4byte gUnknown_0860A7CE + .4byte gUnknown_0860A7D0 + .4byte gUnknown_0860A7D2 + .4byte gUnknown_0860A7D4 + .4byte gUnknown_0860A7D6 + .4byte gUnknown_0860A7D8 + .4byte gUnknown_0860A7DA + .4byte gUnknown_0860A7DA + .4byte gUnknown_0860A7DC + .4byte gUnknown_0860A7DE + .4byte gUnknown_0860A7EC + .4byte gUnknown_0860A7FA + .4byte gUnknown_0860A808 + .4byte gUnknown_0860A816 + .4byte gUnknown_0860A824 + + .align 1 +gUnknown_0860A8A4:: @ 860A8A4 + .2byte 0x0097, 0x00b2, 0x00bc, 0x008c, 0x00b4, 0x00b5, 0x0093, 0x006a, 0x0091, 0x005e, 0x0030, 0x002a, 0x0095, 0x001c, 0x001d, 0x0064 + .2byte 0x0060, 0xffff + diff --git a/data/data2b.s b/data/data2b.s index 74e13cc7f..1400b31d3 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -1,5 +1,3 @@ -@ the second big chunk of data - #include "constants/items.h" #include "constants/moves.h" #include "constants/species.h" diff --git a/data/data2c.s b/data/data2c.s index 904009254..86418ce62 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -1,5 +1,3 @@ -@ the second big chunk of data - #include "constants/abilities.h" #include "constants/items.h" #include "constants/moves.h" diff --git a/data/data_860A4AC.s b/data/data_860A4AC.s deleted file mode 100644 index bac17590d..000000000 --- a/data/data_860A4AC.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0860A4AC:: @ 860A4AC - .incbin "baserom.gba", 0x60a4ac, 0x388 - -gUnknown_0860A834:: @ 860A834 - .incbin "baserom.gba", 0x60a834, 0x70 - -gUnknown_0860A8A4:: @ 860A8A4 - .incbin "baserom.gba", 0x60a8a4, 0x24 - -gUnknown_0860A8C8:: @ 860A8C8 - .incbin "baserom.gba", 0x60a8c8, 0x19c - -gUnknown_0860AA64:: @ 860AA64 - .incbin "baserom.gba", 0x60aa64, 0x1c - -gUnknown_0860AA80:: @ 860AA80 - .incbin "baserom.gba", 0x60aa80, 0x8 - -gUnknown_0860AA88:: @ 860AA88 - .incbin "baserom.gba", 0x60aa88, 0x25c - -gUnknown_0860ACE4:: @ 860ACE4 - .incbin "baserom.gba", 0x60ace4, 0x4b - -gUnknown_0860AD2F:: @ 860AD2F - .incbin "baserom.gba", 0x60ad2f, 0x39 - -gUnknown_0860AD68:: @ 860AD68 - .incbin "baserom.gba", 0x60ad68, 0x8 - -gUnknown_0860AD70:: @ 860AD70 - .incbin "baserom.gba", 0x60ad70, 0x1e - -gUnknown_0860AD8E:: @ 860AD8E - .incbin "baserom.gba", 0x60ad8e, 0x30 - -gUnknown_0860ADBE:: @ 860ADBE - .incbin "baserom.gba", 0x60adbe, 0xbe - -gUnknown_0860AE7C:: @ 860AE7C - .incbin "baserom.gba", 0x60ae7c, 0xc - -gUnknown_0860AE88:: @ 860AE88 - .incbin "baserom.gba", 0x60ae88, 0x8 - diff --git a/data/easy_chat.s b/data/easy_chat.s index 3894cc13d..09d33e660 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -5,13 +5,207 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_08597530:: @ 8597530 - .incbin "baserom.gba", 0x597530, 0x20 + .4byte 0x0000001a + .4byte sub_811A8CC + .4byte 0x00000019 + .4byte sub_811A8F0 + .4byte 0x0000001c + .4byte sub_811A914 + .4byte 0x0000001b + .4byte sub_811A938 gUnknown_08597550:: @ 8597550 - .incbin "baserom.gba", 0x597550, 0x1f8 + .byte 0x00, 0x02, 0x02, 0x00 + + .align 2 + .4byte gText_Profile + .4byte gText_CombineFourWordsOrPhrases + .4byte gText_AndMakeYourProfile + .4byte gText_YourProfile + .4byte gText_IsAsShownOkay + + .byte 0x01, 0x02, 0x03, 0x01 + + .align 2 + .4byte gText_AtTheBattlesStart + .4byte gText_CombineSixWordsOrPhrases + .4byte gText_AndMakeAMessage + .4byte gText_YourFeelingAtTheBattlesStart + .4byte gText_IsAsShownOkay + + .byte 0x02, 0x02, 0x03, 0x01 + + .align 2 + .4byte gText_UponWinningABattle + .4byte gText_CombineSixWordsOrPhrases + .4byte gText_AndMakeAMessage + .4byte gText_WhatYouSayIfYouWin + .4byte gText_IsAsShownOkay + + .byte 0x03, 0x02, 0x03, 0x01 + + .align 2 + .4byte gText_UponLosingABattle + .4byte gText_CombineSixWordsOrPhrases + .4byte gText_AndMakeAMessage + .4byte gText_WhatYouSayIfYouLose + .4byte gText_IsAsShownOkay + + .byte 0x04, 0x02, 0x05, 0x02 + + .align 2 + .4byte NULL + .4byte gText_CombineNineWordsOrPhrases + .4byte gText_AndMakeAMessage2 + .4byte gText_TheMailMessage + .4byte gText_IsAsShownOkay + + .byte 0x05, 0x02, 0x02, 0x05 + + .align 2 + .4byte gText_Interview + .4byte gText_CombineFourWordsOrPhrases + .4byte gText_LetsReplyToTheInterview + .4byte gText_TheAnswer + .4byte gText_IsAsShownOkay + + .byte 0x06, 0x02, 0x03, 0x01 + + .align 2 + .4byte gText_TheBardsSong + .4byte gText_ChangeJustOneWordOrPhrase + .4byte gText_AndImproveTheBardsSong + .4byte gText_TheBardsSong2 + .4byte gText_IsAsShownOkay + + .byte 0x07, 0x01, 0x01, 0x04 + + .align 2 + .4byte gText_Interview + .4byte gText_FindWordsThatDescribeYour + .4byte gText_FeelingsRightNow + .4byte gText_TheAnswer + .4byte gText_IsAsShownOkay + + .byte 0x09, 0x02, 0x01, 0x03 + + .align 2 + .4byte gText_WhatsHipAndHappening + .4byte gText_CombineTwoWordsOrPhrases + .4byte gText_AndMakeATrendySaying + .4byte gText_TheTrendySaying + .4byte gText_IsAsShownOkay + + .byte 0x10, 0x02, 0x05, 0x87 + + .align 2 + .4byte NULL + .4byte gText_AfterYouHaveReadTheQuiz + .4byte gText_QuestionPressTheAButton + .4byte NULL + .4byte NULL + + .byte 0x0f, 0x01, 0x01, 0x86 + + .align 2 + .4byte gText_TheQuizAnswerIs + .4byte gText_OutOfTheListedChoices + .4byte gText_SelectTheAnswerToTheQuiz + .4byte gText_TheAnswerColon + .4byte gText_IsAsShownOkay + + .byte 0x11, 0x02, 0x05, 0x88 + + .align 2 + .4byte NULL + .4byte gText_CombineNineWordsOrPhrases + .4byte gText_AndCreateAQuiz + .4byte gText_IsThisQuizOK + .4byte NULL + + .byte 0x12, 0x01, 0x01, 0x86 + + .align 2 + .4byte gText_TheQuizAnswerIs + .4byte gText_PickAWordOrPhraseAnd + .4byte gText_SetTheQuizAnswer + .4byte gText_IsThisQuizOK + .4byte NULL + + .byte 0x06, 0x02, 0x03, 0x01 + + .align 2 + .4byte gText_TheBardsSong + .4byte gText_ChangeJustOneWordOrPhrase + .4byte gText_AndImproveTheBardsSong + .4byte gText_TheBardsSong2 + .4byte gText_IsAsShownOkay + + .byte 0x13, 0x02, 0x03, 0x01 + + .align 2 + .4byte gText_ApprenticesPhrase + .4byte gText_FindWordsWhichFit + .4byte gText_TheTrainersImage + .4byte gText_ApprenticePhrase + .4byte gText_IsAsShownOkay + + .byte 0x0d, 0x02, 0x01, 0x03 + + .align 2 + .4byte gText_GoodSaying + .4byte gText_CombineTwoWordsOrPhrases2 + .4byte gText_ToTeachHerAGoodSaying + .4byte gText_TheAnswer + .4byte gText_IsAsShownOkay + + .byte 0x0a, 0x01, 0x01, 0x04 + + .align 2 + .4byte gText_Interview + .4byte gText_FindWordsThatDescribeYour + .4byte gText_FeelingsRightNow + .4byte gText_TheAnswer + .4byte gText_IsAsShownOkay + + .byte 0x0c, 0x01, 0x01, 0x04 + + .align 2 + .4byte gText_Interview + .4byte gText_FindWordsThatDescribeYour + .4byte gText_FeelingsRightNow + .4byte gText_TheAnswer + .4byte gText_IsAsShownOkay + + .byte 0x0b, 0x01, 0x01, 0x04 + + .align 2 + .4byte gText_Interview + .4byte gText_FindWordsThatDescribeYour + .4byte gText_FeelingsRightNow + .4byte gText_TheAnswer + .4byte gText_IsAsShownOkay + + .byte 0x0e, 0x01, 0x01, 0x04 + + .align 2 + .4byte gText_FansQuestion + .4byte gText_FindWordsWhichFit + .4byte gText_TheTrainersImage + .4byte gText_TheImage + .4byte gText_IsAsShownOkay + + .byte 0x14, 0x02, 0x02, 0x00 + + .align 2 + .4byte gText_Questionnaire + .4byte gText_CombineFourWordsOrPhrases + .4byte gText_AndFillOutTheQuestionnaire + .4byte gText_TheAnswer + .4byte gText_IsAsShownOkay gUnknown_08597748:: @ 8597748 .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a @@ -20,109 +214,239 @@ gUnknown_08597764:: @ 8597764 .2byte 0x0209, 0x140b, 0x1030, 0x102a gUnknown_0859776C:: @ 859776C - .2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449, 0x4bff, 0x4b1f, 0x2e3d, 0x1577, 0x6b5f, 0x5ade - .2byte 0x4218, 0x0000, 0x0000, 0x0000, 0x0000, 0x18c5, 0x318c, 0x5af6, 0x6f5b, 0x7fff, 0xccc0, 0x0000, 0xddc0, 0x000c, 0xddc0, 0x00cd - .2byte 0xddc0, 0x0cdd, 0xddc0, 0x0cdd, 0xddc0, 0x00cd, 0xddc0, 0x000c, 0xccc0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x0000, 0xc000, 0x0000, 0x6c00, 0x0000, 0x66c0, 0x0000, 0x666c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x000c, 0x0000, 0x00c6, 0x0000, 0x0c66, 0x0000, 0xc666, 0x0000, 0xc000, 0x6666, 0xc000, 0x6666, 0xc000, 0x6666 - .2byte 0xc000, 0xcccc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6666, 0x000c, 0x6666, 0x000c, 0x6666, 0x000c - .2byte 0xcccc, 0x000c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x0000, 0xc000, 0x0000, 0x6c00, 0x0000, 0x66c0, 0x0000, 0x666c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x000c, 0x0000, 0x00c6, 0x0000, 0x0c66, 0x0000, 0xc666, 0x0000, 0xc000, 0x6666, 0xc000, 0x6666, 0xc000, 0x6666 - .2byte 0xc000, 0xcccc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6666, 0x000c, 0x6666, 0x000c, 0x6666, 0x000c - .2byte 0xcccc, 0x000c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x99c0, 0x9999, 0xf99c, 0xff9f, 0xf99c, 0xf999 - .2byte 0xf99c, 0xf99f, 0x999c, 0xf99f, 0xf99c, 0xf99f, 0x99c0, 0x9999, 0xcc00, 0xcccc, 0x9999, 0x9999, 0xff9f, 0xff9f, 0x9f99, 0x9f9f - .2byte 0xff99, 0xff9f, 0x9f99, 0x9f9f, 0x9f99, 0x9f9f, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x9999, 0xff9f, 0x999f, 0xf99f, 0x9999 - .2byte 0xf999, 0x9999, 0xf99f, 0xf999, 0xf99f, 0x9999, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x0c99, 0x9999, 0xc999, 0x9ff9, 0xc999 - .2byte 0xffff, 0xc999, 0xffff, 0xc99f, 0x9999, 0xc999, 0x9999, 0xcc99, 0xcccc, 0x0ccc, 0x99c0, 0x9999, 0xf99c, 0xff9f, 0xf99c, 0x9f99 - .2byte 0xf99c, 0xff9f, 0x999c, 0x9f9f, 0xf99c, 0xff9f, 0x99c0, 0x9999, 0xcc00, 0xcccc, 0x9999, 0x9999, 0x99f9, 0xf9ff, 0x99f9, 0xf99f - .2byte 0x99f9, 0xf9ff, 0x99f9, 0xf99f, 0x9ff9, 0xf9ff, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x9999, 0xff9f, 0x999f, 0xf999, 0xf999 - .2byte 0xf999, 0x9999, 0xf999, 0x9999, 0xf99f, 0x9999, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x0c99, 0x9999, 0xc999, 0xffff, 0xc99f - .2byte 0xffff, 0xc999, 0x9ff9, 0xc999, 0x9999, 0xc999, 0x9999, 0xcc99, 0xcccc, 0x0ccc, 0x0000, 0x5fff, 0x67bd, 0x4b1a, 0x6fff, 0x0000 - .2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0008, 0x003f, 0xf000, 0xf001, 0xf001 - .2byte 0xf001, 0xf001, 0xf001, 0xff01, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0xf0d5, 0x0001, 0x1001, 0x0300 - .2byte 0x0024, 0x1106, 0x0600, 0x2240, 0x1cd0, 0x1111, 0x1111, 0x2222, 0x223f, 0x5022, 0xf007, 0xf01f, 0xf01f, 0xf01f, 0xf01f, 0xfb1f - .2byte 0x1ff0, 0x1ff0, 0x1ff0, 0x1ff0, 0x01b0, 0x0001, 0x1003, 0x4f14, 0x0011, 0x2208, 0x3032, 0x3031, 0xf0e7, 0x1007, 0xff07, 0x4fd0 - .2byte 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf007, 0xd007, 0x3007, 0xf0e7, 0xf007, 0xf0ff, 0xf007, 0xffff - .2byte 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf007, 0xf0ff, 0xf0f7, 0xf0ff, 0xf007, 0xf0ff, 0xf007 - .2byte 0xff07, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf0f7, 0xf0ff, 0xf0f7, 0xf0ff, 0xf007, 0xf007 - .2byte 0xf007, 0xff07, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xff60, 0xcd40, 0xf0db, 0x50ff, 0x40ff, 0x1224, 0x0300, 0xf430 - .2byte 0x704f, 0x0f4f, 0x3333, 0x3333, 0x1ff0, 0x1ff0, 0x1ff0, 0x1ff0, 0xf0fe, 0xf01f, 0xf01f, 0xf01f, 0xf01f, 0xd01f, 0x001f, 0x03e7 - .2byte 0x30ff, 0x00dc, 0xf006, 0xf001, 0xf001, 0xf001, 0xf001, 0xf001, 0xff01, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0 - .2byte 0x01f0, 0xf0c0, 0x0001, 0x0001 + .2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449 + .align 2 +gUnknown_08597780:: @ 8597780 + .incbin "graphics/misc/interview_triangle_cursor.gbapal" + + .align 2 +gUnknown_085977A0:: @ 85977A0 + .incbin "graphics/misc/interview_triangle_cursor.4bpp" + + .align 2 +gUnknown_085977C0:: @ 85977C0 + .incbin "graphics/misc/interview_arrow.4bpp" + + .align 2 +gUnknown_085978C0:: @ 85978C0 + .incbin "graphics/misc/interview_buttons.4bpp" + + .align 2 +gUnknown_085979C0:: @ 85979C0 + .incbin "graphics/misc/interview_frame.gbapal" + + .align 2 +gUnknown_085979E0:: @ 85979E0 + .incbin "graphics/misc/interview_frame.4bpp.lz" + + .align 2 gUnknown_08597B14:: @ 8597B14 - .incbin "baserom.gba", 0x597b14, 0x20 + .incbin "graphics/misc/interview_frame_orange.gbapal" + .align 2 gUnknown_08597B34:: @ 8597B34 - .incbin "baserom.gba", 0x597b34, 0x20 + .incbin "graphics/misc/interview_frame_green.gbapal" + .align 2 gUnknown_08597B54:: @ 8597B54 - .incbin "baserom.gba", 0x597b54, 0xc8 + .incbin "graphics/misc/interview_frame_2.4bpp.lz" + .align 2 gUnknown_08597C1C:: @ 8597C1C - .incbin "baserom.gba", 0x597c1c, 0x8 + .incbin "graphics/misc/8597C1C.gbapal" + .align 2 gUnknown_08597C24:: @ 8597C24 - .incbin "baserom.gba", 0x597c24, 0xc + .incbin "graphics/misc/8597C24.gbapal" gUnknown_08597C30:: @ 8597C30 .byte 0x83, 0x18, 0x04, 0x00, 0x63, 0x18, 0x06, 0x00, 0x03, 0x18, 0x0a, 0x00, 0xa3, 0x18, 0x02, 0x00, 0xb0, 0x0c, 0x02, 0x00, 0x83, 0x18, 0x04, 0x00, 0x89, 0x0c, 0x02, 0x01, 0x65, 0x14, 0x0a, 0x03 .byte 0x03, 0x18, 0x0a, 0x02 + .align 2 gUnknown_08597C54:: @ 8597C54 - .incbin "baserom.gba", 0x597c54, 0x10 + .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb + .align 2 gUnknown_08597C64:: @ 8597C64 - .incbin "baserom.gba", 0x597c64, 0x20 + window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010 + window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a + window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000 + window_template_terminator + .align 2 gUnknown_08597C84:: @ 8597C84 - .incbin "baserom.gba", 0x597c84, 0x8 + window_template 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x006a gUnknown_08597C8C:: @ 8597C8C - .incbin "baserom.gba", 0x597c8c, 0x4 + .string "{CLEAR 17}$" + .align 2 gUnknown_08597C90:: @ 8597C90 .4byte gUnknown_862B810 .4byte gUnknown_862B832 .4byte gUnknown_862B84B .4byte gUnknown_862B86C + .align 2 gUnknown_08597CA0:: @ 8597CA0 - .incbin "baserom.gba", 0x597ca0, 0x20 + obj_tiles gUnknown_085977A0, 0x0020, 0x0000 + obj_tiles gUnknown_085977C0, 0x0100, 0x0002 + obj_tiles gUnknown_085978C0, 0x0100, 0x0003 + null_obj_tiles + .align 2 gUnknown_08597CC0:: @ 8597CC0 - .incbin "baserom.gba", 0x597cc0, 0x28 + obj_pal gUnknown_08597780, 0x0000 + obj_pal gUnknown_08DCB648, 0x0001 + obj_pal gUnknown_08DCB86C, 0x0002 + obj_pal gUnknown_085979C0, 0x0003 + null_obj_pal + .align 2 gUnknown_08597CE8:: @ 8597CE8 - .incbin "baserom.gba", 0x597ce8, 0x20 + obj_tiles gUnknown_085979E0, 0x0800, 0x0005 + obj_tiles gUnknown_08DCB668, 0x1000, 0x0001 + obj_tiles gUnknown_08DCB88C, 0x0800, 0x0006 + obj_tiles gUnknown_08DCBAB0, 0x1000, 0x0004 gUnknown_08597D08:: @ 8597D08 - .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00 + .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00 + .align 2 +gOamData_8597D10:: @ 8597D10 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0C00 + + .align 2 gUnknown_08597D18:: @ 8597D18 - .incbin "baserom.gba", 0x597d18, 0x50 + spr_template 0x0000, 0x0000, gOamData_8597D10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811DF28 + .align 2 +gUnknown_08597D30:: @ 8597D30 + .2byte 0x4000, 0xc000, 0x0400, 0x0000 + + .align 2 +gUnknown_08597D38:: @ 8597D38 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_08597D40:: @ 8597D40 + .2byte 0x0020, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_08597D48:: @ 8597D48 + .2byte 0x0040, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_08597D50:: @ 8597D50 + .2byte 0x0060, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_08597D58:: @ 8597D58 + .4byte gUnknown_08597D38 + .4byte gUnknown_08597D40 + .4byte gUnknown_08597D48 + .4byte gUnknown_08597D50 + + .align 2 gUnknown_08597D68:: @ 8597D68 - .incbin "baserom.gba", 0x597d68, 0x68 + spr_template 0x0001, 0x0001, gUnknown_08597D30, gUnknown_08597D58, NULL, gDummySpriteAffineAnimTable, sub_811DF28 + .align 2 +gUnknown_08597D80:: @ 8597D80 + .2byte 0x4000, 0xc000, 0x0400, 0x0000 + + .align 2 +gUnknown_08597D88:: @ 8597D88 + .2byte 0x0060, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_08597D90:: @ 8597D90 + .2byte 0x0040, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08597D9C:: @ 8597D9C + .2byte 0x0040, 0x0004, 0x0000, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08597DA8:: @ 8597DA8 + .2byte 0x0040, 0x0004, 0x0060, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_08597DB4:: @ 8597DB4 + .2byte 0x0040, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08597DBC:: @ 8597DBC + .4byte gUnknown_08597D88 + .4byte gUnknown_08597D90 + .4byte gUnknown_08597D9C + .4byte gUnknown_08597DA8 + .4byte gUnknown_08597DB4 + + .align 2 gUnknown_08597DD0:: @ 8597DD0 - .incbin "baserom.gba", 0x597dd0, 0x20 + spr_template 0x0004, 0x0002, gUnknown_08597D80, gUnknown_08597DBC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gUnknown_08597DE8:: @ 8597DE8 + .2byte 0x0000, 0xc000, 0x0c00, 0x0000 + + .align 2 gUnknown_08597DF0:: @ 8597DF0 - .incbin "baserom.gba", 0x597df0, 0x40 + spr_template 0x0006, 0x0002, gUnknown_08597DE8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gUnknown_08597E08:: @ 8597E08 + .2byte 0x4000, 0x4000, 0x0400, 0x0000 + + .align 2 +gUnknown_08597E10:: @ 8597E10 + .2byte 0x0000, 0x4000, 0x0400, 0x0000 + + .align 2 +gUnknown_08597E18:: @ 8597E18 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_08597E20:: @ 8597E20 + .2byte 0x0004, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_08597E28:: @ 8597E28 + .4byte gUnknown_08597E18 + .4byte gUnknown_08597E20 + + .align 2 gUnknown_08597E30:: @ 8597E30 - .incbin "baserom.gba", 0x597e30, 0x18 + spr_template 0x0003, 0x0002, gUnknown_08597E08, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08597E48:: @ 8597E48 - .incbin "baserom.gba", 0x597e48, 0x18 + spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08597E60:: @ 8597E60 .byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa + .align 2 gUnknown_08597E6C:: @ 8597E6C - .incbin "baserom.gba", 0x597e6c, 0x30 + .4byte gText_DelAll + .4byte gText_Cancel5 + .4byte gText_Ok2 + .4byte NULL + + .4byte gText_DelAll + .4byte gText_Cancel5 + .4byte gText_Ok2 + .4byte gText_Quiz + + .4byte gText_DelAll + .4byte gText_Cancel5 + .4byte gText_Ok2 + .4byte gText_Answer @ 8597E9C .include "data/text/easy_chat/easy_chat_groups.inc" diff --git a/data/graphics.s b/data/graphics.s index e135a63e3..278b0da1c 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -126,23 +126,23 @@ gBlankGfxCompressed:: @ 8C0237C gUnknown_08C093F0:: @ 8C093F0 .incbin "baserom.gba", 0xc093f0, 0x87ac - .align 2 + .align 2 gBattleInterface_BallStatusBarPal:: @ 8C11B9C .incbin "graphics/battle_interface/ball_status_bar.gbapal" - .align 2 + .align 2 gBattleInterface_BallDisplayPal:: @ 8C11BBC .incbin "graphics/battle_interface/ball_display.gbapal" - .align 2 + .align 2 gHealthboxElementsGfxTable:: @ 8C11BDC .incbin "baserom.gba", 0xc11bdc, 0x840 - .align 2 + .align 2 gBattleInterface_BallDisplayGfx:: @ 8C1241C .incbin "graphics/battle_interface/ball_display.4bpp" - .align 2 + .align 2 gUnknown_08C1249C:: @ 8C1249C .incbin "baserom.gba", 0xc1249c, 0x49f4 @@ -268,28 +268,28 @@ gSubstituteDollGfx:: @ 8C2CEE0 gSubstituteDollTilemap:: @ 8C2D120 .incbin "baserom.gba", 0xc2d120, 552 - + gUnknown_08C2D348:: @ 8C2D348 .incbin "baserom.gba", 0xC2D348, 196 - + gUnknown_08C2D40C:: @ 8C2D40C .incbin "baserom.gba", 0xC2D40C, 28 - + gContestConfetti_Gfx:: @ 8C2D428 .incbin "baserom.gba", 0xC2D428, 288 - + gContestConfetti_Pal:: @ 8C2D548 .incbin "baserom.gba", 0xC2D548, 40 - + gUnknown_08C2D570:: @ 8C2D570 .incbin "baserom.gba", 0xC2D570, 316 - + gUnknown_08C2D6AC:: @ 8C2D6AC .incbin "baserom.gba", 0xC2D6AC, 36 - + gUnknown_08C2D6D0:: @ 8C2D6D0 .incbin "baserom.gba", 0xC2D6D0, 40 - + gUnknown_08C2D6F8:: @ 8C2D6F8 .incbin "baserom.gba", 0xC2D6F8, 40 @@ -906,9 +906,9 @@ gMenuMoneyPal:: @ 8D9B0C8 gBuyMenuFrame_Tilemap:: @ 8D9B0F0 .incbin "baserom.gba", 0xd9b0f0, 0x140 - + gMenuMoneyGfx:: @ 8D9B230 - .incbin "baserom.gba", 0xd9b230, 0x84 + .incbin "baserom.gba", 0xd9b230, 0x84 gMenuPokeblock_Gfx:: @ 8D9B2B4 .incbin "baserom.gba", 0xd9b2b4, 0x1bc @@ -1100,7 +1100,7 @@ gUnknown_08DAAFEC:: @ 8DAAFEC .include "data/graphics/decorations/decoration_graphics.inc" @ 8DBA14C - .incbin "baserom.gba", 0xdba14c, 0x3cc + .incbin "baserom.gba", 0xdba14c, 0x3cc gUnknown_08DBA518:: @ 8DBA518 .incbin "baserom.gba", 0xdba518, 0x80 @@ -1435,43 +1435,65 @@ gUnknown_08DC9608:: @ 8DC9608 gUnknown_08DC9628:: @ 8DC9628 .incbin "baserom.gba", 0xdc9628, 0x320 - + gBerryBlenderMiscPalette:: @ 8DCAB88 .incbin "graphics/berry_blender/misc.gbapal" - + gBerryBlenderArrowPalette:: @ 8DC9948 .incbin "graphics/berry_blender/arrow.gbapal" gUnknown_8DC9988:: @ 8DC9988 - .incbin "baserom.gba", 0xdc9988, 0x200 - + .incbin "baserom.gba", 0xdc9988, 0x200 + .align 2 gBerryBlenderMarubatsuTiles:: @ 8DC9B88 .incbin "graphics/berry_blender/marubatsu.4bpp" - + .align 2 gBerryBlenderParticlesTiles:: @ 8E90818 .incbin "graphics/berry_blender/particles.4bpp" - + .space 0x120 .align 2 gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88 .incbin "graphics/berry_blender/countdown_numbers.4bpp" - + .align 2 gBerryBlenderStartTiles:: @ 8DCA588 .incbin "graphics/berry_blender/start.4bpp" - - .space 0x200 - + + .space 0x200 + .align 2 gBerryBlenderArrowTiles:: @ 8DCAB88 .incbin "graphics/berry_blender/arrow.4bpp" + .align 2 gUnknown_08DCB388:: @ 8DCB388 - .incbin "baserom.gba", 0xdcb388, 0xA28 - + .incbin "baserom.gba", 0xdcb388, 0x2C0 + + .align 2 +gUnknown_08DCB648:: @ 8DCB648 + .incbin "baserom.gba", 0xdcb648, 0x20 + + .align 2 +gUnknown_08DCB668:: @ 8DCB668 + .incbin "baserom.gba", 0xdcb668, 0x204 + + .align 2 +gUnknown_08DCB86C:: @ 8DCB86C + .incbin "baserom.gba", 0xdcb86C, 0x20 + + .align 2 +gUnknown_08DCB88C:: @ 8DCB88C + .incbin "baserom.gba", 0xdcb88C, 0x224 + + .align 2 +gUnknown_08DCBAB0:: @ 8DCBAB0 + .incbin "baserom.gba", 0xdcbab0, 0x300 + + .align 2 gUnknown_08DCBDB0:: @ 8DCBDB0 .incbin "baserom.gba", 0xdcbdb0, 0x20 @@ -1604,7 +1626,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0 gUnknown_08DD4C4C:: @ 8DD4C4C .incbin "baserom.gba", 0xdd4c4c, 0xac - .align 2 + .align 2 gUnknown_08DD4CF8:: @ 8DD4CF8 .incbin "graphics/interface/unk_change_case.4bpp.lz" @@ -1638,61 +1660,61 @@ gUnknown_08DD7300:: @ 8DD7300 .incbin "baserom.gba", 0xdd7300, 0x60 gUnknown_08DD7360:: @ 8DD7360 - .incbin "baserom.gba", 0xdd7360, 0x1420 + .incbin "baserom.gba", 0xdd7360, 0x1420 gUnknown_08DD8780:: @ 8DD8780 - .incbin "baserom.gba", 0xdd8780, 0x40 + .incbin "baserom.gba", 0xdd8780, 0x40 gUnknown_08DD87C0:: @ 8DD87C0 - .incbin "baserom.gba", 0xdd87c0, 0x720 + .incbin "baserom.gba", 0xdd87c0, 0x720 gUnknown_08DD8EE0:: @ 8DD8EE0 - .incbin "baserom.gba", 0xdd8ee0, 0x1a0 + .incbin "baserom.gba", 0xdd8ee0, 0x1a0 gUnknown_08DD9080:: @ 8DD9080 - .incbin "baserom.gba", 0xdd9080, 0x60 + .incbin "baserom.gba", 0xdd9080, 0x60 gUnknown_08DD90E0:: @ 8DD90E0 - .incbin "baserom.gba", 0xdd90e0, 0x638 + .incbin "baserom.gba", 0xdd90e0, 0x638 gUnknown_08DD9718:: @ 8DD9718 - .incbin "baserom.gba", 0xdd9718, 0x15c + .incbin "baserom.gba", 0xdd9718, 0x15c gUnknown_08DD9874:: @ 8DD9874 - .incbin "baserom.gba", 0xdd9874, 0x40 + .incbin "baserom.gba", 0xdd9874, 0x40 gUnknown_08DD98B4:: @ 8DD98B4 - .incbin "baserom.gba", 0xdd98b4, 0x5a4 + .incbin "baserom.gba", 0xdd98b4, 0x5a4 gUnknown_08DD9E58:: @ 8DD9E58 - .incbin "baserom.gba", 0xdd9e58, 0x194 + .incbin "baserom.gba", 0xdd9e58, 0x194 gUnknown_08DD9FEC:: @ 8DD9FEC - .incbin "baserom.gba", 0xdd9fec, 0x40 + .incbin "baserom.gba", 0xdd9fec, 0x40 gUnknown_08DDA02C:: @ 8DDA02C - .incbin "baserom.gba", 0xdda02c, 0x610 + .incbin "baserom.gba", 0xdda02c, 0x610 gUnknown_08DDA63C:: @ 8DDA63C - .incbin "baserom.gba", 0xdda63c, 0x1c4 + .incbin "baserom.gba", 0xdda63c, 0x1c4 gUnknown_08DDA800:: @ 8DDA800 - .incbin "baserom.gba", 0xdda800, 0x40 + .incbin "baserom.gba", 0xdda800, 0x40 gUnknown_08DDA840:: @ 8DDA840 - .incbin "baserom.gba", 0xdda840, 0x600 + .incbin "baserom.gba", 0xdda840, 0x600 gUnknown_08DDAE40:: @ 8DDAE40 - .incbin "baserom.gba", 0xddae40, 0x1a0 + .incbin "baserom.gba", 0xddae40, 0x1a0 gUnknown_08DDAFE0:: @ 8DDAFE0 - .incbin "baserom.gba", 0xddafe0, 0x40 + .incbin "baserom.gba", 0xddafe0, 0x40 gUnknown_08DDB020:: @ 8DDB020 - .incbin "baserom.gba", 0xddb020, 0x2a4 + .incbin "baserom.gba", 0xddb020, 0x2a4 gUnknown_08DDB2C4:: @ 8DDB2C4 - .incbin "baserom.gba", 0xddb2c4, 0x120 + .incbin "baserom.gba", 0xddb2c4, 0x120 gUnknown_08DDB3E4:: @ 8DDB3E4 .incbin "baserom.gba", 0xddb3e4, 0x80 diff --git a/data/pokemon_animation.s b/data/pokemon_animation.s new file mode 100644 index 000000000..535c91b2d --- /dev/null +++ b/data/pokemon_animation.s @@ -0,0 +1,240 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_0860A8C8:: @ 860A8C8 + .byte 0x00, 0x13, 0x02, 0x08, 0x12, 0x15, 0x17, 0x12, 0x12, 0x19, 0x02, 0x13, 0x11, 0x02, 0x13, 0x01, 0x0f, 0x15, 0x0f, 0x0a, 0x0a, 0x0f, 0x15, 0x0f, 0x09, 0x16, 0x16, 0x12, 0x10, 0x12, 0x15, 0x09 + .byte 0x12, 0x15, 0x09, 0x13, 0x13, 0x10, 0x01, 0x13, 0x06, 0x11, 0x09, 0x02, 0x02, 0x14, 0x02, 0x08, 0x0a, 0x11, 0x09, 0x09, 0x10, 0x0f, 0x02, 0x14, 0x10, 0x10, 0x15, 0x15, 0x12, 0x09, 0x0e, 0x14 + .byte 0x14, 0x0d, 0x15, 0x09, 0x09, 0x0b, 0x0b, 0x0b, 0x02, 0x02, 0x0e, 0x08, 0x08, 0x17, 0x15, 0x02, 0x13, 0x0f, 0x0f, 0x02, 0x0f, 0x15, 0x13, 0x02, 0x0b, 0x0c, 0x13, 0x0f, 0x01, 0x01, 0x14, 0x09 + .byte 0x13, 0x14, 0x0a, 0x09, 0x15, 0x15, 0x02, 0x10, 0x15, 0x10, 0x02, 0x0f, 0x02, 0x06, 0x06, 0x0e, 0x0e, 0x12, 0x0b, 0x12, 0x13, 0x11, 0x11, 0x11, 0x13, 0x19, 0x14, 0x0f, 0x13, 0x16, 0x17, 0x0e + .byte 0x0e, 0x10, 0x09, 0x19, 0x05, 0x12, 0x19, 0x16, 0x17, 0x01, 0x13, 0x13, 0x13, 0x15, 0x15, 0x13, 0x19, 0x16, 0x17, 0x02, 0x0f, 0x09, 0x0d, 0x12, 0x12, 0x02, 0x09, 0x12, 0x15, 0x17, 0x15, 0x15 + .byte 0x09, 0x12, 0x10, 0x11, 0x0f, 0x0a, 0x11, 0x0a, 0x02, 0x0f, 0x0b, 0x16, 0x12, 0x13, 0x13, 0x13, 0x11, 0x12, 0x14, 0x12, 0x13, 0x16, 0x11, 0x12, 0x13, 0x02, 0x10, 0x11, 0x11, 0x11, 0x10, 0x13 + .byte 0x02, 0x11, 0x0b, 0x02, 0x14, 0x14, 0x12, 0x13, 0x01, 0x14, 0x0b, 0x14, 0x08, 0x09, 0x0f, 0x05, 0x09, 0x15, 0x09, 0x0d, 0x15, 0x13, 0x15, 0x0f, 0x13, 0x09, 0x17, 0x17, 0x0a, 0x08, 0x02, 0x02 + .byte 0x05, 0x0f, 0x02, 0x15, 0x09, 0x09, 0x19, 0x15, 0x0e, 0x01, 0x13, 0x02, 0x0f, 0x07, 0x02, 0x08, 0x17, 0x02, 0x13, 0x16, 0x17, 0x19, 0x0e, 0x09, 0x0e, 0x19, 0x17, 0x18, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x15, 0x09, 0x12, 0x10, 0x17, 0x02, 0x12, 0x19, 0x12, 0x08 + .byte 0x0f, 0x15, 0x0b, 0x08, 0x11, 0x08, 0x0f, 0x02, 0x10, 0x10, 0x13, 0x09, 0x14, 0x0a, 0x01, 0x14, 0x12, 0x15, 0x13, 0x15, 0x07, 0x11, 0x11, 0x03, 0x11, 0x19, 0x19, 0x13, 0x12, 0x01, 0x13, 0x14 + .byte 0x0e, 0x17, 0x01, 0x0b, 0x09, 0x04, 0x0f, 0x15, 0x03, 0x19, 0x04, 0x15, 0x13, 0x01, 0x0f, 0x0e, 0x0e, 0x15, 0x09, 0x0e, 0x17, 0x13, 0x09, 0x09, 0x0a, 0x08, 0x0f, 0x0f, 0x13, 0x13, 0x10, 0x10 + .byte 0x14, 0x12, 0x12, 0x09, 0x14, 0x14, 0x11, 0x11, 0x12, 0x01, 0x01, 0x18, 0x02, 0x10, 0x08, 0x0b, 0x0b, 0x0e, 0x13, 0x09, 0x0d, 0x13, 0x11, 0x11, 0x14, 0x01, 0x01, 0x0b, 0x15, 0x02, 0x15, 0x09 + .byte 0x0e, 0x11, 0x11, 0x11, 0x0c, 0x0b, 0x0f, 0x09, 0x14, 0x14, 0x14, 0x09, 0x09, 0x08, 0x0f, 0x15, 0x09, 0x09, 0x09, 0x09, 0x19, 0x17, 0x0d, 0x01, 0x01, 0x11, 0x14, 0x11 + +gUnknown_0860AA64:: @ 860AA64 + .byte 0x00, 0x05, 0x01, 0x01, 0x00, 0x0f, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0xff + +gUnknown_0860AA80:: @ 860AA80 + .byte 0x06, 0x1e, 0xfe, 0x0f, 0x06, 0x1e, 0xff, 0x00 + + .align 2 +gUnknown_0860AA88:: @ 860AA88 + .4byte pokemonanimfunc_00 + .4byte pokemonanimfunc_01 + .4byte pokemonanimfunc_02 + .4byte pokemonanimfunc_03 + .4byte pokemonanimfunc_04 + .4byte pokemonanimfunc_05 + .4byte pokemonanimfunc_06 + .4byte pokemonanimfunc_07 + .4byte pokemonanimfunc_08 + .4byte pokemonanimfunc_09 + .4byte pokemonanimfunc_0A + .4byte pokemonanimfunc_0B + .4byte pokemonanimfunc_0C + .4byte pokemonanimfunc_0D + .4byte pokemonanimfunc_0E + .4byte pokemonanimfunc_0F + .4byte pokemonanimfunc_10 + .4byte pokemonanimfunc_11 + .4byte pokemonanimfunc_12 + .4byte pokemonanimfunc_13 + .4byte pokemonanimfunc_14 + .4byte pokemonanimfunc_15 + .4byte pokemonanimfunc_16 + .4byte pokemonanimfunc_17 + .4byte pokemonanimfunc_18 + .4byte pokemonanimfunc_19 + .4byte pokemonanimfunc_1A + .4byte pokemonanimfunc_1B + .4byte pokemonanimfunc_1C + .4byte pokemonanimfunc_1D + .4byte pokemonanimfunc_1E + .4byte pokemonanimfunc_1F + .4byte pokemonanimfunc_20 + .4byte pokemonanimfunc_21 + .4byte pokemonanimfunc_22 + .4byte pokemonanimfunc_23 + .4byte pokemonanimfunc_24 + .4byte pokemonanimfunc_25 + .4byte pokemonanimfunc_26 + .4byte pokemonanimfunc_27 + .4byte pokemonanimfunc_28 + .4byte pokemonanimfunc_29 + .4byte pokemonanimfunc_2A + .4byte pokemonanimfunc_2B + .4byte pokemonanimfunc_2C + .4byte pokemonanimfunc_2D + .4byte pokemonanimfunc_2E + .4byte pokemonanimfunc_2F + .4byte pokemonanimfunc_30 + .4byte pokemonanimfunc_31 + .4byte pokemonanimfunc_32 + .4byte pokemonanimfunc_33 + .4byte pokemonanimfunc_34 + .4byte pokemonanimfunc_35 + .4byte pokemonanimfunc_36 + .4byte pokemonanimfunc_37 + .4byte pokemonanimfunc_38 + .4byte pokemonanimfunc_39 + .4byte pokemonanimfunc_3A + .4byte pokemonanimfunc_3B + .4byte pokemonanimfunc_3C + .4byte pokemonanimfunc_3D + .4byte pokemonanimfunc_3E + .4byte pokemonanimfunc_3F + .4byte pokemonanimfunc_40 + .4byte pokemonanimfunc_41 + .4byte pokemonanimfunc_42 + .4byte pokemonanimfunc_43 + .4byte pokemonanimfunc_44 + .4byte pokemonanimfunc_45 + .4byte pokemonanimfunc_46 + .4byte pokemonanimfunc_47 + .4byte pokemonanimfunc_48 + .4byte pokemonanimfunc_49 + .4byte pokemonanimfunc_4A + .4byte pokemonanimfunc_4B + .4byte pokemonanimfunc_4C + .4byte pokemonanimfunc_4D + .4byte pokemonanimfunc_4E + .4byte pokemonanimfunc_4F + .4byte pokemonanimfunc_50 + .4byte pokemonanimfunc_51 + .4byte pokemonanimfunc_52 + .4byte pokemonanimfunc_53 + .4byte pokemonanimfunc_54 + .4byte pokemonanimfunc_55 + .4byte pokemonanimfunc_56 + .4byte pokemonanimfunc_57 + .4byte pokemonanimfunc_58 + .4byte pokemonanimfunc_59 + .4byte pokemonanimfunc_5A + .4byte pokemonanimfunc_5B + .4byte pokemonanimfunc_5C + .4byte pokemonanimfunc_5D + .4byte pokemonanimfunc_5E + .4byte pokemonanimfunc_5F + .4byte pokemonanimfunc_60 + .4byte pokemonanimfunc_61 + .4byte pokemonanimfunc_62 + .4byte pokemonanimfunc_63 + .4byte pokemonanimfunc_64 + .4byte pokemonanimfunc_65 + .4byte pokemonanimfunc_66 + .4byte pokemonanimfunc_67 + .4byte pokemonanimfunc_68 + .4byte pokemonanimfunc_69 + .4byte pokemonanimfunc_6A + .4byte pokemonanimfunc_6B + .4byte pokemonanimfunc_6C + .4byte pokemonanimfunc_6D + .4byte pokemonanimfunc_6E + .4byte pokemonanimfunc_6F + .4byte pokemonanimfunc_70 + .4byte pokemonanimfunc_71 + .4byte pokemonanimfunc_72 + .4byte pokemonanimfunc_73 + .4byte pokemonanimfunc_74 + .4byte pokemonanimfunc_75 + .4byte pokemonanimfunc_76 + .4byte pokemonanimfunc_77 + .4byte pokemonanimfunc_78 + .4byte pokemonanimfunc_79 + .4byte pokemonanimfunc_7A + .4byte pokemonanimfunc_7B + .4byte pokemonanimfunc_7C + .4byte pokemonanimfunc_7D + .4byte pokemonanimfunc_7E + .4byte pokemonanimfunc_7F + .4byte pokemonanimfunc_80 + .4byte pokemonanimfunc_81 + .4byte pokemonanimfunc_82 + .4byte pokemonanimfunc_83 + .4byte pokemonanimfunc_84 + .4byte pokemonanimfunc_85 + .4byte pokemonanimfunc_86 + .4byte pokemonanimfunc_87 + .4byte pokemonanimfunc_88 + .4byte pokemonanimfunc_89 + .4byte pokemonanimfunc_8A + .4byte pokemonanimfunc_8B + .4byte pokemonanimfunc_8C + .4byte pokemonanimfunc_8D + .4byte pokemonanimfunc_8E + .4byte pokemonanimfunc_8F + .4byte pokemonanimfunc_90 + .4byte pokemonanimfunc_91 + .4byte pokemonanimfunc_92 + .4byte pokemonanimfunc_93 + .4byte pokemonanimfunc_94 + .4byte pokemonanimfunc_95 + .4byte pokemonanimfunc_96 + +gUnknown_0860ACE4:: @ 860ACE4 + .byte 0x60, 0x5f, 0x02, 0x5e, 0x03, 0x46, 0x6d, 0x3e, 0x6e, 0x6f, 0x70, 0x3f, 0x71, 0x13, 0x72, 0x6c, 0x6b, 0x3a, 0x64, 0x14, 0x4f, 0x5d, 0x0f, 0x4c, 0x61, 0x57, 0x58, 0x67, 0x66, 0x59, 0x74, 0x73 + .byte 0x5a, 0x75, 0x76, 0x5b, 0x77, 0x78, 0x65, 0x63, 0x5c, 0x62, 0x6a, 0x69, 0x68, 0x7b, 0x7a, 0x79, 0x7e, 0x7d, 0x7c, 0x81, 0x80, 0x7f, 0x84, 0x82, 0x83, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b + .byte 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96 + +gUnknown_0860AD2F:: @ 860AD2F + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01 + + .align 2 +gSpriteAffineAnim_860AD48:: @ 860AD48 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_860AD58:: @ 860AD58 + obj_rot_scal_anim_frame -0x100, 0x100, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_860AD68:: @ 860AD68 + .4byte gSpriteAffineAnim_860AD48 + .4byte gSpriteAffineAnim_860AD58 + +gUnknown_0860AD70:: @ 860AD70 + .byte 0xff, 0xff, 0x06, 0x02, 0x00, 0x06, 0xfe, 0x02, 0x06, 0x02, 0x00, 0x06, 0xfe, 0xfe, 0x06, 0x02, 0x00, 0x06, 0xfe, 0x02, 0x06, 0x02, 0x00, 0x06, 0xff, 0xff, 0x06, 0x00, 0x00, 0x00 + +gUnknown_0860AD8E:: @ 860AD8E + .byte 0x00, 0x08, 0x08, 0x08, 0xf8, 0x0c, 0xf8, 0x08, 0x0c, 0x08, 0xf8, 0x0c, 0xf8, 0x08, 0x0c, 0x08, 0xf8, 0x0c, 0xf8, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x08, 0xf8, 0x18, 0xf8, 0x08 + .byte 0x18, 0x08, 0xf8, 0x18, 0xf8, 0x08, 0x18, 0x08, 0xf8, 0x18, 0xf8, 0x00, 0x18, 0x00, 0x00, 0x00 + +gUnknown_0860ADBE:: @ 860ADBE + .byte 0x01, 0x01, 0x0c, 0xfe, 0x00, 0x0c, 0x01, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00 + +gUnknown_0860ADCC:: @ 860ADCC + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .byte 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00 + +gUnknown_0860AE1C:: @ 860AE1C + .byte 0x00, 0x05, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00 + +gUnknown_0860AE54:: @ 860AE54 + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .byte 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00 + + .align 2 +gUnknown_0860AE7C:: @ 860AE7C + .4byte gUnknown_0860ADCC + .4byte gUnknown_0860AE1C + .4byte gUnknown_0860AE54 + + .align 1 +gUnknown_0860AE88:: @ 860AE88 + .2byte 0x001f, 0x03e0, 0x7c00, 0x0000 diff --git a/data/strings.s b/data/strings.s index a0661f13d..82c5520e6 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2906,112 +2906,112 @@ gUnknown_085EC04F:: @ 85EC04F gUnknown_085EC063:: @ 85EC063 .string "{SPECIAL_F7 0x00}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}$" -gUnknown_085EC06C:: @ 85EC06C +gText_CombineFourWordsOrPhrases:: @ 85EC06C .string "Combine four words or phrases$" -gUnknown_085EC08A:: @ 85EC08A +gText_AndMakeYourProfile:: @ 85EC08A .string "and make your profile.$" -gUnknown_085EC0A1:: @ 85EC0A1 +gText_CombineSixWordsOrPhrases:: @ 85EC0A1 .string "Combine six words or phrases$" -gUnknown_085EC0BE:: @ 85EC0BE +gText_AndMakeAMessage:: @ 85EC0BE .string "and make a message.$" -gUnknown_085EC0D2:: @ 85EC0D2 +gText_FindWordsThatDescribeYour:: @ 85EC0D2 .string "Find words that describe your$" -gUnknown_085EC0F0:: @ 85EC0F0 +gText_FeelingsRightNow:: @ 85EC0F0 .string "feelings right now.$" gUnknown_085EC104:: @ 85EC104 .string "With four phrases,$" -gUnknown_085EC117:: @ 85EC117 +gText_CombineNineWordsOrPhrases:: @ 85EC117 .string "Combine nine words or phrases$" -gUnknown_085EC135:: @ 85EC135 +gText_AndMakeAMessage2:: @ 85EC135 .string "and make a message.$" -gUnknown_085EC149:: @ 85EC149 +gText_ChangeJustOneWordOrPhrase:: @ 85EC149 .string "Change just one word or phrase$" -gUnknown_085EC168:: @ 85EC168 +gText_AndImproveTheBardsSong:: @ 85EC168 .string "and improve the BARD’s song.$" -gUnknown_085EC185:: @ 85EC185 +gText_YourProfile:: @ 85EC185 .string "Your profile$" -gUnknown_085EC192:: @ 85EC192 +gText_YourFeelingAtTheBattlesStart:: @ 85EC192 .string "Your feeling at the battle’s start$" -gUnknown_085EC1B5:: @ 85EC1B5 +gText_WhatYouSayIfYouWin:: @ 85EC1B5 .string "What you say if you win a battle$" -gUnknown_085EC1D6:: @ 85EC1D6 +gText_WhatYouSayIfYouLose:: @ 85EC1D6 .string "What you say if you lose a battle$" -gUnknown_085EC1F8:: @ 85EC1F8 +gText_TheAnswer:: @ 85EC1F8 .string "The answer$" -gUnknown_085EC203:: @ 85EC203 +gText_TheMailMessage:: @ 85EC203 .string "The MAIL message$" gUnknown_085EC214:: @ 85EC214 .string "The MAIL salutation$" -gUnknown_085EC228:: @ 85EC228 +gText_TheBardsSong2:: @ 85EC228 .string "The new song$" -gUnknown_085EC235:: @ 85EC235 +gText_CombineTwoWordsOrPhrases:: @ 85EC235 .string "Combine two words or phrases$" -gUnknown_085EC252:: @ 85EC252 +gText_AndMakeATrendySaying:: @ 85EC252 .string "and make a trendy saying.$" -gUnknown_085EC26C:: @ 85EC26C +gText_TheTrendySaying:: @ 85EC26C .string "The trendy saying$" -gUnknown_085EC27E:: @ 85EC27E +gText_IsAsShownOkay:: @ 85EC27E .string "is as shown. Okay?$" -gUnknown_085EC291:: @ 85EC291 +gText_CombineTwoWordsOrPhrases2:: @ 85EC291 .string "Combine two words or phrases$" -gUnknown_085EC2AE:: @ 85EC2AE +gText_ToTeachHerAGoodSaying:: @ 85EC2AE .string "to teach her a good saying.$" -gUnknown_085EC2CA:: @ 85EC2CA +gText_FindWordsWhichFit:: @ 85EC2CA .string "Find words which fit$" -gUnknown_085EC2DF:: @ 85EC2DF +gText_TheTrainersImage:: @ 85EC2DF .string "the TRAINER’s image.$" -gUnknown_085EC2F4:: @ 85EC2F4 +gText_TheImage:: @ 85EC2F4 .string "The image:$" -gUnknown_085EC2FF:: @ 85EC2FF +gText_OutOfTheListedChoices:: @ 85EC2FF .string "Out of the listed choices,$" -gUnknown_085EC31A:: @ 85EC31A +gText_SelectTheAnswerToTheQuiz:: @ 85EC31A .string "select the answer to the quiz!$" -gUnknown_085EC339:: @ 85EC339 +gText_AndCreateAQuiz:: @ 85EC339 .string "and create a quiz!$" -gUnknown_085EC34C:: @ 85EC34C +gText_PickAWordOrPhraseAnd:: @ 85EC34C .string "Pick a word or phrase and$" -gUnknown_085EC366:: @ 85EC366 +gText_SetTheQuizAnswer:: @ 85EC366 .string "set the quiz answer.$" -gUnknown_085EC37B:: @ 85EC37B +gText_TheAnswerColon:: @ 85EC37B .string "The answer:$" gUnknown_085EC387:: @ 85EC387 .string "The quiz:$" -gUnknown_085EC391:: @ 85EC391 +gText_ApprenticePhrase:: @ 85EC391 .string "Apprentice’s phrase:$" gText_QuitEditing:: @ 85EC3A6 @@ -3020,10 +3020,10 @@ gText_QuitEditing:: @ 85EC3A6 gText_StopGivingPkmnMail:: @ 85EC3B4 .string "Stop giving the POKéMON MAIL?$" -gUnknown_085EC3D2:: @ 85EC3D2 +gText_AndFillOutTheQuestionnaire:: @ 85EC3D2 .string "and fill out the questionnaire.$" -gUnknown_085EC3F2:: @ 85EC3F2 +gText_LetsReplyToTheInterview:: @ 85EC3F2 .string "Let’s reply to the interview!$" gText_AllTextBeingEditedWill:: @ 85EC410 @@ -3056,7 +3056,7 @@ gText_OriginalSongWillBeUsed:: @ 85EC4E9 gUnknown_085EC509:: @ 85EC509 .string "That’s trendy already!$" -gText_CombineTwoWordsOrPhrases:: @ 85EC520 +gText_CombineTwoWordsOrPhrases3:: @ 85EC520 .string "Combine two words or phrases.$" gUnknown_085EC53E:: @ 85EC53E @@ -3074,40 +3074,40 @@ gUnknown_085EC584:: @ 85EC584 gUnknown_085EC594:: @ 85EC594 .string "Cancel the selection?$" -gUnknown_085EC5AA:: @ 85EC5AA +gText_Profile:: @ 85EC5AA .string "PROFILE$" -gUnknown_085EC5B2:: @ 85EC5B2 +gText_AtTheBattlesStart:: @ 85EC5B2 .string "At the battle’s start:$" -gUnknown_085EC5C9:: @ 85EC5C9 +gText_UponWinningABattle:: @ 85EC5C9 .string "Upon winning a battle:$" -gUnknown_085EC5E0:: @ 85EC5E0 +gText_UponLosingABattle:: @ 85EC5E0 .string "Upon losing a battle:$" -gUnknown_085EC5F6:: @ 85EC5F6 +gText_TheBardsSong:: @ 85EC5F6 .string "The BARD’s Song$" -gUnknown_085EC606:: @ 85EC606 +gText_WhatsHipAndHappening:: @ 85EC606 .string "What’s hip and happening?$" -gUnknown_085EC620:: @ 85EC620 +gText_Interview:: @ 85EC620 .string "Interview$" -gUnknown_085EC62A:: @ 85EC62A +gText_GoodSaying:: @ 85EC62A .string "Good saying$" -gUnknown_085EC636:: @ 85EC636 +gText_FansQuestion:: @ 85EC636 .string "Fan’s question$" gUnknown_085EC645:: @ 85EC645 .string "クイズの こたえは？$" @ "kuizuno kotaeha?" ("The quiz's answer is?" in Japanese) -gUnknown_085EC650:: @ 85EC650 +gText_ApprenticesPhrase:: @ 85EC650 .string "Apprentice’s phrase$" -gUnknown_085EC664:: @ 85EC664 +gText_Questionnaire:: @ 85EC664 .string "QUESTIONNAIRE$" gText_YouCannotQuitHere:: @ 85EC672 @@ -3122,13 +3122,13 @@ gText_F700sQuiz:: @ 85EC6A8 gText_Lady:: @ 85EC6B2 .string "Lady$" -gUnknown_085EC6B7:: @ 85EC6B7 +gText_AfterYouHaveReadTheQuiz:: @ 85EC6B7 .string "After you have read the quiz$" -gUnknown_085EC6D4:: @ 85EC6D4 +gText_QuestionPressTheAButton:: @ 85EC6D4 .string "question, press the A Button.$" -gUnknown_085EC6F2:: @ 85EC6F2 +gText_TheQuizAnswerIs:: @ 85EC6F2 .string "The quiz answer is?$" gText_LikeToQuitQuiz:: @ 85EC706 @@ -3137,7 +3137,7 @@ gText_LikeToQuitQuiz:: @ 85EC706 gText_ChallengeQuestionMark:: @ 85EC727 .string "challenge?$" -gUnknown_085EC732:: @ 85EC732 +gText_IsThisQuizOK:: @ 85EC732 .string "Is this quiz OK?$" gText_CreateAQuiz:: @ 85EC743 @@ -5370,19 +5370,19 @@ gUnknown_085EFCA0:: @ 85EFCA0 gUnknown_085EFCAB:: @ 85EFCAB .string "SEAFLOOR2$" -gUnknown_085EFCB5:: @ 85EFCB5 +gText_DelAll:: @ 85EFCB5 .string "DEL. ALL$" -gUnknown_085EFCBE:: @ 85EFCBE +gText_Cancel5:: @ 85EFCBE .string "CANCEL$" -gUnknown_085EFCC5:: @ 85EFCC5 +gText_Ok2:: @ 85EFCC5 .string "OK$" -gUnknown_085EFCC8:: @ 85EFCC8 +gText_Quiz:: @ 85EFCC8 .string "QUIZ$" -gUnknown_085EFCCD:: @ 85EFCCD +gText_Answer:: @ 85EFCCD .string "ANSWER$" gText_PokeBalls:: @ 85EFCD4 diff --git a/graphics/misc/8597C1C.pal b/graphics/misc/8597C1C.pal new file mode 100644 index 000000000..c075c5ce1 --- /dev/null +++ b/graphics/misc/8597C1C.pal @@ -0,0 +1,7 @@ +JASC-PAL +0100 +4 +0 0 0 +0 0 0 +57 205 255 +172 172 238 diff --git a/graphics/misc/8597C24.pal b/graphics/misc/8597C24.pal new file mode 100644 index 000000000..5c8eed0ba --- /dev/null +++ b/graphics/misc/8597C24.pal @@ -0,0 +1,9 @@ +JASC-PAL +0100 +6 +0 0 0 +255 255 255 +98 98 98 +222 213 222 +65 139 74 +230 230 230 diff --git a/graphics/misc/interview.pal b/graphics/misc/interview.pal new file mode 100644 index 000000000..dfe91b5de --- /dev/null +++ b/graphics/misc/interview.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 148 +255 197 148 +238 139 90 +189 90 41 +255 213 213 +246 180 180 +197 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +41 49 49 +98 98 98 +180 189 180 +222 213 222 +255 255 255 diff --git a/graphics/misc/interview_arrow.png b/graphics/misc/interview_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..1c1073d2ff185961df4fb3847405d50d89750353 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt-3yKjr_?Det0hDL5U!bg5_olYpX5kFf)Taf4Mu+&e~wb;XL6>#qJT1sUn->gTe~DWM4f)8jco literal 0 HcmV?d00001 diff --git a/graphics/misc/interview_buttons.png b/graphics/misc/interview_buttons.png new file mode 100644 index 0000000000000000000000000000000000000000..d6dfc7cbd36983797143fa8b334d15290dce0b08 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^4nWMo!VDyL`#gCAqznRlLR|mEak7F*UX?kn4Z}hqLX0 zcl?cw;V<(Sihnxo8g9Po*JqW^Q>}~L(r0Gvvlc7gaA@lcCXJq@4N)8kmO16zjE!}A z5B{l(oc3{6ThbiEIrE3w8{zx>hO?K}?zQS(v)Ju9yHE30%dQup|3MD%boFyt=akR{ E0E8G+5&!@I literal 0 HcmV?d00001 diff --git a/graphics/misc/interview_frame.png b/graphics/misc/interview_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..63470e729d311db2e68486bf361737fece4e9588 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ipS0MfW|K4}+&R#t_<^TVC zKrVi8F6>%4P=&Xri(`mKXL5oBYcr<-*CPg|09HS*9Sn@j32qO}96Tl0Fl=XRYFez; zGs_^0>7|+mFO&I&vn*nF)Fcc9449%$8A?B92w-+QsKCfzv8gDFi!ZqhWU;5KpUXO@ GgeCx;$S;}z literal 0 HcmV?d00001 diff --git a/graphics/misc/interview_frame_2.png b/graphics/misc/interview_frame_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c0fbba87d39dda01c548859dc89e6d4a78c85bde GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Eu!VDxcYag)#DT4r?5ZB_POaAXI{@-nRHVG(% z4*tK}^8f$U;^N{hd$-)Xdhh@L|Bfxi-+-$6JzX3_B&M#NV90mKfX7w0^z9=V2F?B2 zP6F5F>{#A$%Ty@6f%yQdz=IolD|meNoUE*p%u!lutyNvL>&U4MGmZpQymo96?&@TS zVO0?Oe{lBl0>?92d26Lwf;wuVdezuvp8^XkMGZ_o;<5!Xz(exy>|j=E@X;t_S7QueV&D(to$0v#L>tHyPgg&ebxsLQ03wz#5dZ)H literal 0 HcmV?d00001 diff --git a/ld_script.txt b/ld_script.txt index abb7f64da..3c6cf3bf0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -475,7 +475,8 @@ SECTIONS { data/intro_credits_graphics.o(.rodata); src/evolution_graphics.o(.rodata); src/bard_music.o(.rodata); - data/data_860A4AC.o(.rodata); + data/battle_link_817C95C.o(.rodata); + data/pokemon_animation.o(.rodata); src/battle_controller_recorded_opponent.o(.rodata); src/battle_controller_recorded_player.o(.rodata); src/battle_dome_cards.o(.rodata);