summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-12-17 18:49:34 -0500
committergarak <garakmon@gmail.com>2019-12-17 18:49:34 -0500
commitddaa88390e53665c6ac73af5e1a2f519dbddb5c6 (patch)
tree858be7225887b625817074966666d467ef5f716b
parent47d9fbef9339004364d65861ac661c1bd20419c8 (diff)
eventobject -> objectevent take 3
Diffstat
-rw-r--r--asm/event_object_80688E4.s6
-rw-r--r--asm/event_object_movement.s14
-rw-r--r--asm/field_effect.s40
-rw-r--r--asm/field_player_avatar.s14
-rw-r--r--asm/item_menu.s2
-rw-r--r--asm/naming_screen.s2
-rw-r--r--asm/overworld.s2
-rw-r--r--asm/shop.s2
-rw-r--r--berry_fix/payload/include/constants/vars.h2
-rw-r--r--berry_fix/payload/include/global.fieldmap.h14
-rw-r--r--berry_fix/payload/include/global.h4
-rw-r--r--data/event_object_movement.s394
-rw-r--r--include/event_object_80688E4.h2
-rw-r--r--include/event_object_movement.h4
-rw-r--r--src/battle_setup.c34
-rw-r--r--src/battle_transition.c4
-rw-r--r--src/event_object_lock.c2
-rw-r--r--src/field_fadetransition.c18
-rw-r--r--src/fldeff_rocksmash.c2
-rw-r--r--src/item_use.c2
-rw-r--r--src/quest_log.c4
-rw-r--r--src/quest_log_8150454.c2
-rw-r--r--src/shop.c8
-rw-r--r--src/start_menu.c2
-rw-r--r--src/teachy_tv.c2
-rw-r--r--tools/mapjson/mapjson.cpp4
26 files changed, 293 insertions, 293 deletions
diff --git a/asm/event_object_80688E4.s b/asm/event_object_80688E4.s
index 910e528ab..1482529fe 100644
--- a/asm/event_object_80688E4.s
+++ b/asm/event_object_80688E4.s
@@ -82,8 +82,8 @@ _0806896E:
bx r1
thumb_func_end FreezeObjectEvent
- thumb_func_start FreezeEventObjects
-FreezeEventObjects: @ 8068974
+ thumb_func_start FreezeObjectEvents
+FreezeObjectEvents: @ 8068974
push {r4,r5,lr}
movs r4, 0
ldr r5, _080689A8 @ =gObjectEvents
@@ -114,7 +114,7 @@ _08068998:
.align 2, 0
_080689A8: .4byte gObjectEvents
_080689AC: .4byte gPlayerAvatar
- thumb_func_end FreezeEventObjects
+ thumb_func_end FreezeObjectEvents
thumb_func_start FreezeObjectEventsExceptOne
FreezeObjectEventsExceptOne: @ 80689B0
diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s
index 25c35b1a0..66207007c 100644
--- a/asm/event_object_movement.s
+++ b/asm/event_object_movement.s
@@ -1550,8 +1550,8 @@ MakeObjectTemplateFromObjectEventTemplate: @ 805E960
bx r0
thumb_func_end MakeObjectTemplateFromObjectEventTemplate
- thumb_func_start AddPseudoEventObject
-AddPseudoEventObject: @ 805E978
+ thumb_func_start AddPseudoObjectEvent
+AddPseudoObjectEvent: @ 805E978
push {r4-r6,lr}
sub sp, 0x1C
ldr r4, [sp, 0x2C]
@@ -1612,7 +1612,7 @@ _0805E9E4:
.align 2, 0
_0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gSprites
- thumb_func_end AddPseudoEventObject
+ thumb_func_end AddPseudoObjectEvent
thumb_func_start sprite_new
sprite_new: @ 805E9F8
@@ -2440,8 +2440,8 @@ _0805F058: .4byte gPlayerAvatar
_0805F05C: .4byte gObjectEvents
thumb_func_end SetPlayerAvatarObjectEventIdAndObjectId
- thumb_func_start EventObjectSetGraphicsId
-EventObjectSetGraphicsId: @ 805F060
+ thumb_func_start ObjectEventSetGraphicsId
+ObjectEventSetGraphicsId: @ 805F060
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2625,7 +2625,7 @@ _0805F1BA:
_0805F1CC: .4byte gSprites
_0805F1D0: .4byte 0x000003ff
_0805F1D4: .4byte 0xfffffc00
- thumb_func_end EventObjectSetGraphicsId
+ thumb_func_end ObjectEventSetGraphicsId
thumb_func_start ObjectEventSetGraphicsIdByLocalIdAndMap
ObjectEventSetGraphicsIdByLocalIdAndMap: @ 805F1D8
@@ -2652,7 +2652,7 @@ ObjectEventSetGraphicsIdByLocalIdAndMap: @ 805F1D8
ldr r1, _0805F214 @ =gObjectEvents
adds r0, r1
adds r1, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
_0805F20C:
add sp, 0x4
pop {r4}
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 757f612b8..bc2a2fceb 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -1989,7 +1989,7 @@ mapldr_080842E8: @ 80842E8
movs r1, 0
bl CreateTask
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _0808430C @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -2092,7 +2092,7 @@ mapldr_08084390: @ 8084390
bl ObjectEventTurn
_080843D2:
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _080843F4 @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -2158,7 +2158,7 @@ sub_8084454: @ 8084454
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _0808447C @ =sub_8084484
movs r1, 0
bl CreateTask
@@ -2626,7 +2626,7 @@ _080847F4: .4byte gUnknown_83CC050
sub_80847F8: @ 80847F8
push {r4,lr}
adds r4, r0, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
ldrb r0, [r4, 0xA]
bl sub_809C448
@@ -2889,7 +2889,7 @@ sub_80849F4: @ 80849F4
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _08084A1C @ =sub_8084A24
movs r1, 0
bl CreateTask
@@ -3630,7 +3630,7 @@ sub_8084FA0: @ 8084FA0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
movs r0, 0
bl SetCameraPanningCallback
@@ -3977,7 +3977,7 @@ sub_8085244: @ 8085244
adds r5, r0, 0
adds r4, r1, 0
bl CameraObjectReset2
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085270 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -4239,7 +4239,7 @@ sub_8085440: @ 8085440
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
ldr r1, _0808546C @ =gPlayerAvatar
movs r0, 0x1
@@ -4482,7 +4482,7 @@ _0808561C:
sub_8085620: @ 8085620
push {lr}
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _08085638 @ =sub_808563C
movs r1, 0x50
bl CreateTask
@@ -4969,7 +4969,7 @@ sub_80859D4: @ 80859D4
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085A14 @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -5198,7 +5198,7 @@ sub_8085BA8: @ 8085BA8
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
bl GetPlayerFacingDirection
lsls r0, 24
@@ -5435,7 +5435,7 @@ mapldr_08085D88: @ 8085D88
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085DCC @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -7000,7 +7000,7 @@ sub_80869C0: @ 80869C0
push {r6}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r5, _08086A18 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
@@ -7135,7 +7135,7 @@ sub_8086AB4: @ 8086AB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
adds r0, r4, 0
bl ObjectEventClearHeldMovementIfFinished
ldrb r0, [r4, 0x18]
@@ -7276,7 +7276,7 @@ sub_8086C00: @ 8086C00
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08086C20 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -7366,7 +7366,7 @@ _08086CAE:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
b _08086CD2
_08086CC0:
movs r0, 0
@@ -7375,7 +7375,7 @@ _08086CC0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
_08086CD2:
ldrb r0, [r4, 0x18]
lsls r0, 28
@@ -7809,7 +7809,7 @@ sub_8086FFC: @ 8086FFC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -8468,7 +8468,7 @@ _0808751A:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
bl CameraObjectReset2
adds r0, r5, 0
movs r1, 0x3
@@ -8795,7 +8795,7 @@ _080877B4:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
adds r0, r4, 0
movs r1, 0x1
bl ObjectEventTurn
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index faab73bf6..e4b28d6c6 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -3257,7 +3257,7 @@ sub_805CB70: @ 805CB70
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3318,7 +3318,7 @@ sub_805CBE8: @ 805CBE8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3964,7 +3964,7 @@ sub_805D0F8: @ 805D0F8
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl sav1_reset_battle_music_maybe
bl Overworld_ChangeMusicToDefault
ldr r2, _0805D148 @ =gPlayerAvatar
@@ -4005,7 +4005,7 @@ sub_805D154: @ 805D154
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r2, _0805D19C @ =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0xF7
@@ -4134,7 +4134,7 @@ sub_805D240: @ 805D240
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -4734,7 +4734,7 @@ _0805D6EA:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
@@ -4978,7 +4978,7 @@ sub_805D8D8: @ 805D8D8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 06ac697bc..704d8d5d8 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -5845,7 +5845,7 @@ _0810AD1E:
cmp r6, 0x1
bne _0810AD90
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl sub_805C270
bl sub_805C780
ldr r2, _0810AD88 @ =gSpecialVar_ItemId
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 49ab9164f..527c715d7 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -2789,7 +2789,7 @@ sub_809EF54: @ 809EF54
str r2, [sp]
movs r2, 0x38
movs r3, 0x25
- bl AddPseudoEventObject
+ bl AddPseudoObjectEvent
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/overworld.s b/asm/overworld.s
index d2ae0b792..21fce8cac 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -7888,7 +7888,7 @@ _080588C6:
movs r2, 0
str r2, [sp]
movs r3, 0
- bl AddPseudoEventObject
+ bl AddPseudoObjectEvent
strb r0, [r4, 0x4]
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
diff --git a/asm/shop.s b/asm/shop.s
index 7ed68952c..5d1b723af 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -2017,7 +2017,7 @@ _0809BA56:
str r0, [sp]
adds r0, r4, 0
ldr r1, _0809BAF4 @ =SpriteCallbackDummy
- bl AddPseudoEventObject
+ bl AddPseudoObjectEvent
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
diff --git a/berry_fix/payload/include/constants/vars.h b/berry_fix/payload/include/constants/vars.h
index 4b40c1d8c..3d44dfa4d 100644
--- a/berry_fix/payload/include/constants/vars.h
+++ b/berry_fix/payload/include/constants/vars.h
@@ -27,7 +27,7 @@
// object gfx id vars
// These 0x10 vars are used to dynamically control a event object's sprite.
// For example, the rival's sprite id is dynamically set based on the player's gender.
-// See VarGetEventObjectGraphicsId().
+// See VarGetObjectEventGraphicsId().
#define VAR_OBJ_GFX_ID_0 0x4010
#define VAR_OBJ_GFX_ID_1 0x4011
#define VAR_OBJ_GFX_ID_2 0x4012
diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h
index a75b36265..f5a5173c6 100644
--- a/berry_fix/payload/include/global.fieldmap.h
+++ b/berry_fix/payload/include/global.fieldmap.h
@@ -41,7 +41,7 @@ struct BackupMapLayout
u16 *map;
};
-struct EventObjectTemplate
+struct ObjectEventTemplate
{
/*0x00*/ u8 localId;
/*0x01*/ u8 graphicsId;
@@ -101,12 +101,12 @@ struct BgEvent
struct MapEvents
{
- u8 eventObjectCount;
+ u8 objectEventCount;
u8 warpCount;
u8 coordEventCount;
u8 bgEventCount;
- struct EventObjectTemplate *eventObjects;
+ struct ObjectEventTemplate *objectEvents;
struct WarpEvent *warps;
struct CoordEvent *coordEvents;
struct BgEvent *bgEvents;
@@ -144,7 +144,7 @@ struct MapHeader
/* 0x1B */ u8 battleType;
};
-struct EventObject
+struct ObjectEvent
{
/*0x00*/ u32 active:1;
u32 singleMovementActive:1;
@@ -206,7 +206,7 @@ struct EventObject
/*size = 0x24*/
};
-struct EventObjectGraphicsInfo
+struct ObjectEventGraphicsInfo
{
/*0x00*/ u16 tileTag;
/*0x02*/ u16 paletteTag;
@@ -287,7 +287,7 @@ struct PlayerAvatar /* 0x202E858 */
/*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
/*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
/*0x04*/ u8 spriteId;
- /*0x05*/ u8 eventObjectId;
+ /*0x05*/ u8 objectEventId;
/*0x06*/ bool8 preventStep;
/*0x07*/ u8 gender;
/*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
@@ -309,7 +309,7 @@ struct Camera
s32 y;
};
-extern struct EventObject gObjectEvents[];
+extern struct ObjectEvent gObjectEvents[];
extern u8 gSelectedObjectEvent;
extern struct MapHeader gMapHeader;
extern struct PlayerAvatar gPlayerAvatar;
diff --git a/berry_fix/payload/include/global.h b/berry_fix/payload/include/global.h
index c218b5f4e..63b4e0391 100644
--- a/berry_fix/payload/include/global.h
+++ b/berry_fix/payload/include/global.h
@@ -666,8 +666,8 @@ struct SaveBlock1 /* 0x02025734 */
/*0x972*/ u8 filler_972[0x6];
/*0x978*/ u16 trainerRematchStepCounter;
/*0x97A*/ u8 trainerRematches[100];
- /*0x9E0*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT];
- /*0xC20*/ struct EventObjectTemplate eventObjectTemplates[64];
+ /*0x9E0*/ struct ObjectEvent objectEvents[EVENT_OBJECTS_COUNT];
+ /*0xC20*/ struct ObjectEventTemplate objectEventTemplates[64];
/*0x1220*/ u8 flags[FLAGS_COUNT];
/*0x1340*/ u16 vars[VARS_COUNT];
/*0x1540*/ u32 gameStats[NUM_GAME_STATS];
diff --git a/data/event_object_movement.s b/data/event_object_movement.s
index 0130dc00d..691d7a9a6 100644
--- a/data/event_object_movement.s
+++ b/data/event_object_movement.s
@@ -3940,31 +3940,31 @@ gUnknown_83A3698:: @ 83A3698
.byte 3, 7, 0, 4
.4byte 0x00000000, 0x00000000
-gEventObjectBaseOam_128x64::
+gObjectEventBaseOam_128x64::
.4byte 0x00000000, 0x00000800
-gEventObjectBaseOam_Unknown1::
+gObjectEventBaseOam_Unknown1::
.4byte 0x00004000, 0x00000800
-gEventObjectBaseOam_16x16::
+gObjectEventBaseOam_16x16::
.4byte 0x40000000, 0x00000800
-gEventObjectBaseOam_32x16::
+gObjectEventBaseOam_32x16::
.4byte 0x80004000, 0x00000800
-gEventObjectBaseOam_Unknown2::
+gObjectEventBaseOam_Unknown2::
.4byte 0x40004000, 0x00000800
-gEventObjectBaseOam_Unknown3::
+gObjectEventBaseOam_Unknown3::
.4byte 0xc0004000, 0x00000800
-gEventObjectBaseOam_16x32::
+gObjectEventBaseOam_16x32::
.4byte 0x80008000, 0x00000800
-gEventObjectBaseOam_32x32:: @ 83A3718
+gObjectEventBaseOam_32x32:: @ 83A3718
.4byte 0x80000000, 0x00000800
-gEventObjectBaseOam_64x64:: @ 83A3720
+gObjectEventBaseOam_64x64:: @ 83A3720
.4byte 0xc0000000, 0x00000800
gSubsprites_83A3728:: @ 83A3728
@@ -4404,7 +4404,7 @@ gObjectEventGraphicsInfo_83A3BB0:: @ 83A3BB0
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3470
.4byte gSpriteImages_83A00A0
@@ -4415,7 +4415,7 @@ gObjectEventGraphicsInfo_83A3BD4:: @ 83A3BD4
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 2
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0140
@@ -4426,7 +4426,7 @@ gObjectEventGraphicsInfo_83A3BF8:: @ 83A3BF8
.byte 0 | (1 << 4) | (0 << 6) | (1 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3584
.4byte gSpriteImages_83A0270
@@ -4437,7 +4437,7 @@ gObjectEventGraphicsInfo_83A3C1C:: @ 83A3C1C
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3638
.4byte gSpriteImages_83A0330
@@ -4448,7 +4448,7 @@ gObjectEventGraphicsInfo_83A3C40:: @ 83A3C40
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A04C0
@@ -4459,7 +4459,7 @@ gObjectEventGraphicsInfo_83A3C64:: @ 83A3C64
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0420
@@ -4470,7 +4470,7 @@ gObjectEventGraphicsInfo_83A3C88:: @ 83A3C88
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0470
@@ -4481,7 +4481,7 @@ gObjectEventGraphicsInfo_83A3CAC:: @ 83A3CAC
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0508
@@ -4492,7 +4492,7 @@ gObjectEventGraphicsInfo_83A3CD0:: @ 83A3CD0
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0550
@@ -4503,7 +4503,7 @@ gObjectEventGraphicsInfo_83A3CF4:: @ 83A3CF4
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A05A0
@@ -4514,7 +4514,7 @@ gObjectEventGraphicsInfo_83A3D18:: @ 83A3D18
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A05E8
@@ -4525,7 +4525,7 @@ gObjectEventGraphicsInfo_83A3D3C:: @ 83A3D3C
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0638
@@ -4536,7 +4536,7 @@ gObjectEventGraphicsInfo_83A3D60:: @ 83A3D60
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0688
@@ -4547,7 +4547,7 @@ gObjectEventGraphicsInfo_83A3D84:: @ 83A3D84
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A06D8
@@ -4558,7 +4558,7 @@ gObjectEventGraphicsInfo_83A3DA8:: @ 83A3DA8
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0C40
@@ -4569,7 +4569,7 @@ gObjectEventGraphicsInfo_83A3DCC:: @ 83A3DCC
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0720
@@ -4580,7 +4580,7 @@ gObjectEventGraphicsInfo_83A3DF0:: @ 83A3DF0
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0770
@@ -4591,7 +4591,7 @@ gObjectEventGraphicsInfo_83A3E14:: @ 83A3E14
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A07C0
@@ -4602,7 +4602,7 @@ gObjectEventGraphicsInfo_83A3E38:: @ 83A3E38
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0808
@@ -4613,7 +4613,7 @@ gObjectEventGraphicsInfo_83A3E5C:: @ 83A3E5C
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0858
@@ -4624,7 +4624,7 @@ gObjectEventGraphicsInfo_83A3E80:: @ 83A3E80
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A08A8
@@ -4635,7 +4635,7 @@ gObjectEventGraphicsInfo_83A3EA4:: @ 83A3EA4
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A08F8
@@ -4646,7 +4646,7 @@ gObjectEventGraphicsInfo_83A3EC8:: @ 83A3EC8
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0940
@@ -4657,7 +4657,7 @@ gObjectEventGraphicsInfo_83A3EEC:: @ 83A3EEC
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0988
@@ -4668,7 +4668,7 @@ gObjectEventGraphicsInfo_83A3F10:: @ 83A3F10
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A09D8
@@ -4679,7 +4679,7 @@ gObjectEventGraphicsInfo_83A3F34:: @ 83A3F34
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0A20
@@ -4690,7 +4690,7 @@ gObjectEventGraphicsInfo_83A3F58:: @ 83A3F58
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0AB8
@@ -4701,7 +4701,7 @@ gObjectEventGraphicsInfo_83A3F7C:: @ 83A3F7C
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0B00
@@ -4712,7 +4712,7 @@ gObjectEventGraphicsInfo_83A3FA0:: @ 83A3FA0
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0B50
@@ -4723,7 +4723,7 @@ gObjectEventGraphicsInfo_83A3FC4:: @ 83A3FC4
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0BA0
@@ -4734,7 +4734,7 @@ gObjectEventGraphicsInfo_83A3FE8:: @ 83A3FE8
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0BF0
@@ -4745,7 +4745,7 @@ gObjectEventGraphicsInfo_83A400C:: @ 83A400C
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0C90
@@ -4756,7 +4756,7 @@ gObjectEventGraphicsInfo_83A4030:: @ 83A4030
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0CE0
@@ -4767,7 +4767,7 @@ gObjectEventGraphicsInfo_83A4054:: @ 83A4054
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0D30
@@ -4778,7 +4778,7 @@ gObjectEventGraphicsInfo_83A4078:: @ 83A4078
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0D78
@@ -4789,7 +4789,7 @@ gObjectEventGraphicsInfo_83A409C:: @ 83A409C
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0DC8
@@ -4800,7 +4800,7 @@ gObjectEventGraphicsInfo_83A40C0:: @ 83A40C0
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0E18
@@ -4811,7 +4811,7 @@ gObjectEventGraphicsInfo_83A40E4:: @ 83A40E4
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0E68
@@ -4822,7 +4822,7 @@ gObjectEventGraphicsInfo_83A4108:: @ 83A4108
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0EB8
@@ -4833,7 +4833,7 @@ gObjectEventGraphicsInfo_83A412C:: @ 83A412C
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0F08
@@ -4844,7 +4844,7 @@ gObjectEventGraphicsInfo_83A4150:: @ 83A4150
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0F58
@@ -4855,7 +4855,7 @@ gObjectEventGraphicsInfo_83A4174:: @ 83A4174
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0FA8
@@ -4866,7 +4866,7 @@ gObjectEventGraphicsInfo_83A4198:: @ 83A4198
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0FF8
@@ -4877,7 +4877,7 @@ gObjectEventGraphicsInfo_83A41BC:: @ 83A41BC
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1040
@@ -4888,7 +4888,7 @@ gObjectEventGraphicsInfo_83A41E0:: @ 83A41E0
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1090
@@ -4899,7 +4899,7 @@ gObjectEventGraphicsInfo_83A4204:: @ 83A4204
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A10D8
@@ -4910,7 +4910,7 @@ gObjectEventGraphicsInfo_83A4228:: @ 83A4228
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1120
@@ -4921,7 +4921,7 @@ gObjectEventGraphicsInfo_83A424C:: @ 83A424C
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1170
@@ -4932,7 +4932,7 @@ gObjectEventGraphicsInfo_83A4270:: @ 83A4270
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A11C0
@@ -4943,7 +4943,7 @@ gObjectEventGraphicsInfo_83A4294:: @ 83A4294
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1210
@@ -4954,7 +4954,7 @@ gObjectEventGraphicsInfo_83A42B8:: @ 83A42B8
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 2
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1260
@@ -4965,7 +4965,7 @@ gObjectEventGraphicsInfo_83A42DC:: @ 83A42DC
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 2
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A12B0
@@ -4976,7 +4976,7 @@ gObjectEventGraphicsInfo_83A4300:: @ 83A4300
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A35E4
.4byte gSpriteImages_83A12F8
@@ -4987,7 +4987,7 @@ gObjectEventGraphicsInfo_83A4324:: @ 83A4324
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1348
@@ -4998,7 +4998,7 @@ gObjectEventGraphicsInfo_83A4348:: @ 83A4348
.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1390
@@ -5009,7 +5009,7 @@ gObjectEventGraphicsInfo_83A436C:: @ 83A436C
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1398
@@ -5020,7 +5020,7 @@ gObjectEventGraphicsInfo_83A4390:: @ 83A4390
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A13E0
@@ -5031,7 +5031,7 @@ gObjectEventGraphicsInfo_83A43B4:: @ 83A43B4
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1430
@@ -5042,7 +5042,7 @@ gObjectEventGraphicsInfo_83A43D8:: @ 83A43D8
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1480
@@ -5053,7 +5053,7 @@ gObjectEventGraphicsInfo_83A43FC:: @ 83A43FC
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A14C8
@@ -5064,7 +5064,7 @@ gObjectEventGraphicsInfo_83A4420:: @ 83A4420
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0A70
@@ -5075,7 +5075,7 @@ gObjectEventGraphicsInfo_83A4444:: @ 83A4444
.byte 4 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3660
.4byte gSpriteImages_83A1510
@@ -5086,7 +5086,7 @@ gObjectEventGraphicsInfo_83A4468:: @ 83A4468
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1530
@@ -5097,7 +5097,7 @@ gObjectEventGraphicsInfo_83A448C:: @ 83A448C
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1578
@@ -5108,7 +5108,7 @@ gObjectEventGraphicsInfo_83A44B0:: @ 83A44B0
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A15C0
@@ -5119,7 +5119,7 @@ gObjectEventGraphicsInfo_83A44D4:: @ 83A44D4
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1608
@@ -5130,7 +5130,7 @@ gObjectEventGraphicsInfo_83A44F8:: @ 83A44F8
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1650
@@ -5141,7 +5141,7 @@ gObjectEventGraphicsInfo_83A451C:: @ 83A451C
.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3658
.4byte gSpriteImages_83A1698
@@ -5152,7 +5152,7 @@ gObjectEventGraphicsInfo_83A4540:: @ 83A4540
.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A16B8
@@ -5163,7 +5163,7 @@ gObjectEventGraphicsInfo_83A4564:: @ 83A4564
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3470
.4byte gSpriteImages_83A0188
@@ -5174,7 +5174,7 @@ gObjectEventGraphicsInfo_83A4588:: @ 83A4588
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 2
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0228
@@ -5185,7 +5185,7 @@ gObjectEventGraphicsInfo_83A45AC:: @ 83A45AC
.byte 0 | (1 << 4) | (0 << 6) | (1 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3584
.4byte gSpriteImages_83A02D0
@@ -5196,7 +5196,7 @@ gObjectEventGraphicsInfo_83A45D0:: @ 83A45D0
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3638
.4byte gSpriteImages_83A0378
@@ -5207,7 +5207,7 @@ gObjectEventGraphicsInfo_83A45F4:: @ 83A45F4
.byte 10 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 2
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A0140
@@ -5218,7 +5218,7 @@ gObjectEventGraphicsInfo_83A4618:: @ 83A4618
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A16C0
@@ -5229,7 +5229,7 @@ gObjectEventGraphicsInfo_83A463C:: @ 83A463C
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1708
@@ -5240,7 +5240,7 @@ gObjectEventGraphicsInfo_83A4660:: @ 83A4660
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1750
@@ -5251,7 +5251,7 @@ gObjectEventGraphicsInfo_83A4684:: @ 83A4684
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1798
@@ -5262,7 +5262,7 @@ gObjectEventGraphicsInfo_83A46A8:: @ 83A46A8
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A17E0
@@ -5273,7 +5273,7 @@ gObjectEventGraphicsInfo_83A46CC:: @ 83A46CC
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1828
@@ -5284,7 +5284,7 @@ gObjectEventGraphicsInfo_83A46F0:: @ 83A46F0
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1870
@@ -5295,7 +5295,7 @@ gObjectEventGraphicsInfo_83A4714:: @ 83A4714
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A18B8
@@ -5306,7 +5306,7 @@ gObjectEventGraphicsInfo_83A4738:: @ 83A4738
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1900
@@ -5317,7 +5317,7 @@ gObjectEventGraphicsInfo_83A475C:: @ 83A475C
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1948
@@ -5328,7 +5328,7 @@ gObjectEventGraphicsInfo_83A4780:: @ 83A4780
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1990
@@ -5339,7 +5339,7 @@ gObjectEventGraphicsInfo_83A47A4:: @ 83A47A4
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A19D8
@@ -5350,7 +5350,7 @@ gObjectEventGraphicsInfo_83A47C8:: @ 83A47C8
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1A20
@@ -5361,7 +5361,7 @@ gObjectEventGraphicsInfo_83A47EC:: @ 83A47EC
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1A68
@@ -5372,7 +5372,7 @@ gObjectEventGraphicsInfo_83A4810:: @ 83A4810
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1AB0
@@ -5383,7 +5383,7 @@ gObjectEventGraphicsInfo_83A4834:: @ 83A4834
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1AF8
@@ -5394,7 +5394,7 @@ gObjectEventGraphicsInfo_83A4858:: @ 83A4858
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3668
.4byte gSpriteImages_83A1B40
@@ -5405,7 +5405,7 @@ gObjectEventGraphicsInfo_83A487C:: @ 83A487C
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3668
.4byte gSpriteImages_83A1BA0
@@ -5416,7 +5416,7 @@ gObjectEventGraphicsInfo_83A48A0:: @ 83A48A0
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A363C
.4byte gSpriteImages_83A0330
@@ -5427,7 +5427,7 @@ gObjectEventGraphicsInfo_83A48C4:: @ 83A48C4
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3640
.4byte gSpriteImages_83A03C0
@@ -5438,7 +5438,7 @@ gObjectEventGraphicsInfo_83A48E8:: @ 83A48E8
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A363C
.4byte gSpriteImages_83A0378
@@ -5449,7 +5449,7 @@ gObjectEventGraphicsInfo_83A490C:: @ 83A490C
.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3640
.4byte gSpriteImages_83A03F0
@@ -5460,7 +5460,7 @@ gObjectEventGraphicsInfo_83A4930:: @ 83A4930
.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_32x16
+ .4byte gObjectEventBaseOam_32x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C00
@@ -5471,7 +5471,7 @@ gObjectEventGraphicsInfo_83A4954:: @ 83A4954
.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C08
@@ -5482,7 +5482,7 @@ gObjectEventGraphicsInfo_83A4978:: @ 83A4978
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1C10
@@ -5493,7 +5493,7 @@ gObjectEventGraphicsInfo_83A499C:: @ 83A499C
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1D38
@@ -5504,7 +5504,7 @@ gObjectEventGraphicsInfo_83A49C0:: @ 83A49C0
.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C58
@@ -5515,7 +5515,7 @@ gObjectEventGraphicsInfo_83A49E4:: @ 83A49E4
.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C60
@@ -5526,7 +5526,7 @@ gObjectEventGraphicsInfo_83A4A08:: @ 83A4A08
.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C68
@@ -5537,7 +5537,7 @@ gObjectEventGraphicsInfo_83A4A2C:: @ 83A4A2C
.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C70
@@ -5548,7 +5548,7 @@ gObjectEventGraphicsInfo_83A4A50:: @ 83A4A50
.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C78
@@ -5559,7 +5559,7 @@ gObjectEventGraphicsInfo_83A4A74:: @ 83A4A74
.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C80
@@ -5570,7 +5570,7 @@ gObjectEventGraphicsInfo_83A4A98:: @ 83A4A98
.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C88
@@ -5581,7 +5581,7 @@ gObjectEventGraphicsInfo_83A4ABC:: @ 83A4ABC
.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C90
@@ -5592,7 +5592,7 @@ gObjectEventGraphicsInfo_83A4AE0:: @ 83A4AE0
.byte 10 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1C98
@@ -5603,7 +5603,7 @@ gObjectEventGraphicsInfo_83A4B04:: @ 83A4B04
.byte 3 | (0 << 4) | (1 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3314
.4byte gSpriteImages_83A1CA0
@@ -5614,7 +5614,7 @@ gObjectEventGraphicsInfo_83A4B28:: @ 83A4B28
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1D80
@@ -5625,7 +5625,7 @@ gObjectEventGraphicsInfo_83A4B4C:: @ 83A4B4C
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1E10
@@ -5636,7 +5636,7 @@ gObjectEventGraphicsInfo_83A4B70:: @ 83A4B70
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1E58
@@ -5647,7 +5647,7 @@ gObjectEventGraphicsInfo_83A4B94:: @ 83A4B94
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1EA0
@@ -5658,7 +5658,7 @@ gObjectEventGraphicsInfo_83A4BB8:: @ 83A4BB8
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1EE8
@@ -5669,7 +5669,7 @@ gObjectEventGraphicsInfo_83A4BDC:: @ 83A4BDC
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1F30
@@ -5680,7 +5680,7 @@ gObjectEventGraphicsInfo_83A4C00:: @ 83A4C00
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1F78
@@ -5691,7 +5691,7 @@ gObjectEventGraphicsInfo_83A4C24:: @ 83A4C24
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1FC0
@@ -5702,7 +5702,7 @@ gObjectEventGraphicsInfo_83A4C48:: @ 83A4C48
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2008
@@ -5713,7 +5713,7 @@ gObjectEventGraphicsInfo_83A4C6C:: @ 83A4C6C
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2050
@@ -5724,7 +5724,7 @@ gObjectEventGraphicsInfo_83A4C90:: @ 83A4C90
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2098
@@ -5735,7 +5735,7 @@ gObjectEventGraphicsInfo_83A4CB4:: @ 83A4CB4
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A20E0
@@ -5746,7 +5746,7 @@ gObjectEventGraphicsInfo_83A4CD8:: @ 83A4CD8
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2128
@@ -5757,7 +5757,7 @@ gObjectEventGraphicsInfo_83A4CFC:: @ 83A4CFC
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2170
@@ -5768,7 +5768,7 @@ gObjectEventGraphicsInfo_83A4D20:: @ 83A4D20
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A21B8
@@ -5779,7 +5779,7 @@ gObjectEventGraphicsInfo_83A4D44:: @ 83A4D44
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2200
@@ -5790,7 +5790,7 @@ gObjectEventGraphicsInfo_83A4D68:: @ 83A4D68
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2248
@@ -5801,7 +5801,7 @@ gObjectEventGraphicsInfo_83A4D8C:: @ 83A4D8C
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2290
@@ -5812,7 +5812,7 @@ gObjectEventGraphicsInfo_83A4DB0:: @ 83A4DB0
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A22D8
@@ -5823,7 +5823,7 @@ gObjectEventGraphicsInfo_83A4DD4:: @ 83A4DD4
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2320
@@ -5834,7 +5834,7 @@ gObjectEventGraphicsInfo_83A4DF8:: @ 83A4DF8
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2368
@@ -5845,7 +5845,7 @@ gObjectEventGraphicsInfo_83A4E1C:: @ 83A4E1C
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A23B0
@@ -5856,7 +5856,7 @@ gObjectEventGraphicsInfo_83A4E40:: @ 83A4E40
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A23F8
@@ -5867,7 +5867,7 @@ gObjectEventGraphicsInfo_83A4E64:: @ 83A4E64
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2440
@@ -5878,7 +5878,7 @@ gObjectEventGraphicsInfo_83A4E88:: @ 83A4E88
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2488
@@ -5889,7 +5889,7 @@ gObjectEventGraphicsInfo_83A4EAC:: @ 83A4EAC
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A24D0
@@ -5900,7 +5900,7 @@ gObjectEventGraphicsInfo_83A4ED0:: @ 83A4ED0
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2518
@@ -5911,7 +5911,7 @@ gObjectEventGraphicsInfo_83A4EF4:: @ 83A4EF4
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2560
@@ -5922,7 +5922,7 @@ gObjectEventGraphicsInfo_83A4F18:: @ 83A4F18
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A25A8
@@ -5933,7 +5933,7 @@ gObjectEventGraphicsInfo_83A4F3C:: @ 83A4F3C
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_32x32
+ .4byte gObjectEventBaseOam_32x32
.4byte gSubspriteTables_83A37F0
.4byte gAnimTable_83A33BC
.4byte gSpriteImages_83A25F0
@@ -5944,7 +5944,7 @@ gObjectEventGraphicsInfo_83A4F60:: @ 83A4F60
.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2638
@@ -5955,7 +5955,7 @@ gObjectEventGraphicsInfo_83A4F84:: @ 83A4F84
.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2680
@@ -5966,7 +5966,7 @@ gObjectEventGraphicsInfo_83A4FA8:: @ 83A4FA8
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2878
@@ -5977,7 +5977,7 @@ gObjectEventGraphicsInfo_83A4FCC:: @ 83A4FCC
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A28C0
@@ -5988,7 +5988,7 @@ gObjectEventGraphicsInfo_83A4FF0:: @ 83A4FF0
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A26C8
@@ -5999,7 +5999,7 @@ gObjectEventGraphicsInfo_83A5014:: @ 83A5014
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1DC8
@@ -6010,7 +6010,7 @@ gObjectEventGraphicsInfo_83A5038:: @ 83A5038
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2710
@@ -6021,7 +6021,7 @@ gObjectEventGraphicsInfo_83A505C:: @ 83A505C
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2758
@@ -6032,7 +6032,7 @@ gObjectEventGraphicsInfo_83A5080:: @ 83A5080
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A27A0
@@ -6043,7 +6043,7 @@ gObjectEventGraphicsInfo_83A50A4:: @ 83A50A4
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A27E8
@@ -6054,7 +6054,7 @@ gObjectEventGraphicsInfo_83A50C8:: @ 83A50C8
.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x16
+ .4byte gObjectEventBaseOam_16x16
.4byte gSubspriteTables_83A3748
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2830
@@ -6065,7 +6065,7 @@ gObjectEventGraphicsInfo_83A50EC:: @ 83A50EC
.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 1
.align 2
- .4byte gEventObjectBaseOam_16x32
+ .4byte gObjectEventBaseOam_16x32
.4byte gSubspriteTables_83A379C
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A2908
@@ -6076,7 +6076,7 @@ gObjectEventGraphicsInfo_83A5110:: @ 83A5110
.byte 10 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_64x64
+ .4byte gObjectEventBaseOam_64x64
.4byte gSubspriteTables_83A38D0
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1CA8
@@ -6087,7 +6087,7 @@ gObjectEventGraphicsInfo_83A5134:: @ 83A5134
.byte 10 | (1 << 4) | (0 << 6) | (0 << 7)
.byte 0
.align 2
- .4byte gEventObjectBaseOam_128x64
+ .4byte gObjectEventBaseOam_128x64
.4byte gSubspriteTables_83A3A50
.4byte gAnimTable_83A3368
.4byte gSpriteImages_83A1CF0
@@ -6325,16 +6325,16 @@ gUnknown_83A5374:: @ 83A5374
obj_frame_tiles gUnknown_8398128, 0x400
gUnknown_83A537C:: @ 83A537C
- spr_template 65535, 65535, gEventObjectBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, oamc_shadow
+ spr_template 65535, 65535, gObjectEventBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, oamc_shadow
gUnknown_83A5394:: @ 83A5394
- spr_template 65535, 65535, gEventObjectBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, oamc_shadow
+ spr_template 65535, 65535, gObjectEventBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, oamc_shadow
gUnknown_83A53AC:: @ 83A53AC
- spr_template 65535, 65535, gEventObjectBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, oamc_shadow
+ spr_template 65535, 65535, gObjectEventBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, oamc_shadow
gUnknown_83A53C4:: @ 83A53C4
- spr_template 65535, 65535, gEventObjectBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, oamc_shadow
+ spr_template 65535, 65535, gObjectEventBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, oamc_shadow
gUnknown_83A53DC:: @ 83A53DC
overworld_frame gUnknown_839A008, 2, 2, 0
@@ -6355,7 +6355,7 @@ gUnknown_83A541C:: @ 83A541C
.4byte gUnknown_83A5404
gUnknown_83A5420:: @ 83A5420
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, unc_grass_normal
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, unc_grass_normal
gUnknown_83A5438:: @ 83A5438
overworld_frame gUnknown_83986A8, 2, 2, 0
@@ -6379,7 +6379,7 @@ gUnknown_83A5484:: @ 83A5484
.4byte gUnknown_83A5460
gUnknown_83A5488:: @ 83A5488
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, sub_80DCD1C
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, sub_80DCD1C
gUnknown_83A54A0:: @ 83A54A0
overworld_frame gUnknown_8398928, 2, 2, 0
@@ -6400,7 +6400,7 @@ gUnknown_83A54E0:: @ 83A54E0
.4byte gUnknown_83A54C8
gUnknown_83A54E4:: @ 83A54E4
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, sub_80DC2FC
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, sub_80DC2FC
gUnknown_83A54FC:: @ 83A54FC
overworld_frame gUnknown_8396B08, 2, 8, 0
@@ -6437,7 +6437,7 @@ gUnknown_83A555C:: @ 83A555C
.4byte gUnknown_83A5550
gUnknown_83A556C:: @ 83A556C
- spr_template 0xFFFF, 0xFFFF, gEventObjectBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, sub_80DC4F8
+ spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, sub_80DC4F8
gUnknown_83A5584:: @ 83A5584
overworld_frame gUnknown_8398BA8, 2, 2, 0
@@ -6476,7 +6476,7 @@ gUnknown_83A55F4:: @ 83A55F4
.4byte gUnknown_83A55E8
gUnknown_83A5604:: @ 83A5604
- spr_template 0xFFFF, 0xFFFF, gEventObjectBaseOam_16x16, gUnknown_83A55F4, gUnknown_83A5584, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x16, gUnknown_83A55F4, gUnknown_83A5584, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83A561C:: @ 83A561C
overworld_frame gUnknown_8399008, 2, 1, 0
@@ -6493,7 +6493,7 @@ gUnknown_83A5644:: @ 83A5644
.4byte gUnknown_83A5634
gUnknown_83A5648:: @ 83A5648
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_Unknown1, gUnknown_83A5644, gUnknown_83A561C, gDummySpriteAffineAnimTable, sub_80DCCE0
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5644, gUnknown_83A561C, gDummySpriteAffineAnimTable, sub_80DCCE0
gUnknown_83A5660:: @ 83A5660
overworld_frame gUnknown_8399188, 2, 1, 0
@@ -6512,7 +6512,7 @@ gUnknown_83A5694:: @ 83A5694
.4byte gUnknown_83A5680
gUnknown_83A5698:: @ 83A5698
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_Unknown1, gUnknown_83A5694, gUnknown_83A5660, gDummySpriteAffineAnimTable, sub_80DCCE0
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_Unknown1, gUnknown_83A5694, gUnknown_83A5660, gDummySpriteAffineAnimTable, sub_80DCCE0
gUnknown_83A56B0:: @ 83A56B0
overworld_frame gUnknown_839A388, 2, 2, 0
@@ -6542,7 +6542,7 @@ gUnknown_83A56E0:: @ 83A56E0
.4byte gUnknown_83A56D8
gUnknown_83A56F4:: @ 83A56F4
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, sub_80DBAFC
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, sub_80DBAFC
gUnknown_83A570C:: @ 83A570C
overworld_frame gUnknown_839A488, 2, 2, 0
@@ -6572,7 +6572,7 @@ gUnknown_83A573C:: @ 83A573C
.4byte gUnknown_83A5734
gUnknown_83A5750:: @ 83A5750
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, sub_80DBAFC
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, sub_80DBAFC
gUnknown_83A5768:: @ 83A5768
overworld_frame gUnknown_839A588, 2, 2, 0
@@ -6624,7 +6624,7 @@ gUnknown_83A57C8:: @ 83A57C8
.4byte gUnknown_83A57C0
gUnknown_83A57EC:: @ 83A57EC
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, sub_80DBAFC
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, sub_80DBAFC
gUnknown_83A5804:: @ 83A5804
overworld_frame gUnknown_839AA48, 2, 2, 0
@@ -6643,7 +6643,7 @@ gUnknown_83A5838:: @ 83A5838
.4byte gUnknown_83A5824
gUnknown_83A583C:: @ 83A583C
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_16x16, gUnknown_83A5838, gUnknown_83A5804, gDummySpriteAffineAnimTable, sub_80DCCE0
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5838, gUnknown_83A5804, gDummySpriteAffineAnimTable, sub_80DCCE0
gUnknown_83A5854:: @ 83A5854
overworld_frame gUnknown_839AC48, 2, 1, 0
@@ -6670,7 +6670,7 @@ gUnknown_83A5894:: @ 83A5894
.4byte gUnknown_83A5870
gUnknown_83A589C:: @ 83A589C
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, sub_80DBC2C
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, sub_80DBC2C
gUnknown_83A58B4:: @ 83A58B4
overworld_frame gUnknown_839ACC8, 2, 1, 0
@@ -6687,7 +6687,7 @@ gUnknown_83A58DC:: @ 83A58DC
.4byte gUnknown_83A58CC
gUnknown_83A58E0:: @ 83A58E0
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_Unknown1, gUnknown_83A58DC, gUnknown_83A58B4, gDummySpriteAffineAnimTable, sub_80DCCE0
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A58DC, gUnknown_83A58B4, gDummySpriteAffineAnimTable, sub_80DCCE0
gUnknown_83A58F8:: @ 83A58F8
overworld_frame gUnknown_8399E08, 2, 2, 0
@@ -6709,7 +6709,7 @@ gUnknown_83A5938:: @ 83A5938
.4byte gUnknown_83A5918
gUnknown_83A593C:: @ 83A593C
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, unc_grass_tall
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, unc_grass_tall
gUnknown_83A5954:: @ 83A5954
overworld_frame gUnknown_8399488, 2, 2, 0
@@ -6732,7 +6732,7 @@ gUnknown_83A59A0:: @ 83A59A0
.4byte gUnknown_83A5984
gUnknown_83A59A4:: @ 83A59A4
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A59A0, gUnknown_83A5954, gDummySpriteAffineAnimTable, sub_80DCCE0
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A59A0, gUnknown_83A5954, gDummySpriteAffineAnimTable, sub_80DCCE0
gUnknown_83A59BC:: @ 83A59BC
overworld_frame gUnknown_8399788, 2, 2, 0
@@ -6761,7 +6761,7 @@ gUnknown_83A5A2C:: @ 83A5A2C
.4byte gUnknown_83A5A04
gUnknown_83A5A30:: @ 83A5A30
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, sub_80DCD1C
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, sub_80DCD1C
gUnknown_83A5A48:: @ 83A5A48
overworld_frame gUnknown_8399C08, 2, 2, 0
@@ -6782,7 +6782,7 @@ gUnknown_83A5A84:: @ 83A5A84
.4byte gUnknown_83A5A68
gUnknown_83A5A88:: @ 83A5A88
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, sub_80DCD1C
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, sub_80DCD1C
gUnknown_83A5AA0:: @ 83A5AA0
overworld_frame gUnknown_839A788, 2, 2, 0
@@ -6801,7 +6801,7 @@ gUnknown_83A5AD4:: @ 83A5AD4
.4byte gUnknown_83A5AC0
gUnknown_83A5AD8:: @ 83A5AD8
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, sub_80DCD1C
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, sub_80DCD1C
gUnknown_83A5AF0:: @ 83A5AF0
overworld_frame gUnknown_839A988, 2, 1, 0
@@ -6818,7 +6818,7 @@ gUnknown_83A5B18:: @ 83A5B18
.4byte gUnknown_83A5B08
gUnknown_83A5B1C:: @ 83A5B1C
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, sub_80DC86C
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, sub_80DC86C
gUnknown_83A5B34:: @ 83A5B34
overworld_frame gUnknown_839AD88, 2, 2, 0
@@ -6839,7 +6839,7 @@ gUnknown_83A5B70:: @ 83A5B70
.4byte gUnknown_83A5B54
gUnknown_83A5B74:: @ 83A5B74
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, sub_80DCD1C
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, sub_80DCD1C
gUnknown_83A5B8C:: @ 83A5B8C
obj_rot_scal_anim_frame 0xFF00, 256, 128, 0
@@ -6900,7 +6900,7 @@ gUnknown_83A5CAC:: @ 83A5CAC
.4byte gUnknown_83A5C8C
gUnknown_83A5CB4:: @ 83A5CB4
- spr_template 0xFFFF, 0xFFFF, gEventObjectBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, sub_80DCAC8
+ spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, sub_80DCAC8
gUnknown_83A5CCC:: @ 83A5CCC
overworld_frame gUnknown_839B708, 2, 4, 0
@@ -6930,7 +6930,7 @@ gUnknown_83A5D2C:: @ 83A5D2C
.4byte gUnknown_83A5D0C
gUnknown_83A5D34:: @ 83A5D34
- spr_template 0xFFFF, 0xFFFF, gEventObjectBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, sub_80DCAC8
+ spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, sub_80DCAC8
gUnknown_83A5D4C:: @ 83A5D4C
overworld_frame gUnknown_839BE08, 2, 4, 0
@@ -6942,7 +6942,7 @@ gUnknown_83A5D4C:: @ 83A5D4C
overworld_frame gUnknown_839BE08, 2, 4, 6
gUnknown_83A5D84:: @ 83A5D84
- spr_template 0xFFFF, 0xFFFF, gEventObjectBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, sub_80DCAC8
+ spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, sub_80DCAC8
gUnknown_83A5D9C:: @ 83A5D9C
overworld_frame gUnknown_839D3C8, 8, 8, 0
@@ -6979,7 +6979,7 @@ gUnknown_83A5DEC:: @ 83A5DEC
.4byte gUnknown_83A5DE4
gUnknown_83A5E00:: @ 83A5E00
- spr_template 0xFFFF, 0xFFFF, gEventObjectBaseOam_64x64, gUnknown_83A5DEC, gUnknown_83A5D9C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_64x64, gUnknown_83A5DEC, gUnknown_83A5D9C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83A5E18:: @ 83A5E18
overworld_frame gUnknown_839A288, 2, 2, 0
@@ -6994,7 +6994,7 @@ gUnknown_83A5E34:: @ 83A5E34
.4byte gUnknown_83A5E28
gUnknown_83A5E38:: @ 83A5E38
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, sub_80DB8AC
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, sub_80DB8AC
gUnknown_83A5E50:: @ 83A5E50
overworld_frame gUnknown_839C508, 2, 2, 0
@@ -7007,7 +7007,7 @@ gUnknown_83A5E60:: @ 83A5E60
.4byte gUnknown_83A5E58
gUnknown_83A5E64:: @ 83A5E64
- spr_template 0xFFFF, 0x1005, gEventObjectBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, sub_80DBFF4
+ spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, sub_80DBFF4
gUnknown_83A5E7C:: @ 83A5E7C
overworld_frame gUnknown_839C5A8, 2, 2, 0
@@ -7028,7 +7028,7 @@ gUnknown_83A5EBC:: @ 83A5EBC
.4byte gUnknown_83A5EA4
gUnknown_83A5EC0:: @ 83A5EC0
- spr_template 0xFFFF, 0x100D, gEventObjectBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, sub_8085604
+ spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, sub_8085604
gUnknown_83A5ED8:: @ 83A5ED8
obj_pal gUnknown_839C588, 0x100D
@@ -7052,7 +7052,7 @@ gUnknown_83A5F20:: @ 83A5F20
.4byte gUnknown_83A5F08
gUnknown_83A5F24:: @ 83A5F24
- spr_template 0xFFFF, 0x100D, gEventObjectBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, sub_80853B0
+ spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, sub_80853B0
gUnknown_83A5F3C:: @ 83A5F3C
overworld_frame gUnknown_839CAA8, 2, 4, 0
@@ -7079,7 +7079,7 @@ gUnknown_83A5FA0:: @ 83A5FA0
.4byte gUnknown_83A5F7C
gUnknown_83A5FA4:: @ 83A5FA4
- spr_template 0xFFFF, 0x1004, gEventObjectBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, sub_80DC99C
+ spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, sub_80DC99C
gUnknown_83A5FBC:: @ 83A5FBC
overworld_frame gUnknown_839D2A8, 2, 2, 0
@@ -7095,7 +7095,7 @@ gUnknown_83A5FDC:: @ 83A5FDC
.4byte gUnknown_83A5FCC
gUnknown_83A5FE0:: @ 83A5FE0
- spr_template 0xFFFF, 0x100F, gEventObjectBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, sub_80DCC90
+ spr_template 0xFFFF, 0x100F, gObjectEventBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, sub_80DCC90
gUnknown_83A5FF8::
obj_pal gUnknown_839D3A8, 0x100F
diff --git a/include/event_object_80688E4.h b/include/event_object_80688E4.h
index 7132d2aa8..6c450358d 100644
--- a/include/event_object_80688E4.h
+++ b/include/event_object_80688E4.h
@@ -3,7 +3,7 @@
#include "global.h"
-void FreezeEventObjects(void);
+void FreezeObjectEvents(void);
void FreezeObjectEvent(struct ObjectEvent *);
void FreezeObjectEventsExceptOne(u8 objEventId);
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 38e7dc42b..5eda0be21 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -46,7 +46,7 @@ void ObjectEventClearAnim(struct ObjectEvent *);
void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *);
void SpawnObjectEventsInView(s16, s16);
u8 sprite_new(u8, u8, s16, s16, u8, u8);
-u8 AddPseudoEventObject(u16, SpriteCallback, s16, s16, u8);
+u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8);
u8 show_sprite(u8, u8, u8);
u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
@@ -88,7 +88,7 @@ void sub_805FE7C(struct ObjectEvent *, u8);
void SetTrainerMovementType(struct ObjectEvent *, u8);
u8 sub_80634F0(u8 direction);
u8 sub_8063500(u8 a0);
-void EventObjectSetGraphicsId(struct ObjectEvent *mapObject, u8 a1);
+void ObjectEventSetGraphicsId(struct ObjectEvent *mapObject, u8 a1);
u8 sub_805EB44(u8, u8, s16, s16);
void npc_paltag_set_load(u8 mode);
bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *mapObject);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 2faa70c15..17da53083 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -71,7 +71,7 @@ static const u8 *GetTrainerCantBattleSpeech(void);
static EWRAM_DATA u16 sTrainerBattleMode = 0;
EWRAM_DATA u16 gTrainerBattleOpponent_A = 0;
-static EWRAM_DATA u16 sTrainerEventObjectLocalId = 0;
+static EWRAM_DATA u16 sTrainerObjectEventLocalId = 0;
static EWRAM_DATA u8 *sTrainerAIntroSpeech = NULL;
static EWRAM_DATA u8 *sTrainerADefeatSpeech = NULL;
static EWRAM_DATA u8 *sTrainerVictorySpeech = NULL;
@@ -100,7 +100,7 @@ static const struct TrainerBattleParameter sOrdinaryBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -113,7 +113,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -126,7 +126,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -139,7 +139,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -165,7 +165,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -237,7 +237,7 @@ void BattleSetup_StartWildBattle(void)
static void DoStandardWildBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = 0;
@@ -249,7 +249,7 @@ static void DoStandardWildBattle(void)
void BattleSetup_StartRoamerBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_ROAMER;
@@ -261,7 +261,7 @@ void BattleSetup_StartRoamerBattle(void)
static void DoSafariBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = CB2_EndSafariBattle;
gBattleTypeFlags = BATTLE_TYPE_SAFARI;
@@ -271,7 +271,7 @@ static void DoSafariBattle(void)
static void DoGhostBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_GHOST;
@@ -401,7 +401,7 @@ static void sub_807FAF8(void)
static void sub_807FB08(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = sub_807FAF8;
SavePlayerParty();
@@ -698,7 +698,7 @@ static void InitTrainerBattleVariables(void)
{
sTrainerBattleMode = 0;
gTrainerBattleOpponent_A = 0;
- sTrainerEventObjectLocalId = 0;
+ sTrainerObjectEventLocalId = 0;
sTrainerAIntroSpeech = NULL;
sTrainerADefeatSpeech = NULL;
sTrainerVictorySpeech = NULL;
@@ -765,10 +765,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co
static void SetMapVarsToTrainer(void)
{
- if (sTrainerEventObjectLocalId != 0)
+ if (sTrainerObjectEventLocalId != 0)
{
- gSpecialVar_LastTalked = sTrainerEventObjectLocalId;
- gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+ gSpecialVar_LastTalked = sTrainerObjectEventLocalId;
+ gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
}
}
@@ -835,9 +835,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
void SetUpTrainerMovement(void)
{
- struct ObjectEvent *eventObject = &gObjectEvents[gSelectedObjectEvent];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent];
- SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
+ SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection));
}
u8 ScrSpecial_GetTrainerBattleMode(void)
diff --git a/src/battle_transition.c b/src/battle_transition.c
index a5b6f369c..aa68ed278 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -46,7 +46,7 @@ struct TransitionData
static EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL;
// TODO: Move this declaration to include/event_object_movement.h
-extern const struct OamData gEventObjectBaseOam_32x32;
+extern const struct OamData gObjectEventBaseOam_32x32;
static bool8 BT_Phase1_FadeOut(struct Task *task);
static bool8 BT_Phase1_FadeIn(struct Task *task);
@@ -470,7 +470,7 @@ static const struct SpriteTemplate sSpriteTemplate_SlidingPokeball =
{
.tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1009,
- .oam = &gEventObjectBaseOam_32x32,
+ .oam = &gObjectEventBaseOam_32x32,
.anims = sSpriteAnimTable_SlidingPokeball,
.images = sSpriteImageTable_SlidingPokeball,
.affineAnims = sSpriteAffineAnimTable_SlidingPokeball,
diff --git a/src/event_object_lock.c b/src/event_object_lock.c
index e9de984f1..23131067e 100644
--- a/src/event_object_lock.c
+++ b/src/event_object_lock.c
@@ -37,7 +37,7 @@ bool8 sub_8069590(void)
void ScriptFreezeObjectEvents(void)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
CreateTask(sub_8069570, 80);
}
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 9c3173421..7dc30bb77 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -322,14 +322,14 @@ static void sub_807DFBC(u8 taskId)
{
case 0: // Never reached
sub_807DCB0(0);
- FreezeEventObjects();
+ FreezeObjectEvents();
PlayerGetDestCoords(x, y);
FieldSetDoorOpened(*x, *y);
task->data[0] = 1;
break;
case 5:
sub_807DCB0(0);
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_807F114();
sub_807DBAC();
task->data[0] = 6;
@@ -407,7 +407,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
{
case 0:
sub_807DCB0(0);
- FreezeEventObjects();
+ FreezeObjectEvents();
PlayerGetDestCoords(x, y);
task->data[0] = 1;
break;
@@ -438,7 +438,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
switch (gTasks[taskId].data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
gTasks[taskId].data[0]++;
break;
@@ -458,7 +458,7 @@ static void sub_807E31C(u8 taskId)
switch (gTasks[taskId].data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
sub_805DC04();
gTasks[taskId].data[0]++;
@@ -688,7 +688,7 @@ static void sub_807E718(u8 taskId)
switch (task->data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
task->data[0]++;
break;
@@ -710,7 +710,7 @@ static void sub_807E784(u8 taskId)
switch (task->data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN);
sub_805DAB0();
@@ -743,7 +743,7 @@ static void sub_807E80C(u8 taskId)
switch (task->data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
PlayerGetDestCoords(xp, yp);
PlaySE(GetDoorSoundEffect(*xp, *yp - 1));
task->data[1] = FieldAnimateDoorOpen(*xp, *yp - 1);
@@ -797,7 +797,7 @@ static void sub_807E980(u8 taskId)
{
case 0:
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
CameraObjectReset2();
data[0]++;
break;
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index a0c97e9e3..c62653367 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId)
gFieldEffectArguments[2] = 2;
if (gFieldEffectArguments[1] == 4)
gFieldEffectArguments[2] = 3;
- EventObjectSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
+ ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
FieldEffectActiveListRemove(6);
gTasks[taskId].func = sub_80C99A0;
diff --git a/src/item_use.c b/src/item_use.c
index 83181e0be..46bd066f9 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -223,7 +223,7 @@ static void sub_80A1184(void)
static bool8 sub_80A1194(void)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
sub_807DC00();
CreateTask(sub_80A11C0, 10);
diff --git a/src/quest_log.c b/src/quest_log.c
index ec864ff02..7448e4b87 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -1347,7 +1347,7 @@ static void sub_8111F8C(u8 taskId)
if (ScriptContext2_IsEnabled() != TRUE)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C270();
sub_805C780();
ScriptContext2_Enable();
@@ -1370,7 +1370,7 @@ static void sub_8111FCC(u8 taskId)
task->data[0] = 0;
task->data[1] = 0;
task->func = sub_8112044;
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
}
}
diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c
index 64731f522..2e67ebdce 100644
--- a/src/quest_log_8150454.c
+++ b/src/quest_log_8150454.c
@@ -172,7 +172,7 @@ static void sub_8150794(u8 taskId)
static void sub_81507BC(struct ObjectEvent * a0, u8 a1)
{
- EventObjectSetGraphicsId(a0, a1);
+ ObjectEventSetGraphicsId(a0, a1);
}
static void sub_81507CC(void)
diff --git a/src/shop.c b/src/shop.c
index f4f45eb52..0eb4baaa1 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -139,7 +139,7 @@ static void sub_809B764(void);
static void BuyMenuDrawMapBg(void);
static void BuyMenuDrawMapMetatile(s16 x, s16 y, const u16 *src, u8 metatileLayerType);
static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src);
-static void BuyMenuCollectEventObjectData(void);
+static void BuyMenuCollectObjectEventData(void);
static void BuyMenuDrawObjectEvents(void);
static void BuyMenuCopyTilemapData(void);
static void BuyMenuPrintItemQuantityAndPrice(u8 taskId);
@@ -735,7 +735,7 @@ static void BuyMenuRemoveScrollIndicatorArrows(void)
static void sub_809B764(void)
{
- BuyMenuCollectEventObjectData();
+ BuyMenuCollectObjectEventData();
BuyMenuDrawObjectEvents();
BuyMenuDrawMapBg();
}
@@ -801,7 +801,7 @@ static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, con
dest[offset1 + offset2 + 33] = src[3]; // bottom right
}
-static void BuyMenuCollectEventObjectData(void)
+static void BuyMenuCollectObjectEventData(void)
{
s16 facingX, facingY;
u8 x, y, z;
@@ -857,7 +857,7 @@ static void BuyMenuDrawObjectEvents(void)
continue;
graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId);
- spriteId = AddPseudoEventObject(
+ spriteId = AddPseudoObjectEvent(
gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId,
SpriteCallbackDummy,
(u16)sViewportObjectEvents[i][X_COORD] * 16 - 8,
diff --git a/src/start_menu.c b/src/start_menu.c
index 7394c8d52..59bfb8643 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -392,7 +392,7 @@ void ShowStartMenu(void)
{
if (!IsUpdateLinkStateCBActive())
{
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C270();
sub_805C780();
}
diff --git a/src/teachy_tv.c b/src/teachy_tv.c
index 449e75f09..11d4a80b1 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -619,7 +619,7 @@ static void TeachyTvInitIo(void)
static u8 TeachyTvSetupObjEventAndOam(void)
{
- u8 objId = AddPseudoEventObject(90, SpriteCallbackDummy, 0, 0, 8);
+ u8 objId = AddPseudoObjectEvent(90, SpriteCallbackDummy, 0, 0, 8);
gSprites[objId].oam.priority = 2;
gSprites[objId].invisible = 1;
return objId;
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
index 42bc20a8a..f4e7380b9 100644
--- a/tools/mapjson/mapjson.cpp
+++ b/tools/mapjson/mapjson.cpp
@@ -160,7 +160,7 @@ string generate_map_events_text(Json map_data) {
string objects_label, warps_label, coords_label, bgs_label;
if (map_data["object_events"].array_items().size() > 0) {
- objects_label = map_data["name"].string_value() + "_EventObjects";
+ objects_label = map_data["name"].string_value() + "_ObjectEvents";
text << objects_label << ":\n";
for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
auto obj_event = map_data["object_events"].array_items()[i];
@@ -270,7 +270,7 @@ string generate_firered_map_events_text(Json map_data) {
string objects_label, warps_label, coords_label, bgs_label;
if (map_data["object_events"].array_items().size() > 0) {
- objects_label = map_data["name"].string_value() + "_EventObjects";
+ objects_label = map_data["name"].string_value() + "_ObjectEvents";
text << objects_label << "::\n";
for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
auto obj_event = map_data["object_events"].array_items()[i];
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 08:03:00 +0000