Move object event subsprites to src
This commit is contained in:
GriffinR
@@ -3967,436 +3967,4 @@ gObjectEventBaseOam_32x32:: @ 83A3718
|
||||
gObjectEventBaseOam_64x64:: @ 83A3720
|
||||
.4byte 0xc0000000, 0x00000800
|
||||
|
||||
gSubsprites_83A3728:: @ 83A3728
|
||||
subsprite 248, 248, 2, 0x0000, 16x16
|
||||
|
||||
gSubsprites_83A372C:: @ 83A372C
|
||||
subsprite 248, 248, 1, 0x0000, 16x16
|
||||
|
||||
gSubsprites_83A3730:: @ 83A3730
|
||||
subsprite 248, 248, 2, 0x0000, 16x8
|
||||
subsprite 248, 0, 3, 0x0002, 16x8
|
||||
|
||||
gSubsprites_83A3738:: @ 83A3738
|
||||
subsprite 248, 248, 2, 0x0000, 16x16
|
||||
subsprite 248, 248, 3, 0x0000, 16x16
|
||||
|
||||
gSubsprites_83A3740:: @ 83A3740
|
||||
subsprite 248, 248, 1, 0x0000, 16x16
|
||||
subsprite 248, 248, 3, 0x0000, 16x16
|
||||
|
||||
gSubspriteTables_83A3748:: @ 83A3748
|
||||
.byte 0
|
||||
.align 2
|
||||
.4byte NULL
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3728
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A372C
|
||||
.byte 2
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3730
|
||||
.byte 2
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3738
|
||||
.byte 2
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3740
|
||||
|
||||
gSubsprites_83A3778:: @ 83A3778
|
||||
subsprite 248, 240, 2, 0x0000, 16x32
|
||||
|
||||
gSubsprites_83A377C:: @ 83A377C
|
||||
subsprite 248, 240, 1, 0x0000, 16x32
|
||||
|
||||
gSubsprites_83A3780:: @ 83A3780
|
||||
subsprite 248, 240, 2, 0x0000, 16x16
|
||||
subsprite 248, 0, 2, 0x0004, 16x8
|
||||
subsprite 248, 8, 3, 0x0006, 16x8
|
||||
|
||||
gSubsprites_83A378C:: @ 83A378C
|
||||
subsprite 248, 240, 2, 0x0000, 16x16
|
||||
subsprite 248, 0, 3, 0x0004, 16x16
|
||||
|
||||
gSubsprites_83A3794:: @ 83A3794
|
||||
subsprite 248, 240, 1, 0x0000, 16x16
|
||||
subsprite 248, 0, 3, 0x0004, 16x16
|
||||
|
||||
gSubspriteTables_83A379C:: @ 83A379C
|
||||
.byte 0
|
||||
.align 2
|
||||
.4byte NULL
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3778
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A377C
|
||||
.byte 3
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3780
|
||||
.byte 2
|
||||
.align 2
|
||||
.4byte gSubsprites_83A378C
|
||||
.byte 2
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3794
|
||||
|
||||
gSubsprites_83A37CC:: @ 83A37CC
|
||||
subsprite 240, 240, 2, 0x0000, 32x32
|
||||
|
||||
gSubsprites_83A37D0:: @ 83A37D0
|
||||
subsprite 240, 240, 1, 0x0000, 32x32
|
||||
|
||||
gSubsprites_83A37D4:: @ 83A37D4
|
||||
subsprite 240, 240, 2, 0x0000, 32x16
|
||||
subsprite 240, 0, 2, 0x0008, 32x8
|
||||
subsprite 240, 8, 3, 0x000c, 32x8
|
||||
|
||||
gSubsprites_83A37E0:: @ 83A37E0
|
||||
subsprite 240, 240, 2, 0x0000, 32x16
|
||||
subsprite 240, 0, 3, 0x0008, 32x16
|
||||
|
||||
gSubsprites_83A37E8:: @ 83A37E8
|
||||
subsprite 240, 240, 1, 0x0000, 32x16
|
||||
subsprite 240, 0, 3, 0x0008, 32x16
|
||||
|
||||
gSubspriteTables_83A37F0:: @ 83A37F0
|
||||
.byte 0
|
||||
.align 2
|
||||
.4byte NULL
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A37CC
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A37D0
|
||||
.byte 3
|
||||
.align 2
|
||||
.4byte gSubsprites_83A37D4
|
||||
.byte 2
|
||||
.align 2
|
||||
.4byte gSubsprites_83A37E0
|
||||
.byte 2
|
||||
.align 2
|
||||
.4byte gSubsprites_83A37E8
|
||||
|
||||
gUnknown_83A3820:: @ 83A3820
|
||||
subsprite 232, 232, 2, 0, 32x8
|
||||
subsprite 8, 232, 2, 4, 16x8
|
||||
subsprite 232, 240, 2, 6, 32x8
|
||||
subsprite 8, 240, 2, 10, 16x8
|
||||
subsprite 232, 248, 2, 12, 32x8
|
||||
subsprite 8, 248, 2, 16, 16x8
|
||||
subsprite 232, 0, 2, 18, 32x8
|
||||
subsprite 8, 0, 2, 22, 16x8
|
||||
subsprite 232, 8, 2, 24, 32x8
|
||||
subsprite 8, 8, 2, 28, 16x8
|
||||
subsprite 232, 16, 2, 30, 32x8
|
||||
subsprite 8, 16, 2, 34, 16x8
|
||||
|
||||
gUnknown_83A3850:: @ 83A3850
|
||||
.byte 0xC
|
||||
.align 2
|
||||
.4byte gUnknown_83A3820
|
||||
.byte 0xC
|
||||
.align 2
|
||||
.4byte gUnknown_83A3820
|
||||
.byte 0xC
|
||||
.align 2
|
||||
.4byte gUnknown_83A3820
|
||||
.byte 0xC
|
||||
.align 2
|
||||
.4byte gUnknown_83A3820
|
||||
.byte 0xC
|
||||
.align 2
|
||||
.4byte gUnknown_83A3820
|
||||
.byte 0xC
|
||||
.align 2
|
||||
.4byte gUnknown_83A3820
|
||||
|
||||
gUnknown_83A3880:: @ 83A3880
|
||||
subsprite 224, 240, 2, 0, 64x32
|
||||
|
||||
gUnknown_83A3884:: @ 83A3884
|
||||
subsprite 224, 240, 1, 0, 64x32
|
||||
|
||||
gUnknown_83A3888:: @ 83A3888
|
||||
subsprite 224, 240, 2, 0, 64x32
|
||||
|
||||
gUnknown_83A388C:: @ 83A388C
|
||||
subsprite 224, 240, 2, 0, 64x32
|
||||
|
||||
gUnknown_83A3890:: @ 83A3890
|
||||
.byte 0x0
|
||||
.align 2
|
||||
.4byte NULL
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gUnknown_83A3880
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gUnknown_83A3884
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gUnknown_83A3888
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gUnknown_83A388C
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gUnknown_83A388C
|
||||
|
||||
gSubsprites_83A38C0:: @ 83A38C0
|
||||
subsprite 224, 224, 2, 0x0000, 64x64
|
||||
|
||||
gSubsprites_83A38C4:: @ 83A38C4
|
||||
subsprite 224, 224, 1, 0x0000, 64x64
|
||||
|
||||
gSubsprites_83A38C8:: @ 83A38C8
|
||||
subsprite 224, 224, 2, 0x0000, 64x64
|
||||
|
||||
gSubsprites_83A38CC:: @ 83A38CC
|
||||
subsprite 224, 224, 2, 0x0000, 64x64
|
||||
|
||||
gSubspriteTables_83A38D0:: @ 83A38D0
|
||||
.byte 0
|
||||
.align 2
|
||||
.4byte NULL
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A38C0
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A38C4
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A38C8
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A38CC
|
||||
.byte 1
|
||||
.align 2
|
||||
.4byte gSubsprites_83A38CC
|
||||
|
||||
gUnknown_83A3900:: @ 83A3900
|
||||
subsprite 208, 236, 2, 0, 32x8
|
||||
subsprite 240, 236, 2, 4, 32x8
|
||||
subsprite 16, 236, 2, 8, 32x8
|
||||
subsprite 208, 244, 2, 12, 32x8
|
||||
subsprite 240, 244, 2, 16, 32x8
|
||||
subsprite 16, 244, 2, 20, 32x8
|
||||
subsprite 208, 252, 2, 24, 32x8
|
||||
subsprite 240, 252, 2, 28, 32x8
|
||||
subsprite 16, 252, 2, 32, 32x8
|
||||
subsprite 208, 4, 2, 36, 32x8
|
||||
subsprite 240, 4, 2, 40, 32x8
|
||||
subsprite 16, 4, 2, 44, 32x8
|
||||
subsprite 208, 12, 2, 48, 32x8
|
||||
subsprite 240, 12, 2, 52, 32x8
|
||||
subsprite 16, 12, 2, 56, 32x8
|
||||
|
||||
gUnknown_83A393C:: @ 83A393C
|
||||
subsprite 208, 236, 1, 0, 32x8
|
||||
subsprite 240, 236, 1, 4, 32x8
|
||||
subsprite 16, 236, 1, 8, 32x8
|
||||
subsprite 208, 244, 1, 12, 32x8
|
||||
subsprite 240, 244, 1, 16, 32x8
|
||||
subsprite 16, 244, 1, 20, 32x8
|
||||
subsprite 208, 252, 1, 24, 32x8
|
||||
subsprite 240, 252, 1, 28, 32x8
|
||||
subsprite 16, 252, 1, 32, 32x8
|
||||
subsprite 208, 4, 1, 36, 32x8
|
||||
subsprite 240, 4, 1, 40, 32x8
|
||||
subsprite 16, 4, 1, 44, 32x8
|
||||
subsprite 208, 12, 1, 48, 32x8
|
||||
subsprite 240, 12, 1, 52, 32x8
|
||||
subsprite 16, 12, 1, 56, 32x8
|
||||
|
||||
gUnknown_83A3978:: @ 83A3978
|
||||
subsprite 208, 236, 2, 0, 32x8
|
||||
subsprite 240, 236, 2, 4, 32x8
|
||||
subsprite 16, 236, 2, 8, 32x8
|
||||
subsprite 208, 244, 2, 12, 32x8
|
||||
subsprite 240, 244, 2, 16, 32x8
|
||||
subsprite 16, 244, 2, 20, 32x8
|
||||
subsprite 208, 252, 2, 24, 32x8
|
||||
subsprite 240, 252, 2, 28, 32x8
|
||||
subsprite 16, 252, 2, 32, 32x8
|
||||
subsprite 208, 4, 2, 36, 32x8
|
||||
subsprite 240, 4, 2, 40, 32x8
|
||||
subsprite 16, 4, 2, 44, 32x8
|
||||
subsprite 208, 12, 2, 48, 32x8
|
||||
subsprite 240, 12, 2, 52, 32x8
|
||||
subsprite 16, 12, 2, 56, 32x8
|
||||
|
||||
gUnknown_83A39B4:: @ 83A39B4
|
||||
subsprite 208, 236, 1, 0, 32x8
|
||||
subsprite 240, 236, 1, 4, 32x8
|
||||
subsprite 16, 236, 1, 8, 32x8
|
||||
subsprite 208, 244, 1, 12, 32x8
|
||||
subsprite 240, 244, 1, 16, 32x8
|
||||
subsprite 16, 244, 1, 20, 32x8
|
||||
subsprite 208, 252, 2, 24, 32x8
|
||||
subsprite 240, 252, 2, 28, 32x8
|
||||
subsprite 16, 252, 2, 32, 32x8
|
||||
subsprite 208, 4, 2, 36, 32x8
|
||||
subsprite 240, 4, 2, 40, 32x8
|
||||
subsprite 16, 4, 2, 44, 32x8
|
||||
subsprite 208, 12, 2, 48, 32x8
|
||||
subsprite 240, 12, 2, 52, 32x8
|
||||
subsprite 16, 12, 2, 56, 32x8
|
||||
|
||||
gUnknown_83A39F0:: @ 83A39F0
|
||||
.byte 0xF
|
||||
.align 2
|
||||
.4byte gUnknown_83A3900
|
||||
.byte 0xF
|
||||
.align 2
|
||||
.4byte gUnknown_83A3900
|
||||
.byte 0xF
|
||||
.align 2
|
||||
.4byte gUnknown_83A393C
|
||||
.byte 0xF
|
||||
.align 2
|
||||
.4byte gUnknown_83A3978
|
||||
.byte 0xF
|
||||
.align 2
|
||||
.4byte gUnknown_83A39B4
|
||||
.byte 0xF
|
||||
.align 2
|
||||
.4byte gUnknown_83A39B4
|
||||
|
||||
gSubsprites_83A3A20:: @ 83A3A20
|
||||
subsprite 224, 240, 2, 0x0000, 64x32
|
||||
subsprite 32, 240, 2, 0x0020, 64x32
|
||||
subsprite 224, 16, 2, 0x0040, 64x32
|
||||
subsprite 32, 16, 2, 0x0060, 64x32
|
||||
|
||||
gSubsprites_83A3A30:: @ 83A3A30
|
||||
subsprite 224, 240, 1, 0x0000, 64x32
|
||||
subsprite 32, 240, 1, 0x0020, 64x32
|
||||
subsprite 224, 16, 1, 0x0040, 64x32
|
||||
subsprite 32, 16, 1, 0x0060, 64x32
|
||||
|
||||
gSubsprites_83A3A40:: @ 83A3A40
|
||||
subsprite 224, 240, 1, 0x0000, 64x32
|
||||
subsprite 32, 240, 1, 0x0020, 64x32
|
||||
subsprite 224, 16, 2, 0x0040, 64x32
|
||||
subsprite 32, 16, 2, 0x0060, 64x32
|
||||
|
||||
gSubspriteTables_83A3A50:: @ 83A3A50
|
||||
.byte 4
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3A20
|
||||
.byte 4
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3A20
|
||||
.byte 4
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3A30
|
||||
.byte 4
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3A40
|
||||
.byte 4
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3A40
|
||||
.byte 4
|
||||
.align 2
|
||||
.4byte gSubsprites_83A3A40
|
||||
|
||||
gUnknown_83A3A80:: @ 83A3A80
|
||||
subsprite 208, 236, 2, 0, 32x8
|
||||
subsprite 240, 236, 2, 4, 32x8
|
||||
subsprite 16, 236, 2, 8, 16x8
|
||||
subsprite 32, 236, 2, 10, 8x8
|
||||
subsprite 208, 244, 2, 11, 32x8
|
||||
subsprite 240, 244, 2, 15, 32x8
|
||||
subsprite 16, 244, 2, 19, 16x8
|
||||
subsprite 32, 244, 2, 21, 8x8
|
||||
subsprite 208, 252, 2, 22, 32x8
|
||||
subsprite 240, 252, 2, 26, 32x8
|
||||
subsprite 16, 252, 2, 30, 16x8
|
||||
subsprite 32, 252, 2, 32, 8x8
|
||||
subsprite 208, 4, 2, 33, 32x8
|
||||
subsprite 240, 4, 2, 37, 32x8
|
||||
subsprite 16, 4, 2, 41, 16x8
|
||||
subsprite 32, 4, 2, 43, 8x8
|
||||
|
||||
gUnknown_83A3AC0:: @ 83A3AC0
|
||||
subsprite 208, 236, 1, 0, 32x8
|
||||
subsprite 240, 236, 1, 4, 32x8
|
||||
subsprite 16, 236, 1, 8, 16x8
|
||||
subsprite 32, 236, 1, 10, 8x8
|
||||
subsprite 208, 244, 1, 11, 32x8
|
||||
subsprite 240, 244, 1, 15, 32x8
|
||||
subsprite 16, 244, 1, 19, 16x8
|
||||
subsprite 32, 244, 1, 21, 8x8
|
||||
subsprite 208, 252, 1, 22, 32x8
|
||||
subsprite 240, 252, 1, 26, 32x8
|
||||
subsprite 16, 252, 1, 30, 16x8
|
||||
subsprite 32, 252, 1, 32, 8x8
|
||||
subsprite 208, 4, 1, 33, 32x8
|
||||
subsprite 240, 4, 1, 37, 32x8
|
||||
subsprite 16, 4, 1, 41, 16x8
|
||||
subsprite 32, 4, 1, 43, 8x8
|
||||
|
||||
gUnknown_83A3B00:: @ 83A3B00
|
||||
subsprite 208, 236, 2, 0, 32x8
|
||||
subsprite 240, 236, 2, 4, 32x8
|
||||
subsprite 16, 236, 2, 8, 16x8
|
||||
subsprite 32, 236, 2, 10, 8x8
|
||||
subsprite 208, 244, 2, 11, 32x8
|
||||
subsprite 240, 244, 2, 15, 32x8
|
||||
subsprite 16, 244, 2, 19, 16x8
|
||||
subsprite 32, 244, 2, 21, 8x8
|
||||
subsprite 208, 252, 2, 22, 32x8
|
||||
subsprite 240, 252, 2, 26, 32x8
|
||||
subsprite 16, 252, 2, 30, 16x8
|
||||
subsprite 32, 252, 2, 32, 8x8
|
||||
subsprite 208, 4, 2, 33, 32x8
|
||||
subsprite 240, 4, 2, 37, 32x8
|
||||
subsprite 16, 4, 2, 41, 16x8
|
||||
subsprite 32, 4, 2, 43, 8x8
|
||||
|
||||
gUnknown_83A3B40:: @ 83A3B40
|
||||
subsprite 208, 236, 1, 0, 32x8
|
||||
subsprite 240, 236, 1, 4, 32x8
|
||||
subsprite 16, 236, 1, 8, 16x8
|
||||
subsprite 32, 236, 1, 10, 8x8
|
||||
subsprite 208, 244, 1, 11, 32x8
|
||||
subsprite 240, 244, 1, 15, 32x8
|
||||
subsprite 16, 244, 1, 19, 16x8
|
||||
subsprite 32, 244, 1, 21, 8x8
|
||||
subsprite 208, 252, 2, 22, 32x8
|
||||
subsprite 240, 252, 2, 26, 32x8
|
||||
subsprite 16, 252, 2, 30, 16x8
|
||||
subsprite 32, 252, 2, 32, 8x8
|
||||
subsprite 208, 4, 2, 33, 32x8
|
||||
subsprite 240, 4, 2, 37, 32x8
|
||||
subsprite 16, 4, 2, 41, 16x8
|
||||
subsprite 32, 4, 2, 43, 8x8
|
||||
|
||||
gUnknown_83A3B80:: @ 83A3B80
|
||||
.byte 0x10
|
||||
.align 2
|
||||
.4byte gUnknown_83A3A80
|
||||
.byte 0x10
|
||||
.align 2
|
||||
.4byte gUnknown_83A3A80
|
||||
.byte 0x10
|
||||
.align 2
|
||||
.4byte gUnknown_83A3AC0
|
||||
.byte 0x10
|
||||
.align 2
|
||||
.4byte gUnknown_83A3B00
|
||||
.byte 0x10
|
||||
.align 2
|
||||
.4byte gUnknown_83A3B40
|
||||
.byte 0x10
|
||||
.align 2
|
||||
.4byte gUnknown_83A3B40
|
||||
|
||||
@9186
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -718,8 +718,8 @@ extern const union AffineAnimCmd * const gDummySpriteAffineAnimTable[];
|
||||
#include "data/field_effects/field_effect_object_template_pointers.h"
|
||||
#include "data/object_events/object_event_pic_tables.h"
|
||||
#include "data/object_events/object_event_anims.h"
|
||||
#include "data/object_events/base_oam.h"
|
||||
#include "data/object_events/object_event_subsprites.h"*/
|
||||
#include "data/object_events/base_oam.h"*/
|
||||
#include "data/object_events/object_event_subsprites.h"
|
||||
#include "data/object_events/object_event_graphics_info.h"
|
||||
|
||||
const struct SpritePalette sObjectEventSpritePalettes[] = {
|
||||
|
||||
Reference in New Issue
Block a user