diff options
24 files changed, 1141 insertions, 65 deletions
diff --git a/asm/intro.s b/asm/intro.s index efd52e7fd..01ac2204b 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -376,11 +376,11 @@ task_intro_1: @ 816CF18 movs r0, 0x12 movs r1, 0x28 bl SetGpuReg - ldr r0, =gUnknown_085E13B4 + ldr r0, =gIntroLeavesBgGfx movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, =gUnknown_085E07C4 + ldr r0, =gIntroLeavesForegroundTilemap ldr r1, =0x06008000 bl LZ77UnCompVram ldr r1, =0x06008800 @@ -393,7 +393,7 @@ task_intro_1: @ 816CF18 ldr r5, =0x81000400 str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, =gUnknown_085E0B78 + ldr r0, =gIntroLeavesMidgroundTilemap ldr r1, =0x06009000 bl LZ77UnCompVram ldr r1, =0x06009800 @@ -403,7 +403,7 @@ task_intro_1: @ 816CF18 str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, =gUnknown_085E0EAC + ldr r0, =gIntroLeavesBgLeavesTilemap ldr r1, =0x0600a000 bl LZ77UnCompVram ldr r1, =0x0600a800 @@ -413,7 +413,7 @@ task_intro_1: @ 816CF18 str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, =gUnknown_085E119C + ldr r0, =gIntroLeavesBgMountainsTilemap ldr r1, =0x0600b000 bl LZ77UnCompVram ldr r1, =0x0600b800 @@ -423,7 +423,7 @@ task_intro_1: @ 816CF18 str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, =gUnknown_085E05C4 + ldr r0, =gIntroLeavesPal movs r5, 0x80 lsls r5, 2 movs r1, 0 @@ -1779,14 +1779,14 @@ task_intro_10: @ 816DBAC lsls r5, 24 lsrs r5, 24 bl intro_reset_and_hide_bgs - ldr r0, =gUnknown_085E3854 + ldr r0, =gIntroBattlePokeBallGfx movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, =gUnknown_085E3724 + ldr r0, =gIntroBattlePokeBallTilemap ldr r1, =0x06004000 bl LZ77UnCompVram - ldr r0, =gUnknown_085E3524 + ldr r0, =gIntroBattlePokeBallPal movs r2, 0x80 lsls r2, 2 movs r1, 0 diff --git a/data/graphics.s b/data/graphics.s index 96aaf3911..dc29f6bcb 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -348,7 +348,28 @@ gUnknown_08D85E72:: @ 8D85E72 .incbin "baserom.gba", 0xd85e72, 0xa gUnknown_08D85E7C:: @ 8D85E7C - .incbin "baserom.gba", 0xd85e7c, 0x2618 + .incbin "baserom.gba", 0xd85e7c, 0x54 + +gUnknown_08D85ED0:: @ 8D85ED0 + .incbin "baserom.gba", 0xd85ed0, 0x20 + +gUnknown_08D85EF0:: @ 8D85EF0 + .incbin "baserom.gba", 0xd85ef0, 0x20 + +gUnknown_08D85F10:: @ 8D85ED0 + .incbin "baserom.gba", 0xd85f10, 0x20 + +gUnknown_08D85F30:: @ 8D85ED0 + .incbin "baserom.gba", 0xd85f30, 0x20 + +gUnknown_08D85F50:: @ 8D85F50 + .incbin "baserom.gba", 0xd85f50, 0x1e0 + +gUnknown_08D86130:: @ 8D86130 + .incbin "baserom.gba", 0xd86130, 0x420 + +gUnknown_08D86550:: @ 8D86550 + .incbin "baserom.gba", 0xd86550, 0x1f44 gUnknown_08D88494:: @ 8D88494 .incbin "baserom.gba", 0xd88494, 0x8ac @@ -381,7 +402,13 @@ gUnknown_08D8B440:: @ 8D8B440 .incbin "baserom.gba", 0xd8b440, 0x2a8 gUnknown_08D8B6E8:: @ 8D8B6E8 - .incbin "baserom.gba", 0xd8b6e8, 0x38c + .incbin "baserom.gba", 0xd8b6e8, 0x124 + +gUnknown_08D8B80C:: @ 8D8B80C + .incbin "baserom.gba", 0xd8b80c, 0x248 + +gUnknown_08D8BA54:: @ 8D8BA54 + .incbin "baserom.gba", 0xd8ba54, 0x20 gUnknown_08D8BA74:: @ 8D8BA74 .incbin "baserom.gba", 0xd8ba74, 0x6f8 @@ -393,7 +420,19 @@ gUnknown_08D8C838:: @ 8D8C838 .incbin "baserom.gba", 0xd8c838, 0x490 gUnknown_08D8CCC8:: @ 8D8CCC8 - .incbin "baserom.gba", 0xd8ccc8, 0x748 + .incbin "baserom.gba", 0xd8ccc8, 0x27c + +gUnknown_08D8CF44:: @ 8D8CF44 + .incbin "baserom.gba", 0xd8cf44, 0x1cc + +gUnknown_08D8D110:: @ 8D8D110 + .incbin "baserom.gba", 0xd8d110, 0x20 + +gUnknown_08D8D130:: @ 8D8D130 + .incbin "baserom.gba", 0xd8d130, 0xd8 + +gUnknown_08D8D208:: @ 8D8D208 + .incbin "baserom.gba", 0xd8d208, 0x208 gUnknown_08D8D410:: @ 8D8D410 .incbin "baserom.gba", 0xd8d410, 0x17c diff --git a/data/intro.s b/data/intro.s index 552799951..acd1164b6 100644 --- a/data/intro.s +++ b/data/intro.s @@ -3,122 +3,527 @@ .section .rodata -gUnknown_085E05C4:: @ 85E05C4 - .incbin "baserom.gba", 0x5e05c4, 0x200 + .align 2 +gIntroLeavesDropsPal:: @ 85DFF90 + .incbin "graphics/intro/leaves_drops.gbapal" -gUnknown_085E07C4:: @ 85E07C4 - .incbin "baserom.gba", 0x5e07c4, 0x3b4 + .align 2 +gIntroLeavesGFLogoPal:: @ 85DFFB0 + .incbin "graphics/intro/leaves_gflogo.gbapal" -gUnknown_085E0B78:: @ 85E0B78 - .incbin "baserom.gba", 0x5e0b78, 0x334 + .align 2 +gIntroLeavesGFLogoGfx:: @ 85DFFD0 + .incbin "graphics/intro/leaves_gflogo.4bpp.lz" -gUnknown_085E0EAC:: @ 85E0EAC - .incbin "baserom.gba", 0x5e0eac, 0x2f0 + .align 2 +gIntroLeavesPal:: @ 85E05C4 + .incbin "graphics/intro/leaves.gbapal" -gUnknown_085E119C:: @ 85E119C - .incbin "baserom.gba", 0x5e119c, 0x218 + .align 2 +gIntroLeavesForegroundTilemap:: @ 85E07C4 + .incbin "graphics/intro/leaves_foreground.bin.lz" -gUnknown_085E13B4:: @ 85E13B4 - .incbin "baserom.gba", 0x5e13b4, 0x2170 + .align 2 +gIntroLeavesMidgroundTilemap:: @ 85E0B78 + .incbin "graphics/intro/leaves_midground.bin.lz" -gUnknown_085E3524:: @ 85E3524 - .incbin "baserom.gba", 0x5e3524, 0x200 + .align 2 +gIntroLeavesBgLeavesTilemap:: @ 85E0EAC + .incbin "graphics/intro/leaves_bgleaves.bin.lz" -gUnknown_085E3724:: @ 85E3724 - .incbin "baserom.gba", 0x5e3724, 0x130 + .align 2 +gIntroLeavesBgMountainsTilemap:: @ 85E119C + .incbin "graphics/intro/leaves_bgmountains.bin.lz" -gUnknown_085E3854:: @ 85E3854 - .incbin "baserom.gba", 0x5e3854, 0x1220 + .align 2 +gIntroLeavesBgGfx:: @ 85E13B4 + .incbin "graphics/intro/leaves_bg.4bpp.lz" + .align 2 +gIntroBattlePokeBallPal:: @ 85E3524 + .incbin "graphics/intro/battle_pokeball.gbapal" + + .align 2 +gIntroBattlePokeBallTilemap:: @ 85E3724 + .incbin "graphics/intro/battle_pokeball.bin.lz" + + .align 2 +gIntroBattlePokeBallGfx:: @ 85E3854 + .incbin "graphics/intro/battle_pokeball.8bpp.lz" + + .align 2 + .incbin "graphics/intro/battle_streaks.gbapal" + + .align 2 + .incbin "graphics/intro/battle_streaks.4bpp.lz" + + .align 2 + .incbin "graphics/intro/battle_streaks.bin.lz" + + .align 2 +gIntroBattleCirclePal:: @ 85E4570 + .incbin "graphics/intro/battle_circle_1.gbapal" + + .align 2 + .incbin "graphics/intro/battle_circle_2.gbapal" + + .align 2 +gIntroBattleCircleGfx:: @ 85E45B0 + .incbin "graphics/intro/battle_circle.4bpp.lz" + + .align 2 +gIntroFlyingPkmnShadowPal:: @ 85E492C + .incbin "graphics/intro/flying_shadow.gbapal" + + .align 2 + .incbin "graphics/intro/latis.4bpp.lz" + + .align 2 + .byte 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06 + .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x02, 0x0d + .byte 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15 + .byte 0x16, 0x17, 0x18, 0x19, 0x02, 0x0d, 0x0e, 0x0f + .byte 0x10, 0x11, 0x12, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e + .byte 0x1f, 0x20, 0x21, 0x02, 0x0d, 0x0e, 0x0f, 0x10 + .byte 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27 + .byte 0x28, 0x29, 0x2a, 0x00 + + .align 2 gUnknown_085E4A74:: @ 85E4A74 - .incbin "baserom.gba", 0x5e4a74, 0x10 + obj_tiles gUnknown_08D8D208, 0x0400, 0x05e1 + null_obj_tiles + .align 2 gUnknown_085E4A84:: @ 85E4A84 - .incbin "baserom.gba", 0x5e4a84, 0x34 + obj_pal gUnknown_08D8BA54, 0x05e1 + null_obj_pal + + .align 2 +gUnknown_085E4A94:: @ 85E4A94 + .byte 0xa0, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00 + .align 2 +gUnknown_085E4A9C:: @ 85E4A9C + .2byte 0x0000, 0x0002, 0x0004, 0x0002, 0x0008, 0x0002, 0x000c, 0x0002, 0x0010, 0x0002, 0xfffe, 0x0000 + + .align 2 +gUnknown_085E4AB4:: @ 85E4AB4 + .4byte gUnknown_085E4A9C + + .align 2 gUnknown_085E4AB8:: @ 85E4AB8 - .incbin "baserom.gba", 0x5e4ab8, 0x18 + spr_template 0x05e1, 0x05e1, gUnknown_085E4A94, gUnknown_085E4AB4, NULL, gDummySpriteAffineAnimTable, sub_816D338 + .align 2 gUnknown_085E4AD0:: @ 85E4AD0 - .incbin "baserom.gba", 0x5e4ad0, 0x18 + .byte 0x7c, 0x28, 0x66, 0x1e, 0x4d, 0x1e, 0x36, 0x0f + .byte 0x94, 0x09, 0x3f, 0x1c, 0x5d, 0x28, 0x94, 0x20 + .byte 0xad, 0x29, 0x5e, 0x14, 0xd0, 0x26, 0x00, 0x00 + .align 2 gUnknown_085E4AE8:: @ 85E4AE8 - .incbin "baserom.gba", 0x5e4ae8, 0x20 + obj_tiles gUnknown_08D85F50, 0x0400, 0x05dc + obj_tiles gUnknown_08D86130, 0x0c00, 0x05dd + obj_tiles gUnknown_08D86550, 0x2000, 0x05de + null_obj_tiles + .align 2 gUnknown_085E4B08:: @ 85E4B08 - .incbin "baserom.gba", 0x5e4b08, 0x38 + obj_pal gUnknown_08D85ED0, 0x05dc + obj_pal gUnknown_08D85EF0, 0x05dd + obj_pal gUnknown_08D85F10, 0x05de + null_obj_pal + + .align 2 +gUnknown_085E4B28:: @ 85E4B28 + .byte 0xa0, 0x00, 0x00, 0x80, 0x00, 0x04, 0x00, 0x00 + + .align 2 +gUnknown_085E4B30:: @ 85E4B30 + .2byte 0x0000, 0x0002, 0x0010, 0x0002, 0xfffe, 0x0000 + .align 2 +gUnknown_085E4B3C:: @ 85E4B3C + .4byte gUnknown_085E4B30 + + .align 2 gUnknown_085E4B40:: @ 85E4B40 - .incbin "baserom.gba", 0x5e4b40, 0x64 + spr_template 0x05dc, 0x05dc, gUnknown_085E4B28, gUnknown_085E4B3C, NULL, gDummySpriteAffineAnimTable, sub_816D81C + + .align 2 +gUnknown_085E4B58:: @ 85E4B58 + .byte 0xa0, 0x00, 0x00, 0x80, 0x00, 0x04, 0x00, 0x00 + + .align 2 +gUnknown_085E4B60:: @ 85E4B60 + .2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0005, 0x0010, 0x0005, 0xfffe, 0x0000 + .align 2 +gUnknown_085E4B74:: @ 85E4B74 + .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0010, 0x0003, 0xfffe, 0x0000 + + .align 2 +gUnknown_085E4B88:: @ 85E4B88 + .2byte 0x0030, 0x0004, 0x0040, 0x0006, 0x0050, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4B98:: @ 85E4B98 + .4byte gUnknown_085E4B60 + .4byte gUnknown_085E4B74 + .4byte gUnknown_085E4B88 + + .align 2 gUnknown_085E4BA4:: @ 85E4BA4 - .incbin "baserom.gba", 0x5e4ba4, 0x38 + spr_template 0x05dd, 0x05dd, gUnknown_085E4B58, gUnknown_085E4B98, NULL, gDummySpriteAffineAnimTable, sub_816D9C0 + + .align 2 +gUnknown_085E4BBC:: @ 85E4BBC + .byte 0xa0, 0x00, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00 + + .align 2 +gUnknown_085E4BC4:: @ 85E4BC4 + .2byte 0x0000, 0x0004, 0x0040, 0x0004, 0x0080, 0x0004, 0x00c0, 0x0004, 0xfffe, 0x0000 + + .align 2 +gUnknown_085E4BD8:: @ 85E4BD8 + .4byte gUnknown_085E4BC4 + .align 2 gUnknown_085E4BDC:: @ 85E4BDC - .incbin "baserom.gba", 0x5e4bdc, 0x18 + spr_template 0x05de, 0x05de, gUnknown_085E4BBC, gUnknown_085E4BD8, NULL, gDummySpriteAffineAnimTable, sub_816DAE8 + .align 2 gUnknown_085E4BF4:: @ 85E4BF4 - .incbin "baserom.gba", 0x5e4bf4, 0x10 + obj_tiles gUnknown_08D8B80C, 0x0c00, 0x05df + null_obj_tiles + .align 2 gUnknown_085E4C04:: @ 85E4C04 - .incbin "baserom.gba", 0x5e4c04, 0x48 + obj_pal gUnknown_08D8BA54, 0x05df + null_obj_pal + .align 2 +gUnknown_085E4C14:: @ 85E4C14 + .byte 0xa0, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_085E4C1C:: @ 85E4C1C + .2byte 0x0000, 0x0002, 0x0030, 0x0002, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4C28:: @ 85E4C28 + .2byte 0x0010, 0x0002, 0x0040, 0x0002, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4C34:: @ 85E4C34 + .2byte 0x0020, 0x0002, 0x0050, 0x0002, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4C40:: @ 85E4C40 + .4byte gUnknown_085E4C1C + .4byte gUnknown_085E4C28 + .4byte gUnknown_085E4C34 + + .align 2 gUnknown_085E4C4C:: @ 85E4C4C - .incbin "baserom.gba", 0x5e4c4c, 0x18 + spr_template 0x05df, 0x05df, gUnknown_085E4C14, gUnknown_085E4C40, NULL, gDummySpriteAffineAnimTable, sub_816EC6C + .align 2 gUnknown_085E4C64:: @ 85E4C64 - .incbin "baserom.gba", 0x5e4c64, 0x24 + .2byte 0x0068, 0x0000, 0x00c0, 0x008e, 0x0003, 0x0280, 0x0053, 0x0001 + .2byte 0x0180, 0x009b, 0x0000, 0x0080, 0x0038, 0x0002, 0x0200, 0x00ae + .2byte 0x0001, 0x0100 + .align 2 gUnknown_085E4C88:: @ 85E4C88 - .incbin "baserom.gba", 0x5e4c88, 0x10 + obj_tiles gUnknown_08D8CF44, 0x0600, 0x05e0 + null_obj_tiles + .align 2 gUnknown_085E4C98:: @ 85E4C98 - .incbin "baserom.gba", 0x5e4c98, 0x10 + obj_pal gUnknown_08D8D110, 0x05e0 + null_obj_pal + .align 2 gUnknown_085E4CA8:: @ 85E4CA8 - .incbin "baserom.gba", 0x5e4ca8, 0x6c - + .2byte 0x0042, 0x0040, 0x0001, 0x0060, 0x0060, 0x0008, 0x0080, 0x0040 + .2byte 0x0001, 0x0090, 0x0030, 0x0008, 0x00a0, 0x0048, 0x0001, 0x00b0 + .2byte 0x0060, 0x0008, 0x0060, 0x0060, 0x0004, 0x0070, 0x0068, 0x0008 + .2byte 0x0080, 0x0060, 0x0004, 0x0058, 0x0020, 0x0004, 0x0068, 0x0018 + .2byte 0x0008, 0x0078, 0x0020, 0x0004 + + .align 2 +gUnknown_085E4CF0:: @ 85E4CF0 + .byte 0xa0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_085E4CF8:: @ 85E4CF8 + .2byte 0x0000, 0x0004, 0x0008, 0x0004, 0x0010, 0x0004, 0x0018, 0x0004 + .2byte 0x0020, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4D10:: @ 85E4D10 + .4byte gUnknown_085E4CF8 + + .align 2 gUnknown_085E4D14:: @ 85E4D14 - .incbin "baserom.gba", 0x5e4d14, 0x50 + spr_template 0x05e0, 0x05e0, gUnknown_085E4CF0, gUnknown_085E4D10, NULL, gDummySpriteAffineAnimTable, sub_816E7B4 + + .align 2 +gUnknown_085E4D2C:: @ 85E4D2C + .byte 0xa0, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00 + .align 2 +gUnknown_085E4D34:: @ 85E4D34 + .2byte 0x0010, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4D3C:: @ 85E4D3C + .2byte 0x0018, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4D44:: @ 85E4D44 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4D4C:: @ 85E4D4C + .2byte 0x0030, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4D54:: @ 85E4D54 + .4byte gUnknown_085E4D34 + .4byte gUnknown_085E4D3C + .4byte gUnknown_085E4D44 + .4byte gUnknown_085E4D4C + + .align 2 gUnknown_085E4D64:: @ 85E4D64 - .incbin "baserom.gba", 0x5e4d64, 0x60 + spr_template 0x07d0, 0x07d0, gUnknown_085E4D2C, gUnknown_085E4D54, NULL, gDummySpriteAffineAnimTable, sub_816F454 -gUnknown_085E4DC4:: @ 85E4DC4 - .incbin "baserom.gba", 0x5e4dc4, 0xd0 + .align 2 +gUnknown_085E4D7C:: @ 85E4D7C + .byte 0x00, 0x00, 0x04, 0x00, 0x40, 0x00, 0x04, 0x00 -gUnknown_085E4E94:: @ 85E4E94 - .incbin "baserom.gba", 0x5e4e94, 0xb4 + .align 2 +gUnknown_085E4D84:: @ 85E4D84 + .2byte 0x0080, 0x0004, 0x00c0, 0x0004, 0xfffe, 0x0000 + + .align 2 +gUnknown_085E4D90:: @ 85E4D90 + .2byte 0x0000, 0x0008, 0x0040, 0x0008, 0x0080, 0x0008, 0x00c0, 0x0008, 0xfffe, 0x0000 + + .align 2 +gUnknown_085E4DA4:: @ 85E4DA4 + .2byte 0x0100, 0x0004, 0x0140, 0x0004, 0x0180, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4DB4:: @ 85E4DB4 + .2byte 0x0180, 0x0010, 0x0140, 0x0010, 0x0100, 0x0010, 0xffff, 0x0000 + .align 2 +gUnknown_085E4DC4:: @ 85E4DC4 + .4byte gUnknown_085E4D7C + .4byte gUnknown_085E4D90 + .4byte gUnknown_085E4DA4 + .4byte gUnknown_085E4DB4 + + .align 2 +gUnknown_085E4DD4:: @ 85E4DD4 + .2byte 0x03a0, 0x4000, 0x0000, 0x0000 + + .align 2 +gUnknown_085E4DDC:: @ 85E4DDC + .2byte 0x00a0, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085E4DE4:: @ 85E4DE4 + .2byte 0x87a0, 0xc000, 0x0000, 0x0000 + + .align 2 +gUnknown_085E4DEC:: @ 85E4DEC + .2byte 0x0050, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4DF4:: @ 85E4DF4 + .2byte 0x0054, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4DFC:: @ 85E4DFC + .2byte 0x0058, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E04:: @ 85E4E04 + .2byte 0x005c, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E0C:: @ 85E4E0C + .2byte 0x0060, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E14:: @ 85E4E14 + .2byte 0x0064, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E1C:: @ 85E4E1C + .2byte 0x0068, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E24:: @ 85E4E24 + .2byte 0x0070, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E2C:: @ 85E4E2C + .2byte 0x0071, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E34:: @ 85E4E34 + .2byte 0x0072, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E3C:: @ 85E4E3C + .2byte 0x0073, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E44:: @ 85E4E44 + .2byte 0x0074, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E4C:: @ 85E4E4C + .2byte 0x0075, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E54:: @ 85E4E54 + .2byte 0x0080, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E4E5C:: @ 85E4E5C + .4byte gUnknown_085E4DEC + .4byte gUnknown_085E4DF4 + .4byte gUnknown_085E4DFC + .4byte gUnknown_085E4E04 + .4byte gUnknown_085E4E0C + .4byte gUnknown_085E4E14 + .4byte gUnknown_085E4E1C + + .align 2 +gUnknown_085E4E78:: @ 85E4E78 + .4byte gUnknown_085E4E24 + .4byte gUnknown_085E4E2C + .4byte gUnknown_085E4E34 + .4byte gUnknown_085E4E3C + .4byte gUnknown_085E4E44 + .4byte gUnknown_085E4E4C + + .align 2 +gUnknown_085E4E90:: @ 85E4E90 + .4byte gUnknown_085E4E54 + + .align 2 +gUnknown_085E4E94:: @ 85E4E94 + .2byte 0x0000, 0xffb8, 0x0001, 0xffc8, 0x0002, 0xffd8, 0x0003, 0xffe8 + .2byte 0x0004, 0x0008, 0x0005, 0x0018, 0x0003, 0x0028, 0x0001, 0x0038 + .2byte 0x0006, 0x0048, 0x0000, 0xffe4, 0x0001, 0xffec, 0x0002, 0xfff4 + .2byte 0x0003, 0xfffc, 0x0002, 0x0004, 0x0004, 0x000c, 0x0005, 0x0014 + .2byte 0x0003, 0x001c + + .align 2 +gUnknown_085E4ED8:: @ 85E4ED8 + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085E4EE8:: @ 85E4EE8 + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0010, 0x0010, 0x1000, 0x0000 + .2byte 0xfff0, 0xfff0, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085E4F08:: @ 85E4F08 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0008, 0x0008, 0x3000, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085E4F20:: @ 85E4F20 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0002, 0x0002, 0x3000, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085E4F38:: @ 85E4F38 + .4byte gUnknown_085E4ED8 + .4byte gUnknown_085E4EE8 + .4byte gUnknown_085E4F08 + .4byte gUnknown_085E4F20 + + .align 2 gUnknown_085E4F48:: @ 85E4F48 - .incbin "baserom.gba", 0x5e4f48, 0x14 + .2byte 0x0100, 0x00c0, 0x0080, 0x0040, 0x0000, 0x0040, 0x0080, 0x00c0 + .2byte 0x0100, 0x0000 + .align 2 gUnknown_085E4F5C:: @ 85E4F5C - .incbin "baserom.gba", 0x5e4f5c, 0x30 + spr_template 0x07d0, 0x07d1, gUnknown_085E4DD4, gUnknown_085E4E5C, NULL, gUnknown_085E4F38, sub_816FB38 + spr_template 0x07d0, 0x07d1, gUnknown_085E4DDC, gUnknown_085E4E78, NULL, gDummySpriteAffineAnimTable, sub_816FB38 + .align 2 gUnknown_085E4F8C:: @ 85E4F8C - .incbin "baserom.gba", 0x5e4f8c, 0x18 + spr_template 0x07d0, 0x07d1, gUnknown_085E4DE4, gUnknown_085E4E90, NULL, gUnknown_085E4F38, sub_816FD44 + .align 2 gUnknown_085E4FA4:: @ 85E4FA4 - .incbin "baserom.gba", 0x5e4fa4, 0x20 + .byte 0x00, 0x17, 0x17, 0x31, 0x3e, 0x24, 0x24, 0x0a, 0x0a, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_085E4FB0:: @ 85E4FB0 + .byte 0xa0, 0x40, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 + .align 2 +gUnknown_085E4FB8:: @ 85E4FB8 + .2byte 0x0000, 0x000a, 0xfffe, 0x0000 + + .align 2 +gUnknown_085E4FC0:: @ 85E4FC0 + .4byte gUnknown_085E4FB8 + + .align 2 gUnknown_085E4FC4:: @ 85E4FC4 - .incbin "baserom.gba", 0x5e4fc4, 0x18 + spr_template 0x07d2, 0x07d2, gUnknown_085E4FB0, gUnknown_085E4FC0, NULL, gDummySpriteAffineAnimTable, sub_816FEDC + .align 2 gUnknown_085E4FDC:: @ 85E4FDC - .incbin "baserom.gba", 0x5e4fdc, 0x10 + obj_tiles gIntroLeavesGFLogoGfx, 0x1400, 0x07d0 + null_obj_tiles gUnknown_085E4FEC:: @ 85E4FEC - .incbin "baserom.gba", 0x5e4fec, 0x10 + obj_tiles gUnknown_08D8D130, 0x0400, 0x07d2 + null_obj_tiles + .align 2 gUnknown_085E4FFC:: @ 85E4FFC - .incbin "baserom.gba", 0x5e4ffc, 0x34 + obj_pal gIntroLeavesDropsPal, 0x07d0 + obj_pal gIntroLeavesGFLogoPal, 0x07d1 + obj_pal gIntroFlyingPkmnShadowPal, 0x07d2 + null_obj_pal + + .align 2 +gUnknown_085E501C:: @ 85E501C + .byte 0xa0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 + .align 2 +gUnknown_085E5024:: @ 85E5024 + .2byte 0x0010, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085E502C:: @ 85E502C + .4byte gUnknown_085E5024 + + .align 2 gUnknown_085E5030:: @ 85E5030 - .incbin "baserom.gba", 0x5e5030, 0x18 + spr_template 0x07d3, 0x07d3, gUnknown_085E501C, gUnknown_085E502C, NULL, gDummySpriteAffineAnimTable, sub_8170040 + .align 2 gUnknown_085E5048:: @ 85E5048 - .incbin "baserom.gba", 0x5e5048, 0x10 + obj_tiles gIntroBattleCircleGfx, 0x0a00, 0x07d3 + null_obj_tiles gUnknown_085E5058:: @ 85E5058 - .incbin "baserom.gba", 0x5e5058, 0x10 + obj_pal gIntroBattleCirclePal, 0x07d3 + null_obj_pal + diff --git a/data/player_pc.s b/data/player_pc.s index 1a4f62b4f..4fd2913dd 100644 --- a/data/player_pc.s +++ b/data/player_pc.s @@ -40,4 +40,4 @@ gUnknown_085DFF84:: @ 85DFF84 .incbin "baserom.gba", 0x5dff84, 0x8 gUnknown_085DFF8C:: @ 85DFF8C - .incbin "baserom.gba", 0x5dff8c, 0x638 + .incbin "baserom.gba", 0x5dff8c, 0x4 diff --git a/graphics/intro/battle_circle.png b/graphics/intro/battle_circle.png Binary files differnew file mode 100644 index 000000000..26be33c01 --- /dev/null +++ b/graphics/intro/battle_circle.png diff --git a/graphics/intro/battle_circle_1.pal b/graphics/intro/battle_circle_1.pal new file mode 100644 index 000000000..a34bebc24 --- /dev/null +++ b/graphics/intro/battle_circle_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +255 255 0 +255 213 0 +255 180 0 +255 148 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 222 131 +255 230 172 +255 238 213 +255 255 255 diff --git a/graphics/intro/battle_circle_2.pal b/graphics/intro/battle_circle_2.pal new file mode 100644 index 000000000..3c985dc07 --- /dev/null +++ b/graphics/intro/battle_circle_2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +98 49 90 +115 106 164 +139 164 238 +106 172 255 +131 197 255 +156 222 255 +255 222 57 +255 172 57 +230 106 57 +49 49 49 +98 98 98 +148 148 148 +197 197 197 +255 255 255 diff --git a/graphics/intro/battle_pokeball.bin b/graphics/intro/battle_pokeball.bin Binary files differnew file mode 100644 index 000000000..2f968aa20 --- /dev/null +++ b/graphics/intro/battle_pokeball.bin diff --git a/graphics/intro/battle_pokeball.pal b/graphics/intro/battle_pokeball.pal new file mode 100644 index 000000000..d520a5e82 --- /dev/null +++ b/graphics/intro/battle_pokeball.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +49 41 24 +106 90 57 +164 139 90 +222 98 57 +131 131 189 +255 255 255 +74 32 16 +148 65 32 +41 41 57 +82 82 123 +82 82 82 +164 164 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/intro/battle_pokeball.png b/graphics/intro/battle_pokeball.png Binary files differnew file mode 100644 index 000000000..4af0187f8 --- /dev/null +++ b/graphics/intro/battle_pokeball.png diff --git a/graphics/intro/battle_streaks.bin b/graphics/intro/battle_streaks.bin Binary files differnew file mode 100644 index 000000000..2d1b69924 --- /dev/null +++ b/graphics/intro/battle_streaks.bin diff --git a/graphics/intro/battle_streaks.pal b/graphics/intro/battle_streaks.pal new file mode 100644 index 000000000..21ae1e434 --- /dev/null +++ b/graphics/intro/battle_streaks.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +255 230 74 +255 230 98 +255 238 123 +255 238 148 +255 246 172 +255 255 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/intro/battle_streaks.png b/graphics/intro/battle_streaks.png Binary files differnew file mode 100644 index 000000000..a19fa39c4 --- /dev/null +++ b/graphics/intro/battle_streaks.png diff --git a/graphics/intro/flying_shadow.pal b/graphics/intro/flying_shadow.pal new file mode 100644 index 000000000..dcfc242a5 --- /dev/null +++ b/graphics/intro/flying_shadow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 74 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/latis.png b/graphics/intro/latis.png Binary files differnew file mode 100644 index 000000000..cf8eedc08 --- /dev/null +++ b/graphics/intro/latis.png diff --git a/graphics/intro/leaves.pal b/graphics/intro/leaves.pal new file mode 100644 index 000000000..95145b854 --- /dev/null +++ b/graphics/intro/leaves.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 +0 0 0 +24 82 0 +32 90 0 +41 98 0 +49 115 0 +57 123 0 +65 139 0 +74 148 0 +82 156 0 +90 172 0 +0 16 0 +8 41 0 +16 57 0 +123 197 16 +180 255 131 +164 238 98 +0 0 0 +24 82 0 +32 90 0 +41 98 0 +49 115 0 +57 123 0 +65 139 0 +74 148 0 +82 156 0 +90 172 0 +8 24 8 +8 41 0 +16 57 0 +148 205 98 +98 172 74 +238 255 238 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 +0 0 0 +255 255 255 +246 246 238 +238 246 230 +230 246 222 +205 238 222 +180 230 230 +172 213 238 +131 205 238 +180 180 156 +213 213 230 +205 197 213 +189 230 115 +156 213 98 +222 230 222 +115 172 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 246 0 +65 90 156 +49 115 255 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/intro/leaves_bg.png b/graphics/intro/leaves_bg.png Binary files differnew file mode 100644 index 000000000..041901463 --- /dev/null +++ b/graphics/intro/leaves_bg.png diff --git a/graphics/intro/leaves_bgleaves.bin b/graphics/intro/leaves_bgleaves.bin Binary files differnew file mode 100644 index 000000000..7781e8b08 --- /dev/null +++ b/graphics/intro/leaves_bgleaves.bin diff --git a/graphics/intro/leaves_bgmountains.bin b/graphics/intro/leaves_bgmountains.bin Binary files differnew file mode 100644 index 000000000..1af02a025 --- /dev/null +++ b/graphics/intro/leaves_bgmountains.bin diff --git a/graphics/intro/leaves_drops.pal b/graphics/intro/leaves_drops.pal new file mode 100644 index 000000000..1b8ce3d6e --- /dev/null +++ b/graphics/intro/leaves_drops.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 +8 57 8 +32 74 32 +57 98 57 +90 123 90 +115 139 115 +139 164 139 +172 189 172 +197 205 197 +222 230 222 +255 255 255 diff --git a/graphics/intro/leaves_foreground.bin b/graphics/intro/leaves_foreground.bin Binary files differnew file mode 100644 index 000000000..8307cf656 --- /dev/null +++ b/graphics/intro/leaves_foreground.bin diff --git a/graphics/intro/leaves_gflogo.pal b/graphics/intro/leaves_gflogo.pal new file mode 100644 index 000000000..aef9152e4 --- /dev/null +++ b/graphics/intro/leaves_gflogo.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +156 246 0 +65 90 156 +49 115 255 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +255 255 255 diff --git a/graphics/intro/leaves_gflogo.png b/graphics/intro/leaves_gflogo.png Binary files differnew file mode 100644 index 000000000..e0f28c841 --- /dev/null +++ b/graphics/intro/leaves_gflogo.png diff --git a/graphics/intro/leaves_midground.bin b/graphics/intro/leaves_midground.bin Binary files differnew file mode 100644 index 000000000..7d34e5bba --- /dev/null +++ b/graphics/intro/leaves_midground.bin |
