dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync field_effect_object_template_pointers.h with Emerald

Browse Source
This commit is contained in:
PikalaxALT
2021-05-03 14:09:21 -04:00
parent cb90fda18d
commit 7f50753360
13 changed files with 189 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/object_events/palettes/8398FC8.pal
+1 -17
View File
@@ -1,6 +1,6 @@
JASC-PAL JASC-PAL
0100 0100
32 16
255 0 238 255 0 238
189 255 139 189 255 139
131 213 98 131 213 98
@@ -17,19 +17,3 @@ JASC-PAL
115 205 164 115 205 164
65 180 139 65 180 139
24 164 106 24 164 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
0 0 0
graphics/object_events/pics/unknown/839A288.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 B

After

Width:  |  Height:  |  Size: 175 B

graphics/object_events/pics/unknown/839A988.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 149 B

After

Width:  |  Height:  |  Size: 216 B

graphics/object_events/pics/unknown/839BE08.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 256 B

graphics/object_events/pics/unknown/839C508.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 150 B

include/constants/field_effects.h
+36 -36
View File
@@ -72,41 +72,41 @@
#define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_DESTROY_DEOXYS_ROCK 68
#define FLDEFF_UNK_45 69 // TODO: related to fame checker photos #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos
#define FLDEFFGFX_SHADOW_SMALL 0 #define FLDEFFOBJ_SHADOW_S 0
#define FLDEFFGFX_SHADOW_MEDIUM 1 #define FLDEFFOBJ_SHADOW_M 1
#define FLDEFFGFX_SHADOW_LARGE 2 #define FLDEFFOBJ_SHADOW_L 2
#define FLDEFFGFX_SHADOW_EXTRA_LARGE 3 #define FLDEFFOBJ_SHADOW_XL 3
#define FLDEFFGFX_04 4 #define FLDEFFOBJ_TALL_GRASS 4
#define FLDEFFGFX_05 5 #define FLDEFFOBJ_RIPPLE 5
#define FLDEFFGFX_06 6 #define FLDEFFOBJ_ASH 6
#define FLDEFFGFX_07 7 #define FLDEFFOBJ_SURF_BLOB 7
#define FLDEFFGFX_08 8 #define FLDEFFOBJ_ARROW 8
#define FLDEFFGFX_09 9 #define FLDEFFOBJ_GROUND_IMPACT_DUST 9
#define FLDEFFGFX_10 10 #define FLDEFFOBJ_JUMP_TALL_GRASS 10
#define FLDEFFGFX_11 11 #define FLDEFFOBJ_SAND_FOOTPRINTS 11
#define FLDEFFGFX_12 12 #define FLDEFFOBJ_JUMP_BIG_SPLASH 12
#define FLDEFFGFX_13 13 #define FLDEFFOBJ_SPLASH 13
#define FLDEFFGFX_14 14 #define FLDEFFOBJ_JUMP_SMALL_SPLASH 14
#define FLDEFFGFX_15 15 #define FLDEFFOBJ_LONG_GRASS 15
#define FLDEFFGFX_16 16 #define FLDEFFOBJ_JUMP_LONG_GRASS 16
#define FLDEFFGFX_17 17 #define FLDEFFOBJ_UNUSED_GRASS 17
#define FLDEFFGFX_18 18 #define FLDEFFOBJ_UNUSED_GRASS_2 18
#define FLDEFFGFX_19 19 #define FLDEFFOBJ_UNUSED_SAND 19
#define FLDEFFGFX_20 20 #define FLDEFFOBJ_WATER_SURFACING 20
#define FLDEFFGFX_REFLECTION 21 #define FLDEFFOBJ_REFLECTION_DISTORTION 21
#define FLDEFFGFX_22 22 #define FLDEFFOBJ_SPARKLE 22
#define FLDEFFGFX_23 23 #define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23
#define FLDEFFGFX_24 24 #define FLDEFFOBJ_TREE_DISGUISE 24
#define FLDEFFGFX_25 25 #define FLDEFFOBJ_MOUNTAIN_DISGUISE 25
#define FLDEFFGFX_FLY_BLOB 26 #define FLDEFFOBJ_BIRD 26
#define FLDEFFGFX_27 27 #define FLDEFFOBJ_BIKE_TIRE_TRACKS 27
#define FLDEFFGFX_28 28 #define FLDEFFOBJ_SAND_DISGUISE 28
#define FLDEFFGFX_29 29 #define FLDEFFOBJ_SAND_PILE 29
#define FLDEFFGFX_30 30 #define FLDEFFOBJ_SHORT_GRASS 30
#define FLDEFFGFX_31 31 #define FLDEFFOBJ_HOT_SPRINGS_WATER 31
#define FLDEFFGFX_32 32 #define FLDEFFOBJ_ASH_PUFF 32
#define FLDEFFGFX_33 33 #define FLDEFFOBJ_ASH_LAUNCH 33
#define FLDEFFGFX_34 34 #define FLDEFFOBJ_BUBBLES 34
#define FLDEFFGFX_35 35 #define FLDEFFOBJ_SMALL_SPARKLE 35
#endif // GUARD_CONSTANTS_FIELD_EFFECTS_H #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
src/data/field_effects/field_effect_object_template_pointers.h
+73 -71
View File
@@ -1,74 +1,76 @@
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall;
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium;
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge;
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowXL; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge;
const struct SpriteTemplate gUnknown_83A5420; const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass;
const struct SpriteTemplate gUnknown_83A5488; const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple;
const struct SpriteTemplate gUnknown_83A54E4; const struct SpriteTemplate gFieldEffectObjectTemplate_Ash;
const struct SpriteTemplate gUnknown_83A556C; const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob;
const struct SpriteTemplate gUnknown_83A5604; const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow;
const struct SpriteTemplate gUnknown_83A5648; const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust;
const struct SpriteTemplate gUnknown_83A5698; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass;
const struct SpriteTemplate gUnknown_83A56F4; const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints;
const struct SpriteTemplate gUnknown_83A583C; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash;
const struct SpriteTemplate gUnknown_83A589C; const struct SpriteTemplate gFieldEffectObjectTemplate_Splash;
const struct SpriteTemplate gUnknown_83A58E0; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash;
const struct SpriteTemplate gUnknown_83A593C; const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass;
const struct SpriteTemplate gUnknown_83A59A4; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass;
const struct SpriteTemplate gUnknown_83A5A30; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass;
const struct SpriteTemplate gUnknown_83A5A88; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2;
const struct SpriteTemplate gUnknown_83A5AD8; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand;
const struct SpriteTemplate gUnknown_83A5B74; const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing;
const struct SpriteTemplate gUnknown_83A5C34; const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion;
const struct SpriteTemplate gUnknown_83A5750; const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints;
const struct SpriteTemplate gUnknown_83A5CB4; const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise;
const struct SpriteTemplate gUnknown_83A5D34; const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise;
const struct SpriteTemplate gUnknown_83A5E00; const struct SpriteTemplate gFieldEffectObjectTemplate_Bird;
const struct SpriteTemplate gUnknown_83A57EC; const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks;
const struct SpriteTemplate gUnknown_83A5D84; const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder;
const struct SpriteTemplate gUnknown_83A5B1C; const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile;
const struct SpriteTemplate gUnknown_83A5E38; const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass;
const struct SpriteTemplate gUnknown_83A5E64; const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater;
const struct SpriteTemplate gUnknown_83A5EC0; const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff;
const struct SpriteTemplate gUnknown_83A5F24; const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch;
const struct SpriteTemplate gUnknown_83A5FA4; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles;
const struct SpriteTemplate gUnknown_83A5FE0; const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle;
#define gFieldEffectObjectTemplate_Sparkle NULL
const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
[FLDEFFGFX_SHADOW_SMALL] = &gFieldEffectObjectTemplate_ShadowS, [FLDEFFOBJ_SHADOW_S] = &gFieldEffectObjectTemplate_ShadowSmall,
[FLDEFFGFX_SHADOW_MEDIUM] = &gFieldEffectObjectTemplate_ShadowM, [FLDEFFOBJ_SHADOW_M] = &gFieldEffectObjectTemplate_ShadowMedium,
[FLDEFFGFX_SHADOW_LARGE] = &gFieldEffectObjectTemplate_ShadowL, [FLDEFFOBJ_SHADOW_L] = &gFieldEffectObjectTemplate_ShadowLarge,
[FLDEFFGFX_SHADOW_EXTRA_LARGE] = &gFieldEffectObjectTemplate_ShadowXL, [FLDEFFOBJ_SHADOW_XL] = &gFieldEffectObjectTemplate_ShadowExtraLarge,
[FLDEFFGFX_04] = &gUnknown_83A5420, [FLDEFFOBJ_TALL_GRASS] = &gFieldEffectObjectTemplate_TallGrass,
[FLDEFFGFX_05] = &gUnknown_83A5488, [FLDEFFOBJ_RIPPLE] = &gFieldEffectObjectTemplate_Ripple,
[FLDEFFGFX_06] = &gUnknown_83A54E4, [FLDEFFOBJ_ASH] = &gFieldEffectObjectTemplate_Ash,
[FLDEFFGFX_07] = &gUnknown_83A556C, [FLDEFFOBJ_SURF_BLOB] = &gFieldEffectObjectTemplate_SurfBlob,
[FLDEFFGFX_08] = &gUnknown_83A5604, [FLDEFFOBJ_ARROW] = &gFieldEffectObjectTemplate_Arrow,
[FLDEFFGFX_09] = &gUnknown_83A5648, [FLDEFFOBJ_GROUND_IMPACT_DUST] = &gFieldEffectObjectTemplate_GroundImpactDust,
[FLDEFFGFX_10] = &gUnknown_83A5698, [FLDEFFOBJ_JUMP_TALL_GRASS] = &gFieldEffectObjectTemplate_JumpTallGrass,
[FLDEFFGFX_11] = &gUnknown_83A56F4, [FLDEFFOBJ_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_SandFootprints,
[FLDEFFGFX_12] = &gUnknown_83A583C, [FLDEFFOBJ_JUMP_BIG_SPLASH] = &gFieldEffectObjectTemplate_JumpBigSplash,
[FLDEFFGFX_13] = &gUnknown_83A589C, [FLDEFFOBJ_SPLASH] = &gFieldEffectObjectTemplate_Splash,
[FLDEFFGFX_14] = &gUnknown_83A58E0, [FLDEFFOBJ_JUMP_SMALL_SPLASH] = &gFieldEffectObjectTemplate_JumpSmallSplash,
[FLDEFFGFX_15] = &gUnknown_83A593C, [FLDEFFOBJ_LONG_GRASS] = &gFieldEffectObjectTemplate_LongGrass,
[FLDEFFGFX_16] = &gUnknown_83A59A4, [FLDEFFOBJ_JUMP_LONG_GRASS] = &gFieldEffectObjectTemplate_JumpLongGrass,
[FLDEFFGFX_17] = &gUnknown_83A5A30, [FLDEFFOBJ_UNUSED_GRASS] = &gFieldEffectObjectTemplate_UnusedGrass,
[FLDEFFGFX_18] = &gUnknown_83A5A88, [FLDEFFOBJ_UNUSED_GRASS_2] = &gFieldEffectObjectTemplate_UnusedGrass2,
[FLDEFFGFX_19] = &gUnknown_83A5AD8, [FLDEFFOBJ_UNUSED_SAND] = &gFieldEffectObjectTemplate_UnusedSand,
[FLDEFFGFX_20] = &gUnknown_83A5B74, [FLDEFFOBJ_WATER_SURFACING] = &gFieldEffectObjectTemplate_WaterSurfacing,
[FLDEFFGFX_REFLECTION] = &gUnknown_83A5C34, [FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion,
[FLDEFFGFX_22] = NULL, [FLDEFFOBJ_SPARKLE] = gFieldEffectObjectTemplate_Sparkle,
[FLDEFFGFX_23] = &gUnknown_83A5750, [FLDEFFOBJ_DEEP_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_DeepSandFootprints,
[FLDEFFGFX_24] = &gUnknown_83A5CB4, [FLDEFFOBJ_TREE_DISGUISE] = &gFieldEffectObjectTemplate_TreeDisguise,
[FLDEFFGFX_25] = &gUnknown_83A5D34, [FLDEFFOBJ_MOUNTAIN_DISGUISE] = &gFieldEffectObjectTemplate_MountainDisguise,
[FLDEFFGFX_FLY_BLOB] = &gUnknown_83A5E00, [FLDEFFOBJ_BIRD] = &gFieldEffectObjectTemplate_Bird,
[FLDEFFGFX_27] = &gUnknown_83A57EC, [FLDEFFOBJ_BIKE_TIRE_TRACKS] = &gFieldEffectObjectTemplate_BikeTireTracks,
[FLDEFFGFX_28] = &gUnknown_83A5D84, [FLDEFFOBJ_SAND_DISGUISE] = &gFieldEffectObjectTemplate_SandDisguisePlaceholder,
[FLDEFFGFX_29] = &gUnknown_83A5B1C, [FLDEFFOBJ_SAND_PILE] = &gFieldEffectObjectTemplate_SandPile,
[FLDEFFGFX_30] = &gUnknown_83A5E38, [FLDEFFOBJ_SHORT_GRASS] = &gFieldEffectObjectTemplate_ShortGrass,
[FLDEFFGFX_31] = &gUnknown_83A5E64, [FLDEFFOBJ_HOT_SPRINGS_WATER] = &gFieldEffectObjectTemplate_HotSpringsWater,
[FLDEFFGFX_32] = &gUnknown_83A5EC0, [FLDEFFOBJ_ASH_PUFF] = &gFieldEffectObjectTemplate_AshPuff,
[FLDEFFGFX_33] = &gUnknown_83A5F24, [FLDEFFOBJ_ASH_LAUNCH] = &gFieldEffectObjectTemplate_AshLaunch,
[FLDEFFGFX_34] = &gUnknown_83A5FA4, [FLDEFFOBJ_BUBBLES] = &gFieldEffectObjectTemplate_Bubbles,
[FLDEFFGFX_35] = &gUnknown_83A5FE0, [FLDEFFOBJ_SMALL_SPARKLE] = &gFieldEffectObjectTemplate_SmallSparkle,
}; };
src/data/field_effects/field_effect_objects.h
+35 -35
View File
@@ -17,7 +17,7 @@ const struct SpriteFrameImage gSpriteFrameImage_FieldShadowM[] = {obj_frame_tile
const struct SpriteFrameImage gSpriteFrameImage_FieldShadowL[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowL) }; const struct SpriteFrameImage gSpriteFrameImage_FieldShadowL[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowL) };
const struct SpriteFrameImage gSpriteFrameImage_FieldShadowXL[] = { obj_frame_tiles(gSpriteImageGfx_FieldShadowXL) }; const struct SpriteFrameImage gSpriteFrameImage_FieldShadowXL[] = { obj_frame_tiles(gSpriteImageGfx_FieldShadowXL) };
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS = const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -28,7 +28,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS =
.callback = UpdateShadowFieldEffect, .callback = UpdateShadowFieldEffect,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM = const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -39,7 +39,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM =
.callback = UpdateShadowFieldEffect, .callback = UpdateShadowFieldEffect,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL = const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -50,7 +50,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL =
.callback = UpdateShadowFieldEffect, .callback = UpdateShadowFieldEffect,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowXL = const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -85,7 +85,7 @@ const union AnimCmd *const gUnknown_83A541C[] =
gUnknown_83A5404, gUnknown_83A5404,
}; };
const struct SpriteTemplate gUnknown_83A5420 = const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -123,7 +123,7 @@ const union AnimCmd *const gUnknown_83A5484[] =
gUnknown_83A5460, gUnknown_83A5460,
}; };
const struct SpriteTemplate gUnknown_83A5488 = const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -158,7 +158,7 @@ const union AnimCmd *const gUnknown_83A54E0[] =
gUnknown_83A54C8, gUnknown_83A54C8,
}; };
const struct SpriteTemplate gUnknown_83A54E4 = const struct SpriteTemplate gFieldEffectObjectTemplate_Ash =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -215,7 +215,7 @@ const union AnimCmd *const gUnknown_83A555C[] =
gUnknown_83A5550, gUnknown_83A5550,
}; };
const struct SpriteTemplate gUnknown_83A556C = const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -274,7 +274,7 @@ const union AnimCmd *const gUnknown_83A55F4[] =
gUnknown_83A55E8, gUnknown_83A55E8,
}; };
const struct SpriteTemplate gUnknown_83A5604 = const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -305,7 +305,7 @@ const union AnimCmd *const gUnknown_83A5644[] =
gUnknown_83A5634, gUnknown_83A5634,
}; };
const struct SpriteTemplate gUnknown_83A5648 = const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -338,7 +338,7 @@ const union AnimCmd *const gUnknown_83A5694[] =
gUnknown_83A5680, gUnknown_83A5680,
}; };
const struct SpriteTemplate gUnknown_83A5698 = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -388,7 +388,7 @@ const union AnimCmd *const gUnknown_83A56E0[] =
gUnknown_83A56D8, gUnknown_83A56D8,
}; };
const struct SpriteTemplate gUnknown_83A56F4 = const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -438,7 +438,7 @@ const union AnimCmd *const gUnknown_83A573C[] =
gUnknown_83A5734, gUnknown_83A5734,
}; };
const struct SpriteTemplate gUnknown_83A5750 = const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -518,7 +518,7 @@ const union AnimCmd *const gUnknown_83A57C8[] =
gUnknown_83A57C0, gUnknown_83A57C0,
}; };
const struct SpriteTemplate gUnknown_83A57EC = const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -551,7 +551,7 @@ const union AnimCmd *const gUnknown_83A5838[] =
gUnknown_83A5824, gUnknown_83A5824,
}; };
const struct SpriteTemplate gUnknown_83A583C = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -594,7 +594,7 @@ const union AnimCmd *const gUnknown_83A5894[] =
gUnknown_83A5870, gUnknown_83A5870,
}; };
const struct SpriteTemplate gUnknown_83A589C = const struct SpriteTemplate gFieldEffectObjectTemplate_Splash =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -625,7 +625,7 @@ const union AnimCmd *const gUnknown_83A58DC[] =
gUnknown_83A58CC, gUnknown_83A58CC,
}; };
const struct SpriteTemplate gUnknown_83A58E0 = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -661,7 +661,7 @@ const union AnimCmd *const gUnknown_83A5938[] =
gUnknown_83A5918, gUnknown_83A5918,
}; };
const struct SpriteTemplate gUnknown_83A593C = const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -698,7 +698,7 @@ const union AnimCmd *const gUnknown_83A59A0[] =
gUnknown_83A5984, gUnknown_83A5984,
}; };
const struct SpriteTemplate gUnknown_83A59A4 = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -741,7 +741,7 @@ const union AnimCmd *const gUnknown_83A5A2C[] =
gUnknown_83A5A04, gUnknown_83A5A04,
}; };
const struct SpriteTemplate gUnknown_83A5A30 = const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -776,7 +776,7 @@ const union AnimCmd *const gUnknown_83A5A84[] =
gUnknown_83A5A68, gUnknown_83A5A68,
}; };
const struct SpriteTemplate gUnknown_83A5A88 = const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -809,7 +809,7 @@ const union AnimCmd *const gUnknown_83A5AD4[] =
gUnknown_83A5AC0, gUnknown_83A5AC0,
}; };
const struct SpriteTemplate gUnknown_83A5AD8 = const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -840,7 +840,7 @@ const union AnimCmd *const gUnknown_83A5B18[] =
gUnknown_83A5B08, gUnknown_83A5B08,
}; };
const struct SpriteTemplate gUnknown_83A5B1C = const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -875,7 +875,7 @@ const union AnimCmd *const gUnknown_83A5B70[] =
gUnknown_83A5B54, gUnknown_83A5B54,
}; };
const struct SpriteTemplate gUnknown_83A5B74 = const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -920,7 +920,7 @@ const union AffineAnimCmd *const gUnknown_83A5C2C[] =
gUnknown_83A5BDC, gUnknown_83A5BDC,
}; };
const struct SpriteTemplate gUnknown_83A5C34 = const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion =
{ {
.tileTag = 0x0, .tileTag = 0x0,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -966,7 +966,7 @@ const union AnimCmd *const gUnknown_83A5CAC[] =
gUnknown_83A5C8C, gUnknown_83A5C8C,
}; };
const struct SpriteTemplate gUnknown_83A5CB4 = const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -1012,7 +1012,7 @@ const union AnimCmd *const gUnknown_83A5D2C[] =
gUnknown_83A5D0C, gUnknown_83A5D0C,
}; };
const struct SpriteTemplate gUnknown_83A5D34 = const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -1034,7 +1034,7 @@ const struct SpriteFrameImage gUnknown_83A5D4C[] =
overworld_frame(gUnknown_839BE08, 2, 4, 6), overworld_frame(gUnknown_839BE08, 2, 4, 6),
}; };
const struct SpriteTemplate gUnknown_83A5D84 = const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -1093,7 +1093,7 @@ const union AnimCmd *const gUnknown_83A5DEC[] =
gUnknown_83A5DE4, gUnknown_83A5DE4,
}; };
const struct SpriteTemplate gUnknown_83A5E00 = const struct SpriteTemplate gFieldEffectObjectTemplate_Bird =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,
@@ -1122,7 +1122,7 @@ const union AnimCmd *const gUnknown_83A5E34[] =
gUnknown_83A5E28, gUnknown_83A5E28,
}; };
const struct SpriteTemplate gUnknown_83A5E38 = const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -1149,7 +1149,7 @@ const union AnimCmd *const gUnknown_83A5E60[] =
gUnknown_83A5E58, gUnknown_83A5E58,
}; };
const struct SpriteTemplate gUnknown_83A5E64 = const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1005, .paletteTag = 0x1005,
@@ -1184,7 +1184,7 @@ const union AnimCmd *const gUnknown_83A5EBC[] =
gUnknown_83A5EA4, gUnknown_83A5EA4,
}; };
const struct SpriteTemplate gUnknown_83A5EC0 = const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x100D, .paletteTag = 0x100D,
@@ -1221,7 +1221,7 @@ const union AnimCmd *const gUnknown_83A5F20[] =
gUnknown_83A5F08, gUnknown_83A5F08,
}; };
const struct SpriteTemplate gUnknown_83A5F24 = const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x100D, .paletteTag = 0x100D,
@@ -1262,7 +1262,7 @@ const union AnimCmd *const gUnknown_83A5FA0[] =
gUnknown_83A5F7C, gUnknown_83A5F7C,
}; };
const struct SpriteTemplate gUnknown_83A5FA4 = const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1004, .paletteTag = 0x1004,
@@ -1292,7 +1292,7 @@ const union AnimCmd *const gUnknown_83A5FDC[] =
gUnknown_83A5FCC, gUnknown_83A5FCC,
}; };
const struct SpriteTemplate gUnknown_83A5FE0 = const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x100F, .paletteTag = 0x100F,
src/data/object_events/object_event_graphics.h
+1
View File
@@ -199,6 +199,7 @@ const u32 gUnknown_8398928[] = INCBIN_U32("graphics/object_events/pics/unknown/8
const u32 gUnknown_8398BA8[] = INCBIN_U32("graphics/object_events/pics/unknown/8398BA8.4bpp"); const u32 gUnknown_8398BA8[] = INCBIN_U32("graphics/object_events/pics/unknown/8398BA8.4bpp");
const u16 gUnknown_8398FA8[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); const u16 gUnknown_8398FA8[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal");
const u16 gUnknown_8398FC8[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); const u16 gUnknown_8398FC8[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal");
const u16 filler_8398FE8[16] = {0};
const u32 gUnknown_8399008[] = INCBIN_U32("graphics/object_events/pics/unknown/8399008.4bpp"); const u32 gUnknown_8399008[] = INCBIN_U32("graphics/object_events/pics/unknown/8399008.4bpp");
const u32 gUnknown_83990C8[] = INCBIN_U32("graphics/object_events/pics/unknown/83990C8.4bpp"); const u32 gUnknown_83990C8[] = INCBIN_U32("graphics/object_events/pics/unknown/83990C8.4bpp");
const u32 gUnknown_8399188[] = INCBIN_U32("graphics/object_events/pics/unknown/8399188.4bpp"); const u32 gUnknown_8399188[] = INCBIN_U32("graphics/object_events/pics/unknown/8399188.4bpp");
src/event_object_movement.c
+2 -2
View File
@@ -1243,13 +1243,13 @@ void ResetObjectEvents(void)
static void CreateReflectionEffectSprites(void) static void CreateReflectionEffectSprites(void)
{ {
u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_REFLECTION], 0, 0, 31); u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_REFLECTION_DISTORTION], 0, 0, 31);
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
InitSpriteAffineAnim(&gSprites[spriteId]); InitSpriteAffineAnim(&gSprites[spriteId]);
StartSpriteAffineAnim(&gSprites[spriteId], 0); StartSpriteAffineAnim(&gSprites[spriteId], 0);
gSprites[spriteId].invisible = TRUE; gSprites[spriteId].invisible = TRUE;
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_REFLECTION], 0, 0, 31); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_REFLECTION_DISTORTION], 0, 0, 31);
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
InitSpriteAffineAnim(&gSprites[spriteId]); InitSpriteAffineAnim(&gSprites[spriteId]);
StartSpriteAffineAnim(&gSprites[spriteId], 1); StartSpriteAffineAnim(&gSprites[spriteId], 1);
src/field_effect.c
+4 -4
View File
@@ -1903,7 +1903,7 @@ u8 FldEff_LavaridgeGymWarp(void)
{ {
u8 spriteId; u8 spriteId;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH_LAUNCH], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
gSprites[spriteId].coordOffsetEnabled = TRUE; gSprites[spriteId].coordOffsetEnabled = TRUE;
return spriteId; return spriteId;
@@ -1996,7 +1996,7 @@ u8 FldEff_PopOutOfAsh(void)
{ {
u8 spriteId; u8 spriteId;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH_PUFF], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
gSprites[spriteId].coordOffsetEnabled = TRUE; gSprites[spriteId].coordOffsetEnabled = TRUE;
return spriteId; return spriteId;
@@ -3048,7 +3048,7 @@ static void sub_8086D94(struct Sprite * sprite);
u8 FldEff_NpcFlyOut(void) u8 FldEff_NpcFlyOut(void)
{ {
u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0x78, 0, 1); u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0x78, 0, 1);
struct Sprite * sprite = &gSprites[spriteId]; struct Sprite * sprite = &gSprites[spriteId];
sprite->oam.paletteNum = 0; sprite->oam.paletteNum = 0;
@@ -3239,7 +3239,7 @@ static u8 sub_8087168(void)
{ {
u8 spriteId; u8 spriteId;
struct Sprite * sprite; struct Sprite * sprite;
spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0xff, 0xb4, 0x1); spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0xff, 0xb4, 0x1);
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->oam.paletteNum = 0; sprite->oam.paletteNum = 0;
sprite->oam.priority = 1; sprite->oam.priority = 1;
src/field_effect_helpers.c
+35 -34
View File
@@ -7,6 +7,7 @@
#include "fieldmap.h" #include "fieldmap.h"
#include "metatile_behavior.h" #include "metatile_behavior.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/event_objects.h"
#include "constants/songs.h" #include "constants/songs.h"
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c #define OBJ_EVENT_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c
@@ -164,7 +165,7 @@ u8 CreateWarpArrowSprite(void)
u8 spriteId; u8 spriteId;
struct Sprite * sprite; struct Sprite * sprite;
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[8], 0, 0, 0x52); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ARROW], 0, 0, 0x52);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -201,17 +202,17 @@ void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y)
} }
const u8 gShadowEffectTemplateIds[] = { const u8 gShadowEffectTemplateIds[] = {
0, [SHADOW_SIZE_S] = FLDEFFOBJ_SHADOW_S,
1, [SHADOW_SIZE_M] = FLDEFFOBJ_SHADOW_M,
2, [SHADOW_SIZE_L] = FLDEFFOBJ_SHADOW_L,
3 [SHADOW_SIZE_XL] = FLDEFFOBJ_SHADOW_XL
}; };
const u16 gShadowVerticalOffsets[] = { const u16 gShadowVerticalOffsets[] = {
4, [SHADOW_SIZE_S] = 4,
4, [SHADOW_SIZE_M] = 4,
4, [SHADOW_SIZE_L] = 4,
16 [SHADOW_SIZE_XL] = 16
}; };
u32 FldEff_Shadow(void) u32 FldEff_Shadow(void)
@@ -273,7 +274,7 @@ u32 FldEff_TallGrass(void)
x = gFieldEffectArguments[0]; x = gFieldEffectArguments[0];
y = gFieldEffectArguments[1]; y = gFieldEffectArguments[1];
sub_8063BC4(&x, &y, 8, 8); sub_8063BC4(&x, &y, 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[4], x, y, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_TALL_GRASS], x, y, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -340,7 +341,7 @@ u32 FldEff_JumpTallGrass(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[10], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_TALL_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -380,7 +381,7 @@ u32 FldEff_LongGrass(void)
x = gFieldEffectArguments[0]; x = gFieldEffectArguments[0];
y = gFieldEffectArguments[1]; y = gFieldEffectArguments[1];
sub_8063BC4(&x, &y, 8, 8); sub_8063BC4(&x, &y, 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_LONG_GRASS], x, y, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -443,7 +444,7 @@ u32 FldEff_JumpLongGrass(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[16], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_LONG_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -464,7 +465,7 @@ u32 FldEff_ShortGrass(void)
objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
objectEvent = &gObjectEvents[objectEventId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SHORT_GRASS], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &(gSprites[spriteId]); sprite = &(gSprites[spriteId]);
@@ -521,7 +522,7 @@ u32 FldEff_SandFootprints(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[11], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SAND_FOOTPRINTS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -539,7 +540,7 @@ u32 FldEff_DeepSandFootprints(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[23], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_DEEP_SAND_FOOTPRINTS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -557,7 +558,7 @@ u32 FldEff_BikeTireTracks(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[27], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIKE_TIRE_TRACKS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -610,7 +611,7 @@ u32 FldEff_Splash(void)
objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
objectEvent = &gObjectEvents[objectEventId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPLASH], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
@@ -649,7 +650,7 @@ u32 FldEff_JumpSmallSplash(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[14], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_SMALL_SPLASH], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -667,7 +668,7 @@ u32 FldEff_JumpBigSplash(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[12], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_BIG_SPLASH], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -689,7 +690,7 @@ u32 FldEff_FeetInFlowingWater(void)
objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
objectEvent = &gObjectEvents[objectEventId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPLASH], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
@@ -743,7 +744,7 @@ u32 FldEff_Ripple(void)
u8 spriteId; u8 spriteId;
struct Sprite * sprite; struct Sprite * sprite;
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[5], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_RIPPLE], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -763,7 +764,7 @@ u32 FldEff_HotSpringsWater(void)
objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
objectEvent = &gObjectEvents[objectEventId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_HOT_SPRINGS_WATER], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -805,7 +806,7 @@ u32 FldEff_Unknown19(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[17], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -822,7 +823,7 @@ u32 FldEff_Unknown20(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[18], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS_2], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -839,7 +840,7 @@ u32 FldEff_Unknown21(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[19], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_SAND], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -856,7 +857,7 @@ u32 FldEff_Unknown22(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[20], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_WATER_SURFACING], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -888,7 +889,7 @@ u32 FldEff_Ash(void)
x = gFieldEffectArguments[0]; x = gFieldEffectArguments[0];
y = gFieldEffectArguments[1]; y = gFieldEffectArguments[1];
sub_8063BC4(&x, &y, 8, 8); sub_8063BC4(&x, &y, 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[6], x, y, gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH], x, y, gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -944,7 +945,7 @@ u32 FldEff_SurfBlob(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[7], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x96); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SURF_BLOB], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x96);
if (spriteId !=MAX_SPRITES) if (spriteId !=MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -1104,7 +1105,7 @@ u32 FldEff_Dust(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[9], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_GROUND_IMPACT_DUST], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -1126,7 +1127,7 @@ u32 FldEff_SandPile(void)
objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
objectEvent = &gObjectEvents[objectEventId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SAND_PILE], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
@@ -1180,7 +1181,7 @@ u32 FldEff_Bubbles(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 0); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 0);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[34], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BUBBLES], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -1208,7 +1209,7 @@ u32 FldEff_BerryTreeGrowthSparkle(void)
struct Sprite * sprite; struct Sprite * sprite;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 4); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 4);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[22], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPARKLE], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
@@ -1328,7 +1329,7 @@ u32 FldEff_Sparkle(void)
gFieldEffectArguments[0] += 7; gFieldEffectArguments[0] += 7;
gFieldEffectArguments[1] += 7; gFieldEffectArguments[1] += 7;
sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[35], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SMALL_SPARKLE], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].oam.priority = gFieldEffectArguments[2]; gSprites[spriteId].oam.priority = gFieldEffectArguments[2];
src/teachy_tv.c
+2 -1
View File
@@ -25,6 +25,7 @@
#include "graphics.h" #include "graphics.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "strings.h" #include "strings.h"
#include "constants/field_effects.h"
struct TeachyTvCtrlBlk struct TeachyTvCtrlBlk
{ {
@@ -1107,7 +1108,7 @@ static void TeachyTvGrassAnimationMain(u8 taskId, s16 x, s16 y, u8 subpriority,
if (sResources->grassAnimDisabled != 1 && TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(x - 0x10, y)) if (sResources->grassAnimDisabled != 1 && TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(x - 0x10, y))
{ {
spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[4], 0, 0, subpriority); spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_TALL_GRASS], 0, 0, subpriority);
obj = &gSprites[spriteId]; obj = &gSprites[spriteId];
obj->pos2.x = x; obj->pos2.x = x;
obj->pos2.y = y + 8; obj->pos2.y = y + 8;