diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-06 00:45:55 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-06 00:45:55 -0700 |
| commit | be041806e32d0ee1181907e7cf69e8d962113efb (patch) | |
| tree | d8476739d78dc008593d3461873b0c5267fa7ba4 | |
| parent | 9256ea79abbd745e6d0c990e958895b39f98821f (diff) | |
shorten field effect label names
| -rw-r--r-- | data/data2.s | 2 | ||||
| -rw-r--r-- | data/graphics/field_objects/base_oam.s | 16 | ||||
| -rw-r--r-- | data/graphics/field_objects/field_effect_object_graphics.s | 262 | ||||
| -rw-r--r-- | data/graphics/field_objects/field_effect_objects.s | 492 | ||||
| -rw-r--r-- | data/graphics/field_objects/map_object_graphics.s | 18 | ||||
| -rw-r--r-- | data/graphics/field_objects/map_object_graphics_info.s | 436 |
6 files changed, 613 insertions, 613 deletions
diff --git a/data/data2.s b/data/data2.s index 635f717aa..230911678 100644 --- a/data/data2.s +++ b/data/data2.s @@ -7014,7 +7014,7 @@ gSpriteAnimTable_CutGrass:: @ 83C15EC .align 2 gSpriteImageTable_CutGrass:: @ 83C15F0 - obj_frame_tiles gFieldEffectObjectPic_CutGrass, 0x20 + obj_frame_tiles gFieldEffectPic_CutGrass, 0x20 .align 2 gFieldEffectObjectPaletteInfo6:: @ 83C15F8 diff --git a/data/graphics/field_objects/base_oam.s b/data/graphics/field_objects/base_oam.s index 9fccf9ae9..88a8ed058 100644 --- a/data/graphics/field_objects/base_oam.s +++ b/data/graphics/field_objects/base_oam.s @@ -1,47 +1,47 @@ .align 2 -gFieldObjectBaseOam_8x8: @ 83711C4 +gFieldOamData_8x8: @ 83711C4 .4byte OAM_SIZE_8x8 .2byte 2 << 10 @ priority .align 2 -gFieldObjectBaseOam_16x8: @ 83711CC +gFieldOamData_16x8: @ 83711CC .4byte OAM_SIZE_16x8 .2byte 2 << 10 @ priority .align 2 -gFieldObjectBaseOam_16x16: @ 83711D4 +gFieldOamData_16x16: @ 83711D4 .4byte OAM_SIZE_16x16 .2byte 2 << 10 @ priority .align 2 -gFieldObjectBaseOam_32x8: @ 83711DC +gFieldOamData_32x8: @ 83711DC .4byte OAM_SIZE_32x8 .2byte 2 << 10 @ priority .align 2 -gFieldObjectBaseOam_64x32: @ 83711E4 +gFieldOamData_64x32: @ 83711E4 .4byte OAM_SIZE_64x32 .2byte 2 << 10 @ priority .align 2 -gFieldObjectBaseOam_16x32: @ 83711EC +gFieldOamData_16x32: @ 83711EC .4byte OAM_SIZE_16x32 .2byte 2 << 10 @ priority .align 2 -gFieldObjectBaseOam_32x32: @ 83711F4 +gFieldOamData_32x32: @ 83711F4 .4byte OAM_SIZE_32x32 .2byte 2 << 10 @ priority .align 2 -gFieldObjectBaseOam_64x64: @ 83711FC +gFieldOamData_64x64: @ 83711FC .4byte OAM_SIZE_64x64 .2byte 2 << 10 @ priority diff --git a/data/graphics/field_objects/field_effect_object_graphics.s b/data/graphics/field_objects/field_effect_object_graphics.s index 9c9fc79dd..ec3b89526 100644 --- a/data/graphics/field_objects/field_effect_object_graphics.s +++ b/data/graphics/field_objects/field_effect_object_graphics.s @@ -1,24 +1,24 @@ .align 2 -gFieldEffectObjectPic_ShadowSmall: @ 8368528 +gFieldEffectPic_ShadowSmall: @ 8368528 .incbin "graphics/field_effect_objects/pics/shadow_small.4bpp" .align 2 -gFieldEffectObjectPic_ShadowMedium: @ 8368548 +gFieldEffectPic_ShadowMedium: @ 8368548 .incbin "graphics/field_effect_objects/pics/shadow_medium.4bpp" .align 2 -gFieldEffectObjectPic_ShadowLarge: @ 8368588 +gFieldEffectPic_ShadowLarge: @ 8368588 .incbin "graphics/field_effect_objects/pics/shadow_large.4bpp" .align 2 -gFieldEffectObjectPic_ShadowExtraLarge: @ 8368608 +gFieldEffectPic_ShadowExtraLarge: @ 8368608 .incbin "graphics/field_effect_objects/pics/shadow_extra_large.4bpp" .align 2 .space 0x120 .align 2 -gFieldEffectObjectPic_CutGrass: @ 8368B28 +gFieldEffectPic_CutGrass: @ 8368B28 .incbin "graphics/field_effect_objects/pics/cut_grass.4bpp" .incbin "graphics/field_effect_objects/pics/cut_grass.4bpp" @ included twice @@ -27,75 +27,75 @@ gFieldEffectObjectPalette6: @ 8368B68 .incbin "graphics/field_effect_objects/palettes/06.gbapal" .align 2 -gFieldEffectObjectPic_Ripple_0: @ 8368B88 +gFieldEffectPic_Ripple_0: @ 8368B88 .incbin "graphics/field_effect_objects/pics/ripple/0.4bpp" .align 2 -gFieldEffectObjectPic_Ripple_1: @ 8368C08 +gFieldEffectPic_Ripple_1: @ 8368C08 .incbin "graphics/field_effect_objects/pics/ripple/1.4bpp" .align 2 -gFieldEffectObjectPic_Ripple_2: @ 8368C88 +gFieldEffectPic_Ripple_2: @ 8368C88 .incbin "graphics/field_effect_objects/pics/ripple/2.4bpp" .align 2 -gFieldEffectObjectPic_Ripple_3: @ 8368D08 +gFieldEffectPic_Ripple_3: @ 8368D08 .incbin "graphics/field_effect_objects/pics/ripple/3.4bpp" .align 2 -gFieldEffectObjectPic_Ripple_4: @ 8368D88 +gFieldEffectPic_Ripple_4: @ 8368D88 .incbin "graphics/field_effect_objects/pics/ripple/4.4bpp" .align 2 -gFieldEffectObjectPic_Ash_0: @ 8368E08 +gFieldEffectPic_Ash_0: @ 8368E08 .incbin "graphics/field_effect_objects/pics/ash/0.4bpp" .align 2 -gFieldEffectObjectPic_Ash_1: @ 8368E88 +gFieldEffectPic_Ash_1: @ 8368E88 .incbin "graphics/field_effect_objects/pics/ash/1.4bpp" .align 2 -gFieldEffectObjectPic_Ash_2: @ 8368F08 +gFieldEffectPic_Ash_2: @ 8368F08 .incbin "graphics/field_effect_objects/pics/ash/2.4bpp" .align 2 -gFieldEffectObjectPic_Ash_3: @ 8368F88 +gFieldEffectPic_Ash_3: @ 8368F88 .incbin "graphics/field_effect_objects/pics/ash/3.4bpp" .align 2 -gFieldEffectObjectPic_Ash_4: @ 8369008 +gFieldEffectPic_Ash_4: @ 8369008 .incbin "graphics/field_effect_objects/pics/ash/4.4bpp" .align 2 -gFieldEffectObjectPic_Arrow_0: @ 8369088 +gFieldEffectPic_Arrow_0: @ 8369088 .incbin "graphics/field_effect_objects/pics/arrow/0.4bpp" .align 2 -gFieldEffectObjectPic_Arrow_1: @ 8369108 +gFieldEffectPic_Arrow_1: @ 8369108 .incbin "graphics/field_effect_objects/pics/arrow/1.4bpp" .align 2 -gFieldEffectObjectPic_Arrow_2: @ 8369188 +gFieldEffectPic_Arrow_2: @ 8369188 .incbin "graphics/field_effect_objects/pics/arrow/2.4bpp" .align 2 -gFieldEffectObjectPic_Arrow_3: @ 8369208 +gFieldEffectPic_Arrow_3: @ 8369208 .incbin "graphics/field_effect_objects/pics/arrow/3.4bpp" .align 2 -gFieldEffectObjectPic_Arrow_4: @ 8369288 +gFieldEffectPic_Arrow_4: @ 8369288 .incbin "graphics/field_effect_objects/pics/arrow/4.4bpp" .align 2 -gFieldEffectObjectPic_Arrow_5: @ 8369308 +gFieldEffectPic_Arrow_5: @ 8369308 .incbin "graphics/field_effect_objects/pics/arrow/5.4bpp" .align 2 -gFieldEffectObjectPic_Arrow_6: @ 8369388 +gFieldEffectPic_Arrow_6: @ 8369388 .incbin "graphics/field_effect_objects/pics/arrow/6.4bpp" .align 2 -gFieldEffectObjectPic_Arrow_7: @ 8369408 +gFieldEffectPic_Arrow_7: @ 8369408 .incbin "graphics/field_effect_objects/pics/arrow/7.4bpp" .align 2 @@ -107,33 +107,33 @@ gFieldEffectObjectPalette1: @ 83694A8 .incbin "graphics/field_effect_objects/palettes/01.gbapal" .align 2 -gFieldEffectObjectPic_Dust_0: @ 83694C8 +gFieldEffectPic_Dust_0: @ 83694C8 .incbin "graphics/field_effect_objects/pics/dust/0.4bpp" .align 2 -gFieldEffectObjectPic_Dust_1: @ 8369508 +gFieldEffectPic_Dust_1: @ 8369508 .incbin "graphics/field_effect_objects/pics/dust/1.4bpp" .align 2 -gFieldEffectObjectPic_Dust_2: @ 8369548 +gFieldEffectPic_Dust_2: @ 8369548 .incbin "graphics/field_effect_objects/pics/dust/2.4bpp" .incbin "graphics/field_effect_objects/unknown.bin" .align 2 -gFieldEffectObjectPic_JumpTallGrass_0: @ 8369648 +gFieldEffectPic_JumpTallGrass_0: @ 8369648 .incbin "graphics/field_effect_objects/pics/jump_tall_grass/0.4bpp" .align 2 -gFieldEffectObjectPic_JumpTallGrass_1: @ 8369688 +gFieldEffectPic_JumpTallGrass_1: @ 8369688 .incbin "graphics/field_effect_objects/pics/jump_tall_grass/1.4bpp" .align 2 -gFieldEffectObjectPic_JumpTallGrass_2: @ 83696C8 +gFieldEffectPic_JumpTallGrass_2: @ 83696C8 .incbin "graphics/field_effect_objects/pics/jump_tall_grass/2.4bpp" .align 2 -gFieldEffectObjectPic_JumpTallGrass_3: @ 8369708 +gFieldEffectPic_JumpTallGrass_3: @ 8369708 .incbin "graphics/field_effect_objects/pics/jump_tall_grass/3.4bpp" .incbin "graphics/field_effect_objects/pics/unused_grass/0.4bpp" @@ -142,325 +142,325 @@ gFieldEffectObjectPic_JumpTallGrass_3: @ 8369708 .incbin "graphics/field_effect_objects/pics/unused_grass/3.4bpp" .align 2 -gFieldEffectObjectPic_JumpLongGrass_0: @ 8369948 +gFieldEffectPic_JumpLongGrass_0: @ 8369948 .incbin "graphics/field_effect_objects/pics/jump_long_grass/0.4bpp" .align 2 -gFieldEffectObjectPic_JumpLongGrass_1: @ 83699C8 +gFieldEffectPic_JumpLongGrass_1: @ 83699C8 .incbin "graphics/field_effect_objects/pics/jump_long_grass/1.4bpp" .align 2 -gFieldEffectObjectPic_JumpLongGrass_2: @ 8369A48 +gFieldEffectPic_JumpLongGrass_2: @ 8369A48 .incbin "graphics/field_effect_objects/pics/jump_long_grass/2.4bpp" .align 2 -gFieldEffectObjectPic_JumpLongGrass_3: @ 8369AC8 +gFieldEffectPic_JumpLongGrass_3: @ 8369AC8 .incbin "graphics/field_effect_objects/pics/jump_long_grass/3.4bpp" .align 2 -gFieldEffectObjectPic_JumpLongGrass_4: @ 8369B48 +gFieldEffectPic_JumpLongGrass_4: @ 8369B48 .incbin "graphics/field_effect_objects/pics/jump_long_grass/4.4bpp" .incbin "graphics/field_effect_objects/pics/jump_long_grass/unused.4bpp" .align 2 -gFieldEffectObjectPic_JumpLongGrass_5: @ 8369C48 +gFieldEffectPic_JumpLongGrass_5: @ 8369C48 .incbin "graphics/field_effect_objects/pics/jump_long_grass/5.4bpp" .align 2 -gFieldEffectObjectPic_Unknown17_0: @ 8369CC8 +gFieldEffectPic_Unknown17_0: @ 8369CC8 .incbin "graphics/field_effect_objects/pics/unknown_17/0.4bpp" .align 2 -gFieldEffectObjectPic_Unknown17_1: @ 8369D48 +gFieldEffectPic_Unknown17_1: @ 8369D48 .incbin "graphics/field_effect_objects/pics/unknown_17/1.4bpp" .align 2 -gFieldEffectObjectPic_Unknown17_2: @ 8369DC8 +gFieldEffectPic_Unknown17_2: @ 8369DC8 .incbin "graphics/field_effect_objects/pics/unknown_17/2.4bpp" .align 2 -gFieldEffectObjectPic_Unknown17_3: @ 8369E48 +gFieldEffectPic_Unknown17_3: @ 8369E48 .incbin "graphics/field_effect_objects/pics/unknown_17/3.4bpp" .align 2 -gFieldEffectObjectPic_Unknown17_4: @ 8369EC8 +gFieldEffectPic_Unknown17_4: @ 8369EC8 .incbin "graphics/field_effect_objects/pics/unknown_17/4.4bpp" .align 2 -gFieldEffectObjectPic_Unknown17_5: @ 8369F48 +gFieldEffectPic_Unknown17_5: @ 8369F48 .incbin "graphics/field_effect_objects/pics/unknown_17/5.4bpp" .align 2 -gFieldEffectObjectPic_Unknown17_6: @ 8369FC8 +gFieldEffectPic_Unknown17_6: @ 8369FC8 .incbin "graphics/field_effect_objects/pics/unknown_17/6.4bpp" .align 2 -gFieldEffectObjectPic_Unknown17_7: @ 836A048 +gFieldEffectPic_Unknown17_7: @ 836A048 .incbin "graphics/field_effect_objects/pics/unknown_17/7.4bpp" .align 2 -gFieldEffectObjectPic_Unknown18_0: @ 836A0C8 +gFieldEffectPic_Unknown18_0: @ 836A0C8 .incbin "graphics/field_effect_objects/pics/unknown_18/0.4bpp" .align 2 -gFieldEffectObjectPic_Unknown18_1: @ 836A148 +gFieldEffectPic_Unknown18_1: @ 836A148 .incbin "graphics/field_effect_objects/pics/unknown_18/1.4bpp" .align 2 -gFieldEffectObjectPic_Unknown18_2: @ 836A1C8 +gFieldEffectPic_Unknown18_2: @ 836A1C8 .incbin "graphics/field_effect_objects/pics/unknown_18/2.4bpp" .align 2 -gFieldEffectObjectPic_Unknown18_3: @ 836A248 +gFieldEffectPic_Unknown18_3: @ 836A248 .incbin "graphics/field_effect_objects/pics/unknown_18/3.4bpp" .align 2 -gFieldEffectObjectPic_LongGrass_0: @ 836A2C8 +gFieldEffectPic_LongGrass_0: @ 836A2C8 .incbin "graphics/field_effect_objects/pics/long_grass/0.4bpp" .align 2 -gFieldEffectObjectPic_LongGrass_1: @ 836A348 +gFieldEffectPic_LongGrass_1: @ 836A348 .incbin "graphics/field_effect_objects/pics/long_grass/1.4bpp" .align 2 -gFieldEffectObjectPic_LongGrass_2: @ 836A3C8 +gFieldEffectPic_LongGrass_2: @ 836A3C8 .incbin "graphics/field_effect_objects/pics/long_grass/2.4bpp" .align 2 -gFieldEffectObjectPic_LongGrass_3: @ 836A448 +gFieldEffectPic_LongGrass_3: @ 836A448 .incbin "graphics/field_effect_objects/pics/long_grass/3.4bpp" .align 2 -gFieldEffectObjectPic_TallGrass_0: @ 836A4C8 +gFieldEffectPic_TallGrass_0: @ 836A4C8 .incbin "graphics/field_effect_objects/pics/tall_grass/0.4bpp" .align 2 -gFieldEffectObjectPic_TallGrass_1: @ 836A548 +gFieldEffectPic_TallGrass_1: @ 836A548 .incbin "graphics/field_effect_objects/pics/tall_grass/1.4bpp" .align 2 -gFieldEffectObjectPic_TallGrass_2: @ 836A5C8 +gFieldEffectPic_TallGrass_2: @ 836A5C8 .incbin "graphics/field_effect_objects/pics/tall_grass/2.4bpp" .align 2 -gFieldEffectObjectPic_TallGrass_3: @ 836A648 +gFieldEffectPic_TallGrass_3: @ 836A648 .incbin "graphics/field_effect_objects/pics/tall_grass/3.4bpp" .align 2 -gFieldEffectObjectPic_TallGrass_4: @ 836A6C8 +gFieldEffectPic_TallGrass_4: @ 836A6C8 .incbin "graphics/field_effect_objects/pics/tall_grass/4.4bpp" .align 2 -gFieldEffectObjectPic_ShortGrass_0: @ 836A748 +gFieldEffectPic_ShortGrass_0: @ 836A748 .incbin "graphics/field_effect_objects/pics/short_grass/0.4bpp" .align 2 -gFieldEffectObjectPic_ShortGrass_1: @ 836A7C8 +gFieldEffectPic_ShortGrass_1: @ 836A7C8 .incbin "graphics/field_effect_objects/pics/short_grass/1.4bpp" .align 2 -gFieldEffectObjectPic_SandFootprints_0: @ 836A848 +gFieldEffectPic_SandFootprints_0: @ 836A848 .incbin "graphics/field_effect_objects/pics/sand_footprints/0.4bpp" .align 2 -gFieldEffectObjectPic_SandFootprints_1: @ 836A8C8 +gFieldEffectPic_SandFootprints_1: @ 836A8C8 .incbin "graphics/field_effect_objects/pics/sand_footprints/1.4bpp" .align 2 -gFieldEffectObjectPic_DeepSandFootprints_0: @ 836A948 +gFieldEffectPic_DeepSandFootprints_0: @ 836A948 .incbin "graphics/field_effect_objects/pics/deep_sand_footprints/0.4bpp" .align 2 -gFieldEffectObjectPic_DeepSandFootprints_1: @ 836A9C8 +gFieldEffectPic_DeepSandFootprints_1: @ 836A9C8 .incbin "graphics/field_effect_objects/pics/deep_sand_footprints/1.4bpp" .align 2 -gFieldEffectObjectPic_BikeTireTracks_0: @ 836AA48 +gFieldEffectPic_BikeTireTracks_0: @ 836AA48 .incbin "graphics/field_effect_objects/pics/bike_tire_tracks/0.4bpp" .align 2 -gFieldEffectObjectPic_BikeTireTracks_1: @ 836AAC8 +gFieldEffectPic_BikeTireTracks_1: @ 836AAC8 .incbin "graphics/field_effect_objects/pics/bike_tire_tracks/1.4bpp" .align 2 -gFieldEffectObjectPic_BikeTireTracks_2: @ 836AB48 +gFieldEffectPic_BikeTireTracks_2: @ 836AB48 .incbin "graphics/field_effect_objects/pics/bike_tire_tracks/2.4bpp" .align 2 -gFieldEffectObjectPic_BikeTireTracks_3: @ 836ABC8 +gFieldEffectPic_BikeTireTracks_3: @ 836ABC8 .incbin "graphics/field_effect_objects/pics/bike_tire_tracks/3.4bpp" .align 2 -gFieldEffectObjectPic_Unknown19_0: @ 836AC48 +gFieldEffectPic_Unknown19_0: @ 836AC48 .incbin "graphics/field_effect_objects/pics/unknown_19/0.4bpp" .align 2 -gFieldEffectObjectPic_Unknown19_1: @ 836ACC8 +gFieldEffectPic_Unknown19_1: @ 836ACC8 .incbin "graphics/field_effect_objects/pics/unknown_19/1.4bpp" .align 2 -gFieldEffectObjectPic_Unknown19_2: @ 836AD48 +gFieldEffectPic_Unknown19_2: @ 836AD48 .incbin "graphics/field_effect_objects/pics/unknown_19/2.4bpp" .align 2 -gFieldEffectObjectPic_Unknown19_3: @ 836ADC8 +gFieldEffectPic_Unknown19_3: @ 836ADC8 .incbin "graphics/field_effect_objects/pics/unknown_19/3.4bpp" .align 2 -gFieldEffectObjectPic_Unknown29_0: @ 836AE48 +gFieldEffectPic_Unknown29_0: @ 836AE48 .incbin "graphics/field_effect_objects/pics/unknown_29/0.4bpp" .align 2 -gFieldEffectObjectPic_Unknown29_1: @ 836AE88 +gFieldEffectPic_Unknown29_1: @ 836AE88 .incbin "graphics/field_effect_objects/pics/unknown_29/1.4bpp" .align 2 -gFieldEffectObjectPic_Unknown29_2: @ 836AEC8 +gFieldEffectPic_Unknown29_2: @ 836AEC8 .incbin "graphics/field_effect_objects/pics/unknown_29/2.4bpp" .align 2 -gFieldEffectObjectPic_JumpBigSplash_0: @ 836AF08 +gFieldEffectPic_JumpBigSplash_0: @ 836AF08 .incbin "graphics/field_effect_objects/pics/jump_big_splash/0.4bpp" .align 2 -gFieldEffectObjectPic_JumpBigSplash_1: @ 836AF88 +gFieldEffectPic_JumpBigSplash_1: @ 836AF88 .incbin "graphics/field_effect_objects/pics/jump_big_splash/1.4bpp" .align 2 -gFieldEffectObjectPic_JumpBigSplash_2: @ 836B008 +gFieldEffectPic_JumpBigSplash_2: @ 836B008 .incbin "graphics/field_effect_objects/pics/jump_big_splash/2.4bpp" .align 2 -gFieldEffectObjectPic_JumpBigSplash_3: @ 836B088 +gFieldEffectPic_JumpBigSplash_3: @ 836B088 .incbin "graphics/field_effect_objects/pics/jump_big_splash/3.4bpp" .align 2 -gFieldEffectObjectPic_Splash_0: @ 836B108 +gFieldEffectPic_Splash_0: @ 836B108 .incbin "graphics/field_effect_objects/pics/splash/0.4bpp" .align 2 -gFieldEffectObjectPic_Splash_1: @ 836B148 +gFieldEffectPic_Splash_1: @ 836B148 .incbin "graphics/field_effect_objects/pics/splash/1.4bpp" .align 2 -gFieldEffectObjectPic_JumpSmallSplash_0: @ 836B188 +gFieldEffectPic_JumpSmallSplash_0: @ 836B188 .incbin "graphics/field_effect_objects/pics/jump_small_splash/0.4bpp" .align 2 -gFieldEffectObjectPic_JumpSmallSplash_1: @ 836B1C8 +gFieldEffectPic_JumpSmallSplash_1: @ 836B1C8 .incbin "graphics/field_effect_objects/pics/jump_small_splash/1.4bpp" .align 2 -gFieldEffectObjectPic_JumpSmallSplash_2: @ 836B208 +gFieldEffectPic_JumpSmallSplash_2: @ 836B208 .incbin "graphics/field_effect_objects/pics/jump_small_splash/2.4bpp" .align 2 -gFieldEffectObjectPic_Unknown20_0: @ 836B248 +gFieldEffectPic_Unknown20_0: @ 836B248 .incbin "graphics/field_effect_objects/pics/unknown_20/0.4bpp" .align 2 -gFieldEffectObjectPic_Unknown20_1: @ 836B2C8 +gFieldEffectPic_Unknown20_1: @ 836B2C8 .incbin "graphics/field_effect_objects/pics/unknown_20/1.4bpp" .align 2 -gFieldEffectObjectPic_Unknown20_2: @ 836B348 +gFieldEffectPic_Unknown20_2: @ 836B348 .incbin "graphics/field_effect_objects/pics/unknown_20/2.4bpp" .align 2 -gFieldEffectObjectPic_Unknown20_3: @ 836B3C8 +gFieldEffectPic_Unknown20_3: @ 836B3C8 .incbin "graphics/field_effect_objects/pics/unknown_20/3.4bpp" .align 2 -gFieldEffectObjectPic_Unknown20_4: @ 836B448 +gFieldEffectPic_Unknown20_4: @ 836B448 .incbin "graphics/field_effect_objects/pics/unknown_20/4.4bpp" .align 2 -gFieldEffectObjectPic_TreeDisguise_0: @ 836B4C8 +gFieldEffectPic_TreeDisguise_0: @ 836B4C8 .incbin "graphics/field_effect_objects/pics/tree_disguise/0.4bpp" .align 2 -gFieldEffectObjectPic_TreeDisguise_1: @ 836B5C8 +gFieldEffectPic_TreeDisguise_1: @ 836B5C8 .incbin "graphics/field_effect_objects/pics/tree_disguise/1.4bpp" .align 2 -gFieldEffectObjectPic_TreeDisguise_2: @ 836B6C8 +gFieldEffectPic_TreeDisguise_2: @ 836B6C8 .incbin "graphics/field_effect_objects/pics/tree_disguise/2.4bpp" .align 2 -gFieldEffectObjectPic_TreeDisguise_3: @ 836B7C8 +gFieldEffectPic_TreeDisguise_3: @ 836B7C8 .incbin "graphics/field_effect_objects/pics/tree_disguise/3.4bpp" .align 2 -gFieldEffectObjectPic_TreeDisguise_4: @ 836B8C8 +gFieldEffectPic_TreeDisguise_4: @ 836B8C8 .incbin "graphics/field_effect_objects/pics/tree_disguise/4.4bpp" .align 2 -gFieldEffectObjectPic_TreeDisguise_5: @ 836B9C8 +gFieldEffectPic_TreeDisguise_5: @ 836B9C8 .incbin "graphics/field_effect_objects/pics/tree_disguise/5.4bpp" .align 2 -gFieldEffectObjectPic_TreeDisguise_6: @ 836BAC8 +gFieldEffectPic_TreeDisguise_6: @ 836BAC8 .incbin "graphics/field_effect_objects/pics/tree_disguise/6.4bpp" .align 2 -gFieldEffectObjectPic_MountainDisguise_0: @ 836BBC8 +gFieldEffectPic_MountainDisguise_0: @ 836BBC8 .incbin "graphics/field_effect_objects/pics/mountain_disguise/0.4bpp" .align 2 -gFieldEffectObjectPic_MountainDisguise_1: @ 836BCC8 +gFieldEffectPic_MountainDisguise_1: @ 836BCC8 .incbin "graphics/field_effect_objects/pics/mountain_disguise/1.4bpp" .align 2 -gFieldEffectObjectPic_MountainDisguise_2: @ 836BDC8 +gFieldEffectPic_MountainDisguise_2: @ 836BDC8 .incbin "graphics/field_effect_objects/pics/mountain_disguise/2.4bpp" .align 2 -gFieldEffectObjectPic_MountainDisguise_3: @ 836BEC8 +gFieldEffectPic_MountainDisguise_3: @ 836BEC8 .incbin "graphics/field_effect_objects/pics/mountain_disguise/3.4bpp" .align 2 -gFieldEffectObjectPic_MountainDisguise_4: @ 836BFC8 +gFieldEffectPic_MountainDisguise_4: @ 836BFC8 .incbin "graphics/field_effect_objects/pics/mountain_disguise/4.4bpp" .align 2 -gFieldEffectObjectPic_MountainDisguise_5: @ 836C0C8 +gFieldEffectPic_MountainDisguise_5: @ 836C0C8 .incbin "graphics/field_effect_objects/pics/mountain_disguise/5.4bpp" .align 2 -gFieldEffectObjectPic_MountainDisguise_6: @ 836C1C8 +gFieldEffectPic_MountainDisguise_6: @ 836C1C8 .incbin "graphics/field_effect_objects/pics/mountain_disguise/6.4bpp" .align 2 -gFieldEffectObjectPic_SandDisguise_0: @ 836C2C8 +gFieldEffectPic_SandDisguise_0: @ 836C2C8 .incbin "graphics/field_effect_objects/pics/sand_disguise/0.4bpp" .align 2 -gFieldEffectObjectPic_SandDisguise_1: @ 836C3C8 +gFieldEffectPic_SandDisguise_1: @ 836C3C8 .incbin "graphics/field_effect_objects/pics/sand_disguise/1.4bpp" .align 2 -gFieldEffectObjectPic_SandDisguise_2: @ 836C4C8 +gFieldEffectPic_SandDisguise_2: @ 836C4C8 .incbin "graphics/field_effect_objects/pics/sand_disguise/2.4bpp" .align 2 -gFieldEffectObjectPic_SandDisguise_3: @ 836C5C8 +gFieldEffectPic_SandDisguise_3: @ 836C5C8 .incbin "graphics/field_effect_objects/pics/sand_disguise/3.4bpp" .align 2 -gFieldEffectObjectPic_SandDisguise_4: @ 836C6C8 +gFieldEffectPic_SandDisguise_4: @ 836C6C8 .incbin "graphics/field_effect_objects/pics/sand_disguise/4.4bpp" .align 2 -gFieldEffectObjectPic_SandDisguise_5: @ 836C7C8 +gFieldEffectPic_SandDisguise_5: @ 836C7C8 .incbin "graphics/field_effect_objects/pics/sand_disguise/5.4bpp" .align 2 -gFieldEffectObjectPic_SandDisguise_6: @ 836C8C8 +gFieldEffectPic_SandDisguise_6: @ 836C8C8 .incbin "graphics/field_effect_objects/pics/sand_disguise/6.4bpp" .align 2 -gFieldEffectObjectPic_HotSpringsWater: @ 836C9C8 +gFieldEffectPic_HotSpringsWater: @ 836C9C8 .incbin "graphics/field_effect_objects/pics/hot_springs_water.4bpp" .align 2 @@ -468,83 +468,83 @@ gFieldEffectObjectPalette2: @ 836CA48 .incbin "graphics/field_effect_objects/palettes/02.gbapal" .align 2 -gFieldEffectObjectPic_PopOutOfAsh_0: @ 836CA68 +gFieldEffectPic_PopOutOfAsh_0: @ 836CA68 .incbin "graphics/field_effect_objects/pics/pop_out_of_ash/0.4bpp" .align 2 -gFieldEffectObjectPic_PopOutOfAsh_1: @ 836CAE8 +gFieldEffectPic_PopOutOfAsh_1: @ 836CAE8 .incbin "graphics/field_effect_objects/pics/pop_out_of_ash/1.4bpp" .align 2 -gFieldEffectObjectPic_PopOutOfAsh_2: @ 836CB68 +gFieldEffectPic_PopOutOfAsh_2: @ 836CB68 .incbin "graphics/field_effect_objects/pics/pop_out_of_ash/2.4bpp" .align 2 -gFieldEffectObjectPic_PopOutOfAsh_3: @ 836CBE8 +gFieldEffectPic_PopOutOfAsh_3: @ 836CBE8 .incbin "graphics/field_effect_objects/pics/pop_out_of_ash/3.4bpp" .align 2 -gFieldEffectObjectPic_PopOutOfAsh_4: @ 836CC68 +gFieldEffectPic_PopOutOfAsh_4: @ 836CC68 .incbin "graphics/field_effect_objects/pics/pop_out_of_ash/4.4bpp" .align 2 -gFieldEffectObjectPic_Unknown33_0: @ 836CCE8 +gFieldEffectPic_Unknown33_0: @ 836CCE8 .incbin "graphics/field_effect_objects/pics/unknown_33/0.4bpp" .align 2 -gFieldEffectObjectPic_Unknown33_1: @ 836CD68 +gFieldEffectPic_Unknown33_1: @ 836CD68 .incbin "graphics/field_effect_objects/pics/unknown_33/1.4bpp" .align 2 -gFieldEffectObjectPic_Unknown33_2: @ 836CDE8 +gFieldEffectPic_Unknown33_2: @ 836CDE8 .incbin "graphics/field_effect_objects/pics/unknown_33/2.4bpp" .align 2 -gFieldEffectObjectPic_Unknown33_3: @ 836CE68 +gFieldEffectPic_Unknown33_3: @ 836CE68 .incbin "graphics/field_effect_objects/pics/unknown_33/3.4bpp" .align 2 -gFieldEffectObjectPic_Unknown33_4: @ 836CEE8 +gFieldEffectPic_Unknown33_4: @ 836CEE8 .incbin "graphics/field_effect_objects/pics/unknown_33/4.4bpp" .align 2 -gFieldEffectObjectPic_Bubbles_0: @ 836CF68 +gFieldEffectPic_Bubbles_0: @ 836CF68 .incbin "graphics/field_effect_objects/pics/bubbles/0.4bpp" .align 2 -gFieldEffectObjectPic_Bubbles_1: @ 836D068 +gFieldEffectPic_Bubbles_1: @ 836D068 .incbin "graphics/field_effect_objects/pics/bubbles/1.4bpp" .align 2 -gFieldEffectObjectPic_Bubbles_2: @ 836D168 +gFieldEffectPic_Bubbles_2: @ 836D168 .incbin "graphics/field_effect_objects/pics/bubbles/2.4bpp" .align 2 -gFieldEffectObjectPic_Bubbles_3: @ 836D268 +gFieldEffectPic_Bubbles_3: @ 836D268 .incbin "graphics/field_effect_objects/pics/bubbles/3.4bpp" .align 2 -gFieldEffectObjectPic_Bubbles_4: @ 836D368 +gFieldEffectPic_Bubbles_4: @ 836D368 .incbin "graphics/field_effect_objects/pics/bubbles/4.4bpp" .align 2 -gFieldEffectObjectPic_Bubbles_5: @ 836D468 +gFieldEffectPic_Bubbles_5: @ 836D468 .incbin "graphics/field_effect_objects/pics/bubbles/5.4bpp" .align 2 -gFieldEffectObjectPic_Bubbles_6: @ 836D568 +gFieldEffectPic_Bubbles_6: @ 836D568 .incbin "graphics/field_effect_objects/pics/bubbles/6.4bpp" .align 2 -gFieldEffectObjectPic_Bubbles_7: @ 836D668 +gFieldEffectPic_Bubbles_7: @ 836D668 .incbin "graphics/field_effect_objects/pics/bubbles/7.4bpp" .align 2 -gFieldEffectObjectPic_Unknown35_0: @ 836D768 +gFieldEffectPic_Unknown35_0: @ 836D768 .incbin "graphics/field_effect_objects/pics/unknown_35/0.4bpp" .align 2 -gFieldEffectObjectPic_Unknown35_1: @ 836D7E8 +gFieldEffectPic_Unknown35_1: @ 836D7E8 .incbin "graphics/field_effect_objects/pics/unknown_35/1.4bpp" .align 2 @@ -552,5 +552,5 @@ gFieldEffectObjectPalette3: @ 836D868 .incbin "graphics/field_effect_objects/palettes/03.gbapal" .align 2 -gFieldEffectObjectPic_Bird: @ 836D888 +gFieldEffectPic_Bird: @ 836D888 .incbin "graphics/field_effect_objects/pics/bird.4bpp" diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s index 7150aa281..0974f6f50 100644 --- a/data/graphics/field_objects/field_effect_objects.s +++ b/data/graphics/field_objects/field_effect_objects.s @@ -12,48 +12,48 @@ gFieldEffectObjectImageAnim_8374534: @ 8374534 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Shadow: @ 837453C +gFieldEffectAnimTable_Shadow: @ 837453C .4byte gFieldEffectObjectImageAnim_8374534 .align 2 -gFieldEffectObjectPicTable_ShadowSmall: @ 8374540 - obj_frame_tiles gFieldEffectObjectPic_ShadowSmall, 0x20 +gFieldEffectPicTable_ShadowSmall: @ 8374540 + obj_frame_tiles gFieldEffectPic_ShadowSmall, 0x20 .align 2 -gFieldEffectObjectPicTable_ShadowMedium: @ 8374548 - obj_frame_tiles gFieldEffectObjectPic_ShadowMedium, 0x40 +gFieldEffectPicTable_ShadowMedium: @ 8374548 + obj_frame_tiles gFieldEffectPic_ShadowMedium, 0x40 .align 2 -gFieldEffectObjectPicTable_ShadowLarge: @ 8374550 - obj_frame_tiles gFieldEffectObjectPic_ShadowLarge, 0x80 +gFieldEffectPicTable_ShadowLarge: @ 8374550 + obj_frame_tiles gFieldEffectPic_ShadowLarge, 0x80 .align 2 -gFieldEffectObjectPicTable_ShadowExtraLarge: @ 8374558 - obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge, 0x400 +gFieldEffectPicTable_ShadowExtraLarge: @ 8374558 + obj_frame_tiles gFieldEffectPic_ShadowExtraLarge, 0x400 .align 2 gFieldEffectObjectTemplate_ShadowSmall: @ 8374560 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 0xFFFF, 0xFFFF, gFieldOamData_8x8, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow .align 2 gFieldEffectObjectTemplate_ShadowMedium: @ 8374578 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 0xFFFF, 0xFFFF, gFieldOamData_16x8, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, oamc_shadow .align 2 gFieldEffectObjectTemplate_ShadowLarge: @ 8374590 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 0xFFFF, 0xFFFF, gFieldOamData_32x8, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, oamc_shadow .align 2 gFieldEffectObjectTemplate_ShadowExtraLarge: @ 83745A8 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 0xFFFF, 0xFFFF, gFieldOamData_64x32, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow .align 2 -gFieldEffectObjectPicTable_TallGrass: @ 83745C0 - obj_frame_tiles gFieldEffectObjectPic_TallGrass_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_TallGrass_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_TallGrass_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_TallGrass_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_TallGrass_4, 0x80 +gFieldEffectPicTable_TallGrass: @ 83745C0 + obj_frame_tiles gFieldEffectPic_TallGrass_0, 0x80 + obj_frame_tiles gFieldEffectPic_TallGrass_1, 0x80 + obj_frame_tiles gFieldEffectPic_TallGrass_2, 0x80 + obj_frame_tiles gFieldEffectPic_TallGrass_3, 0x80 + obj_frame_tiles gFieldEffectPic_TallGrass_4, 0x80 .align 2 gFieldEffectObjectImageAnim_83745E8: @ 83745E8 @@ -65,20 +65,20 @@ gFieldEffectObjectImageAnim_83745E8: @ 83745E8 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_TallGrass: @ 8374600 +gFieldEffectAnimTable_TallGrass: @ 8374600 .4byte gFieldEffectObjectImageAnim_83745E8 .align 2 gFieldEffectObjectTemplate_TallGrass: @ 8374604 - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_TallGrass, gFieldEffectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal .align 2 -gFieldEffectObjectPicTable_Ripple: @ 837461C - obj_frame_tiles gFieldEffectObjectPic_Ripple_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Ripple_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Ripple_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Ripple_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Ripple_4, 0x80 +gFieldEffectPicTable_Ripple: @ 837461C + obj_frame_tiles gFieldEffectPic_Ripple_0, 0x80 + obj_frame_tiles gFieldEffectPic_Ripple_1, 0x80 + obj_frame_tiles gFieldEffectPic_Ripple_2, 0x80 + obj_frame_tiles gFieldEffectPic_Ripple_3, 0x80 + obj_frame_tiles gFieldEffectPic_Ripple_4, 0x80 .align 2 gFieldEffectObjectImageAnim_8374644: @ 8374644 @@ -93,20 +93,20 @@ gFieldEffectObjectImageAnim_8374644: @ 8374644 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Ripple: @ 8374668 +gFieldEffectAnimTable_Ripple: @ 8374668 .4byte gFieldEffectObjectImageAnim_8374644 .align 2 gFieldEffectObjectTemplate_Ripple: @ 837466C - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_8128800 + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_Ripple, gFieldEffectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_8128800 .align 2 -gFieldEffectObjectPicTable_Ash: @ 8374684 - obj_frame_tiles gFieldEffectObjectPic_Ash_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Ash_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Ash_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Ash_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Ash_4, 0x80 +gFieldEffectPicTable_Ash: @ 8374684 + obj_frame_tiles gFieldEffectPic_Ash_0, 0x80 + obj_frame_tiles gFieldEffectPic_Ash_1, 0x80 + obj_frame_tiles gFieldEffectPic_Ash_2, 0x80 + obj_frame_tiles gFieldEffectPic_Ash_3, 0x80 + obj_frame_tiles gFieldEffectPic_Ash_4, 0x80 .align 2 gFieldEffectObjectImageAnim_83746AC: @ 83746AC @@ -118,18 +118,18 @@ gFieldEffectObjectImageAnim_83746AC: @ 83746AC obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Ash: @ 83746C4 +gFieldEffectAnimTable_Ash: @ 83746C4 .4byte gFieldEffectObjectImageAnim_83746AC .align 2 gFieldEffectObjectTemplate_Ash: @ 83746C8 - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8127D84 + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_Ash, gFieldEffectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8127D84 .align 2 -gFieldEffectObjectPicTable_SurfBlob: @ 83746E0 - obj_frame_tiles gFieldEffectObjectPic_SurfBlob_0, 0x200 - obj_frame_tiles gFieldEffectObjectPic_SurfBlob_1, 0x200 - obj_frame_tiles gFieldEffectObjectPic_SurfBlob_2, 0x200 +gFieldEffectPicTable_SurfBlob: @ 83746E0 + obj_frame_tiles gFieldEffectPic_SurfBlob_0, 0x200 + obj_frame_tiles gFieldEffectPic_SurfBlob_1, 0x200 + obj_frame_tiles gFieldEffectPic_SurfBlob_2, 0x200 .align 2 gFieldEffectObjectImageAnim_83746F8: @ 83746F8 @@ -152,7 +152,7 @@ gFieldEffectObjectImageAnim_8374710: @ 8374710 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnimTable_SurfBlob: @ 8374718 +gFieldEffectAnimTable_SurfBlob: @ 8374718 .4byte gFieldEffectObjectImageAnim_83746F8 .4byte gFieldEffectObjectImageAnim_8374700 .4byte gFieldEffectObjectImageAnim_8374708 @@ -160,18 +160,18 @@ gFieldEffectObjectImageAnimTable_SurfBlob: @ 8374718 .align 2 gFieldEffectObjectTemplate_SurfBlob: @ 8374728 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8127F7C + spr_template 0xFFFF, 0xFFFF, gFieldOamData_32x32, gFieldEffectAnimTable_SurfBlob, gFieldEffectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8127F7C .align 2 -gFieldEffectObjectPicTable_Arrow: @ 8374740 - obj_frame_tiles gFieldEffectObjectPic_Arrow_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Arrow_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Arrow_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Arrow_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Arrow_4, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Arrow_5, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Arrow_6, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Arrow_7, 0x80 +gFieldEffectPicTable_Arrow: @ 8374740 + obj_frame_tiles gFieldEffectPic_Arrow_0, 0x80 + obj_frame_tiles gFieldEffectPic_Arrow_1, 0x80 + obj_frame_tiles gFieldEffectPic_Arrow_2, 0x80 + obj_frame_tiles gFieldEffectPic_Arrow_3, 0x80 + obj_frame_tiles gFieldEffectPic_Arrow_4, 0x80 + obj_frame_tiles gFieldEffectPic_Arrow_5, 0x80 + obj_frame_tiles gFieldEffectPic_Arrow_6, 0x80 + obj_frame_tiles gFieldEffectPic_Arrow_7, 0x80 .align 2 gFieldEffectObjectImageAnim_8374780: @ 8374780 @@ -198,7 +198,7 @@ gFieldEffectObjectImageAnim_83747A4: @ 83747A4 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnimTable_Arrow: @ 83747B0 +gFieldEffectAnimTable_Arrow: @ 83747B0 .4byte gFieldEffectObjectImageAnim_8374780 .4byte gFieldEffectObjectImageAnim_837478C .4byte gFieldEffectObjectImageAnim_8374798 @@ -206,13 +206,13 @@ gFieldEffectObjectImageAnimTable_Arrow: @ 83747B0 .align 2 gFieldEffectObjectTemplate_Arrow: @ 83747C0 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 0xFFFF, gFieldOamData_16x16, gFieldEffectAnimTable_Arrow, gFieldEffectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 -gFieldEffectObjectPicTable_Dust: @ 83747D8 - obj_frame_tiles gFieldEffectObjectPic_Dust_0, 0x40 - obj_frame_tiles gFieldEffectObjectPic_Dust_1, 0x40 - obj_frame_tiles gFieldEffectObjectPic_Dust_2, 0x40 +gFieldEffectPicTable_Dust: @ 83747D8 + obj_frame_tiles gFieldEffectPic_Dust_0, 0x40 + obj_frame_tiles gFieldEffectPic_Dust_1, 0x40 + obj_frame_tiles gFieldEffectPic_Dust_2, 0x40 .align 2 gFieldEffectObjectImageAnim_83747F0: @ 83747F0 @@ -222,19 +222,19 @@ gFieldEffectObjectImageAnim_83747F0: @ 83747F0 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Dust: @ 8374800 +gFieldEffectAnimTable_Dust: @ 8374800 .4byte gFieldEffectObjectImageAnim_83747F0 .align 2 gFieldEffectObjectTemplate_Dust: @ 8374804 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Dust, gFieldEffectObjectPicTable_Dust, gDummySpriteAffineAnimTable, sub_81287C4 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x8, gFieldEffectAnimTable_Dust, gFieldEffectPicTable_Dust, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 -gFieldEffectObjectPicTable_JumpTallGrass: @ 837481C - obj_frame_tiles gFieldEffectObjectPic_JumpTallGrass_0, 0x40 - obj_frame_tiles gFieldEffectObjectPic_JumpTallGrass_1, 0x40 - obj_frame_tiles gFieldEffectObjectPic_JumpTallGrass_2, 0x40 - obj_frame_tiles gFieldEffectObjectPic_JumpTallGrass_3, 0x40 +gFieldEffectPicTable_JumpTallGrass: @ 837481C + obj_frame_tiles gFieldEffectPic_JumpTallGrass_0, 0x40 + obj_frame_tiles gFieldEffectPic_JumpTallGrass_1, 0x40 + obj_frame_tiles gFieldEffectPic_JumpTallGrass_2, 0x40 + obj_frame_tiles gFieldEffectPic_JumpTallGrass_3, 0x40 .align 2 gFieldEffectObjectImageAnim_837483C: @ 837483C @@ -245,17 +245,17 @@ gFieldEffectObjectImageAnim_837483C: @ 837483C obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_JumpTallGrass: @ 8374850 +gFieldEffectAnimTable_JumpTallGrass: @ 8374850 .4byte gFieldEffectObjectImageAnim_837483C .align 2 gFieldEffectObjectTemplate_JumpTallGrass: @ 8374854 - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_JumpTallGrass, gFieldEffectObjectPicTable_JumpTallGrass, gDummySpriteAffineAnimTable, sub_81287C4 + spr_template 0xFFFF, 0x1005, gFieldOamData_16x8, gFieldEffectAnimTable_JumpTallGrass, gFieldEffectPicTable_JumpTallGrass, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 -gFieldEffectObjectPicTable_SandFootprints: @ 837486C - obj_frame_tiles gFieldEffectObjectPic_SandFootprints_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_SandFootprints_1, 0x80 +gFieldEffectPicTable_SandFootprints: @ 837486C + obj_frame_tiles gFieldEffectPic_SandFootprints_0, 0x80 + obj_frame_tiles gFieldEffectPic_SandFootprints_1, 0x80 .align 2 gFieldEffectObjectImageAnim_837487C: @ 837487C @@ -278,7 +278,7 @@ gFieldEffectObjectImageAnim_8374894: @ 8374894 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_SandFootprints: @ 837489C +gFieldEffectAnimTable_SandFootprints: @ 837489C .4byte gFieldEffectObjectImageAnim_837487C .4byte gFieldEffectObjectImageAnim_837487C .4byte gFieldEffectObjectImageAnim_8374884 @@ -287,12 +287,12 @@ gFieldEffectObjectImageAnimTable_SandFootprints: @ 837489C .align 2 gFieldEffectObjectTemplate_SandFootprints: @ 83748B0 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8127584 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x16, gFieldEffectAnimTable_SandFootprints, gFieldEffectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8127584 .align 2 -gFieldEffectObjectPicTable_DeepSandFootprints: @ 83748C8 - obj_frame_tiles gFieldEffectObjectPic_DeepSandFootprints_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_DeepSandFootprints_1, 0x80 +gFieldEffectPicTable_DeepSandFootprints: @ 83748C8 + obj_frame_tiles gFieldEffectPic_DeepSandFootprints_0, 0x80 + obj_frame_tiles gFieldEffectPic_DeepSandFootprints_1, 0x80 .align 2 gFieldEffectObjectImageAnim_83748D8: @ 83748D8 @@ -315,7 +315,7 @@ gFieldEffectObjectImageAnim_83748F0: @ 83748F0 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_DeepSandFootprints: @ 83748F8 +gFieldEffectAnimTable_DeepSandFootprints: @ 83748F8 .4byte gFieldEffectObjectImageAnim_83748D8 .4byte gFieldEffectObjectImageAnim_83748D8 .4byte gFieldEffectObjectImageAnim_83748E0 @@ -324,14 +324,14 @@ gFieldEffectObjectImageAnimTable_DeepSandFootprints: @ 83748F8 .align 2 gFieldEffectObjectTemplate_DeepSandFootprints: @ 837490C - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8127584 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x16, gFieldEffectAnimTable_DeepSandFootprints, gFieldEffectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8127584 .align 2 -gFieldEffectObjectPicTable_BikeTireTracks: @ 8374924 - obj_frame_tiles gFieldEffectObjectPic_BikeTireTracks_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_BikeTireTracks_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_BikeTireTracks_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_BikeTireTracks_3, 0x80 +gFieldEffectPicTable_BikeTireTracks: @ 8374924 + obj_frame_tiles gFieldEffectPic_BikeTireTracks_0, 0x80 + obj_frame_tiles gFieldEffectPic_BikeTireTracks_1, 0x80 + obj_frame_tiles gFieldEffectPic_BikeTireTracks_2, 0x80 + obj_frame_tiles gFieldEffectPic_BikeTireTracks_3, 0x80 .align 2 gFieldEffectObjectImageAnim_8374944: @ 8374944 @@ -374,7 +374,7 @@ gFieldEffectObjectImageAnim_837497C: @ 837497C obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_BikeTireTracks: @ 8374984 +gFieldEffectAnimTable_BikeTireTracks: @ 8374984 .4byte gFieldEffectObjectImageAnim_8374944 .4byte gFieldEffectObjectImageAnim_8374944 .4byte gFieldEffectObjectImageAnim_837494C @@ -387,14 +387,14 @@ gFieldEffectObjectImageAnimTable_BikeTireTracks: @ 8374984 .align 2 gFieldEffectObjectTemplate_BikeTireTracks: @ 83749A8 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8127584 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x16, gFieldEffectAnimTable_BikeTireTracks, gFieldEffectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8127584 .align 2 -gFieldEffectObjectPicTable_JumpBigSplash: @ 83749C0 - obj_frame_tiles gFieldEffectObjectPic_JumpBigSplash_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_JumpBigSplash_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_JumpBigSplash_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_JumpBigSplash_3, 0x80 +gFieldEffectPicTable_JumpBigSplash: @ 83749C0 + obj_frame_tiles gFieldEffectPic_JumpBigSplash_0, 0x80 + obj_frame_tiles gFieldEffectPic_JumpBigSplash_1, 0x80 + obj_frame_tiles gFieldEffectPic_JumpBigSplash_2, 0x80 + obj_frame_tiles gFieldEffectPic_JumpBigSplash_3, 0x80 .align 2 gFieldEffectObjectImageAnim_83749E0: @ 83749E0 @@ -405,17 +405,17 @@ gFieldEffectObjectImageAnim_83749E0: @ 83749E0 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_JumpBigSplash: @ 83749F4 +gFieldEffectAnimTable_JumpBigSplash: @ 83749F4 .4byte gFieldEffectObjectImageAnim_83749E0 .align 2 gFieldEffectObjectTemplate_JumpBigSplash: @ 83749F8 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpBigSplash, gFieldEffectObjectPicTable_JumpBigSplash, gDummySpriteAffineAnimTable, sub_81287C4 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x16, gFieldEffectAnimTable_JumpBigSplash, gFieldEffectPicTable_JumpBigSplash, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 -gFieldEffectObjectPicTable_Splash: @ 8374A10 - obj_frame_tiles gFieldEffectObjectPic_Splash_0, 0x40 - obj_frame_tiles gFieldEffectObjectPic_Splash_1, 0x40 +gFieldEffectPicTable_Splash: @ 8374A10 + obj_frame_tiles gFieldEffectPic_Splash_0, 0x40 + obj_frame_tiles gFieldEffectPic_Splash_1, 0x40 .align 2 gFieldEffectObjectImageAnim_8374A20: @ 8374A20 @@ -436,19 +436,19 @@ gFieldEffectObjectImageAnim_8374A2C: @ 8374A2C obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnimTable_Splash: @ 8374A50 +gFieldEffectAnimTable_Splash: @ 8374A50 .4byte gFieldEffectObjectImageAnim_8374A20 .4byte gFieldEffectObjectImageAnim_8374A2C .align 2 gFieldEffectObjectTemplate_Splash: @ 8374A58 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_81276B4 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x8, gFieldEffectAnimTable_Splash, gFieldEffectPicTable_Splash, gDummySpriteAffineAnimTable, sub_81276B4 .align 2 -gFieldEffectObjectPicTable_JumpSmallSplash: @ 8374A70 - obj_frame_tiles gFieldEffectObjectPic_JumpSmallSplash_0, 0x40 - obj_frame_tiles gFieldEffectObjectPic_JumpSmallSplash_1, 0x40 - obj_frame_tiles gFieldEffectObjectPic_JumpSmallSplash_2, 0x40 +gFieldEffectPicTable_JumpSmallSplash: @ 8374A70 + obj_frame_tiles gFieldEffectPic_JumpSmallSplash_0, 0x40 + obj_frame_tiles gFieldEffectPic_JumpSmallSplash_1, 0x40 + obj_frame_tiles gFieldEffectPic_JumpSmallSplash_2, 0x40 .align 2 gFieldEffectObjectImageAnim_8374A88: @ 8374A88 @@ -458,19 +458,19 @@ gFieldEffectObjectImageAnim_8374A88: @ 8374A88 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_JumpSmallSplash: @ 8374A98 +gFieldEffectAnimTable_JumpSmallSplash: @ 8374A98 .4byte gFieldEffectObjectImageAnim_8374A88 .align 2 gFieldEffectObjectTemplate_JumpSmallSplash: @ 8374A9C - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_JumpSmallSplash, gFieldEffectObjectPicTable_JumpSmallSplash, gDummySpriteAffineAnimTable, sub_81287C4 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x8, gFieldEffectAnimTable_JumpSmallSplash, gFieldEffectPicTable_JumpSmallSplash, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 -gFieldEffectObjectPicTable_LongGrass: @ 8374AB4 - obj_frame_tiles gFieldEffectObjectPic_LongGrass_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_LongGrass_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_LongGrass_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_LongGrass_3, 0x80 +gFieldEffectPicTable_LongGrass: @ 8374AB4 + obj_frame_tiles gFieldEffectPic_LongGrass_0, 0x80 + obj_frame_tiles gFieldEffectPic_LongGrass_1, 0x80 + obj_frame_tiles gFieldEffectPic_LongGrass_2, 0x80 + obj_frame_tiles gFieldEffectPic_LongGrass_3, 0x80 .align 2 gFieldEffectObjectImageAnim_8374AD4: @ 8374AD4 @@ -484,21 +484,21 @@ gFieldEffectObjectImageAnim_8374AD4: @ 8374AD4 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_LongGrass: @ 8374AF4 +gFieldEffectAnimTable_LongGrass: @ 8374AF4 .4byte gFieldEffectObjectImageAnim_8374AD4 .align 2 gFieldEffectObjectTemplate_LongGrass: @ 8374AF8 - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_LongGrass, gFieldEffectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall .align 2 -gFieldEffectObjectPicTable_JumpLongGrass: @ 8374B10 - obj_frame_tiles gFieldEffectObjectPic_JumpLongGrass_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_JumpLongGrass_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_JumpLongGrass_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_JumpLongGrass_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_JumpLongGrass_4, 0x80 - obj_frame_tiles gFieldEffectObjectPic_JumpLongGrass_5, 0x80 +gFieldEffectPicTable_JumpLongGrass: @ 8374B10 + obj_frame_tiles gFieldEffectPic_JumpLongGrass_0, 0x80 + obj_frame_tiles gFieldEffectPic_JumpLongGrass_1, 0x80 + obj_frame_tiles gFieldEffectPic_JumpLongGrass_2, 0x80 + obj_frame_tiles gFieldEffectPic_JumpLongGrass_3, 0x80 + obj_frame_tiles gFieldEffectPic_JumpLongGrass_4, 0x80 + obj_frame_tiles gFieldEffectPic_JumpLongGrass_5, 0x80 .align 2 gFieldEffectObjectImageAnim_8374B40: @ 8374B40 @@ -511,24 +511,24 @@ gFieldEffectObjectImageAnim_8374B40: @ 8374B40 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_JumpLongGrass: @ 8374B5C +gFieldEffectAnimTable_JumpLongGrass: @ 8374B5C .4byte gFieldEffectObjectImageAnim_8374B40 .align 2 gFieldEffectObjectTemplate_JumpLongGrass: @ 8374B60 - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpLongGrass, gFieldEffectObjectPicTable_JumpLongGrass, gDummySpriteAffineAnimTable, sub_81287C4 + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_JumpLongGrass, gFieldEffectPicTable_JumpLongGrass, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 -gFieldEffectObjectPicTable_Unknown17: @ 8374B78 - obj_frame_tiles gFieldEffectObjectPic_JumpLongGrass_5, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown17_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown17_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown17_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown17_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown17_4, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown17_5, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown17_6, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown17_7, 0x80 +gFieldEffectPicTable_Unknown17: @ 8374B78 + obj_frame_tiles gFieldEffectPic_JumpLongGrass_5, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown17_0, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown17_1, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown17_2, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown17_3, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown17_4, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown17_5, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown17_6, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown17_7, 0x80 .align 2 gFieldEffectObjectImageAnim_8374BC0: @ 8374BC0 @@ -544,19 +544,19 @@ gFieldEffectObjectImageAnim_8374BC0: @ 8374BC0 obj_image_anim_jump 7 .align 2 -gFieldEffectObjectImageAnimTable_Unknown17: @ 8374BE8 +gFieldEffectAnimTable_Unknown17: @ 8374BE8 .4byte gFieldEffectObjectImageAnim_8374BC0 .align 2 gFieldEffectObjectTemplate_Unknown17: @ 8374BEC - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_8128800 + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown17, gFieldEffectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_8128800 .align 2 -gFieldEffectObjectPicTable_Unknown18: @ 8374C04 - obj_frame_tiles gFieldEffectObjectPic_Unknown18_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown18_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown18_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown18_3, 0x80 +gFieldEffectPicTable_Unknown18: @ 8374C04 + obj_frame_tiles gFieldEffectPic_Unknown18_0, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown18_1, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown18_2, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown18_3, 0x80 .align 2 gFieldEffectObjectImageAnim_8374C24: @ 8374C24 @@ -569,19 +569,19 @@ gFieldEffectObjectImageAnim_8374C24: @ 8374C24 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnimTable_Unknown18: @ 8374C40 +gFieldEffectAnimTable_Unknown18: @ 8374C40 .4byte gFieldEffectObjectImageAnim_8374C24 .align 2 gFieldEffectObjectTemplate_Unknown18: @ 8374C44 - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_8128800 + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown18, gFieldEffectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_8128800 .align 2 -gFieldEffectObjectPicTable_Unknown19: @ 8374C5C - obj_frame_tiles gFieldEffectObjectPic_Unknown19_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown19_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown19_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown19_3, 0x80 +gFieldEffectPicTable_Unknown19: @ 8374C5C + obj_frame_tiles gFieldEffectPic_Unknown19_0, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown19_1, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown19_2, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown19_3, 0x80 .align 2 gFieldEffectObjectImageAnim_8374C7C: @ 8374C7C @@ -592,18 +592,18 @@ gFieldEffectObjectImageAnim_8374C7C: @ 8374C7C obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnimTable_Unknown19: @ 8374C90 +gFieldEffectAnimTable_Unknown19: @ 8374C90 .4byte gFieldEffectObjectImageAnim_8374C7C .align 2 gFieldEffectObjectTemplate_Unknown19: @ 8374C94 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_8128800 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown19, gFieldEffectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_8128800 .align 2 -gFieldEffectObjectPicTable_Unknown29: @ 8374CAC - obj_frame_tiles gFieldEffectObjectPic_Unknown29_0, 0x40 - obj_frame_tiles gFieldEffectObjectPic_Unknown29_1, 0x40 - obj_frame_tiles gFieldEffectObjectPic_Unknown29_2, 0x40 +gFieldEffectPicTable_Unknown29: @ 8374CAC + obj_frame_tiles gFieldEffectPic_Unknown29_0, 0x40 + obj_frame_tiles gFieldEffectPic_Unknown29_1, 0x40 + obj_frame_tiles gFieldEffectPic_Unknown29_2, 0x40 .align 2 gFieldEffectObjectImageAnim_8374CC4: @ 8374CC4 @@ -613,19 +613,19 @@ gFieldEffectObjectImageAnim_8374CC4: @ 8374CC4 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Unknown29: @ 8374CD4 +gFieldEffectAnimTable_Unknown29: @ 8374CD4 .4byte gFieldEffectObjectImageAnim_8374CC4 .align 2 gFieldEffectObjectTemplate_Unknown29: @ 8374CD8 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81282E0 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x8, gFieldEffectAnimTable_Unknown29, gFieldEffectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81282E0 .align 2 -gFieldEffectObjectPicTable_Unknown20: @ 8374CF0 - obj_frame_tiles gFieldEffectObjectPic_Unknown20_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown20_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown20_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown20_3, 0x80 +gFieldEffectPicTable_Unknown20: @ 8374CF0 + obj_frame_tiles gFieldEffectPic_Unknown20_0, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown20_1, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown20_2, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown20_3, 0x80 .align 2 gFieldEffectObjectImageAnim_8374D10: @ 8374D10 @@ -638,15 +638,15 @@ gFieldEffectObjectImageAnim_8374D10: @ 8374D10 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnimTable_Unknown20: @ 8374D2C +gFieldEffectAnimTable_Unknown20: @ 8374D2C .4byte gFieldEffectObjectImageAnim_8374D10 .align 2 gFieldEffectObjectTemplate_Unknown20: @ 8374D30 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_8128800 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown20, gFieldEffectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_8128800 .align 2 -gFieldEffectObjectRotScalAnim_8374D48: @ 8374D48 +gFieldEffectAffineAnim_8374D48: @ 8374D48 obj_rot_scal_anim_frame 0xFF00, 0x100, -128, 0 obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 @@ -659,7 +659,7 @@ gFieldEffectObjectRotScalAnim_8374D48: @ 8374D48 obj_rot_scal_anim_jump 1 .align 2 -gFieldEffectObjectRotScalAnim_8374D98: @ 8374D98 +gFieldEffectAffineAnim_8374D98: @ 8374D98 obj_rot_scal_anim_frame 0x100, 0x100, -128, 0 obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 @@ -672,22 +672,22 @@ gFieldEffectObjectRotScalAnim_8374D98: @ 8374D98 obj_rot_scal_anim_jump 1 .align 2 -gFieldEffectObjectRotScalAnimTable_Unknown21: @ 8374DE8 - .4byte gFieldEffectObjectRotScalAnim_8374D48 - .4byte gFieldEffectObjectRotScalAnim_8374D98 +gFieldEffectAffineAnimTable_Unknown21: @ 8374DE8 + .4byte gFieldEffectAffineAnim_8374D48 + .4byte gFieldEffectAffineAnim_8374D98 .align 2 gFieldEffectObjectTemplate_Unknown21: @ 8374DF0 - spr_template 0x0, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_Unknown21, SpriteCallbackDummy + spr_template 0x0, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectAffineAnimTable_Unknown21, SpriteCallbackDummy .align 2 -gFieldEffectObjectPicTable_BerryTreeGrowthSparkle: @ 8374E08 - obj_frame_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_4, 0x80 - obj_frame_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_5, 0x80 +gFieldEffectPicTable_BerryTreeGrowthSparkle: @ 8374E08 + obj_frame_tiles gFieldEffectPic_BerryTreeGrowthSparkle_0, 0x80 + obj_frame_tiles gFieldEffectPic_BerryTreeGrowthSparkle_1, 0x80 + obj_frame_tiles gFieldEffectPic_BerryTreeGrowthSparkle_2, 0x80 + obj_frame_tiles gFieldEffectPic_BerryTreeGrowthSparkle_3, 0x80 + obj_frame_tiles gFieldEffectPic_BerryTreeGrowthSparkle_4, 0x80 + obj_frame_tiles gFieldEffectPic_BerryTreeGrowthSparkle_5, 0x80 .align 2 gFieldEffectObjectImageAnim_8374E38: @ 8374E38 @@ -714,22 +714,22 @@ gFieldEffectObjectImageAnim_8374E38: @ 8374E38 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle: @ 8374E8C +gFieldEffectAnimTable_BerryTreeGrowthSparkle: @ 8374E8C .4byte gFieldEffectObjectImageAnim_8374E38 .align 2 gFieldEffectObjectTemplate_BerryTreeGrowthSparkle: @ 8374E90 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_8128800 + spr_template 0xFFFF, 0xFFFF, gFieldOamData_16x16, gFieldEffectAnimTable_BerryTreeGrowthSparkle, gFieldEffectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_8128800 .align 2 -gFieldEffectObjectPicTable_TreeDisguise: @ 8374EA8 - obj_frame_tiles gFieldEffectObjectPic_TreeDisguise_0, 0x100 - obj_frame_tiles gFieldEffectObjectPic_TreeDisguise_1, 0x100 - obj_frame_tiles gFieldEffectObjectPic_TreeDisguise_2, 0x100 - obj_frame_tiles gFieldEffectObjectPic_TreeDisguise_3, 0x100 - obj_frame_tiles gFieldEffectObjectPic_TreeDisguise_4, 0x100 - obj_frame_tiles gFieldEffectObjectPic_TreeDisguise_5, 0x100 - obj_frame_tiles gFieldEffectObjectPic_TreeDisguise_6, 0x100 +gFieldEffectPicTable_TreeDisguise: @ 8374EA8 + obj_frame_tiles gFieldEffectPic_TreeDisguise_0, 0x100 + obj_frame_tiles gFieldEffectPic_TreeDisguise_1, 0x100 + obj_frame_tiles gFieldEffectPic_TreeDisguise_2, 0x100 + obj_frame_tiles gFieldEffectPic_TreeDisguise_3, 0x100 + obj_frame_tiles gFieldEffectPic_TreeDisguise_4, 0x100 + obj_frame_tiles gFieldEffectPic_TreeDisguise_5, 0x100 + obj_frame_tiles gFieldEffectPic_TreeDisguise_6, 0x100 .align 2 gFieldEffectObjectImageAnim_8374EE0: @ 8374EE0 @@ -748,23 +748,23 @@ gFieldEffectObjectImageAnim_8374EE8: @ 8374EE8 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_TreeDisguise: @ 8374F08 +gFieldEffectAnimTable_TreeDisguise: @ 8374F08 .4byte gFieldEffectObjectImageAnim_8374EE0 .4byte gFieldEffectObjectImageAnim_8374EE8 .align 2 gFieldEffectObjectTemplate_TreeDisguise: @ 8374F10 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_81285AC + spr_template 0xFFFF, 0xFFFF, gFieldOamData_16x32, gFieldEffectAnimTable_TreeDisguise, gFieldEffectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_81285AC .align 2 -gFieldEffectObjectPicTable_MountainDisguise: @ 8374F28 - obj_frame_tiles gFieldEffectObjectPic_MountainDisguise_0, 0x100 - obj_frame_tiles gFieldEffectObjectPic_MountainDisguise_1, 0x100 - obj_frame_tiles gFieldEffectObjectPic_MountainDisguise_2, 0x100 - obj_frame_tiles gFieldEffectObjectPic_MountainDisguise_3, 0x100 - obj_frame_tiles gFieldEffectObjectPic_MountainDisguise_4, 0x100 - obj_frame_tiles gFieldEffectObjectPic_MountainDisguise_5, 0x100 - obj_frame_tiles gFieldEffectObjectPic_MountainDisguise_6, 0x100 +gFieldEffectPicTable_MountainDisguise: @ 8374F28 + obj_frame_tiles gFieldEffectPic_MountainDisguise_0, 0x100 + obj_frame_tiles gFieldEffectPic_MountainDisguise_1, 0x100 + obj_frame_tiles gFieldEffectPic_MountainDisguise_2, 0x100 + obj_frame_tiles gFieldEffectPic_MountainDisguise_3, 0x100 + obj_frame_tiles gFieldEffectPic_MountainDisguise_4, 0x100 + obj_frame_tiles gFieldEffectPic_MountainDisguise_5, 0x100 + obj_frame_tiles gFieldEffectPic_MountainDisguise_6, 0x100 .align 2 gFieldEffectObjectImageAnim_8374F60: @ 8374F60 @@ -783,31 +783,31 @@ gFieldEffectObjectImageAnim_8374F68: @ 8374F68 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_MountainDisguise: @ 8374F88 +gFieldEffectAnimTable_MountainDisguise: @ 8374F88 .4byte gFieldEffectObjectImageAnim_8374F60 .4byte gFieldEffectObjectImageAnim_8374F68 .align 2 gFieldEffectObjectTemplate_MountainDisguise: @ 8374F90 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_81285AC + spr_template 0xFFFF, 0xFFFF, gFieldOamData_16x32, gFieldEffectAnimTable_MountainDisguise, gFieldEffectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_81285AC .align 2 -gFieldEffectObjectPicTable_SandDisguise: @ 8374FA8 - obj_frame_tiles gFieldEffectObjectPic_SandDisguise_0, 0x100 - obj_frame_tiles gFieldEffectObjectPic_SandDisguise_1, 0x100 - obj_frame_tiles gFieldEffectObjectPic_SandDisguise_2, 0x100 - obj_frame_tiles gFieldEffectObjectPic_SandDisguise_3, 0x100 - obj_frame_tiles gFieldEffectObjectPic_SandDisguise_4, 0x100 - obj_frame_tiles gFieldEffectObjectPic_SandDisguise_5, 0x100 - obj_frame_tiles gFieldEffectObjectPic_SandDisguise_6, 0x100 +gFieldEffectPicTable_SandDisguise: @ 8374FA8 + obj_frame_tiles gFieldEffectPic_SandDisguise_0, 0x100 + obj_frame_tiles gFieldEffectPic_SandDisguise_1, 0x100 + obj_frame_tiles gFieldEffectPic_SandDisguise_2, 0x100 + obj_frame_tiles gFieldEffectPic_SandDisguise_3, 0x100 + obj_frame_tiles gFieldEffectPic_SandDisguise_4, 0x100 + obj_frame_tiles gFieldEffectPic_SandDisguise_5, 0x100 + obj_frame_tiles gFieldEffectPic_SandDisguise_6, 0x100 .align 2 gFieldEffectObjectTemplate_SandDisguise: @ 8374FE0 - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguise, gDummySpriteAffineAnimTable, sub_81285AC + spr_template 0xFFFF, 0xFFFF, gFieldOamData_16x32, gFieldEffectAnimTable_TreeDisguise, gFieldEffectPicTable_SandDisguise, gDummySpriteAffineAnimTable, sub_81285AC .align 2 -gFieldEffectObjectPicTable_Bird: @ 8374FF8 - obj_frame_tiles gFieldEffectObjectPic_Bird, 0x200 +gFieldEffectPicTable_Bird: @ 8374FF8 + obj_frame_tiles gFieldEffectPic_Bird, 0x200 .align 2 gFieldEffectObjectImageAnim_8375000: @ 8375000 @@ -815,17 +815,17 @@ gFieldEffectObjectImageAnim_8375000: @ 8375000 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Bird: @ 8375008 +gFieldEffectAnimTable_Bird: @ 8375008 .4byte gFieldEffectObjectImageAnim_8375000 .align 2 gFieldEffectObjectTemplate_Bird: @ 837500C - spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 0xFFFF, gFieldOamData_32x32, gFieldEffectAnimTable_Bird, gFieldEffectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 -gFieldEffectObjectPicTable_ShortGrass: @ 8375024 - obj_frame_tiles gFieldEffectObjectPic_ShortGrass_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_ShortGrass_1, 0x80 +gFieldEffectPicTable_ShortGrass: @ 8375024 + obj_frame_tiles gFieldEffectPic_ShortGrass_0, 0x80 + obj_frame_tiles gFieldEffectPic_ShortGrass_1, 0x80 .align 2 gFieldEffectObjectImageAnim_8375034: @ 8375034 @@ -834,16 +834,16 @@ gFieldEffectObjectImageAnim_8375034: @ 8375034 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_ShortGrass: @ 8375040 +gFieldEffectAnimTable_ShortGrass: @ 8375040 .4byte gFieldEffectObjectImageAnim_8375034 .align 2 gFieldEffectObjectTemplate_ShortGrass: @ 8375044 - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8127334 + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_ShortGrass, gFieldEffectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8127334 .align 2 -gFieldEffectObjectPicTable_HotSpringsWater: @ 837505C - obj_frame_tiles gFieldEffectObjectPic_HotSpringsWater, 0x80 +gFieldEffectPicTable_HotSpringsWater: @ 837505C + obj_frame_tiles gFieldEffectPic_HotSpringsWater, 0x80 .align 2 gFieldEffectObjectImageAnim_8375064: @ 8375064 @@ -851,20 +851,20 @@ gFieldEffectObjectImageAnim_8375064: @ 8375064 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_HotSpringsWater: @ 837506C +gFieldEffectAnimTable_HotSpringsWater: @ 837506C .4byte gFieldEffectObjectImageAnim_8375064 .align 2 gFieldEffectObjectTemplate_HotSpringsWater: @ 8375070 - spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8127A7C + spr_template 0xFFFF, 0x1005, gFieldOamData_16x16, gFieldEffectAnimTable_HotSpringsWater, gFieldEffectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8127A7C .align 2 -gFieldEffectObjectPicTable_PopOutOfAsh: @ 8375088 - obj_frame_tiles gFieldEffectObjectPic_PopOutOfAsh_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_PopOutOfAsh_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_PopOutOfAsh_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_PopOutOfAsh_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_PopOutOfAsh_4, 0x80 +gFieldEffectPicTable_PopOutOfAsh: @ 8375088 + obj_frame_tiles gFieldEffectPic_PopOutOfAsh_0, 0x80 + obj_frame_tiles gFieldEffectPic_PopOutOfAsh_1, 0x80 + obj_frame_tiles gFieldEffectPic_PopOutOfAsh_2, 0x80 + obj_frame_tiles gFieldEffectPic_PopOutOfAsh_3, 0x80 + obj_frame_tiles gFieldEffectPic_PopOutOfAsh_4, 0x80 .align 2 gFieldEffectObjectImageAnim_83750B0: @ 83750B0 @@ -876,24 +876,24 @@ gFieldEffectObjectImageAnim_83750B0: @ 83750B0 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_PopOutOfAsh: @ 83750C8 +gFieldEffectAnimTable_PopOutOfAsh: @ 83750C8 .4byte gFieldEffectObjectImageAnim_83750B0 .align 2 gFieldEffectObjectTemplate_PopOutOfAsh: @ 83750CC - spr_template 0xFFFF, 0x100D, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_PopOutOfAsh, gFieldEffectObjectPicTable_PopOutOfAsh, gDummySpriteAffineAnimTable, sub_808788C + spr_template 0xFFFF, 0x100D, gFieldOamData_16x16, gFieldEffectAnimTable_PopOutOfAsh, gFieldEffectPicTable_PopOutOfAsh, gDummySpriteAffineAnimTable, sub_808788C .align 2 gFieldEffectObjectPaletteInfo2:: @ 83750E4 obj_pal gFieldEffectObjectPalette2, 0x100D .align 2 -gFieldEffectObjectPicTable_Unknown33: @ 83750EC - obj_frame_tiles gFieldEffectObjectPic_Unknown33_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown33_1, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown33_2, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown33_3, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown33_4, 0x80 +gFieldEffectPicTable_Unknown33: @ 83750EC + obj_frame_tiles gFieldEffectPic_Unknown33_0, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown33_1, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown33_2, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown33_3, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown33_4, 0x80 .align 2 gFieldEffectObjectImageAnim_8375114: @ 8375114 @@ -905,23 +905,23 @@ gFieldEffectObjectImageAnim_8375114: @ 8375114 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Unknown33: @ 837512C +gFieldEffectAnimTable_Unknown33: @ 837512C .4byte gFieldEffectObjectImageAnim_8375114 .align 2 gFieldEffectObjectTemplate_Unknown33: @ 8375130 - spr_template 0xFFFF, 0x100D, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_8087638 + spr_template 0xFFFF, 0x100D, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown33, gFieldEffectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_8087638 .align 2 -gFieldEffectObjectPicTable_Bubbles: @ 8375148 - obj_frame_tiles gFieldEffectObjectPic_Bubbles_0, 0x100 - obj_frame_tiles gFieldEffectObjectPic_Bubbles_1, 0x100 - obj_frame_tiles gFieldEffectObjectPic_Bubbles_2, 0x100 - obj_frame_tiles gFieldEffectObjectPic_Bubbles_3, 0x100 - obj_frame_tiles gFieldEffectObjectPic_Bubbles_4, 0x100 - obj_frame_tiles gFieldEffectObjectPic_Bubbles_5, 0x100 - obj_frame_tiles gFieldEffectObjectPic_Bubbles_6, 0x100 - obj_frame_tiles gFieldEffectObjectPic_Bubbles_7, 0x100 +gFieldEffectPicTable_Bubbles: @ 8375148 + obj_frame_tiles gFieldEffectPic_Bubbles_0, 0x100 + obj_frame_tiles gFieldEffectPic_Bubbles_1, 0x100 + obj_frame_tiles gFieldEffectPic_Bubbles_2, 0x100 + obj_frame_tiles gFieldEffectPic_Bubbles_3, 0x100 + obj_frame_tiles gFieldEffectPic_Bubbles_4, 0x100 + obj_frame_tiles gFieldEffectPic_Bubbles_5, 0x100 + obj_frame_tiles gFieldEffectPic_Bubbles_6, 0x100 + obj_frame_tiles gFieldEffectPic_Bubbles_7, 0x100 .align 2 gFieldEffectObjectImageAnim_8375188: @ 8375188 @@ -936,17 +936,17 @@ gFieldEffectObjectImageAnim_8375188: @ 8375188 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Bubbles: @ 83751AC +gFieldEffectAnimTable_Bubbles: @ 83751AC .4byte gFieldEffectObjectImageAnim_8375188 .align 2 gFieldEffectObjectTemplate_Bubbles: @ 83751B0 - spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8128410 + spr_template 0xFFFF, 0x1004, gFieldOamData_16x32, gFieldEffectAnimTable_Bubbles, gFieldEffectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8128410 .align 2 -gFieldEffectObjectPicTable_Unknown35: @ 83751C8 - obj_frame_tiles gFieldEffectObjectPic_Unknown35_0, 0x80 - obj_frame_tiles gFieldEffectObjectPic_Unknown35_1, 0x80 +gFieldEffectPicTable_Unknown35: @ 83751C8 + obj_frame_tiles gFieldEffectPic_Unknown35_0, 0x80 + obj_frame_tiles gFieldEffectPic_Unknown35_1, 0x80 .align 2 gFieldEffectObjectImageAnim_83751D8: @ 83751D8 @@ -956,12 +956,12 @@ gFieldEffectObjectImageAnim_83751D8: @ 83751D8 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnimTable_Unknown35: @ 83751E8 +gFieldEffectAnimTable_Unknown35: @ 83751E8 .4byte gFieldEffectObjectImageAnim_83751D8 .align 2 gFieldEffectObjectTemplate_Unknown35: @ 83751EC - spr_template 0xFFFF, 0x100F, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8128774 + spr_template 0xFFFF, 0x100F, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown35, gFieldEffectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8128774 .align 2 gFieldEffectObjectPaletteInfo3:: @ 8375204 diff --git a/data/graphics/field_objects/map_object_graphics.s b/data/graphics/field_objects/map_object_graphics.s index 380dcdfd4..5bf9ccc9c 100644 --- a/data/graphics/field_objects/map_object_graphics.s +++ b/data/graphics/field_objects/map_object_graphics.s @@ -4339,27 +4339,27 @@ gMapObjectPalette21: @ 835B848 .incbin "graphics/map_objects/palettes/21.gbapal" .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_0: @ 835B868 +gFieldEffectPic_BerryTreeGrowthSparkle_0: @ 835B868 .incbin "graphics/field_effect_objects/pics/berry_tree_growth_sparkle/0.4bpp" .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_1: @ 835B8E8 +gFieldEffectPic_BerryTreeGrowthSparkle_1: @ 835B8E8 .incbin "graphics/field_effect_objects/pics/berry_tree_growth_sparkle/1.4bpp" .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_2: @ 835B968 +gFieldEffectPic_BerryTreeGrowthSparkle_2: @ 835B968 .incbin "graphics/field_effect_objects/pics/berry_tree_growth_sparkle/2.4bpp" .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_3: @ 835B9E8 +gFieldEffectPic_BerryTreeGrowthSparkle_3: @ 835B9E8 .incbin "graphics/field_effect_objects/pics/berry_tree_growth_sparkle/3.4bpp" .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_4: @ 835BA68 +gFieldEffectPic_BerryTreeGrowthSparkle_4: @ 835BA68 .incbin "graphics/field_effect_objects/pics/berry_tree_growth_sparkle/4.4bpp" .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_5: @ 835BAE8 +gFieldEffectPic_BerryTreeGrowthSparkle_5: @ 835BAE8 .incbin "graphics/field_effect_objects/pics/berry_tree_growth_sparkle/5.4bpp" .align 2 @@ -5095,15 +5095,15 @@ gMapObjectPic_TamatoBerryTree_5: @ 8366FE8 .incbin "graphics/map_objects/pics/berry_trees/tamato/5.4bpp" .align 2 -gFieldEffectObjectPic_SurfBlob_0: @ 83670E8 +gFieldEffectPic_SurfBlob_0: @ 83670E8 .incbin "graphics/field_effect_objects/pics/surf_blob/0.4bpp" .align 2 -gFieldEffectObjectPic_SurfBlob_1: @ 83672E8 +gFieldEffectPic_SurfBlob_1: @ 83672E8 .incbin "graphics/field_effect_objects/pics/surf_blob/1.4bpp" .align 2 -gFieldEffectObjectPic_SurfBlob_2: @ 83674E8 +gFieldEffectPic_SurfBlob_2: @ 83674E8 .incbin "graphics/field_effect_objects/pics/surf_blob/2.4bpp" .align 2 diff --git a/data/graphics/field_objects/map_object_graphics_info.s b/data/graphics/field_objects/map_object_graphics_info.s index bb8683ad6..c446904b7 100644 --- a/data/graphics/field_objects/map_object_graphics_info.s +++ b/data/graphics/field_objects/map_object_graphics_info.s @@ -10,7 +10,7 @@ gMapObjectGraphicsInfo_BrendanNormal: @ 83718D4 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_BrendanNormal @@ -28,7 +28,7 @@ gMapObjectGraphicsInfo_BrendanMachBike: @ 83718F8 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BrendanMachBike @@ -46,7 +46,7 @@ gMapObjectGraphicsInfo_BrendanAcroBike: @ 837191C .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_BrendanAcroBike @@ -64,7 +64,7 @@ gMapObjectGraphicsInfo_BrendanSurfing: @ 8371940 .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Surfing .4byte gMapObjectPicTable_BrendanSurfing @@ -82,7 +82,7 @@ gMapObjectGraphicsInfo_BrendanFieldMove: @ 8371964 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_FieldMove .4byte gMapObjectPicTable_BrendanFieldMove @@ -100,7 +100,7 @@ gMapObjectGraphicsInfo_QuintyPlump: @ 8371988 .byte (SHADOW_SIZE_L << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_QuintyPlump .4byte gMapObjectPicTable_QuintyPlump @@ -118,7 +118,7 @@ gMapObjectGraphicsInfo_LittleBoy1: @ 83719AC .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleBoy1 @@ -136,7 +136,7 @@ gMapObjectGraphicsInfo_LittleGirl1: @ 83719D0 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleGirl1 @@ -154,7 +154,7 @@ gMapObjectGraphicsInfo_Boy1: @ 83719F4 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy1 @@ -172,7 +172,7 @@ gMapObjectGraphicsInfo_Girl1: @ 8371A18 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Girl1 @@ -190,7 +190,7 @@ gMapObjectGraphicsInfo_Boy2: @ 8371A3C .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy2 @@ -208,7 +208,7 @@ gMapObjectGraphicsInfo_Girl2: @ 8371A60 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Girl2 @@ -226,7 +226,7 @@ gMapObjectGraphicsInfo_LittleBoy2: @ 8371A84 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleBoy2 @@ -244,7 +244,7 @@ gMapObjectGraphicsInfo_LittleGirl2: @ 8371AA8 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleGirl2 @@ -262,7 +262,7 @@ gMapObjectGraphicsInfo_Boy3: @ 8371ACC .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy3 @@ -280,7 +280,7 @@ gMapObjectGraphicsInfo_Girl3: @ 8371AF0 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Girl3 @@ -298,7 +298,7 @@ gMapObjectGraphicsInfo_Boy4: @ 8371B14 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy4 @@ -316,7 +316,7 @@ gMapObjectGraphicsInfo_Woman1: @ 8371B38 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman1 @@ -334,7 +334,7 @@ gMapObjectGraphicsInfo_FatMan: @ 8371B5C .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_FatMan @@ -352,7 +352,7 @@ gMapObjectGraphicsInfo_Woman2: @ 8371B80 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman2 @@ -370,7 +370,7 @@ gMapObjectGraphicsInfo_Man1: @ 8371BA4 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man1 @@ -388,7 +388,7 @@ gMapObjectGraphicsInfo_Woman3: @ 8371BC8 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman3 @@ -406,7 +406,7 @@ gMapObjectGraphicsInfo_OldMan1: @ 8371BEC .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_OldMan1 @@ -424,7 +424,7 @@ gMapObjectGraphicsInfo_OldWoman1: @ 8371C10 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_OldWoman1 @@ -442,7 +442,7 @@ gMapObjectGraphicsInfo_Man2: @ 8371C34 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man2 @@ -460,7 +460,7 @@ gMapObjectGraphicsInfo_Woman4: @ 8371C58 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman4 @@ -478,7 +478,7 @@ gMapObjectGraphicsInfo_Man3: @ 8371C7C .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man3 @@ -496,7 +496,7 @@ gMapObjectGraphicsInfo_Woman5: @ 8371CA0 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman5 @@ -514,7 +514,7 @@ gMapObjectGraphicsInfo_Cook: @ 8371CC4 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Cook @@ -532,7 +532,7 @@ gMapObjectGraphicsInfo_Woman6: @ 8371CE8 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman6 @@ -550,7 +550,7 @@ gMapObjectGraphicsInfo_OldMan2: @ 8371D0C .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_OldMan2 @@ -568,7 +568,7 @@ gMapObjectGraphicsInfo_OldWoman2: @ 8371D30 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_OldWoman2 @@ -586,7 +586,7 @@ gMapObjectGraphicsInfo_Camper: @ 8371D54 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Camper @@ -604,7 +604,7 @@ gMapObjectGraphicsInfo_Picnicker: @ 8371D78 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Picnicker @@ -622,7 +622,7 @@ gMapObjectGraphicsInfo_Man4: @ 8371D9C .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man4 @@ -640,7 +640,7 @@ gMapObjectGraphicsInfo_Woman7: @ 8371DC0 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman7 @@ -658,7 +658,7 @@ gMapObjectGraphicsInfo_Youngster: @ 8371DE4 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Youngster @@ -676,7 +676,7 @@ gMapObjectGraphicsInfo_BugCatcher: @ 8371E08 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BugCatcher @@ -694,7 +694,7 @@ gMapObjectGraphicsInfo_PsychicM: @ 8371E2C .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_PsychicM @@ -712,7 +712,7 @@ gMapObjectGraphicsInfo_SchoolKidM: @ 8371E50 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SchoolKidM @@ -730,7 +730,7 @@ gMapObjectGraphicsInfo_Maniac: @ 8371E74 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Maniac @@ -748,7 +748,7 @@ gMapObjectGraphicsInfo_HexManiac: @ 8371E98 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_HexManiac @@ -766,7 +766,7 @@ gMapObjectGraphicsInfo_Woman8: @ 8371EBC .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman8 @@ -784,7 +784,7 @@ gMapObjectGraphicsInfo_SwimmerM: @ 8371EE0 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SwimmerM @@ -802,7 +802,7 @@ gMapObjectGraphicsInfo_SwimmerF: @ 8371F04 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SwimmerF @@ -820,7 +820,7 @@ gMapObjectGraphicsInfo_BlackBelt: @ 8371F28 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BlackBelt @@ -838,7 +838,7 @@ gMapObjectGraphicsInfo_Beauty: @ 8371F4C .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Beauty @@ -856,7 +856,7 @@ gMapObjectGraphicsInfo_Scientist1: @ 8371F70 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Scientist1 @@ -874,7 +874,7 @@ gMapObjectGraphicsInfo_Lass: @ 8371F94 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Lass @@ -892,7 +892,7 @@ gMapObjectGraphicsInfo_Gentleman: @ 8371FB8 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Gentleman @@ -910,7 +910,7 @@ gMapObjectGraphicsInfo_Sailor: @ 8371FDC .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Sailor @@ -928,7 +928,7 @@ gMapObjectGraphicsInfo_Fisherman: @ 8372000 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Fisherman @@ -946,7 +946,7 @@ gMapObjectGraphicsInfo_RunningTriathleteM: @ 8372024 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_RunningTriathleteM @@ -964,7 +964,7 @@ gMapObjectGraphicsInfo_RunningTriathleteF: @ 8372048 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_RunningTriathleteF @@ -982,7 +982,7 @@ gMapObjectGraphicsInfo_TuberF: @ 837206C .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_TuberF @@ -1000,7 +1000,7 @@ gMapObjectGraphicsInfo_TuberM: @ 8372090 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_TuberM @@ -1018,7 +1018,7 @@ gMapObjectGraphicsInfo_Hiker: @ 83720B4 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Hiker @@ -1036,7 +1036,7 @@ gMapObjectGraphicsInfo_CyclingTriathleteM: @ 83720D8 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_CyclingTriathleteM @@ -1054,7 +1054,7 @@ gMapObjectGraphicsInfo_CyclingTriathleteF: @ 83720FC .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_CyclingTriathleteF @@ -1072,7 +1072,7 @@ gMapObjectGraphicsInfo_Nurse: @ 8372120 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Nurse .4byte gMapObjectPicTable_Nurse @@ -1090,7 +1090,7 @@ gMapObjectGraphicsInfo_ItemBall: @ 8372144 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_ItemBall @@ -1108,7 +1108,7 @@ gMapObjectGraphicsInfo_BerryTree: @ 8372168 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte NULL @ OAM tables .4byte gMapObjectImageAnimTable_BerryTree .4byte gMapObjectPicTable_PechaBerryTree @@ -1126,7 +1126,7 @@ gMapObjectGraphicsInfo_BerryTreeEarlyStages: @ 837218C .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_BerryTree .4byte gMapObjectPicTable_PechaBerryTree @@ -1144,7 +1144,7 @@ gMapObjectGraphicsInfo_BerryTreeLateStages: @ 83721B0 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BerryTree .4byte gMapObjectPicTable_PechaBerryTree @@ -1162,7 +1162,7 @@ gMapObjectGraphicsInfo_ProfBirch: @ 83721D4 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_ProfBirch @@ -1180,7 +1180,7 @@ gMapObjectGraphicsInfo_Man5: @ 83721F8 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man5 @@ -1198,7 +1198,7 @@ gMapObjectGraphicsInfo_Man6: @ 837221C .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man6 @@ -1216,7 +1216,7 @@ gMapObjectGraphicsInfo_ReporterM: @ 8372240 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_ReporterM @@ -1234,7 +1234,7 @@ gMapObjectGraphicsInfo_ReporterF: @ 8372264 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_ReporterF @@ -1252,7 +1252,7 @@ gMapObjectGraphicsInfo_Bard: @ 8372288 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan1 @@ -1270,7 +1270,7 @@ gMapObjectGraphicsInfo_Hipster: @ 83722AC .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan1 @@ -1288,7 +1288,7 @@ gMapObjectGraphicsInfo_Trader: @ 83722D0 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan1 @@ -1306,7 +1306,7 @@ gMapObjectGraphicsInfo_Storyteller: @ 83722F4 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan2 @@ -1324,7 +1324,7 @@ gMapObjectGraphicsInfo_Giddy: @ 8372318 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan2 @@ -1342,7 +1342,7 @@ gMapObjectGraphicsInfo_UnusedMauvilleOldMan1: @ 837233C .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan2 @@ -1360,7 +1360,7 @@ gMapObjectGraphicsInfo_UnusedMauvilleOldMan2: @ 8372360 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan2 @@ -1378,7 +1378,7 @@ gMapObjectGraphicsInfo_UnusedNatuDoll: @ 8372384 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedNatuDoll @@ -1396,7 +1396,7 @@ gMapObjectGraphicsInfo_UnusedMagnemiteDoll: @ 83723A8 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedMagnemiteDoll @@ -1414,7 +1414,7 @@ gMapObjectGraphicsInfo_UnusedSquirtleDoll: @ 83723CC .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedSquirtleDoll @@ -1432,7 +1432,7 @@ gMapObjectGraphicsInfo_UnusedWooperDoll: @ 83723F0 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedWooperDoll @@ -1450,7 +1450,7 @@ gMapObjectGraphicsInfo_UnusedPikachuDoll: @ 8372414 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedPikachuDoll @@ -1468,7 +1468,7 @@ gMapObjectGraphicsInfo_UnusedPorygon2Doll: @ 8372438 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedPorygon2Doll @@ -1486,7 +1486,7 @@ gMapObjectGraphicsInfo_CuttableTree: @ 837245C .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_CuttableTree .4byte gMapObjectPicTable_CuttableTree @@ -1504,7 +1504,7 @@ gMapObjectGraphicsInfo_MartEmployee: @ 8372480 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MartEmployee @@ -1522,7 +1522,7 @@ gMapObjectGraphicsInfo_RooftopSaleWoman: @ 83724A4 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_RooftopSaleWoman @@ -1540,7 +1540,7 @@ gMapObjectGraphicsInfo_Teala: @ 83724C8 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Teala @@ -1558,7 +1558,7 @@ gMapObjectGraphicsInfo_BreakableRock: @ 83724EC .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_BreakableRock .4byte gMapObjectPicTable_BreakableRock @@ -1576,7 +1576,7 @@ gMapObjectGraphicsInfo_PushableBoulder: @ 8372510 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_PushableBoulder @@ -1594,7 +1594,7 @@ gMapObjectGraphicsInfo_MrBrineysBoat: @ 8372534 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MrBrineysBoat @@ -1612,7 +1612,7 @@ gMapObjectGraphicsInfo_MayNormal: @ 8372558 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_MayNormal @@ -1630,7 +1630,7 @@ gMapObjectGraphicsInfo_MayMachBike: @ 837257C .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MayMachBike @@ -1648,7 +1648,7 @@ gMapObjectGraphicsInfo_MayAcroBike: @ 83725A0 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_MayAcroBike @@ -1666,7 +1666,7 @@ gMapObjectGraphicsInfo_MaySurfing: @ 83725C4 .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Surfing .4byte gMapObjectPicTable_MaySurfing @@ -1684,7 +1684,7 @@ gMapObjectGraphicsInfo_MayFieldMove: @ 83725E8 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_FieldMove .4byte gMapObjectPicTable_MayFieldMove @@ -1702,7 +1702,7 @@ gMapObjectGraphicsInfo_Truck: @ 837260C .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_Truck .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_Truck @@ -1720,7 +1720,7 @@ gMapObjectGraphicsInfo_MachokeCarryingBox: @ 8372630 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MachokeCarryingBox @@ -1738,7 +1738,7 @@ gMapObjectGraphicsInfo_MachokeFacingAway: @ 8372654 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MachokeFacingAway @@ -1756,7 +1756,7 @@ gMapObjectGraphicsInfo_BirchsBag: @ 8372678 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BirchsBag @@ -1774,7 +1774,7 @@ gMapObjectGraphicsInfo_Poochyena: @ 837269C .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Poochyena @@ -1792,7 +1792,7 @@ gMapObjectGraphicsInfo_Artist: @ 83726C0 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Artist @@ -1810,7 +1810,7 @@ gMapObjectGraphicsInfo_RivalBrendanNormal: @ 83726E4 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_BrendanNormal @@ -1828,7 +1828,7 @@ gMapObjectGraphicsInfo_RivalBrendanMachBike: @ 8372708 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BrendanMachBike @@ -1846,7 +1846,7 @@ gMapObjectGraphicsInfo_RivalBrendanAcroBike: @ 837272C .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_BrendanAcroBike @@ -1864,7 +1864,7 @@ gMapObjectGraphicsInfo_RivalBrendanSurfing: @ 8372750 .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Surfing .4byte gMapObjectPicTable_BrendanSurfing @@ -1882,7 +1882,7 @@ gMapObjectGraphicsInfo_RivalBrendanFieldMove: @ 8372774 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_FieldMove .4byte gMapObjectPicTable_BrendanFieldMove @@ -1900,7 +1900,7 @@ gMapObjectGraphicsInfo_RivalMayNormal: @ 8372798 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_MayNormal @@ -1918,7 +1918,7 @@ gMapObjectGraphicsInfo_RivalMayMachBike: @ 83727BC .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MayMachBike @@ -1936,7 +1936,7 @@ gMapObjectGraphicsInfo_RivalMayAcroBike: @ 83727E0 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_BIKE_TIRE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_MayAcroBike @@ -1954,7 +1954,7 @@ gMapObjectGraphicsInfo_RivalMaySurfing: @ 8372804 .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Surfing .4byte gMapObjectPicTable_MaySurfing @@ -1972,7 +1972,7 @@ gMapObjectGraphicsInfo_RivalMayFieldMove: @ 8372828 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_FieldMove .4byte gMapObjectPicTable_MayFieldMove @@ -1990,7 +1990,7 @@ gMapObjectGraphicsInfo_Cameraman: @ 837284C .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Cameraman @@ -2008,7 +2008,7 @@ gMapObjectGraphicsInfo_BrendanUnderwater: @ 8372870 .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BrendanUnderwater @@ -2026,7 +2026,7 @@ gMapObjectGraphicsInfo_MayUnderwater: @ 8372894 .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MayUnderwater @@ -2044,7 +2044,7 @@ gMapObjectGraphicsInfo_MovingBox: @ 83728B8 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MovingBox @@ -2062,7 +2062,7 @@ gMapObjectGraphicsInfo_CableCar: @ 83728DC .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_64x64 + .4byte gFieldOamData_64x64 .4byte gMapObjectSubspriteTables_CableCar .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_CableCar @@ -2080,7 +2080,7 @@ gMapObjectGraphicsInfo_Scientist2: @ 8372900 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Scientist2 @@ -2098,7 +2098,7 @@ gMapObjectGraphicsInfo_Man7: @ 8372924 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man7 @@ -2116,7 +2116,7 @@ gMapObjectGraphicsInfo_AquaMemberM: @ 8372948 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_AquaMemberM @@ -2134,7 +2134,7 @@ gMapObjectGraphicsInfo_AquaMemberF: @ 837296C .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_AquaMemberF @@ -2152,7 +2152,7 @@ gMapObjectGraphicsInfo_MagmaMemberM: @ 8372990 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MagmaMemberM @@ -2170,7 +2170,7 @@ gMapObjectGraphicsInfo_MagmaMemberF: @ 83729B4 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MagmaMemberF @@ -2188,7 +2188,7 @@ gMapObjectGraphicsInfo_Sidney: @ 83729D8 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Sidney @@ -2206,7 +2206,7 @@ gMapObjectGraphicsInfo_Phoebe: @ 83729FC .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Phoebe @@ -2224,7 +2224,7 @@ gMapObjectGraphicsInfo_Glacia: @ 8372A20 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Glacia @@ -2242,7 +2242,7 @@ gMapObjectGraphicsInfo_Drake: @ 8372A44 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Drake @@ -2260,7 +2260,7 @@ gMapObjectGraphicsInfo_Roxanne: @ 8372A68 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Roxanne @@ -2278,7 +2278,7 @@ gMapObjectGraphicsInfo_Brawly: @ 8372A8C .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Brawly @@ -2296,7 +2296,7 @@ gMapObjectGraphicsInfo_Wattson: @ 8372AB0 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Wattson @@ -2314,7 +2314,7 @@ gMapObjectGraphicsInfo_Flannery: @ 8372AD4 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Flannery @@ -2332,7 +2332,7 @@ gMapObjectGraphicsInfo_Norman: @ 8372AF8 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Norman @@ -2350,7 +2350,7 @@ gMapObjectGraphicsInfo_Winona: @ 8372B1C .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Winona @@ -2368,7 +2368,7 @@ gMapObjectGraphicsInfo_Liza: @ 8372B40 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Liza @@ -2386,7 +2386,7 @@ gMapObjectGraphicsInfo_Tate: @ 8372B64 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Tate @@ -2404,7 +2404,7 @@ gMapObjectGraphicsInfo_Wallace: @ 8372B88 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Wallace @@ -2422,7 +2422,7 @@ gMapObjectGraphicsInfo_Steven: @ 8372BAC .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Steven @@ -2440,7 +2440,7 @@ gMapObjectGraphicsInfo_Wally: @ 8372BD0 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Wally @@ -2458,7 +2458,7 @@ gMapObjectGraphicsInfo_LittleBoy3: @ 8372BF4 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleBoy3 @@ -2476,7 +2476,7 @@ gMapObjectGraphicsInfo_BrendanFishing: @ 8372C18 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Fishing .4byte gMapObjectPicTable_BrendanFishing @@ -2494,7 +2494,7 @@ gMapObjectGraphicsInfo_MayFishing: @ 8372C3C .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Fishing .4byte gMapObjectPicTable_MayFishing @@ -2512,7 +2512,7 @@ gMapObjectGraphicsInfo_HotSpringsOldWoman: @ 8372C60 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_HotSpringsOldWoman @@ -2530,7 +2530,7 @@ gMapObjectGraphicsInfo_SSTidal: @ 8372C84 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_8x8 + .4byte gFieldOamData_8x8 .4byte gMapObjectSubspriteTables_SSTidal .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SSTidal @@ -2548,7 +2548,7 @@ gMapObjectGraphicsInfo_SubmarineShadow: @ 8372CA8 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_8x8 + .4byte gFieldOamData_8x8 .4byte gMapObjectSubspriteTables_SubmarineShadow .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SubmarineShadow @@ -2566,7 +2566,7 @@ gMapObjectGraphicsInfo_PichuDoll: @ 8372CCC .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_PichuDoll @@ -2584,7 +2584,7 @@ gMapObjectGraphicsInfo_PikachuDoll: @ 8372CF0 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_PikachuDoll @@ -2602,7 +2602,7 @@ gMapObjectGraphicsInfo_MarillDoll: @ 8372D14 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MarillDoll @@ -2620,7 +2620,7 @@ gMapObjectGraphicsInfo_TogepiDoll: @ 8372D38 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_TogepiDoll @@ -2638,7 +2638,7 @@ gMapObjectGraphicsInfo_CyndaquilDoll: @ 8372D5C .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_CyndaquilDoll @@ -2656,7 +2656,7 @@ gMapObjectGraphicsInfo_ChikoritaDoll: @ 8372D80 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_ChikoritaDoll @@ -2674,7 +2674,7 @@ gMapObjectGraphicsInfo_TotodileDoll: @ 8372DA4 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_TotodileDoll @@ -2692,7 +2692,7 @@ gMapObjectGraphicsInfo_JigglypuffDoll: @ 8372DC8 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_JigglypuffDoll @@ -2710,7 +2710,7 @@ gMapObjectGraphicsInfo_MeowthDoll: @ 8372DEC .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MeowthDoll @@ -2728,7 +2728,7 @@ gMapObjectGraphicsInfo_ClefairyDoll: @ 8372E10 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_ClefairyDoll @@ -2746,7 +2746,7 @@ gMapObjectGraphicsInfo_DittoDoll: @ 8372E34 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_DittoDoll @@ -2764,7 +2764,7 @@ gMapObjectGraphicsInfo_SmoochumDoll: @ 8372E58 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SmoochumDoll @@ -2782,7 +2782,7 @@ gMapObjectGraphicsInfo_TreeckoDoll: @ 8372E7C .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_TreeckoDoll @@ -2800,7 +2800,7 @@ gMapObjectGraphicsInfo_TorchicDoll: @ 8372EA0 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_TorchicDoll @@ -2818,7 +2818,7 @@ gMapObjectGraphicsInfo_MudkipDoll: @ 8372EC4 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MudkipDoll @@ -2836,7 +2836,7 @@ gMapObjectGraphicsInfo_DuskullDoll: @ 8372EE8 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_DuskullDoll @@ -2854,7 +2854,7 @@ gMapObjectGraphicsInfo_WynautDoll: @ 8372F0C .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_WynautDoll @@ -2872,7 +2872,7 @@ gMapObjectGraphicsInfo_BaltoyDoll: @ 8372F30 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BaltoyDoll @@ -2890,7 +2890,7 @@ gMapObjectGraphicsInfo_KecleonDoll: @ 8372F54 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_KecleonDoll @@ -2908,7 +2908,7 @@ gMapObjectGraphicsInfo_AzurillDoll: @ 8372F78 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_AzurillDoll @@ -2926,7 +2926,7 @@ gMapObjectGraphicsInfo_SkittyDoll: @ 8372F9C .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SkittyDoll @@ -2944,7 +2944,7 @@ gMapObjectGraphicsInfo_SwabluDoll: @ 8372FC0 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SwabluDoll @@ -2962,7 +2962,7 @@ gMapObjectGraphicsInfo_GulpinDoll: @ 8372FE4 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_GulpinDoll @@ -2980,7 +2980,7 @@ gMapObjectGraphicsInfo_LotadDoll: @ 8373008 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_LotadDoll @@ -2998,7 +2998,7 @@ gMapObjectGraphicsInfo_SeedotDoll: @ 837302C .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SeedotDoll @@ -3016,7 +3016,7 @@ gMapObjectGraphicsInfo_PikaCushion: @ 8373050 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_PikaCushion @@ -3034,7 +3034,7 @@ gMapObjectGraphicsInfo_RoundCushion: @ 8373074 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_RoundCushion @@ -3052,7 +3052,7 @@ gMapObjectGraphicsInfo_KissCushion: @ 8373098 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_KissCushion @@ -3070,7 +3070,7 @@ gMapObjectGraphicsInfo_ZigzagCushion: @ 83730BC .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_ZigzagCushion @@ -3088,7 +3088,7 @@ gMapObjectGraphicsInfo_SpinCushion: @ 83730E0 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SpinCushion @@ -3106,7 +3106,7 @@ gMapObjectGraphicsInfo_DiamondCushion: @ 8373104 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_DiamondCushion @@ -3124,7 +3124,7 @@ gMapObjectGraphicsInfo_BallCushion: @ 8373128 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BallCushion @@ -3142,7 +3142,7 @@ gMapObjectGraphicsInfo_GrassCushion: @ 837314C .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_GrassCushion @@ -3160,7 +3160,7 @@ gMapObjectGraphicsInfo_FireCushion: @ 8373170 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_FireCushion @@ -3178,7 +3178,7 @@ gMapObjectGraphicsInfo_WaterCushion: @ 8373194 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_WaterCushion @@ -3196,7 +3196,7 @@ gMapObjectGraphicsInfo_BigSnorlaxDoll: @ 83731B8 .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigSnorlaxDoll @@ -3214,7 +3214,7 @@ gMapObjectGraphicsInfo_BigRhydonDoll: @ 83731DC .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigRhydonDoll @@ -3232,7 +3232,7 @@ gMapObjectGraphicsInfo_BigLaprasDoll: @ 8373200 .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigLaprasDoll @@ -3250,7 +3250,7 @@ gMapObjectGraphicsInfo_BigVenusaurDoll: @ 8373224 .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigVenusaurDoll @@ -3268,7 +3268,7 @@ gMapObjectGraphicsInfo_BigCharizardDoll: @ 8373248 .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigCharizardDoll @@ -3286,7 +3286,7 @@ gMapObjectGraphicsInfo_BigBlastoiseDoll: @ 837326C .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigBlastoiseDoll @@ -3304,7 +3304,7 @@ gMapObjectGraphicsInfo_BigWailmerDoll: @ 8373290 .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigWailmerDoll @@ -3322,7 +3322,7 @@ gMapObjectGraphicsInfo_BigRegirockDoll: @ 83732B4 .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigRegirockDoll @@ -3340,7 +3340,7 @@ gMapObjectGraphicsInfo_BigRegiceDoll: @ 83732D8 .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigRegiceDoll @@ -3358,7 +3358,7 @@ gMapObjectGraphicsInfo_BigRegisteelDoll: @ 83732FC .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigRegisteelDoll @@ -3376,7 +3376,7 @@ gMapObjectGraphicsInfo_Latias: @ 8373320 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LatiasLatios @@ -3394,7 +3394,7 @@ gMapObjectGraphicsInfo_Latios: @ 8373344 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LatiasLatios @@ -3412,7 +3412,7 @@ gMapObjectGraphicsInfo_Boy5: @ 8373368 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy5 @@ -3430,7 +3430,7 @@ gMapObjectGraphicsInfo_ContestJudge: @ 837338C .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_ContestJudge @@ -3448,7 +3448,7 @@ gMapObjectGraphicsInfo_BrendanWatering: @ 83733B0 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BrendanWatering @@ -3466,7 +3466,7 @@ gMapObjectGraphicsInfo_MayWatering: @ 83733D4 .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MayWatering @@ -3484,7 +3484,7 @@ gMapObjectGraphicsInfo_BrendanDecorating: @ 83733F8 .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BrendanDecorating @@ -3502,7 +3502,7 @@ gMapObjectGraphicsInfo_MayDecorating: @ 837341C .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MayDecorating @@ -3520,7 +3520,7 @@ gMapObjectGraphicsInfo_Archie: @ 8373440 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Archie @@ -3538,7 +3538,7 @@ gMapObjectGraphicsInfo_Maxie: @ 8373464 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Maxie @@ -3556,7 +3556,7 @@ gMapObjectGraphicsInfo_Kyogre1: @ 8373488 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Kyogre @@ -3574,7 +3574,7 @@ gMapObjectGraphicsInfo_Groudon1: @ 83734AC .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Groudon @@ -3592,7 +3592,7 @@ gMapObjectGraphicsInfo_Fossil: @ 83734D0 .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_NONE .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_Fossil @@ -3610,7 +3610,7 @@ gMapObjectGraphicsInfo_Regirock: @ 83734F4 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Regi @@ -3628,7 +3628,7 @@ gMapObjectGraphicsInfo_Regice: @ 8373518 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Regi @@ -3646,7 +3646,7 @@ gMapObjectGraphicsInfo_Registeel: @ 837353C .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Regi @@ -3664,7 +3664,7 @@ gMapObjectGraphicsInfo_Skitty: @ 8373560 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Skitty @@ -3682,7 +3682,7 @@ gMapObjectGraphicsInfo_Kecleon1: @ 8373584 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Kecleon @@ -3700,7 +3700,7 @@ gMapObjectGraphicsInfo_Kyogre2: @ 83735A8 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Kyogre @@ -3718,7 +3718,7 @@ gMapObjectGraphicsInfo_Groudon2: @ 83735CC .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Groudon @@ -3736,7 +3736,7 @@ gMapObjectGraphicsInfo_Rayquaza: @ 83735F0 .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 + .4byte gFieldOamData_32x32 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Rayquaza @@ -3754,7 +3754,7 @@ gMapObjectGraphicsInfo_Zigzagoon: @ 8373614 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Zigzagoon @@ -3772,7 +3772,7 @@ gMapObjectGraphicsInfo_Pikachu: @ 8373638 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Pikachu @@ -3790,7 +3790,7 @@ gMapObjectGraphicsInfo_Azumarill: @ 837365C .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Azumarill @@ -3808,7 +3808,7 @@ gMapObjectGraphicsInfo_Wingull: @ 8373680 .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Wingull @@ -3826,7 +3826,7 @@ gMapObjectGraphicsInfo_Kecleon2: @ 83736A4 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Kecleon @@ -3844,7 +3844,7 @@ gMapObjectGraphicsInfo_TuberMSwimming: @ 83736C8 .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_TuberMSwimming @@ -3862,7 +3862,7 @@ gMapObjectGraphicsInfo_Azurill: @ 83736EC .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 + .4byte gFieldOamData_16x16 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Azurill @@ -3880,7 +3880,7 @@ gMapObjectGraphicsInfo_Mom: @ 8373710 .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Mom @@ -3898,7 +3898,7 @@ gMapObjectGraphicsInfo_LinkBrendan: @ 8373734 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_BrendanNormal @@ -3916,7 +3916,7 @@ gMapObjectGraphicsInfo_LinkMay: @ 8373758 .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot .byte TRACKS_FOOT .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 + .4byte gFieldOamData_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_MayNormal |