diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/fldeff_decoration.s | 36 | ||||
| -rwxr-xr-x | data/fldeff_recordmixing.s | 45 | ||||
| -rwxr-xr-x[-rw-r--r--] | data/fldeff_secretpower.s (renamed from data/fldeff_80C5CD4.s) | 112 | ||||
| -rwxr-xr-x | data/pss_effect.s | 43 |
4 files changed, 124 insertions, 112 deletions
diff --git a/data/fldeff_decoration.s b/data/fldeff_decoration.s new file mode 100755 index 000000000..2081679cd --- /dev/null +++ b/data/fldeff_decoration.s @@ -0,0 +1,36 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gOamData_83D266C:: @ 83D266C + .2byte 0x8000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_83D2674:: @ 83D2674 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 2, 6 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83D2684:: @ 83D2684 + .4byte gSpriteAnim_83D2674 + + .align 2 +gSpriteImageTable_83D2688:: @ 83D2688 + obj_frame_tiles gSpriteImage_83D21EC, 0x100 + obj_frame_tiles gSpriteImage_83D22EC, 0x100 + obj_frame_tiles gSpriteImage_83D23EC, 0x100 + + .align 2 +gSpriteTemplate_83D26A0:: @ 83D26A0 + spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, SpriteCB_SandPillar_0 + +@ This uses one of the secret base palettes, so there is no "09.pal" file. + .align 2 +gFieldEffectObjectPaletteInfo9:: @ 83D26B8 + obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E diff --git a/data/fldeff_recordmixing.s b/data/fldeff_recordmixing.s new file mode 100755 index 000000000..ee9d6b8d6 --- /dev/null +++ b/data/fldeff_recordmixing.s @@ -0,0 +1,45 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteImage_83D26C0:: @ 83D26C0 + .incbin "graphics/unknown_sprites/83D2860/0.4bpp" + + .align 2 +gSpriteImage_83D2740:: @ 83D2740 + .incbin "graphics/unknown_sprites/83D2860/1.4bpp" + + .align 2 +gSpriteImage_83D27C0:: @ 83D27C0 + .incbin "graphics/unknown_sprites/83D2860/2.4bpp" + + .align 2 +Palette_3D2840:: @ 83D2840 + .incbin "graphics/unknown/unknown_3D2840.gbapal" + + .align 2 +gSpriteImageTable_83D2860:: @ 83D2860 + obj_frame_tiles gSpriteImage_83D26C0, 0x80 + obj_frame_tiles gSpriteImage_83D2740, 0x80 + obj_frame_tiles gSpriteImage_83D27C0, 0x80 + + .align 2 +gUnknown_083D2878:: @ 83D2878 + obj_pal Palette_3D2840, 4096 + + .align 2 +gSpriteAnim_83D2880:: @ 83D2880 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_frame 2, 30 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_83D2890:: @ 83D2890 + .4byte gSpriteAnim_83D2880 + + .align 2 +gSpriteTemplate_83D2894:: @ 83D2894 + spr_template 0xFFFF, 4096, gFieldOamData_32x8, gSpriteAnimTable_83D2890, gSpriteImageTable_83D2860, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/fldeff_80C5CD4.s b/data/fldeff_secretpower.s index 4f0e83832..589ded675 100644..100755 --- a/data/fldeff_80C5CD4.s +++ b/data/fldeff_secretpower.s @@ -4,45 +4,6 @@ .section .rodata .align 2 -gUnknown_083D1898:: @ 83D1898 - obj_tiles gUnknownGfx_083D190C, 0x80, 0 - - .align 2 -gUnknown_083D18A0:: @ 83D18A0 - obj_pal gUnknownPal_083D18EC, 0x0000 - - .align 2 -gSpriteTemplate_83D18A8:: @ 83D18A8 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC - - .align 2 -gSpriteTemplate_83D18C0:: @ 83D18C0 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 - - .align 2 -gOamData_83D18D8:: @ 83D18D8 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83D18E0:: @ 83D18E0 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D18E8:: @ 83D18E8 - .4byte gSpriteAnim_83D18E0 - - .align 2 -gUnknownPal_083D18EC:: - .incbin "graphics/unknown/unknown_3D18EC.gbapal" - - .align 2 -gUnknownGfx_083D190C:: - .incbin "graphics/unknown/unknown_3D190C.4bpp" - - .align 2 gSpriteImage_83D198C:: @ 83D198C .incbin "graphics/unknown_sprites/83D259C/0.4bpp" @@ -245,76 +206,3 @@ gFieldEffectObjectPaletteInfo7:: @ 83D265C .align 2 gFieldEffectObjectPaletteInfo8:: @ 83D2664 obj_pal gFieldEffectObjectPalette8, 0x1008 - - .align 2 -gOamData_83D266C:: @ 83D266C - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83D2674:: @ 83D2674 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D2684:: @ 83D2684 - .4byte gSpriteAnim_83D2674 - - .align 2 -gSpriteImageTable_83D2688:: @ 83D2688 - obj_frame_tiles gSpriteImage_83D21EC, 0x100 - obj_frame_tiles gSpriteImage_83D22EC, 0x100 - obj_frame_tiles gSpriteImage_83D23EC, 0x100 - - .align 2 -gSpriteTemplate_83D26A0:: @ 83D26A0 - spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, SpriteCB_SandPillar_0 - -@ This uses one of the secret base palettes, so there is no "09.pal" file. - .align 2 -gFieldEffectObjectPaletteInfo9:: @ 83D26B8 - obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E - - .align 2 -gSpriteImage_83D26C0:: @ 83D26C0 - .incbin "graphics/unknown_sprites/83D2860/0.4bpp" - - .align 2 -gSpriteImage_83D2740:: @ 83D2740 - .incbin "graphics/unknown_sprites/83D2860/1.4bpp" - - .align 2 -gSpriteImage_83D27C0:: @ 83D27C0 - .incbin "graphics/unknown_sprites/83D2860/2.4bpp" - - .align 2 -Palette_3D2840:: @ 83D2840 - .incbin "graphics/unknown/unknown_3D2840.gbapal" - - .align 2 -gSpriteImageTable_83D2860:: @ 83D2860 - obj_frame_tiles gSpriteImage_83D26C0, 0x80 - obj_frame_tiles gSpriteImage_83D2740, 0x80 - obj_frame_tiles gSpriteImage_83D27C0, 0x80 - - .align 2 -gUnknown_083D2878:: @ 83D2878 - obj_pal Palette_3D2840, 4096 - - .align 2 -gSpriteAnim_83D2880:: @ 83D2880 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_frame 2, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83D2890:: @ 83D2890 - .4byte gSpriteAnim_83D2880 - - .align 2 -gSpriteTemplate_83D2894:: @ 83D2894 - spr_template 0xFFFF, 4096, gFieldOamData_32x8, gSpriteAnimTable_83D2890, gSpriteImageTable_83D2860, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/pss_effect.s b/data/pss_effect.s new file mode 100755 index 000000000..4f860213a --- /dev/null +++ b/data/pss_effect.s @@ -0,0 +1,43 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_083D1898:: @ 83D1898 + obj_tiles gUnknownGfx_083D190C, 0x80, 0 + + .align 2 +gUnknown_083D18A0:: @ 83D18A0 + obj_pal gUnknownPal_083D18EC, 0x0000 + + .align 2 +gSpriteTemplate_83D18A8:: @ 83D18A8 + spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC + + .align 2 +gSpriteTemplate_83D18C0:: @ 83D18C0 + spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 + + .align 2 +gOamData_83D18D8:: @ 83D18D8 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0000 + + .align 2 +gSpriteAnim_83D18E0:: @ 83D18E0 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83D18E8:: @ 83D18E8 + .4byte gSpriteAnim_83D18E0 + + .align 2 +gUnknownPal_083D18EC:: + .incbin "graphics/unknown/unknown_3D18EC.gbapal" + + .align 2 +gUnknownGfx_083D190C:: + .incbin "graphics/unknown/unknown_3D190C.4bpp" |