From ca49f8438d1d31c9b95e508224f7ce3cb29112f6 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 27 Dec 2017 15:25:15 -0600 Subject: [PATCH] Extract battle_transition data --- asm/battle_transition.s | 90 +- data/battle_transition.s | 784 ++++++++++++++++++ data/data4d.s | 298 ------- graphics/battle_transitions/85BBC14.png | Bin 0 -> 231 bytes graphics/battle_transitions/85BC2B4.pal | 19 + graphics/battle_transitions/85BC2D4.pal | 19 + graphics/battle_transitions/85BC2F4.pal | 19 + graphics/battle_transitions/85BC314.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/85BCB14.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/85BD314.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/85BDB14.pal | 19 + graphics/battle_transitions/big_pokeball.png | Bin 0 -> 553 bytes .../battle_transitions/big_pokeball_map.bin | Bin 0 -> 1200 bytes graphics/battle_transitions/brendan_bg.pal | 19 + graphics/battle_transitions/drake_bg.pal | 19 + graphics/battle_transitions/elite_four_bg.png | Bin 0 -> 158 bytes .../battle_transitions/elite_four_bg_map.bin | Bin 0 -> 1280 bytes graphics/battle_transitions/evil_team.pal | 19 + .../battle_transitions/frontier_brain.bin | Bin 0 -> 2048 bytes .../battle_transitions/frontier_brain.png | Bin 0 -> 1582 bytes .../battle_transitions/frontier_squares.bin | Bin 0 -> 32 bytes .../battle_transitions/frontier_squares_1.png | Bin 0 -> 329 bytes .../battle_transitions/frontier_squares_2.png | Bin 0 -> 270 bytes .../battle_transitions/frontier_squares_3.png | Bin 0 -> 231 bytes .../battle_transitions/frontier_squares_4.png | Bin 0 -> 191 bytes .../frontier_squares_blanktiles.png | Bin 0 -> 134 bytes graphics/battle_transitions/glacia_bg.pal | 19 + graphics/battle_transitions/groudon.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/groudon.png | Bin 0 -> 1031 bytes graphics/battle_transitions/groudon_pt1.pal | 259 ++++++ graphics/battle_transitions/groudon_pt2.pal | 259 ++++++ graphics/battle_transitions/kyogre.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/kyogre.png | Bin 0 -> 1248 bytes graphics/battle_transitions/kyogre_pt1.pal | 163 ++++ graphics/battle_transitions/kyogre_pt2.pal | 227 +++++ graphics/battle_transitions/may_bg.pal | 19 + graphics/battle_transitions/phoebe_bg.pal | 19 + graphics/battle_transitions/pokeball.png | Bin 0 -> 309 bytes .../battle_transitions/pokeball_trail.png | Bin 0 -> 73 bytes graphics/battle_transitions/rayquaza.bin | Bin 0 -> 4096 bytes graphics/battle_transitions/rayquaza.pal | 259 ++++++ graphics/battle_transitions/rayquaza.png | Bin 0 -> 2308 bytes graphics/battle_transitions/shrinking_box.png | Bin 0 -> 189 bytes graphics/battle_transitions/sidney_bg.pal | 19 + graphics/battle_transitions/team_aqua.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/team_aqua.png | Bin 0 -> 782 bytes graphics/battle_transitions/team_magma.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/team_magma.png | Bin 0 -> 1084 bytes .../battle_transitions/unused_brendan.png | Bin 0 -> 475 bytes graphics/battle_transitions/unused_lass.png | Bin 0 -> 412 bytes .../battle_transitions/unused_trainer.pal | 19 + graphics/battle_transitions/vs.png | Bin 0 -> 533 bytes graphics/battle_transitions/vs_frame.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/vs_frame.png | Bin 0 -> 317 bytes graphics/battle_transitions/wallace_bg.pal | 19 + graphics_file_rules.mk | 22 +- ld_script.txt | 2 +- 57 files changed, 2265 insertions(+), 345 deletions(-) create mode 100644 data/battle_transition.s delete mode 100644 data/data4d.s create mode 100644 graphics/battle_transitions/85BBC14.png create mode 100644 graphics/battle_transitions/85BC2B4.pal create mode 100644 graphics/battle_transitions/85BC2D4.pal create mode 100644 graphics/battle_transitions/85BC2F4.pal create mode 100644 graphics/battle_transitions/85BC314.bin create mode 100644 graphics/battle_transitions/85BCB14.bin create mode 100644 graphics/battle_transitions/85BD314.bin create mode 100644 graphics/battle_transitions/85BDB14.pal create mode 100644 graphics/battle_transitions/big_pokeball.png create mode 100644 graphics/battle_transitions/big_pokeball_map.bin create mode 100644 graphics/battle_transitions/brendan_bg.pal create mode 100644 graphics/battle_transitions/drake_bg.pal create mode 100644 graphics/battle_transitions/elite_four_bg.png create mode 100644 graphics/battle_transitions/elite_four_bg_map.bin create mode 100644 graphics/battle_transitions/evil_team.pal create mode 100644 graphics/battle_transitions/frontier_brain.bin create mode 100644 graphics/battle_transitions/frontier_brain.png create mode 100644 graphics/battle_transitions/frontier_squares.bin create mode 100644 graphics/battle_transitions/frontier_squares_1.png create mode 100644 graphics/battle_transitions/frontier_squares_2.png create mode 100644 graphics/battle_transitions/frontier_squares_3.png create mode 100644 graphics/battle_transitions/frontier_squares_4.png create mode 100644 graphics/battle_transitions/frontier_squares_blanktiles.png create mode 100644 graphics/battle_transitions/glacia_bg.pal create mode 100644 graphics/battle_transitions/groudon.bin create mode 100644 graphics/battle_transitions/groudon.png create mode 100644 graphics/battle_transitions/groudon_pt1.pal create mode 100644 graphics/battle_transitions/groudon_pt2.pal create mode 100644 graphics/battle_transitions/kyogre.bin create mode 100644 graphics/battle_transitions/kyogre.png create mode 100644 graphics/battle_transitions/kyogre_pt1.pal create mode 100644 graphics/battle_transitions/kyogre_pt2.pal create mode 100644 graphics/battle_transitions/may_bg.pal create mode 100644 graphics/battle_transitions/phoebe_bg.pal create mode 100644 graphics/battle_transitions/pokeball.png create mode 100644 graphics/battle_transitions/pokeball_trail.png create mode 100644 graphics/battle_transitions/rayquaza.bin create mode 100644 graphics/battle_transitions/rayquaza.pal create mode 100644 graphics/battle_transitions/rayquaza.png create mode 100644 graphics/battle_transitions/shrinking_box.png create mode 100644 graphics/battle_transitions/sidney_bg.pal create mode 100644 graphics/battle_transitions/team_aqua.bin create mode 100644 graphics/battle_transitions/team_aqua.png create mode 100644 graphics/battle_transitions/team_magma.bin create mode 100644 graphics/battle_transitions/team_magma.png create mode 100644 graphics/battle_transitions/unused_brendan.png create mode 100644 graphics/battle_transitions/unused_lass.png create mode 100644 graphics/battle_transitions/unused_trainer.pal create mode 100644 graphics/battle_transitions/vs.png create mode 100644 graphics/battle_transitions/vs_frame.bin create mode 100644 graphics/battle_transitions/vs_frame.png create mode 100644 graphics/battle_transitions/wallace_bg.pal diff --git a/asm/battle_transition.s b/asm/battle_transition.s index b7f2746eca..d7f6b9e039 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -148,7 +148,7 @@ Task_BattleTransitionMain: @ 8145FA8 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8A98 + ldr r5, =sMainTransitionPhases ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -180,7 +180,7 @@ sub_8145FE0: @ 8145FE0 ldr r1, =gPlttBufferUnfaded ldr r2, =0x04000100 bl CpuSet - ldr r1, =gUnknown_085C8948 + ldr r1, =sPhase1_Tasks movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -210,7 +210,7 @@ _0814602A: sub_8146030: @ 8146030 push {r4,lr} adds r4, r0, 0 - ldr r1, =gUnknown_085C8948 + ldr r1, =sPhase1_Tasks movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -239,7 +239,7 @@ _0814605C: sub_8146064: @ 8146064 push {r4,lr} adds r4, r0, 0 - ldr r1, =gUnknown_085C89F0 + ldr r1, =sPhase2_Tasks movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -263,7 +263,7 @@ sub_814608C: @ 814608C adds r4, r0, 0 movs r0, 0 strh r0, [r4, 0x26] - ldr r1, =gUnknown_085C89F0 + ldr r1, =sPhase2_Tasks movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -331,7 +331,7 @@ sub_814610C: @ 814610C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8AA8 + ldr r5, =sPhase2_Transition_Blur_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -458,7 +458,7 @@ sub_8146204: @ 8146204 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8AB4 + ldr r5, =sPhase2_Transition_Swirl_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -629,7 +629,7 @@ sub_8146384: @ 8146384 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8ABC + ldr r5, =sPhase2_Transition_Shuffle_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -1069,10 +1069,10 @@ sub_814670C: @ 814670C ldr r1, [sp, 0x4] ldr r2, =0x01000400 bl CpuSet - ldr r0, =gUnknown_085BAED0 + ldr r0, =sTeamAqua_Tileset ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, =gUnknown_085BAEB0 + ldr r0, =sEvilTeam_Palette movs r1, 0xF0 movs r2, 0x20 bl LoadPalette @@ -1105,10 +1105,10 @@ sub_8146760: @ 8146760 ldr r1, [sp, 0x4] ldr r2, =0x01000400 bl CpuSet - ldr r0, =gUnknown_085BB4A4 + ldr r0, =sTeamMagma_Tileset ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, =gUnknown_085BAEB0 + ldr r0, =sEvilTeam_Palette movs r1, 0xF0 movs r2, 0x20 bl LoadPalette @@ -1173,7 +1173,7 @@ sub_8146800: @ 8146800 ldr r2, =0x01000400 mov r0, sp bl CpuSet - ldr r0, =gUnknown_085B9330 + ldr r0, =sBigPokeball_Tileset ldr r1, [sp, 0x8] movs r2, 0xB0 lsls r2, 2 @@ -1204,7 +1204,7 @@ sub_8146854: @ 8146854 add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r5, =gUnknown_085C9020 + ldr r5, =sBigPokeball_Tilemap movs r1, 0 ldr r0, [sp, 0x8] mov r9, r0 @@ -1274,7 +1274,7 @@ sub_81468E4: @ 81468E4 add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, =gUnknown_085BB248 + ldr r0, =sTeamAqua_Tilemap ldr r1, [sp, 0x8] bl LZ77UnCompVram ldr r0, =gUnknown_02038C28 @@ -1307,7 +1307,7 @@ sub_814692C: @ 814692C add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, =gUnknown_085BB930 + ldr r0, =sTeamMagma_Tilemap ldr r1, [sp, 0x8] bl LZ77UnCompVram ldr r0, =gUnknown_02038C28 @@ -2074,7 +2074,7 @@ sub_8146F94: @ 8146F94 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8B7C + ldr r5, =sPhase2_Transition_PokeballsTrail_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -2105,7 +2105,7 @@ sub_8146FCC: @ 8146FCC add r0, sp, 0x4 add r1, sp, 0x8 bl sub_8149F58 - ldr r0, =gUnknown_085B98B0 + ldr r0, =sPokeballTrail_Tileset ldr r1, [sp, 0x8] movs r2, 0x20 bl CpuSet @@ -2137,12 +2137,12 @@ sub_8147018: @ 8147018 push {r7} sub sp, 0x10 adds r7, r0, 0 - ldr r1, =gUnknown_085C8B88 + ldr r1, =sUnknown_085C8B88 mov r0, sp movs r2, 0x4 bl memcpy add r4, sp, 0x4 - ldr r1, =gUnknown_085C8B8C + ldr r1, =sUnknown_085C8B8C adds r0, r4, 0 movs r2, 0xA bl memcpy @@ -2270,7 +2270,7 @@ sub_814713C: @ 814713C push {r4-r6,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r1, =gUnknown_085C8B96 + ldr r1, =sUnknown_085C8B96 mov r0, sp movs r2, 0x4 bl memcpy @@ -2370,7 +2370,7 @@ sub_8147204: @ 8147204 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8B9C + ldr r5, =sPhase2_Transition_Clockwise_BlackFade_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -2997,7 +2997,7 @@ sub_8147718: @ 8147718 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8BB8 + ldr r5, =sPhase2_Transition_Ripple_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -3214,7 +3214,7 @@ sub_81478EC: @ 81478EC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8BC0 + ldr r5, =sPhase2_Transition_Wave_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -3532,7 +3532,7 @@ sub_8147B84: @ 8147B84 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8BCC + ldr r5, =sPhase2_Mugshot_Transition_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -3608,15 +3608,15 @@ sub_8147C24: @ 8147C24 push {r7} sub sp, 0x8 mov r8, r0 - ldr r6, =gUnknown_085C94D0 + ldr r6, =sMugshotsTilemap add r1, sp, 0x4 mov r0, sp bl sub_8149F58 - ldr r0, =gUnknown_085B9AF0 + ldr r0, =sUnknown_085B9AF0 ldr r1, [sp, 0x4] movs r2, 0xF0 bl CpuSet - ldr r1, =gUnknown_085C8FDC + ldr r1, =sOpponentMugshotsPals mov r2, r8 movs r3, 0x26 ldrsh r0, [r2, r3] @@ -3626,7 +3626,7 @@ sub_8147C24: @ 8147C24 movs r1, 0xF0 movs r2, 0x20 bl LoadPalette - ldr r1, =gUnknown_085C8FF0 + ldr r1, =sPlayerMugshotsPals ldr r0, =gSaveBlock2Ptr ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -4318,13 +4318,13 @@ sub_8148218: @ 8148218 push {r5,r6} sub sp, 0x4 adds r4, r0, 0 - ldr r0, =gUnknown_085C8BF4 + ldr r0, =sMugshotsTrainerPicIDsTable movs r2, 0x26 ldrsh r1, [r4, r2] mov r8, r1 add r0, r8 ldrb r0, [r0] - ldr r2, =gUnknown_085C8C0E + ldr r2, =sMugshotsOpponentCoords lsls r1, 2 mov r8, r1 adds r1, r2 @@ -4439,7 +4439,7 @@ sub_8148218: @ 8148218 ldrb r0, [r5, 0x3] lsls r0, 26 lsrs r0, 27 - ldr r2, =gUnknown_085C8BFA + ldr r2, =sMugshotsOpponentRotationScales mov r3, r8 adds r1, r3, r2 movs r4, 0 @@ -4473,7 +4473,7 @@ sub_8148218: @ 8148218 sub_8148380: @ 8148380 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gUnknown_085C8C24 + ldr r5, =sUnknown_085C8C24 _08148386: movs r1, 0x2E ldrsh r0, [r4, r1] @@ -4502,12 +4502,12 @@ sub_81483AC: @ 81483AC push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 - ldr r1, =gUnknown_085C8C40 + ldr r1, =sUnknown_085C8C40 mov r0, sp movs r2, 0x4 bl memcpy add r4, sp, 0x4 - ldr r1, =gUnknown_085C8C44 + ldr r1, =sUnknown_085C8C44 adds r0, r4, 0 movs r2, 0x4 bl memcpy @@ -5855,7 +5855,7 @@ sub_8148E8C: @ 8148E8C add r0, sp, 0x4 add r1, sp, 0x8 bl sub_8149F58 - ldr r4, =gUnknown_085BACD0 + ldr r4, =sShrinkingBoxTileset ldr r1, [sp, 0x8] adds r0, r4, 0 movs r2, 0x10 @@ -6401,7 +6401,7 @@ sub_81492B4: @ 81492B4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, =gUnknown_085BF540 + ldr r0, =gUnknown_085BF4A0+0xA0 movs r1, 0xF0 movs r2, 0x20 bl LoadPalette @@ -6780,7 +6780,7 @@ sub_8149628: @ 8149628 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r1, =gUnknown_085C8DA0 + ldr r1, =sUnknown_085C8DA0 mov r0, sp movs r2, 0x10 bl memcpy @@ -7163,7 +7163,7 @@ sub_814995C: @ 814995C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8DB0 + ldr r5, =sUnknown_085C8DB0 ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -7194,7 +7194,7 @@ sub_8149994: @ 8149994 add r0, sp, 0x4 add r1, sp, 0x8 bl sub_8149F58 - ldr r0, =gUnknown_085BACD0 + ldr r0, =sShrinkingBoxTileset ldr r1, [sp, 0x8] movs r2, 0x10 bl CpuSet @@ -7241,7 +7241,7 @@ sub_81499E8: @ 81499E8 movs r1, 0xC ldrsh r0, [r4, r1] lsls r0, 5 - ldr r1, =gUnknown_085BACD0 + ldr r1, =sShrinkingBoxTileset adds r0, r1 ldr r1, [sp] movs r2, 0x10 @@ -7294,7 +7294,7 @@ sub_8149A6C: @ 8149A6C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8DBC + ldr r5, =sPhase2_Transition_Shards_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -7372,7 +7372,7 @@ sub_8149B08: @ 8149B08 ldr r0, =sTransitionStructPtr ldr r0, [r0] adds r0, 0x24 - ldr r6, =gUnknown_085C8DD0 + ldr r6, =sUnknown_085C8DD0 mov r2, r8 movs r3, 0xA ldrsh r1, [r2, r3] @@ -7571,7 +7571,7 @@ _08149CAC: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - ldr r1, =gUnknown_085C8E16 + ldr r1, =sUnknown_085C8E16 movs r3, 0xA ldrsh r0, [r2, r3] subs r0, 0x1 @@ -7738,7 +7738,7 @@ sub_8149DFC: @ 8149DFC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8E24 + ldr r5, =sPhase1_TransitionAll_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 diff --git a/data/battle_transition.s b/data/battle_transition.s new file mode 100644 index 0000000000..bd0386e2b9 --- /dev/null +++ b/data/battle_transition.s @@ -0,0 +1,784 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +sBigPokeball_Tileset:: @ 85B9330 + .incbin "graphics/battle_transitions/big_pokeball.4bpp" + + .align 2 +sPokeballTrail_Tileset:: @ 85B98B0 + .incbin "graphics/battle_transitions/pokeball_trail.4bpp" + + .align 2 +sSpriteImage_85B98F0:: @ 85B98F0 + .incbin "graphics/battle_transitions/pokeball.4bpp" + + .align 2 +sUnknown_085B9AF0:: @ 85B9AF0 + .incbin "graphics/battle_transitions/elite_four_bg.4bpp" + + .align 2 +sSpriteImage_85B9CD0:: @ 85B9CD0 + .incbin "graphics/battle_transitions/unused_brendan.4bpp" + + .align 2 +sSpriteImage_85BA4D0:: @ 85BA4D0 + .incbin "graphics/battle_transitions/unused_lass.4bpp" + + .align 2 +sShrinkingBoxTileset:: @ 85BACD0 + .incbin "graphics/battle_transitions/shrinking_box.4bpp" + + .align 2 +sEvilTeam_Palette:: @ 85BAEB0 + .incbin "graphics/battle_transitions/evil_team.gbapal" + + .align 2 +sTeamAqua_Tileset:: @ 85BAED0 + .incbin "graphics/battle_transitions/team_aqua.4bpp.lz" + + .align 2 +sTeamAqua_Tilemap:: @ 85BB248 + .incbin "graphics/battle_transitions/team_aqua.bin.lz" + + .align 2 +sTeamMagma_Tileset:: @ 85BB4A4 + .incbin "graphics/battle_transitions/team_magma.4bpp.lz" + + .align 2 +sTeamMagma_Tilemap:: @ 85BB930 + .incbin "graphics/battle_transitions/team_magma.bin.lz" + + .align 2 +gUnknown_085BBC14:: @ 85BBC14 + .incbin "graphics/battle_transitions/85BBC14.4bpp" + + .align 2 +gUnknown_085BC2B4:: @ 85BC2B4 + .incbin "graphics/battle_transitions/85BC2B4.gbapal" + + .align 2 +gUnknown_085BC2D4:: @ 85BC2D4 + .incbin "graphics/battle_transitions/85BC2D4.gbapal" + + .align 2 +gUnknown_085BC2F4:: @ 85BC2F4 + .incbin "graphics/battle_transitions/85BC2F4.gbapal" + + .align 2 +gUnknown_085BC314:: @ 85BC314 + .incbin "graphics/battle_transitions/85BC314.bin" + + .align 2 +gUnknown_085BCB14:: @ 85BCB14 + .incbin "graphics/battle_transitions/85BCB14.bin" + + .align 2 +gUnknown_085BD314:: @ 85BD314 + .incbin "graphics/battle_transitions/85BD314.bin" + + .align 2 +gUnknown_085BDB14:: @ 85BDB14 + .incbin "graphics/battle_transitions/85BDB14.gbapal" + + .align 2 +gUnknown_085BDB34:: @ 85BDB34 + .incbin "graphics/battle_transitions/kyogre.4bpp.lz" + + .align 2 +gUnknown_085BE1E8:: @ 85BE1E8 + .incbin "graphics/battle_transitions/kyogre.bin.lz" + + .align 2 +gUnknown_085BE51C:: @ 85BE51C + .incbin "graphics/battle_transitions/groudon.4bpp.lz" + + .align 2 +gUnknown_085BEA88:: @ 85BEA88 + .incbin "graphics/battle_transitions/groudon.bin.lz" + + .align 2 +gUnknown_085BEDA0:: @ 85BEDA0 + .incbin "graphics/battle_transitions/kyogre_pt1.gbapal" + + .align 2 +gUnknown_085BEEE0:: @ 85BEEE0 + .incbin "graphics/battle_transitions/kyogre_pt2.gbapal" + + .align 2 +gUnknown_085BF0A0:: @ 85BF0A0 + .incbin "graphics/battle_transitions/groudon_pt1.gbapal" + + .align 2 +gUnknown_085BF2A0:: @ 85BF2A0 + .incbin "graphics/battle_transitions/groudon_pt2.gbapal" + + .align 2 +gUnknown_085BF4A0:: @ 85BF4A0 + .incbin "graphics/battle_transitions/rayquaza.gbapal" + + .align 2 +gUnknown_085BF6A0:: @ 85BF6A0 + .incbin "graphics/battle_transitions/rayquaza.4bpp" + + .align 2 +gUnknown_085C6BE0:: @ 85C6BE0 + .incbin "graphics/battle_transitions/rayquaza.bin" + + .align 2 +gUnknown_085C7BE0:: @ 85C7BE0 + .incbin "graphics/battle_transitions/frontier_brain.gbapal" + + .align 2 +gUnknown_085C7C00:: @ 85C7C00 + .incbin "graphics/battle_transitions/frontier_brain.4bpp.lz" + + .align 2 +gUnknown_085C828C:: @ 85C828C + .incbin "graphics/battle_transitions/frontier_brain.bin.lz" + + .align 2 +gUnknown_085C8578:: @ 85C8578 + .incbin "graphics/battle_transitions/frontier_squares_blanktiles.gbapal" + + .align 2 +gUnknown_085C8598:: @ 85C8598 + .incbin "graphics/battle_transitions/frontier_square_1.4bpp.lz" + + .align 2 +gUnknown_085C86F4:: @ 85C86F4 + .incbin "graphics/battle_transitions/frontier_square_2.4bpp.lz" + + .align 2 +gUnknown_085C87F4:: @ 85C87F4 + .incbin "graphics/battle_transitions/frontier_square_3.4bpp.lz" + + .align 2 +gUnknown_085C88A4:: @ 85C88A4 + .incbin "graphics/battle_transitions/frontier_square_4.4bpp.lz" + + .align 2 +gUnknown_085C8928:: @ 85C8928 + .incbin "graphics/battle_transitions/frontier_squares.bin" + + .align 2 +sPhase1_Tasks:: @ 85C8948 + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + + .align 2 +sPhase2_Tasks:: @ 85C89F0 + .4byte sub_814610C + .4byte sub_8146204 + .4byte sub_8146384 + .4byte sub_8146514 + .4byte sub_8146F94 + .4byte sub_8147204 + .4byte sub_8147718 + .4byte sub_81478EC + .4byte sub_81484D0 + .4byte sub_8149578 + .4byte sub_814995C + .4byte sub_8149A6C + .4byte sub_8147AE4 + .4byte sub_8147B04 + .4byte sub_8147B24 + .4byte sub_8147B44 + .4byte sub_8147B64 + .4byte sub_814654C + .4byte sub_8146584 + .4byte sub_81465BC + .4byte sub_81465F4 + .4byte sub_814662C + .4byte sub_8146664 + .4byte sub_8149140 + .4byte sub_814927C + .4byte sub_8148760 + .4byte sub_8148B54 + .4byte sub_8148B8C + .4byte sub_8148E54 + .4byte sub_814A3BC + .4byte sub_814A3F4 + .4byte sub_814A6F0 + .4byte sub_814A760 + .4byte sub_814A728 + .4byte sub_81DABDC + .4byte sub_81DACB4 + .4byte sub_81DAD8C + .4byte sub_81DAE78 + .4byte sub_81DAF68 + .4byte sub_81DB060 + .4byte sub_81DB158 + .4byte sub_81DB258 + + .align 2 +sMainTransitionPhases:: @ 85C8A98 + .4byte sub_8145FE0 + .4byte sub_8146030 + .4byte sub_8146064 + .4byte sub_814608C + + .align 2 +sPhase2_Transition_Blur_Funcs:: @ 85C8AA8 + .4byte sub_8146144 + .4byte sub_8146178 + .4byte sub_81461D8 + + .align 2 +sPhase2_Transition_Swirl_Funcs:: @ 85C8AB4 + .4byte sub_814623C + .4byte sub_81462A8 + + .align 2 +sPhase2_Transition_Shuffle_Funcs:: @ 85C8ABC + .4byte sub_81463BC + .4byte sub_8146420 + + .align 2 +gUnknown_085C8AC4:: @ 85C8AC4 + .4byte sub_814670C + .4byte sub_81468E4 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146D90 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8AE0:: @ 85C8AE0 + .4byte sub_8146760 + .4byte sub_814692C + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146D90 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8AFC:: @ 85C8AFC + .4byte sub_8146800 + .4byte sub_8146854 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8B14:: @ 85C8B14 + .4byte sub_81467B4 + .4byte sub_8146974 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8B2C:: @ 85C8B2C + .4byte sub_81467B4 + .4byte sub_81469CC + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8B44:: @ 85C8B44 + .4byte sub_81467B4 + .4byte sub_8146A24 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8B5C:: @ 85C8B5C + .4byte sub_8146DAC + .4byte sub_8146DD8 + .4byte sub_8146A7C + .4byte sub_8146AC8 + .4byte sub_8146B24 + .4byte sub_8146D90 + .4byte sub_8146B7C + .4byte sub_8146BA8 + + .align 2 +sPhase2_Transition_PokeballsTrail_Funcs:: @ 85C8B7C + .4byte sub_8146FCC + .4byte sub_8147018 + .4byte sub_81470A4 + + .align 1 +sUnknown_085C8B88:: @ 85C8B88 + .2byte 0xfff0, 0x0100 + + .align 1 +sUnknown_085C8B8C:: @ 85C8B8C + .2byte 0x0000, 0x0020, 0x0040, 0x0012, 0x0030 + + .align 1 +sUnknown_085C8B96:: @ 85C8B96 + .2byte 0x0008, 0xfff8, 0x0000 + + .align 2 +sPhase2_Transition_Clockwise_BlackFade_Funcs:: @ 85C8B9C + .4byte sub_814723C + .4byte sub_81472A4 + .4byte sub_8147334 + .4byte sub_8147428 + .4byte sub_81474B0 + .4byte sub_81475B0 + .4byte sub_8147648 + + .align 2 +sPhase2_Transition_Ripple_Funcs:: @ 85C8BB8 + .4byte sub_8147750 + .4byte sub_81477A8 + + .align 2 +sPhase2_Transition_Wave_Funcs:: @ 85C8BC0 + .4byte sub_8147924 + .4byte sub_814797C + .4byte sub_8147A18 + + .align 2 +sPhase2_Mugshot_Transition_Funcs:: @ 85C8BCC + .4byte sub_8147BBC + .4byte sub_8147C24 + .4byte sub_8147CE4 + .4byte sub_8147DD0 + .4byte sub_8147E4C + .4byte sub_8147E88 + .4byte sub_8147F40 + .4byte sub_8148008 + .4byte sub_8148040 + .4byte sub_814808C + +sMugshotsTrainerPicIDsTable:: @ 85C8BF4 + .byte 0x24, 0x25, 0x26, 0x27, 0x36, 0x00 + + .align 1 +sMugshotsOpponentRotationScales:: @ 85C8BFA + .2byte 0x0200, 0x0200, 0x0200, 0x0200, 0x01b0, 0x01b0, 0x01a0, 0x01a0, 0x0188, 0x0188 + + .align 1 +sMugshotsOpponentCoords:: @ 85C8C0E + .2byte 0x0000, 0x0000, 0x0000, 0x0000, 0xfffc, 0x0004, 0x0000, 0x0005, 0xfff8, 0x0007, 0x0000 + + .align 2 +sUnknown_085C8C24:: @ 85C8C24 + .4byte sub_81483A8 + .4byte sub_81483AC + .4byte sub_81483F8 + .4byte sub_814842C + .4byte sub_81483A8 + .4byte sub_8148458 + .4byte sub_81483A8 + + .align 1 +sUnknown_085C8C40:: @ 85C8C40 + .2byte 0x000c, 0xfff4 + + .align 1 +sUnknown_085C8C44:: @ 85C8C44 + .2byte 0xffff, 0x0001 + + .align 2 +gUnknown_085C8C48:: @ 85C8C48 + .4byte sub_8148508 + .4byte sub_8148590 + .4byte sub_814865C + + .align 2 +gUnknown_085C8C54:: @ 85C8C54 + .4byte sub_8148798 + .4byte sub_8148864 + .4byte sub_8148AD4 + .4byte sub_8148B14 + + .align 1 +gUnknown_085C8C64:: @ 85C8C64 + .2byte 0x7727 + + .align 1 +gUnknown_085C8C66:: @ 85C8C66 + .2byte 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_085C8C6C:: @ 85C8C6C + .4byte sub_8148BC4 + .4byte sub_8148CE8 + .4byte sub_8148C28 + + .align 2 +gUnknown_085C8C78:: @ 85C8C78 + .4byte sub_8148BC4 + .4byte sub_8148D6C + + .align 1 +gUnknown_085C8C80:: @ 85C8C80 + .2byte 0xfffa, 0x0004 + + .align 2 +gUnknown_085C8C84:: @ 85C8C84 + .4byte sub_8148E8C + .4byte sub_8148F4C + .4byte sub_8149008 + +gUnknown_085C8C90:: @ 85C8C90 + .2byte 0x0001, 0x001b, 0x0113, 0xffff + +gUnknown_085C8C98:: @ 85C8C98 + .2byte 0x0002, 0x01e6, 0xffff + +gUnknown_085C8C9E:: @ 85C8C9E + .2byte 0x0003, 0x0106, 0xffff + +gUnknown_085C8CA4:: @ 85C8CA4 + .2byte 0x0004, 0x01fb, 0xfffe + +gUnknown_085C8CAA:: @ 85C8CAA + .2byte 0x0001, 0x00d5, 0xffff + +gUnknown_085C8CB0:: @ 85C8CB0 + .2byte 0x0002, 0x0224, 0xfffe + +gUnknown_085C8CB6:: @ 85C8CB6 + .2byte 0x0003, 0x00c4, 0xffff + +gUnknown_085C8CBC:: @ 85C8CBC + .2byte 0x0004, 0x023d, 0x0135, 0xffff + +gUnknown_085C8CC4:: @ 85C8CC4 + .2byte 0x0001, 0x01da, 0xffff + +gUnknown_085C8CCA:: @ 85C8CCA + .2byte 0x0002, 0x0127, 0x0020, 0xffff + +gUnknown_085C8CD2:: @ 85C8CD2 + .2byte 0x0003, 0x003a, 0xffff + +gUnknown_085C8CD8:: @ 85C8CD8 + .2byte 0x0004, 0x01c7, 0xffff + +gUnknown_085C8CDE:: @ 85C8CDE + .2byte 0x0001, 0x021c, 0xffff + +gUnknown_085C8CE4:: @ 85C8CE4 + .2byte 0x0002, 0x00e5, 0xffff + +gUnknown_085C8CEA:: @ 85C8CEA + .2byte 0x0003, 0x00f4, 0x001c, 0xffff + +gUnknown_085C8CF2:: @ 85C8CF2 + .2byte 0x0004, 0x0205, 0xffff + + .align 2 +gUnknown_085C8CF8:: @ 85C8CF8 + .4byte gUnknown_085C8C90 + .4byte gUnknown_085C8CA4 + .4byte gUnknown_085C8C98 + .4byte gUnknown_085C8C9E + .4byte gUnknown_085C8CEA + .4byte gUnknown_085C8CE4 + .4byte gUnknown_085C8CF2 + .4byte gUnknown_085C8CDE + + .align 2 +gUnknown_085C8D18:: @ 85C8D18 + .4byte gUnknown_085C8CBC + .4byte gUnknown_085C8CB0 + .4byte gUnknown_085C8CB6 + .4byte gUnknown_085C8CAA + .4byte gUnknown_085C8CCA + .4byte gUnknown_085C8CD8 + .4byte gUnknown_085C8CC4 + .4byte gUnknown_085C8CD2 + + .align 2 +gUnknown_085C8D38:: @ 85C8D38 + .4byte gUnknown_085C8CF8 + .4byte gUnknown_085C8D18 + + .align 2 +gUnknown_085C8D40:: @ 85C8D40 + .4byte sub_8146DAC + .4byte sub_8146DD8 + .4byte sub_8149178 + .4byte sub_81491C8 + .4byte sub_8149224 + .4byte sub_8146D90 + .4byte sub_8146B7C + .4byte sub_8146BA8 + + .align 2 +gUnknown_085C8D60:: @ 85C8D60 + .4byte sub_8146DAC + .4byte sub_8146DD8 + .4byte sub_81492B4 + .4byte sub_8149358 + .4byte sub_8149388 + .4byte sub_81493D8 + .4byte sub_8149410 + .4byte sub_814943C + .4byte sub_814946C + .4byte sub_8148CE8 + .4byte sub_8148C28 + + .align 2 +gUnknown_085C8D8C:: @ 85C8D8C + .4byte sub_81495B0 + .4byte sub_8149628 + .4byte sub_814969C + .4byte sub_81496D8 + .4byte sub_8149740 + + .align 1 +sUnknown_085C8DA0:: @ 85C8DA0 + .2byte 0x0000, 0x0014, 0x000f, 0x0028, 0x000a, 0x0019, 0x0023, 0x0005 + + .align 2 +sUnknown_085C8DB0:: @ 85C8DB0 + .4byte sub_8149994 + .4byte sub_81499E8 + .4byte sub_8149A40 + + .align 2 +sPhase2_Transition_Shards_Funcs:: @ 85C8DBC + .4byte sub_8149AA4 + .4byte sub_8149B08 + .4byte sub_8149B84 + .4byte sub_8149C60 + .4byte sub_8149CCC + + .align 1 +sUnknown_085C8DD0:: @ 85C8DD0 + .2byte 0x0038, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0068, 0x00a0, 0x00f0, 0x0058, 0x0001, 0x00f0, 0x0048, 0x0038, 0x0000, 0x0001, 0x0000 + .2byte 0x0020, 0x0090, 0x00a0, 0x0000, 0x0090, 0x00a0, 0x00b8, 0x0000, 0x0001, 0x0038, 0x0000, 0x00a8, 0x00a0, 0x0000, 0x00a8, 0x00a0 + .2byte 0x0030, 0x0000, 0x0001 + + .align 1 +sUnknown_085C8E16:: @ 85C8E16 + .2byte 0x0008, 0x0004, 0x0002, 0x0001, 0x0001, 0x0001, 0x0000 + + .align 2 +sPhase1_TransitionAll_Funcs:: @ 85C8E24 + .4byte sub_8149E34 + .4byte sub_8149E90 + + .align 2 +sSpriteImageTable_85C8E2C:: @ 85C8E2C + obj_frame_tiles sSpriteImage_85B98F0, 0x0200 + + .align 2 +sSpriteAnim_85C8E34:: @ 85C8E34 + obj_image_anim_frame 0, 1 + obj_image_anim_end + + .align 2 +sSpriteAnimTable_85C8E3C:: @ 85C8E3C + .4byte sSpriteAnim_85C8E34 + + .align 2 +sSpriteAffineAnim_85C8E40:: @ 85C8E40 + obj_rot_scal_anim_frame 0, 0, -4, 1 + obj_rot_scal_anim_jump 0 + + .align 2 +sSpriteAffineAnim_85C8E50:: @ 85C8E50 + obj_rot_scal_anim_frame 0, 0, 4, 1 + obj_rot_scal_anim_jump 0 + + .align 2 +sSpriteAffineAnimTable_85C8E60:: @ 85C8E60 + .4byte sSpriteAffineAnim_85C8E40 + .4byte sSpriteAffineAnim_85C8E50 + + .align 2 +gUnknown_085C8E68:: @ 85C8E68 + spr_template 0xffff, 0x1009, gFieldObjectBaseOam_32x32, sSpriteAnimTable_85C8E3C, sSpriteImageTable_85C8E2C, sSpriteAffineAnimTable_85C8E60, sub_814713C + + .align 2 +gOamData_85C8E80:: @ 85C8E80 + .2byte 0x0000, 0xc000, 0x0000, 0x0000 + + .align 2 +sSpriteImageTable_85C8E88:: @ 85C8E88 + obj_frame_tiles sSpriteImage_85B9CD0, 0x0800 + + .align 2 +sSpriteImageTable_85C8E90:: @ 85C8E90 + obj_frame_tiles sSpriteImage_85BA4D0, 0x0800 + + .align 2 +sSpriteAnim_85C8E98:: @ 85C8E98 + obj_image_anim_frame 0, 1 + obj_image_anim_end + + .align 2 +sSpriteAnimTable_85C8EA0:: @ 85C8EA0 + .4byte sSpriteAnim_85C8E98 + + .align 2 +sSpriteTemplate_85C8EA4:: @ 85C8EA4 + spr_template 0xffff, 0x100a, gOamData_85C8E80, sSpriteAnimTable_85C8EA0, sSpriteImageTable_85C8E88, gDummySpriteAffineAnimTable, sub_8148380 + + .align 2 +sSpriteTemplate_85C8EBC:: @ 85C8EBC + spr_template 0xffff, 0x100a, gOamData_85C8E80, sSpriteAnimTable_85C8EA0, sSpriteImageTable_85C8E90, gDummySpriteAffineAnimTable, sub_8148380 + + .align 2 +gFieldEffectObjectPalette10:: @ 85C8ED4 + .incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal" + + .align 2 +gFieldEffectObjectPaletteInfo10:: @ 85C8EF4 + obj_pal gFieldEffectObjectPalette10, 0x1009 + + .align 2 +sMugshotPal_Sidney:: @ 85C8EFC + .incbin "graphics/battle_transitions/sidney_bg.gbapal" + + .align 2 +sMugshotPal_Phoebe:: @ 85C8F1C + .incbin "graphics/battle_transitions/phoebe_bg.gbapal" + + .align 2 +sMugshotPal_Glacia:: @ 85C8F3C + .incbin "graphics/battle_transitions/glacia_bg.gbapal" + + .align 2 +sMugshotPal_Drake:: @ 85C8F5C + .incbin "graphics/battle_transitions/drake_bg.gbapal" + + .align 2 +sMugshotPal_Wallace:: @ 85C8F7C + .incbin "graphics/battle_transitions/wallace_bg.gbapal" + + .align 2 +sMugshotPal_Brendan:: @ 85C8F9C + .incbin "graphics/battle_transitions/brendan_bg.gbapal" + + .align 2 +sMugshotPal_May:: @ 85C8EFC + .incbin "graphics/battle_transitions/may_bg.gbapal" + + .align 2 +sOpponentMugshotsPals:: @ 85C8FDC + .4byte sMugshotPal_Sidney + .4byte sMugshotPal_Phoebe + .4byte sMugshotPal_Glacia + .4byte sMugshotPal_Drake + .4byte sMugshotPal_Wallace + + .align 2 +sPlayerMugshotsPals:: @ 85C8FF0 + .4byte sMugshotPal_Brendan + .4byte sMugshotPal_May + + .align 2 +sUnusedTrainerPalette:: @ 85C8EF8 + .incbin "graphics/battle_transitions/unused_trainer.gbapal" + + .align 2 +sSpritePalette_UnusedTrainer:: @ 85C8EFC + obj_pal sUnusedTrainerPalette, 0x100A + + .align 2 +sBigPokeball_Tilemap:: @ 85C9020 + .incbin "graphics/battle_transitions/big_pokeball_map.bin" + + .align 2 +sMugshotsTilemap:: @ 85C94D0 + .incbin "graphics/battle_transitions/elite_four_bg_map.bin" + + .align 2 +gUnknown_085C99D0:: @ 85C99D0 + .4byte sub_814A324 + .4byte sub_814A374 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C99E8:: @ 85C99E8 + .4byte sub_814A42C + .4byte sub_814A4D4 + .4byte sub_814A500 + .4byte sub_814A550 + + .align 2 +gUnknown_085C99F8:: @ 85C99F8 + .4byte sub_814A798 + .4byte sub_814A828 + .4byte sub_814A898 + .4byte sub_814ABA0 + + .align 2 +gUnknown_085C9A08:: @ 85C9A08 + .4byte sub_814A960 + .4byte sub_814AA04 + .4byte sub_814AA84 + .4byte sub_814AAB8 + .4byte sub_814ABA0 + + .align 2 +gUnknown_085C9A1C:: @ 85C9A1C + .4byte sub_814AC38 + .4byte sub_814AD48 + .4byte sub_814ADB4 + .4byte sub_814ADD8 + .4byte sub_814AE40 + +gUnknown_085C9A30:: @ 85C9A30 + .byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x1b, 0x14, 0x0d, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0e, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x13, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f + .byte 0x10, 0x11, 0x12 + +gUnknown_085C9A53:: @ 85C9A53 + .byte 0x00, 0x10, 0x29, 0x16, 0x2c, 0x02, 0x2b, 0x15, 0x2e, 0x1b, 0x09, 0x30, 0x26, 0x05, 0x39, 0x3b, 0x0c, 0x3f, 0x23, 0x1c, 0x0a, 0x35, 0x07, 0x31, 0x27, 0x17, 0x37, 0x01, 0x3e, 0x11, 0x3d, 0x1e + .byte 0x06, 0x22, 0x0f, 0x33, 0x20, 0x3a, 0x0d, 0x2d, 0x25, 0x34, 0x0b, 0x18, 0x3c, 0x13, 0x38, 0x21, 0x1d, 0x32, 0x28, 0x36, 0x0e, 0x03, 0x2f, 0x14, 0x12, 0x19, 0x04, 0x24, 0x1a, 0x2a, 0x1f, 0x08 + .byte 0x00 + diff --git a/data/data4d.s b/data/data4d.s deleted file mode 100644 index 2ab3b7dfb5..0000000000 --- a/data/data4d.s +++ /dev/null @@ -1,298 +0,0 @@ - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085B9330:: @ 85B9330 - .incbin "baserom.gba", 0x5b9330, 0x580 - -gUnknown_085B98B0:: @ 85B98B0 - .incbin "baserom.gba", 0x5b98b0, 0x240 - -gUnknown_085B9AF0:: @ 85B9AF0 - .incbin "baserom.gba", 0x5b9af0, 0x11e0 - -gUnknown_085BACD0:: @ 85BACD0 - .incbin "baserom.gba", 0x5bacd0, 0x1e0 - -gUnknown_085BAEB0:: @ 85BAEB0 - .incbin "baserom.gba", 0x5baeb0, 0x20 - -gUnknown_085BAED0:: @ 85BAED0 - .incbin "baserom.gba", 0x5baed0, 0x378 - -gUnknown_085BB248:: @ 85BB248 - .incbin "baserom.gba", 0x5bb248, 0x25c - -gUnknown_085BB4A4:: @ 85BB4A4 - .incbin "baserom.gba", 0x5bb4a4, 0x48c - -gUnknown_085BB930:: @ 85BB930 - .incbin "baserom.gba", 0x5bb930, 0x2e4 - -gUnknown_085BBC14:: @ 85BBC14 - .incbin "baserom.gba", 0x5bbc14, 0x6a0 - -gUnknown_085BC2B4:: @ 85BC2B4 - .incbin "baserom.gba", 0x5bc2b4, 0x20 - -gUnknown_085BC2D4:: @ 85BC2D4 - .incbin "baserom.gba", 0x5bc2d4, 0x20 - -gUnknown_085BC2F4:: @ 85BC2F4 - .incbin "baserom.gba", 0x5bc2f4, 0x20 - -gUnknown_085BC314:: @ 85BC314 - .incbin "baserom.gba", 0x5bc314, 0x800 - -gUnknown_085BCB14:: @ 85BCB14 - .incbin "baserom.gba", 0x5bcb14, 0x800 - -gUnknown_085BD314:: @ 85BD314 - .incbin "baserom.gba", 0x5bd314, 0x820 - -gUnknown_085BDB34:: @ 85BDB34 - .incbin "baserom.gba", 0x5bdb34, 0x6b4 - -gUnknown_085BE1E8:: @ 85BE1E8 - .incbin "baserom.gba", 0x5be1e8, 0x334 - -gUnknown_085BE51C:: @ 85BE51C - .incbin "baserom.gba", 0x5be51c, 0x56c - -gUnknown_085BEA88:: @ 85BEA88 - .incbin "baserom.gba", 0x5bea88, 0x318 - -gUnknown_085BEDA0:: @ 85BEDA0 - .incbin "baserom.gba", 0x5beda0, 0x140 - -gUnknown_085BEEE0:: @ 85BEEE0 - .incbin "baserom.gba", 0x5beee0, 0x1c0 - -gUnknown_085BF0A0:: @ 85BF0A0 - .incbin "baserom.gba", 0x5bf0a0, 0x200 - -gUnknown_085BF2A0:: @ 85BF2A0 - .incbin "baserom.gba", 0x5bf2a0, 0x200 - -gUnknown_085BF4A0:: @ 85BF4A0 - .incbin "baserom.gba", 0x5bf4a0, 0xa0 - -gUnknown_085BF540:: @ 85BF540 - .incbin "baserom.gba", 0x5bf540, 0x160 - -gUnknown_085BF6A0:: @ 85BF6A0 - .incbin "baserom.gba", 0x5bf6a0, 0x7540 - -gUnknown_085C6BE0:: @ 85C6BE0 - .incbin "baserom.gba", 0x5c6be0, 0x1000 - -gUnknown_085C7BE0:: @ 85C7BE0 - .incbin "baserom.gba", 0x5c7be0, 0x20 - -gUnknown_085C7C00:: @ 85C7C00 - .incbin "baserom.gba", 0x5c7c00, 0x68c - -gUnknown_085C828C:: @ 85C828C - .incbin "baserom.gba", 0x5c828c, 0x2ec - -gUnknown_085C8578:: @ 85C8578 - .incbin "baserom.gba", 0x5c8578, 0x20 - -gUnknown_085C8598:: @ 85C8598 - .incbin "baserom.gba", 0x5c8598, 0x15c - -gUnknown_085C86F4:: @ 85C86F4 - .incbin "baserom.gba", 0x5c86f4, 0x100 - -gUnknown_085C87F4:: @ 85C87F4 - .incbin "baserom.gba", 0x5c87f4, 0xb0 - -gUnknown_085C88A4:: @ 85C88A4 - .incbin "baserom.gba", 0x5c88a4, 0x84 - -gUnknown_085C8928:: @ 85C8928 - .incbin "baserom.gba", 0x5c8928, 0x20 - -gUnknown_085C8948:: @ 85C8948 - .incbin "baserom.gba", 0x5c8948, 0xa8 - -gUnknown_085C89F0:: @ 85C89F0 - .incbin "baserom.gba", 0x5c89f0, 0xa8 - -gUnknown_085C8A98:: @ 85C8A98 - .incbin "baserom.gba", 0x5c8a98, 0x10 - -gUnknown_085C8AA8:: @ 85C8AA8 - .incbin "baserom.gba", 0x5c8aa8, 0xc - -gUnknown_085C8AB4:: @ 85C8AB4 - .incbin "baserom.gba", 0x5c8ab4, 0x8 - -gUnknown_085C8ABC:: @ 85C8ABC - .incbin "baserom.gba", 0x5c8abc, 0x8 - -gUnknown_085C8AC4:: @ 85C8AC4 - .incbin "baserom.gba", 0x5c8ac4, 0x1c - -gUnknown_085C8AE0:: @ 85C8AE0 - .incbin "baserom.gba", 0x5c8ae0, 0x1c - -gUnknown_085C8AFC:: @ 85C8AFC - .incbin "baserom.gba", 0x5c8afc, 0x18 - -gUnknown_085C8B14:: @ 85C8B14 - .incbin "baserom.gba", 0x5c8b14, 0x18 - -gUnknown_085C8B2C:: @ 85C8B2C - .incbin "baserom.gba", 0x5c8b2c, 0x18 - -gUnknown_085C8B44:: @ 85C8B44 - .incbin "baserom.gba", 0x5c8b44, 0x18 - -gUnknown_085C8B5C:: @ 85C8B5C - .incbin "baserom.gba", 0x5c8b5c, 0x20 - -gUnknown_085C8B7C:: @ 85C8B7C - .incbin "baserom.gba", 0x5c8b7c, 0xc - -gUnknown_085C8B88:: @ 85C8B88 - .incbin "baserom.gba", 0x5c8b88, 0x4 - -gUnknown_085C8B8C:: @ 85C8B8C - .incbin "baserom.gba", 0x5c8b8c, 0xa - -gUnknown_085C8B96:: @ 85C8B96 - .incbin "baserom.gba", 0x5c8b96, 0x6 - -gUnknown_085C8B9C:: @ 85C8B9C - .incbin "baserom.gba", 0x5c8b9c, 0x1c - -gUnknown_085C8BB8:: @ 85C8BB8 - .incbin "baserom.gba", 0x5c8bb8, 0x8 - -gUnknown_085C8BC0:: @ 85C8BC0 - .incbin "baserom.gba", 0x5c8bc0, 0xc - -gUnknown_085C8BCC:: @ 85C8BCC - .incbin "baserom.gba", 0x5c8bcc, 0x28 - -gUnknown_085C8BF4:: @ 85C8BF4 - .incbin "baserom.gba", 0x5c8bf4, 0x6 - -gUnknown_085C8BFA:: @ 85C8BFA - .incbin "baserom.gba", 0x5c8bfa, 0x14 - -gUnknown_085C8C0E:: @ 85C8C0E - .incbin "baserom.gba", 0x5c8c0e, 0x16 - -gUnknown_085C8C24:: @ 85C8C24 - .incbin "baserom.gba", 0x5c8c24, 0x1c - -gUnknown_085C8C40:: @ 85C8C40 - .incbin "baserom.gba", 0x5c8c40, 0x4 - -gUnknown_085C8C44:: @ 85C8C44 - .incbin "baserom.gba", 0x5c8c44, 0x4 - -gUnknown_085C8C48:: @ 85C8C48 - .incbin "baserom.gba", 0x5c8c48, 0xc - -gUnknown_085C8C54:: @ 85C8C54 - .incbin "baserom.gba", 0x5c8c54, 0x10 - -gUnknown_085C8C64:: @ 85C8C64 - .incbin "baserom.gba", 0x5c8c64, 0x2 - -gUnknown_085C8C66:: @ 85C8C66 - .incbin "baserom.gba", 0x5c8c66, 0x6 - -gUnknown_085C8C6C:: @ 85C8C6C - .incbin "baserom.gba", 0x5c8c6c, 0xc - -gUnknown_085C8C78:: @ 85C8C78 - .incbin "baserom.gba", 0x5c8c78, 0x8 - -gUnknown_085C8C80:: @ 85C8C80 - .incbin "baserom.gba", 0x5c8c80, 0x4 - -gUnknown_085C8C84:: @ 85C8C84 - .incbin "baserom.gba", 0x5c8c84, 0xb4 - -gUnknown_085C8D38:: @ 85C8D38 - .incbin "baserom.gba", 0x5c8d38, 0x8 - -gUnknown_085C8D40:: @ 85C8D40 - .incbin "baserom.gba", 0x5c8d40, 0x20 - -gUnknown_085C8D60:: @ 85C8D60 - .incbin "baserom.gba", 0x5c8d60, 0x2c - -gUnknown_085C8D8C:: @ 85C8D8C - .incbin "baserom.gba", 0x5c8d8c, 0x14 - -gUnknown_085C8DA0:: @ 85C8DA0 - .incbin "baserom.gba", 0x5c8da0, 0x10 - -gUnknown_085C8DB0:: @ 85C8DB0 - .incbin "baserom.gba", 0x5c8db0, 0xc - -gUnknown_085C8DBC:: @ 85C8DBC - .incbin "baserom.gba", 0x5c8dbc, 0x14 - -gUnknown_085C8DD0:: @ 85C8DD0 - .incbin "baserom.gba", 0x5c8dd0, 0x46 - -gUnknown_085C8E16:: @ 85C8E16 - .incbin "baserom.gba", 0x5c8e16, 0xe - -gUnknown_085C8E24:: @ 85C8E24 - .incbin "baserom.gba", 0x5c8e24, 0x44 - -gUnknown_085C8E68:: @ 85C8E68 - .incbin "baserom.gba", 0x5c8e68, 0x6c - - .align 2 -gFieldEffectObjectPalette10:: @ 85C8ED4 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal" - - .align 2 -gFieldEffectObjectPaletteInfo10:: @ 85C8EF4 - obj_pal gFieldEffectObjectPalette10, 0x1009 - - .incbin "baserom.gba", 0x5c8efc, 0xe0 - -gUnknown_085C8FDC:: @ 85C8FDC - .incbin "baserom.gba", 0x5c8fdc, 0x14 - -gUnknown_085C8FF0:: @ 85C8FF0 - .incbin "baserom.gba", 0x5c8ff0, 0x30 - -gUnknown_085C9020:: @ 85C9020 - .incbin "baserom.gba", 0x5c9020, 0x4b0 - -gUnknown_085C94D0:: @ 85C94D0 - .incbin "baserom.gba", 0x5c94d0, 0x500 - -gUnknown_085C99D0:: @ 85C99D0 - .incbin "baserom.gba", 0x5c99d0, 0x18 - -gUnknown_085C99E8:: @ 85C99E8 - .incbin "baserom.gba", 0x5c99e8, 0x10 - -gUnknown_085C99F8:: @ 85C99F8 - .incbin "baserom.gba", 0x5c99f8, 0x10 - -gUnknown_085C9A08:: @ 85C9A08 - .incbin "baserom.gba", 0x5c9a08, 0x14 - -gUnknown_085C9A1C:: @ 85C9A1C - .incbin "baserom.gba", 0x5c9a1c, 0x14 - -gUnknown_085C9A30:: @ 85C9A30 - .incbin "baserom.gba", 0x5c9a30, 0x23 - -gUnknown_085C9A53:: @ 85C9A53 - .incbin "baserom.gba", 0x5c9a53, 0x41 diff --git a/graphics/battle_transitions/85BBC14.png b/graphics/battle_transitions/85BBC14.png new file mode 100644 index 0000000000000000000000000000000000000000..a0831073746388464d2a66d223c6d51f3a4d5d78 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G0wfr$b{_fxq}F-5IEHw1p1rzJ@UQ^~YrxwU zGlP2$S8mlaTrU$!mb~+K{T+`?$=Y0!XemUWl3WZjcYC;b4PO(h*&cwXrtP5kId6C17 eb1DK=+(#Ibl$!*4zAr5U`M}fF&t;ucLK6Uv+E#l2 literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/85BC2B4.pal b/graphics/battle_transitions/85BC2B4.pal new file mode 100644 index 0000000000..f508de9380 --- /dev/null +++ b/graphics/battle_transitions/85BC2B4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 0 +57 57 0 +123 123 0 +189 189 0 +255 255 0 +255 255 82 +255 255 172 +255 255 255 diff --git a/graphics/battle_transitions/85BC2D4.pal b/graphics/battle_transitions/85BC2D4.pal new file mode 100644 index 0000000000..6a46ddacf2 --- /dev/null +++ b/graphics/battle_transitions/85BC2D4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 0 +0 0 0 +139 0 0 +197 0 0 +255 0 0 +255 65 65 +255 139 139 +255 255 255 diff --git a/graphics/battle_transitions/85BC2F4.pal b/graphics/battle_transitions/85BC2F4.pal new file mode 100644 index 0000000000..2a65c3a9ec --- /dev/null +++ b/graphics/battle_transitions/85BC2F4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 148 0 +0 0 0 +74 49 0 +156 98 0 +230 156 0 +238 189 82 +246 222 172 +255 255 255 diff --git a/graphics/battle_transitions/85BC314.bin b/graphics/battle_transitions/85BC314.bin new file mode 100644 index 0000000000000000000000000000000000000000..37149e37bf405e079dcefd6cbb06bef057847e28 GIT binary patch literal 2048 zcmeH{NeaLq3`Nu70v#^U;Q}4*f2Mzgb`kgpC4@*9g1Y%4FOsJyken%5G~`FVL5mK( z-JNm%fDsesFu!2MhCR$5IC0?)^RAoG{^`n_w7T+i&6k1{8E0px?nMHudXgw Z%=2}1!D61Ts|yzM{K~kr*9z2J-~%$MfX4s; literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/85BD314.bin b/graphics/battle_transitions/85BD314.bin new file mode 100644 index 0000000000000000000000000000000000000000..cd1a672b573d86016e86169df6d2f04d9f335576 GIT binary patch literal 2048 zcmeH{*$Kcf3`5gnfgTI=SfI!LGiihtf<6RBzil81!N{_}ypJR#r1ZWY+y*T=^x-DX zy$euFBY{cvEHURGe4FPQ`g;>{Oipx~s%> m8|QISiL;xl^Ej!*+0E5?oK)iM=IT71EK0p!XFZibxda}z;(ylw literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/85BDB14.pal b/graphics/battle_transitions/85BDB14.pal new file mode 100644 index 0000000000..920669dcdc --- /dev/null +++ b/graphics/battle_transitions/85BDB14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +255 255 255 +82 0 0 +98 0 0 +115 0 0 +131 0 0 +139 0 0 +156 0 0 +172 0 0 +189 0 0 +197 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/big_pokeball.png b/graphics/battle_transitions/big_pokeball.png new file mode 100644 index 0000000000000000000000000000000000000000..21b227441247acc39cba65ac71282502afc4c5af GIT binary patch literal 553 zcmV+^0@nSBP)$-pzy6v}(`deJD=!)vECJ(h z{P^P}0I&tN$OhFu4DbaY%>XI2G$bOJya9;2Cr)#p-C$Nf-OI=Uf+UTW~8m#9D& zM@^tS*3s0A;3cejtz zUZfrgD1NodAW(}@cHjzma1LyhLJkK_Ar-%>O^}v>p+B|;O%LU0--9VHGhlMeKz1`v zKri!s0=DJ%Jp8G={vkBx7x_kfgt)@Rz`}19>Amu1yH6+jiBU$O@$~#YamJbzaKLYj zHwKre;HJvysTm9wEgyyI4uq2}R?-xRtK{J`ZQ#pNL2_*zR}F#d)7ohWYlDXi(hwF1 rt4r2Svf8s`u18HGh`wwk=PUgKeSm<1APZGU00000NkvXXu0mjfrQ-Az literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/big_pokeball_map.bin b/graphics/battle_transitions/big_pokeball_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..691e16ef7a9e80f4ddd8541400262278d24703f5 GIT binary patch literal 1200 zcmd7R$Bu(Q5Jl13_H&kV&N=`8|Bc%oO0aOjViwa^0wHv|KmzzrtBj~nrK*agvR;>; zavriqod)5P!mEbrsui$JT8WG2w~fb^no+x}ot7yZ)XuRTx?gQq9d~XoD>HM0damuK z?1?jHo$QT+`mP-?v@Tq^>Y|}FaP5e(b>q%mH;t{4YbTVf2Tz`QsANrCJ2m;chq<`J z)U`9_S)HSWi7B?&A?wbQC| zcA}sp9`g58M$wqggi*xh1YFfc)|J1{U1ySwv``5xxsJowPOh zH;E+LedtRx{W!x}&i%!qKS?ArK=wC~K@8UaJ%phQll`41p9@?J;xL>Mq%e|EjAjgD z8K?R2Opt6Mm$*y;SGelxFo{$lCNo9!PE6JOwBqa<*Cj9Hh6_KP8CpNHSnoLal<#}M z%efcn{!MNf9cGax{n^YZ!T(~Nx7*wi#a-?h`MJ!K?tB)o(CBcV2RszTBOV+1MWm?+ z7PEwa9D_O1jl)W*Oq*9cFYLse&lv1RWF};)+)sz7ClmGw#qzu6N000HK zNkl-vje zB-!6LUhEsBN>N)fWsi(XX$oHisiH(}XI*x)Ar6VB>;u0-e&XCz*)yY3UJkj_fL1FFZcragEPTBTqdEYm4v>>*m4oTMZ0FmcUIwX3IaeVZqGMA`y%LwL|> z1LOfgSR}1V8_ZI+YHoj3P<->=Qw6CZq&o@bhNzI}d5@5TU5~Ha!7CY_^qKw1^RAn7 zUT{bkm_uSn>wg0Px;Q7uY>@64s*qrMtO|9Y{q6E=%I+dkvnaSlQAo@U?SCN;l?Xb9 z0=TVJ$rW@a%ftF&$X%J&Tl0)TsvwX5g^aR5(E&v^h-yQ$eLZ-t?PnAeGchmF)aIMP z!;~8i@^s(16kq_zBl=c;j3%OVpWULlIBvZ&EanAr)+6fS?K~U>hTOoAyer2?DQ{?| zL&}>$dHmGGo-vENDaJSAiHX2$cB(=;!uW}C=KXs0RbW7Gi0|nFA(nMJVDk6$T~por^d)v zw7}gW%x9(5(?qrRJx~8gq3jY|kPn{rMop?HGDzZxE)=4OXl`|aRG9%JNqW_<09b?`JmVjf&59~hIDHCPR;jM|})?FXcO&3E^)TZkxW6icMZOt!wm1LO4q zN~tU7Z%)0hp$^{s`VDE4-2E1!Kk!Evrgp%*-@Hc1rU%qgyBg$l!;s*@=&x_H?yCx_aeTUo^$Zdj@nC1o)f`&E8e3wI}Fa%k$7lag1E|6wD z9kR`yyh6H35@bh($07*qoM6N<$g2Q<0I{*Lx literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/frontier_squares.bin b/graphics/battle_transitions/frontier_squares.bin new file mode 100644 index 0000000000000000000000000000000000000000..e649791349bb4b84e11af372eaf7881c0a072158 GIT binary patch literal 32 icmV~$hYi3W001E3-mU*XD+E!J6;;y>)3P0(-}L|okN}wg literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/frontier_squares_1.png b/graphics/battle_transitions/frontier_squares_1.png new file mode 100644 index 0000000000000000000000000000000000000000..7ceb90434818b36409f8e6d9bf9fee9f6ae1cdf5 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*Cd9d|NsAQx%ywT`+sqD zGn@@%{AXae_wC-%XJ^-3Jv!y+mg+5QfSQ~#TmAv5E1oWnAsQ1)C))BIGT>>gW<8#~ zY{JBoA5Zk&3~~$LcL>Zsz&XK!`JZO4(h=!Z&sP6VvghCKzPxhA`MJv;*1g?Q!|1@z zRGh`QfkUc+D}z1M&O0!N!7!OwuSlru7K50DjKXEUNmVUu3QwE1G;+nvFm^5pknEn7 zrghOFfrZuK(!K_*tqV4H2 zzlv|xfwHwH*Khsf#dS02OXQcUNnay#*f;)Cv*Eu#$#(kv&~xYgE*tE%-fQ>i#)|?A T$E@=}|1o&F`njxgN@xNAYR-$o literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/frontier_squares_2.png b/graphics/battle_transitions/frontier_squares_2.png new file mode 100644 index 0000000000000000000000000000000000000000..24467544c1bbac19fddcbb0eee79e7e4a4d3ebcc GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*Cd9d|NsAQx%ywT`+sqD zGn@@%{AXae_wC-%XJ^-3Jv!y+mg+5QfSQ~#TmAv5nVv3=AsQ3cUc4xHM1h0l!j=s| z4sL51w*OzW=7FC>Z~6U)hdu8ZNE=*#zJ8rJ2n_?+svgI?D<-T)oR;OXk; Jvd$@?2>??_b4~yN literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/frontier_squares_3.png b/graphics/battle_transitions/frontier_squares_3.png new file mode 100644 index 0000000000000000000000000000000000000000..3bf0c57206d596a9d89d6f913e8f86c569e881cd GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*Cd9d|NsAQx%ywT`+sqD zGn@@%{AXae_wC-%XJ^-3Jv!y+mg+5QfSQ~#TmAv5B2O2`5RHjvFC64Npuoc#5Z+PG zAjm#p2IH>(7PlDJOuKaCUX_N)lP?~13hV4o{pINh%TTIhG`Qg;x`Bl|Mo4Fio!P+WDu zT{*Q`gNO literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/frontier_squares_blanktiles.png b/graphics/battle_transitions/frontier_squares_blanktiles.png new file mode 100644 index 0000000000000000000000000000000000000000..92c401d7783ca841b6019ffd5a50b2b8c11b37f4 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5Z5Gzr2qf_Z@Kzkv-^K> zbu*j|Wc+7fxcBYe(PwAZTs=DF=$7g&Yk-=ZGF$!uDM3#c#}JO0$q5Wi{~ZoENHR0n XxX3>g4UdfhN-}u5`njxgN@xNAlq53q literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/glacia_bg.pal b/graphics/battle_transitions/glacia_bg.pal new file mode 100644 index 0000000000..4aac79feca --- /dev/null +++ b/graphics/battle_transitions/glacia_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +255 82 172 +255 98 189 +255 115 205 +255 131 222 +255 148 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/groudon.bin b/graphics/battle_transitions/groudon.bin new file mode 100644 index 0000000000000000000000000000000000000000..6432affbf1c8192975ab8ee0b119c9aad0b4226e GIT binary patch literal 2048 zcmeIyGBYzXGcz+Yz4dv3^W%DFx6>$5p5Qi?c8;U@ytX67gD_Y! z!Vw`g5>ci`BL=bdobUXk6*Ru-p~wEXJ`VBlicdhI)FdP$C8YmSpDNvHNSA6M1DS5h zLUu_1p*}~teaJVX$%WfLbh$czDH+SUvExF5m-G8&w zXPzx+)!c^m0Kdmw?r@uq-&Eh>noe}7wtvy?0KdU?8Ef+X)ga%4UO(T5etTwmSGde2 zE^>kMBApY>sUJ`^h#}3x7!g0q8BTMGlbql<$8?2J^`mOWFpddKVhYok!L0ZZ4yzgB zpymPfbLuV3V*!g;!ZKEzZ`sd2H5Pl>|hsr0luAWxLHE-d=nelAgZ2qtW}@m`eU5n6lXYx<1cWDD_rBo zUWZ=Ru$on@WChDv#!~v+6@L6J?r@I>JmSfSXS|s4iZ{HQnU^IjHvL5`WC8O{%44p( z!jJdh!+*za{uH0hEcb1h%y3gW(TB000BdNkloEa;ZvuR@KQdZuM!wG??peqQ$XLjBqI4u^FjL1DUrNj z1DQ4=XUud+IEJA8azY!5#7I`vidpZRSkik0k@Q;{dJP{>j;`0e z3|H&}v}@XSQZ${I`rkzX?(R+i|G&Z%bNi1#Q6d7o>oTBc23;lZi!{?BFTo6ycTEZ0 z+#Ce7Xs@m?>OY09aJ2wfY8=oeK-<2}|4CYH1K>W*-`|e{M-<9}8B?l&eP=0(Twt#N zBw=r-_1=8*#`c!y@V>s@;kRZ0w5Jq?z)1x!3{Fa^CLo<0U^}k}>|7uY+pB@!Z;u1t z?@lQ2)%ZGqJ9?eOF!uR1fUE1{z|+kM1)e+x{0qbDsbjh#;?4j7002ovPDHLkV1n>e B)W`q; literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/groudon_pt1.pal b/graphics/battle_transitions/groudon_pt1.pal new file mode 100644 index 0000000000..0a3853df4c --- /dev/null +++ b/graphics/battle_transitions/groudon_pt1.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 213 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 172 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 131 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 90 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 90 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 131 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 172 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 213 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +65 106 230 +74 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 32 172 +230 82 32 +230 16 32 +16 148 32 +16 255 230 +16 255 0 +115 115 32 +222 115 32 +255 197 222 +115 82 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/groudon_pt2.pal b/graphics/battle_transitions/groudon_pt2.pal new file mode 100644 index 0000000000..524ab4019b --- /dev/null +++ b/graphics/battle_transitions/groudon_pt2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 148 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 164 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 172 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 189 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 197 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 222 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 238 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/kyogre.bin b/graphics/battle_transitions/kyogre.bin new file mode 100644 index 0000000000000000000000000000000000000000..9fa18ed599168bb80ff7c599b1275f1d9d9f6002 GIT binary patch literal 2048 zcmeH_RYEI45Je}ryF0<%-5r9v2X}Y39p8_;fY(zQNq`+Zx;{!zb+u^F3<*FWf-El> zA-c^F22(R6h=B~SJQdZKMQ8{|1R@PT3emzxGs++$8NqOG`UkHe4)I8k4v9z-K8cCK zBru+FzVt7=hE${>U6C2c6h4y~ib`i1Q@_)~XCYhmv(J%(TsV=3eBtw%M<;Wc^Nr4C zmhc5AM3Jhuc@4!VK`F|FFJmc7SnNYPS;RsX81t8-0+pze4%Mg;U5h%@3t!JV)(Tz2 zYSC4!WChE0Tdf8(s=6jLqXn&KLpwUqsUltI7QUNZs^3u!torV+E^1tzjK*AKuM%u1SYg zu5g)4T;u}hW&RCps@g4VV+Xs~!#)mhXwvHcd*qM@+~*#5xx;O4spuv*jPoDi7$-Ot z<_zcd-g?BE+s$*HiFe8q9`i`I)w;kXuDqCQ+~5{>xW@w?@yG|>^NzQ?;k8$Wfonf#f(iGe8W%I?I5`VG}l);uU~#h>@|2EvKZtuGR>U zQG>co0YIQR8z8y}0IHh>o_w3E`Y=V8$<&s3cYQB z7O;bmXg~Z|XoB9)?_IELW3fCebWs49*uI2fkymjM0U~JZx{#?SxFG;tkevZY2ymnzRV4cq@1Wo#0^#EC$0^G82IM$cXDOx7f}A5-D_?J{sb(D8BO&B<{fiYmV^avIqfRF6MEc1Q5aP z6|@hRq7cag(1df;ps6mZ5CK};M+vsYlgM}@juV3;-6j}Um5)zxm~posb{m5L4z+Tn z%}e>1Ab_W{sR0r{U8rVDn?rzvtVjzo7vo@Hq^=VJdSVzo;Du+-E2aezoO)pdWe5Qk zBSQckN>n{Ybglw77E7IsT>fVsx*+nE-VA`mT6O>uJSZT6@CMt92xz}SI5Z``_F@|I z06Eb10CWL=2Y9&qJPHim%oFzpK&gKNkm8L2oYF15aSSCV2x!ad7)mcm5Cyh<;l5`) zuONwdCnAQS5_21<#-S?^i70}5sHR~I)X(1E&I#)0~9p8zwGmo$Y4s}TO{8(7%u>fCl zomYIArbEWVz3bW`%O8NX(_w6nJn!uZ*vfI$-pzy6v}(D>A241?AmP6Pz<&zwuWL+2C-}!kY&-J|LLHf0)P`-I6i<6CwH0I zV;bfA2LZ#r9w&`H3Rf}4Szlc(u8IzVC``f^G>ubVUo zdD}ySl`cpFzQfdZG?wxXsWq5-vainzCSE`8+qs*n_3!WnnQ@ETPDvh=00000NkvXX Hu0mjfk&KKl literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/pokeball_trail.png b/graphics/battle_transitions/pokeball_trail.png new file mode 100644 index 0000000000000000000000000000000000000000..ff2a75ee442b074742719cf3fb5b1f40f3034cba GIT binary patch literal 73 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<0wfqt3-&AkaXeidLpWw8|KMlgaS?D~VyLu~ Uf9O#*|365Lr>mdKI;Vst0NhCr=>Px# literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/rayquaza.bin b/graphics/battle_transitions/rayquaza.bin new file mode 100644 index 0000000000000000000000000000000000000000..fd1a20b0fecafdd22f2dbfd3b91a7ada6d940527 GIT binary patch literal 4096 zcmeH{Nlz3}6om^=L0uqI3jzjcXhu!I8PTX42(-ol7eGUpT!6DCYT^)w1ZU%rFsi@J zpKumu@fK&{tD+RDyV`WqQ8(nKhIill?tAy%Q{}+fuoa^?V>TZJ*n+LthC&o!J9c2F zr8DJAP>QmYy;k{hR3L)gh_Dh>*kf1qV*qiSMV!^BL9O-FqXE%SK8i*(A%TgO-Sq{8|d{bb8`LFhWr*>$&id3j=+Nv!oU_KoM^Gr7i zJAWBVS;BNg&>zM}*}!^_uVFQj~o>b+OaqJJ?REA|^P( zVUKTR3$4-^V-p*FzAh>MI&(&+bxJ4HqvLXPUDtF~vzk%2j@j`|dpSC!gF2uz`>WHg z*ryJ)%c@8Tjc8ayYE!FPWR<3vn$)OhC?8dW>MdWZ8db}xNO29Q-+K0_N|mxoQ$!Ui zx1O;5%T%foJC}*Md`kb7pAqY7By4}b!ej4OieNDg)#U literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/rayquaza.pal b/graphics/battle_transitions/rayquaza.pal new file mode 100644 index 0000000000..ac2f9009d1 --- /dev/null +++ b/graphics/battle_transitions/rayquaza.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 82 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +82 82 0 +82 82 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +180 180 0 +123 123 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +0 0 0 +255 255 0 +164 164 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +0 0 0 +255 255 115 +205 205 0 +0 0 0 +0 0 0 +255 255 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 189 +255 255 189 +255 255 189 +255 255 189 +0 0 0 +255 255 0 +164 164 0 +0 0 0 +0 0 0 +213 213 213 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +213 213 213 +213 213 213 +213 213 213 +213 213 213 +255 255 255 +180 180 0 +123 123 0 +255 255 255 +0 0 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +164 164 0 +255 255 255 +0 0 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 115 +205 205 0 +255 255 255 +0 0 0 +255 255 0 +0 115 0 +0 205 0 +123 24 0 +123 24 131 +230 246 131 +255 0 246 +255 0 8 +0 238 222 +0 16 139 +238 148 139 +0 156 74 +255 255 255 +255 255 255 +0 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +82 82 0 +0 0 0 diff --git a/graphics/battle_transitions/rayquaza.png b/graphics/battle_transitions/rayquaza.png new file mode 100644 index 0000000000000000000000000000000000000000..5c3a914749b5f85021200c247847848369b313e9 GIT binary patch literal 2308 zcmY+Gdo+~!AIHDXGmjaDF=M(7GG<&NwKYj7;t9zm6O-DOwBxd(&?J{}ou`>m+FeCc zvDi$xr4-vmavf4GOQMY&WMq^m*UBYj?K!`He&@W;`Mlnr|K8_w-sgPIxwH3>h+0Gd z0Lj_OfwMd@0H9aMGJs#m97_O{|8{oR<;lRcm5T_wybp!p~$gkERoHn3AOX4=om_ zZ0$GM29~^!436kn>blq|3cu-k3Y9%x@O0;3N0YF~EhxtpqS^5{)CMNv8ta?;+q{_= zB=qlD#q9`v{l^krx|2Unq9?DGU<5VVXr^>m{SFnBUR-FCq$Q6;Q05`gCZz}RNHsv0 z@2bAKR@BV|XJjvb?nU=5ZxKMJE%j%ZrqfwI`#>BHwAyd`EM>k59DIOZBtaDig37Mu zoo6?6Yw>;qE8>#DxYfk=a&=J9rKnTU5}<3#)gc?CF7@fu=Wa+Q(Y=0@$SfSA@QA>O ziA_T|A;r28@W+@i+8?FJu(WU~YJ2-6u_QAvbWi^AW5!yOg@i-C>a0EvzLX5@1bsk8 zgJ(a{usc>DaghsNh)3^e$dUm31;_n_0{&C*#SRk1JeeYiTNRErUBLFR|uo76;2&a`i~DNqq3k@aSeNjdS4um zu2~2Myi@?sTvcxHDo#ZB>m-$H_$sbRWFRj@g@o)UPuC!F(^M8*N{~#^`?T?GFE`iB z_ttVP!ZB5ZA09cJRa;F0M_0;s!e&3B^|vpxV4kuyH@jz@%mS^CK3I=P^=bxU>>fKg z!LKJi5Ql&m!O`AQiM-kw@tHI^C^5!-5bxM;ALMH<5@L$>Uc3ic=a4q_X(!4LbQJNpq)A^#Imec*AW;p zRaxG20>eN7If^+X{ar9C`Ai!3!$Lg=TIK$K`dJn2xl566XwjfxCeA8=;;BKkX53`x z?*;XT9eCLJg}Z-3j8JD2689fsc2K9=@Sj1QQ87lDzyEa5PV!fai={Fn_|nX^<{pJX z0JL4jtt`cw;h#3B3sOJch`1 z1{UIy_cJ!4nc_jH-prlIFj+Jduh7bD;bi@?M){&RPbtE!VOSv4M*D0u-1~=FOR>=pRCQ|r+l5Yip-)QULh&wkq7YBF_;Lt6} z4dr{5%@<;1hoA<=J{0qvSPE(~_^&NZ8l;Q-%iX=C)wk7BHAkG9eaMgX|`{dx6P zXewy0%|#7HS(wCrJ>s7G$aS8A-x5~rI&1$tMO>+qRwjj7AD_TeClGpzr~Qz7prQ2a zxnqqs`o+j6%l&QTdrnIjSKX&UMQ!2wl$l*NMW$31W83YmR0gBEQ~`ws2InTA*rzv{ zxCq~*N&S!Zz$ug!j&;5CduW+Q){wrl_$e5ZpH<6i_J^IKE?;u{@64VkV)^}2R6NG` z^-X>#lQAX=iP;PS5>i7>wg63Cq}O^huC}KM=a&*xDH$ko3{5uOVSHAoU3b9ij0`7q zGm4=pLq0r`pH%PkN{}JeKJnz22$sxMx$L`6R);Ugw{9?3yZzE7F-x<%Lf{jh-Z~=2 z&aad!G^p3(uj`bh;fA7N)HaH?RxJN##aA@XVU@Y~?l~i2Ympr}wO33IIM|)DZAbhl z!&JpU`Vpn8KyPNY(!v^fn={zsbO27#GYAznECd(% zR_Ub~6)lt7v+6tzqtWfy+yUrorqjY*p`hI$-sd9U!!XWQ68mDCK%}v{+4WXmW!Z=0 z_cqUj{;cE)jE~iActPYxfWZ^M63cASLkndmT^Bl6TeQcgLPE#NM=xTll=G{Sp*x9$ zs4*2gq|^wh8k`8+7@AvD5-cHv(60OE+@2tNxy*lsF|Dy&?_&#kWELqYHf1dvJ{c8Q z;c?$ylicI5DJdO;vV9v}g94(e#EyYabG6eB2zB7Op({YjhZfTzOwi1(N+Utp&RPSE z-_)=LEgYvdl8cyc7ahi(Rmv00*=zIBFSGmaJ0MLP{qvp-f*zVF+YTL{_0DTvgEW27 zTd_{LY5b^h7V!oq!nK^4p2~S@4_XTD54E=ptGZ5gMlHU4#20zgJX!xbVAY8k_0o=w zeWOuDqH_WFZWAAV4a?hP!@JSY;}ovg((f5Q!rAX4==rPtykwZLPf5pz_vugkXy@aH z0<|l;OP7zQu~D&dvduQqJ9U1W0*!x;TbtOq_b^ zBrk&khfAQPo8m(fM;~NRH^AVJ-!D#Hz&4xK2e%u my^m?f6c4HSSNseg)UdIoD3+dR7JdLUlfl!~&t;ucLK6VhTT4v< literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/sidney_bg.pal b/graphics/battle_transitions/sidney_bg.pal new file mode 100644 index 0000000000..1f30ed0623 --- /dev/null +++ b/graphics/battle_transitions/sidney_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +189 0 189 +205 16 205 +222 32 222 +238 49 238 +255 65 255 +106 180 213 +123 197 230 +139 213 246 +156 230 255 +172 246 255 +255 255 255 diff --git a/graphics/battle_transitions/team_aqua.bin b/graphics/battle_transitions/team_aqua.bin new file mode 100644 index 0000000000000000000000000000000000000000..3526dde59a6782cf9c15db8f2e81477784533800 GIT binary patch literal 2048 zcmeIxM^?iy6op}9NT{KA0-^U12qdBR-r4^q?%-blmXHl62kQi;U=2KwzWbgfD^L&* zg1XT}Q#{wmyH01xkWsb~`LU+XcatNh?q7OSJtWi*I!Nk|Gsb9C-T0hFHKy@Kx`_ND z3(Paetg+UI3N@=a&1*r6{uDMTu@TEJ-eiQ@P)VD<1S;$#dYdv^Y^khmt4+d=Djt8p zzSDc`Qlo12LsiwZt38*ouY=TtV~(6ZOm;H)RnGvGjMoPg gS!az^R#;}q`Xw!EMXOrVx{BZF;Q#sGfxo*0@AQ*)H2?qr literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/team_aqua.png b/graphics/battle_transitions/team_aqua.png new file mode 100644 index 0000000000000000000000000000000000000000..4b0b1ac1d3ca5877abaabfc95e16896902405ec5 GIT binary patch literal 782 zcmV+p1M&QcP)<)lEd{`JLw#LufZuWzQX-!I52UZ_od9i%3k5XOPg*Eot6K(~nmbuFIgl6% zyH2(ef_nq(3fLo{x+K6;!+WZa^19~yRf5~F%elsWDZy>nVJNWPg4^PERef6EBf1Sc zLY+BH4iGZ|E4u|NQq05xNa7A!i#`)fq6RG0R1%92sPf3IHbC}_1`{9)%t8K9wv!{k z4TC1wp96pah?)I?0pI}#IF}4qS|#M$0EqgsJB|%-_WJUyUxXuv8Jka)Dk(PK1hBsY zbafvA$L0|oWdzjZfk7+>2A~5e&17l*{1QMt@|!}mQ1x%0-}U#Qhvbp59b#6{ryetE zDDxEnoA%*#>y0dW)SK(k2zoHU#E6_14V;WPgk;j?28|eE105P>#3NktG3jfjc~EDT zpsZsLPH0OP@2NaD(_;%aibbYkwTfkVMP|(D&gY2y=01gu)hRWrL!G3iNfBKcC9w22 zk+v9;B%Tuwz;y<&X$F%tdlSfS3OM@C!#rHR4e%No55;4AbaM3&Mn;7{k71}oz6~U7 zzHEL--qndspuL@~3p+7_=9oXMkwta;$-3 zrG~~SG)TGjL)#tv=+HUYH*WcD0GpFu+Pfx63VOY~jJiSU4ba=_s;{nzfrNLpzS|}S z65Zv}CldqdN^eJZmZ##T!CYQ%4AhJDX9H=xrUt;z`t(l!U;a`404JRlIXHR;wg3PC M07*qoM6N<$f(*e?pa1{> literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/team_magma.bin b/graphics/battle_transitions/team_magma.bin new file mode 100644 index 0000000000000000000000000000000000000000..5c90fbf6af2b47e321e507c085bd458d7ace4b8f GIT binary patch literal 2048 zcmeH_#dhQ{5JfxWFf%hVGcz+YGynKo+z%MF+i~1EoylUB6TfrpDoOWARhCb_e-}Pi zVQyrPdA!3s@s~YaCYBhY-OM<+OtfMY>t@~=v&JRTNh6gMCr>8XAySm8G^PK@7m!aL zx#Sp!Y_iBwwqbIVt32ha;0L~nN-8L)j8emwP)xB(3{$Eym8(LPs`_y7RQ7rPW}2{! z8fl=OI%=s^o$A$~Mp;HpYW@q~MJF9LZ_!R0t^Qc8YE!#STk24!x&jU%_V1^UUWf0Y zI}jPNTRjfnt3LIA%MUTgfW!N%u;q~c(_0$QpoT*6<_}IV&KRQ~ocWG0%&q|Z)v5{NTgVKd44cnTW(c)>^1k2aw*&ug2mSy>{FEI4 literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/team_magma.png b/graphics/battle_transitions/team_magma.png new file mode 100644 index 0000000000000000000000000000000000000000..44ffed071c82f2ab0838eb23734ffb9b1eb7df11 GIT binary patch literal 1084 zcmV-C1jGA@P)0-Or~^ZW)4f%*crtN_mU-GEI1&`*-^H~^=-2$?@82?Z_6i#4;M9wiLm z5TM=Q2FydjMWv%ZaVcs9aL|+S66CN>G9rT>wFqotAOdJF`+SQ)7T^Y(j}C_E85r|N zpMlJPEaNrLzKz`AHPpA}XaeKnF`{lV2~Y!|;_ndC_(MI+K=45Z?gN*T1K>D?Z@>DK zmF`I-56^zJ9)$&*Jd7eaClRwGu4aSOn`KnJltM}gs1v~J7)8eKq8zk;D!_sGWq`^7 z1t^VFt85$rT;z2spdJbvM=7WhKW7iJ4DpokbM{c!H~~XM`91c9gv-4Yb-)x3Hs zmKBNv$CC~04pdNpSPOOWr5J!;*@JCb34;K*J=nuf06bY3x!Hp+Lx39=4@I*{M*sz+ zfNcx)=1Ly~u2U+Ay+QE;qx7=d2SVwDr4Vp6_TeFSr8Vo)P;S$Zdtu(_vHT$)lvobA z7bXKF6LbrNfa6-}0g#X80XYM}5+&THZBqP-KxWBZtXsXLA?&7dVnrHmRX3hr?Uw+* z`3RweUbZcVupa?RIOi=3Np2nbLaXedvR9yZgk0qW(D|`cH36}bbFhX^2>4kl8Gke> z9|A(5DsX)R9tHH+odA_yH11TZ0k|AEzXFw%vjlWVWglJK5EBQPHjck^m7NDwB4-xyxc9918PF%-+-Q6$MnLGmZm2*PsK!v6NKX_ z%uCH4-MgpJLCk#=*6h_o|5n#NYq+_ZUTSK_C*?`fE3~~{mV(jl>R9H7LL#)G+9nf{ zVmKU_Ow`@up7h|hc8s^A65uVFHgpe^IFc2Z_*mu#PBb*L4k ze-F-Jfht++0iqE7dw`X?04&1(Kj59Esr(9novW_$2`b0MMbGX@JV5L^j;;S2 zSX%$jK>a7szKK|Rp7(ehcs>GJJrv;oJ}&hCF~(m5Fk0;=I;N+TD_cF|6*FjK|%lj{{R30ViWUa0004I zNkln|&17F< zJC;-W*0yh zuQ-|J6>wFxF>IKK_@_Vu$pl9c0C`!+MAVO~xB-w?f;DGSKh6QVZcdQ5vUv96XSfDf zw?eRN&SCHYNXRULB`-J!6l;J5ewJT@1bzaLta=*nWc8CJ-Udk=@8WCV-g}4lS1~M_ z##(!^%ro#`va5~##++imnSsBYfKA&PUt)e2V2qu(7Pful>}bPXz&p>qcjH-5jhs!b z`xqaQ_DkynUALcvDwxifR{sVfoYx%!$Ep$5+KH~@dLUBy!^gJ RnwS6p002ovPDHLkV1oK;)KdTe literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/unused_lass.png b/graphics/battle_transitions/unused_lass.png new file mode 100644 index 0000000000000000000000000000000000000000..378fa3c19fc46d2795300bb90e7e7e48c68c4449 GIT binary patch literal 412 zcmV;N0b~A&P)5Fk0;=I;N+TD_cF|6*FjK|%lj{{R30ViWUa0003e zNkl~>TnP_T4vK10F^cpfR83BF9F)B%ym2gK+vxAbLH=WQc&Sb z;Ik2{6OoCa{6FT7>;a)LqAYEmM{`x5D0{sJxMr@rR#okg_a3U|er8sd)QLg8n|Bj2 zzFY(Jeg}ft!2vL{fm=|)4nq4)Q2l5k!g(KKxD8_00AzmTE$8=`>L;-U*qR@$Mz}uP z@c@2{2K5GT5MG`U&H!`>tj^RmpmU>DmdAPzT&m=64wY0000I^HwnxSHj4c1icut5+fFuYNnb=G&a^Z&_Ja zy}Y()YEI$!_Kf4+QI4}qIQBMktV!aC3d#bK3=C_4>c4%v_w4Gudt2_EopSGJ^}Q`o z_tse6nyFUcJ$u6Emz+yIs0tN(PzzjpTSik+XWQd+w6F> zIqBZs=IS5`h?*_c)$i`D0g5{+F#Km=$l7vMvwBJO6vJ=dzQGN_!+2KRy~MB>qClgc z`2vu&!PCVtB%<~0m1w>e1s>K5@9HmKJ;KuUWofQg&mH}@wihKs7|Md0)2}!(?%-dx zk844}GiC$E73?J^{vLat@T!)iHXR0Su^)h%w zURtBRn}KJuLBjuKoF_se)a5f~R!j4=yv?2P+3BAtd;g33wgqOhv_QV_boFyt=akR{ E00^+#3jhEB literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/vs_frame.bin b/graphics/battle_transitions/vs_frame.bin new file mode 100644 index 0000000000000000000000000000000000000000..2ad1539649a0194c0349f5be5c181e90c8490903 GIT binary patch literal 2048 zcmZQgU_*oK2@E6vjs#9L$Tg~eH2jDT0qz7IG{{R*`XSn)QH7%+Fd71*Aut*OC?Nm< DnI0`4 literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/vs_frame.png b/graphics/battle_transitions/vs_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..0b38c8960d945627464377f51811bdfdb8d21b3e GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^5ZkJeps3F6Jxexu4(P**ATD{^qVfhi&=$#WULyk1zi} zf5EHEpB$|kjMilG+`n|mu91N`+s(3N@%k^Fii-|ODo%d4gys6-TZ|@xX;RUgS1JS& zwB4RBX>?$i63oYx%P7!iC@^Eob|;I3@KsY33#V8yO|W>!=^^u(Wy4Yfz9W_ad^Z*r z@SWfW;$k4a&B1456=3o1#GF0`7WNkb1`U;rJPGrdnP+TgXJ=rz{<7q;-M%Z|fPP}| MboFyt=akR{0Ev2mnE(I) literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/wallace_bg.pal b/graphics/battle_transitions/wallace_bg.pal new file mode 100644 index 0000000000..30da9c5f98 --- /dev/null +++ b/graphics/battle_transitions/wallace_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +197 197 65 +213 213 82 +230 230 98 +246 246 115 +255 255 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index b0d30751cb..fb96dd9ad1 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -5,6 +5,7 @@ monpaldir := graphics/pokemon/palettes tilesetdir := data/tilesets fontdir := data/graphics/fonts roulgfxdir := graphics/roulette +battletransgfxdir := graphics/battle_transitions $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ @@ -301,4 +302,23 @@ $(roulgfxdir)/roulette_tilt.4bpp: $(roulgfxdir)/shroomish.4bpp $(roulgfxdir)/tai @cat $(roulgfxdir)/shroomish.4bpp $(roulgfxdir)/tailow.4bpp >$@ $(roulgfxdir)/poke_icons2.4bpp: $(roulgfxdir)/wynaut.4bpp $(roulgfxdir)/azurill.4bpp $(roulgfxdir)/skitty.4bpp $(roulgfxdir)/makuhita.4bpp - @cat $(roulgfxdir)/wynaut.4bpp $(roulgfxdir)/azurill.4bpp $(roulgfxdir)/skitty.4bpp $(roulgfxdir)/makuhita.4bpp >$@ + @cat $^ >$@ + +$(battletransgfxdir)/85BBC14.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(battletransgfxdir)/rayquaza.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 938 + +$(battletransgfxdir)/frontier_square_1.4bpp: $(battletransgfxdir)/frontier_squares_blanktiles.4bpp $(battletransgfxdir)/frontier_squares_1.4bpp + @cat $^ >$@ + +$(battletransgfxdir)/frontier_square_2.4bpp: $(battletransgfxdir)/frontier_squares_blanktiles.4bpp $(battletransgfxdir)/frontier_squares_2.4bpp + @cat $^ >$@ + +$(battletransgfxdir)/frontier_square_3.4bpp: $(battletransgfxdir)/frontier_squares_blanktiles.4bpp $(battletransgfxdir)/frontier_squares_3.4bpp + @cat $^ >$@ + +$(battletransgfxdir)/frontier_square_4.4bpp: $(battletransgfxdir)/frontier_squares_blanktiles.4bpp $(battletransgfxdir)/frontier_squares_4.4bpp + @cat $^ >$@ + diff --git a/ld_script.txt b/ld_script.txt index b57666c64d..e6559dba80 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -435,7 +435,7 @@ SECTIONS { data/roulette.o(.rodata); data/pokedex_cry_screen.o(.rodata); src/landmark.o(.rodata); - data/data4d.o(.rodata); + data/battle_transition.o(.rodata); src/battle_controller_link_partner.o(.rodata); src/battle_message.o(.rodata); data/cable_car.o(.rodata);