diff options
171 files changed, 2941 insertions, 2211 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 00a8b4d92..4a445d524 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5393,7 +5393,7 @@ _080CA0C2: thumb_func_start sub_80CA0C8 sub_80CA0C8: @ 80CA0C8 push {lr} - ldr r0, =gUnknown_08572744 + ldr r0, =gWaveformSpritePalette bl LoadSpritePalette pop {r0} bx r0 @@ -5498,7 +5498,7 @@ sub_80CA154: @ 80CA154 sub_80CA1C4: @ 80CA1C4 push {r4,lr} sub sp, 0x8 - ldr r0, =gUnknown_0857274C + ldr r0, =gWaveformSpriteSheet ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] @@ -10135,7 +10135,7 @@ _080CC7E6: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_085775B8 + ldr r1, =gWallpaperTable adds r6, r0, r1 ldr r0, [r6, 0x4] ldr r1, [r7] @@ -10646,7 +10646,7 @@ _080CCC70: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - ldr r0, =gUnknown_0857B0A8 + ldr r0, =gSpriteTemplate_857B0A8 movs r2, 0x1C movs r3, 0x18 bl CreateSprite @@ -10720,7 +10720,7 @@ sub_80CCCFC: @ 80CCCFC ldr r0, =0x00030200 str r0, [r3, 0x4] add r1, sp, 0x4 - ldr r0, =gUnknown_0857B0A8 + ldr r0, =gSpriteTemplate_857B0A8 ldm r0!, {r5-r7} stm r1!, {r5-r7} ldm r0!, {r5-r7} @@ -16240,14 +16240,14 @@ sub_80CFC14: @ 80CFC14 push {r4-r6,lr} sub sp, 0x2C mov r1, sp - ldr r0, =gUnknown_0857B9E4 + ldr r0, =gHandCursorSpriteSheets ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} add r4, sp, 0x18 adds r1, r4, 0 - ldr r0, =gUnknown_0857B9FC + ldr r0, =gHandCursorSpritePalettes ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldr r0, [r0] @@ -16279,7 +16279,7 @@ sub_80CFC14: @ 80CFC14 adds r2, r4, 0 adds r3, r5, 0 bl sub_80CD444 - ldr r0, =gUnknown_0857BA50 + ldr r0, =gSpriteTemplate_857BA50 movs r2, 0 ldrsh r1, [r4, r2] movs r3, 0 @@ -16353,7 +16353,7 @@ _080CFD3C: movs r3, 0x15 movs r4, 0x2 _080CFD40: - ldr r0, =gUnknown_0857BA68 + ldr r0, =gSpriteTemplate_857BA68 movs r1, 0 movs r2, 0 bl CreateSprite @@ -18324,7 +18324,7 @@ sub_80D0C60: @ 80D0C60 orrs r0, r1 str r0, [r2, 0x4] mov r1, sp - ldr r0, =gUnknown_0857BC70 + ldr r0, =gSpriteTemplate_857BC70 ldm r0!, {r4-r6} stm r1!, {r4-r6} ldm r0!, {r4-r6} @@ -21660,7 +21660,7 @@ sub_80D2644: @ 80D2644 mov r2, r9 ldr r1, [r2] adds r5, r1 - ldr r2, =gUnknown_0857BC88 + ldr r2, =gSpriteTemplate_857BC88 lsls r4, 2 lsls r1, r0, 4 adds r4, r1 diff --git a/asm/unk_sprite_file.s b/asm/unk_sprite_file.s deleted file mode 100755 index 5a25b8e08..000000000 --- a/asm/unk_sprite_file.s +++ /dev/null @@ -1,607 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81DA700 -sub_81DA700: @ 81DA700 - push {lr} - sub sp, 0x8 - add r1, sp, 0x4 - mov r0, sp - bl sub_8149F58 - ldr r0, =gUnknown_0862AD54 - ldr r1, [sp, 0x4] - bl LZ77UnCompVram - ldr r0, =gUnknown_0862AF30 - ldr r1, [sp] - bl LZ77UnCompVram - ldr r0, =gUnknown_0862B53C - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_0862B724 - bl LoadCompressedObjectPic - ldr r0, =gUnknown_0862B72C - bl LoadSpritePalette - add sp, 0x8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DA700 - - thumb_func_start sub_81DA74C -sub_81DA74C: @ 81DA74C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r5, r0, 0 - adds r6, r1, 0 - ldr r0, [sp, 0x24] - ldr r1, [sp, 0x28] - ldr r4, [sp, 0x2C] - lsls r2, 24 - lsrs r2, 24 - str r2, [sp] - lsls r3, 24 - lsrs r3, 24 - mov r10, r3 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r4, 24 - lsrs r7, r4, 24 - ldr r0, =gUnknown_0862B758 - lsls r5, 16 - asrs r5, 16 - lsls r6, 16 - asrs r6, 16 - adds r1, r5, 0 - adds r2, r6, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r5, r0, 24 - cmp r7, 0x1 - beq _081DA7D0 - cmp r7, 0x1 - bgt _081DA7A8 - cmp r7, 0 - beq _081DA7B8 - b _081DA7AC - .pool -_081DA7A8: - cmp r7, 0x2 - beq _081DA7E4 -_081DA7AC: - ldr r6, =gSprites - lsls r3, r5, 4 - b _081DA7F8 - .pool -_081DA7B8: - ldr r2, =gSprites - lsls r3, r5, 4 - adds r0, r3, r5 - lsls r0, 2 - adds r0, r2 - movs r1, 0x78 - strh r1, [r0, 0x2E] - movs r1, 0x2D - b _081DA7F4 - .pool -_081DA7D0: - ldr r2, =gSprites - lsls r3, r5, 4 - adds r0, r3, r5 - lsls r0, 2 - adds r0, r2 - movs r1, 0x59 - b _081DA7F0 - .pool -_081DA7E4: - ldr r2, =gSprites - lsls r3, r5, 4 - adds r0, r3, r5 - lsls r0, 2 - adds r0, r2 - movs r1, 0x97 -_081DA7F0: - strh r1, [r0, 0x2E] - movs r1, 0x61 -_081DA7F4: - strh r1, [r0, 0x30] - adds r6, r2, 0 -_081DA7F8: - adds r4, r3, r5 - lsls r4, 2 - adds r0, r4, r6 - mov r2, r8 - lsls r1, r2, 24 - asrs r1, 24 - movs r2, 0 - strh r1, [r0, 0x32] - mov r3, r9 - lsls r1, r3, 24 - asrs r1, 24 - strh r1, [r0, 0x34] - mov r1, sp - ldrh r1, [r1] - strh r1, [r0, 0x3A] - mov r3, r10 - strh r3, [r0, 0x3C] - strh r2, [r0, 0x36] - strh r2, [r0, 0x38] - adds r1, r7, 0 - bl StartSpriteAnim - adds r0, r6, 0 - adds r0, 0x1C - adds r4, r0 - ldr r0, =sub_81DA848 - str r0, [r4] - adds r0, r5, 0 - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DA74C - - thumb_func_start sub_81DA848 -sub_81DA848: @ 81DA848 - push {r4,r5,lr} - adds r3, r0, 0 - adds r2, r3, 0 - adds r2, 0x2E - movs r0, 0x20 - ldrsh r1, [r3, r0] - movs r4, 0x2E - ldrsh r0, [r3, r4] - cmp r1, r0 - bne _081DA874 - movs r5, 0x22 - ldrsh r1, [r3, r5] - movs r4, 0x2 - ldrsh r0, [r2, r4] - cmp r1, r0 - bne _081DA874 - ldr r0, =SpriteCallbackDummy - str r0, [r3, 0x1C] - b _081DA8B4 - .pool -_081DA874: - ldrh r4, [r2, 0x8] - movs r5, 0x8 - ldrsh r1, [r2, r5] - movs r5, 0xC - ldrsh r0, [r2, r5] - cmp r1, r0 - bne _081DA890 - ldrh r0, [r2, 0x4] - ldrh r1, [r3, 0x20] - adds r0, r1 - movs r1, 0 - strh r0, [r3, 0x20] - strh r1, [r2, 0x8] - b _081DA894 -_081DA890: - adds r0, r4, 0x1 - strh r0, [r2, 0x8] -_081DA894: - ldrh r4, [r2, 0xA] - movs r5, 0xA - ldrsh r1, [r2, r5] - movs r5, 0xE - ldrsh r0, [r2, r5] - cmp r1, r0 - bne _081DA8B0 - ldrh r0, [r2, 0x6] - ldrh r1, [r3, 0x22] - adds r0, r1 - movs r1, 0 - strh r0, [r3, 0x22] - strh r1, [r2, 0xA] - b _081DA8B4 -_081DA8B0: - adds r0, r4, 0x1 - strh r0, [r2, 0xA] -_081DA8B4: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81DA848 - - thumb_func_start sub_81DA8BC -sub_81DA8BC: @ 81DA8BC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r6, r0, 0 - mov r8, r1 - ldr r0, [sp, 0x2C] - ldr r1, [sp, 0x30] - ldr r4, [sp, 0x34] - ldr r5, [sp, 0x38] - lsls r2, 16 - lsrs r2, 16 - str r2, [sp] - lsls r3, 16 - lsrs r3, 16 - str r3, [sp, 0x4] - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - lsls r4, 16 - lsrs r7, r4, 16 - lsls r5, 24 - lsrs r5, 24 - ldr r0, =gUnknown_0862B758 - lsls r6, 16 - asrs r6, 16 - mov r1, r8 - lsls r1, 16 - asrs r1, 16 - mov r8, r1 - adds r1, r6, 0 - mov r2, r8 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r5, 0x1 - beq _081DA94C - cmp r5, 0x1 - bgt _081DA924 - cmp r5, 0 - beq _081DA934 - b _081DA928 - .pool -_081DA924: - cmp r5, 0x2 - beq _081DA960 -_081DA928: - ldr r2, =gSprites - lsls r3, r6, 4 - b _081DA972 - .pool -_081DA934: - ldr r2, =gSprites - lsls r3, r6, 4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - movs r1, 0x78 - strh r1, [r0, 0x2E] - movs r1, 0x2D - b _081DA970 - .pool -_081DA94C: - ldr r2, =gSprites - lsls r3, r6, 4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - movs r1, 0x59 - b _081DA96C - .pool -_081DA960: - ldr r2, =gSprites - lsls r3, r6, 4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - movs r1, 0x97 -_081DA96C: - strh r1, [r0, 0x2E] - movs r1, 0x61 -_081DA970: - strh r1, [r0, 0x30] -_081DA972: - adds r4, r3, r6 - lsls r4, 2 - adds r0, r4, r2 - mov r3, sp - ldrh r3, [r3] - strh r3, [r0, 0x32] - mov r1, sp - ldrh r1, [r1, 0x4] - strh r1, [r0, 0x34] - mov r3, r10 - strh r3, [r0, 0x36] - mov r1, r9 - strh r1, [r0, 0x38] - strh r7, [r0, 0x3A] - adds r1, r5, 0 - str r2, [sp, 0x8] - bl StartSpriteAnim - ldr r2, [sp, 0x8] - adds r0, r2, 0 - adds r0, 0x1C - adds r4, r0 - ldr r0, =sub_81DA9BC - str r0, [r4] - adds r0, r6, 0 - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DA8BC - - thumb_func_start sub_81DA9BC -sub_81DA9BC: @ 81DA9BC - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x32] - bl Sin2 - lsls r0, 16 - asrs r0, 16 - movs r2, 0x36 - ldrsh r1, [r4, r2] - muls r0, r1 - asrs r0, 12 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x32] - bl Cos2 - lsls r0, 16 - asrs r0, 16 - movs r3, 0x36 - ldrsh r1, [r4, r3] - muls r0, r1 - asrs r0, 12 - strh r0, [r4, 0x26] - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r2, 0x34 - ldrsh r1, [r4, r2] - adds r0, r1 - movs r1, 0xB4 - lsls r1, 1 - bl __modsi3 - strh r0, [r4, 0x32] - ldrh r2, [r4, 0x36] - movs r3, 0x36 - ldrsh r1, [r4, r3] - movs r3, 0x38 - ldrsh r0, [r4, r3] - cmp r1, r0 - beq _081DAA12 - ldrh r0, [r4, 0x3A] - adds r0, r2, r0 - strh r0, [r4, 0x36] - b _081DAA16 -_081DAA12: - ldr r0, =SpriteCallbackDummy - str r0, [r4, 0x1C] -_081DAA16: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DA9BC - - thumb_func_start sub_81DAA20 -sub_81DAA20: @ 81DAA20 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =0x00002e90 - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag - movs r0, 0x10 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r4, =gSprites - adds r0, r4 - bl DestroySprite - movs r0, 0x12 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl DestroySprite - movs r0, 0x14 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl DestroySprite - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DAA20 - - thumb_func_start sub_81DAA74 -sub_81DAA74: @ 81DAA74 - push {r4,r5,lr} - adds r3, r0, 0 - ldr r2, =gSprites - movs r0, 0x10 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r5, r2, 0 - adds r5, 0x1C - adds r0, r5 - ldr r4, [r0] - ldr r0, =SpriteCallbackDummy - cmp r4, r0 - bne _081DAAC4 - movs r0, 0x12 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldr r2, [r0] - cmp r2, r4 - bne _081DAAC4 - movs r1, 0x14 - ldrsh r0, [r3, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - ldr r0, [r1] - cmp r0, r2 - bne _081DAAC4 - movs r0, 0x1 - b _081DAAC6 - .pool -_081DAAC4: - movs r0, 0 -_081DAAC6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81DAA74 - - thumb_func_start sub_81DAACC -sub_81DAACC: @ 81DAACC - push {r4,lr} - adds r4, r0, 0 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _081DAB20 - bl sub_81DA700 - ldr r1, =0x00003f41 - movs r0, 0x50 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 5 - movs r0, 0x52 - bl SetGpuReg - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r1, 0xA0 - lsls r1, 3 - movs r0, 0 - movs r2, 0x2 - bl ChangeBgY - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 - b _081DAB46 - .pool -_081DAB20: - movs r1, 0x80 - lsls r1, 6 - movs r0, 0 - bl ClearGpuRegBits - movs r1, 0x80 - lsls r1, 7 - movs r0, 0 - bl ClearGpuRegBits - movs r1, 0x80 - lsls r1, 1 - movs r0, 0 - bl ClearGpuRegBits - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 -_081DAB46: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DAACC - - thumb_func_start sub_81DAB4C -sub_81DAB4C: @ 81DAB4C - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081DAB64 - movs r1, 0x80 - lsls r1, 1 - movs r0, 0 - bl SetGpuRegBits -_081DAB64: - ldrh r1, [r4, 0xC] - movs r2, 0xC - ldrsh r0, [r4, r2] - cmp r0, 0x10 - bne _081DAB98 - ldrh r1, [r4, 0xE] - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r0, 0x1F - bne _081DAB92 - movs r1, 0x1 - negs r1, r1 - movs r0, 0 - str r0, [sp] - adds r0, r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _081DABB0 -_081DAB92: - adds r0, r1, 0x1 - strh r0, [r4, 0xE] - b _081DABB0 -_081DAB98: - adds r0, r1, 0x1 - strh r0, [r4, 0xC] - ldrh r1, [r4, 0xC] - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg -_081DABB0: - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DAB4C - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/unk_transition.s b/asm/unk_transition.s deleted file mode 100755 index 4b96ccaf7..000000000 --- a/asm/unk_transition.s +++ /dev/null @@ -1,985 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81DABBC -sub_81DABBC: @ 81DABBC - push {r4,lr} - adds r4, r0, 0 - bl sub_81DAA74 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081DABD2 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DABD2: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DABBC - - thumb_func_start Phase2Task_34 -Phase2Task_34: @ 81DABDC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B770 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DABEE: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DABEE - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_34 - - thumb_func_start sub_81DAC14 -sub_81DAC14: @ 81DAC14 - push {r4-r6,lr} - sub sp, 0xC - adds r6, r0, 0 - movs r1, 0x33 - negs r1, r1 - movs r0, 0 - str r0, [sp] - movs r5, 0x2 - str r5, [sp, 0x4] - str r0, [sp, 0x8] - movs r0, 0x78 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x10] - movs r0, 0x7 - negs r0, r0 - str r5, [sp] - movs r4, 0x2 - negs r4, r4 - str r4, [sp, 0x4] - movs r1, 0x1 - str r1, [sp, 0x8] - movs r1, 0xC1 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x12] - str r4, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0xF7 - movs r1, 0xC1 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x14] - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81DAC14 - - thumb_func_start sub_81DAC80 -sub_81DAC80: @ 81DAC80 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DACA4 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_34 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DACA4: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DAC80 - - thumb_func_start Phase2Task_35 -Phase2Task_35: @ 81DACB4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B784 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DACC6: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DACC6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_35 - - thumb_func_start sub_81DACEC -sub_81DACEC: @ 81DACEC - push {r4,r5,lr} - sub sp, 0xC - adds r5, r0, 0 - movs r0, 0 - str r0, [sp] - movs r4, 0x4 - negs r4, r4 - str r4, [sp, 0x4] - str r0, [sp, 0x8] - movs r0, 0x78 - movs r1, 0xC5 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x10] - str r4, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0xF1 - movs r1, 0x3B - movs r2, 0 - movs r3, 0x1 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x12] - movs r0, 0x1 - negs r0, r0 - movs r1, 0x4 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r1, 0x3B - movs r2, 0 - movs r3, 0x1 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x14] - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81DACEC - - thumb_func_start sub_81DAD58 -sub_81DAD58: @ 81DAD58 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DAD7C - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_35 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DAD7C: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DAD58 - - thumb_func_start Phase2Task_36 -Phase2Task_36: @ 81DAD8C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B798 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DAD9E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DAD9E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_36 - - thumb_func_start sub_81DADC4 -sub_81DADC4: @ 81DADC4 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x10 - mov r8, r0 - movs r6, 0x80 - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - movs r5, 0x4 - negs r5, r5 - str r5, [sp, 0x8] - str r4, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x2D - movs r2, 0xC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x10] - str r6, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x59 - movs r1, 0x61 - movs r2, 0xFC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x12] - str r6, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x97 - movs r1, 0x61 - movs r2, 0x84 - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x14] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81DADC4 - - thumb_func_start sub_81DAE44 -sub_81DAE44: @ 81DAE44 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DAE68 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_36 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DAE68: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DAE44 - - thumb_func_start Phase2Task_37 -Phase2Task_37: @ 81DAE78 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7AC - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DAE8A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DAE8A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_37 - - thumb_func_start sub_81DAEB0 -sub_81DAEB0: @ 81DAEB0 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x10 - mov r8, r0 - movs r2, 0x8E - lsls r2, 1 - movs r6, 0x83 - str r6, [sp] - movs r5, 0x23 - str r5, [sp, 0x4] - movs r4, 0x3 - negs r4, r4 - str r4, [sp, 0x8] - movs r0, 0 - str r0, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x10] - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r2, 0x2C - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x12] - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x79 - movs r1, 0x50 - movs r2, 0xA4 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x14] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81DAEB0 - - thumb_func_start sub_81DAF34 -sub_81DAF34: @ 81DAF34 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DAF58 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_37 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DAF58: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DAF34 - - thumb_func_start Phase2Task_38 -Phase2Task_38: @ 81DAF68 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7C0 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DAF7A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DAF7A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_38 - - thumb_func_start sub_81DAFA0 -sub_81DAFA0: @ 81DAFA0 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r0, 0xA - ldrsh r2, [r4, r0] - cmp r2, 0 - bne _081DAFCC - movs r1, 0x33 - negs r1, r1 - str r2, [sp] - movs r0, 0x4 - str r0, [sp, 0x4] - str r2, [sp, 0x8] - movs r0, 0x78 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB01A -_081DAFCC: - cmp r2, 0x10 - bne _081DAFF2 - movs r0, 0x7 - negs r0, r0 - movs r1, 0x4 - str r1, [sp] - subs r1, 0x8 - str r1, [sp, 0x4] - movs r1, 0x1 - str r1, [sp, 0x8] - movs r1, 0xC1 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB01A -_081DAFF2: - cmp r2, 0x20 - bne _081DB01A - movs r0, 0x4 - negs r0, r0 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0x2 - str r0, [sp, 0x8] - movs r0, 0xF7 - movs r1, 0xC1 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB01A: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DAFA0 - - thumb_func_start sub_81DB02C -sub_81DB02C: @ 81DB02C - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB050 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_38 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB050: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB02C - - thumb_func_start Phase2Task_39 -Phase2Task_39: @ 81DB060 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7D4 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DB072: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DB072 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_39 - - thumb_func_start sub_81DB098 -sub_81DB098: @ 81DB098 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r0, 0xA - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _081DB0C4 - str r1, [sp] - movs r0, 0x8 - negs r0, r0 - str r0, [sp, 0x4] - str r1, [sp, 0x8] - movs r0, 0x78 - movs r1, 0xC5 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB112 -_081DB0C4: - cmp r1, 0x10 - bne _081DB0E8 - movs r0, 0x8 - negs r0, r0 - str r0, [sp] - movs r0, 0x1 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - movs r0, 0xF1 - movs r1, 0x4E - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB112 -_081DB0E8: - cmp r1, 0x20 - bne _081DB112 - movs r0, 0x1 - negs r0, r0 - movs r1, 0x8 - str r1, [sp] - movs r1, 0x1 - str r1, [sp, 0x4] - movs r1, 0x2 - str r1, [sp, 0x8] - movs r1, 0x4E - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB112: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DB098 - - thumb_func_start sub_81DB124 -sub_81DB124: @ 81DB124 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB148 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_39 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB148: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB124 - - thumb_func_start Phase2Task_40 -Phase2Task_40: @ 81DB158 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7E8 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DB16A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DB16A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_40 - - thumb_func_start sub_81DB190 -sub_81DB190: @ 81DB190 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - movs r0, 0xA - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _081DB1BE - movs r0, 0x80 - str r0, [sp] - str r1, [sp, 0x4] - subs r0, 0x84 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x2D - movs r2, 0xC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB212 -_081DB1BE: - cmp r1, 0x10 - bne _081DB1E6 - movs r0, 0x80 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - subs r0, 0x4 - str r0, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x59 - movs r1, 0x61 - movs r2, 0xFC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB212 -_081DB1E6: - cmp r1, 0x20 - bne _081DB212 - movs r0, 0x80 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - subs r0, 0x4 - str r0, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x97 - movs r1, 0x61 - movs r2, 0x84 - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB212: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DB190 - - thumb_func_start sub_81DB224 -sub_81DB224: @ 81DB224 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB248 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_40 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB248: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB224 - - thumb_func_start Phase2Task_41 -Phase2Task_41: @ 81DB258 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7FC - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DB26A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DB26A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_41 - - thumb_func_start sub_81DB290 -sub_81DB290: @ 81DB290 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - movs r0, 0xA - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _081DB2C2 - movs r2, 0x8E - lsls r2, 1 - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB316 -_081DB2C2: - cmp r1, 0x10 - bne _081DB2EA - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r2, 0x2C - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB316 -_081DB2EA: - cmp r1, 0x20 - bne _081DB316 - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x79 - movs r1, 0x50 - movs r2, 0xA4 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB316: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DB290 - - thumb_func_start sub_81DB328 -sub_81DB328: @ 81DB328 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB34C - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_41 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB34C: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB328 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index 1b4cc5af9..0cb95a7e1 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -505,6 +505,5 @@ gUnknown_085CE9B0:: @ 85CE9B0 .align 2 gUnknown_085CE9C8:: @ 85CE9C8 .2byte 0x0000, 0x0010, 0x0400, 0x0000, 0xfffe, 0x0000, 0x0800, 0x0000, 0x0000, 0x0004, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000 - .2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000, 0x03e0, 0x001f, 0x001c, 0x001a, 0x0018, 0x0000, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6318, 0x0000, 0x7fff + .2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 diff --git a/data/field_effect.s b/data/field_effect.s index a1ddcc247..e6f8a558e 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -8,51 +8,88 @@ gNewGameBirchPic:: @ 8553A90 .incbin "graphics/birch_speech/birch.4bpp" - .incbin "baserom.gba", 0x554290, 0x66c0 + .space 0x3800 + + .incbin "graphics/unused/intro_birch_beauty.4bpp" .align 2 gNewGameBirchPalette:: @ 855A950 .incbin "graphics/birch_speech/birch.gbapal" .align 2 - .incbin "baserom.gba", 0x55a970, 0x20 +gSpriteImage_855A970:: @ 855A970 + .incbin "graphics/misc/pokeball_glow.4bpp" .align 2 gFieldEffectObjectPalette4:: @ 855A990 .incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal" - .incbin "baserom.gba", 0x55a9b0, 0x480 + .align 2 +gSpriteImage_855A9B0:: @ 855A9B0 + .incbin "graphics/misc/pokecenter_monitor/0.4bpp" + + .align 2 +gSpriteImage_855AA70:: @ 855AA70 + .incbin "graphics/misc/pokecenter_monitor/1.4bpp" + + .align 2 +gSpriteImage_855AB30:: @ 855AB30 + .incbin "graphics/misc/big_hof_monitor.4bpp" + + .align 2 +gSpriteImage_855AD30:: @ 855AD30 + .incbin "graphics/misc/small_hof_monitor.4bpp" .align 2 gFieldEffectObjectPalette5:: @ 855AE30 .incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal" + .align 2 gUnknown_0855AE50:: @ 855AE50 - .incbin "baserom.gba", 0x55ae50, 0x200 + .incbin "graphics/misc/field_move_streaks.4bpp" + .align 2 gUnknown_0855B050:: @ 855B050 - .incbin "baserom.gba", 0x55b050, 0x20 + .incbin "graphics/misc/field_move_streaks.gbapal" + .align 2 gUnknown_0855B070:: @ 855B070 - .incbin "baserom.gba", 0x55b070, 0x280 + .incbin "graphics/misc/field_move_streaks_map.bin" + .align 2 gUnknown_0855B2F0:: @ 855B2F0 - .incbin "baserom.gba", 0x55b2f0, 0x80 + .incbin "graphics/misc/darkness_field_move_streaks.4bpp" + .align 2 gUnknown_0855B370:: @ 855B370 - .incbin "baserom.gba", 0x55b370, 0x20 + .incbin "graphics/misc/darkness_field_move_streaks.gbapal" + .align 2 gUnknown_0855B390:: @ 855B390 - .incbin "baserom.gba", 0x55b390, 0x280 + .incbin "graphics/misc/darkness_field_move_streaks_map.bin" + .align 2 gUnknown_0855B610:: @ 855B610 - .incbin "baserom.gba", 0x55b610, 0x20 + .incbin "graphics/misc/spotlight.gbapal" + .align 2 gUnknown_0855B630:: @ 855B630 - .incbin "baserom.gba", 0x55b630, 0xbc0 + .incbin "graphics/misc/spotlight.4bpp" + + .align 2 +gUnknown_0855C170:: @ 855C170 + .incbin "graphics/unknown/unknown_55C170.4bpp" + .align 2 gUnknown_0855C1F0:: @ 855C1F0 - .incbin "baserom.gba", 0x55c1f0, 0x20 + .4byte FieldEffectCmd_loadtiles + .4byte FieldEffectCmd_loadfadedpal + .4byte FieldEffectCmd_loadpal + .4byte FieldEffectCmd_callnative + .4byte FieldEffectCmd_end + .4byte FieldEffectCmd_loadgfx_callnative + .4byte FieldEffectCmd_loadtiles_callnative + .4byte FieldEffectCmd_loadfadedpal_callnative .align 2 @ TODO: something else uses these too @@ -61,7 +98,12 @@ gNewGameBirchOamAttributes:: @ 855C210 .2byte 0 .align 2 - .incbin "baserom.gba", 0x55c218, 0x10 +gOamData_855C218:: @ 855C218 + .2byte 0x0000, 0x0000, 0x0000, 0x0000 + + .align 2 +gOamData_855C220:: @ 855C220 + .2byte 0x0000, 0x4000, 0x0000, 0x0000 .align 2 gNewGameBirchPicTable:: @ 855C228 @@ -82,13 +124,7 @@ gNewGameBirchImageAnimTable:: @ 855C240 .align 2 gNewGameBirchObjectTemplate:: @ 855C244 - .2byte 0xFFFF @ tiles tag - .2byte 0x1006 @ palette tag - .4byte gNewGameBirchOamAttributes - .4byte gNewGameBirchImageAnimTable - .4byte gNewGameBirchPicTable - .4byte gDummySpriteAffineAnimTable - .4byte SpriteCallbackDummy + spr_template 0xFFFF, 0x1006, gNewGameBirchOamAttributes, gNewGameBirchImageAnimTable, gNewGameBirchPicTable, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gFieldEffectObjectPaletteInfo4:: @ 855C25C @@ -98,109 +134,318 @@ gFieldEffectObjectPaletteInfo4:: @ 855C25C gFieldEffectObjectPaletteInfo5:: @ 855C264 obj_pal gFieldEffectObjectPalette5, 0x1010 - .incbin "baserom.gba", 0x55c26c, 0x40 + .align 2 +gOamData_855C26C:: @ 855C26C + .2byte 0x4000, 0x8000, 0x0000, 0x0000 + .align 2 +gUnknown_855C274:: @ 855C274 + obj_frame_tiles gSpriteImage_855A970, 0x0020 + + .align 2 +gUnknown_855C27C:: @ 855C27C + obj_frame_tiles gSpriteImage_855A9B0, 0x00c0 + obj_frame_tiles gSpriteImage_855AA70, 0x00c0 + + .align 2 +gUnknown_855C28C:: @ 855C28C + obj_frame_tiles gSpriteImage_855AB30, 0x0200 + + .align 2 +gUnknown_855C294:: @ 855C294 + obj_frame_tiles gSpriteImage_855AD30, 0x0200 + + .align 2 +gSubspriteTable_855C29C:: @ 855C29C + subsprite -12, -8, 2, 0, 16x8 + subsprite 4, -8, 2, 2, 8x8 + subsprite -12, 0, 2, 3, 16x8 + subsprite 4, 0, 2, 5, 8x8 + + .align 2 gUnknown_0855C2AC:: @ 855C2AC - .incbin "baserom.gba", 0x55c2ac, 0x18 + .4byte 4, gSubspriteTable_855C29C + + .align 2 +gSubspriteTable_855C2B4:: @ 855C2B4 + subsprite -32, -8, 2, 0, 32x8 + subsprite 0, -8, 2, 4, 32x8 + subsprite -32, 0, 2, 8, 32x8 + subsprite 0, 0, 2, 12, 32x8 + .align 2 gUnknown_0855C2C4:: @ 855C2C4 - .incbin "baserom.gba", 0x55c2c4, 0x40 + .4byte 4, gSubspriteTable_855C2B4 + + .align 2 +gUnknown_0855C2CC:: @ 855C2CC + .2byte 0x0000, 0x0001, 0xfffe, 0x0000 + + .align 2 +gUnknown_0855C2D4:: @ 855C2D4 + .2byte 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010 + .2byte 0xffff, 0x0000 + .align 2 +gUnknown_0855C2F8:: @ 855C2F8 + .4byte gUnknown_0855C2CC + .4byte gUnknown_0855C2D4 + + .align 2 +gUnknown_0855C300:: @ 855C300 + .4byte gUnknown_0855C2CC + + .align 2 gUnknown_0855C304:: @ 855C304 - .incbin "baserom.gba", 0x55c304, 0x18 + spr_template 0xffff, 0x1007, gOamData_855C218, gUnknown_0855C2F8, gUnknown_855C274, gDummySpriteAffineAnimTable, sub_80B6828 + .align 2 gUnknown_0855C31C:: @ 855C31C - .incbin "baserom.gba", 0x55c31c, 0x18 + spr_template 0xffff, 0x1004, gOamData_855C220, gUnknown_0855C2F8, gUnknown_855C27C, gDummySpriteAffineAnimTable, sub_80B68AC + .align 2 gUnknown_0855C334:: @ 855C334 - .incbin "baserom.gba", 0x55c334, 0x18 + spr_template 0xffff, 0x1010, gOamData_855C220, gUnknown_0855C300, gUnknown_855C28C, gDummySpriteAffineAnimTable, sub_80B6970 + .align 2 gUnknown_0855C34C:: @ 855C34C - .incbin "baserom.gba", 0x55c34c, 0x18 + spr_template 0xffff, 0x1010, gOamData_855C26C, gUnknown_0855C300, gUnknown_855C294, gDummySpriteAffineAnimTable, sub_80B6970 + .align 2 gUnknown_0855C364:: @ 855C364 - .incbin "baserom.gba", 0x55c364, 0x10 + .4byte sub_80B6214 + .4byte sub_80B6250 + .4byte sub_80B628C + .4byte sub_80B62B4 + .align 2 gUnknown_0855C374:: @ 855C374 - .incbin "baserom.gba", 0x55c374, 0x10 + .4byte sub_80B6360 + .4byte sub_80B63D4 + .4byte sub_80B6404 + .4byte sub_80B642C + .align 2 gUnknown_0855C384:: @ 855C384 - .incbin "baserom.gba", 0x55c384, 0x20 - + .4byte sub_80B64DC + .4byte sub_80B6574 + .4byte sub_80B65A8 + .4byte sub_80B66E8 + .4byte sub_80B67DC + .4byte sub_80B67F8 + .4byte sub_80B6800 + .4byte nullsub_97 + + .align 1 gUnknown_0855C3A4:: @ 855C3A4 - .incbin "baserom.gba", 0x55c3a4, 0x18 + .2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008 gUnknown_0855C3BC:: @ 855C3BC - .incbin "baserom.gba", 0x55c3bc, 0x4 + .byte 0x10, 0x0c, 0x08, 0x00 gUnknown_0855C3C0:: @ 855C3C0 - .incbin "baserom.gba", 0x55c3c0, 0x4 + .byte 0x10, 0x0c, 0x08, 0x00 gUnknown_0855C3C4:: @ 855C3C4 - .incbin "baserom.gba", 0x55c3c4, 0x4 + .byte 0x00, 0x00, 0x00, 0x00 + .align 2 gUnknown_0855C3C8:: @ 855C3C8 - .incbin "baserom.gba", 0x55c3c8, 0x1c + .4byte sub_80B6BCC + .4byte sub_80B6C74 + .4byte sub_80B6C90 + .4byte sub_80B6D04 + .4byte sub_80B6DBC + .4byte sub_80B6DD8 + .4byte sub_80B6E18 + .align 2 gUnknown_0855C3E4:: @ 855C3E4 - .incbin "baserom.gba", 0x55c3e4, 0x18 + .4byte sub_80B6EC0 + .4byte sub_80B6EE0 + .4byte sub_80B6F50 + .4byte sub_80B6F74 + .4byte sub_80B6F84 + .4byte sub_80B6FA8 + .align 2 gUnknown_0855C3FC:: @ 855C3FC - .incbin "baserom.gba", 0x55c3fc, 0x1c + .4byte sub_80B7114 + .4byte sub_80B7190 + .4byte sub_80B71D0 + .4byte sub_80B7230 + .4byte sub_80B7270 + .4byte sub_80B72D0 + .4byte sub_80B72F4 + .align 2 gUnknown_0855C418:: @ 855C418 - .incbin "baserom.gba", 0x55c418, 0x14 + .4byte sub_80B73D0 + .4byte waterfall_1_do_anim_probably + .4byte waterfall_2_wait_anim_finish_probably + .4byte sub_80B7450 + .4byte sub_80B7478 + .align 2 gUnknown_0855C42C:: @ 855C42C - .incbin "baserom.gba", 0x55c42c, 0xc + .4byte dive_1_lock + .4byte dive_2_unknown + .4byte dive_3_unknown + .align 2 gUnknown_0855C438:: @ 855C438 - .incbin "baserom.gba", 0x55c438, 0x18 + .4byte sub_80B764C + .4byte sub_80B7684 + .4byte sub_80B76B8 + .4byte sub_80B7704 + .4byte sub_80B77F8 + .4byte sub_80B7814 + .align 2 gUnknown_0855C450:: @ 855C450 - .incbin "baserom.gba", 0x55c450, 0x10 + .4byte sub_80B78EC + .4byte sub_80B791C + .4byte sub_80B7968 + .4byte sub_80B79BC + .align 2 gUnknown_0855C460:: @ 855C460 - .incbin "baserom.gba", 0x55c460, 0x14 + .4byte sub_80B7AE8 + .4byte sub_80B7B18 + .4byte sub_80B7B94 + .4byte sub_80B7BCC + .4byte sub_80B7BF4 + .align 2 gUnknown_0855C474:: @ 855C474 - .incbin "baserom.gba", 0x55c474, 0x8 + .4byte sub_80B7D14 + .4byte sub_80B7D34 gUnknown_0855C47C:: @ 855C47C - .incbin "baserom.gba", 0x55c47c, 0x8 + .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 + .align 2 gUnknown_0855C484:: @ 855C484 - .incbin "baserom.gba", 0x55c484, 0x8 + .4byte sub_80B7EC4 + .4byte sub_80B7EE8 + .align 2 gUnknown_0855C48C:: @ 855C48C - .incbin "baserom.gba", 0x55c48c, 0x10 + .4byte sub_80B800C + .4byte sub_80B8034 + .4byte sub_80B80C4 + .4byte sub_80B8198 + .align 2 gUnknown_0855C49C:: @ 855C49C - .incbin "baserom.gba", 0x55c49c, 0xc + .4byte sub_80B8280 + .4byte sub_80B830C + .4byte sub_80B8410 + .align 2 gUnknown_0855C4A8:: @ 855C4A8 - .incbin "baserom.gba", 0x55c4a8, 0x1c + .4byte sub_80B8584 + .4byte sub_80B85F8 + .4byte sub_80B8660 + .4byte sub_80B86EC + .4byte sub_80B871C + .4byte sub_80B8770 + .4byte overworld_bg_setup_2 + .align 2 gUnknown_0855C4C4:: @ 855C4C4 - .incbin "baserom.gba", 0x55c4c4, 0x1c + .4byte sub_80B88E4 + .4byte sub_80B8920 + .4byte sub_80B898C + .4byte sub_80B89DC + .4byte sub_80B8A0C + .4byte sub_80B8A44 + .4byte sub_80B8A64 + .align 2 gUnknown_0855C4E0:: @ 855C4E0 - .incbin "baserom.gba", 0x55c4e0, 0x14 + .4byte sub_80B8DB4 + .4byte sub_80B8E14 + .4byte sub_80B8E60 + .4byte sub_80B8EA8 + .4byte sub_80B8F24 + .align 2 gUnknown_0855C4F4:: @ 855C4F4 - .incbin "baserom.gba", 0x55c4f4, 0x54 + .4byte sub_80B9204 + .4byte sub_80B925C + .4byte sub_80B92A0 + .4byte sub_80B92F8 + .4byte sub_80B933C + .4byte sub_80B9390 + .4byte sub_80B9418 + .4byte sub_80B9474 + .4byte sub_80B9494 + + .align 2 +gUnknown_0855C518:: @ 855C518 + .2byte 0x0008, 0x0008, 0x00e2, 0x0000, 0x001c, 0x001c, 0x1e00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + .align 2 +gUnknown_0855C530:: @ 855C530 + .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0xfff6, 0xfff6, 0x1600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 gUnknown_0855C548:: @ 855C548 - .incbin "baserom.gba", 0x55c548, 0x8 + .4byte gUnknown_0855C518 + .4byte gUnknown_0855C530 + .align 2 gUnknown_0855C550:: @ 855C550 - .incbin "baserom.gba", 0x55c550, 0x1c + .4byte sub_80B9804 + .4byte sub_80B98B8 + .4byte sub_80B9924 + .4byte sub_80B9978 + .4byte sub_80B99F0 + .4byte sub_80B9A28 + .4byte sub_80B9A60 gUnknown_0855C56C:: @ 855C56C - .incbin "baserom.gba", 0x55c56c, 0x24 + .byte 0xfe, 0xff, 0xfc, 0xff, 0xfb, 0xff, 0xfa, 0xff, 0xf9, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf9, 0xff, 0xf9, 0xff, 0xfa, 0xff, 0xfb, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0x00, 0x00, 0x02, 0x00 + .byte 0x04, 0x00, 0x08, 0x00 + .align 2 gUnknown_0855C590:: @ 855C590 - .incbin "baserom.gba", 0x55c590, 0x5c + .4byte sub_80B9C28 + .4byte sub_80B9C54 + .4byte sub_80B9CDC + + .align 2 +gUnknown_0855C59C:: @ 855C59C + obj_frame_tiles gUnknown_0855C170, 0x0020 + obj_frame_tiles gUnknown_0855C170 + 0x20, 0x0020 + obj_frame_tiles gUnknown_0855C170 + 0x40, 0x0020 + obj_frame_tiles gUnknown_0855C170 + 0x60, 0x0020 + + .align 2 +gUnknown_0855C5BC:: @ 855C5BC + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_0855C5C4:: @ 855C5C4 + .2byte 0x0001, 0x0000, 0xffff, 0x0000 + .align 2 +gUnknown_0855C5CC:: @ 855C5CC + .2byte 0x0002, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_0855C5D4:: @ 855C5D4 + .2byte 0x0003, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_0855C5DC:: @ 855C5DC + .4byte gUnknown_0855C5BC + .4byte gUnknown_0855C5C4 + .4byte gUnknown_0855C5CC + .4byte gUnknown_0855C5D4 + + .align 2 gUnknown_0855C5EC:: @ 855C5EC - .incbin "baserom.gba", 0x55c5ec, 0x18 + spr_template 0xffff, 0x111a, gOamData_855C218, gUnknown_0855C5DC, gUnknown_0855C59C, gDummySpriteAffineAnimTable, sub_80B9DB8 + diff --git a/data/graphics.s b/data/graphics.s index 414985125..8733869b5 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -5049,40 +5049,42 @@ gUnknown_08DDD748:: @ 8DDD748 .incbin "graphics/interface/textbox.4bpp" .align 2 -gUnknown_08DDD908:: - .incbin "graphics/unknown/unknown_DDD908.bin.lz" +gWallpaperIcon_Cross:: + .incbin "graphics/pokemon_storage/cross_icon.4bpp.lz" .align 2 -gUnknown_08DDD920:: - .incbin "graphics/unknown/unknown_DDD920.bin.lz" +gWallpaperIcon_Bolt:: + .incbin "graphics/pokemon_storage/bolt_icon.4bpp.lz" .align 2 -gUnknown_08DDD938:: - .incbin "graphics/unknown/unknown_DDD938.bin.lz" +gWallpaperIcon_Plusle:: + .incbin "graphics/pokemon_storage/plusle_icon.4bpp.lz" .align 2 -gUnknown_08DDD950:: - .incbin "graphics/pokemon_storage/pss_window.gbapal" +gWallpaperPalettes_Horizontal:: @ 8DDD950 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/horizontal_bg.gbapal" .align 2 -gUnknown_08DDD990:: - .incbin "graphics/pokemon_storage/pss_window.4bpp.lz" +gWallpaperTiles_Horizontal:: @ 8DDD990 + .incbin "graphics/pokemon_storage/horizontal.4bpp.lz" .align 2 -gUnknown_08DDDB80:: @ 8DDDB80 - .incbin "graphics/unknown/unknown_DDDB80.bin.lz" +gWallpaperTilemap_Horizontal:: @ 8DDDB80 + .incbin "graphics/pokemon_storage/horizontal.bin.lz" .align 2 -gUnknown_08DDDC8C:: - .incbin "graphics/pokemon_storage/pss_window2.gbapal" +gWallpaperPalettes_Ribbon:: @ 8DDDC8C + .incbin "graphics/pokemon_storage/ribbon_frame.gbapal" + .incbin "graphics/pokemon_storage/ribbon_bg.gbapal" .align 2 -gUnknown_08DDDCCC:: - .incbin "graphics/pokemon_storage/pss_window2.4bpp.lz" +gWallpaperTiles_Ribbon:: @ 8DDDCCC + .incbin "graphics/pokemon_storage/ribbon.4bpp.lz" .align 2 -gUnknown_08DDDEDC:: - .incbin "graphics/pokemon_storage/pss_window2.bin.lz" +gWallpaperTilemap_Ribbon:: @ 8DDDEDC + .incbin "graphics/pokemon_storage/ribbon.bin.lz" @ pokenav diff --git a/data/graphics/pokemon/graphics.inc b/data/graphics/pokemon/graphics.inc index 45ddfe1b5..4c4a0f57b 100644 --- a/data/graphics/pokemon/graphics.inc +++ b/data/graphics/pokemon/graphics.inc @@ -9250,7 +9250,13 @@ gMonShinyPalette_Deoxys:: @ 8D3B7D0 gMonIcon_Deoxys:: @ 8D3B7F8 .incbin "graphics/pokemon/icons/deoxys_icon.4bpp" - .incbin "baserom.gba", 0xd3bbf8, 0x8000 + .incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp" + + .incbin "graphics/unused/deoxys_speed_icon_wide.4bpp" + + .space 0x6800 + + .incbin "graphics/unknown/unknown_D437F8.bin" .align 2 gMonFootprint_Deoxys:: @ 8D43BF8 diff --git a/data/learn_move.s b/data/learn_move.s index 94805bacb..0a2c31e58 100644 --- a/data/learn_move.s +++ b/data/learn_move.s @@ -2,23 +2,92 @@ .include "constants/constants.inc" .section .rodata + +gUnknown_085CE9F8:: @ 85CE9F8 + .incbin "graphics/interface/ui_learn_move.gbapal" + gUnknown_085CEA18:: @ 85CEA18 - .incbin "baserom.gba", 0x5ceA18, 0x198 + .incbin "graphics/interface/ui_learn_move.4bpp" + +gUnknown_085CEB98:: @ 85CEB98 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + .2byte 0 gUnknown_085CEBB0:: @ 85CEBB0 - .incbin "baserom.gba", 0x5cebb0, 0x8 + obj_tiles gUnknown_085CEA18, 0x180, 0x1595 gUnknown_085CEBB8:: @ 85CEBB8 - .incbin "baserom.gba", 0x5cebb8, 0x8 + obj_pal gUnknown_085CE9F8, 0x1596 gUnknown_085CEBC0:: @ 85CEBC0 - .incbin "baserom.gba", 0x5cebc0, 0x10 + .byte 0 + .byte 0x1B + .byte 16 + .byte 1 + .byte 0x75 + .byte 16 + .2byte 0xFFFF + .2byte 0xFFFF + .2byte 0x14CD + .2byte 0x14CD + .byte 0, 0 gUnknown_085CEBD0:: @ 85CEBD0 - .incbin "baserom.gba", 0x5cebd0, 0x40 + .byte 2 + .byte 0xC0 + .byte 8 + .byte 3 + .byte 0xC0 + .byte 0x68 + .2byte 0 + .2byte 0 + .2byte 0x1531 + .2byte 0x1531 + .byte 0, 0 +gUnknown_085CEBE0:: @ 85CEBE0 + .2byte 8 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBE8:: @ 85CEBE8 + .2byte 9 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBF0:: @ 85CEBF0 + .2byte 10 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBF8:: @ 85CEBF8 + .2byte 11 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEC00:: @ 85CEC00 + .4byte gUnknown_085CEBE0 + .4byte gUnknown_085CEBE8 + .4byte gUnknown_085CEBF0 + .4byte gUnknown_085CEBF8 + gUnknown_085CEC10:: @ 85CEC10 - .incbin "baserom.gba", 0x5cec10, 0x18 + spr_template 0x1595, 0x1596, gUnknown_085CEB98, gUnknown_085CEC00, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085CEC28:: @ 85CEC28 - .incbin "baserom.gba", 0x5cec28, 0x8 + .4byte 0x1F0 + .4byte 0x11E1 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index e419db55a..f123f4fe2 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -2,109 +2,142 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_0857173C:: @ 857173C - .incbin "baserom.gba", 0x57173c, 0x20 + .incbin "graphics/unknown/unknown_57173C.gbapal" + .align 2 gUnknown_0857175C:: @ 857175C - .incbin "baserom.gba", 0x57175c, 0x800 + .incbin "graphics/pokemon_storage/box_selection_popup_center.4bpp" + .align 2 gUnknown_08571F5C:: @ 8571F5C - .incbin "baserom.gba", 0x571f5c, 0x180 + .incbin "graphics/pokemon_storage/box_selection_popup_sides.4bpp" + .align 2 gUnknown_085720DC:: @ 85720DC - .incbin "baserom.gba", 0x5720dc, 0x98 + .incbin "graphics/pokemon_storage/scrolling_bg.4bpp.lz" + .align 2 gUnknown_08572174:: @ 8572174 - .incbin "baserom.gba", 0x572174, 0x12c + .incbin "graphics/pokemon_storage/scrolling_bg.bin.lz" + + .align 2 +gUnknown_08572280:: @ 8572280 + .incbin "graphics/unknown/unknown_572280.gbapal" + .align 2 gUnknown_085722A0:: @ 85722A0 - .incbin "baserom.gba", 0x5722a0, 0xfc + .incbin "graphics/unknown/unknown_5722A0.bin.lz" + .align 1 gUnknown_0857239C:: @ 857239C - .incbin "baserom.gba", 0x57239c, 0x40 + .2byte 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118 + .2byte 0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107, 0x2108, 0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117, 0x2118 + .align 2 gUnknown_085723DC:: @ 85723DC - .incbin "baserom.gba", 0x5723dc, 0x20 + .incbin "graphics/unknown/unknown_5723DC.gbapal" + .align 2 gUnknown_085723FC:: @ 85723FC - .incbin "baserom.gba", 0x5723fc, 0x20 + .incbin "graphics/unknown/unknown_5723FC.gbapal" + .align 2 gUnknown_0857241C:: @ 857241C - .incbin "baserom.gba", 0x57241c, 0x20 + .incbin "graphics/unknown/unknown_57241C.gbapal" + .align 2 gUnknown_0857243C:: @ 857243C - .incbin "baserom.gba", 0x57243c, 0x20 + .incbin "graphics/unknown/unknown_57243C.gbapal" + .align 1 gUnknown_0857245C:: @ 857245C - .incbin "baserom.gba", 0x57245c, 0x48 + .2byte 0x014c, 0x014d, 0x014e, 0x014f, 0x0170, 0x0171, 0x0172, 0x0173, 0x0174, 0x015c, 0x015d, 0x015e, 0x015f, 0x0180, 0x0181, 0x0182 + .2byte 0x0183, 0x0184, 0x0175, 0x0176, 0x0177, 0x0178, 0x0179, 0x017a, 0x017b, 0x017c, 0x017d, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189 + .2byte 0x018a, 0x018b, 0x018c, 0x018d + .align 1 gUnknown_085724A4:: @ 85724A4 - .incbin "baserom.gba", 0x5724a4, 0x18 + .2byte 0x1140, 0x1141, 0x1141, 0x1142, 0x1150, 0x1151, 0x1151, 0x1152, 0x1160, 0x1161, 0x1161, 0x1162 + .align 1 gUnknown_085724BC:: @ 85724BC - .incbin "baserom.gba", 0x5724bc, 0x18 + .2byte 0x1143, 0x1144, 0x1144, 0x1145, 0x1153, 0x1154, 0x1154, 0x1155, 0x1163, 0x1164, 0x1164, 0x1165 -gUnknown_085724D4:: @ 85724D4 - .incbin "baserom.gba", 0x5724d4, 0x20 + .align 2 +WaveformPalette:: @ 85724D4 + .incbin "graphics/pokemon_storage/waveform.gbapal" + + .align 2 +WaveformTiles:: @ 85724F4 + .incbin "graphics/pokemon_storage/waveform.4bpp" -gUnknown_085724F4:: @ 85724F4 - .incbin "baserom.gba", 0x5724f4, 0x200 + .align 2 +gUnknown_085726B4:: @ 85726B4 + .incbin "graphics/unused/unknown_5726B4.gbapal" + .align 2 gUnknown_085726F4:: @ 85726F4 - .incbin "baserom.gba", 0x5726f4, 0x20 + .incbin "graphics/unknown/unknown_5726F4.gbapal" + .align 2 gUnknown_08572714:: @ 8572714 - .incbin "baserom.gba", 0x572714, 0x20 + window_template 0x01, 0x00, 0x0b, 0x09, 0x07, 0x03, 0x00c0 + window_template 0x00, 0x0b, 0x11, 0x12, 0x02, 0x0f, 0x0014 + window_template 0x00, 0x00, 0x0d, 0x15, 0x07, 0x0f, 0x0014 + window_template_terminator + .align 2 gUnknown_08572734:: @ 8572734 - .incbin "baserom.gba", 0x572734, 0x10 + .4byte 0x000001d0, 0x004011e5, 0x000023ba, 0x000031ff -gUnknown_08572744:: @ 8572744 - obj_pal gUnknown_085724D4, 0xDACA + .align 2 +gWaveformSpritePalette:: @ 8572744 + obj_pal WaveformPalette, 0xDACA -gUnknown_0857274C:: @ 857274C - obj_tiles gUnknown_085724F4, 0x1C0, 5 + .align 2 +gWaveformSpriteSheet:: @ 857274C + obj_tiles WaveformTiles, 0x1C0, 5 gUnknown_08572754:: @ 8572754 spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0857276C:: @ 857276C - .4byte gUnknown_085EB7EF, 0 - .4byte gUnknown_085EB802, 0 - .4byte gUnknown_085EB81A, 0 - .4byte gUnknown_085EB82F, 0 - .4byte gUnknown_085EB843, 1 - .4byte gUnknown_085EB853, 0 - .4byte gUnknown_085EB866, 0 - .4byte gUnknown_085EB87C, 1 - .4byte gUnknown_085EB88E, 0 - .4byte gUnknown_085EB89F, 0 - .4byte gUnknown_085EB8B5, 4 - .4byte gUnknown_085EB8C6, 6 - .4byte gUnknown_085EB8D3, 0 - .4byte gUnknown_085EB8E6, 0 - .4byte gUnknown_085EB900, 0 - .4byte gUnknown_085EB913, 0 - .4byte gUnknown_085EB92D, 0 - .4byte gUnknown_085EB946, 0 - .4byte gUnknown_085EB960, 0 - .4byte gUnknown_085EB979, 1 - .4byte gUnknown_085EB987, 0 - .4byte gUnknown_085EB9A1, 0 - .4byte gUnknown_085EB9AB, 0 - .4byte gUnknown_085EB843, 7 - .4byte gUnknown_085EB9C3, 0 - .4byte gUnknown_085EB9D6, 7 - .4byte gUnknown_085EB9EE, 0 - .4byte gUnknown_085EB9FF, 0 - .4byte gUnknown_085EBA19, 7 - .4byte gUnknown_085EBA29, 7 - .4byte gUnknown_085EBA38, 0 + .4byte gText_ExitFromBox, 0 + .4byte gText_WhatDoYouWantToDo, 0 + .4byte gText_PleasePickATheme, 0 + .4byte gText_PickTheWallpaper, 0 + .4byte gText_PkmnIsSelected, 1 + .4byte gText_JumpToWhichBox, 0 + .4byte gText_DepositInWhichBox, 0 + .4byte gText_PkmnWasDeposited, 1 + .4byte gText_BoxIsFull2, 0 + .4byte gText_ReleaseThisPokemon, 0 + .4byte gText_PkmnWasReleased, 4 + .4byte gText_ByeByePkmn, 6 + .4byte gText_MarkYourPkmn, 0 + .4byte gText_ThatsYourLastPkmn, 0 + .4byte gText_YourPartysFull, 0 + .4byte gText_YoureHoldingAPkmn, 0 + .4byte gText_WhichOneWillYouTake, 0 + .4byte gText_YouCantReleaseAnEgg, 0 + .4byte gText_ContinueBoxOperations, 0 + .4byte gText_PkmnCameBack, 1 + .4byte gText_WasItWorriedAboutYou, 0 + .4byte gText_FourEllipsesExclamation, 0 + .4byte gText_PleaseRemoveTheMail, 0 + .4byte gText_PkmnIsSelected, 7 + .4byte gText_GiveToAPkmn, 0 + .4byte gText_PlacedItemInBag, 7 + .4byte gText_BagIsFull2, 0 + .4byte gText_PutItemInBag, 0 + .4byte gText_ItemIsNowHeld, 7 + .4byte gText_ChangedToNewItem, 7 + .4byte gText_MailCantBeStored, 0 .align 2 - gUnknown_08572864:: @ 8572864 window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C @@ -180,62 +213,918 @@ gSpriteAffineAnimTable_857291C:: @ 857291C .4byte gSpriteAffineAnim_85728F4 .4byte gSpriteAffineAnim_8572904 -gUnknown_08572924:: @ 8572924 - .incbin "baserom.gba", 0x572924, 0x4c50 + .align 2 +gWallpaperPalettes_Forest:: @ 8572924 + .incbin "graphics/pokemon_storage/forest_frame.gbapal" + .incbin "graphics/pokemon_storage/forest_bg.gbapal" + + .align 2 +gWallpaperTiles_Forest: @ 8572964 + .incbin "graphics/pokemon_storage/forest.4bpp.lz" + + .align 2 +gWallpaperTilemap_Forest:: @ 8572DE8 + .incbin "graphics/pokemon_storage/forest.bin.lz" + + .align 2 +gWallpaperPalettes_City: @ 8572EC8 + .incbin "graphics/pokemon_storage/city_frame.gbapal" + .incbin "graphics/pokemon_storage/city_bg.gbapal" + + .align 2 +gWallpaperTiles_City: @ 8572F08 + .incbin "graphics/pokemon_storage/city.4bpp.lz" + + .align 2 +gWallpaperTilemap_City: @ 8573220 + .incbin "graphics/pokemon_storage/city.bin.lz" + + .align 2 +gWallpaperPalettes_Desert: @ 85732FC + .incbin "graphics/pokemon_storage/desert_frame.gbapal" + .incbin "graphics/pokemon_storage/desert_bg.gbapal" + + .align 2 +gWallpaperTiles_Desert: @ 857333C + .incbin "graphics/pokemon_storage/desert.4bpp.lz" + + .align 2 +gWallpaperTilemap_Desert: @ 85736F0 + .incbin "graphics/pokemon_storage/desert.bin.lz" + + .align 2 +gWallpaperPalettes_Savanna: @ 85737EC + .incbin "graphics/pokemon_storage/savanna_frame.gbapal" + .incbin "graphics/pokemon_storage/savanna_bg.gbapal" + + .align 2 +gWallpaperTiles_Savanna: @ 857382C + .incbin "graphics/pokemon_storage/savanna.4bpp.lz" + + .align 2 +gWallpaperTilemap_Savanna: @ 8573C40 + .incbin "graphics/pokemon_storage/savanna.bin.lz" + + .align 2 +gWallpaperPalettes_Crag: @ 8573D44 + .incbin "graphics/pokemon_storage/crag_frame.gbapal" + .incbin "graphics/pokemon_storage/crag_bg.gbapal" + + .align 2 +gWallpaperTiles_Crag: @ 8573D84 + .incbin "graphics/pokemon_storage/crag.4bpp.lz" + + .align 2 +gWallpaperTilemap_Crag: @ 8574180 + .incbin "graphics/pokemon_storage/crag.bin.lz" + + .align 2 +gWallpaperPalettes_Volcano: @ 8573D44 + .incbin "graphics/pokemon_storage/volcano_frame.gbapal" + .incbin "graphics/pokemon_storage/volcano_bg.gbapal" + + .align 2 +gWallpaperTiles_Volcano: @ 8573D84 + .incbin "graphics/pokemon_storage/volcano.4bpp.lz" + + .align 2 +gWallpaperTilemap_Volcano: @ 85747A0 + .incbin "graphics/pokemon_storage/volcano.bin.lz" + + .align 2 +gWallpaperPalettes_Snow: @ 85748DC + .incbin "graphics/pokemon_storage/snow_frame.gbapal" + .incbin "graphics/pokemon_storage/snow_bg.gbapal" + + .align 2 +gWallpaperTiles_Snow: @ 857491C + .incbin "graphics/pokemon_storage/snow.4bpp.lz" + + .align 2 +gWallpaperTilemap_Snow: @ 8574D7C + .incbin "graphics/pokemon_storage/snow.bin.lz" + + .align 2 +gWallpaperPalettes_Cave: @ 8574E88 + .incbin "graphics/pokemon_storage/cave_frame.gbapal" + .incbin "graphics/pokemon_storage/cave_bg.gbapal" + + .align 2 +gWallpaperTiles_Cave: @ 8574EC8 + .incbin "graphics/pokemon_storage/cave.4bpp.lz" + + .align 2 +gWallpaperTilemap_Cave: @ 85752A0 + .incbin "graphics/pokemon_storage/cave.bin.lz" + .align 2 +gWallpaperPalettes_Beach: @ 8575378 + .incbin "graphics/pokemon_storage/beach_frame.gbapal" + .incbin "graphics/pokemon_storage/beach_bg.gbapal" + + .align 2 +gWallpaperTiles_Beach: @ 85753B8 + .incbin "graphics/pokemon_storage/beach.4bpp.lz" + + .align 2 +gWallpaperTilemap_Beach: @ 8575788 + .incbin "graphics/pokemon_storage/beach.bin.lz" + + .align 2 +gWallpaperPalettes_Seafloor: @ 8575888 + .incbin "graphics/pokemon_storage/seafloor_frame.gbapal" + .incbin "graphics/pokemon_storage/seafloor_bg.gbapal" + + .align 2 +gWallpaperTiles_Seafloor: @ 85758C8 + .incbin "graphics/pokemon_storage/seafloor.4bpp.lz" + + .align 2 +gWallpaperTilemap_Seafloor: @ 8575BC4 + .incbin "graphics/pokemon_storage/seafloor.bin.lz" + + .align 2 +gWallpaperPalettes_River: @ 8575CD8 + .incbin "graphics/pokemon_storage/river_frame.gbapal" + .incbin "graphics/pokemon_storage/river_bg.gbapal" + + .align 2 +gWallpaperTiles_River: @ 8575D18 + .incbin "graphics/pokemon_storage/river.4bpp.lz" + + .align 2 +gWallpaperTilemap_River: @ 8576100 + .incbin "graphics/pokemon_storage/river.bin.lz" + + .align 2 +gWallpaperPalettes_Sky: @ 85761F8 + .incbin "graphics/pokemon_storage/sky_frame.gbapal" + .incbin "graphics/pokemon_storage/sky_bg.gbapal" + + .align 2 +gWallpaperTiles_Sky: @ 8576238 + .incbin "graphics/pokemon_storage/sky.4bpp.lz" + + .align 2 +gWallpaperTilemap_Sky: @ 85765C0 + .incbin "graphics/pokemon_storage/sky.bin.lz" + + .align 2 +gWallpaperPalettes_PolkaDot: @ 85766B0 + .incbin "graphics/pokemon_storage/polkadot_frame.gbapal" + .incbin "graphics/pokemon_storage/polkadot_bg.gbapal" + + .align 2 +gWallpaperTiles_PolkaDot: @ 85766F0 + .incbin "graphics/pokemon_storage/polkadot.4bpp.lz" + + .align 2 +gWallpaperTilemap_PolkaDot: @ 85769B8 + .incbin "graphics/pokemon_storage/polkadot.bin.lz" + + .align 2 +gWallpaperPalettes_Pokecenter: @ 8576AB8 + .incbin "graphics/pokemon_storage/pokecenter_frame.gbapal" + .incbin "graphics/pokemon_storage/pokecenter_bg.gbapal" + + .align 2 +gWallpaperTiles_Pokecenter: @ 8576AF8 + .incbin "graphics/pokemon_storage/pokecenter.4bpp.lz" + + .align 2 +gWallpaperTilemap_Pokecenter: @ 8576D74 + .incbin "graphics/pokemon_storage/pokecenter.bin.lz" + + .align 2 +gWallpaperPalettes_Machine: @ 8576E74 + .incbin "graphics/pokemon_storage/machine_frame.gbapal" + .incbin "graphics/pokemon_storage/machine_bg.gbapal" + + .align 2 +gWallpaperTiles_Machine: @ 8576EB4 + .incbin "graphics/pokemon_storage/machine.4bpp.lz" + + .align 2 +gWallpaperTilemap_Machine: @ 8577108 + .incbin "graphics/pokemon_storage/machine.bin.lz" + + .align 2 +gWallpaperPalettes_Plain: @ 85771CC + .incbin "graphics/pokemon_storage/plain_frame.gbapal" + .incbin "graphics/pokemon_storage/plain_bg.gbapal" + + .align 2 +gWallpaperTiles_Plain: @ 857720C + .incbin "graphics/pokemon_storage/plain.4bpp.lz" + + .align 2 +gWallpaperTilemap_Plain: @ 857732C + .incbin "graphics/pokemon_storage/plain.bin.lz" + +@ 12×18 tilemap + .incbin "graphics/unused/tilemap_5773C4.bin" + + .align 1 gUnknown_08577574:: @ 8577574 - .incbin "baserom.gba", 0x577574, 0x44 + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + + .align 2 +gWallpaperTable:: @ 85775B8 + @ Forest + .4byte gWallpaperTiles_Forest + .4byte gWallpaperTilemap_Forest + .4byte gWallpaperPalettes_Forest + + @ City + .4byte gWallpaperTiles_City + .4byte gWallpaperTilemap_City + .4byte gWallpaperPalettes_City + + @ Desert + .4byte gWallpaperTiles_Desert + .4byte gWallpaperTilemap_Desert + .4byte gWallpaperPalettes_Desert + + @ Savanna + .4byte gWallpaperTiles_Savanna + .4byte gWallpaperTilemap_Savanna + .4byte gWallpaperPalettes_Savanna + + @ Crag + .4byte gWallpaperTiles_Crag + .4byte gWallpaperTilemap_Crag + .4byte gWallpaperPalettes_Crag + + @ Volcano + .4byte gWallpaperTiles_Volcano + .4byte gWallpaperTilemap_Volcano + .4byte gWallpaperPalettes_Volcano + + @ Snow + .4byte gWallpaperTiles_Snow + .4byte gWallpaperTilemap_Snow + .4byte gWallpaperPalettes_Snow + + @ Cave + .4byte gWallpaperTiles_Cave + .4byte gWallpaperTilemap_Cave + .4byte gWallpaperPalettes_Cave + + @ Beach + .4byte gWallpaperTiles_Beach + .4byte gWallpaperTilemap_Beach + .4byte gWallpaperPalettes_Beach + + @ Seafloor + .4byte gWallpaperTiles_Seafloor + .4byte gWallpaperTilemap_Seafloor + .4byte gWallpaperPalettes_Seafloor + + @ River + .4byte gWallpaperTiles_River + .4byte gWallpaperTilemap_River + .4byte gWallpaperPalettes_River + + @ Sky + .4byte gWallpaperTiles_Sky + .4byte gWallpaperTilemap_Sky + .4byte gWallpaperPalettes_Sky + + @ PolkaDot + .4byte gWallpaperTiles_PolkaDot + .4byte gWallpaperTilemap_PolkaDot + .4byte gWallpaperPalettes_PolkaDot + + @ Pokecenter + .4byte gWallpaperTiles_Pokecenter + .4byte gWallpaperTilemap_Pokecenter + .4byte gWallpaperPalettes_Pokecenter + + @ Machine + .4byte gWallpaperTiles_Machine + .4byte gWallpaperTilemap_Machine + .4byte gWallpaperPalettes_Machine + + @ Plain + .4byte gWallpaperTiles_Plain + .4byte gWallpaperTilemap_Plain + .4byte gWallpaperPalettes_Plain + + .align 2 +PCGfx_Arrow: @ 8577678 + .incbin "graphics/pokemon_storage/arrow.4bpp" + + .align 2 +gWallpaperPalettes_Zigzagoon:: @ 85776F8 + .incbin "graphics/pokemon_storage/friends_frame1.gbapal" + .incbin "graphics/pokemon_storage/zigzagoon_bg.gbapal" + + .align 2 +gWallpaperTiles_Zigzagoon: @ 8577738 + .incbin "graphics/pokemon_storage/zigzagoon.4bpp.lz" + + .align 2 +gWallpaperTilemap_Zigzagoon: @ 857792C + .incbin "graphics/pokemon_storage/zigzagoon.bin.lz" + + .align 2 +gWallpaperPalettes_Screen:: @ 8577A44 + .incbin "graphics/pokemon_storage/friends_frame1.gbapal" + .incbin "graphics/pokemon_storage/screen_bg.gbapal" + + .align 2 +gWallpaperTiles_Screen: @ 8577A84 + .incbin "graphics/pokemon_storage/screen.4bpp.lz" + + .align 2 +gWallpaperTilemap_Screen: @ 8577D00 + .incbin "graphics/pokemon_storage/screen.bin.lz" + + .align 2 +gWallpaperPalettes_Diagonal:: @ 8577E2C + .incbin "graphics/pokemon_storage/friends_frame1.gbapal" + .incbin "graphics/pokemon_storage/diagonal_bg.gbapal" + + .align 2 +gWallpaperTiles_Diagonal: @ 8577E6C + .incbin "graphics/pokemon_storage/diagonal.4bpp.lz" + + .align 2 +gWallpaperTilemap_Diagonal: @ 8578058 + .incbin "graphics/pokemon_storage/diagonal.bin.lz" + + .align 2 +gWallpaperPalettes_Block:: @ 8578148 + .incbin "graphics/pokemon_storage/block_bg.gbapal" + .incbin "graphics/pokemon_storage/block_bg.gbapal" + + .align 2 +gWallpaperTiles_Block: @ 8578188 + .incbin "graphics/pokemon_storage/block.4bpp.lz" + + .align 2 +gWallpaperTilemap_Block: @ 8578358 + .incbin "graphics/pokemon_storage/block.bin.lz" + + .align 2 +gWallpaperPalettes_Pokecenter2:: @ 8578450 + .incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal" + .incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal" + + .align 2 +gWallpaperTiles_Pokecenter2: @ 8578490 + .incbin "graphics/pokemon_storage/pokecenter2.4bpp.lz" + + .align 2 +gWallpaperTilemap_Pokecenter2: @ 85786D0 + .incbin "graphics/pokemon_storage/pokecenter2.bin.lz" + + .align 2 +gWallpaperPalettes_Frame:: @ 85787E4 + .incbin "graphics/pokemon_storage/frame_bg.gbapal" + .incbin "graphics/pokemon_storage/frame_bg.gbapal" + + .align 2 +gWallpaperTiles_Frame: @ 8578824 + .incbin "graphics/pokemon_storage/frame.4bpp.lz" + + .align 2 +gWallpaperTilemap_Frame: @ 8578A34 + .incbin "graphics/pokemon_storage/frame.bin.lz" + + .align 2 +gWallpaperPalettes_Blank:: @ 8578B48 + .incbin "graphics/pokemon_storage/friends_frame1.gbapal" + .incbin "graphics/pokemon_storage/zigzagoon_bg.gbapal" + + .align 2 +gWallpaperTiles_Blank: @ 8578B88 + .incbin "graphics/pokemon_storage/blank.4bpp.lz" + + .align 2 +gWallpaperTilemap_Blank: @ 8578D34 + .incbin "graphics/pokemon_storage/blank.bin.lz" + + .align 2 +gWallpaperPalettes_Circles:: @ 8578E10 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/circles_bg.gbapal" + + .align 2 +gWallpaperTiles_Circles: @ 8578E50 + .incbin "graphics/pokemon_storage/circles.4bpp.lz" -gUnknown_085775B8:: @ 85775B8 - .incbin "baserom.gba", 0x5775b8, 0x398c + .align 2 +gWallpaperTilemap_Circles: @ 85790A4 + .incbin "graphics/pokemon_storage/circles.bin.lz" + + .align 2 +gWallpaperPalettes_Azumarill:: @ 85791A0 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/azumarill_bg.gbapal" + + .align 2 +gWallpaperTiles_Azumarill: @ 85791E0 + .incbin "graphics/pokemon_storage/azumarill.4bpp.lz" + + .align 2 +gWallpaperTilemap_Azumarill: @ 85793CC + .incbin "graphics/pokemon_storage/azumarill.bin.lz" + + .align 2 +gWallpaperPalettes_Pikachu:: @ 85794C4 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/pikachu_bg.gbapal" + + .align 2 +gWallpaperTiles_Pikachu: @ 8579504 + .incbin "graphics/pokemon_storage/pikachu.4bpp.lz" + + .align 2 +gWallpaperTilemap_Pikachu: @ 8579738 + .incbin "graphics/pokemon_storage/pikachu.bin.lz" + + .align 2 +gWallpaperPalettes_Legendary:: @ 8579860 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/legendary_bg.gbapal" + + .align 2 +gWallpaperTiles_Legendary: @ 85798A0 + .incbin "graphics/pokemon_storage/legendary.4bpp.lz" + + .align 2 +gWallpaperTilemap_Legendary: @ 8579B80 + .incbin "graphics/pokemon_storage/legendary.bin.lz" + + .align 2 +gWallpaperPalettes_Dusclops:: @ 8579CC4 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/dusclops_bg.gbapal" + + .align 2 +gWallpaperTiles_Dusclops: @ 8579D04 + .incbin "graphics/pokemon_storage/dusclops.4bpp.lz" + + .align 2 +gWallpaperTilemap_Dusclops: @ 8579F50 + .incbin "graphics/pokemon_storage/dusclops.bin.lz" + + .align 2 +gWallpaperPalettes_Ludicolo:: @ 857A048 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/ludicolo_bg.gbapal" + + .align 2 +gWallpaperTiles_Ludicolo: @ 857A088 + .incbin "graphics/pokemon_storage/ludicolo.4bpp.lz" + + .align 2 +gWallpaperTilemap_Ludicolo: @ 857A348 + .incbin "graphics/pokemon_storage/ludicolo.bin.lz" + + .align 2 +gWallpaperPalettes_Whiscash:: @ 857A468 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/whiscash_bg.gbapal" + + .align 2 +gWallpaperTiles_Whiscash: @ 857A4A8 + .incbin "graphics/pokemon_storage/whiscash.4bpp.lz" + + .align 2 +gWallpaperTilemap_Whiscash: @ 857A6F0 + .incbin "graphics/pokemon_storage/whiscash.bin.lz" + + .align 2 +gWallpaperIcon_Aqua: @ 857A81C + .incbin "graphics/pokemon_storage/aqua_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Heart: @ 857A860 + .incbin "graphics/pokemon_storage/heart_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_FiveStar: @ 857A89C + .incbin "graphics/pokemon_storage/five_star_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Brick: @ 857A8DC + .incbin "graphics/pokemon_storage/brick_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_FourStar: @ 857A904 + .incbin "graphics/pokemon_storage/four_star_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Asterisk: @ 857A940 + .incbin "graphics/pokemon_storage/asterisk_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Dot: @ 857A990 + .incbin "graphics/pokemon_storage/dot_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_LineCircle: @ 857A9C0 + .incbin "graphics/pokemon_storage/line_circle_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_PokeBall: @ 857A9EC + .incbin "graphics/pokemon_storage/pokeball_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Maze: @ 857AA38 + .incbin "graphics/pokemon_storage/maze_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Footprint: @ 857AA7C + .incbin "graphics/pokemon_storage/footprint_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_BigAsterisk: @ 857AAC4 + .incbin "graphics/pokemon_storage/big_asterisk_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Circle: @ 857AB08 + .incbin "graphics/pokemon_storage/circle_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Koffing: @ 857AB48 + .incbin "graphics/pokemon_storage/koffing_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Ribbon: @ 857AB98 + .incbin "graphics/pokemon_storage/ribbon_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_FourCircles: @ 857AC00 + .incbin "graphics/pokemon_storage/four_circles_icon.4bpp.lz" + .align 2 +gWallpaperIcon_Lotad: @ 857AC30 + .incbin "graphics/pokemon_storage/lotad_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Crystal: @ 857AC74 + .incbin "graphics/pokemon_storage/crystal_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Pichu: @ 857ACBC + .incbin "graphics/pokemon_storage/pichu_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Diglett: @ 857ACF4 + .incbin "graphics/pokemon_storage/diglett_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Luvdisc: @ 857AD44 + .incbin "graphics/pokemon_storage/luvdisc_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_StarInCircle: @ 857AD88 + .incbin "graphics/pokemon_storage/star_in_circle_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Spinda: @ 857ADCC + .incbin "graphics/pokemon_storage/spinda_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Latis: @ 857AE20 + .incbin "graphics/pokemon_storage/latis_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Minun: @ 857AE64 + .incbin "graphics/pokemon_storage/minun_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Togepi: @ 857AEAC + .incbin "graphics/pokemon_storage/togepi_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Magma: @ 857AF08 + .incbin "graphics/pokemon_storage/magma_icon.4bpp.lz" + + .align 2 gUnknown_0857AF44:: @ 857AF44 - .incbin "baserom.gba", 0x57af44, 0xc0 + .4byte gWallpaperTiles_Zigzagoon, gWallpaperTilemap_Zigzagoon, gWallpaperPalettes_Zigzagoon + .4byte gWallpaperTiles_Screen, gWallpaperTilemap_Screen, gWallpaperPalettes_Screen + .4byte gWallpaperTiles_Horizontal, gWallpaperTilemap_Horizontal, gWallpaperPalettes_Horizontal + .4byte gWallpaperTiles_Diagonal, gWallpaperTilemap_Diagonal, gWallpaperPalettes_Diagonal + .4byte gWallpaperTiles_Block, gWallpaperTilemap_Block, gWallpaperPalettes_Block + .4byte gWallpaperTiles_Ribbon, gWallpaperTilemap_Ribbon, gWallpaperPalettes_Ribbon + .4byte gWallpaperTiles_Pokecenter2, gWallpaperTilemap_Pokecenter2, gWallpaperPalettes_Pokecenter2 + .4byte gWallpaperTiles_Frame, gWallpaperTilemap_Frame, gWallpaperPalettes_Frame + .4byte gWallpaperTiles_Blank, gWallpaperTilemap_Blank, gWallpaperPalettes_Blank + .4byte gWallpaperTiles_Circles, gWallpaperTilemap_Circles, gWallpaperPalettes_Circles + .4byte gWallpaperTiles_Azumarill, gWallpaperTilemap_Azumarill, gWallpaperPalettes_Azumarill + .4byte gWallpaperTiles_Pikachu, gWallpaperTilemap_Pikachu, gWallpaperPalettes_Pikachu + .4byte gWallpaperTiles_Legendary, gWallpaperTilemap_Legendary, gWallpaperPalettes_Legendary + .4byte gWallpaperTiles_Dusclops, gWallpaperTilemap_Dusclops, gWallpaperPalettes_Dusclops + .4byte gWallpaperTiles_Ludicolo, gWallpaperTilemap_Ludicolo, gWallpaperPalettes_Ludicolo + .4byte gWallpaperTiles_Whiscash, gWallpaperTilemap_Whiscash, gWallpaperPalettes_Whiscash + .align 2 gUnknown_0857B004:: @ 857B004 - .incbin "baserom.gba", 0x57b004, 0x7c + .4byte gWallpaperIcon_Aqua + .4byte gWallpaperIcon_Heart + .4byte gWallpaperIcon_FiveStar + .4byte gWallpaperIcon_Brick + .4byte gWallpaperIcon_FourStar + .4byte gWallpaperIcon_Asterisk + .4byte gWallpaperIcon_Dot + .4byte gWallpaperIcon_Cross + .4byte gWallpaperIcon_LineCircle + .4byte gWallpaperIcon_PokeBall + .4byte gWallpaperIcon_Maze + .4byte gWallpaperIcon_Footprint + .4byte gWallpaperIcon_BigAsterisk + .4byte gWallpaperIcon_Circle + .4byte gWallpaperIcon_Koffing + .4byte gWallpaperIcon_Ribbon + .4byte gWallpaperIcon_Bolt + .4byte gWallpaperIcon_FourCircles + .4byte gWallpaperIcon_Lotad + .4byte gWallpaperIcon_Crystal + .4byte gWallpaperIcon_Pichu + .4byte gWallpaperIcon_Diglett + .4byte gWallpaperIcon_Luvdisc + .4byte gWallpaperIcon_StarInCircle + .4byte gWallpaperIcon_Spinda + .4byte gWallpaperIcon_Latis + .4byte gWallpaperIcon_Plusle + .4byte gWallpaperIcon_Minun + .4byte gWallpaperIcon_Togepi + .4byte gWallpaperIcon_Magma + + .align 2 +gUnknown_0857B07C:: @ 857B07C + .4byte 0x23BA + .align 2 gUnknown_0857B080:: @ 857B080 - .incbin "baserom.gba", 0x57b080, 0x28 + obj_tiles PCGfx_Arrow, 128, 0x0006 + + .align 2 +gOamData_857B088:: @ 857B088 + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_857B090:: @ 857B090 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857B098:: @ 857B098 + obj_image_anim_frame 8, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_857B0A0:: @ 857B0A0 + .4byte gSpriteAnim_857B090 + .4byte gSpriteAnim_857B098 + + .align 2 +gSpriteTemplate_857B0A8:: @ 857B0A8 + spr_template 0x0003, 0xDAC9, gOamData_857B088, gSpriteAnimTable_857B0A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_857B0C0:: @ 857B0C0 + .2byte 0x8000 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_857B0C8:: @ 857B0C8 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857B0D0:: @ 857B0D0 + obj_image_anim_frame 2, 5 + obj_image_anim_end -gUnknown_0857B0A8:: @ 857B0A8 - .incbin "baserom.gba", 0x57b0a8, 0x38 + .align 2 +gSpriteAnimTable_857B0D8:: @ 857B0D8 + .4byte gSpriteAnim_857B0C8 + .4byte gSpriteAnim_857B0D0 gUnknown_0857B0E0:: @ 857B0E0 - .incbin "baserom.gba", 0x57b0e0, 0x8b8 + spr_template 0x0006, 0xDACA, gOamData_857B0C0, gSpriteAnimTable_857B0D8, NULL, gDummySpriteAffineAnimTable, sub_80CD210 + .align 2 +HandCursorPalette: @ 857B0F8 + .incbin "graphics/pokemon_storage/hand_cursor.gbapal" + + .align 2 +HandCursorTiles: @ 857B118 + .incbin "graphics/pokemon_storage/hand_cursor.4bpp" + + .align 2 +HandCursorShadowTiles: @ 857B918 + .incbin "graphics/pokemon_storage/hand_cursor_shadow.4bpp" + + .align 2 gUnknown_0857B998:: @ 857B998 - .incbin "baserom.gba", 0x57b998, 0xc + .4byte sub_80CDCCC + .4byte sub_80CDD5C + .4byte sub_80CDDD8 + .align 2 gUnknown_0857B9A4:: @ 857B9A4 - .incbin "baserom.gba", 0x57b9a4, 0x18 + .byte 0x22, 0x00 + .2byte 0x0039 + .byte 0x22, 0x00 + .2byte 0x0123 + .byte 0x10, 0x0a + .2byte 0x0046 + .byte 0x10, 0x0a + .2byte 0x00f9 + .byte 0x10, 0x0e + .2byte 0x0046 + .byte 0x10, 0x0e + .2byte 0x00f9 + .align 2 gUnknown_0857B9BC:: @ 857B9BC - .incbin "baserom.gba", 0x57b9bc, 0x28 + .4byte sub_80CF0CC, 0 + .4byte sub_80CF5C4, 1 + .4byte sub_80CF7E4, 2 + .4byte sub_80CF8D8, 3 + .4byte NULL, 0 -gUnknown_0857B9E4:: @ 857B9E4 - .incbin "baserom.gba", 0x57b9e4, 0x18 + .align 2 +gHandCursorSpriteSheets:: @ 857B9E4 + obj_tiles HandCursorTiles, 0x0800, 0x0000 + obj_tiles HandCursorShadowTiles, 0x0080, 0x0001 + null_obj_tiles -gUnknown_0857B9FC:: @ 857B9FC - .incbin "baserom.gba", 0x57b9fc, 0x54 + .align 2 +gHandCursorSpritePalettes:: @ 857B9FC + obj_pal HandCursorPalette, 0xDAC7 + null_obj_pal -gUnknown_0857BA50:: @ 857BA50 - .incbin "baserom.gba", 0x57ba50, 0x18 + .align 2 +gOamData_857BA0C:: @ 857BA0C + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0400 -gUnknown_0857BA68:: @ 857BA68 - .incbin "baserom.gba", 0x57ba68, 0x18 + .align 2 +gOamData_857BA14:: @ 857BA14 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0400 + + .align 2 +gSpriteAnim_857BA1C:: @ 857BA1C + obj_image_anim_frame 0, 30 + obj_image_anim_frame 16, 30 + obj_image_anim_jump 0 + .align 2 +gSpriteAnim_857BA28:: @ 857BA28 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857BA30:: @ 857BA30 + obj_image_anim_frame 32, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857BA38:: @ 857BA38 + obj_image_anim_frame 48, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_857BA40:: @ 857BA40 + .4byte gSpriteAnim_857BA1C + .4byte gSpriteAnim_857BA28 + .4byte gSpriteAnim_857BA30 + .4byte gSpriteAnim_857BA38 + + .align 2 +gSpriteTemplate_857BA50:: @ 857BA50 + spr_template 0, 0xDACA, gOamData_857BA0C, gSpriteAnimTable_857BA40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_857BA68:: @ 857BA68 + spr_template 1, 0xDACA, gOamData_857BA14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CFBF4 + + .align 2 gUnknown_0857BA80:: @ 857BA80 - .incbin "baserom.gba", 0x57ba80, 0x9c + .4byte gPCText_Cancel + .4byte gPCText_Store + .4byte gPCText_Withdraw + .4byte gPCText_Move + .4byte gPCText_Shift + .4byte gPCText_Place + .4byte gPCText_Summary + .4byte gPCText_Release + .4byte gPCText_Mark + .4byte gPCText_Jump + .4byte gPCText_Wallpaper + .4byte gPCText_Name + .4byte gPCText_Take + .4byte gPCText_Give + .4byte gPCText_Give + .4byte gPCText_Switch + .4byte gPCText_Bag + .4byte gPCText_Info + .4byte gPCText_Scenery1 + .4byte gPCText_Scenery2 + .4byte gPCText_Scenery3 + .4byte gPCText_Etcetera + .4byte gPCText_Friends + .4byte gPCText_Forest + .4byte gPCText_City + .4byte gPCText_Desert + .4byte gPCText_Savanna + .4byte gPCText_Crag + .4byte gPCText_Volcano + .4byte gPCText_Snow + .4byte gPCText_Cave + .4byte gPCText_Beach + .4byte gPCText_Seafloor + .4byte gPCText_River + .4byte gPCText_Sky + .4byte gPCText_PolkaDot + .4byte gPCText_Pokecenter + .4byte gPCText_Machine + .4byte gPCText_Simple + .align 2 gUnknown_0857BB1C:: @ 857BB1C - .incbin "baserom.gba", 0x57bb1c, 0x8 + window_template 0x00, 0x0a, 0x03, 0x14, 0x12, 0x09, 0x000a + .align 2 gUnknown_0857BB24:: @ 857BB24 - .incbin "baserom.gba", 0x57bb24, 0x14c + .incbin "graphics/pokemon_storage/unknown_frame.4bpp" + + .align 2 +gOamData_857BBA4:: @ 857BBA4 + .2byte 0x0100, 0x8000, 0x0400, 0x0000 + + .align 2 +gSpriteAffineAnim_857BBAC:: @ 857BBAC + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BBBC:: @ 857BBBC + .2byte 0x0058, 0x0058, 0x0000, 0x0000, 0x0005, 0x0005, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BBD4:: @ 857BBD4 + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfffb, 0xfffb, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BBEC:: @ 857BBEC + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x000a, 0x000a, 0x0c00, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BC0C:: @ 857BC0C + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff6, 0xfff6, 0x0c00, 0x0000, 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BC2C:: @ 857BC2C + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfffb, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BC44:: @ 857BC44 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_857BC54:: @ 857BC54 + .4byte gSpriteAffineAnim_857BBAC + .4byte gSpriteAffineAnim_857BBBC + .4byte gSpriteAffineAnim_857BBD4 + .4byte gSpriteAffineAnim_857BBEC + .4byte gSpriteAffineAnim_857BC0C + .4byte gSpriteAffineAnim_857BC2C + .4byte gSpriteAffineAnim_857BC44 + + .align 2 +gSpriteTemplate_857BC70:: @ 857BC70 + spr_template 0x0007, 0xdacb, gOamData_857BBA4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_857BC54, SpriteCallbackDummy -gUnknown_0857BC70:: @ 857BC70 - .incbin "baserom.gba", 0x57bc70, 0x18 +gSpriteTemplate_857BC88:: @ 857BC88 + .2byte 0x0100, 0x0100, 0x0200, 0x0100, 0x0100, 0x0200, 0x0200, 0x0200, 0x0080, 0x0080, 0x0100, 0x0100, 0x0200, 0x0200, 0x0400, 0x0400 -gUnknown_0857BC88:: @ 857BC88 - .incbin "baserom.gba", 0x57bc88, 0x20 diff --git a/data/strings.s b/data/strings.s index 01bca9cd8..9ff36256d 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2498,208 +2498,208 @@ gText_DontRemember:: @ 85EB7DB gText_Exit:: @ 85EB7EA .string "EXIT$" -gUnknown_085EB7EF:: @ 85EB7EF +gText_ExitFromBox:: @ 85EB7EF .string "Exit from the BOX?$" -gUnknown_085EB802:: @ 85EB802 +gText_WhatDoYouWantToDo:: @ 85EB802 .string "What do you want to do?$" -gUnknown_085EB81A:: @ 85EB81A +gText_PleasePickATheme:: @ 85EB81A .string "Please pick a theme.$" -gUnknown_085EB82F:: @ 85EB82F +gText_PickTheWallpaper:: @ 85EB82F .string "Pick the wallpaper.$" -gUnknown_085EB843:: @ 85EB843 +gText_PkmnIsSelected:: @ 85EB843 .string "{SPECIAL_F7 0x00} is selected.$" -gUnknown_085EB853:: @ 85EB853 +gText_JumpToWhichBox:: @ 85EB853 .string "Jump to which BOX?$" -gUnknown_085EB866:: @ 85EB866 +gText_DepositInWhichBox:: @ 85EB866 .string "Deposit in which BOX?$" -gUnknown_085EB87C:: @ 85EB87C +gText_PkmnWasDeposited:: @ 85EB87C .string "{SPECIAL_F7 0x00} was deposited.$" -gUnknown_085EB88E:: @ 85EB88E +gText_BoxIsFull2:: @ 85EB88E .string "The BOX is full.$" -gUnknown_085EB89F:: @ 85EB89F +gText_ReleaseThisPokemon:: @ 85EB89F .string "Release this POKéMON?$" -gUnknown_085EB8B5:: @ 85EB8B5 +gText_PkmnWasReleased:: @ 85EB8B5 .string "{SPECIAL_F7 0x00} was released.$" -gUnknown_085EB8C6:: @ 85EB8C6 +gText_ByeByePkmn:: @ 85EB8C6 .string "Bye-bye, {SPECIAL_F7 0x00}!$" -gUnknown_085EB8D3:: @ 85EB8D3 +gText_MarkYourPkmn:: @ 85EB8D3 .string "Mark your POKéMON.$" -gUnknown_085EB8E6:: @ 85EB8E6 +gText_ThatsYourLastPkmn:: @ 85EB8E6 .string "That’s your last POKéMON!$" -gUnknown_085EB900:: @ 85EB900 +gText_YourPartysFull:: @ 85EB900 .string "Your party’s full!$" -gUnknown_085EB913:: @ 85EB913 +gText_YoureHoldingAPkmn:: @ 85EB913 .string "You’re holding a POKéMON!$" -gUnknown_085EB92D:: @ 85EB92D +gText_WhichOneWillYouTake:: @ 85EB92D .string "Which one will you take?$" -gUnknown_085EB946:: @ 85EB946 +gText_YouCantReleaseAnEgg:: @ 85EB946 .string "You can’t release an EGG.$" -gUnknown_085EB960:: @ 85EB960 +gText_ContinueBoxOperations:: @ 85EB960 .string "Continue BOX operations?$" -gUnknown_085EB979:: @ 85EB979 +gText_PkmnCameBack:: @ 85EB979 .string "{SPECIAL_F7 0x00} came back!$" -gUnknown_085EB987:: @ 85EB987 +gText_WasItWorriedAboutYou:: @ 85EB987 .string "Was it worried about you?$" -gUnknown_085EB9A1:: @ 85EB9A1 +gText_FourEllipsesExclamation:: @ 85EB9A1 .string "… … … … !$" -gUnknown_085EB9AB:: @ 85EB9AB +gText_PleaseRemoveTheMail:: @ 85EB9AB .string "Please remove the MAIL.$" -gUnknown_085EB9C3:: @ 85EB9C3 +gText_GiveToAPkmn:: @ 85EB9C3 .string "GIVE to a POKéMON?$" -gUnknown_085EB9D6:: @ 85EB9D6 +gText_PlacedItemInBag:: @ 85EB9D6 .string "Placed item in the BAG.$" -gUnknown_085EB9EE:: @ 85EB9EE +gText_BagIsFull2:: @ 85EB9EE .string "The BAG is full.$" -gUnknown_085EB9FF:: @ 85EB9FF +gText_PutItemInBag:: @ 85EB9FF .string "Put this item in the BAG?$" -gUnknown_085EBA19:: @ 85EBA19 +gText_ItemIsNowHeld:: @ 85EBA19 .string "{SPECIAL_F7 0x00} is now held.$" -gUnknown_085EBA29:: @ 85EBA29 +gText_ChangedToNewItem:: @ 85EBA29 .string "Changed to {SPECIAL_F7 0x00}.$" -gUnknown_085EBA38:: @ 85EBA38 +gText_MailCantBeStored:: @ 85EBA38 .string "MAIL can’t be stored!$" -gUnknown_085EBA4E:: @ 85EBA4E +gPCText_Cancel:: @ 85EBA4E .string "CANCEL$" -gUnknown_085EBA55:: @ 85EBA55 +gPCText_Store:: @ 85EBA55 .string "STORE$" -gUnknown_085EBA5B:: @ 85EBA5B +gPCText_Withdraw:: @ 85EBA5B .string "WITHDRAW$" -gUnknown_085EBA64:: @ 85EBA64 +gPCText_Shift:: @ 85EBA64 .string "SHIFT$" -gUnknown_085EBA6A:: @ 85EBA6A +gPCText_Move:: @ 85EBA6A .string "MOVE$" -gUnknown_085EBA6F:: @ 85EBA6F +gPCText_Place:: @ 85EBA6F .string "PLACE$" -gUnknown_085EBA75:: @ 85EBA75 +gPCText_Summary:: @ 85EBA75 .string "SUMMARY$" -gUnknown_085EBA7D:: @ 85EBA7D +gPCText_Release:: @ 85EBA7D .string "RELEASE$" -gUnknown_085EBA85:: @ 85EBA85 +gPCText_Mark:: @ 85EBA85 .string "MARK$" -gUnknown_085EBA8A:: @ 85EBA8A +gPCText_Name:: @ 85EBA8A .string "NAME$" -gUnknown_085EBA8F:: @ 85EBA8F +gPCText_Jump:: @ 85EBA8F .string "JUMP$" -gUnknown_085EBA94:: @ 85EBA94 +gPCText_Wallpaper:: @ 85EBA94 .string "WALLPAPER$" -gUnknown_085EBA9E:: @ 85EBA9E +gPCText_Take:: @ 85EBA9E .string "TAKE$" -gUnknown_085EBAA3:: @ 85EBAA3 +gPCText_Give:: @ 85EBAA3 .string "GIVE$" -gUnknown_085EBAA8:: @ 85EBAA8 +gPCText_Switch:: @ 85EBAA8 .string "SWITCH$" -gUnknown_085EBAAF:: @ 85EBAAF +gPCText_Bag:: @ 85EBAAF .string "BAG$" -gUnknown_085EBAB3:: @ 85EBAB3 +gPCText_Info:: @ 85EBAB3 .string "INFO$" -gUnknown_085EBAB8:: @ 85EBAB8 +gPCText_Scenery1:: @ 85EBAB8 .string "SCENERY 1$" -gUnknown_085EBAC2:: @ 85EBAC2 +gPCText_Scenery2:: @ 85EBAC2 .string "SCENERY 2$" -gUnknown_085EBACC:: @ 85EBACC +gPCText_Scenery3:: @ 85EBACC .string "SCENERY 3$" -gUnknown_085EBAD6:: @ 85EBAD6 +gPCText_Etcetera:: @ 85EBAD6 .string "ETCETERA$" -gUnknown_085EBADF:: @ 85EBADF +gPCText_Friends:: @ 85EBADF .string "FRIENDS$" -gUnknown_085EBAE7:: @ 85EBAE7 +gPCText_Forest:: @ 85EBAE7 .string "FOREST$" -gUnknown_085EBAEE:: @ 85EBAEE +gPCText_City:: @ 85EBAEE .string "CITY$" -gUnknown_085EBAF3:: @ 85EBAF3 +gPCText_Desert:: @ 85EBAF3 .string "DESERT$" -gUnknown_085EBAFA:: @ 85EBAFA +gPCText_Savanna:: @ 85EBAFA .string "SAVANNA$" -gUnknown_085EBB02:: @ 85EBB02 +gPCText_Crag:: @ 85EBB02 .string "CRAG$" -gUnknown_085EBB07:: @ 85EBB07 +gPCText_Volcano:: @ 85EBB07 .string "VOLCANO$" -gUnknown_085EBB0F:: @ 85EBB0F +gPCText_Snow:: @ 85EBB0F .string "SNOW$" -gUnknown_085EBB14:: @ 85EBB14 +gPCText_Cave:: @ 85EBB14 .string "CAVE$" -gUnknown_085EBB19:: @ 85EBB19 +gPCText_Beach:: @ 85EBB19 .string "BEACH$" -gUnknown_085EBB1F:: @ 85EBB1F +gPCText_Seafloor:: @ 85EBB1F .string "SEAFLOOR$" -gUnknown_085EBB28:: @ 85EBB28 +gPCText_River:: @ 85EBB28 .string "RIVER$" -gUnknown_085EBB2E:: @ 85EBB2E +gPCText_Sky:: @ 85EBB2E .string "SKY$" -gUnknown_085EBB32:: @ 85EBB32 +gPCText_PolkaDot:: @ 85EBB32 .string "POLKA-DOT$" -gUnknown_085EBB3C:: @ 85EBB3C +gPCText_Pokecenter:: @ 85EBB3C .string "POKéCENTER$" -gUnknown_085EBB47:: @ 85EBB47 +gPCText_Machine:: @ 85EBB47 .string "MACHINE$" -gUnknown_085EBB4F:: @ 85EBB4F +gPCText_Simple:: @ 85EBB4F .string "SIMPLE$" gUnknown_085EBB56:: @ 85EBB56 diff --git a/data/unk_sprite_file.s b/data/unk_sprite_file.s deleted file mode 100644 index 2d5c9c12a..000000000 --- a/data/unk_sprite_file.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0862AD54:: @ 862AD54 - .incbin "baserom.gba", 0x62ad54, 0x1dc - -gUnknown_0862AF30:: @ 862AF30 - .incbin "baserom.gba", 0x62af30, 0x1AC - -gUnknown_0862B0DC:: @ 862B0DC - .incbin "baserom.gba", 0x62b0dc, 0x460 - -gUnknown_0862B53C:: @ 862B53C - .incbin "baserom.gba", 0x62b53c, 0x1E0 - -gUnknown_0862B71C:: @ 862B71C - .incbin "baserom.gba", 0x62b71c, 0x8 - -gUnknown_0862B724:: @ 862B724 - obj_tiles gUnknown_0862B0DC, 0x1800, 11920 - -gUnknown_0862B72C:: @ 862B72C - obj_pal gUnknown_0862B53C, 11920 - -gUnknown_0862B734:: @ 862B734 - .incbin "baserom.gba", 0x62b734, 0x8 - -gUnknown_0862B73C:: @ 862B73C - .incbin "baserom.gba", 0x62b73c, 0x8 - -gUnknown_0862B744:: @ 862B744 - .incbin "baserom.gba", 0x62b744, 0x8 - -gUnknown_0862B74C:: @ 862B74C - .4byte gUnknown_0862B734 - .4byte gUnknown_0862B73C - .4byte gUnknown_0862B744 - -gUnknown_0862B758:: @ 862B758 - spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/unk_transition.s b/data/unk_transition.s index 1b9ce5171..5d0dc07af 100644 --- a/data/unk_transition.s +++ b/data/unk_transition.s @@ -3,58 +3,14 @@ .section .rodata -gUnknown_0862B770:: @ 862B770 - .4byte sub_81DAACC - .4byte sub_81DAC14 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAC80 +gUnknown_0862AD54:: @ 862AD54 + .incbin "baserom.gba", 0x62ad54, 0x1dc -gUnknown_0862B784:: @ 862B784 - .4byte sub_81DAACC - .4byte sub_81DACEC - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAD58 +gUnknown_0862AF30:: @ 862AF30 + .incbin "baserom.gba", 0x62af30, 0x1AC -gUnknown_0862B798:: @ 862B798 - .4byte sub_81DAACC - .4byte sub_81DADC4 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAE44 +gUnknown_0862B0DC:: @ 862B0DC + .incbin "baserom.gba", 0x62b0dc, 0x460 -gUnknown_0862B7AC:: @ 862B7AC - .4byte sub_81DAACC - .4byte sub_81DAEB0 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAF34 - -gUnknown_0862B7C0:: @ 862B7C0 - .4byte sub_81DAACC - .4byte sub_81DAFA0 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB02C - -gUnknown_0862B7D4:: @ 862B7D4 - .4byte sub_81DAACC - .4byte sub_81DB098 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB124 - -gUnknown_0862B7E8:: @ 862B7E8 - .4byte sub_81DAACC - .4byte sub_81DB190 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB224 - -gUnknown_0862B7FC:: @ 862B7FC - .4byte sub_81DAACC - .4byte sub_81DB290 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB328 +gUnknown_0862B53C:: @ 862B53C + .incbin "baserom.gba", 0x62b53c, 0x1E0 diff --git a/data/wild_encounter.s b/data/wild_encounter.s index 914471769..5def2ca70 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -8,16 +8,288 @@ @ 85507E4 .include "data/wild_mons.inc" - .incbin "baserom.gba", 0x55370c, 0x188 +gBattlePyramidPlaceholders_1:: @ 55370C + wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_CHARMANDER, 5 + +gBattlePyramidPlaceholders_1Info:: @ 55373C + .4byte 4 + .4byte gBattlePyramidPlaceholders_1 + +gBattlePyramidPlaceholders_2:: @ 553744 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMANDER, 5 + +gBattlePyramidPlaceholders_2Info:: @ 553774 + .4byte 4 + .4byte gBattlePyramidPlaceholders_2 + +gBattlePyramidPlaceholders_3:: @ 55377C + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARIZARD, 5 + +gBattlePyramidPlaceholders_3Info:: @ 5537AC + .4byte 4 + .4byte gBattlePyramidPlaceholders_3 + +gBattlePyramidPlaceholders_4:: @ 5537B4 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_SQUIRTLE, 5 + +gBattlePyramidPlaceholders_4Info:: @ 5537E4 + .4byte 4 + .4byte gBattlePyramidPlaceholders_4 + +gBattlePyramidPlaceholders_5:: @ 5537EC + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + +gBattlePyramidPlaceholders_5Info:: @ 55381C + .4byte 4 + .4byte gBattlePyramidPlaceholders_5 + +gBattlePyramidPlaceholders_6:: @ 553824 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + +gBattlePyramidPlaceholders_6Info:: @ 553854 + .4byte 4 + .4byte gBattlePyramidPlaceholders_6 + +gBattlePyramidPlaceholders_7:: @ 55385C + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + +gBattlePyramidPlaceholders_7Info:: @ 55388C + .4byte 8 + .4byte gBattlePyramidPlaceholders_7 gBattlePyramidWildMonHeaders:: @ 8553894 - .incbin "baserom.gba", 0x553894, 0x180 + .byte 0, 1 + .2byte 0 + .4byte gBattlePyramidPlaceholders_1Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 2 + .2byte 0 + .4byte gBattlePyramidPlaceholders_2Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 3 + .2byte 0 + .4byte gBattlePyramidPlaceholders_3Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 4 + .2byte 0 + .4byte gBattlePyramidPlaceholders_4Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 5 + .2byte 0 + .4byte gBattlePyramidPlaceholders_5Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 6 + .2byte 0 + .4byte gBattlePyramidPlaceholders_6Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 7 + .2byte 0 + .4byte gBattlePyramidPlaceholders_7Info + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0xFFFF + .2byte 0 + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + +gBattlePikeMons_1:: @ 8553934 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + +gBattlePikeMonsInfo_1:: @ 8553964 + .4byte 10 + .4byte gBattlePikeMons_1 + +gBattlePikeMons_2:: @ 855396C + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + +gBattlePikeMonsInfo_2:: @ 855399C + .4byte 10 + .4byte gBattlePikeMons_2 + +gBattlePikeMons_3:: @ 85539A4 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + +gBattlePikeMonsInfo_3:: @ 85539D4 + .4byte 10 + .4byte gBattlePikeMons_3 + +gBattlePikeMons_4:: @ 85539DC + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + +gBattlePikeMonsInfo_4:: @ 8553A0C + .4byte 10 + .4byte gBattlePikeMons_4 gBattlePikeWildMonHeaders:: @ 8553A14 - .incbin "baserom.gba", 0x553a14, 0x64 + .byte 0, 1 + .2byte 0 + .4byte gBattlePikeMonsInfo_1 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 2 + .2byte 0 + .4byte gBattlePikeMonsInfo_2 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 3 + .2byte 0 + .4byte gBattlePikeMonsInfo_3 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 4 + .2byte 0 + .4byte gBattlePikeMonsInfo_4 + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0xFFFF + .2byte 0 + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL gWildFeebasRoute119Data:: @ 8553A78 - .incbin "baserom.gba", 0x553a78, 0x4 + wild_mon SPECIES_FEEBAS, 20, 25 gRoute119WaterTileData:: @ 8553A7C - .incbin "baserom.gba", 0x553a7c, 0x14 + .2byte 0, 0x2D, 0, 0x2E, 0x5B, 0x83, 0x5C, 0x8B, 0x12A, 0 diff --git a/graphics/interface/ui_learn_move.png b/graphics/interface/ui_learn_move.png Binary files differnew file mode 100755 index 000000000..6cb6540b5 --- /dev/null +++ b/graphics/interface/ui_learn_move.png diff --git a/graphics/misc/big_hof_monitor.png b/graphics/misc/big_hof_monitor.png Binary files differnew file mode 100644 index 000000000..510e6a232 --- /dev/null +++ b/graphics/misc/big_hof_monitor.png diff --git a/graphics/misc/darkness_field_move_streaks.png b/graphics/misc/darkness_field_move_streaks.png Binary files differnew file mode 100644 index 000000000..825d695eb --- /dev/null +++ b/graphics/misc/darkness_field_move_streaks.png diff --git a/graphics/misc/darkness_field_move_streaks_map.bin b/graphics/misc/darkness_field_move_streaks_map.bin Binary files differnew file mode 100644 index 000000000..f7c2f2142 --- /dev/null +++ b/graphics/misc/darkness_field_move_streaks_map.bin diff --git a/graphics/misc/field_move_streaks.png b/graphics/misc/field_move_streaks.png Binary files differnew file mode 100644 index 000000000..8becc4413 --- /dev/null +++ b/graphics/misc/field_move_streaks.png diff --git a/graphics/misc/field_move_streaks_map.bin b/graphics/misc/field_move_streaks_map.bin Binary files differnew file mode 100644 index 000000000..466f456be --- /dev/null +++ b/graphics/misc/field_move_streaks_map.bin diff --git a/graphics/misc/pokeball_glow.png b/graphics/misc/pokeball_glow.png Binary files differnew file mode 100644 index 000000000..1c1133b76 --- /dev/null +++ b/graphics/misc/pokeball_glow.png diff --git a/graphics/misc/pokecenter_monitor/0.png b/graphics/misc/pokecenter_monitor/0.png Binary files differnew file mode 100644 index 000000000..474883908 --- /dev/null +++ b/graphics/misc/pokecenter_monitor/0.png diff --git a/graphics/misc/pokecenter_monitor/1.png b/graphics/misc/pokecenter_monitor/1.png Binary files differnew file mode 100644 index 000000000..1a2606011 --- /dev/null +++ b/graphics/misc/pokecenter_monitor/1.png diff --git a/graphics/misc/small_hof_monitor.png b/graphics/misc/small_hof_monitor.png Binary files differnew file mode 100644 index 000000000..dcff33095 --- /dev/null +++ b/graphics/misc/small_hof_monitor.png diff --git a/graphics/misc/spotlight.png b/graphics/misc/spotlight.png Binary files differnew file mode 100644 index 000000000..62e21e411 --- /dev/null +++ b/graphics/misc/spotlight.png diff --git a/graphics/pokemon/icons/deoxys_speed_icon.png b/graphics/pokemon/icons/deoxys_speed_icon.png Binary files differnew file mode 100644 index 000000000..674b93a9c --- /dev/null +++ b/graphics/pokemon/icons/deoxys_speed_icon.png diff --git a/graphics/pokemon_storage/aqua_icon.png b/graphics/pokemon_storage/aqua_icon.png Binary files differnew file mode 100644 index 000000000..169ba5b68 --- /dev/null +++ b/graphics/pokemon_storage/aqua_icon.png diff --git a/graphics/pokemon_storage/arrow.png b/graphics/pokemon_storage/arrow.png Binary files differnew file mode 100644 index 000000000..ec1202319 --- /dev/null +++ b/graphics/pokemon_storage/arrow.png diff --git a/graphics/pokemon_storage/asterisk_icon.png b/graphics/pokemon_storage/asterisk_icon.png Binary files differnew file mode 100644 index 000000000..e353a1c3d --- /dev/null +++ b/graphics/pokemon_storage/asterisk_icon.png diff --git a/graphics/pokemon_storage/azumarill.bin b/graphics/pokemon_storage/azumarill.bin Binary files differnew file mode 100644 index 000000000..029fd418c --- /dev/null +++ b/graphics/pokemon_storage/azumarill.bin diff --git a/graphics/pokemon_storage/azumarill_bg.png b/graphics/pokemon_storage/azumarill_bg.png Binary files differnew file mode 100644 index 000000000..fcb387149 --- /dev/null +++ b/graphics/pokemon_storage/azumarill_bg.png diff --git a/graphics/pokemon_storage/beach.bin b/graphics/pokemon_storage/beach.bin Binary files differnew file mode 100644 index 000000000..42b834dbd --- /dev/null +++ b/graphics/pokemon_storage/beach.bin diff --git a/graphics/pokemon_storage/beach_bg.png b/graphics/pokemon_storage/beach_bg.png Binary files differnew file mode 100644 index 000000000..49f169084 --- /dev/null +++ b/graphics/pokemon_storage/beach_bg.png diff --git a/graphics/pokemon_storage/beach_frame.png b/graphics/pokemon_storage/beach_frame.png Binary files differnew file mode 100644 index 000000000..eae14b95a --- /dev/null +++ b/graphics/pokemon_storage/beach_frame.png diff --git a/graphics/pokemon_storage/big_asterisk_icon.png b/graphics/pokemon_storage/big_asterisk_icon.png Binary files differnew file mode 100644 index 000000000..9a56b0fc6 --- /dev/null +++ b/graphics/pokemon_storage/big_asterisk_icon.png diff --git a/graphics/pokemon_storage/blank.bin b/graphics/pokemon_storage/blank.bin Binary files differnew file mode 100644 index 000000000..b00854423 --- /dev/null +++ b/graphics/pokemon_storage/blank.bin diff --git a/graphics/pokemon_storage/blank_bg.png b/graphics/pokemon_storage/blank_bg.png Binary files differnew file mode 100644 index 000000000..7ff832672 --- /dev/null +++ b/graphics/pokemon_storage/blank_bg.png diff --git a/graphics/pokemon_storage/block.bin b/graphics/pokemon_storage/block.bin Binary files differnew file mode 100644 index 000000000..ec5df1525 --- /dev/null +++ b/graphics/pokemon_storage/block.bin diff --git a/graphics/pokemon_storage/block_bg.png b/graphics/pokemon_storage/block_bg.png Binary files differnew file mode 100644 index 000000000..9147ef881 --- /dev/null +++ b/graphics/pokemon_storage/block_bg.png diff --git a/graphics/pokemon_storage/bolt_icon.png b/graphics/pokemon_storage/bolt_icon.png Binary files differnew file mode 100644 index 000000000..674d22424 --- /dev/null +++ b/graphics/pokemon_storage/bolt_icon.png diff --git a/graphics/pokemon_storage/box_bg1.pal b/graphics/pokemon_storage/box_bg1.pal new file mode 100644 index 000000000..52ac12110 --- /dev/null +++ b/graphics/pokemon_storage/box_bg1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokemon_storage/box_selection_popup_center.png b/graphics/pokemon_storage/box_selection_popup_center.png Binary files differnew file mode 100644 index 000000000..f7ab30276 --- /dev/null +++ b/graphics/pokemon_storage/box_selection_popup_center.png diff --git a/graphics/pokemon_storage/box_selection_popup_sides.png b/graphics/pokemon_storage/box_selection_popup_sides.png Binary files differnew file mode 100644 index 000000000..a0140dc87 --- /dev/null +++ b/graphics/pokemon_storage/box_selection_popup_sides.png diff --git a/graphics/pokemon_storage/brick_icon.png b/graphics/pokemon_storage/brick_icon.png Binary files differnew file mode 100644 index 000000000..06a751af3 --- /dev/null +++ b/graphics/pokemon_storage/brick_icon.png diff --git a/graphics/pokemon_storage/cave.bin b/graphics/pokemon_storage/cave.bin Binary files differnew file mode 100644 index 000000000..112d4724d --- /dev/null +++ b/graphics/pokemon_storage/cave.bin diff --git a/graphics/pokemon_storage/cave_bg.png b/graphics/pokemon_storage/cave_bg.png Binary files differnew file mode 100644 index 000000000..421221634 --- /dev/null +++ b/graphics/pokemon_storage/cave_bg.png diff --git a/graphics/pokemon_storage/cave_frame.png b/graphics/pokemon_storage/cave_frame.png Binary files differnew file mode 100644 index 000000000..35cca742c --- /dev/null +++ b/graphics/pokemon_storage/cave_frame.png diff --git a/graphics/pokemon_storage/circle_icon.png b/graphics/pokemon_storage/circle_icon.png Binary files differnew file mode 100644 index 000000000..cf92abeed --- /dev/null +++ b/graphics/pokemon_storage/circle_icon.png diff --git a/graphics/pokemon_storage/circles.bin b/graphics/pokemon_storage/circles.bin Binary files differnew file mode 100644 index 000000000..d2ed6d127 --- /dev/null +++ b/graphics/pokemon_storage/circles.bin diff --git a/graphics/pokemon_storage/circles_bg.png b/graphics/pokemon_storage/circles_bg.png Binary files differnew file mode 100644 index 000000000..c105b1760 --- /dev/null +++ b/graphics/pokemon_storage/circles_bg.png diff --git a/graphics/pokemon_storage/city.bin b/graphics/pokemon_storage/city.bin Binary files differnew file mode 100644 index 000000000..ff0785a96 --- /dev/null +++ b/graphics/pokemon_storage/city.bin diff --git a/graphics/pokemon_storage/city_bg.png b/graphics/pokemon_storage/city_bg.png Binary files differnew file mode 100644 index 000000000..b221c2596 --- /dev/null +++ b/graphics/pokemon_storage/city_bg.png diff --git a/graphics/pokemon_storage/city_frame.png b/graphics/pokemon_storage/city_frame.png Binary files differnew file mode 100644 index 000000000..82e4731ef --- /dev/null +++ b/graphics/pokemon_storage/city_frame.png diff --git a/graphics/pokemon_storage/crag.bin b/graphics/pokemon_storage/crag.bin Binary files differnew file mode 100644 index 000000000..5c7c44cd2 --- /dev/null +++ b/graphics/pokemon_storage/crag.bin diff --git a/graphics/pokemon_storage/crag_bg.png b/graphics/pokemon_storage/crag_bg.png Binary files differnew file mode 100644 index 000000000..13b536358 --- /dev/null +++ b/graphics/pokemon_storage/crag_bg.png diff --git a/graphics/pokemon_storage/crag_frame.png b/graphics/pokemon_storage/crag_frame.png Binary files differnew file mode 100644 index 000000000..b67c6efa1 --- /dev/null +++ b/graphics/pokemon_storage/crag_frame.png diff --git a/graphics/pokemon_storage/cross_icon.png b/graphics/pokemon_storage/cross_icon.png Binary files differnew file mode 100644 index 000000000..674d22424 --- /dev/null +++ b/graphics/pokemon_storage/cross_icon.png diff --git a/graphics/pokemon_storage/crystal_icon.png b/graphics/pokemon_storage/crystal_icon.png Binary files differnew file mode 100644 index 000000000..424f104de --- /dev/null +++ b/graphics/pokemon_storage/crystal_icon.png diff --git a/graphics/pokemon_storage/desert.bin b/graphics/pokemon_storage/desert.bin Binary files differnew file mode 100644 index 000000000..98464faff --- /dev/null +++ b/graphics/pokemon_storage/desert.bin diff --git a/graphics/pokemon_storage/desert_bg.png b/graphics/pokemon_storage/desert_bg.png Binary files differnew file mode 100644 index 000000000..535fe9cb0 --- /dev/null +++ b/graphics/pokemon_storage/desert_bg.png diff --git a/graphics/pokemon_storage/desert_frame.png b/graphics/pokemon_storage/desert_frame.png Binary files differnew file mode 100644 index 000000000..a46e72e7f --- /dev/null +++ b/graphics/pokemon_storage/desert_frame.png diff --git a/graphics/pokemon_storage/diagonal.bin b/graphics/pokemon_storage/diagonal.bin Binary files differnew file mode 100644 index 000000000..d63b17121 --- /dev/null +++ b/graphics/pokemon_storage/diagonal.bin diff --git a/graphics/pokemon_storage/diagonal_bg.png b/graphics/pokemon_storage/diagonal_bg.png Binary files differnew file mode 100644 index 000000000..d4fcbe06a --- /dev/null +++ b/graphics/pokemon_storage/diagonal_bg.png diff --git a/graphics/pokemon_storage/diglett_icon.png b/graphics/pokemon_storage/diglett_icon.png Binary files differnew file mode 100644 index 000000000..8e485cfd4 --- /dev/null +++ b/graphics/pokemon_storage/diglett_icon.png diff --git a/graphics/pokemon_storage/dot_icon.png b/graphics/pokemon_storage/dot_icon.png Binary files differnew file mode 100644 index 000000000..0b3e6b34c --- /dev/null +++ b/graphics/pokemon_storage/dot_icon.png diff --git a/graphics/pokemon_storage/dusclops.bin b/graphics/pokemon_storage/dusclops.bin Binary files differnew file mode 100644 index 000000000..1c520b119 --- /dev/null +++ b/graphics/pokemon_storage/dusclops.bin diff --git a/graphics/pokemon_storage/dusclops_bg.png b/graphics/pokemon_storage/dusclops_bg.png Binary files differnew file mode 100644 index 000000000..035cf7466 --- /dev/null +++ b/graphics/pokemon_storage/dusclops_bg.png diff --git a/graphics/pokemon_storage/five_star_icon.png b/graphics/pokemon_storage/five_star_icon.png Binary files differnew file mode 100644 index 000000000..29b2eb9b0 --- /dev/null +++ b/graphics/pokemon_storage/five_star_icon.png diff --git a/graphics/pokemon_storage/footprint_icon.png b/graphics/pokemon_storage/footprint_icon.png Binary files differnew file mode 100644 index 000000000..30f8c4e8a --- /dev/null +++ b/graphics/pokemon_storage/footprint_icon.png diff --git a/graphics/pokemon_storage/forest.bin b/graphics/pokemon_storage/forest.bin Binary files differnew file mode 100644 index 000000000..5439f1274 --- /dev/null +++ b/graphics/pokemon_storage/forest.bin diff --git a/graphics/pokemon_storage/forest_bg.png b/graphics/pokemon_storage/forest_bg.png Binary files differnew file mode 100644 index 000000000..c81182807 --- /dev/null +++ b/graphics/pokemon_storage/forest_bg.png diff --git a/graphics/pokemon_storage/forest_frame.png b/graphics/pokemon_storage/forest_frame.png Binary files differnew file mode 100644 index 000000000..c205e8944 --- /dev/null +++ b/graphics/pokemon_storage/forest_frame.png diff --git a/graphics/pokemon_storage/four_circles_icon.png b/graphics/pokemon_storage/four_circles_icon.png Binary files differnew file mode 100644 index 000000000..b8f8f991b --- /dev/null +++ b/graphics/pokemon_storage/four_circles_icon.png diff --git a/graphics/pokemon_storage/four_star_icon.png b/graphics/pokemon_storage/four_star_icon.png Binary files differnew file mode 100644 index 000000000..4c61ffc0d --- /dev/null +++ b/graphics/pokemon_storage/four_star_icon.png diff --git a/graphics/pokemon_storage/frame.bin b/graphics/pokemon_storage/frame.bin Binary files differnew file mode 100644 index 000000000..490a9968d --- /dev/null +++ b/graphics/pokemon_storage/frame.bin diff --git a/graphics/pokemon_storage/frame_bg.png b/graphics/pokemon_storage/frame_bg.png Binary files differnew file mode 100644 index 000000000..98a3d80b7 --- /dev/null +++ b/graphics/pokemon_storage/frame_bg.png diff --git a/graphics/pokemon_storage/friends_frame1.png b/graphics/pokemon_storage/friends_frame1.png Binary files differnew file mode 100644 index 000000000..e76eb4e73 --- /dev/null +++ b/graphics/pokemon_storage/friends_frame1.png diff --git a/graphics/pokemon_storage/friends_frame2.png b/graphics/pokemon_storage/friends_frame2.png Binary files differnew file mode 100644 index 000000000..b66c5ce12 --- /dev/null +++ b/graphics/pokemon_storage/friends_frame2.png diff --git a/graphics/pokemon_storage/hand_cursor.png b/graphics/pokemon_storage/hand_cursor.png Binary files differnew file mode 100644 index 000000000..32f58ec63 --- /dev/null +++ b/graphics/pokemon_storage/hand_cursor.png diff --git a/graphics/pokemon_storage/hand_cursor_shadow.png b/graphics/pokemon_storage/hand_cursor_shadow.png Binary files differnew file mode 100644 index 000000000..f10b0af44 --- /dev/null +++ b/graphics/pokemon_storage/hand_cursor_shadow.png diff --git a/graphics/pokemon_storage/heart_icon.png b/graphics/pokemon_storage/heart_icon.png Binary files differnew file mode 100644 index 000000000..928182bfd --- /dev/null +++ b/graphics/pokemon_storage/heart_icon.png diff --git a/graphics/unknown/unknown_DDDB80.bin b/graphics/pokemon_storage/horizontal.bin Binary files differindex d538583f6..d538583f6 100755..100644 --- a/graphics/unknown/unknown_DDDB80.bin +++ b/graphics/pokemon_storage/horizontal.bin diff --git a/graphics/pokemon_storage/horizontal_bg.png b/graphics/pokemon_storage/horizontal_bg.png Binary files differnew file mode 100644 index 000000000..3c1facd74 --- /dev/null +++ b/graphics/pokemon_storage/horizontal_bg.png diff --git a/graphics/pokemon_storage/koffing_icon.png b/graphics/pokemon_storage/koffing_icon.png Binary files differnew file mode 100644 index 000000000..9ec2d166f --- /dev/null +++ b/graphics/pokemon_storage/koffing_icon.png diff --git a/graphics/pokemon_storage/latis_icon.png b/graphics/pokemon_storage/latis_icon.png Binary files differnew file mode 100644 index 000000000..90fbdfa25 --- /dev/null +++ b/graphics/pokemon_storage/latis_icon.png diff --git a/graphics/pokemon_storage/legendary.bin b/graphics/pokemon_storage/legendary.bin Binary files differnew file mode 100644 index 000000000..72444b590 --- /dev/null +++ b/graphics/pokemon_storage/legendary.bin diff --git a/graphics/pokemon_storage/legendary_bg.png b/graphics/pokemon_storage/legendary_bg.png Binary files differnew file mode 100644 index 000000000..bcfda2f3b --- /dev/null +++ b/graphics/pokemon_storage/legendary_bg.png diff --git a/graphics/pokemon_storage/line_circle_icon.png b/graphics/pokemon_storage/line_circle_icon.png Binary files differnew file mode 100644 index 000000000..0bcf9171b --- /dev/null +++ b/graphics/pokemon_storage/line_circle_icon.png diff --git a/graphics/pokemon_storage/lotad_icon.png b/graphics/pokemon_storage/lotad_icon.png Binary files differnew file mode 100644 index 000000000..2399ea256 --- /dev/null +++ b/graphics/pokemon_storage/lotad_icon.png diff --git a/graphics/pokemon_storage/ludicolo.bin b/graphics/pokemon_storage/ludicolo.bin Binary files differnew file mode 100644 index 000000000..6f39ea7d2 --- /dev/null +++ b/graphics/pokemon_storage/ludicolo.bin diff --git a/graphics/pokemon_storage/ludicolo_bg.png b/graphics/pokemon_storage/ludicolo_bg.png Binary files differnew file mode 100644 index 000000000..585cb0ce1 --- /dev/null +++ b/graphics/pokemon_storage/ludicolo_bg.png diff --git a/graphics/pokemon_storage/luvdisc_icon.png b/graphics/pokemon_storage/luvdisc_icon.png Binary files differnew file mode 100644 index 000000000..c3a06d3e0 --- /dev/null +++ b/graphics/pokemon_storage/luvdisc_icon.png diff --git a/graphics/pokemon_storage/machine.bin b/graphics/pokemon_storage/machine.bin Binary files differnew file mode 100644 index 000000000..123dc02e0 --- /dev/null +++ b/graphics/pokemon_storage/machine.bin diff --git a/graphics/pokemon_storage/machine_bg.png b/graphics/pokemon_storage/machine_bg.png Binary files differnew file mode 100644 index 000000000..648229ed2 --- /dev/null +++ b/graphics/pokemon_storage/machine_bg.png diff --git a/graphics/pokemon_storage/machine_frame.png b/graphics/pokemon_storage/machine_frame.png Binary files differnew file mode 100644 index 000000000..7b14a0d0d --- /dev/null +++ b/graphics/pokemon_storage/machine_frame.png diff --git a/graphics/pokemon_storage/magma_icon.png b/graphics/pokemon_storage/magma_icon.png Binary files differnew file mode 100644 index 000000000..69d5f4fb7 --- /dev/null +++ b/graphics/pokemon_storage/magma_icon.png diff --git a/graphics/pokemon_storage/maze_icon.png b/graphics/pokemon_storage/maze_icon.png Binary files differnew file mode 100644 index 000000000..42664ecb7 --- /dev/null +++ b/graphics/pokemon_storage/maze_icon.png diff --git a/graphics/pokemon_storage/minun_icon.png b/graphics/pokemon_storage/minun_icon.png Binary files differnew file mode 100644 index 000000000..5a8e56d18 --- /dev/null +++ b/graphics/pokemon_storage/minun_icon.png diff --git a/graphics/pokemon_storage/pichu_icon.png b/graphics/pokemon_storage/pichu_icon.png Binary files differnew file mode 100644 index 000000000..384027dca --- /dev/null +++ b/graphics/pokemon_storage/pichu_icon.png diff --git a/graphics/pokemon_storage/pikachu.bin b/graphics/pokemon_storage/pikachu.bin Binary files differnew file mode 100644 index 000000000..f94b31e37 --- /dev/null +++ b/graphics/pokemon_storage/pikachu.bin diff --git a/graphics/pokemon_storage/pikachu_bg.png b/graphics/pokemon_storage/pikachu_bg.png Binary files differnew file mode 100644 index 000000000..c08494fa9 --- /dev/null +++ b/graphics/pokemon_storage/pikachu_bg.png diff --git a/graphics/pokemon_storage/plain.bin b/graphics/pokemon_storage/plain.bin Binary files differnew file mode 100644 index 000000000..1813620a4 --- /dev/null +++ b/graphics/pokemon_storage/plain.bin diff --git a/graphics/pokemon_storage/plain_bg.png b/graphics/pokemon_storage/plain_bg.png Binary files differnew file mode 100644 index 000000000..79218ca9d --- /dev/null +++ b/graphics/pokemon_storage/plain_bg.png diff --git a/graphics/pokemon_storage/plain_frame.png b/graphics/pokemon_storage/plain_frame.png Binary files differnew file mode 100644 index 000000000..e3eea8728 --- /dev/null +++ b/graphics/pokemon_storage/plain_frame.png diff --git a/graphics/pokemon_storage/plusle_icon.png b/graphics/pokemon_storage/plusle_icon.png Binary files differnew file mode 100644 index 000000000..674d22424 --- /dev/null +++ b/graphics/pokemon_storage/plusle_icon.png diff --git a/graphics/pokemon_storage/pokeball_icon.png b/graphics/pokemon_storage/pokeball_icon.png Binary files differnew file mode 100644 index 000000000..65af70016 --- /dev/null +++ b/graphics/pokemon_storage/pokeball_icon.png diff --git a/graphics/pokemon_storage/pokecenter.bin b/graphics/pokemon_storage/pokecenter.bin Binary files differnew file mode 100644 index 000000000..c7b6405e1 --- /dev/null +++ b/graphics/pokemon_storage/pokecenter.bin diff --git a/graphics/pokemon_storage/pokecenter2.bin b/graphics/pokemon_storage/pokecenter2.bin Binary files differnew file mode 100644 index 000000000..d65cead67 --- /dev/null +++ b/graphics/pokemon_storage/pokecenter2.bin diff --git a/graphics/pokemon_storage/pokecenter2_bg.png b/graphics/pokemon_storage/pokecenter2_bg.png Binary files differnew file mode 100644 index 000000000..704f96164 --- /dev/null +++ b/graphics/pokemon_storage/pokecenter2_bg.png diff --git a/graphics/pokemon_storage/pokecenter_bg.png b/graphics/pokemon_storage/pokecenter_bg.png Binary files differnew file mode 100644 index 000000000..52b100357 --- /dev/null +++ b/graphics/pokemon_storage/pokecenter_bg.png diff --git a/graphics/pokemon_storage/pokecenter_frame.png b/graphics/pokemon_storage/pokecenter_frame.png Binary files differnew file mode 100644 index 000000000..3a32c4e64 --- /dev/null +++ b/graphics/pokemon_storage/pokecenter_frame.png diff --git a/graphics/pokemon_storage/polkadot.bin b/graphics/pokemon_storage/polkadot.bin Binary files differnew file mode 100644 index 000000000..c31792b81 --- /dev/null +++ b/graphics/pokemon_storage/polkadot.bin diff --git a/graphics/pokemon_storage/polkadot_bg.png b/graphics/pokemon_storage/polkadot_bg.png Binary files differnew file mode 100644 index 000000000..fe67c1b39 --- /dev/null +++ b/graphics/pokemon_storage/polkadot_bg.png diff --git a/graphics/pokemon_storage/polkadot_frame.png b/graphics/pokemon_storage/polkadot_frame.png Binary files differnew file mode 100644 index 000000000..4d76fbbbf --- /dev/null +++ b/graphics/pokemon_storage/polkadot_frame.png diff --git a/graphics/pokemon_storage/pss_window.pal b/graphics/pokemon_storage/pss_window.pal deleted file mode 100755 index bfd913069..000000000 --- a/graphics/pokemon_storage/pss_window.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 255 -74 205 139 -172 106 148 -49 0 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 -255 255 255 -57 164 148 -230 180 148 -49 0 148 -0 0 0 -255 148 148 -255 230 131 -255 189 115 -0 0 0 -0 0 0 -0 0 0 -213 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 diff --git a/graphics/pokemon_storage/pss_window.png b/graphics/pokemon_storage/pss_window.png Binary files differdeleted file mode 100755 index 59cc0b5d2..000000000 --- a/graphics/pokemon_storage/pss_window.png +++ /dev/null diff --git a/graphics/pokemon_storage/pss_window2.png b/graphics/pokemon_storage/pss_window2.png Binary files differdeleted file mode 100755 index ae2d3b969..000000000 --- a/graphics/pokemon_storage/pss_window2.png +++ /dev/null diff --git a/graphics/pokemon_storage/pss_window2.bin b/graphics/pokemon_storage/ribbon.bin Binary files differindex f348e6e1e..f348e6e1e 100755..100644 --- a/graphics/pokemon_storage/pss_window2.bin +++ b/graphics/pokemon_storage/ribbon.bin diff --git a/graphics/pokemon_storage/ribbon_bg.png b/graphics/pokemon_storage/ribbon_bg.png Binary files differnew file mode 100644 index 000000000..f8d258d9b --- /dev/null +++ b/graphics/pokemon_storage/ribbon_bg.png diff --git a/graphics/pokemon_storage/pss_window2.pal b/graphics/pokemon_storage/ribbon_frame.pal index 9696184a2..8180cfb89 100755..100644 --- a/graphics/pokemon_storage/pss_window2.pal +++ b/graphics/pokemon_storage/ribbon_frame.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -32 +16 255 255 255 139 180 255 222 238 255 @@ -17,19 +17,3 @@ JASC-PAL 255 255 255 164 164 164 82 82 82 -255 255 255 -197 222 255 -90 164 238 -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 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 diff --git a/graphics/pokemon_storage/ribbon_icon.png b/graphics/pokemon_storage/ribbon_icon.png Binary files differnew file mode 100644 index 000000000..0c3d51bab --- /dev/null +++ b/graphics/pokemon_storage/ribbon_icon.png diff --git a/graphics/pokemon_storage/river.bin b/graphics/pokemon_storage/river.bin Binary files differnew file mode 100644 index 000000000..ca4d56f8a --- /dev/null +++ b/graphics/pokemon_storage/river.bin diff --git a/graphics/pokemon_storage/river_bg.png b/graphics/pokemon_storage/river_bg.png Binary files differnew file mode 100644 index 000000000..ab76e28e3 --- /dev/null +++ b/graphics/pokemon_storage/river_bg.png diff --git a/graphics/pokemon_storage/river_frame.png b/graphics/pokemon_storage/river_frame.png Binary files differnew file mode 100644 index 000000000..f6a87236b --- /dev/null +++ b/graphics/pokemon_storage/river_frame.png diff --git a/graphics/pokemon_storage/savanna.bin b/graphics/pokemon_storage/savanna.bin Binary files differnew file mode 100644 index 000000000..ae9911446 --- /dev/null +++ b/graphics/pokemon_storage/savanna.bin diff --git a/graphics/pokemon_storage/savanna_bg.png b/graphics/pokemon_storage/savanna_bg.png Binary files differnew file mode 100644 index 000000000..24fc476f6 --- /dev/null +++ b/graphics/pokemon_storage/savanna_bg.png diff --git a/graphics/pokemon_storage/savanna_frame.png b/graphics/pokemon_storage/savanna_frame.png Binary files differnew file mode 100644 index 000000000..b66494d79 --- /dev/null +++ b/graphics/pokemon_storage/savanna_frame.png diff --git a/graphics/pokemon_storage/screen.bin b/graphics/pokemon_storage/screen.bin Binary files differnew file mode 100644 index 000000000..05d68aad4 --- /dev/null +++ b/graphics/pokemon_storage/screen.bin diff --git a/graphics/pokemon_storage/screen_bg.png b/graphics/pokemon_storage/screen_bg.png Binary files differnew file mode 100644 index 000000000..b9552d479 --- /dev/null +++ b/graphics/pokemon_storage/screen_bg.png diff --git a/graphics/pokemon_storage/scrolling_bg.bin b/graphics/pokemon_storage/scrolling_bg.bin Binary files differnew file mode 100644 index 000000000..25b6cf240 --- /dev/null +++ b/graphics/pokemon_storage/scrolling_bg.bin diff --git a/graphics/pokemon_storage/scrolling_bg.png b/graphics/pokemon_storage/scrolling_bg.png Binary files differnew file mode 100644 index 000000000..8be861a26 --- /dev/null +++ b/graphics/pokemon_storage/scrolling_bg.png diff --git a/graphics/pokemon_storage/seafloor.bin b/graphics/pokemon_storage/seafloor.bin Binary files differnew file mode 100644 index 000000000..aa8d671d4 --- /dev/null +++ b/graphics/pokemon_storage/seafloor.bin diff --git a/graphics/pokemon_storage/seafloor_bg.png b/graphics/pokemon_storage/seafloor_bg.png Binary files differnew file mode 100644 index 000000000..841642946 --- /dev/null +++ b/graphics/pokemon_storage/seafloor_bg.png diff --git a/graphics/pokemon_storage/seafloor_frame.png b/graphics/pokemon_storage/seafloor_frame.png Binary files differnew file mode 100644 index 000000000..494145558 --- /dev/null +++ b/graphics/pokemon_storage/seafloor_frame.png diff --git a/graphics/pokemon_storage/sky.bin b/graphics/pokemon_storage/sky.bin Binary files differnew file mode 100644 index 000000000..1091d2a62 --- /dev/null +++ b/graphics/pokemon_storage/sky.bin diff --git a/graphics/pokemon_storage/sky_bg.png b/graphics/pokemon_storage/sky_bg.png Binary files differnew file mode 100644 index 000000000..f561cef53 --- /dev/null +++ b/graphics/pokemon_storage/sky_bg.png diff --git a/graphics/pokemon_storage/sky_frame.png b/graphics/pokemon_storage/sky_frame.png Binary files differnew file mode 100644 index 000000000..83c1e9a0b --- /dev/null +++ b/graphics/pokemon_storage/sky_frame.png diff --git a/graphics/pokemon_storage/snow.bin b/graphics/pokemon_storage/snow.bin Binary files differnew file mode 100644 index 000000000..5dac9c110 --- /dev/null +++ b/graphics/pokemon_storage/snow.bin diff --git a/graphics/pokemon_storage/snow_bg.png b/graphics/pokemon_storage/snow_bg.png Binary files differnew file mode 100644 index 000000000..5e81e4980 --- /dev/null +++ b/graphics/pokemon_storage/snow_bg.png diff --git a/graphics/pokemon_storage/snow_frame.png b/graphics/pokemon_storage/snow_frame.png Binary files differnew file mode 100644 index 000000000..529fff66e --- /dev/null +++ b/graphics/pokemon_storage/snow_frame.png diff --git a/graphics/pokemon_storage/spinda_icon.png b/graphics/pokemon_storage/spinda_icon.png Binary files differnew file mode 100644 index 000000000..8da756233 --- /dev/null +++ b/graphics/pokemon_storage/spinda_icon.png diff --git a/graphics/pokemon_storage/star_in_circle_icon.png b/graphics/pokemon_storage/star_in_circle_icon.png Binary files differnew file mode 100644 index 000000000..43a307891 --- /dev/null +++ b/graphics/pokemon_storage/star_in_circle_icon.png diff --git a/graphics/pokemon_storage/togepi_icon.png b/graphics/pokemon_storage/togepi_icon.png Binary files differnew file mode 100644 index 000000000..f8ce1c539 --- /dev/null +++ b/graphics/pokemon_storage/togepi_icon.png diff --git a/graphics/pokemon_storage/unknown_frame.png b/graphics/pokemon_storage/unknown_frame.png Binary files differnew file mode 100644 index 000000000..743e52441 --- /dev/null +++ b/graphics/pokemon_storage/unknown_frame.png diff --git a/graphics/pokemon_storage/volcano.bin b/graphics/pokemon_storage/volcano.bin Binary files differnew file mode 100644 index 000000000..0dbaf03a3 --- /dev/null +++ b/graphics/pokemon_storage/volcano.bin diff --git a/graphics/pokemon_storage/volcano_bg.png b/graphics/pokemon_storage/volcano_bg.png Binary files differnew file mode 100644 index 000000000..25f391e8b --- /dev/null +++ b/graphics/pokemon_storage/volcano_bg.png diff --git a/graphics/pokemon_storage/volcano_frame.png b/graphics/pokemon_storage/volcano_frame.png Binary files differnew file mode 100644 index 000000000..edfef1247 --- /dev/null +++ b/graphics/pokemon_storage/volcano_frame.png diff --git a/graphics/pokemon_storage/waveform.png b/graphics/pokemon_storage/waveform.png Binary files differnew file mode 100644 index 000000000..12eeef86b --- /dev/null +++ b/graphics/pokemon_storage/waveform.png diff --git a/graphics/pokemon_storage/whiscash.bin b/graphics/pokemon_storage/whiscash.bin Binary files differnew file mode 100644 index 000000000..0ebb4d299 --- /dev/null +++ b/graphics/pokemon_storage/whiscash.bin diff --git a/graphics/pokemon_storage/whiscash_bg.png b/graphics/pokemon_storage/whiscash_bg.png Binary files differnew file mode 100644 index 000000000..703278948 --- /dev/null +++ b/graphics/pokemon_storage/whiscash_bg.png diff --git a/graphics/pokemon_storage/zigzagoon.bin b/graphics/pokemon_storage/zigzagoon.bin Binary files differnew file mode 100644 index 000000000..744b2210c --- /dev/null +++ b/graphics/pokemon_storage/zigzagoon.bin diff --git a/graphics/pokemon_storage/zigzagoon_bg.png b/graphics/pokemon_storage/zigzagoon_bg.png Binary files differnew file mode 100644 index 000000000..d4a6d1279 --- /dev/null +++ b/graphics/pokemon_storage/zigzagoon_bg.png diff --git a/graphics/unknown/unknown_55C170.png b/graphics/unknown/unknown_55C170.png Binary files differnew file mode 100644 index 000000000..95a2e2427 --- /dev/null +++ b/graphics/unknown/unknown_55C170.png diff --git a/graphics/unknown/unknown_57173C.pal b/graphics/unknown/unknown_57173C.pal new file mode 100644 index 000000000..3743fa228 --- /dev/null +++ b/graphics/unknown/unknown_57173C.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 +246 222 115 +246 230 180 +205 123 0 +123 74 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_572280.pal b/graphics/unknown/unknown_572280.pal new file mode 100644 index 000000000..bf5197761 --- /dev/null +++ b/graphics/unknown/unknown_572280.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 90 57 +148 148 172 +255 255 255 +0 0 0 +222 222 246 +90 189 238 +164 164 180 +98 98 115 +0 0 0 +82 82 90 +189 238 98 +164 222 74 +164 230 74 +180 230 115 +148 205 57 +148 148 172 diff --git a/graphics/unknown/unknown_5722A0.bin b/graphics/unknown/unknown_5722A0.bin Binary files differnew file mode 100644 index 000000000..050dd78f9 --- /dev/null +++ b/graphics/unknown/unknown_5722A0.bin diff --git a/graphics/unknown/unknown_5723DC.pal b/graphics/unknown/unknown_5723DC.pal new file mode 100644 index 000000000..1fda7f05a --- /dev/null +++ b/graphics/unknown/unknown_5723DC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 172 +115 115 123 +82 82 90 +148 148 172 +246 172 82 +164 164 180 +0 0 0 +164 205 246 +123 180 213 +255 222 148 +213 230 255 +180 213 246 +156 205 238 +255 255 255 +90 255 238 diff --git a/graphics/unknown/unknown_5723FC.pal b/graphics/unknown/unknown_5723FC.pal new file mode 100644 index 000000000..42bb76663 --- /dev/null +++ b/graphics/unknown/unknown_5723FC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 148 +148 148 172 +115 115 123 +82 82 90 +139 139 164 +164 123 0 +164 164 180 +0 0 0 +164 205 246 +123 180 213 +197 189 24 +213 230 255 +180 213 246 +156 205 238 +180 180 180 +90 255 238 diff --git a/graphics/unknown/unknown_57241C.pal b/graphics/unknown/unknown_57241C.pal new file mode 100644 index 000000000..087a84a69 --- /dev/null +++ b/graphics/unknown/unknown_57241C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 172 +255 255 255 +0 0 0 +123 189 255 +0 123 255 +255 131 131 +172 24 24 +255 238 230 +255 230 213 +255 222 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_57243C.pal b/graphics/unknown/unknown_57243C.pal new file mode 100644 index 000000000..74876ded3 --- /dev/null +++ b/graphics/unknown/unknown_57243C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 172 +255 255 255 +0 0 0 +123 189 255 +0 123 255 +255 131 131 +172 24 24 +230 246 255 +222 238 246 +213 238 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_5726F4.pal b/graphics/unknown/unknown_5726F4.pal new file mode 100644 index 000000000..b9c6f46de --- /dev/null +++ b/graphics/unknown/unknown_5726F4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +98 98 98 +213 213 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/unknown/unknown_D437F8.bin b/graphics/unknown/unknown_D437F8.bin Binary files differnew file mode 100644 index 000000000..fcb503112 --- /dev/null +++ b/graphics/unknown/unknown_D437F8.bin diff --git a/graphics/unknown/unknown_DDD908.bin b/graphics/unknown/unknown_DDD908.bin deleted file mode 100755 index cb0a2fda1..000000000 --- a/graphics/unknown/unknown_DDD908.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/graphics/unknown/unknown_DDD920.bin b/graphics/unknown/unknown_DDD920.bin deleted file mode 100755 index cb0a2fda1..000000000 --- a/graphics/unknown/unknown_DDD920.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/graphics/unknown/unknown_DDD938.bin b/graphics/unknown/unknown_DDD938.bin deleted file mode 100755 index cb0a2fda1..000000000 --- a/graphics/unknown/unknown_DDD938.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/graphics/unused/deoxys_speed_icon_wide.png b/graphics/unused/deoxys_speed_icon_wide.png Binary files differnew file mode 100644 index 000000000..ccfba4b24 --- /dev/null +++ b/graphics/unused/deoxys_speed_icon_wide.png diff --git a/graphics/unused/intro_birch_beauty.png b/graphics/unused/intro_birch_beauty.png Binary files differnew file mode 100644 index 000000000..817db46f7 --- /dev/null +++ b/graphics/unused/intro_birch_beauty.png diff --git a/graphics/unused/tilemap_5773C4.bin b/graphics/unused/tilemap_5773C4.bin new file mode 100644 index 000000000..95e7b00d5 --- /dev/null +++ b/graphics/unused/tilemap_5773C4.bin @@ -0,0 +1 @@ +"®"¯"°"±"²"³"´"µ"¶"®"·"¸"¹"º"»"¼"½"¾"¿"À"Á"¹"Â"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Æ"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"È"É"É"É"É"É"É"É"É"É"É"Ê"
\ No newline at end of file diff --git a/graphics/unused/unknown_5726B4.pal b/graphics/unused/unknown_5726B4.pal new file mode 100644 index 000000000..a28f6d332 --- /dev/null +++ b/graphics/unused/unknown_5726B4.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +65 205 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 139 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 172 +0 0 0 +255 156 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 90 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 172 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 250916022..648e3a9cb 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -1,296 +1,297 @@ -monstillfrontdir := graphics/pokemon/front_pics -monbackdir := graphics/pokemon/back_pics -monfrontdir := graphics/pokemon/anim_front_pics -monpaldir := graphics/pokemon/palettes -tilesetdir := data/tilesets -fontdir := data/graphics/fonts -menudir := graphics/interface -btanimgfxdir := graphics/battle_anims/sprites -unusedgfxdir := graphics/unused -unknowngfxdir := graphics/unknown -btintgfxdir := graphics/battle_interface -masksgfxdir := graphics/battle_anims/masks -bttransgfxdir := graphics/battle_transitions -typesdir := graphics/types -rayquazadir := graphics/rayquaza_scene -roulettegfxdir := graphics/roulette -pknvdir := graphics/pokenav/ -pknvoptionsdir := graphics/pokenav/options +MONSTILLFRONTGFXDIR := graphics/pokemon/front_pics +MONBACKGFXDIR := graphics/pokemon/back_pics +MONFRONTGFXDIR := graphics/pokemon/anim_front_pics +MONPALDIR := graphics/pokemon/palettes +TILESETGFXDIR := data/tilesets +FONTGFXDIR := data/graphics/fonts +MENUGFXDIR := graphics/interface +BTLANMSPRGFXDIR := graphics/battle_anims/sprites +UNUSEDGFXDIR := graphics/unused +UNKNOWNGFXDIR := graphics/unknown +BATINTGFXDIR := graphics/battle_interface +MASKSGFXDIR := graphics/battle_anims/masks +BATTRANSGFXDIR := graphics/battle_transitions +TYPESGFXDIR := graphics/types +RAYQUAZAGFXDIR := graphics/rayquaza_scene +ROULETTEGFXDIR := graphics/roulette +PKNAVGFXDIR := graphics/pokenav/ +PKNAVOPTIONSGFXDIR := graphics/pokenav/options +PSSGFXDIR := graphics/pokemon_storage types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough -$(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ - $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ - $(monstillfrontdir)/castform_rainy_form_still_front_pic.4bpp \ - $(monstillfrontdir)/castform_snowy_form_still_front_pic.4bpp +$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp @cat $^ >$@ -$(monbackdir)/castform_back_pic.4bpp: $(monbackdir)/castform_normal_form_back_pic.4bpp \ - $(monbackdir)/castform_sunny_form_back_pic.4bpp \ - $(monbackdir)/castform_rainy_form_back_pic.4bpp \ - $(monbackdir)/castform_snowy_form_back_pic.4bpp +$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp @cat $^ >$@ -$(monfrontdir)/castform_front_pic.4bpp: $(monfrontdir)/castform_normal_form_front_pic.4bpp \ - $(monfrontdir)/castform_sunny_form_front_pic.4bpp \ - $(monfrontdir)/castform_rainy_form_front_pic.4bpp \ - $(monfrontdir)/castform_snowy_form_front_pic.4bpp +$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp @cat $^ >$@ -$(monpaldir)/castform_palette.gbapal: $(monpaldir)/castform_normal_form_palette.gbapal \ - $(monpaldir)/castform_sunny_form_palette.gbapal \ - $(monpaldir)/castform_rainy_form_palette.gbapal \ - $(monpaldir)/castform_snowy_form_palette.gbapal +$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_palette.gbapal @cat $^ >$@ -$(monpaldir)/castform_shiny_palette.gbapal: $(monpaldir)/castform_normal_form_shiny_palette.gbapal \ - $(monpaldir)/castform_sunny_form_shiny_palette.gbapal \ - $(monpaldir)/castform_rainy_form_shiny_palette.gbapal \ - $(monpaldir)/castform_snowy_form_shiny_palette.gbapal +$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal @cat $^ >$@ -$(tilesetdir)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 159 -$(tilesetdir)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 498 -$(tilesetdir)/secondary/dewford/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dewford/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/slateport/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/slateport/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 504 -$(tilesetdir)/secondary/mauville/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mauville/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 450 -$(tilesetdir)/secondary/fortree/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/fortree/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 493 -$(tilesetdir)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 504 -$(tilesetdir)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 328 -$(tilesetdir)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/primary/building/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 502 -$(tilesetdir)/secondary/shop/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 502 -$(tilesetdir)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 478 -$(tilesetdir)/secondary/cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 425 -$(tilesetdir)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 278 -$(tilesetdir)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 319 -$(tilesetdir)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(tilesetdir)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 460 -$(tilesetdir)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 319 -$(tilesetdir)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 120 -$(tilesetdir)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 312 -$(tilesetdir)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 345 -$(tilesetdir)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 355 -$(tilesetdir)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/brown_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/tree/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/tree/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/shrub/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/shrub/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/blue_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/yellow_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/red_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 -$(tilesetdir)/secondary/contest/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/contest/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 430 -$(tilesetdir)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 431 -$(tilesetdir)/secondary/lab/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 500 -$(tilesetdir)/secondary/underwater/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/underwater/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 500 -$(tilesetdir)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 -$(tilesetdir)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 469 -$(tilesetdir)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 150 -$(tilesetdir)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 60 -$(tilesetdir)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 61 -$(tilesetdir)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 -$(tilesetdir)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 148 -$(tilesetdir)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 61 -$(tilesetdir)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 484 -$(tilesetdir)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 294 -$(tilesetdir)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 342 -$(tilesetdir)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 505 -$(tilesetdir)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 310 -$(tilesetdir)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 424 -$(tilesetdir)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 382 -$(tilesetdir)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 420 -$(tilesetdir)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 95 -$(tilesetdir)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 374 -$(tilesetdir)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 420 -$(tilesetdir)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 136 -$(tilesetdir)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 -$(fontdir)/font0.latfont: $(fontdir)/font0_latin.png +$(FONTGFXDIR)/font0.latfont: $(FONTGFXDIR)/font0_latin.png $(GFX) $< $@ -$(fontdir)/font1.latfont: $(fontdir)/font1_latin.png +$(FONTGFXDIR)/font1.latfont: $(FONTGFXDIR)/font1_latin.png $(GFX) $< $@ -$(fontdir)/font2.latfont: $(fontdir)/font2_latin.png +$(FONTGFXDIR)/font2.latfont: $(FONTGFXDIR)/font2_latin.png $(GFX) $< $@ -$(fontdir)/font7.latfont: $(fontdir)/font7_latin.png +$(FONTGFXDIR)/font7.latfont: $(FONTGFXDIR)/font7_latin.png $(GFX) $< $@ -$(fontdir)/font8.latfont: $(fontdir)/font8_latin.png +$(FONTGFXDIR)/font8.latfont: $(FONTGFXDIR)/font8_latin.png $(GFX) $< $@ -$(fontdir)/font0.hwjpnfont: $(fontdir)/font0_japanese.png +$(FONTGFXDIR)/font0.hwjpnfont: $(FONTGFXDIR)/font0_japanese.png $(GFX) $< $@ -$(fontdir)/font1.hwjpnfont: $(fontdir)/font1_japanese.png +$(FONTGFXDIR)/font1.hwjpnfont: $(FONTGFXDIR)/font1_japanese.png $(GFX) $< $@ -$(fontdir)/font9.hwjpnfont: $(fontdir)/font9_japanese.png +$(FONTGFXDIR)/font9.hwjpnfont: $(FONTGFXDIR)/font9_japanese.png $(GFX) $< $@ -$(fontdir)/font2.fwjpnfont: $(fontdir)/font2_japanese.png +$(FONTGFXDIR)/font2.fwjpnfont: $(FONTGFXDIR)/font2_japanese.png $(GFX) $< $@ -$(fontdir)/font6.fwjpnfont: $(fontdir)/font6_braille.png +$(FONTGFXDIR)/font6.fwjpnfont: $(FONTGFXDIR)/font6_braille.png $(GFX) $< $@ -$(fontdir)/unused_frlg_male.fwjpnfont: $(fontdir)/unused_japanese_frlg_male_font.png +$(FONTGFXDIR)/unused_frlg_male.fwjpnfont: $(FONTGFXDIR)/unused_japanese_frlg_male_font.png $(GFX) $< $@ -$(fontdir)/unused_frlg_female.fwjpnfont: $(fontdir)/unused_japanese_frlg_female_font.png +$(FONTGFXDIR)/unused_frlg_female.fwjpnfont: $(FONTGFXDIR)/unused_japanese_frlg_female_font.png $(GFX) $< $@ -$(fontdir)/down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/down_arrow_rs.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/down_arrow_rs.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/unused_frlg_blanked_down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/unused_frlg_blanked_down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/keypad_icons.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png $(GFX) $< $@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal @@ -308,176 +309,335 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png graphics/misc/japanese_hof.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 -$(menudir)/menu.gbapal: $(menudir)/menu_0.gbapal \ - $(menudir)/menu_1.gbapal +$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal \ + $(MENUGFXDIR)/menu_1.gbapal @cat $^ >$@ -$(btanimgfxdir)/010.4bpp: $(btanimgfxdir)/010_0.4bpp \ - $(btanimgfxdir)/010_1.4bpp \ - $(btanimgfxdir)/010_2.4bpp \ - $(btanimgfxdir)/010_3.4bpp +$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ + $(BTLANMSPRGFXDIR)/010_1.4bpp \ + $(BTLANMSPRGFXDIR)/010_2.4bpp \ + $(BTLANMSPRGFXDIR)/010_3.4bpp @cat $^ >$@ -$(unusedgfxdir)/obi_palpak1.gbapal: $(unusedgfxdir)/old_pal1.gbapal \ - $(unusedgfxdir)/old_pal2.gbapal \ - $(unusedgfxdir)/old_pal3.gbapal +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \ + $(UNUSEDGFXDIR)/old_pal2.gbapal \ + $(UNUSEDGFXDIR)/old_pal3.gbapal @cat $^ >$@ -$(unusedgfxdir)/obi_palpak3.gbapal: $(unusedgfxdir)/old_pal5.gbapal \ - $(unusedgfxdir)/old_pal6.gbapal \ - $(unusedgfxdir)/old_pal7.gbapal +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \ + $(UNUSEDGFXDIR)/old_pal6.gbapal \ + $(UNUSEDGFXDIR)/old_pal7.gbapal @cat $^ >$@ -$(unusedgfxdir)/obi1.4bpp: $(unusedgfxdir)/old_bulbasaur.4bpp \ - $(unusedgfxdir)/old_charizard.4bpp +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \ + $(UNUSEDGFXDIR)/old_charizard.4bpp @cat $^ >$@ -$(unusedgfxdir)/obi2.4bpp: $(unusedgfxdir)/old_bulbasaur2.4bpp \ - $(unusedgfxdir)/old_battle_interface_1.4bpp \ - $(unusedgfxdir)/old_battle_interface_2.4bpp \ - $(unusedgfxdir)/old_battle_interface_3.4bpp +$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp @cat $^ >$@ -$(menudir)/hp_numbers.4bpp: $(menudir)/hpbar_anim.4bpp \ - $(menudir)/numbers1.4bpp \ - $(menudir)/numbers2.4bpp +$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \ + $(MENUGFXDIR)/numbers1.4bpp \ + $(MENUGFXDIR)/numbers2.4bpp @cat $^ >$@ -$(unusedgfxdir)/redyellowgreen_frame.bin: $(unusedgfxdir)/red_frame.bin \ - $(unusedgfxdir)/yellow_frame.bin \ - $(unusedgfxdir)/green_frame.bin \ - $(unusedgfxdir)/blank_frame.bin +$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ + $(UNUSEDGFXDIR)/yellow_frame.bin \ + $(UNUSEDGFXDIR)/green_frame.bin \ + $(UNUSEDGFXDIR)/blank_frame.bin @cat $^ >$@ -$(unusedgfxdir)/color_frames.4bpp: %.4bpp: %.png +$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 353 -$(btintgfxdir)/unused_window2bar.4bpp: %.4bpp: %.png +$(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 5 -$(unusedgfxdir)/old_contest.4bpp: $(unusedgfxdir)/old_contest_frame_1.4bpp \ - $(unusedgfxdir)/old_contest_floor.4bpp \ - $(unusedgfxdir)/old_contest_frame_2.4bpp \ - $(unusedgfxdir)/old_contest_symbols.4bpp \ - $(unusedgfxdir)/old_contest_meter.4bpp \ - $(unusedgfxdir)/old_contest_classes.4bpp \ - $(unusedgfxdir)/old_contest_numbers.4bpp +$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_floor.4bpp \ + $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \ + $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \ + $(UNUSEDGFXDIR)/old_contest_meter.4bpp \ + $(UNUSEDGFXDIR)/old_contest_classes.4bpp \ + $(UNUSEDGFXDIR)/old_contest_numbers.4bpp @cat $^ >$@ -$(unusedgfxdir)/old_contest_2.4bpp: $(unusedgfxdir)/old_contest_2_1.4bpp \ - $(unusedgfxdir)/old_contest_2_2.4bpp +$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_2_2.4bpp @cat $^ >$@ -$(unknowngfxdir)/unknown_C19470.4bpp: %.4bpp: %.png +$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(btanimgfxdir)/141.4bpp: $(btanimgfxdir)/141_0.4bpp \ - $(btanimgfxdir)/141_1.4bpp \ - $(btanimgfxdir)/141_2.4bpp \ - $(btanimgfxdir)/141_3.4bpp \ - $(btanimgfxdir)/141_4.4bpp +$(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \ + $(BTLANMSPRGFXDIR)/141_1.4bpp \ + $(BTLANMSPRGFXDIR)/141_2.4bpp \ + $(BTLANMSPRGFXDIR)/141_3.4bpp \ + $(BTLANMSPRGFXDIR)/141_4.4bpp @cat $^ >$@ -$(btanimgfxdir)/074.4bpp: $(btanimgfxdir)/074_0.4bpp \ - $(btanimgfxdir)/074_1.4bpp +$(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \ + $(BTLANMSPRGFXDIR)/074_1.4bpp @cat $^ >$@ -$(btanimgfxdir)/159.4bpp: $(btanimgfxdir)/159_0.4bpp \ - $(btanimgfxdir)/159_1.4bpp +$(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \ + $(BTLANMSPRGFXDIR)/159_1.4bpp @cat $^ >$@ -$(btanimgfxdir)/001.4bpp: $(btanimgfxdir)/001_0.4bpp \ - $(btanimgfxdir)/001_1.4bpp +$(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \ + $(BTLANMSPRGFXDIR)/001_1.4bpp @cat $^ >$@ -$(masksgfxdir)/unknown_C2EA50.4bpp: %.4bpp: %.png +$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 14 -$(bttransgfxdir)/vs_frame.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 16 -$(menudir)/party_menu_misc.4bpp: %.4bpp: %.png +$(MENUGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 -$(typesdir)/move_types.4bpp: $(types:%=$(typesdir)/%.4bpp) $(contest_types:%=$(typesdir)/contest_%.4bpp) +$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) @cat $^ >$@ -$(typesdir)/move_types.gbapal: $(typesdir)/move_types_1.gbapal \ - $(typesdir)/move_types_2.gbapal \ - $(typesdir)/move_types_3.gbapal +$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ + $(TYPESGFXDIR)/move_types_2.gbapal \ + $(TYPESGFXDIR)/move_types_3.gbapal @cat $^ >$@ -$(menudir)/bag_screen.4bpp: %.4bpp: %.png +$(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(rayquazadir)/rayquaza.8bpp: %.8bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 227 -$(rayquazadir)/overcast.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 313 -$(rayquazadir)/rayquaza_fly1.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 124 -$(rayquazadir)/rayquaza_tail_fix.4bpp: $(rayquazadir)/rayquaza_tail.4bpp +$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp cp $< $@ head -c 12 /dev/zero >> $@ -$(rayquazadir)/chase_streaks.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 -$(rayquazadir)/rayquaza_chase.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 155 graphics/picture_frame/frame5.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 86 -$(roulettegfxdir)/roulette_tilt.4bpp: $(roulettegfxdir)/shroomish.4bpp \ - $(roulettegfxdir)/tailow.4bpp +$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \ + $(ROULETTEGFXDIR)/tailow.4bpp @cat $^ >$@ -$(roulettegfxdir)/poke_icons2.4bpp: $(roulettegfxdir)/wynaut.4bpp \ - $(roulettegfxdir)/azurill.4bpp \ - $(roulettegfxdir)/skitty.4bpp \ - $(roulettegfxdir)/makuhita.4bpp +$(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \ + $(ROULETTEGFXDIR)/azurill.4bpp \ + $(ROULETTEGFXDIR)/skitty.4bpp \ + $(ROULETTEGFXDIR)/makuhita.4bpp @cat $^ >$@ -$(bttransgfxdir)/85BBC14.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(bttransgfxdir)/rayquaza.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 938 -$(bttransgfxdir)/frontier_square_1.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_1.4bpp +$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_1.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_2.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_2.4bpp +$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_2.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_3.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_3.4bpp +$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_3.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_4.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_4.4bpp +$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_4.4bpp @cat $^ >$@ -$(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp \ - $(pknvoptionsdir)/condition.4bpp \ - $(pknvoptionsdir)/match_call.4bpp \ - $(pknvoptionsdir)/ribbons.4bpp \ - $(pknvoptionsdir)/switch_off.4bpp \ - $(pknvoptionsdir)/party.4bpp \ - $(pknvoptionsdir)/search.4bpp \ - $(pknvoptionsdir)/cool.4bpp \ - $(pknvoptionsdir)/beauty.4bpp \ - $(pknvoptionsdir)/cute.4bpp \ - $(pknvoptionsdir)/smart.4bpp \ - $(pknvoptionsdir)/tough.4bpp \ - $(pknvoptionsdir)/cancel.4bpp +$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ + $(PKNAVOPTIONSGFXDIR)/condition.4bpp \ + $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \ + $(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \ + $(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \ + $(PKNAVOPTIONSGFXDIR)/party.4bpp \ + $(PKNAVOPTIONSGFXDIR)/search.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cool.4bpp \ + $(PKNAVOPTIONSGFXDIR)/beauty.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cute.4bpp \ + $(PKNAVOPTIONSGFXDIR)/smart.4bpp \ + $(PKNAVOPTIONSGFXDIR)/tough.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cancel.4bpp @cat $^ >$@ -$(pknvdir)/header.4bpp: %.4bpp: %.png +$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 + +$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 374 + +$(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 52 + +$(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 49 + +$(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 56 + +$(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 46 + +$(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 51 + +$(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 35 + +$(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 33 + +$(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 18 + +$(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/screen.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/screen_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/horizontal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/horizontal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/diagonal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/diagonal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/block.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/block_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ribbon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/ribbon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter2.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/pokecenter2_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/frame.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/frame_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/blank.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/blank_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/circles.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/circles_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/azumarill.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/azumarill_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pikachu.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/pikachu_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/legendary.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/legendary_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/dusclops.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/dusclops_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludicolo_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp + @cat $^ >$@ diff --git a/ld_script.txt b/ld_script.txt index 68365e252..a7379d18b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -273,8 +273,7 @@ SECTIONS { src/walda_phrase.o(.text); asm/contest_link_81D9DE4.o(.text); asm/trainer_rematch.o(.text); - asm/unk_sprite_file.o(.text); - asm/unk_transition.o(.text); + src/unk_transition.o(.text); src/international_string_util.o(.text); asm/international_string_util.o(.text); } =0 @@ -539,8 +538,8 @@ SECTIONS { src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); data/trainer_rematch.o(.rodata); - data/unk_sprite_file.o(.rodata); data/unk_transition.o(.rodata); + src/unk_transition.o(.rodata); data/link_strings.o(.rodata); data/fonts.o(.rodata); data/mystery_event_msg.o(.rodata); diff --git a/src/unk_transition.c b/src/unk_transition.c new file mode 100644 index 000000000..feaddc8ce --- /dev/null +++ b/src/unk_transition.c @@ -0,0 +1,633 @@ +#include "global.h" +#include "sprite.h" +#include "decompress.h" +#include "unk_transition.h" +#include "battle_transition.h" +#include "task.h" +#include "palette.h" +#include "trig.h" +#include "bg.h" +#include "gpu_regs.h" + +typedef bool8 (*TransitionStateFunc)(struct Task *task); + +// this file's functions +static void sub_81DA848(struct Sprite *sprite); +static void sub_81DA9BC(struct Sprite *sprite); +static bool8 sub_81DAACC(struct Task *task); +static bool8 sub_81DAC14(struct Task *task); +static bool8 sub_81DABBC(struct Task *task); +static bool8 sub_81DAB4C(struct Task *task); +static bool8 sub_81DAC80(struct Task *task); +static bool8 sub_81DACEC(struct Task *task); +static bool8 sub_81DAD58(struct Task *task); +static bool8 sub_81DADC4(struct Task *task); +static bool8 sub_81DAE44(struct Task *task); +static bool8 sub_81DAEB0(struct Task *task); +static bool8 sub_81DAF34(struct Task *task); +static bool8 sub_81DAFA0(struct Task *task); +static bool8 sub_81DB02C(struct Task *task); +static bool8 sub_81DB098(struct Task *task); +static bool8 sub_81DB124(struct Task *task); +static bool8 sub_81DB190(struct Task *task); +static bool8 sub_81DB224(struct Task *task); +static bool8 sub_81DB290(struct Task *task); +static bool8 sub_81DB328(struct Task *task); + +// const rom data +// TODO: move those from .s file to .c +extern const u8 gUnknown_0862AD54[]; +extern const u8 gUnknown_0862AF30[]; +extern const u8 gUnknown_0862B0DC[]; +extern const u16 gUnknown_0862B53C[]; + +static const struct OamData sOamData_862B71C = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0 +}; + +static const struct CompressedSpriteSheet sUnknown_0862B724 = +{ + gUnknown_0862B0DC, 0x1800, 11920 +}; + +static const struct SpritePalette sUnknown_0862B72C = +{ + gUnknown_0862B53C, 11920 +}; + +static const union AnimCmd sSpriteAnim_862B734[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_862B73C[] = +{ + ANIMCMD_FRAME(64, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_862B744[] = +{ + ANIMCMD_FRAME(128, 1), + ANIMCMD_END +}; + +static const union AnimCmd *const sSpriteAnimTable_862B74C[] = +{ + sSpriteAnim_862B734, + sSpriteAnim_862B73C, + sSpriteAnim_862B744 +}; + +static const struct SpriteTemplate sUnknown_0862B758 = +{ + .tileTag = 11920, + .paletteTag = 11920, + .oam = &sOamData_862B71C, + .anims = sSpriteAnimTable_862B74C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const TransitionStateFunc sPhase2_34_Funcs[] = +{ + sub_81DAACC, + sub_81DAC14, + sub_81DABBC, + sub_81DAB4C, + sub_81DAC80 +}; + +static const TransitionStateFunc sPhase2_35_Funcs[] = +{ + sub_81DAACC, + sub_81DACEC, + sub_81DABBC, + sub_81DAB4C, + sub_81DAD58 +}; + +static const TransitionStateFunc sPhase2_36_Funcs[] = +{ + sub_81DAACC, + sub_81DADC4, + sub_81DABBC, + sub_81DAB4C, + sub_81DAE44 +}; + +static const TransitionStateFunc sPhase2_37_Funcs[] = +{ + sub_81DAACC, + sub_81DAEB0, + sub_81DABBC, + sub_81DAB4C, + sub_81DAF34 +}; + +static const TransitionStateFunc sPhase2_38_Funcs[] = +{ + sub_81DAACC, + sub_81DAFA0, + sub_81DABBC, + sub_81DAB4C, + sub_81DB02C +}; + +static const TransitionStateFunc sPhase2_39_Funcs[] = +{ + sub_81DAACC, + sub_81DB098, + sub_81DABBC, + sub_81DAB4C, + sub_81DB124 +}; + +static const TransitionStateFunc sPhase2_40_Funcs[] = +{ + sub_81DAACC, + sub_81DB190, + sub_81DABBC, + sub_81DAB4C, + sub_81DB224 +}; + +static const TransitionStateFunc sPhase2_41_Funcs[] = +{ + sub_81DAACC, + sub_81DB290, + sub_81DABBC, + sub_81DAB4C, + sub_81DB328 +}; + +// code +static void sub_81DA700(void) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(gUnknown_0862AD54, dst2); + LZ77UnCompVram(gUnknown_0862AF30, dst1); + LoadPalette(gUnknown_0862B53C, 0xF0, 0x20); + LoadCompressedObjectPic(&sUnknown_0862B724); + LoadSpritePalette(&sUnknown_0862B72C); +} + +static u8 sub_81DA74C(s16 x, s16 y, u8 arg2, u8 arg3, s8 arg4, s8 arg5, u8 spriteAnimNum) +{ + u8 spriteId = CreateSprite(&sUnknown_0862B758, x, y, 0); + + switch (spriteAnimNum) + { + case 0: + gSprites[spriteId].data[0] = 120; + gSprites[spriteId].data[1] = 45; + break; + case 1: + gSprites[spriteId].data[0] = 89; + gSprites[spriteId].data[1] = 97; + break; + case 2: + gSprites[spriteId].data[0] = 151; + gSprites[spriteId].data[1] = 97; + break; + } + + gSprites[spriteId].data[2] = arg4; + gSprites[spriteId].data[3] = arg5; + gSprites[spriteId].data[6] = arg2; + gSprites[spriteId].data[7] = arg3; + gSprites[spriteId].data[4] = 0; + gSprites[spriteId].data[5] = 0; + + StartSpriteAnim(&gSprites[spriteId], spriteAnimNum); + gSprites[spriteId].callback = sub_81DA848; + + return spriteId; +} + +static void sub_81DA848(struct Sprite *sprite) +{ + s16 *data = sprite->data; + + if (sprite->pos1.x == data[0] && sprite->pos1.y == data[1]) + { + sprite->callback = SpriteCallbackDummy; + } + else + { + if (data[4] == data[6]) + { + sprite->pos1.x += data[2]; + data[4] = 0; + } + else + { + data[4]++; + } + + if (data[5] == data[7]) + { + sprite->pos1.y += data[3]; + data[5] = 0; + } + else + { + data[5]++; + } + } +} + +static u8 sub_81DA8BC(s16 x, s16 y, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, u8 spriteAnimNum) +{ + u8 spriteId = CreateSprite(&sUnknown_0862B758, x, y, 0); + + switch (spriteAnimNum) + { + case 0: + gSprites[spriteId].data[0] = 120; + gSprites[spriteId].data[1] = 45; + break; + case 1: + gSprites[spriteId].data[0] = 89; + gSprites[spriteId].data[1] = 97; + break; + case 2: + gSprites[spriteId].data[0] = 151; + gSprites[spriteId].data[1] = 97; + break; + } + + gSprites[spriteId].data[2] = arg2; + gSprites[spriteId].data[3] = arg3; + gSprites[spriteId].data[4] = arg4; + gSprites[spriteId].data[5] = arg5; + gSprites[spriteId].data[6] = arg6; + + StartSpriteAnim(&gSprites[spriteId], spriteAnimNum); + gSprites[spriteId].callback = sub_81DA9BC; + + return spriteId; +} + +static void sub_81DA9BC(struct Sprite *sprite) +{ + sprite->pos2.x = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096 + sprite->pos2.y = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096 + + sprite->data[2] = (sprite->data[2] + sprite->data[3]) % 360; + + if (sprite->data[4] != sprite->data[5]) + sprite->data[4] += sprite->data[6]; + else + sprite->callback = SpriteCallbackDummy; +} + +#define tState data[0] + +static void sub_81DAA20(struct Task *task) +{ + FreeSpriteTilesByTag(11920); + FreeSpritePaletteByTag(11920); + + DestroySprite(&gSprites[task->data[4]]); + DestroySprite(&gSprites[task->data[5]]); + DestroySprite(&gSprites[task->data[6]]); +} + +static bool8 sub_81DAA74(struct Task *task) +{ + if (gSprites[task->data[4]].callback == SpriteCallbackDummy + && gSprites[task->data[5]].callback == SpriteCallbackDummy + && gSprites[task->data[6]].callback == SpriteCallbackDummy) + return TRUE; + else + return FALSE; +} + +static bool8 sub_81DAACC(struct Task *task) +{ + if (task->data[1] == 0) + { + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON); + + task->data[1]++; + return FALSE; + } + else + { + sub_81DA700(); + SetGpuReg(REG_OFFSET_BLDCNT, 0x3F41); + SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000); + ChangeBgX(0, 0, 0); + ChangeBgY(0, 0, 0); + ChangeBgY(0, 0x500, 2); + + task->data[1] = 0; + task->tState++; + return TRUE; + } +} + +static bool8 sub_81DAB4C(struct Task *task) +{ + if (task->data[2] == 0) + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON); + + if (task->data[2] == 16) + { + if (task->data[3] == 31) + { + BeginNormalPaletteFade(-1, -1, 0, 0x10, 0); + task->tState++; + } + else + { + task->data[3]++; + } + } + else + { + u16 var; + + task->data[2]++; + var = task->data[2]; + SetGpuReg(REG_OFFSET_BLDALPHA, (var) | ((16 - var) << 8)); + } + + return FALSE; +} + +static bool8 sub_81DABBC(struct Task *task) +{ + if (sub_81DAA74(task) == TRUE) + task->tState++; + + return FALSE; +} + +void Phase2Task_34(u8 taskId) +{ + while (sPhase2_34_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DAC14(struct Task *task) +{ + task->data[4] = sub_81DA74C(120, -51, 0, 0, 0, 2, 0); + task->data[5] = sub_81DA74C(-7, 193, 0, 0, 2, -2, 1); + task->data[6] = sub_81DA74C(247, 193, 0, 0, -2, -2, 2); + + task->tState++; + return FALSE; +} + +static bool8 sub_81DAC80(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_34)); + } + + return FALSE; +} + +void Phase2Task_35(u8 taskId) +{ + while (sPhase2_35_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DACEC(struct Task *task) +{ + task->data[4] = sub_81DA74C(120, 197, 0, 0, 0, -4, 0); + task->data[5] = sub_81DA74C(241, 59, 0, 1, -4, 2, 1); + task->data[6] = sub_81DA74C(-1, 59, 0, 1, 4, 2, 2); + + task->tState++; + return FALSE; +} + +static bool8 sub_81DAD58(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_35)); + } + + return FALSE; +} + +void Phase2Task_36(u8 taskId) +{ + while (sPhase2_36_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DADC4(struct Task *task) +{ + task->data[4] = sub_81DA8BC(120, 45, 12, 4, 128, 0, -4, 0); + task->data[5] = sub_81DA8BC(89, 97, 252, 4, 128, 0, -4, 1); + task->data[6] = sub_81DA8BC(151, 97, 132, 4, 128, 0, -4, 2); + + task->tState++; + return FALSE; +} + +static bool8 sub_81DAE44(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_36)); + } + + return FALSE; +} + +void Phase2Task_37(u8 taskId) +{ + while (sPhase2_37_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DAEB0(struct Task *task) +{ + task->data[4] = sub_81DA8BC(120, 80, 284, 8, 131, 35, -3, 0); + task->data[5] = sub_81DA8BC(120, 80, 44, 8, 131, 35, -3, 1); + task->data[6] = sub_81DA8BC(121, 80, 164, 8, 131, 35, -3, 2); + + task->tState++; + return FALSE; +} + +static bool8 sub_81DAF34(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_37)); + } + + return FALSE; +} + +void Phase2Task_38(u8 taskId) +{ + while (sPhase2_38_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DAFA0(struct Task *task) +{ + if (task->data[1] == 0) + { + task->data[4] = sub_81DA74C(120, -51, 0, 0, 0, 4, 0); + } + else if (task->data[1] == 16) + { + task->data[5] = sub_81DA74C(-7, 193, 0, 0, 4, -4, 1); + } + else if (task->data[1] == 32) + { + task->data[6] = sub_81DA74C(247, 193, 0, 0, -4, -4, 2); + task->tState++; + } + + task->data[1]++; + return FALSE; +} + +static bool8 sub_81DB02C(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_38)); + } + + return FALSE; +} + +void Phase2Task_39(u8 taskId) +{ + while (sPhase2_39_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DB098(struct Task *task) +{ + if (task->data[1] == 0) + { + task->data[4] = sub_81DA74C(120, 197, 0, 0, 0, -8, 0); + } + else if (task->data[1] == 16) + { + task->data[5] = sub_81DA74C(241, 78, 0, 0, -8, 1, 1); + } + else if (task->data[1] == 32) + { + task->data[6] = sub_81DA74C(-1, 78, 0, 0, 8, 1, 2); + task->tState++; + } + + task->data[1]++; + return FALSE; +} + +static bool8 sub_81DB124(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_39)); + } + + return FALSE; +} + +void Phase2Task_40(u8 taskId) +{ + while (sPhase2_40_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DB190(struct Task *task) +{ + if (task->data[1] == 0) + { + task->data[4] = sub_81DA8BC(120, 45, 12, 4, 128, 0, -4, 0); + } + else if (task->data[1] == 16) + { + task->data[5] = sub_81DA8BC(89, 97, 252, 4, 128, 0, -4, 1); + } + else if (task->data[1] == 32) + { + task->data[6] = sub_81DA8BC(151, 97, 132, 4, 128, 0, -4, 2); + task->tState++; + } + + task->data[1]++; + return FALSE; +} + +static bool8 sub_81DB224(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_40)); + } + + return FALSE; +} + +void Phase2Task_41(u8 taskId) +{ + while (sPhase2_41_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DB290(struct Task *task) +{ + if (task->data[1] == 0) + { + task->data[4] = sub_81DA8BC(120, 80, 284, 8, 131, 35, -3, 0); + } + else if (task->data[1] == 16) + { + task->data[5] = sub_81DA8BC(120, 80, 44, 8, 131, 35, -3, 1); + } + else if (task->data[1] == 32) + { + task->data[6] = sub_81DA8BC(121, 80, 164, 8, 131, 35, -3, 2); + task->tState++; + } + + task->data[1]++; + return FALSE; +} + +static bool8 sub_81DB328(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_41)); + } + + return FALSE; +} |
