summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rwxr-xr-xsrc/data/field_event_obj/event_object_graphics.h2
-rwxr-xr-xsrc/data/field_event_obj/field_effect_object_template_pointers.h4
-rwxr-xr-xsrc/data/field_event_obj/field_effect_objects.h40
-rw-r--r--src/data/trade.h37
4 files changed, 59 insertions, 24 deletions
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
index f7f1f33ba..1702392ca 100755
--- a/src/data/field_event_obj/event_object_graphics.h
+++ b/src/data/field_event_obj/event_object_graphics.h
@@ -326,7 +326,7 @@ const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics
const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp");
const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal");
const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33.4bpp");
+const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/event_objects/pics/effects/lavaridge_gym_warp.4bpp");
const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp");
const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp");
const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal");
diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/field_event_obj/field_effect_object_template_pointers.h
index 32d2b069a..de39e6db3 100755
--- a/src/data/field_event_obj/field_effect_object_template_pointers.h
+++ b/src/data/field_event_obj/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,
diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
index a3944de36..d28357765 100755
--- a/src/data/field_event_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -892,19 +892,28 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] =
gFieldEffectObjectImageAnim_850D54C,
};
-const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC};
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh =
+{
+ .tileTag = 0xFFFF,
+ .paletteTag = 0x100D,
+ .oam = &gEventObjectBaseOam_16x16,
+ .anims = gFieldEffectObjectImageAnimTable_JumpOutOfAsh,
+ .images = gFieldEffectObjectPicTable_JumpOutOfAsh,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCB_PopOutOfAsh
+};
const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown33[] = {
- overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 0),
- overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 1),
- overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 2),
- overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 3),
- overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 4),
+const struct SpriteFrameImage gFieldEffectObjectPicTable_LavaridgeGymWarp[] = {
+ overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 0),
+ overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 1),
+ overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 2),
+ overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 3),
+ overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 4),
};
-const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] =
+const union AnimCmd gFieldEffectObjectImageAnim_LavaridgeGymWarp[] =
{
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 6),
@@ -914,12 +923,21 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] =
ANIMCMD_END,
};
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] =
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_LavaridgeGymWarp[] =
{
- gFieldEffectObjectImageAnim_850D5B0,
+ gFieldEffectObjectImageAnim_LavaridgeGymWarp,
};
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58};
+const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp =
+{
+ .tileTag = 0xFFFF,
+ .paletteTag = 0x100D,
+ .oam = &gEventObjectBaseOam_16x16,
+ .anims = gFieldEffectObjectImageAnimTable_LavaridgeGymWarp,
+ .images = gFieldEffectObjectPicTable_LavaridgeGymWarp,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCB_LavaridgeGymWarp
+};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0),
diff --git a/src/data/trade.h b/src/data/trade.h
index 4ed39f6cd..8601af2a8 100644
--- a/src/data/trade.h
+++ b/src/data/trade.h
@@ -276,48 +276,65 @@ static const u8 sTradeMonSpriteCoords[(PARTY_SIZE * 2) + 1][2] =
{23, 18} // CANCEL
};
-static const u8 sTradeMonLevelCoords[][PARTY_SIZE][2] =
+static const u8 sTradeMonLevelCoords[][2][2] =
{
+ // Your party
{
- // Your party
{5, 4},
{12, 4},
+ },
+ {
{5, 9},
{12, 9},
+ },
+ {
{5, 14},
{12, 14},
},
+ // Friend's party
{
- // Friend's party
+
{20, 4},
{27, 4},
+ },
+ {
{20, 9},
{27, 9},
+ },
+ {
{20, 14},
- {27, 14}
- }
+ {27, 14},
+ },
};
-static const u8 sTradeMonBoxCoords[][PARTY_SIZE][2] =
+static const u8 sTradeMonBoxCoords[][2][2] =
{
+ // Your party
{
- // Your party
{1, 3},
{8, 3},
+ },
+ {
{1, 8},
{8, 8},
+ },
+ {
{1, 13},
{8, 13},
},
+ // Friend's party
{
- // Friend's party
{16, 3},
{23, 3},
+ },
+ {
{16, 8},
{23, 8},
+ },
+ {
{16, 13},
- {23, 13}
- }
+ {23, 13},
+ },
};
static const u8 sUnref_0832DE6E[] =
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 17:22:32 +0000