diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-27 15:25:15 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-27 15:25:15 -0600 |
| commit | ca49f8438d1d31c9b95e508224f7ce3cb29112f6 (patch) | |
| tree | 07b8470286bb4a681de4e9e6f3e1fc40cdfefc21 | |
| parent | f9a9391ff38fb78636efebbfd1da4c05b93c6026 (diff) | |
Extract battle_transition data
57 files changed, 2265 insertions, 345 deletions
diff --git a/asm/battle_transition.s b/asm/battle_transition.s index b7f2746ec..d7f6b9e03 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 000000000..bd0386e2b --- /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 2ab3b7dfb..000000000 --- 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 Binary files differnew file mode 100644 index 000000000..a08310737 --- /dev/null +++ b/graphics/battle_transitions/85BBC14.png diff --git a/graphics/battle_transitions/85BC2B4.pal b/graphics/battle_transitions/85BC2B4.pal new file mode 100644 index 000000000..f508de938 --- /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 000000000..6a46ddacf --- /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 000000000..2a65c3a9e --- /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 Binary files differnew file mode 100644 index 000000000..37149e37b --- /dev/null +++ b/graphics/battle_transitions/85BC314.bin diff --git a/graphics/battle_transitions/85BCB14.bin b/graphics/battle_transitions/85BCB14.bin Binary files differnew file mode 100644 index 000000000..29fde971c --- /dev/null +++ b/graphics/battle_transitions/85BCB14.bin diff --git a/graphics/battle_transitions/85BD314.bin b/graphics/battle_transitions/85BD314.bin Binary files differnew file mode 100644 index 000000000..cd1a672b5 --- /dev/null +++ b/graphics/battle_transitions/85BD314.bin diff --git a/graphics/battle_transitions/85BDB14.pal b/graphics/battle_transitions/85BDB14.pal new file mode 100644 index 000000000..920669dcd --- /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 Binary files differnew file mode 100644 index 000000000..21b227441 --- /dev/null +++ b/graphics/battle_transitions/big_pokeball.png diff --git a/graphics/battle_transitions/big_pokeball_map.bin b/graphics/battle_transitions/big_pokeball_map.bin Binary files differnew file mode 100644 index 000000000..691e16ef7 --- /dev/null +++ b/graphics/battle_transitions/big_pokeball_map.bin diff --git a/graphics/battle_transitions/brendan_bg.pal b/graphics/battle_transitions/brendan_bg.pal new file mode 100644 index 000000000..e43b0f74c --- /dev/null +++ b/graphics/battle_transitions/brendan_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 180 213 +123 197 230 +139 213 246 +156 230 255 +172 246 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 diff --git a/graphics/battle_transitions/drake_bg.pal b/graphics/battle_transitions/drake_bg.pal new file mode 100644 index 000000000..6717a90bd --- /dev/null +++ b/graphics/battle_transitions/drake_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 +0 0 131 +16 16 148 +32 32 164 +49 49 180 +65 65 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/elite_four_bg.png b/graphics/battle_transitions/elite_four_bg.png Binary files differnew file mode 100644 index 000000000..1d327cdaf --- /dev/null +++ b/graphics/battle_transitions/elite_four_bg.png diff --git a/graphics/battle_transitions/elite_four_bg_map.bin b/graphics/battle_transitions/elite_four_bg_map.bin Binary files differnew file mode 100644 index 000000000..4f170b470 --- /dev/null +++ b/graphics/battle_transitions/elite_four_bg_map.bin diff --git a/graphics/battle_transitions/evil_team.pal b/graphics/battle_transitions/evil_team.pal new file mode 100644 index 000000000..c76de7dfe --- /dev/null +++ b/graphics/battle_transitions/evil_team.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +106 106 106 +164 164 164 +205 205 205 +65 65 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 32 74 +230 82 123 +255 255 255 diff --git a/graphics/battle_transitions/frontier_brain.bin b/graphics/battle_transitions/frontier_brain.bin Binary files differnew file mode 100644 index 000000000..968b6eaca --- /dev/null +++ b/graphics/battle_transitions/frontier_brain.bin diff --git a/graphics/battle_transitions/frontier_brain.png b/graphics/battle_transitions/frontier_brain.png Binary files differnew file mode 100644 index 000000000..25af2e3ab --- /dev/null +++ b/graphics/battle_transitions/frontier_brain.png diff --git a/graphics/battle_transitions/frontier_squares.bin b/graphics/battle_transitions/frontier_squares.bin Binary files differnew file mode 100644 index 000000000..e64979134 --- /dev/null +++ b/graphics/battle_transitions/frontier_squares.bin diff --git a/graphics/battle_transitions/frontier_squares_1.png b/graphics/battle_transitions/frontier_squares_1.png Binary files differnew file mode 100644 index 000000000..7ceb90434 --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_1.png diff --git a/graphics/battle_transitions/frontier_squares_2.png b/graphics/battle_transitions/frontier_squares_2.png Binary files differnew file mode 100644 index 000000000..24467544c --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_2.png diff --git a/graphics/battle_transitions/frontier_squares_3.png b/graphics/battle_transitions/frontier_squares_3.png Binary files differnew file mode 100644 index 000000000..3bf0c5720 --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_3.png diff --git a/graphics/battle_transitions/frontier_squares_4.png b/graphics/battle_transitions/frontier_squares_4.png Binary files differnew file mode 100644 index 000000000..3f79a382d --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_4.png diff --git a/graphics/battle_transitions/frontier_squares_blanktiles.png b/graphics/battle_transitions/frontier_squares_blanktiles.png Binary files differnew file mode 100644 index 000000000..92c401d77 --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_blanktiles.png diff --git a/graphics/battle_transitions/glacia_bg.pal b/graphics/battle_transitions/glacia_bg.pal new file mode 100644 index 000000000..4aac79fec --- /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 Binary files differnew file mode 100644 index 000000000..6432affbf --- /dev/null +++ b/graphics/battle_transitions/groudon.bin diff --git a/graphics/battle_transitions/groudon.png b/graphics/battle_transitions/groudon.png Binary files differnew file mode 100644 index 000000000..aec84e4b5 --- /dev/null +++ b/graphics/battle_transitions/groudon.png diff --git a/graphics/battle_transitions/groudon_pt1.pal b/graphics/battle_transitions/groudon_pt1.pal new file mode 100644 index 000000000..0a3853df4 --- /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 000000000..524ab4019 --- /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 Binary files differnew file mode 100644 index 000000000..9fa18ed59 --- /dev/null +++ b/graphics/battle_transitions/kyogre.bin diff --git a/graphics/battle_transitions/kyogre.png b/graphics/battle_transitions/kyogre.png Binary files differnew file mode 100644 index 000000000..53949ed79 --- /dev/null +++ b/graphics/battle_transitions/kyogre.png diff --git a/graphics/battle_transitions/kyogre_pt1.pal b/graphics/battle_transitions/kyogre_pt1.pal new file mode 100644 index 000000000..4cabc773e --- /dev/null +++ b/graphics/battle_transitions/kyogre_pt1.pal @@ -0,0 +1,163 @@ +JASC-PAL +0100 +160 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +0 0 0 diff --git a/graphics/battle_transitions/kyogre_pt2.pal b/graphics/battle_transitions/kyogre_pt2.pal new file mode 100644 index 000000000..7f7976ece --- /dev/null +++ b/graphics/battle_transitions/kyogre_pt2.pal @@ -0,0 +1,227 @@ +JASC-PAL +0100 +224 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 0 0 +0 0 0 +0 0 0 +156 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 0 0 +0 0 0 +0 0 0 +189 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 0 0 +0 0 0 +0 0 0 +230 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 0 0 +0 0 0 +0 0 0 +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 +255 0 0 +0 0 0 +0 0 0 +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 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 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 +255 0 0 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +230 0 0 diff --git a/graphics/battle_transitions/may_bg.pal b/graphics/battle_transitions/may_bg.pal new file mode 100644 index 000000000..8ebd38309 --- /dev/null +++ b/graphics/battle_transitions/may_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 123 139 +246 139 156 +255 156 172 +255 172 189 +255 189 205 +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 diff --git a/graphics/battle_transitions/phoebe_bg.pal b/graphics/battle_transitions/phoebe_bg.pal new file mode 100644 index 000000000..b55e6a6cd --- /dev/null +++ b/graphics/battle_transitions/phoebe_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 +8 213 8 +32 238 32 +49 246 49 +74 255 74 +123 255 123 +230 123 139 +246 139 156 +255 156 172 +255 172 189 +255 189 205 +230 123 139 diff --git a/graphics/battle_transitions/pokeball.png b/graphics/battle_transitions/pokeball.png Binary files differnew file mode 100644 index 000000000..3802a915b --- /dev/null +++ b/graphics/battle_transitions/pokeball.png diff --git a/graphics/battle_transitions/pokeball_trail.png b/graphics/battle_transitions/pokeball_trail.png Binary files differnew file mode 100644 index 000000000..ff2a75ee4 --- /dev/null +++ b/graphics/battle_transitions/pokeball_trail.png diff --git a/graphics/battle_transitions/rayquaza.bin b/graphics/battle_transitions/rayquaza.bin Binary files differnew file mode 100644 index 000000000..fd1a20b0f --- /dev/null +++ b/graphics/battle_transitions/rayquaza.bin diff --git a/graphics/battle_transitions/rayquaza.pal b/graphics/battle_transitions/rayquaza.pal new file mode 100644 index 000000000..ac2f9009d --- /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 Binary files differnew file mode 100644 index 000000000..5c3a91474 --- /dev/null +++ b/graphics/battle_transitions/rayquaza.png diff --git a/graphics/battle_transitions/shrinking_box.png b/graphics/battle_transitions/shrinking_box.png Binary files differnew file mode 100644 index 000000000..cde6f2107 --- /dev/null +++ b/graphics/battle_transitions/shrinking_box.png diff --git a/graphics/battle_transitions/sidney_bg.pal b/graphics/battle_transitions/sidney_bg.pal new file mode 100644 index 000000000..1f30ed062 --- /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 Binary files differnew file mode 100644 index 000000000..3526dde59 --- /dev/null +++ b/graphics/battle_transitions/team_aqua.bin diff --git a/graphics/battle_transitions/team_aqua.png b/graphics/battle_transitions/team_aqua.png Binary files differnew file mode 100644 index 000000000..4b0b1ac1d --- /dev/null +++ b/graphics/battle_transitions/team_aqua.png diff --git a/graphics/battle_transitions/team_magma.bin b/graphics/battle_transitions/team_magma.bin Binary files differnew file mode 100644 index 000000000..5c90fbf6a --- /dev/null +++ b/graphics/battle_transitions/team_magma.bin diff --git a/graphics/battle_transitions/team_magma.png b/graphics/battle_transitions/team_magma.png Binary files differnew file mode 100644 index 000000000..44ffed071 --- /dev/null +++ b/graphics/battle_transitions/team_magma.png diff --git a/graphics/battle_transitions/unused_brendan.png b/graphics/battle_transitions/unused_brendan.png Binary files differnew file mode 100644 index 000000000..926ba0ff7 --- /dev/null +++ b/graphics/battle_transitions/unused_brendan.png diff --git a/graphics/battle_transitions/unused_lass.png b/graphics/battle_transitions/unused_lass.png Binary files differnew file mode 100644 index 000000000..378fa3c19 --- /dev/null +++ b/graphics/battle_transitions/unused_lass.png diff --git a/graphics/battle_transitions/unused_trainer.pal b/graphics/battle_transitions/unused_trainer.pal new file mode 100644 index 000000000..ad94d728a --- /dev/null +++ b/graphics/battle_transitions/unused_trainer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/battle_transitions/vs.png b/graphics/battle_transitions/vs.png Binary files differnew file mode 100644 index 000000000..a1badcb02 --- /dev/null +++ b/graphics/battle_transitions/vs.png diff --git a/graphics/battle_transitions/vs_frame.bin b/graphics/battle_transitions/vs_frame.bin Binary files differnew file mode 100644 index 000000000..2ad153964 --- /dev/null +++ b/graphics/battle_transitions/vs_frame.bin diff --git a/graphics/battle_transitions/vs_frame.png b/graphics/battle_transitions/vs_frame.png Binary files differnew file mode 100644 index 000000000..0b38c8960 --- /dev/null +++ b/graphics/battle_transitions/vs_frame.png diff --git a/graphics/battle_transitions/wallace_bg.pal b/graphics/battle_transitions/wallace_bg.pal new file mode 100644 index 000000000..30da9c5f9 --- /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 b0d30751c..fb96dd9ad 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 b57666c64..e6559dba8 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); |
