diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
| commit | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (patch) | |
| tree | 65b32493ea3eaef107ac73f804d23563da0f9ada /src/data/object_event/field_effect_object_template_pointers.h | |
| parent | 949509aade2627ded031669c296453c3d0ea9e59 (diff) | |
| parent | 026e1108b26f4ce5cea362997135bd8efc7cb28a (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'src/data/object_event/field_effect_object_template_pointers.h')
| -rwxr-xr-x | src/data/object_event/field_effect_object_template_pointers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/data/object_event/field_effect_object_template_pointers.h b/src/data/object_event/field_effect_object_template_pointers.h index 32d2b069a..de39e6db3 100755 --- a/src/data/object_event/field_effect_object_template_pointers.h +++ b/src/data/object_event/field_effect_object_template_pointers.h @@ -31,7 +31,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29; const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33; +const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35; const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza; @@ -70,7 +70,7 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { &gFieldEffectObjectTemplate_ShortGrass, &gFieldEffectObjectTemplate_HotSpringsWater, &gFieldEffectObjectTemplate_JumpOutOfAsh, - &gFieldEffectObjectTemplate_Unknown33, + &gFieldEffectObjectTemplate_LavaridgeGymWarp, &gFieldEffectObjectTemplate_Bubbles, &gFieldEffectObjectTemplate_Unknown35, &gFieldEffectObjectTemplate_Rayquaza, |