From e45aee1ff2c693d09b47cd381a94557b3f3cdcb8 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 2 Dec 2019 22:47:45 -0800 Subject: [PATCH] Port/dump dodrio_berry_picking data. --- asm/dodrio_berry_picking.s | 98 +-- data/{data_8471F50.s => data_8479668.s} | 177 ----- data/strings.s | 31 +- .../link_games/dodrioberry_berrysprites.png | Bin 0 -> 395 bytes graphics/link_games/dodrioberry_bg1.bin | Bin 0 -> 1280 bytes graphics/link_games/dodrioberry_bg1.pal | 19 + graphics/link_games/dodrioberry_bg1.png | Bin 0 -> 1887 bytes graphics/link_games/dodrioberry_bg2.pal | 19 + graphics/link_games/dodrioberry_bg2.png | Bin 0 -> 2856 bytes graphics/link_games/dodrioberry_bg2left.bin | Bin 0 -> 1280 bytes graphics/link_games/dodrioberry_bg2right.bin | Bin 0 -> 1280 bytes graphics/link_games/dodrioberry_pkmn.png | Bin 0 -> 3330 bytes graphics/link_games/dodrioberry_platform.png | Bin 0 -> 310 bytes graphics/link_games/dodrioberry_shiny.pal | 19 + graphics/link_games/dodrioberry_status.png | Bin 0 -> 195 bytes include/strings.h | 22 + ld_script.txt | 6 +- src/dodrio_berry_picking.c | 748 ++++++++++++++++++ 18 files changed, 899 insertions(+), 240 deletions(-) rename data/{data_8471F50.s => data_8479668.s} (81%) create mode 100644 graphics/link_games/dodrioberry_berrysprites.png create mode 100644 graphics/link_games/dodrioberry_bg1.bin create mode 100644 graphics/link_games/dodrioberry_bg1.pal create mode 100644 graphics/link_games/dodrioberry_bg1.png create mode 100644 graphics/link_games/dodrioberry_bg2.pal create mode 100644 graphics/link_games/dodrioberry_bg2.png create mode 100644 graphics/link_games/dodrioberry_bg2left.bin create mode 100644 graphics/link_games/dodrioberry_bg2right.bin create mode 100644 graphics/link_games/dodrioberry_pkmn.png create mode 100644 graphics/link_games/dodrioberry_platform.png create mode 100644 graphics/link_games/dodrioberry_shiny.pal create mode 100644 graphics/link_games/dodrioberry_status.png create mode 100644 src/dodrio_berry_picking.c diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s index ceccf74ff..892dff901 100644 --- a/asm/dodrio_berry_picking.s +++ b/asm/dodrio_berry_picking.s @@ -6691,7 +6691,7 @@ sub_8153A9C: @ 8153A9C ldr r0, [r0] str r0, [sp, 0x10] str r1, [sp, 0x14] - ldr r0, _08153AF8 @ =gUnknown_8477374 + ldr r0, _08153AF8 @ =gDodrioBerryPkmnGfx adds r1, r4, 0 bl LZ77UnCompWram cmp r4, 0 @@ -6714,7 +6714,7 @@ _08153ADC: .align 2, 0 _08153AF0: .4byte gUnknown_8478D90 _08153AF4: .4byte gUnknown_8478D98 -_08153AF8: .4byte gUnknown_8477374 +_08153AF8: .4byte gDodrioBerryPkmnGfx thumb_func_end sub_8153A9C thumb_func_start sub_8153AFC @@ -6741,9 +6741,9 @@ sub_8153AFC: @ 8153AFC mov r0, sp adds r0, 0x1A strh r2, [r0] - ldr r0, _08153B88 @ =gUnknown_8478C98 + ldr r0, _08153B88 @ =sOamData_8478C98 str r0, [sp, 0x1C] - ldr r0, _08153B8C @ =gUnknown_8478CE0 + ldr r0, _08153B8C @ =sSpriteAnimTable_8478CE0 str r0, [sp, 0x20] str r3, [sp, 0x24] ldr r0, _08153B90 @ =gDummySpriteAffineAnimTable @@ -6784,8 +6784,8 @@ sub_8153AFC: @ 8153AFC pop {r0} bx r0 .align 2, 0 -_08153B88: .4byte gUnknown_8478C98 -_08153B8C: .4byte gUnknown_8478CE0 +_08153B88: .4byte sOamData_8478C98 +_08153B8C: .4byte sSpriteAnimTable_8478CE0 _08153B90: .4byte gDummySpriteAffineAnimTable _08153B94: .4byte sub_8153B9C _08153B98: .4byte gUnknown_203F3E4 @@ -7167,7 +7167,7 @@ sub_8153E28: @ 8153E28 ldr r0, [r0] str r0, [sp, 0x20] str r1, [sp, 0x24] - ldr r0, _08153ECC @ =gUnknown_8477198 + ldr r0, _08153ECC @ =gDodrioBerryStatusGfx adds r1, r6, 0 bl LZ77UnCompWram cmp r6, 0 @@ -7231,7 +7231,7 @@ _08153EB8: bx r0 .align 2, 0 _08153EC8: .4byte gUnknown_8478DA0 -_08153ECC: .4byte gUnknown_8477198 +_08153ECC: .4byte gDodrioBerryStatusGfx _08153ED0: .4byte gUnknown_8478DA8 _08153ED4: .4byte gUnknown_203F43C thumb_func_end sub_8153E28 @@ -7563,7 +7563,7 @@ sub_8154128: @ 8154128 ldr r0, [r0] str r0, [sp, 0x8] str r1, [sp, 0xC] - ldr r0, _08154178 @ =gUnknown_8475968 + ldr r0, _08154178 @ =gDodrioBerrySpritesGfx adds r1, r4, 0 bl LZ77UnCompWram cmp r4, 0 @@ -7586,7 +7586,7 @@ _0815415E: bx r0 .align 2, 0 _08154174: .4byte gUnknown_8478DCC -_08154178: .4byte gUnknown_8475968 +_08154178: .4byte gDodrioBerrySpritesGfx thumb_func_end sub_8154128 thumb_func_start sub_815417C @@ -7971,7 +7971,7 @@ sub_8154438: @ 8154438 ldr r0, [r0] str r0, [sp, 0x20] str r1, [sp, 0x24] - ldr r0, _081544E0 @ =gUnknown_847722C + ldr r0, _081544E0 @ =gDodrioBerryPlatformGfx adds r1, r6, 0 bl LZ77UnCompWram cmp r6, 0 @@ -8034,7 +8034,7 @@ _081544C6: bx r0 .align 2, 0 _081544DC: .4byte gUnknown_8478E18 -_081544E0: .4byte gUnknown_847722C +_081544E0: .4byte gDodrioBerryPlatformGfx _081544E4: .4byte gUnknown_8478E20 _081544E8: .4byte gUnknown_8478E0E _081544EC: .4byte gUnknown_203F3F8 @@ -8777,17 +8777,17 @@ _08154A6E: _08154A80: .4byte gUnknown_203F440 _08154A84: .4byte 0x00003014 _08154A88: - ldr r1, _08154AC0 @ =gUnknown_8478590 + ldr r1, _08154AC0 @ =gDodrioBerryBgTilemap1 movs r0, 0x3 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer - ldr r1, _08154AC4 @ =gUnknown_8478A4C + ldr r1, _08154AC4 @ =gDodrioBerryBgTilemap2Left movs r0, 0x1 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer - ldr r1, _08154AC8 @ =gUnknown_84787FC + ldr r1, _08154AC8 @ =gDodrioBerryBgTilemap2Right movs r0, 0x2 movs r2, 0 movs r3, 0 @@ -8800,9 +8800,9 @@ _08154A88: bl CopyBgTilemapBufferToVram b _08154B08 .align 2, 0 -_08154AC0: .4byte gUnknown_8478590 -_08154AC4: .4byte gUnknown_8478A4C -_08154AC8: .4byte gUnknown_84787FC +_08154AC0: .4byte gDodrioBerryBgTilemap1 +_08154AC4: .4byte gDodrioBerryBgTilemap2Left +_08154AC8: .4byte gDodrioBerryBgTilemap2Right _08154ACC: movs r0, 0 bl ShowBg @@ -9215,7 +9215,7 @@ _08154E1C: bcc _08154DF4 _08154E22: movs r5, 0 - ldr r4, _08154F68 @ =gUnknown_841CE1C + ldr r4, _08154F68 @ =gText_SpacePoints cmp r5, r7 bcs _08154E48 add r1, sp, 0x34 @@ -9354,7 +9354,7 @@ _08154EC8: str r4, [sp, 0x4] movs r1, 0 str r1, [sp, 0x8] - ldr r2, _08154F68 @ =gUnknown_841CE1C + ldr r2, _08154F68 @ =gText_SpacePoints lsrs r3, 24 bl AddTextPrinterParameterized adds r0, r5, 0x1 @@ -9373,7 +9373,7 @@ _08154F52: bx r0 .align 2, 0 _08154F64: .4byte gUnknown_8478F14 -_08154F68: .4byte gUnknown_841CE1C +_08154F68: .4byte gText_SpacePoints _08154F6C: .4byte 0x00003009 _08154F70: .4byte gUnknown_203F440 _08154F74: .4byte gUnknown_8478E94 @@ -9488,7 +9488,7 @@ _08155060: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, _081551B4 @ =gUnknown_841CD03 + ldr r2, _081551B4 @ =gText_BerryPickingResults mov r8, r2 movs r2, 0x1 negs r2, r2 @@ -9516,7 +9516,7 @@ _08155060: ldr r0, [r4] add r0, r9 ldrb r0, [r0] - ldr r2, _081551B8 @ =gUnknown_841CD25 + ldr r2, _081551B8 @ =gText_10P30P50P50P movs r1, 0x10 str r1, [sp] str r6, [sp, 0x4] @@ -9616,7 +9616,7 @@ _0815512E: lsrs r2, 24 mov r1, r8 ldrb r3, [r1] - ldr r1, _081551CC @ =gUnknown_8478E3B + ldr r1, _081551CC @ =gUnknown_8478E38+0x3 str r1, [sp] movs r1, 0x1 negs r1, r1 @@ -9630,13 +9630,13 @@ _0815512E: _081551A8: .4byte gUnknown_203F440 _081551AC: .4byte 0x00003008 _081551B0: .4byte 0x00003009 -_081551B4: .4byte gUnknown_841CD03 -_081551B8: .4byte gUnknown_841CD25 +_081551B4: .4byte gText_BerryPickingResults +_081551B8: .4byte gText_10P30P50P50P _081551BC: .4byte gUnknown_8478EB0 _081551C0: .4byte gUnknown_8478E38 _081551C4: .4byte gUnknown_8478EA8 _081551C8: .4byte 0x0000270f -_081551CC: .4byte gUnknown_8478E3B +_081551CC: .4byte gUnknown_8478E38+0x3 _081551D0: ldr r0, _0815523C @ =gUnknown_203F440 ldr r0, [r0] @@ -9773,7 +9773,7 @@ _081552DC: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r6, _0815533C @ =gUnknown_841CD43 + ldr r6, _0815533C @ =gText_AnnouncingRankings movs r2, 0x1 negs r2, r2 movs r0, 0 @@ -9801,7 +9801,7 @@ _081552DC: _08155330: .4byte gUnknown_203F440 _08155334: .4byte 0x00003008 _08155338: .4byte 0x00003009 -_0815533C: .4byte gUnknown_841CD43 +_0815533C: .4byte gText_AnnouncingRankings _08155340: ldr r0, [sp, 0x84] bl sub_8154D9C @@ -9957,7 +9957,7 @@ _08155480: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, _08155568 @ =gUnknown_841CD58 + ldr r5, _08155568 @ =gText_AnnouncingPrizes movs r2, 0x1 negs r2, r2 movs r0, 0 @@ -9993,7 +9993,7 @@ _08155480: movs r0, 0 adds r1, r5, 0 bl DynamicPlaceholderTextUtil_SetPlaceholderPtr - ldr r1, _0815556C @ =gUnknown_841CD7A + ldr r1, _0815556C @ =gText_FirstPlacePrize add r0, sp, 0xC bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r0, [r4] @@ -10027,7 +10027,7 @@ _08155480: bl DynamicPlaceholderTextUtil_SetPlaceholderPtr cmp r4, 0x2 bne _08155574 - ldr r1, _08155570 @ =gUnknown_841CD9F + ldr r1, _08155570 @ =gText_CantHoldAnyMore add r0, sp, 0xC bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _08155580 @@ -10036,13 +10036,13 @@ _08155558: .4byte 0x00000101 _0815555C: .4byte gUnknown_203F440 _08155560: .4byte 0x00003008 _08155564: .4byte 0x00003009 -_08155568: .4byte gUnknown_841CD58 -_0815556C: .4byte gUnknown_841CD7A -_08155570: .4byte gUnknown_841CD9F +_08155568: .4byte gText_AnnouncingPrizes +_0815556C: .4byte gText_FirstPlacePrize +_08155570: .4byte gText_CantHoldAnyMore _08155574: cmp r6, 0x1 bne _08155580 - ldr r1, _081555C4 @ =gUnknown_841CDBA + ldr r1, _081555C4 @ =gText_FilledStorageSpace add r0, sp, 0xC bl DynamicPlaceholderTextUtil_ExpandPlaceholders _08155580: @@ -10079,7 +10079,7 @@ _0815559E: adds r1, r0 b _0815565E .align 2, 0 -_081555C4: .4byte gUnknown_841CDBA +_081555C4: .4byte gText_FilledStorageSpace _081555C8: .4byte gUnknown_203F440 _081555CC: .4byte 0x00003009 _081555D0: .4byte 0x00003008 @@ -10310,7 +10310,7 @@ _0815579C: ldr r0, [r2] add r0, r8 ldrb r0, [r0] - ldr r2, _08155854 @ =gUnknown_841CDD7 + ldr r2, _08155854 @ =gText_WantToPlayAgain movs r1, 0x6 str r1, [sp] movs r5, 0xFF @@ -10376,7 +10376,7 @@ _0815579C: .align 2, 0 _0815584C: .4byte 0x00003008 _08155850: .4byte 0x00003009 -_08155854: .4byte gUnknown_841CDD7 +_08155854: .4byte gText_WantToPlayAgain _08155858: .4byte gText_Yes _0815585C: .4byte gText_No _08155860: .4byte gFameCheckerText_ListMenuCursor @@ -10789,7 +10789,7 @@ _08155BA4: ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - ldr r2, _08155BE4 @ =gUnknown_841CE24 + ldr r2, _08155BE4 @ =gText_CommunicationStandby3 movs r1, 0x6 str r1, [sp] movs r1, 0xFF @@ -10810,7 +10810,7 @@ _08155BA4: b _08155C0C .align 2, 0 _08155BE0: .4byte 0x00003008 -_08155BE4: .4byte gUnknown_841CE24 +_08155BE4: .4byte gText_CommunicationStandby3 _08155BE8: .4byte 0x00003014 _08155BEC: bl IsDma3ManagerBusyWithBgCopy @@ -10961,7 +10961,7 @@ _08155D08: ldr r0, [r6] adds r0, r4 ldrb r0, [r0] - ldr r2, _08155D48 @ =gUnknown_841CDEB + ldr r2, _08155D48 @ =gText_SomeoneDroppedOut movs r1, 0x6 str r1, [sp] movs r1, 0xFF @@ -10982,7 +10982,7 @@ _08155D08: b _08155D70 .align 2, 0 _08155D44: .4byte 0x00003008 -_08155D48: .4byte gUnknown_841CDEB +_08155D48: .4byte gText_SomeoneDroppedOut _08155D4C: .4byte 0x00003014 _08155D50: bl IsDma3ManagerBusyWithBgCopy @@ -11340,26 +11340,26 @@ _08156008: .4byte _0815605C .4byte _0815606A _08156020: - ldr r0, _0815602C @ =gUnknown_84758A8 + ldr r0, _0815602C @ =gDodrioBerryBgPal1 movs r1, 0 movs r2, 0x40 bl LoadPalette b _08156082 .align 2, 0 -_0815602C: .4byte gUnknown_84758A8 +_0815602C: .4byte gDodrioBerryBgPal1 _08156030: bl ResetTempTileDataBuffers b _08156082 _08156036: - ldr r1, _08156040 @ =gUnknown_8475B3C + ldr r1, _08156040 @ =gDodrioBerryBgGfx1 movs r0, 0 str r0, [sp] movs r0, 0x3 b _0815604C .align 2, 0 -_08156040: .4byte gUnknown_8475B3C +_08156040: .4byte gDodrioBerryBgGfx1 _08156044: - ldr r1, _08156058 @ =gUnknown_84763CC + ldr r1, _08156058 @ =gDodrioBerryBgGfx2 movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -11369,7 +11369,7 @@ _0815604C: bl DecompressAndCopyTileDataToVram b _08156082 .align 2, 0 -_08156058: .4byte gUnknown_84763CC +_08156058: .4byte gDodrioBerryBgGfx2 _0815605C: bl FreeTempTileDataBuffersIfPossible lsls r0, 24 diff --git a/data/data_8471F50.s b/data/data_8479668.s similarity index 81% rename from data/data_8471F50.s rename to data/data_8479668.s index 8a3a7ae77..8527b4f09 100644 --- a/data/data_8471F50.s +++ b/data/data_8479668.s @@ -13,183 +13,6 @@ .section .rodata - .align 2 -gUnknown_8471F50:: @ 8471F50 - .incbin "baserom.gba", 0x471F50, 0x113 - -gUnknown_8472063:: @ 8472063 - .incbin "baserom.gba", 0x472063, 0x4B - -gUnknown_84720AE:: @ 84720AE - .incbin "baserom.gba", 0x4720AE, 0x4E - -gUnknown_84720FC:: @ 84720FC - .incbin "baserom.gba", 0x4720FC, 0x37 - -gUnknown_8472133:: @ 8472133 - .incbin "baserom.gba", 0x472133, 0x3409 - -gUnknown_847553C:: @ 847553C - .incbin "baserom.gba", 0x47553C, 0xC - -gUnknown_8475548:: @ 8475548 - .incbin "baserom.gba", 0x475548, 0x8 - -gUnknown_8475550:: @ 8475550 - .incbin "baserom.gba", 0x475550, 0x8 - -gUnknown_8475558:: @ 8475558 - .incbin "baserom.gba", 0x475558, 0x20 - -gUnknown_8475578:: @ 8475578 - .incbin "baserom.gba", 0x475578, 0x30 - -gUnknown_84755A8:: @ 84755A8 - .incbin "baserom.gba", 0x4755A8, 0x30 - -gUnknown_84755D8:: @ 84755D8 - .incbin "baserom.gba", 0x4755D8, 0x8 - -gUnknown_84755E0:: @ 84755E0 - .incbin "baserom.gba", 0x4755E0, 0x8 - -gUnknown_84755E8:: @ 84755E8 - .incbin "baserom.gba", 0x4755E8, 0x10 - -gUnknown_84755F8:: @ 84755F8 - .incbin "baserom.gba", 0x4755F8, 0x4 - -gUnknown_84755FC:: @ 84755FC - .incbin "baserom.gba", 0x4755FC, 0x6 - -gUnknown_8475602:: @ 8475602 - .incbin "baserom.gba", 0x475602, 0x6 - -gUnknown_8475608:: @ 8475608 - .incbin "baserom.gba", 0x475608, 0x40 - -gUnknown_8475648:: @ 8475648 - .incbin "baserom.gba", 0x475648, 0x14 - -gUnknown_847565C:: @ 847565C - .incbin "baserom.gba", 0x47565C, 0x18 - -gUnknown_8475674:: @ 8475674 - .incbin "baserom.gba", 0x475674, 0x10 - -gUnknown_8475684:: @ 8475684 - .incbin "baserom.gba", 0x475684, 0x8 - -gUnknown_847568C:: @ 847568C - .incbin "baserom.gba", 0x47568C, 0x10 - -gUnknown_847569C:: @ 847569C - .incbin "baserom.gba", 0x47569C, 0x8 - -gUnknown_84756A4:: @ 84756A4 - .incbin "baserom.gba", 0x4756A4, 0x204 - -gUnknown_84758A8:: @ 84758A8 - .incbin "baserom.gba", 0x4758A8, 0xC0 - -gUnknown_8475968:: @ 8475968 - .incbin "baserom.gba", 0x475968, 0x1D4 - -gUnknown_8475B3C:: @ 8475B3C - .incbin "baserom.gba", 0x475B3C, 0x890 - -gUnknown_84763CC:: @ 84763CC - .incbin "baserom.gba", 0x4763CC, 0xDCC - -gUnknown_8477198:: @ 8477198 - .incbin "baserom.gba", 0x477198, 0x94 - -gUnknown_847722C:: @ 847722C - .incbin "baserom.gba", 0x47722C, 0x148 - -gUnknown_8477374:: @ 8477374 - .incbin "baserom.gba", 0x477374, 0x121C - -gUnknown_8478590:: @ 8478590 - .incbin "baserom.gba", 0x478590, 0x26C - -gUnknown_84787FC:: @ 84787FC - .incbin "baserom.gba", 0x4787FC, 0x250 - -gUnknown_8478A4C:: @ 8478A4C - .incbin "baserom.gba", 0x478A4C, 0x24C - -gUnknown_8478C98:: @ 8478C98 - .incbin "baserom.gba", 0x478C98, 0x48 - -gUnknown_8478CE0:: @ 8478CE0 - .incbin "baserom.gba", 0x478CE0, 0xB0 - -gUnknown_8478D90:: @ 8478D90 - .incbin "baserom.gba", 0x478D90, 0x8 - -gUnknown_8478D98:: @ 8478D98 - .incbin "baserom.gba", 0x478D98, 0x8 - -gUnknown_8478DA0:: @ 8478DA0 - .incbin "baserom.gba", 0x478DA0, 0x8 - -gUnknown_8478DA8:: @ 8478DA8 - .incbin "baserom.gba", 0x478DA8, 0x24 - -gUnknown_8478DCC:: @ 8478DCC - .incbin "baserom.gba", 0x478DCC, 0x8 - -gUnknown_8478DD4:: @ 8478DD4 - .incbin "baserom.gba", 0x478DD4, 0x8 - -gUnknown_8478DDC:: @ 8478DDC - .incbin "baserom.gba", 0x478DDC, 0x18 - -gUnknown_8478DF4:: @ 8478DF4 - .incbin "baserom.gba", 0x478DF4, 0x18 - -gUnknown_8478E0C:: @ 8478E0C - .incbin "baserom.gba", 0x478E0C, 0x2 - -gUnknown_8478E0E:: @ 8478E0E - .incbin "baserom.gba", 0x478E0E, 0xA - -gUnknown_8478E18:: @ 8478E18 - .incbin "baserom.gba", 0x478E18, 0x8 - -gUnknown_8478E20:: @ 8478E20 - .incbin "baserom.gba", 0x478E20, 0x18 - -gUnknown_8478E38:: @ 8478E38 - .incbin "baserom.gba", 0x478E38, 0x3 - -gUnknown_8478E3B:: @ 8478E3B - .incbin "baserom.gba", 0x478E3B, 0x45 - -gUnknown_8478E80:: @ 8478E80 - .incbin "baserom.gba", 0x478E80, 0x14 - -gUnknown_8478E94:: @ 8478E94 - .incbin "baserom.gba", 0x478E94, 0x14 - -gUnknown_8478EA8:: @ 8478EA8 - .incbin "baserom.gba", 0x478EA8, 0x8 - -gUnknown_8478EB0:: @ 8478EB0 - .incbin "baserom.gba", 0x478EB0, 0xA - -gUnknown_8478EBA:: @ 8478EBA - .incbin "baserom.gba", 0x478EBA, 0xA - -gUnknown_8478EC4:: @ 8478EC4 - .incbin "baserom.gba", 0x478EC4, 0x50 - -gUnknown_8478F14:: @ 8478F14 - .incbin "baserom.gba", 0x478F14, 0x8 - - .section .rodata.8479668 - .align 2 gUnknown_8479668:: @ 8479668 .incbin "graphics/misc/unk_8479688.gbapal" diff --git a/data/strings.s b/data/strings.s index ac7241354..27481f0a0 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3351,58 +3351,67 @@ gUnknown_841CC64:: @ 841CC64 .string "SAVING...\n" .string "DON'T TURN OFF THE POWER.$" +gText_BerryPickingRecords:: .string "DODRIO BERRY-PICKING RECORDS$" +gText_BerriesPicked:: .string "BERRIES picked:$" +gText_BestScore:: .string "Best score:$" +gText_BerriesInRowFivePlayers:: .string "BERRIES picked in a row with\n" .string "five players:$" -gUnknown_841CD03:: @ 841CD03 +gText_BerryPickingResults:: @ 841CD03 .string "Announcing BERRY-PICKING results!$" -gUnknown_841CD25:: @ 841CD25 +gText_10P30P50P50P:: @ 841CD25 .string "10P 30P 50P {EXTRA 0xDD}50P$" -gUnknown_841CD43:: @ 841CD43 +gText_AnnouncingRankings:: @ 841CD43 .string "Announcing rankings!$" -gUnknown_841CD58:: @ 841CD58 +gText_AnnouncingPrizes:: @ 841CD58 .string "Announcing prizes!$" +gText_1Colon:: .string "1:$" +gText_2Colon:: .string "2:$" +gText_3Colon:: .string "3:$" +gText_4Colon:: .string "4:$" +gText_5Colon:: .string "5:$" -gUnknown_841CD7A:: @ 841CD7A +gText_FirstPlacePrize:: @ 841CD7A .string "The first-place winner gets\n" .string "this {DYNAMIC 00}!$" -gUnknown_841CD9F:: @ 841CD9F +gText_CantHoldAnyMore:: @ 841CD9F .string "You can't hold any more...$" -gUnknown_841CDBA:: @ 841CDBA +gText_FilledStorageSpace:: @ 841CDBA .string "It filled its storage space.$" -gUnknown_841CDD7:: @ 841CDD7 +gText_WantToPlayAgain:: @ 841CDD7 .string "Want to play again?$" -gUnknown_841CDEB:: @ 841CDEB +gText_SomeoneDroppedOut:: @ 841CDEB .string "Somebody dropped out.\n" .string "The link will be canceled.$" -gUnknown_841CE1C:: @ 841CE1C +gText_SpacePoints:: @ 841CE1C .string " points$" -gUnknown_841CE24:: @ 841CE24 +gText_CommunicationStandby3:: @ 841CE24 .string "Communication standby…$" .align 2 diff --git a/graphics/link_games/dodrioberry_berrysprites.png b/graphics/link_games/dodrioberry_berrysprites.png new file mode 100644 index 0000000000000000000000000000000000000000..81d3a6f97ca27078cf92a551eb4db9ae7370394c GIT binary patch literal 395 zcmV;60d)R}P)8A2FJN)U#SkusE_1eIbmHWonDPBFlAj|bE} zts#LBhKmb?Arj&WWw=147(+v8@16{(d)mtiA&j&%2t%wa9m+_9N->s~Q`~dUFHyH^wLK^{pwS%+-9F|pphm97-Wcf7Fc9XvzpNiv&?YLoRt-2bg)vRgSWirA%d*FQJq& z%BdjOQK52`sZ=HAn`xnywqUXEoZ8f?7B!n6W`t2U+VN;qBN{fp#IieW9xZFh{1L}L z^2a(df5PdH{HadNudvFPyBnPMk7-pa<}0b9ni@AZs7BSQQlz&aLW)SnLoq%4aq{mk+2hwwc5<;i>Y+%5=HCE{^`3+P literal 0 HcmV?d00001 diff --git a/graphics/link_games/dodrioberry_bg1.pal b/graphics/link_games/dodrioberry_bg1.pal new file mode 100644 index 000000000..c06550002 --- /dev/null +++ b/graphics/link_games/dodrioberry_bg1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 246 255 +82 180 172 +82 205 189 +156 156 131 +106 156 148 +123 123 98 +189 172 98 +189 189 139 +74 172 156 +172 172 131 +74 156 123 +115 115 82 +139 139 106 +164 164 115 +197 197 148 +230 246 255 diff --git a/graphics/link_games/dodrioberry_bg1.png b/graphics/link_games/dodrioberry_bg1.png new file mode 100644 index 0000000000000000000000000000000000000000..7079e8094308b227e0d656f486486159cf5f05e0 GIT binary patch literal 1887 zcmV-l2cYv2CShN?n+yJ=-WW>K{>OE)2Sx>c1|aD*wi-0ib{1_vV~$ zHtMB%VgWR~7DfoO24I2q8i2*ZT(d=eEgfL7>hw2ygQhOk(gOI}%|TSvwVW)`px|)1 ztjpxmtek?CDbr~?0S~xzQxIzk03_7cuexnDOU}&7Dp<`;sfvCJ_!q5-!KrpZsLFD? zRc%|91Sk*DVZH!h+(z)}4uHEkR5ZSlvISTL7XU2h6vF@zPCy4BEMWb9O9IlAz95dV z3RrBGvjqS}n}Vk|0H^gD*op+SEmdYdJu^$zTgpcUGspwr`DfQu&OD$J)w-(RhX@4B zqjEZ4tS)+rp;sxJ5Cp)KvDC+ai@Ki8LdUHKy`IbQV##9mh-@@{;O1|%@BdlO=cNaj zxTTl!d$E8LX(R!O1?Z^L+SORQ`4c55XaH70DOJ*^0RD6f zK<=nR{JTE30F@k;>=5fgk`0lqsLW%TYQYED&`}7my8^m^GC3jzB~#O}8-A7_No0kO zTEJpq0}!-tgBO%EbCtwUFqgUYF#$@}D^n6P$UFe+-djI}p$P{mh-dPs%ySZ80|-H{ zWf$xwXYr488wZSsj)*)krJy?CUK9&ypG07$~nir4}Ch8V1?sy0;(2_~At zAw`h~0QaMF`<7*U`0oHjhA?C`4Q*clloP3nLMrJ1T4>?xqLn}`QpN8cKmkH1*A-ag z1umjDuxKIki(@|p3YBpiF^n`I4bk+=m#qf~t~~%J1@c3LLL>{xn9mq}Y5~@4+@?Kx zh1%|V6F_8@A;1-h;L#g~G^Q>5NRWOK9ZSA2>XGW+*j;G$ zBc12!a)JQ*B#?1k5@{MnvvaIze&PV#8qmFelL9aSV}gzCA?krM61{PDPLC1*XT7!t zz^k2moF5n~WX}QiBH@fgfjnseIP0}Fz#dnddkGr=a0~z&KZMf}ENw+XL5@lj_Xu#Q z+8O{r=U%1&9I#{5>!b(gQZ;hx01_rifps=(BuPw-xYT#$g!IrM>4@tCGS*a zZ2`tKfIVO1yYFaHp3NJ;A9i1Ga{%BZ7>N$e(VnmId-R?S-90I|2`~--J2gfkz+R~F zsF7H9k-OjfiUKl{-CmJK)&UHCjmPL(DtCD zZ9|#hJVJm8O7pP;&>Te9NOWW^?qiw36xoed+{d%XHNNMxbi;KgRTj|KHYK+JIGk$w z4S6@fd<$SdFJhOnaJ>!iU+lYc&WrtQFru0tKA#>GHsaxW3lP2-n+bW5A3^AZG$y>+;k`oUCP4sHXuB(6Ya;v*FWFQ Z!v7K2ZmhO?^_u_y002ovPDHLkV1f-LV{-ri literal 0 HcmV?d00001 diff --git a/graphics/link_games/dodrioberry_bg2.pal b/graphics/link_games/dodrioberry_bg2.pal new file mode 100644 index 000000000..be2b62cc9 --- /dev/null +++ b/graphics/link_games/dodrioberry_bg2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 246 255 +246 246 222 +230 230 180 +139 238 139 +246 246 189 +197 246 164 +246 230 197 +230 246 255 +230 213 180 +205 197 164 +148 222 148 +222 238 255 +139 205 139 +213 238 246 +222 246 255 +213 205 164 diff --git a/graphics/link_games/dodrioberry_bg2.png b/graphics/link_games/dodrioberry_bg2.png new file mode 100644 index 0000000000000000000000000000000000000000..ee343dd1321ed036047856d753902ff0be4cfc87 GIT binary patch literal 2856 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 V4%%?XUALuq&wUR(^vL5N|1bSVaCiU! literal 0 HcmV?d00001 diff --git a/graphics/link_games/dodrioberry_bg2right.bin b/graphics/link_games/dodrioberry_bg2right.bin new file mode 100644 index 0000000000000000000000000000000000000000..a93db06df057f30db2c2ce2bca06d75d7cc93ee8 GIT binary patch literal 1280 zcmb8tMUNCw6oAnJ4#C~s-Q5Z9?moCPgS)%CTjLIc%MN$`6Wz_E)2o?BCGT6@%6T`b zR21d*lv2_vee~8Vr)#WEO>&d}-qljmE@O-~DyMtwPEGRmt+aH?Y_rVF=^3X}le~Q- zriJF3X{w3F8oBM3n^sz3xey;Ip}1m-Dx$DLZn*B6op#tBCkk9tj7oUCd(FgD2zGwW*u+7#WANk|AUw-=GyKixu z(3!zLrlJbUE2pe7N*if}tpD(lh8n1^p1SI&9rua-8NvIrb<{z7?X=ZK>$ps8&kFXD z9=hwMt1de0l+>B=8;&^|^!;Ln8)m2>1{-9c0s8BwZ?a+k-*nSVHN|9;Of$$%gpI7MpFd(FW_Svo@_^{)od4Ip~1>_Su`(5P#JbmtAtv a1?Qb}HmxE4iN_v!=z;t0x$90^6aFvoEOjUV literal 0 HcmV?d00001 diff --git a/graphics/link_games/dodrioberry_pkmn.png b/graphics/link_games/dodrioberry_pkmn.png new file mode 100644 index 0000000000000000000000000000000000000000..41ecd921d3d07c4ba215d1f72dd1fd6a400c5e68 GIT binary patch literal 3330 zcmV+d4gKe zwFl5>Ak0HLAv}!p4Gm4+L91{mQWRUJ{i1^TQ1)s_P7K(e9>!E^SA3t(Ftmgzhsy z$cugb&}t0>yPF2uf;#^M5LQv4RL^F9#HW{heNFCJU~$V&oF-OE4+F^)I5wepBq3} z(0oPly{p^+Pa2-)X@wiS5Eq_Y^$QJu;l^VgaPZh)xaz|%UK0n8_ZP12UpU|ov+o=n z^d0^%g%IG^OLiCTUAsFAh<@-|2mx*z1FQWfK{)SP15SO*vPcBW+Q}rOZ`|!7MDKSN z+aF|gLo9tGi(^4pmc&>qpPteJc*As3xBPTWEs5YQ`ggzJQD? zXb%M{W?UccIOC718q{wUQHE?inPzz)_KjMxa34 z^i&Di@UUpB6BVy7SJDAs>Vr02TZOSqjsmxp3P7_zr~@=;4RBzkr`j<4yPZ|bvWLZV zfKY(I=&@@#xRfzhyJ2!C0%I89j0cj6g%?#bD7AVeJW4-L^rF0I82GR?7~qWDP1S^0 zMJ52ltO&Hgl>lIfvmyvl1a$ZZsGku5nGWVhfLpaPf-dS$IrVU>DsU$S9#6u60`X7L z51LQ)13z{D3IN|P@C1f<@Jr2WYTix0I=H5JI zHP$^K0%P>0pqh)@ko8sAT0`+UoeB)|DX4-#rvNGOIh_iOQ4k6XSy0!PCulkTS~?XN zBD^xg44|S3I6{FT2;np;>DX;C zGjb#_=-Zw`vb=tnvKNTJ=qg6vF%+p~_ev}f2@Jy@5UM`a7=-}6Ozbd)D1vz$ zA*-l{N(N65pR~BMvmJUC4tQ!ifQqkOu|p_T&h~{e^@)D7@Vc-GeERln0fj1DW{* zNXdi3I}Y^*rUpb(9*FNaLzw7;V;~_9#J)3}CV|j^NXUc1V3%eI5;8O(Qu07N&QzfR zk(LL?c0*`Dq~(DKx}ylUMPxvvrex`65QLdo$NBh-g-3ITWY*57e-e_-#l;9SG+$Y`Li3rGR8vPBzhRb*P~3EN1Hm z>6?zc+!ds6WsZIjBkw`s>xbiVrXSAASvf1olIKscQSm?$&Csrb;Fm1>kI@ThR$9qv zUd!?I4Q_h_?9adH;ZTC*(;*~l_+0mOJV*oihk`Flu04Fy^OVD#t_T{L0emm-dy6gS zsR4Mk4{AQe9w(g;AJ@ue8xwm~=RSS4R^ z1X$J)9u4D7h%OO7AU(*ZCOQBkw8}_QP>K##1U*o8T8d80Gvr!vNh(=;rkemrE(M9Q*a-~^>0L&&y4?bK*?O`>fcw|vBp_K7 zAS)n!XX#_AKnC#-UZgg)i!OX&f7o|Gg@h7?1?bu6+jp-!U)a$%Luo*=oeKwdA5RSk zDb`8)C$S$yMUkflMBEAE+tL5fDn|pJ(NNP$W9L zWu4{w(eGPuvG=p4>+{jhnx&F;=G3HkX^CBeaXUAA zWZnRP2Dq}aodA002+)$l7INtJ%Nh&F=VZD%@Uzz3CGtII`8EsmLvyO%d8IWE7iz0q zEnj37aU^i2L^&`-N*a54gaf&=@S-_?!z!cHz2RI5=oFv+Kz#{VjX%;NWvkeF)tB zHLn5sV2JizZUdpe)ZgP)hYNPI&52I0t`75&O{Qv*} M07*qoM6N<$g0`|BW&i*H literal 0 HcmV?d00001 diff --git a/graphics/link_games/dodrioberry_platform.png b/graphics/link_games/dodrioberry_platform.png new file mode 100644 index 0000000000000000000000000000000000000000..9074ec74045a74cc91f48ab5954a634d7e7d6965 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQU(D&A+A9B*|+~d@b3SAApPvw zw|not-TU_K-MjxlDNL|O|D_U8^q{AUV~9oX+lk(MEebpiJDFyB-jLRJcy-A13ztgV zVIQ^9{2rNVuTZv&%0I$d_SI>4{dfG*(7~{6N67Jqy-nG(rpZQg%Vco{Noufo+Dwj; zJ+%6;)gI|GVTSiD)7(FXNl)d9kuo?}$a}ttafjfomMHb++j5?zpDMMWS-Hf z3HK$f&SXz=U7GS@`i8EAX&eo#^R|mPb1?VbUX;PLCg+P`Ys=J6YG*~V!n|Jo)bE(4 mY&5~(+I~;TS~pu8kv|OaW{DaWb)pAAUi5VJb6Mw<&;$TYW_e2h literal 0 HcmV?d00001 diff --git a/graphics/link_games/dodrioberry_shiny.pal b/graphics/link_games/dodrioberry_shiny.pal new file mode 100644 index 000000000..5d8b5b7a5 --- /dev/null +++ b/graphics/link_games/dodrioberry_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 255 238 +41 41 41 +213 222 90 +172 180 49 +90 98 16 +246 131 164 +197 82 82 +255 255 156 +255 205 98 +139 106 16 +148 148 148 +82 82 82 +255 205 230 +131 139 16 +0 0 0 +255 255 255 diff --git a/graphics/link_games/dodrioberry_status.png b/graphics/link_games/dodrioberry_status.png new file mode 100644 index 0000000000000000000000000000000000000000..e48d499f03853a0f3ff5310d998412e1069c6140 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT%Y~_@960G|Nq|q?~4B) zWjK2D>XIc}nwzKmKYH|kclUooL!d%9_;1L-{rAQuAm7i^#W6%;YI4E>W(n3t2ZkdB zj7$cHZ{E1Uaws53=}d!WTXwsohn&NX