From 4327bee485510b424cbf28e450d90ff50e6fe78b Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 24 Jan 2018 23:34:17 -0500 Subject: merge field files into evobjmv.c. --- src/field/fldeff_recordmixing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field/fldeff_recordmixing.c') diff --git a/src/field/fldeff_recordmixing.c b/src/field/fldeff_recordmixing.c index ec72885b5..8d5e7229d 100644 --- a/src/field/fldeff_recordmixing.c +++ b/src/field/fldeff_recordmixing.c @@ -1,5 +1,5 @@ #include "global.h" -#include "field_map_obj.h" +#include "evobjmv.h" #include "fldeff_recordmixing.h" #include "sprite.h" -- cgit v1.2.3 From e74b0c6e51796d2c8c7fab6ef22f75d15a6c8786 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 17 Feb 2018 22:14:41 -0500 Subject: take your stupid fucking politically correct names since you dont care about authenticity --- src/field/fldeff_recordmixing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field/fldeff_recordmixing.c') diff --git a/src/field/fldeff_recordmixing.c b/src/field/fldeff_recordmixing.c index 8d5e7229d..716447f9c 100644 --- a/src/field/fldeff_recordmixing.c +++ b/src/field/fldeff_recordmixing.c @@ -1,5 +1,5 @@ #include "global.h" -#include "evobjmv.h" +#include "event_object_movement.h" #include "fldeff_recordmixing.h" #include "sprite.h" -- cgit v1.2.3 From daa05c1b7c5e079ad8554e88a290e07b333bd2db Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 18 Feb 2018 19:59:51 -0600 Subject: remove subdirectories --- src/field/fldeff_recordmixing.c | 83 ----------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 src/field/fldeff_recordmixing.c (limited to 'src/field/fldeff_recordmixing.c') diff --git a/src/field/fldeff_recordmixing.c b/src/field/fldeff_recordmixing.c deleted file mode 100644 index 716447f9c..000000000 --- a/src/field/fldeff_recordmixing.c +++ /dev/null @@ -1,83 +0,0 @@ -#include "global.h" -#include "event_object_movement.h" -#include "fldeff_recordmixing.h" -#include "sprite.h" - -extern const struct OamData gFieldOamData_32x8; - -static const u8 sSpriteImage_83D26C0[] = INCBIN_U8("graphics/unknown_sprites/83D2860/0.4bpp"); -static const u8 sSpriteImage_83D2740[] = INCBIN_U8("graphics/unknown_sprites/83D2860/1.4bpp"); -static const u8 sSpriteImage_83D27C0[] = INCBIN_U8("graphics/unknown_sprites/83D2860/2.4bpp"); -static const u16 sPalette_3D2840[] = INCBIN_U16("graphics/unknown/unknown_3D2840.gbapal"); - - -static const struct SpriteFrameImage sSpriteImageTable_83FD950[] = -{ - { sSpriteImage_83D26C0, sizeof(sSpriteImage_83D26C0) }, - { sSpriteImage_83D2740, sizeof(sSpriteImage_83D2740) }, - { sSpriteImage_83D27C0, sizeof(sSpriteImage_83D27C0) }, -}; - -static const struct SpritePalette sUnknown_083D2878 = { sPalette_3D2840, 0x1000 }; - -static const union AnimCmd sSpriteAnim_83D2880[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(2, 30), - ANIMCMD_JUMP(0), -}; - -static const union AnimCmd *const sSpriteAnimTable_83D2890[] = -{ - sSpriteAnim_83D2880, -}; - -static const struct SpriteTemplate sSpriteTemplate_83D2894 = -{ - .tileTag = 0xFFFF, - .paletteTag = 0x1000, - .oam = &gFieldOamData_32x8, - .anims = sSpriteAnimTable_83D2890, - .images = sSpriteImageTable_83FD950, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, -}; - -u8 CreateRecordMixingSprite(void) -{ - u8 spriteId; - - LoadSpritePalette(&sUnknown_083D2878); - - spriteId = CreateSprite(&sSpriteTemplate_83D2894, 0, 0, 82); - - if (spriteId == MAX_SPRITES) - { - return MAX_SPRITES; - } - else - { - struct Sprite *sprite = &gSprites[spriteId]; - sub_8060388(16, 13, &sprite->pos1.x, &sprite->pos1.y); - sprite->coordOffsetEnabled = TRUE; - sprite->pos1.x += 16; - sprite->pos1.y += 2; - } - - return spriteId; -} - -void DestroyRecordMixingSprite(void) -{ - int i; - - for (i = 0; i < MAX_SPRITES; i++) - { - if (gSprites[i].template == &sSpriteTemplate_83D2894) - { - FreeSpritePalette(&gSprites[i]); - DestroySprite(&gSprites[i]); - } - } -} -- cgit v1.2.3