diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-17 23:25:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 23:25:11 -0500 |
| commit | 2f1285e4393deef290790e04cbb8d50b9fd007f5 (patch) | |
| tree | fa9008354f56ecb3ff48c266dc0474a1c621f6c9 | |
| parent | ebd3a1371757839c260256e2d8101fc6448b2915 (diff) | |
| parent | da93247ea805fa5ade9fe2316dee827553d09e43 (diff) | |
Merge pull request #174 from garakmon/object_event
Dissassemble Event Object Data
689 files changed, 8526 insertions, 4845 deletions
diff --git a/asm/bike.s b/asm/bike.s index 4d2683968..5bba18d71 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -77,7 +77,7 @@ sub_80BD100: @ 80BD100 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080BD160 @ =gMapObjects + ldr r0, _080BD160 @ =gObjectEvents adds r4, r0 bl player_get_direction_upper_nybble lsls r0, 24 @@ -106,7 +106,7 @@ sub_80BD100: @ 80BD100 b _080BD1B6 .align 2, 0 _080BD15C: .4byte gPlayerAvatar -_080BD160: .4byte gMapObjects +_080BD160: .4byte gObjectEvents _080BD164: .4byte gMain _080BD168: ldrb r0, [r6] @@ -204,7 +204,7 @@ sub_80BD1E8: @ 80BD1E8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD244 @ =gMapObjects + ldr r1, _080BD244 @ =gObjectEvents adds r0, r1 ldrb r0, [r0, 0x1E] bl MetatileBehavior_IsCyclingRoadPullDownTile @@ -227,7 +227,7 @@ sub_80BD1E8: @ 80BD1E8 b _080BD270 .align 2, 0 _080BD240: .4byte gPlayerAvatar -_080BD244: .4byte gMapObjects +_080BD244: .4byte gObjectEvents _080BD248: movs r0, 0x2 strb r0, [r4, 0x2] @@ -281,7 +281,7 @@ sub_80BD28C: @ 80BD28C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD2C4 @ =gMapObjects + ldr r1, _080BD2C4 @ =gObjectEvents adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -299,7 +299,7 @@ _080BD2B2: bx r0 .align 2, 0 _080BD2C0: .4byte gPlayerAvatar -_080BD2C4: .4byte gMapObjects +_080BD2C4: .4byte gObjectEvents thumb_func_end sub_80BD28C thumb_func_start sub_80BD2C8 @@ -313,7 +313,7 @@ sub_80BD2C8: @ 80BD2C8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD2FC @ =gMapObjects + ldr r1, _080BD2FC @ =gObjectEvents adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -327,7 +327,7 @@ sub_80BD2C8: @ 80BD2C8 b _080BD350 .align 2, 0 _080BD2F8: .4byte gPlayerAvatar -_080BD2FC: .4byte gMapObjects +_080BD2FC: .4byte gObjectEvents _080BD300: adds r0, r4, 0 bl sub_80BD3A0 @@ -425,7 +425,7 @@ sub_80BD3A0: @ 80BD3A0 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080BD408 @ =gMapObjects + ldr r0, _080BD408 @ =gObjectEvents adds r4, r0 ldrh r1, [r4, 0x10] add r0, sp, 0x4 @@ -463,7 +463,7 @@ sub_80BD3A0: @ 80BD3A0 bx r1 .align 2, 0 _080BD404: .4byte gPlayerAvatar -_080BD408: .4byte gMapObjects +_080BD408: .4byte gObjectEvents thumb_func_end sub_80BD3A0 thumb_func_start sub_80BD40C @@ -689,7 +689,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C lsls r0, 24 cmp r0, 0 beq _080BD5C0 - ldr r2, _080BD5B8 @ =gMapObjects + ldr r2, _080BD5B8 @ =gObjectEvents ldr r0, _080BD5BC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -704,7 +704,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C movs r0, 0 b _080BD5C2 .align 2, 0 -_080BD5B8: .4byte gMapObjects +_080BD5B8: .4byte gObjectEvents _080BD5BC: .4byte gPlayerAvatar _080BD5C0: movs r0, 0x1 diff --git a/asm/map_obj_80688E4.s b/asm/event_object_80688E4.s index 04df8c938..1482529fe 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/event_object_80688E4.s @@ -5,8 +5,8 @@ .text - thumb_func_start FreezeMapObject -FreezeMapObject: @ 80688E4 + thumb_func_start FreezeObjectEvent +FreezeObjectEvent: @ 80688E4 push {r4,r5,lr} adds r5, r0, 0 ldrh r1, [r5] @@ -80,13 +80,13 @@ _0806896E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end FreezeMapObject + 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 @ =gMapObjects + ldr r5, _080689A8 @ =gObjectEvents _0806897A: lsls r0, r4, 3 adds r0, r4 @@ -101,7 +101,7 @@ _0806897A: cmp r4, r0 beq _08068998 adds r0, r1, 0 - bl FreezeMapObject + bl FreezeObjectEvent _08068998: adds r0, r4, 0x1 lsls r0, 24 @@ -112,17 +112,17 @@ _08068998: pop {r0} bx r0 .align 2, 0 -_080689A8: .4byte gMapObjects +_080689A8: .4byte gObjectEvents _080689AC: .4byte gPlayerAvatar - thumb_func_end FreezeEventObjects + thumb_func_end FreezeObjectEvents - thumb_func_start FreezeMapObjectsExceptOne -FreezeMapObjectsExceptOne: @ 80689B0 + thumb_func_start FreezeObjectEventsExceptOne +FreezeObjectEventsExceptOne: @ 80689B0 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r6, _080689EC @ =gMapObjects + ldr r6, _080689EC @ =gObjectEvents _080689BA: cmp r4, r5 beq _080689DC @@ -139,7 +139,7 @@ _080689BA: cmp r4, r0 beq _080689DC adds r0, r1, 0 - bl FreezeMapObject + bl FreezeObjectEvent _080689DC: adds r0, r4, 0x1 lsls r0, 24 @@ -150,9 +150,9 @@ _080689DC: pop {r0} bx r0 .align 2, 0 -_080689EC: .4byte gMapObjects +_080689EC: .4byte gObjectEvents _080689F0: .4byte gPlayerAvatar - thumb_func_end FreezeMapObjectsExceptOne + thumb_func_end FreezeObjectEventsExceptOne thumb_func_start npc_sync_anim_pause_bits npc_sync_anim_pause_bits: @ 80689F4 @@ -209,11 +209,11 @@ _08068A54: .4byte 0x00000101 _08068A58: .4byte gSprites thumb_func_end npc_sync_anim_pause_bits - thumb_func_start UnfreezeMapObjects -UnfreezeMapObjects: @ 8068A5C + thumb_func_start UnfreezeObjectEvents +UnfreezeObjectEvents: @ 8068A5C push {r4,r5,lr} movs r4, 0 - ldr r5, _08068A88 @ =gMapObjects + ldr r5, _08068A88 @ =gObjectEvents _08068A62: lsls r0, r4, 3 adds r0, r4 @@ -235,8 +235,8 @@ _08068A78: pop {r0} bx r0 .align 2, 0 -_08068A88: .4byte gMapObjects - thumb_func_end UnfreezeMapObjects +_08068A88: .4byte gObjectEvents + thumb_func_end UnfreezeObjectEvents thumb_func_start little_step little_step: @ 8068A8C @@ -788,14 +788,14 @@ _08068E50: .4byte gUnknown_83A7202 _08068E54: .4byte gUnknown_83A7208 thumb_func_end sub_8068DC4 - thumb_func_start SetFieldObjectStepTimer -SetFieldObjectStepTimer: @ 8068E58 + thumb_func_start SetObjectEventStepTimer +SetObjectEventStepTimer: @ 8068E58 strh r1, [r0, 0x34] bx lr - thumb_func_end SetFieldObjectStepTimer + thumb_func_end SetObjectEventStepTimer - thumb_func_start RunFieldObjectStepTimer -RunFieldObjectStepTimer: @ 8068E5C + thumb_func_start RunObjectEventStepTimer +RunObjectEventStepTimer: @ 8068E5C push {lr} ldrh r1, [r0, 0x34] subs r1, 0x1 @@ -810,7 +810,7 @@ _08068E6E: _08068E70: pop {r1} bx r1 - thumb_func_end RunFieldObjectStepTimer + thumb_func_end RunObjectEventStepTimer thumb_func_start obj_anim_image_set_and_seek obj_anim_image_set_and_seek: @ 8068E74 @@ -1099,7 +1099,7 @@ sub_8069058: @ 8069058 ldr r0, _08069090 @ =gSprites adds r4, r0 adds r0, r5, 0 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1130,7 +1130,7 @@ sub_8069094: @ 8069094 ldr r1, _080690F8 @ =gSprites adds r4, r0, r1 adds r0, r5, 0 - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldrh r3, [r4, 0x4] lsls r3, 22 ldr r1, [r0, 0x10] @@ -1441,7 +1441,7 @@ oe_exec_and_other_stuff: @ 80692C8 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap adds r0, r4, 0 bl FieldEffectStart pop {r4} @@ -1474,7 +1474,7 @@ DoRippleFieldEffect: @ 806930C push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldr r2, _08069344 @ =gFieldEffectArguments movs r3, 0x20 ldrsh r1, [r4, r3] diff --git a/asm/field_map_obj.s b/asm/event_object_movement.s index 8c782d3dd..66207007c 100644 --- a/asm/field_map_obj.s +++ b/asm/event_object_movement.s @@ -28,7 +28,7 @@ npc_clear_ids_and_state: @ 805DE2C npcs_clear_ids_and_state: @ 805DE4C push {r4,r5,lr} movs r4, 0 - ldr r5, _0805DE70 @ =gMapObjects + ldr r5, _0805DE70 @ =gObjectEvents _0805DE52: lsls r0, r4, 3 adds r0, r4 @@ -44,7 +44,7 @@ _0805DE52: pop {r0} bx r0 .align 2, 0 -_0805DE70: .4byte gMapObjects +_0805DE70: .4byte gObjectEvents thumb_func_end npcs_clear_ids_and_state thumb_func_start sub_805DE74 @@ -65,7 +65,7 @@ sub_805DE8C: @ 805DE8C mov r5, r9 mov r4, r8 push {r4-r6} - ldr r0, _0805DF28 @ =gUnknown_83A0010 + ldr r0, _0805DF28 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x54] mov r9, r0 movs r1, 0 @@ -133,7 +133,7 @@ sub_805DE8C: @ 805DE8C pop {r0} bx r0 .align 2, 0 -_0805DF28: .4byte gUnknown_83A0010 +_0805DF28: .4byte gFieldEffectObjectTemplatePointers _0805DF2C: .4byte gSprites thumb_func_end sub_805DE8C @@ -141,11 +141,11 @@ _0805DF2C: .4byte gSprites sub_805DF30: @ 805DF30 push {lr} movs r1, 0 - ldr r2, _0805DF3C @ =gMapObjects + ldr r2, _0805DF3C @ =gObjectEvents ldrb r0, [r2] b _0805DF54 .align 2, 0 -_0805DF3C: .4byte gMapObjects +_0805DF3C: .4byte gObjectEvents _0805DF40: adds r0, r1, 0x1 lsls r0, 24 @@ -167,8 +167,8 @@ _0805DF5A: bx r1 thumb_func_end sub_805DF30 - thumb_func_start GetFieldObjectIdByLocalIdAndMap -GetFieldObjectIdByLocalIdAndMap: @ 805DF60 + thumb_func_start GetObjectEventIdByLocalIdAndMap +GetObjectEventIdByLocalIdAndMap: @ 805DF60 push {lr} lsls r0, 24 lsrs r0, 24 @@ -178,19 +178,19 @@ GetFieldObjectIdByLocalIdAndMap: @ 805DF60 lsrs r2, 24 cmp r0, 0xFE bls _0805DF78 - bl GetFieldObjectIdByLocalId + bl GetObjectEventIdByLocalId b _0805DF7C _0805DF78: - bl GetFieldObjectIdByLocalIdAndMapInternal + bl GetObjectEventIdByLocalIdAndMapInternal _0805DF7C: lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end GetFieldObjectIdByLocalIdAndMap + thumb_func_end GetObjectEventIdByLocalIdAndMap - thumb_func_start TryGetFieldObjectIdByLocalIdAndMap -TryGetFieldObjectIdByLocalIdAndMap: @ 805DF84 + thumb_func_start TryGetObjectEventIdByLocalIdAndMap +TryGetObjectEventIdByLocalIdAndMap: @ 805DF84 push {r4,lr} adds r4, r3, 0 lsls r0, 24 @@ -199,7 +199,7 @@ TryGetFieldObjectIdByLocalIdAndMap: @ 805DF84 lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - bl GetFieldObjectIdByLocalIdAndMap + bl GetObjectEventIdByLocalIdAndMap strb r0, [r4] lsls r0, 24 lsrs r0, 24 @@ -213,13 +213,13 @@ _0805DFA8: pop {r4} pop {r1} bx r1 - thumb_func_end TryGetFieldObjectIdByLocalIdAndMap + thumb_func_end TryGetObjectEventIdByLocalIdAndMap - thumb_func_start GetFieldObjectIdByXY -GetFieldObjectIdByXY: @ 805DFB0 + thumb_func_start GetObjectEventIdByXY +GetObjectEventIdByXY: @ 805DFB0 push {r4-r6,lr} movs r3, 0 - ldr r5, _0805DFF0 @ =gMapObjects + ldr r5, _0805DFF0 @ =gObjectEvents lsls r0, 16 asrs r4, r0, 16 lsls r1, 16 @@ -253,11 +253,11 @@ _0805DFE8: pop {r1} bx r1 .align 2, 0 -_0805DFF0: .4byte gMapObjects - thumb_func_end GetFieldObjectIdByXY +_0805DFF0: .4byte gObjectEvents + thumb_func_end GetObjectEventIdByXY - thumb_func_start GetFieldObjectIdByLocalIdAndMapInternal -GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4 + thumb_func_start GetObjectEventIdByLocalIdAndMapInternal +GetObjectEventIdByLocalIdAndMapInternal: @ 805DFF4 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -266,7 +266,7 @@ GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4 lsls r2, 24 lsrs r2, 24 movs r1, 0 - ldr r6, _0805E02C @ =gMapObjects + ldr r6, _0805E02C @ =gObjectEvents _0805E006: lsls r0, r1, 3 adds r0, r1 @@ -288,7 +288,7 @@ _0805E006: adds r0, r1, 0 b _0805E03C .align 2, 0 -_0805E02C: .4byte gMapObjects +_0805E02C: .4byte gObjectEvents _0805E030: adds r0, r1, 0x1 lsls r0, 24 @@ -300,15 +300,15 @@ _0805E03C: pop {r4-r6} pop {r1} bx r1 - thumb_func_end GetFieldObjectIdByLocalIdAndMapInternal + thumb_func_end GetObjectEventIdByLocalIdAndMapInternal - thumb_func_start GetFieldObjectIdByLocalId -GetFieldObjectIdByLocalId: @ 805E044 + thumb_func_start GetObjectEventIdByLocalId +GetObjectEventIdByLocalId: @ 805E044 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r4, _0805E068 @ =gMapObjects + ldr r4, _0805E068 @ =gObjectEvents _0805E04E: lsls r0, r2, 3 adds r0, r2 @@ -324,7 +324,7 @@ _0805E04E: adds r0, r2, 0 b _0805E078 .align 2, 0 -_0805E068: .4byte gMapObjects +_0805E068: .4byte gObjectEvents _0805E06C: adds r0, r2, 0x1 lsls r0, 24 @@ -336,7 +336,7 @@ _0805E078: pop {r4} pop {r1} bx r1 - thumb_func_end GetFieldObjectIdByLocalId + thumb_func_end GetObjectEventIdByLocalId thumb_func_start sub_805E080 sub_805E080: @ 805E080 @@ -389,7 +389,7 @@ _0805E0DA: adds r1, r7, 0 adds r2, r6, 0 mov r3, sp - bl GetAvailableFieldObjectSlot + bl GetAvailableObjectEventSlot lsls r0, 24 cmp r0, 0 bne _0805E106 @@ -414,7 +414,7 @@ _0805E10A: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805E13C @ =gMapObjects + ldr r1, _0805E13C @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 bl npc_clear_ids_and_state @@ -434,7 +434,7 @@ _0805E10A: adds r0, r1 b _0805E14E .align 2, 0 -_0805E13C: .4byte gMapObjects +_0805E13C: .4byte gObjectEvents _0805E140: ldrh r0, [r5, 0x4] adds r0, 0x7 @@ -501,7 +501,7 @@ _0805E14E: strb r0, [r4, 0x7] ldrh r0, [r5, 0xE] strb r0, [r4, 0x1D] - ldr r1, _0805E230 @ =gUnknown_839FD5D + ldr r1, _0805E230 @ =gInitialMovementTypeFacingDirections ldrb r0, [r5, 0x9] adds r0, r1 ldrb r1, [r0] @@ -510,10 +510,10 @@ _0805E14E: strb r1, [r0] ldrb r1, [r0] adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r4, 0 - bl FieldObjectHandleDynamicGraphicsId - ldr r1, _0805E234 @ =gUnknown_839FD0C + bl ObjectEventHandleDynamicGraphicsId + ldr r1, _0805E234 @ =gRangedMovementTypes ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -559,8 +559,8 @@ _0805E220: pop {r1} bx r1 .align 2, 0 -_0805E230: .4byte gUnknown_839FD5D -_0805E234: .4byte gUnknown_839FD0C +_0805E230: .4byte gInitialMovementTypeFacingDirections +_0805E234: .4byte gRangedMovementTypes thumb_func_end sub_805E080 thumb_func_start sub_805E238 @@ -828,8 +828,8 @@ _0805E406: _0805E410: .4byte gSaveBlock1Ptr thumb_func_end sub_805E3A0 - thumb_func_start GetAvailableFieldObjectSlot -GetAvailableFieldObjectSlot: @ 805E414 + thumb_func_start GetAvailableObjectEventSlot +GetAvailableObjectEventSlot: @ 805E414 push {r4-r7,lr} mov r12, r3 lsls r0, 16 @@ -839,7 +839,7 @@ GetAvailableFieldObjectSlot: @ 805E414 lsls r2, 24 lsrs r4, r2, 24 movs r2, 0 - ldr r1, _0805E470 @ =gMapObjects + ldr r1, _0805E470 @ =gObjectEvents ldrb r0, [r1] lsls r0, 31 adds r7, r1, 0 @@ -881,11 +881,11 @@ _0805E46C: movs r0, 0x1 b _0805E4A8 .align 2, 0 -_0805E470: .4byte gMapObjects +_0805E470: .4byte gObjectEvents _0805E474: mov r0, r12 strb r2, [r0] - ldr r1, _0805E4B0 @ =gMapObjects + ldr r1, _0805E4B0 @ =gObjectEvents _0805E47A: lsls r0, r2, 3 adds r0, r2 @@ -916,24 +916,24 @@ _0805E4A8: pop {r1} bx r1 .align 2, 0 -_0805E4B0: .4byte gMapObjects - thumb_func_end GetAvailableFieldObjectSlot +_0805E4B0: .4byte gObjectEvents + thumb_func_end GetAvailableObjectEventSlot - thumb_func_start RemoveFieldObject -RemoveFieldObject: @ 805E4B4 + thumb_func_start RemoveObjectEvent +RemoveObjectEvent: @ 805E4B4 push {lr} ldrb r2, [r0] movs r1, 0x2 negs r1, r1 ands r1, r2 strb r1, [r0] - bl RemoveFieldObjectInternal + bl RemoveObjectEventInternal pop {r0} bx r0 - thumb_func_end RemoveFieldObject + thumb_func_end RemoveObjectEvent - thumb_func_start RemoveFieldObjectByLocalIdAndMap -RemoveFieldObjectByLocalIdAndMap: @ 805E4C8 + thumb_func_start RemoveObjectEventByLocalIdAndMap +RemoveObjectEventByLocalIdAndMap: @ 805E4C8 push {lr} sub sp, 0x4 lsls r0, 24 @@ -943,13 +943,13 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805E506 mov r0, sp ldrb r0, [r0] - bl GetFieldObjectFlagIdByFieldObjectId + bl GetObjectEventFlagIdByObjectEventId lsls r0, 16 lsrs r0, 16 bl FlagSet @@ -958,24 +958,24 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805E50C @ =gMapObjects + ldr r1, _0805E50C @ =gObjectEvents adds r0, r1 - bl RemoveFieldObject + bl RemoveObjectEvent _0805E506: add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0805E50C: .4byte gMapObjects - thumb_func_end RemoveFieldObjectByLocalIdAndMap +_0805E50C: .4byte gObjectEvents + thumb_func_end RemoveObjectEventByLocalIdAndMap - thumb_func_start RemoveFieldObjectInternal -RemoveFieldObjectInternal: @ 805E510 + thumb_func_start RemoveObjectEventInternal +RemoveObjectEventInternal: @ 805E510 push {r4,lr} sub sp, 0x8 adds r4, r0, 0 ldrb r0, [r4, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldrh r2, [r0, 0x6] ldr r1, _0805E554 @ =0xffff0000 ldr r0, [sp, 0x4] @@ -1005,7 +1005,7 @@ RemoveFieldObjectInternal: @ 805E510 .align 2, 0 _0805E554: .4byte 0xffff0000 _0805E558: .4byte gSprites - thumb_func_end RemoveFieldObjectInternal + thumb_func_end RemoveObjectEventInternal thumb_func_start unref_sub_808D958 unref_sub_808D958: @ 805E55C @@ -1019,9 +1019,9 @@ _0805E560: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _0805E58C @ =gMapObjects + ldr r1, _0805E58C @ =gObjectEvents adds r0, r1 - bl RemoveFieldObject + bl RemoveObjectEvent _0805E576: adds r0, r4, 0x1 lsls r0, 24 @@ -1033,7 +1033,7 @@ _0805E576: bx r0 .align 2, 0 _0805E588: .4byte gPlayerAvatar -_0805E58C: .4byte gMapObjects +_0805E58C: .4byte gObjectEvents thumb_func_end unref_sub_808D958 thumb_func_start sub_805E590 @@ -1071,10 +1071,10 @@ _0805E5CA: lsls r4, r0, 3 adds r0, r4, r0 lsls r0, 2 - ldr r1, _0805E5F4 @ =gMapObjects + ldr r1, _0805E5F4 @ =gObjectEvents adds r5, r0, r1 ldrb r0, [r5, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r6, r0, 0 ldrb r1, [r6, 0xC] movs r0, 0xF @@ -1087,7 +1087,7 @@ _0805E5CA: bl npc_load_two_palettes__no_record b _0805E606 .align 2, 0 -_0805E5F4: .4byte gMapObjects +_0805E5F4: .4byte gObjectEvents _0805E5F8: cmp r0, 0xA bne _0805E606 @@ -1116,7 +1116,7 @@ _0805E614: lsrs r7, r0, 24 cmp r7, 0x40 bne _0805E650 - ldr r0, _0805E64C @ =gMapObjects + ldr r0, _0805E64C @ =gObjectEvents mov r2, r8 adds r1, r4, r2 lsls r1, 2 @@ -1130,7 +1130,7 @@ _0805E614: b _0805E718 .align 2, 0 _0805E648: .4byte 0x0000ffff -_0805E64C: .4byte gMapObjects +_0805E64C: .4byte gObjectEvents _0805E650: lsls r0, r7, 4 adds r0, r7 @@ -1212,7 +1212,7 @@ _0805E650: ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1240,8 +1240,8 @@ _0805E718: _0805E728: .4byte gSprites thumb_func_end sub_805E590 - thumb_func_start SpawnFieldObject -SpawnFieldObject: @ 805E72C + thumb_func_start SpawnObjectEvent +SpawnObjectEvent: @ 805E72C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -1266,12 +1266,12 @@ SpawnFieldObject: @ 805E72C str r0, [sp, 0x20] mov r1, r9 ldrb r0, [r1, 0x1] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r7, r0, 0 add r2, sp, 0x20 mov r0, r9 add r1, sp, 0x8 - bl MakeObjectTemplateFromFieldObjectTemplate + bl MakeObjectTemplateFromObjectEventTemplate ldrh r3, [r7, 0x6] ldr r2, _0805E7A4 @ =0xffff0000 add r1, sp, 0x24 @@ -1302,7 +1302,7 @@ SpawnFieldObject: @ 805E72C _0805E7A4: .4byte 0xffff0000 _0805E7A8: ldr r4, _0805E7EC @ =gSprites - ldr r1, _0805E7F0 @ =gMapObjects + ldr r1, _0805E7F0 @ =gObjectEvents lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -1338,11 +1338,11 @@ _0805E7DE: bx r1 .align 2, 0 _0805E7EC: .4byte gSprites -_0805E7F0: .4byte gMapObjects - thumb_func_end SpawnFieldObject +_0805E7F0: .4byte gObjectEvents + thumb_func_end SpawnObjectEvent - thumb_func_start SpawnSpecialFieldObject -SpawnSpecialFieldObject: @ 805E7F4 + thumb_func_start SpawnSpecialObjectEvent +SpawnSpecialObjectEvent: @ 805E7F4 push {r4-r6,lr} sub sp, 0x8 adds r5, r0, 0 @@ -1350,7 +1350,7 @@ SpawnSpecialFieldObject: @ 805E7F4 adds r4, 0x6 add r0, sp, 0x4 adds r1, r4, 0 - bl GetFieldObjectMovingCameraOffset + bl GetObjectEventMovingCameraOffset ldr r0, _0805E82C @ =gSaveBlock1Ptr ldr r0, [r0] ldrb r1, [r0, 0x5] @@ -1362,7 +1362,7 @@ SpawnSpecialFieldObject: @ 805E7F4 ldrsh r0, [r4, r6] str r0, [sp] adds r0, r5, 0 - bl SpawnFieldObject + bl SpawnObjectEvent lsls r0, 24 lsrs r0, 24 add sp, 0x8 @@ -1371,10 +1371,10 @@ SpawnSpecialFieldObject: @ 805E7F4 bx r1 .align 2, 0 _0805E82C: .4byte gSaveBlock1Ptr - thumb_func_end SpawnSpecialFieldObject + thumb_func_end SpawnSpecialObjectEvent - thumb_func_start SpawnSpecialFieldObjectParameterized -SpawnSpecialFieldObjectParameterized: @ 805E830 + thumb_func_start SpawnSpecialObjectEventParameterized +SpawnSpecialObjectEventParameterized: @ 805E830 push {r4-r6,lr} mov r6, r8 push {r6} @@ -1414,7 +1414,7 @@ SpawnSpecialFieldObjectParameterized: @ 805E830 strb r5, [r0, 0xA] strh r6, [r0, 0xC] strh r6, [r0, 0xE] - bl SpawnSpecialFieldObject + bl SpawnSpecialObjectEvent lsls r0, 24 lsrs r0, 24 add sp, 0x18 @@ -1425,7 +1425,7 @@ SpawnSpecialFieldObjectParameterized: @ 805E830 bx r1 .align 2, 0 _0805E894: .4byte 0xfff90000 - thumb_func_end SpawnSpecialFieldObjectParameterized + thumb_func_end SpawnSpecialObjectEventParameterized thumb_func_start show_sprite show_sprite: @ 805E898 @@ -1439,7 +1439,7 @@ show_sprite: @ 805E898 lsrs r6, r2, 24 adds r1, r7, 0 adds r2, r6, 0 - bl GetFieldObjectTemplateByLocalIdAndMap + bl GetObjectEventTemplateByLocalIdAndMap adds r5, r0, 0 cmp r5, 0 beq _0805E8DE @@ -1447,7 +1447,7 @@ show_sprite: @ 805E898 adds r4, 0x6 add r0, sp, 0x4 adds r1, r4, 0 - bl GetFieldObjectMovingCameraOffset + bl GetObjectEventMovingCameraOffset add r0, sp, 0x4 movs r1, 0 ldrsh r3, [r0, r1] @@ -1457,7 +1457,7 @@ show_sprite: @ 805E898 adds r0, r5, 0 adds r1, r7, 0 adds r2, r6, 0 - bl SpawnFieldObject + bl SpawnObjectEvent lsls r0, 24 lsrs r0, 24 b _0805E8E0 @@ -1478,7 +1478,7 @@ sub_805E8E8: @ 805E8E8 adds r7, r3, 0 lsls r0, 24 lsrs r0, 24 - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r5, r0, 0 ldrh r0, [r5] strh r0, [r4] @@ -1517,13 +1517,13 @@ _0805E936: bx r0 thumb_func_end sub_805E8E8 - thumb_func_start MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex -MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 805E940 + thumb_func_start MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex +MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex: @ 805E940 push {r4,lr} lsls r0, 16 lsrs r0, 16 lsls r1, 16 - ldr r4, _0805E95C @ =gUnknown_839FBC8 + ldr r4, _0805E95C @ =gMovementTypeCallbacks lsrs r1, 14 adds r1, r4 ldr r1, [r1] @@ -1532,11 +1532,11 @@ MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 805E940 pop {r0} bx r0 .align 2, 0 -_0805E95C: .4byte gUnknown_839FBC8 - thumb_func_end MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex +_0805E95C: .4byte gMovementTypeCallbacks + thumb_func_end MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex - thumb_func_start MakeObjectTemplateFromFieldObjectTemplate -MakeObjectTemplateFromFieldObjectTemplate: @ 805E960 + thumb_func_start MakeObjectTemplateFromObjectEventTemplate +MakeObjectTemplateFromObjectEventTemplate: @ 805E960 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -1544,14 +1544,14 @@ MakeObjectTemplateFromFieldObjectTemplate: @ 805E960 ldrb r0, [r4, 0x1] ldrb r1, [r4, 0x9] adds r2, r5, 0 - bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex + bl MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex pop {r4,r5} pop {r0} bx r0 - thumb_func_end MakeObjectTemplateFromFieldObjectTemplate + 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 @@ -1643,7 +1643,7 @@ sprite_new: @ 805E9F8 lsrs r4, 24 str r4, [sp, 0x20] adds r0, r5, 0 - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r4, r0, 0 ldr r1, _0805EB38 @ =sub_8068FA8 add r3, sp, 0x1C @@ -1752,7 +1752,7 @@ _0805EB00: movs r2, 0x1 bl SetObjectSubpriorityByZCoord ldr r0, [sp, 0x20] - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1793,7 +1793,7 @@ sub_805EB44: @ 805EB44 lsls r5, 16 lsrs r5, 16 adds r0, r6, 0 - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r7, r0, 0 ldr r1, _0805EC24 @ =SpriteCallbackDummy add r3, sp, 0x18 @@ -1869,7 +1869,7 @@ _0805EBE6: strb r1, [r2] _0805EC02: movs r0, 0x1 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1983,7 +1983,7 @@ _0805EC86: str r0, [sp] adds r0, r4, 0 asrs r3, 16 - bl SpawnFieldObject + bl SpawnObjectEvent _0805ECEC: adds r0, r5, 0x1 lsls r0, 24 @@ -2005,8 +2005,8 @@ _0805ED08: .4byte gMapHeader _0805ED0C: .4byte gSaveBlock1Ptr thumb_func_end sub_805EC30 - thumb_func_start RemoveFieldObjectsOutsideView -RemoveFieldObjectsOutsideView: @ 805ED10 + thumb_func_start RemoveObjectEventsOutsideView +RemoveObjectEventsOutsideView: @ 805ED10 push {r4-r6,lr} movs r3, 0 ldr r6, _0805ED64 @ =gUnknown_2031DEC @@ -2035,7 +2035,7 @@ _0805ED2E: lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r1, _0805ED68 @ =gMapObjects + ldr r1, _0805ED68 @ =gObjectEvents adds r2, r0, r1 ldr r0, [r2] ldr r1, _0805ED6C @ =0x00010001 @@ -2043,7 +2043,7 @@ _0805ED2E: cmp r0, 0x1 bne _0805ED56 adds r0, r2, 0 - bl RemoveFieldObjectIfOutsideView + bl RemoveObjectEventIfOutsideView _0805ED56: lsls r0, r5, 24 lsrs r3, r0, 24 @@ -2054,12 +2054,12 @@ _0805ED56: bx r0 .align 2, 0 _0805ED64: .4byte gUnknown_2031DEC -_0805ED68: .4byte gMapObjects +_0805ED68: .4byte gObjectEvents _0805ED6C: .4byte 0x00010001 - thumb_func_end RemoveFieldObjectsOutsideView + thumb_func_end RemoveObjectEventsOutsideView - thumb_func_start RemoveFieldObjectIfOutsideView -RemoveFieldObjectIfOutsideView: @ 805ED70 + thumb_func_start RemoveObjectEventIfOutsideView +RemoveObjectEventIfOutsideView: @ 805ED70 push {r4-r7,lr} adds r3, r0, 0 ldr r0, _0805EDEC @ =gSaveBlock1Ptr @@ -2118,14 +2118,14 @@ _0805EDB6: ble _0805EDE4 _0805EDDE: adds r0, r3, 0 - bl RemoveFieldObject + bl RemoveObjectEvent _0805EDE4: pop {r4-r7} pop {r0} bx r0 .align 2, 0 _0805EDEC: .4byte gSaveBlock1Ptr - thumb_func_end RemoveFieldObjectIfOutsideView + thumb_func_end RemoveObjectEventIfOutsideView thumb_func_start sub_805EDF0 sub_805EDF0: @ 805EDF0 @@ -2138,7 +2138,7 @@ sub_805EDF0: @ 805EDF0 lsrs r5, 16 bl ClearPlayerAvatarInfo movs r6, 0 - ldr r7, _0805EE38 @ =gMapObjects + ldr r7, _0805EE38 @ =gObjectEvents lsls r4, 16 lsls r5, 16 _0805EE0A: @@ -2165,7 +2165,7 @@ _0805EE24: pop {r0} bx r0 .align 2, 0 -_0805EE38: .4byte gMapObjects +_0805EE38: .4byte gObjectEvents thumb_func_end sub_805EDF0 thumb_func_start sub_805EE3C @@ -2207,12 +2207,12 @@ _0805EE70: lsls r0, r1, 3 add r0, r8 lsls r0, 2 - ldr r1, _0805EFE4 @ =gMapObjects + ldr r1, _0805EFE4 @ =gObjectEvents adds r6, r0, r1 movs r0, 0 str r0, [sp, 0x20] ldrb r0, [r6, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r5, r0, 0 ldrh r2, [r5, 0x6] ldr r1, _0805EFE8 @ =0xffff0000 @@ -2225,7 +2225,7 @@ _0805EE70: ldrb r1, [r6, 0x6] add r3, sp, 0x20 mov r2, sp - bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex + bl MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex str r4, [sp, 0xC] mov r0, sp ldr r2, _0805EFEC @ =0x0000ffff @@ -2314,7 +2314,7 @@ _0805EEDC: bne _0805EF6A mov r0, r8 adds r1, r7, 0 - bl SetPlayerAvatarFieldObjectIdAndObjectId + bl SetPlayerAvatarObjectEventIdAndObjectId bl sub_80DB0C4 strb r0, [r6, 0x1B] _0805EF6A: @@ -2351,7 +2351,7 @@ _0805EF76: ldrb r0, [r6, 0x18] lsls r0, 28 lsrs r0, 28 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2376,7 +2376,7 @@ _0805EFCE: bx r0 .align 2, 0 _0805EFE0: .4byte gUnknown_2031DEC -_0805EFE4: .4byte gMapObjects +_0805EFE4: .4byte gObjectEvents _0805EFE8: .4byte 0xffff0000 _0805EFEC: .4byte 0x0000ffff _0805EFF0: .4byte gSprites @@ -2408,20 +2408,20 @@ sub_805EFF4: @ 805EFF4 subs r2, 0x10 ands r1, r2 strb r1, [r0, 0x2] - bl FieldObjectClearAnim + bl ObjectEventClearAnim pop {r0} bx r0 thumb_func_end sub_805EFF4 - thumb_func_start SetPlayerAvatarFieldObjectIdAndObjectId -SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C + thumb_func_start SetPlayerAvatarObjectEventIdAndObjectId +SetPlayerAvatarObjectEventIdAndObjectId: @ 805F02C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 ldr r5, _0805F058 @ =gPlayerAvatar strb r0, [r5, 0x5] strb r1, [r5, 0x4] - ldr r1, _0805F05C @ =gMapObjects + ldr r1, _0805F05C @ =gObjectEvents lsls r4, r0, 3 adds r4, r0 lsls r4, 2 @@ -2437,11 +2437,11 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C bx r0 .align 2, 0 _0805F058: .4byte gPlayerAvatar -_0805F05C: .4byte gMapObjects - thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId +_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 @@ -2453,7 +2453,7 @@ EventObjectSetGraphicsId: @ 805F060 lsrs r1, 24 str r1, [sp] adds r0, r1, 0 - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r5, r0, 0 ldrb r1, [r6, 0x4] lsls r0, r1, 4 @@ -2625,10 +2625,10 @@ _0805F1BA: _0805F1CC: .4byte gSprites _0805F1D0: .4byte 0x000003ff _0805F1D4: .4byte 0xfffffc00 - thumb_func_end EventObjectSetGraphicsId + thumb_func_end ObjectEventSetGraphicsId - thumb_func_start FieldObjectSetGraphicsIdByLocalIdAndMap -FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8 + thumb_func_start ObjectEventSetGraphicsIdByLocalIdAndMap +ObjectEventSetGraphicsIdByLocalIdAndMap: @ 805F1D8 push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -2640,7 +2640,7 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8 lsls r3, 24 lsrs r4, r3, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805F20C @@ -2649,26 +2649,26 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F214 @ =gMapObjects + ldr r1, _0805F214 @ =gObjectEvents adds r0, r1 adds r1, r4, 0 - bl EventObjectSetGraphicsId + bl ObjectEventSetGraphicsId _0805F20C: add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_0805F214: .4byte gMapObjects - thumb_func_end FieldObjectSetGraphicsIdByLocalIdAndMap +_0805F214: .4byte gObjectEvents + thumb_func_end ObjectEventSetGraphicsIdByLocalIdAndMap - thumb_func_start FieldObjectTurn -FieldObjectTurn: @ 805F218 + thumb_func_start ObjectEventTurn +ObjectEventTurn: @ 805F218 push {r4-r6,lr} adds r6, r0, 0 lsls r1, 24 lsrs r1, 24 - bl FieldObjectSetDirection + bl ObjectEventSetDirection ldrb r0, [r6, 0x1] lsls r0, 27 cmp r0, 0 @@ -2682,7 +2682,7 @@ FieldObjectTurn: @ 805F218 ldrb r0, [r6, 0x18] lsls r0, 28 lsrs r0, 28 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2701,10 +2701,10 @@ _0805F25E: bx r0 .align 2, 0 _0805F264: .4byte gSprites - thumb_func_end FieldObjectTurn + thumb_func_end ObjectEventTurn - thumb_func_start FieldObjectTurnByLocalIdAndMap -FieldObjectTurnByLocalIdAndMap: @ 805F268 + thumb_func_start ObjectEventTurnByLocalIdAndMap +ObjectEventTurnByLocalIdAndMap: @ 805F268 push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -2716,7 +2716,7 @@ FieldObjectTurnByLocalIdAndMap: @ 805F268 lsls r3, 24 lsrs r4, r3, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805F29C @@ -2725,18 +2725,18 @@ FieldObjectTurnByLocalIdAndMap: @ 805F268 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F2A4 @ =gMapObjects + ldr r1, _0805F2A4 @ =gObjectEvents adds r0, r1 adds r1, r4, 0 - bl FieldObjectTurn + bl ObjectEventTurn _0805F29C: add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_0805F2A4: .4byte gMapObjects - thumb_func_end FieldObjectTurnByLocalIdAndMap +_0805F2A4: .4byte gObjectEvents + thumb_func_end ObjectEventTurnByLocalIdAndMap thumb_func_start PlayerObjectTurn PlayerObjectTurn: @ 805F2A8 @@ -2747,17 +2747,17 @@ PlayerObjectTurn: @ 805F2A8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805F2C4 @ =gMapObjects + ldr r2, _0805F2C4 @ =gObjectEvents adds r0, r2 - bl FieldObjectTurn + bl ObjectEventTurn pop {r0} bx r0 .align 2, 0 -_0805F2C4: .4byte gMapObjects +_0805F2C4: .4byte gObjectEvents thumb_func_end PlayerObjectTurn - thumb_func_start GetFieldObjectGraphicsInfo -GetFieldObjectGraphicsInfo: @ 805F2C8 + thumb_func_start GetObjectEventGraphicsInfo +GetObjectEventGraphicsInfo: @ 805F2C8 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -2767,25 +2767,25 @@ GetFieldObjectGraphicsInfo: @ 805F2C8 adds r0, 0x10 lsls r0, 24 lsrs r0, 24 - bl VarGetFieldObjectGraphicsId + bl VarGetObjectEventGraphicsId adds r1, r0, 0 _0805F2E0: cmp r1, 0x97 bls _0805F2E6 movs r1, 0x10 _0805F2E6: - ldr r0, _0805F2F4 @ =gMapObjectGraphicsInfoPointers + ldr r0, _0805F2F4 @ =gObjectEventGraphicsInfoPointers lsls r1, 2 adds r1, r0 ldr r0, [r1] pop {r1} bx r1 .align 2, 0 -_0805F2F4: .4byte gMapObjectGraphicsInfoPointers - thumb_func_end GetFieldObjectGraphicsInfo +_0805F2F4: .4byte gObjectEventGraphicsInfoPointers + thumb_func_end GetObjectEventGraphicsInfo - thumb_func_start FieldObjectHandleDynamicGraphicsId -FieldObjectHandleDynamicGraphicsId: @ 805F2F8 + thumb_func_start ObjectEventHandleDynamicGraphicsId +ObjectEventHandleDynamicGraphicsId: @ 805F2F8 push {r4,lr} adds r4, r0, 0 ldrb r0, [r4, 0x5] @@ -2794,13 +2794,13 @@ FieldObjectHandleDynamicGraphicsId: @ 805F2F8 adds r0, 0x10 lsls r0, 24 lsrs r0, 24 - bl VarGetFieldObjectGraphicsId + bl VarGetObjectEventGraphicsId strb r0, [r4, 0x5] _0805F30E: pop {r4} pop {r0} bx r0 - thumb_func_end FieldObjectHandleDynamicGraphicsId + thumb_func_end ObjectEventHandleDynamicGraphicsId thumb_func_start npc_by_local_id_and_map_set_field_1_bit_x20 npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314 @@ -2815,11 +2815,11 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314 lsls r3, 24 lsrs r4, r3, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805F356 - ldr r2, _0805F360 @ =gMapObjects + ldr r2, _0805F360 @ =gObjectEvents mov r0, sp ldrb r0, [r0] lsls r1, r0, 3 @@ -2842,11 +2842,11 @@ _0805F356: pop {r0} bx r0 .align 2, 0 -_0805F360: .4byte gMapObjects +_0805F360: .4byte gObjectEvents thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20 - thumb_func_start FieldObjectGetLocalIdAndMap -FieldObjectGetLocalIdAndMap: @ 805F364 + thumb_func_start ObjectEventGetLocalIdAndMap +ObjectEventGetLocalIdAndMap: @ 805F364 push {r4,lr} ldrb r4, [r0, 0x8] strb r4, [r1] @@ -2857,7 +2857,7 @@ FieldObjectGetLocalIdAndMap: @ 805F364 pop {r4} pop {r0} bx r0 - thumb_func_end FieldObjectGetLocalIdAndMap + thumb_func_end ObjectEventGetLocalIdAndMap thumb_func_start sub_805F378 sub_805F378: @ 805F378 @@ -2866,7 +2866,7 @@ sub_805F378: @ 805F378 asrs r0, 16 lsls r1, 16 asrs r1, 16 - bl GetFieldObjectIdByXY + bl GetObjectEventIdByXY lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x10 @@ -2874,7 +2874,7 @@ sub_805F378: @ 805F378 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F3A4 @ =gMapObjects + ldr r1, _0805F3A4 @ =gObjectEvents adds r0, r1 ldrb r1, [r0] movs r2, 0x4 @@ -2884,7 +2884,7 @@ _0805F3A0: pop {r0} bx r0 .align 2, 0 -_0805F3A4: .4byte gMapObjects +_0805F3A4: .4byte gObjectEvents thumb_func_end sub_805F378 thumb_func_start sub_805F3A8 @@ -2900,7 +2900,7 @@ sub_805F3A8: @ 805F3A8 lsls r3, 24 lsrs r4, r3, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805F3EE @@ -2909,7 +2909,7 @@ sub_805F3A8: @ 805F3A8 lsls r2, r0, 3 adds r2, r0 lsls r2, 2 - ldr r0, _0805F3F8 @ =gMapObjects + ldr r0, _0805F3F8 @ =gObjectEvents adds r2, r0 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -2929,7 +2929,7 @@ _0805F3EE: pop {r0} bx r0 .align 2, 0 -_0805F3F8: .4byte gMapObjects +_0805F3F8: .4byte gObjectEvents _0805F3FC: .4byte gSprites thumb_func_end sub_805F3A8 @@ -2944,7 +2944,7 @@ sub_805F400: @ 805F400 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805F43C @@ -2953,7 +2953,7 @@ sub_805F400: @ 805F400 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805F444 @ =gMapObjects + ldr r0, _0805F444 @ =gObjectEvents adds r1, r0 ldrb r2, [r1, 0x3] movs r0, 0x5 @@ -2969,7 +2969,7 @@ _0805F43C: pop {r0} bx r0 .align 2, 0 -_0805F444: .4byte gMapObjects +_0805F444: .4byte gObjectEvents thumb_func_end sub_805F400 thumb_func_start sub_805F448 @@ -2988,11 +2988,11 @@ sub_805F448: @ 805F448 lsls r4, 16 lsrs r4, 16 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805F48C - ldr r2, _0805F494 @ =gMapObjects + ldr r2, _0805F494 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3013,7 +3013,7 @@ _0805F48C: pop {r0} bx r0 .align 2, 0 -_0805F494: .4byte gMapObjects +_0805F494: .4byte gObjectEvents _0805F498: .4byte gSprites thumb_func_end sub_805F448 @@ -3035,14 +3035,14 @@ sub_805F4B0: @ 805F4B0 push {lr} lsls r0, 16 lsrs r0, 16 - bl FindFieldObjectPaletteIndexByTag + bl FindObjectEventPaletteIndexByTag lsls r0, 24 lsrs r1, r0, 24 ldr r0, _0805F4D4 @ =0x000011ff cmp r1, r0 beq _0805F4CE lsls r0, r1, 3 - ldr r1, _0805F4D8 @ =gUnknown_83A5158 + ldr r1, _0805F4D8 @ =gObjectEventSpritePalettes adds r0, r1 bl sub_805F510 _0805F4CE: @@ -3050,7 +3050,7 @@ _0805F4CE: bx r0 .align 2, 0 _0805F4D4: .4byte 0x000011ff -_0805F4D8: .4byte gUnknown_83A5158 +_0805F4D8: .4byte gObjectEventSpritePalettes thumb_func_end sub_805F4B0 thumb_func_start sub_805F4DC @@ -3115,9 +3115,9 @@ pal_patch_for_npc: @ 805F538 lsrs r0, 16 lsls r4, 24 lsrs r4, 24 - bl FindFieldObjectPaletteIndexByTag + bl FindObjectEventPaletteIndexByTag lsls r0, 24 - ldr r1, _0805F570 @ =gUnknown_83A5158 + ldr r1, _0805F570 @ =gObjectEventSpritePalettes lsrs r0, 21 adds r0, r1 ldr r0, [r0] @@ -3134,7 +3134,7 @@ pal_patch_for_npc: @ 805F538 pop {r0} bx r0 .align 2, 0 -_0805F570: .4byte gUnknown_83A5158 +_0805F570: .4byte gObjectEventSpritePalettes thumb_func_end pal_patch_for_npc thumb_func_start pal_patch_for_npc_range @@ -3163,13 +3163,13 @@ _0805F598: bx r0 thumb_func_end pal_patch_for_npc_range - thumb_func_start FindFieldObjectPaletteIndexByTag -FindFieldObjectPaletteIndexByTag: @ 805F5A0 + thumb_func_start FindObjectEventPaletteIndexByTag +FindObjectEventPaletteIndexByTag: @ 805F5A0 push {r4-r6,lr} lsls r0, 16 lsrs r5, r0, 16 movs r2, 0 - ldr r0, _0805F5C8 @ =gUnknown_83A5158 + ldr r0, _0805F5C8 @ =gObjectEventSpritePalettes ldrh r1, [r0, 0x4] ldr r3, _0805F5CC @ =0x000011ff adds r4, r0, 0 @@ -3186,7 +3186,7 @@ _0805F5B8: adds r0, r2, 0 b _0805F5E2 .align 2, 0 -_0805F5C8: .4byte gUnknown_83A5158 +_0805F5C8: .4byte gObjectEventSpritePalettes _0805F5CC: .4byte 0x000011ff _0805F5D0: adds r0, r2, 0x1 @@ -3203,7 +3203,7 @@ _0805F5E2: pop {r4-r6} pop {r1} bx r1 - thumb_func_end FindFieldObjectPaletteIndexByTag + thumb_func_end FindObjectEventPaletteIndexByTag thumb_func_start npc_load_two_palettes__no_record npc_load_two_palettes__no_record: @ 805F5E8 @@ -3395,7 +3395,7 @@ sub_805F724: @ 805F724 ldr r1, _0805F7C0 @ =gSprites adds r7, r0, r1 ldrb r0, [r6, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo mov r8, r0 lsls r4, 16 asrs r4, 16 @@ -3472,7 +3472,7 @@ sub_805F7C4: @ 805F7C4 lsls r4, 16 lsrs r4, 16 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805F80C @@ -3483,7 +3483,7 @@ sub_805F7C4: @ 805F7C4 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r3, _0805F814 @ =gMapObjects + ldr r3, _0805F814 @ =gObjectEvents adds r0, r3 movs r3, 0xE0 lsls r3, 11 @@ -3498,7 +3498,7 @@ _0805F80C: pop {r0} bx r0 .align 2, 0 -_0805F814: .4byte gMapObjects +_0805F814: .4byte gObjectEvents thumb_func_end sub_805F7C4 thumb_func_start npc_coords_shift_still @@ -3513,8 +3513,8 @@ npc_coords_shift_still: @ 805F818 bx r0 thumb_func_end npc_coords_shift_still - thumb_func_start UpdateFieldObjectCoordsForCameraUpdate -UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C + thumb_func_start UpdateObjectEventCoordsForCameraUpdate +UpdateObjectEventCoordsForCameraUpdate: @ 805F82C push {r4,r5,lr} ldr r2, _0805F88C @ =gCamera ldrb r1, [r2] @@ -3523,7 +3523,7 @@ UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C cmp r0, 0 beq _0805F884 movs r3, 0 - ldr r5, _0805F890 @ =gMapObjects + ldr r5, _0805F890 @ =gObjectEvents movs r0, 0x4 ldrsh r4, [r2, r0] movs r0, 0x8 @@ -3567,11 +3567,11 @@ _0805F884: bx r0 .align 2, 0 _0805F88C: .4byte gCamera -_0805F890: .4byte gMapObjects - thumb_func_end UpdateFieldObjectCoordsForCameraUpdate +_0805F890: .4byte gObjectEvents + thumb_func_end UpdateObjectEventCoordsForCameraUpdate - thumb_func_start GetFieldObjectIdByXYZ -GetFieldObjectIdByXYZ: @ 805F894 + thumb_func_start GetObjectEventIdByXYZ +GetObjectEventIdByXYZ: @ 805F894 push {r4-r7,lr} mov r7, r8 push {r7} @@ -3582,7 +3582,7 @@ GetFieldObjectIdByXYZ: @ 805F894 lsls r2, 24 lsrs r5, r2, 24 movs r4, 0 - ldr r0, _0805F8E0 @ =gMapObjects + ldr r0, _0805F8E0 @ =gObjectEvents mov r8, r0 _0805F8AC: lsls r0, r4, 3 @@ -3604,14 +3604,14 @@ _0805F8AC: bne _0805F8E4 adds r0, r1, 0 adds r1, r5, 0 - bl FieldObjectDoesZCoordMatch + bl ObjectEventDoesZCoordMatch lsls r0, 24 cmp r0, 0 beq _0805F8E4 adds r0, r4, 0 b _0805F8F0 .align 2, 0 -_0805F8E0: .4byte gMapObjects +_0805F8E0: .4byte gObjectEvents _0805F8E4: adds r0, r4, 0x1 lsls r0, 24 @@ -3625,10 +3625,10 @@ _0805F8F0: pop {r4-r7} pop {r1} bx r1 - thumb_func_end GetFieldObjectIdByXYZ + thumb_func_end GetObjectEventIdByXYZ - thumb_func_start FieldObjectDoesZCoordMatch -FieldObjectDoesZCoordMatch: @ 805F8FC + thumb_func_start ObjectEventDoesZCoordMatch +ObjectEventDoesZCoordMatch: @ 805F8FC push {lr} lsls r1, 24 lsrs r1, 24 @@ -3650,10 +3650,10 @@ _0805F91C: _0805F91E: pop {r1} bx r1 - thumb_func_end FieldObjectDoesZCoordMatch + thumb_func_end ObjectEventDoesZCoordMatch - thumb_func_start UpdateFieldObjectsForCameraUpdate -UpdateFieldObjectsForCameraUpdate: @ 805F924 + thumb_func_start UpdateObjectEventsForCameraUpdate +UpdateObjectEventsForCameraUpdate: @ 805F924 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -3661,7 +3661,7 @@ UpdateFieldObjectsForCameraUpdate: @ 805F924 lsrs r4, 16 lsls r5, 16 lsrs r5, 16 - bl UpdateFieldObjectCoordsForCameraUpdate + bl UpdateObjectEventCoordsForCameraUpdate lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -3669,11 +3669,11 @@ UpdateFieldObjectsForCameraUpdate: @ 805F924 adds r0, r4, 0 adds r1, r5, 0 bl sub_805EC30 - bl RemoveFieldObjectsOutsideView + bl RemoveObjectEventsOutsideView pop {r4,r5} pop {r0} bx r0 - thumb_func_end UpdateFieldObjectsForCameraUpdate + thumb_func_end UpdateObjectEventsForCameraUpdate thumb_func_start AddCameraObject AddCameraObject: @ 805F950 @@ -4040,8 +4040,8 @@ _0805FBD2: bx r1 thumb_func_end obj_unfreeze - thumb_func_start FieldObjectSetDirection -FieldObjectSetDirection: @ 805FBDC + thumb_func_start ObjectEventSetDirection +ObjectEventSetDirection: @ 805FBDC push {r4,lr} adds r3, r0, 0 lsls r1, 24 @@ -4076,10 +4076,10 @@ _0805FC0C: pop {r4} pop {r0} bx r0 - thumb_func_end FieldObjectSetDirection + thumb_func_end ObjectEventSetDirection - thumb_func_start GetFieldObjectScriptPointerByLocalIdAndMap -GetFieldObjectScriptPointerByLocalIdAndMap: @ 805FC20 + thumb_func_start GetObjectEventScriptPointerByLocalIdAndMap +GetObjectEventScriptPointerByLocalIdAndMap: @ 805FC20 push {lr} lsls r0, 24 lsrs r0, 24 @@ -4087,18 +4087,18 @@ GetFieldObjectScriptPointerByLocalIdAndMap: @ 805FC20 lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - bl GetFieldObjectTemplateByLocalIdAndMap + bl GetObjectEventTemplateByLocalIdAndMap ldr r0, [r0, 0x10] pop {r1} bx r1 - thumb_func_end GetFieldObjectScriptPointerByLocalIdAndMap + thumb_func_end GetObjectEventScriptPointerByLocalIdAndMap - thumb_func_start GetFieldObjectScriptPointerByFieldObjectId -GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38 + thumb_func_start GetObjectEventScriptPointerByObjectEventId +GetObjectEventScriptPointerByObjectEventId: @ 805FC38 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805FC58 @ =gMapObjects + ldr r1, _0805FC58 @ =gObjectEvents lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -4106,15 +4106,15 @@ GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38 ldrb r0, [r2, 0x8] ldrb r1, [r2, 0x9] ldrb r2, [r2, 0xA] - bl GetFieldObjectScriptPointerByLocalIdAndMap + bl GetObjectEventScriptPointerByLocalIdAndMap pop {r1} bx r1 .align 2, 0 -_0805FC58: .4byte gMapObjects - thumb_func_end GetFieldObjectScriptPointerByFieldObjectId +_0805FC58: .4byte gObjectEvents + thumb_func_end GetObjectEventScriptPointerByObjectEventId - thumb_func_start GetFieldObjectFlagIdByLocalIdAndMap -GetFieldObjectFlagIdByLocalIdAndMap: @ 805FC5C + thumb_func_start GetObjectEventFlagIdByLocalIdAndMap +GetObjectEventFlagIdByLocalIdAndMap: @ 805FC5C push {lr} lsls r0, 24 lsrs r0, 24 @@ -4122,18 +4122,18 @@ GetFieldObjectFlagIdByLocalIdAndMap: @ 805FC5C lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - bl GetFieldObjectTemplateByLocalIdAndMap + bl GetObjectEventTemplateByLocalIdAndMap ldrh r0, [r0, 0x14] pop {r1} bx r1 - thumb_func_end GetFieldObjectFlagIdByLocalIdAndMap + thumb_func_end GetObjectEventFlagIdByLocalIdAndMap - thumb_func_start GetFieldObjectFlagIdByFieldObjectId -GetFieldObjectFlagIdByFieldObjectId: @ 805FC74 + thumb_func_start GetObjectEventFlagIdByObjectEventId +GetObjectEventFlagIdByObjectEventId: @ 805FC74 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805FC98 @ =gMapObjects + ldr r1, _0805FC98 @ =gObjectEvents lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -4141,14 +4141,14 @@ GetFieldObjectFlagIdByFieldObjectId: @ 805FC74 ldrb r0, [r2, 0x8] ldrb r1, [r2, 0x9] ldrb r2, [r2, 0xA] - bl GetFieldObjectFlagIdByLocalIdAndMap + bl GetObjectEventFlagIdByLocalIdAndMap lsls r0, 16 lsrs r0, 16 pop {r1} bx r1 .align 2, 0 -_0805FC98: .4byte gMapObjects - thumb_func_end GetFieldObjectFlagIdByFieldObjectId +_0805FC98: .4byte gObjectEvents + thumb_func_end GetObjectEventFlagIdByObjectEventId thumb_func_start sub_805FC9C sub_805FC9C: @ 805FC9C @@ -4161,11 +4161,11 @@ sub_805FC9C: @ 805FC9C lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805FCD0 - ldr r2, _0805FCCC @ =gMapObjects + ldr r2, _0805FCCC @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -4175,7 +4175,7 @@ sub_805FC9C: @ 805FC9C ldrb r0, [r0, 0x7] b _0805FCD2 .align 2, 0 -_0805FCCC: .4byte gMapObjects +_0805FCCC: .4byte gObjectEvents _0805FCD0: movs r0, 0xFF _0805FCD2: @@ -4193,7 +4193,7 @@ sub_805FCD8: @ 805FCD8 lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - bl GetFieldObjectTemplateByLocalIdAndMap + bl GetObjectEventTemplateByLocalIdAndMap ldrh r0, [r0, 0xC] pop {r1} bx r1 @@ -4203,7 +4203,7 @@ sub_805FCD8: @ 805FCD8 sub_805FCF0: @ 805FCF0 lsls r0, 24 lsrs r0, 24 - ldr r2, _0805FD04 @ =gMapObjects + ldr r2, _0805FD04 @ =gObjectEvents lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -4211,7 +4211,7 @@ sub_805FCF0: @ 805FCF0 ldrb r0, [r1, 0x7] bx lr .align 2, 0 -_0805FD04: .4byte gMapObjects +_0805FD04: .4byte gObjectEvents thumb_func_end sub_805FCF0 thumb_func_start sub_805FD08 @@ -4225,11 +4225,11 @@ sub_805FD08: @ 805FD08 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805FD3C - ldr r2, _0805FD38 @ =gMapObjects + ldr r2, _0805FD38 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -4239,7 +4239,7 @@ sub_805FD08: @ 805FD08 ldrb r0, [r0, 0x1D] b _0805FD3E .align 2, 0 -_0805FD38: .4byte gMapObjects +_0805FD38: .4byte gObjectEvents _0805FD3C: movs r0, 0xFF _0805FD3E: @@ -4248,11 +4248,11 @@ _0805FD3E: bx r1 thumb_func_end sub_805FD08 - thumb_func_start FieldObjectGetBerryTreeId -FieldObjectGetBerryTreeId: @ 805FD44 + thumb_func_start ObjectEventGetBerryTreeId +ObjectEventGetBerryTreeId: @ 805FD44 lsls r0, 24 lsrs r0, 24 - ldr r2, _0805FD58 @ =gMapObjects + ldr r2, _0805FD58 @ =gObjectEvents lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -4260,11 +4260,11 @@ FieldObjectGetBerryTreeId: @ 805FD44 ldrb r0, [r1, 0x1D] bx lr .align 2, 0 -_0805FD58: .4byte gMapObjects - thumb_func_end FieldObjectGetBerryTreeId +_0805FD58: .4byte gObjectEvents + thumb_func_end ObjectEventGetBerryTreeId - thumb_func_start GetFieldObjectTemplateByLocalIdAndMap -GetFieldObjectTemplateByLocalIdAndMap: @ 805FD5C + thumb_func_start GetObjectEventTemplateByLocalIdAndMap +GetObjectEventTemplateByLocalIdAndMap: @ 805FD5C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -4300,14 +4300,14 @@ _0805FD94: _0805FDA0: ldrb r2, [r0] adds r0, r4, 0 - bl FindFieldObjectTemplateInArrayByLocalId + bl FindObjectEventTemplateInArrayByLocalId pop {r4} pop {r1} bx r1 - thumb_func_end GetFieldObjectTemplateByLocalIdAndMap + thumb_func_end GetObjectEventTemplateByLocalIdAndMap - thumb_func_start FindFieldObjectTemplateInArrayByLocalId -FindFieldObjectTemplateInArrayByLocalId: @ 805FDB0 + thumb_func_start FindObjectEventTemplateInArrayByLocalId +FindObjectEventTemplateInArrayByLocalId: @ 805FDB0 push {r4,r5,lr} adds r5, r1, 0 lsls r0, 24 @@ -4339,7 +4339,7 @@ _0805FDE0: pop {r4,r5} pop {r1} bx r1 - thumb_func_end FindFieldObjectTemplateInArrayByLocalId + thumb_func_end FindObjectEventTemplateInArrayByLocalId thumb_func_start sub_805FDE8 sub_805FDE8: @ 805FDE8 @@ -4454,7 +4454,7 @@ sub_805FE94: @ 805FE94 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0805FEC2 @@ -4463,7 +4463,7 @@ sub_805FE94: @ 805FE94 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805FEC8 @ =gMapObjects + ldr r1, _0805FEC8 @ =gObjectEvents adds r0, r1 bl sub_805FE5C _0805FEC2: @@ -4471,7 +4471,7 @@ _0805FEC2: pop {r0} bx r0 .align 2, 0 -_0805FEC8: .4byte gMapObjects +_0805FEC8: .4byte gObjectEvents thumb_func_end sub_805FE94 thumb_func_start npc_paltag_set_load @@ -4602,14 +4602,14 @@ sub_805FFB4: @ 805FFB4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805FFD0 @ =gMapObjects + ldr r2, _0805FFD0 @ =gObjectEvents adds r0, r2 ldr r2, _0805FFD4 @ =sub_805FFD8 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0805FFD0: .4byte gMapObjects +_0805FFD0: .4byte gObjectEvents _0805FFD4: .4byte sub_805FFD8 thumb_func_end sub_805FFB4 @@ -4628,14 +4628,14 @@ sub_805FFDC: @ 805FFDC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805FFF8 @ =gMapObjects + ldr r2, _0805FFF8 @ =gObjectEvents adds r0, r2 ldr r2, _0805FFFC @ =sub_8060000 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0805FFF8: .4byte gMapObjects +_0805FFF8: .4byte gObjectEvents _0805FFFC: .4byte sub_8060000 thumb_func_end sub_805FFDC @@ -4667,14 +4667,14 @@ sub_8060020: @ 8060020 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806003C @ =gMapObjects + ldr r2, _0806003C @ =gObjectEvents adds r0, r2 ldr r2, _08060040 @ =sub_8060044 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0806003C: .4byte gMapObjects +_0806003C: .4byte gObjectEvents _08060040: .4byte sub_8060044 thumb_func_end sub_8060020 @@ -4750,7 +4750,7 @@ sub_80600A4: @ 80600A4 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r6, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer strh r4, [r6, 0x30] movs r0, 0x1 b _080600DA @@ -4769,7 +4769,7 @@ sub_80600E0: @ 80600E0 push {r4,lr} adds r4, r1, 0 adds r0, r4, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _080600F4 @@ -4803,7 +4803,7 @@ sub_8060100: @ 8060100 ldrb r4, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x5 strh r0, [r6, 0x30] adds r0, r5, 0 @@ -4899,8 +4899,8 @@ _080601CA: bx r1 thumb_func_end sub_80601AC - thumb_func_start FieldObjectIsTrainerAndCloseToPlayer -FieldObjectIsTrainerAndCloseToPlayer: @ 80601D4 + thumb_func_start ObjectEventIsTrainerAndCloseToPlayer +ObjectEventIsTrainerAndCloseToPlayer: @ 80601D4 push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 @@ -4964,7 +4964,7 @@ _08060246: pop {r4-r7} pop {r1} bx r1 - thumb_func_end FieldObjectIsTrainerAndCloseToPlayer + thumb_func_end ObjectEventIsTrainerAndCloseToPlayer thumb_func_start GetRegularRunningPastFacingDirection GetRegularRunningPastFacingDirection: @ 8060250 @@ -5362,7 +5362,7 @@ GetRunningPastFacingDirection: @ 8060504 adds r4, r0, 0 lsls r1, 24 lsrs r6, r1, 24 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 bne _0806051C @@ -5437,14 +5437,14 @@ sub_806058C: @ 806058C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080605A8 @ =gMapObjects + ldr r2, _080605A8 @ =gObjectEvents adds r0, r2 ldr r2, _080605AC @ =sub_80605B0 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080605A8: .4byte gMapObjects +_080605A8: .4byte gObjectEvents _080605AC: .4byte sub_80605B0 thumb_func_end sub_806058C @@ -5521,7 +5521,7 @@ sub_8060610: @ 8060610 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -5543,12 +5543,12 @@ sub_8060654: @ 8060654 adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _08060672 adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _0806067A @@ -5590,7 +5590,7 @@ sub_8060684: @ 8060684 ldrb r1, [r0] _080606B4: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -5610,14 +5610,14 @@ sub_80606CC: @ 80606CC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080606E8 @ =gMapObjects + ldr r2, _080606E8 @ =gObjectEvents adds r0, r2 ldr r2, _080606EC @ =sub_80606F0 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080606E8: .4byte gMapObjects +_080606E8: .4byte gObjectEvents _080606EC: .4byte sub_80606F0 thumb_func_end sub_80606CC @@ -5693,7 +5693,7 @@ sub_8060750: @ 8060750 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r6, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer strh r4, [r6, 0x30] movs r0, 0x1 b _08060786 @@ -5712,7 +5712,7 @@ sub_806078C: @ 806078C push {r4,lr} adds r4, r1, 0 adds r0, r4, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _080607A0 @@ -5747,7 +5747,7 @@ sub_80607AC: @ 80607AC ldrb r4, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x5 strh r0, [r6, 0x30] adds r0, r5, 0 @@ -5825,14 +5825,14 @@ sub_8060850: @ 8060850 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806086C @ =gMapObjects + ldr r2, _0806086C @ =gObjectEvents adds r0, r2 ldr r2, _08060870 @ =sub_8060874 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0806086C: .4byte gMapObjects +_0806086C: .4byte gObjectEvents _08060870: .4byte sub_8060874 thumb_func_end sub_8060850 @@ -5908,7 +5908,7 @@ sub_80608D4: @ 80608D4 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r6, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer strh r4, [r6, 0x30] movs r0, 0x1 b _0806090A @@ -5927,7 +5927,7 @@ sub_8060910: @ 8060910 push {r4,lr} adds r4, r1, 0 adds r0, r4, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _08060924 @@ -5962,7 +5962,7 @@ sub_8060930: @ 8060930 ldrb r4, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x5 strh r0, [r6, 0x30] adds r0, r5, 0 @@ -6040,14 +6040,14 @@ sub_80609D4: @ 80609D4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080609F0 @ =gMapObjects + ldr r2, _080609F0 @ =gObjectEvents adds r0, r2 ldr r2, _080609F4 @ =sub_80609F8 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080609F0: .4byte gMapObjects +_080609F0: .4byte gObjectEvents _080609F4: .4byte sub_80609F8 thumb_func_end sub_80609D4 @@ -6133,14 +6133,14 @@ sub_8060A74: @ 8060A74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060A90 @ =gMapObjects + ldr r2, _08060A90 @ =gObjectEvents adds r0, r2 ldr r2, _08060A94 @ =sub_8060A98 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08060A90: .4byte gMapObjects +_08060A90: .4byte gObjectEvents _08060A94: .4byte sub_8060A98 thumb_func_end sub_8060A74 @@ -6217,7 +6217,7 @@ sub_8060AF8: @ 8060AF8 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -6239,12 +6239,12 @@ sub_8060B3C: @ 8060B3C adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _08060B5A adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _08060B62 @@ -6286,7 +6286,7 @@ sub_8060B6C: @ 8060B6C ldrb r1, [r0] _08060B9C: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -6306,14 +6306,14 @@ sub_8060BB4: @ 8060BB4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060BD0 @ =gMapObjects + ldr r2, _08060BD0 @ =gObjectEvents adds r0, r2 ldr r2, _08060BD4 @ =sub_8060BD8 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08060BD0: .4byte gMapObjects +_08060BD0: .4byte gObjectEvents _08060BD4: .4byte sub_8060BD8 thumb_func_end sub_8060BB4 @@ -6390,7 +6390,7 @@ sub_8060C38: @ 8060C38 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -6412,12 +6412,12 @@ sub_8060C7C: @ 8060C7C adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _08060C9A adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _08060CA2 @@ -6459,7 +6459,7 @@ sub_8060CAC: @ 8060CAC ldrb r1, [r0] _08060CDC: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -6479,14 +6479,14 @@ sub_8060CF4: @ 8060CF4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060D10 @ =gMapObjects + ldr r2, _08060D10 @ =gObjectEvents adds r0, r2 ldr r2, _08060D14 @ =sub_8060D18 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08060D10: .4byte gMapObjects +_08060D10: .4byte gObjectEvents _08060D14: .4byte sub_8060D18 thumb_func_end sub_8060CF4 @@ -6563,7 +6563,7 @@ sub_8060D78: @ 8060D78 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -6585,12 +6585,12 @@ sub_8060DBC: @ 8060DBC adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _08060DDA adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _08060DE2 @@ -6632,7 +6632,7 @@ sub_8060DEC: @ 8060DEC ldrb r1, [r0] _08060E1C: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -6652,14 +6652,14 @@ sub_8060E34: @ 8060E34 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060E50 @ =gMapObjects + ldr r2, _08060E50 @ =gObjectEvents adds r0, r2 ldr r2, _08060E54 @ =sub_8060E58 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08060E50: .4byte gMapObjects +_08060E50: .4byte gObjectEvents _08060E54: .4byte sub_8060E58 thumb_func_end sub_8060E34 @@ -6736,7 +6736,7 @@ sub_8060EB8: @ 8060EB8 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -6758,12 +6758,12 @@ sub_8060EFC: @ 8060EFC adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _08060F1A adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _08060F22 @@ -6805,7 +6805,7 @@ sub_8060F2C: @ 8060F2C ldrb r1, [r0] _08060F5C: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -6825,14 +6825,14 @@ sub_8060F74: @ 8060F74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060F90 @ =gMapObjects + ldr r2, _08060F90 @ =gObjectEvents adds r0, r2 ldr r2, _08060F94 @ =sub_8060F98 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08060F90: .4byte gMapObjects +_08060F90: .4byte gObjectEvents _08060F94: .4byte sub_8060F98 thumb_func_end sub_8060F74 @@ -6909,7 +6909,7 @@ sub_8060FF8: @ 8060FF8 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -6931,12 +6931,12 @@ sub_806103C: @ 806103C adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _0806105A adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _08061062 @@ -6978,7 +6978,7 @@ sub_806106C: @ 806106C ldrb r1, [r0] _0806109C: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -6998,14 +6998,14 @@ sub_80610B4: @ 80610B4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080610D0 @ =gMapObjects + ldr r2, _080610D0 @ =gObjectEvents adds r0, r2 ldr r2, _080610D4 @ =sub_80610D8 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080610D0: .4byte gMapObjects +_080610D0: .4byte gObjectEvents _080610D4: .4byte sub_80610D8 thumb_func_end sub_80610B4 @@ -7082,7 +7082,7 @@ sub_8061138: @ 8061138 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -7104,12 +7104,12 @@ sub_806117C: @ 806117C adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _0806119A adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _080611A2 @@ -7151,7 +7151,7 @@ sub_80611AC: @ 80611AC ldrb r1, [r0] _080611DC: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -7171,14 +7171,14 @@ sub_80611F4: @ 80611F4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061210 @ =gMapObjects + ldr r2, _08061210 @ =gObjectEvents adds r0, r2 ldr r2, _08061214 @ =sub_8061218 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061210: .4byte gMapObjects +_08061210: .4byte gObjectEvents _08061214: .4byte sub_8061218 thumb_func_end sub_80611F4 @@ -7255,7 +7255,7 @@ sub_8061278: @ 8061278 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -7277,12 +7277,12 @@ sub_80612BC: @ 80612BC adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _080612DA adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _080612E2 @@ -7324,7 +7324,7 @@ sub_80612EC: @ 80612EC ldrb r1, [r0] _0806131C: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -7344,14 +7344,14 @@ sub_8061334: @ 8061334 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061350 @ =gMapObjects + ldr r2, _08061350 @ =gObjectEvents adds r0, r2 ldr r2, _08061354 @ =sub_8061358 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061350: .4byte gMapObjects +_08061350: .4byte gObjectEvents _08061354: .4byte sub_8061358 thumb_func_end sub_8061334 @@ -7428,7 +7428,7 @@ sub_80613B8: @ 80613B8 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -7450,12 +7450,12 @@ sub_80613FC: @ 80613FC adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _0806141A adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _08061422 @@ -7497,7 +7497,7 @@ sub_806142C: @ 806142C ldrb r1, [r0] _0806145C: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -7517,14 +7517,14 @@ sub_8061474: @ 8061474 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061490 @ =gMapObjects + ldr r2, _08061490 @ =gObjectEvents adds r0, r2 ldr r2, _08061494 @ =sub_8061498 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061490: .4byte gMapObjects +_08061490: .4byte gObjectEvents _08061494: .4byte sub_8061498 thumb_func_end sub_8061474 @@ -7601,7 +7601,7 @@ sub_80614F8: @ 80614F8 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -7623,12 +7623,12 @@ sub_806153C: @ 806153C adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _0806155A adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _08061562 @@ -7670,7 +7670,7 @@ sub_806156C: @ 806156C ldrb r1, [r0] _0806159C: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -7690,14 +7690,14 @@ sub_80615B4: @ 80615B4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080615D0 @ =gMapObjects + ldr r2, _080615D0 @ =gObjectEvents adds r0, r2 ldr r2, _080615D4 @ =sub_80615D8 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080615D0: .4byte gMapObjects +_080615D0: .4byte gObjectEvents _080615D4: .4byte sub_80615D8 thumb_func_end sub_80615B4 @@ -7774,7 +7774,7 @@ sub_8061638: @ 8061638 movs r0, 0 ldrsh r1, [r1, r0] adds r0, r7, 0 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer ldrb r1, [r6] movs r0, 0x3 negs r0, r0 @@ -7796,12 +7796,12 @@ sub_806167C: @ 806167C adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _0806169A adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _080616A2 @@ -7843,7 +7843,7 @@ sub_80616AC: @ 80616AC ldrb r1, [r0] _080616DC: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x30] add sp, 0x4 @@ -7863,14 +7863,14 @@ sub_80616F4: @ 80616F4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061710 @ =gMapObjects + ldr r2, _08061710 @ =gObjectEvents adds r0, r2 ldr r2, _08061714 @ =sub_8061718 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061710: .4byte gMapObjects +_08061710: .4byte gObjectEvents _08061714: .4byte sub_8061718 thumb_func_end sub_80616F4 @@ -7926,7 +7926,7 @@ sub_8061764: @ 8061764 beq _0806177E adds r0, r4, 0 movs r1, 0x30 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer movs r0, 0x2 strh r0, [r4, 0x30] _0806177E: @@ -7942,12 +7942,12 @@ sub_8061788: @ 8061788 adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _080617A6 adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _080617AA @@ -7985,7 +7985,7 @@ sub_80617B4: @ 80617B4 ldrb r1, [r0] _080617E0: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0 strh r0, [r5, 0x30] movs r0, 0x1 @@ -8006,14 +8006,14 @@ sub_80617F8: @ 80617F8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061814 @ =gMapObjects + ldr r2, _08061814 @ =gObjectEvents adds r0, r2 ldr r2, _08061818 @ =sub_806181C - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061814: .4byte gMapObjects +_08061814: .4byte gObjectEvents _08061818: .4byte sub_806181C thumb_func_end sub_80617F8 @@ -8069,7 +8069,7 @@ sub_8061868: @ 8061868 beq _08061882 adds r0, r4, 0 movs r1, 0x30 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer movs r0, 0x2 strh r0, [r4, 0x30] _08061882: @@ -8085,12 +8085,12 @@ sub_806188C: @ 806188C adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 bne _080618AA adds r0, r4, 0 - bl FieldObjectIsTrainerAndCloseToPlayer + bl ObjectEventIsTrainerAndCloseToPlayer lsls r0, 24 cmp r0, 0 beq _080618AE @@ -8128,7 +8128,7 @@ sub_80618B8: @ 80618B8 ldrb r1, [r0] _080618E4: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0 strh r0, [r5, 0x30] movs r0, 0x1 @@ -8149,14 +8149,14 @@ sub_80618FC: @ 80618FC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061918 @ =gMapObjects + ldr r2, _08061918 @ =gObjectEvents adds r0, r2 ldr r2, _0806191C @ =sub_8061920 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061918: .4byte gMapObjects +_08061918: .4byte gObjectEvents _0806191C: .4byte sub_8061920 thumb_func_end sub_80618FC @@ -8196,7 +8196,7 @@ sub_8061954: @ 8061954 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _08061988 @ =gUnknown_839FD5D + ldr r0, _08061988 @ =gInitialMovementTypeFacingDirections ldrb r1, [r4, 0x6] adds r1, r0 ldrb r1, [r1] @@ -8211,7 +8211,7 @@ sub_8061954: @ 8061954 lsrs r1, r0, 24 _08061976: adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x2 strh r0, [r5, 0x30] movs r0, 0x1 @@ -8219,7 +8219,7 @@ _08061976: pop {r1} bx r1 .align 2, 0 -_08061988: .4byte gUnknown_839FD5D +_08061988: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8061954 thumb_func_start sub_806198C @@ -8245,7 +8245,7 @@ sub_806198C: @ 806198C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection _080619BC: ldrb r1, [r4, 0x18] lsrs r1, 4 @@ -8272,7 +8272,7 @@ _080619BC: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection ldrb r0, [r4, 0x18] lsrs r0, 4 bl sub_8063F84 @@ -8345,8 +8345,8 @@ sub_8061A6C: @ 8061A6C bx r1 thumb_func_end sub_8061A6C - thumb_func_start MoveFieldObjectInNextDirectionInSequence -MoveFieldObjectInNextDirectionInSequence: @ 8061A80 + thumb_func_start MoveObjectEventInNextDirectionInSequence +MoveObjectEventInNextDirectionInSequence: @ 8061A80 push {r4-r7,lr} mov r7, r8 push {r7} @@ -8371,7 +8371,7 @@ _08061AA2: adds r0, r7, r0 ldrb r1, [r0] adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection ldrb r0, [r4, 0x18] lsrs r0, 4 bl sub_8063F84 @@ -8392,7 +8392,7 @@ _08061AA2: adds r0, r7, r0 ldrb r1, [r0] adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection ldrb r0, [r4, 0x18] lsrs r0, 4 bl sub_8063F84 @@ -8431,7 +8431,7 @@ _08061B0E: pop {r4-r7} pop {r1} bx r1 - thumb_func_end MoveFieldObjectInNextDirectionInSequence + thumb_func_end MoveObjectEventInNextDirectionInSequence thumb_func_start sub_8061B34 sub_8061B34: @ 8061B34 @@ -8465,14 +8465,14 @@ sub_8061B5C: @ 8061B5C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061B78 @ =gMapObjects + ldr r2, _08061B78 @ =gObjectEvents adds r0, r2 ldr r2, _08061B7C @ =sub_8061B80 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061B78: .4byte gMapObjects +_08061B78: .4byte gObjectEvents _08061B7C: .4byte sub_8061B80 thumb_func_end sub_8061B5C @@ -8522,7 +8522,7 @@ _08061BCC: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -8542,14 +8542,14 @@ sub_8061BE8: @ 8061BE8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061C04 @ =gMapObjects + ldr r2, _08061C04 @ =gObjectEvents adds r0, r2 ldr r2, _08061C08 @ =sub_8061C0C - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061C04: .4byte gMapObjects +_08061C04: .4byte gObjectEvents _08061C08: .4byte sub_8061C0C thumb_func_end sub_8061BE8 @@ -8599,7 +8599,7 @@ _08061C58: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -8619,14 +8619,14 @@ sub_8061C74: @ 8061C74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061C90 @ =gMapObjects + ldr r2, _08061C90 @ =gObjectEvents adds r0, r2 ldr r2, _08061C94 @ =sub_8061C98 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061C90: .4byte gMapObjects +_08061C90: .4byte gObjectEvents _08061C94: .4byte sub_8061C98 thumb_func_end sub_8061C74 @@ -8676,7 +8676,7 @@ _08061CE4: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -8696,14 +8696,14 @@ sub_8061D00: @ 8061D00 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061D1C @ =gMapObjects + ldr r2, _08061D1C @ =gObjectEvents adds r0, r2 ldr r2, _08061D20 @ =sub_8061D24 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061D1C: .4byte gMapObjects +_08061D1C: .4byte gObjectEvents _08061D20: .4byte sub_8061D24 thumb_func_end sub_8061D00 @@ -8753,7 +8753,7 @@ _08061D70: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -8773,14 +8773,14 @@ sub_8061D8C: @ 8061D8C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061DA8 @ =gMapObjects + ldr r2, _08061DA8 @ =gObjectEvents adds r0, r2 ldr r2, _08061DAC @ =sub_8061DB0 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061DA8: .4byte gMapObjects +_08061DA8: .4byte gObjectEvents _08061DAC: .4byte sub_8061DB0 thumb_func_end sub_8061D8C @@ -8830,7 +8830,7 @@ _08061DFC: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -8850,14 +8850,14 @@ sub_8061E18: @ 8061E18 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061E34 @ =gMapObjects + ldr r2, _08061E34 @ =gObjectEvents adds r0, r2 ldr r2, _08061E38 @ =sub_8061E3C - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061E34: .4byte gMapObjects +_08061E34: .4byte gObjectEvents _08061E38: .4byte sub_8061E3C thumb_func_end sub_8061E18 @@ -8907,7 +8907,7 @@ _08061E88: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -8927,14 +8927,14 @@ sub_8061EA4: @ 8061EA4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061EC0 @ =gMapObjects + ldr r2, _08061EC0 @ =gObjectEvents adds r0, r2 ldr r2, _08061EC4 @ =sub_8061EC8 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061EC0: .4byte gMapObjects +_08061EC0: .4byte gObjectEvents _08061EC4: .4byte sub_8061EC8 thumb_func_end sub_8061EA4 @@ -8984,7 +8984,7 @@ _08061F14: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9004,14 +9004,14 @@ sub_8061F30: @ 8061F30 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061F4C @ =gMapObjects + ldr r2, _08061F4C @ =gObjectEvents adds r0, r2 ldr r2, _08061F50 @ =sub_8061F54 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061F4C: .4byte gMapObjects +_08061F4C: .4byte gObjectEvents _08061F50: .4byte sub_8061F54 thumb_func_end sub_8061F30 @@ -9061,7 +9061,7 @@ _08061FA0: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9081,14 +9081,14 @@ sub_8061FBC: @ 8061FBC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061FD8 @ =gMapObjects + ldr r2, _08061FD8 @ =gObjectEvents adds r0, r2 ldr r2, _08061FDC @ =sub_8061FE0 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08061FD8: .4byte gMapObjects +_08061FD8: .4byte gObjectEvents _08061FDC: .4byte sub_8061FE0 thumb_func_end sub_8061FBC @@ -9138,7 +9138,7 @@ _0806202C: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9158,14 +9158,14 @@ sub_8062048: @ 8062048 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062064 @ =gMapObjects + ldr r2, _08062064 @ =gObjectEvents adds r0, r2 ldr r2, _08062068 @ =sub_806206C - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062064: .4byte gMapObjects +_08062064: .4byte gObjectEvents _08062068: .4byte sub_806206C thumb_func_end sub_8062048 @@ -9215,7 +9215,7 @@ _080620B8: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9235,14 +9235,14 @@ sub_80620D4: @ 80620D4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080620F0 @ =gMapObjects + ldr r2, _080620F0 @ =gObjectEvents adds r0, r2 ldr r2, _080620F4 @ =sub_80620F8 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080620F0: .4byte gMapObjects +_080620F0: .4byte gObjectEvents _080620F4: .4byte sub_80620F8 thumb_func_end sub_80620D4 @@ -9292,7 +9292,7 @@ _08062144: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9312,14 +9312,14 @@ sub_8062160: @ 8062160 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806217C @ =gMapObjects + ldr r2, _0806217C @ =gObjectEvents adds r0, r2 ldr r2, _08062180 @ =sub_8062184 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0806217C: .4byte gMapObjects +_0806217C: .4byte gObjectEvents _08062180: .4byte sub_8062184 thumb_func_end sub_8062160 @@ -9369,7 +9369,7 @@ _080621D0: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9389,14 +9389,14 @@ sub_80621EC: @ 80621EC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062208 @ =gMapObjects + ldr r2, _08062208 @ =gObjectEvents adds r0, r2 ldr r2, _0806220C @ =sub_8062210 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062208: .4byte gMapObjects +_08062208: .4byte gObjectEvents _0806220C: .4byte sub_8062210 thumb_func_end sub_80621EC @@ -9446,7 +9446,7 @@ _0806225C: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9466,14 +9466,14 @@ sub_8062278: @ 8062278 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062294 @ =gMapObjects + ldr r2, _08062294 @ =gObjectEvents adds r0, r2 ldr r2, _08062298 @ =sub_806229C - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062294: .4byte gMapObjects +_08062294: .4byte gObjectEvents _08062298: .4byte sub_806229C thumb_func_end sub_8062278 @@ -9523,7 +9523,7 @@ _080622E8: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9543,14 +9543,14 @@ sub_8062304: @ 8062304 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062320 @ =gMapObjects + ldr r2, _08062320 @ =gObjectEvents adds r0, r2 ldr r2, _08062324 @ =sub_8062328 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062320: .4byte gMapObjects +_08062320: .4byte gObjectEvents _08062324: .4byte sub_8062328 thumb_func_end sub_8062304 @@ -9600,7 +9600,7 @@ _08062374: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9620,14 +9620,14 @@ sub_8062390: @ 8062390 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080623AC @ =gMapObjects + ldr r2, _080623AC @ =gObjectEvents adds r0, r2 ldr r2, _080623B0 @ =sub_80623B4 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080623AC: .4byte gMapObjects +_080623AC: .4byte gObjectEvents _080623B0: .4byte sub_80623B4 thumb_func_end sub_8062390 @@ -9677,7 +9677,7 @@ _08062400: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9697,14 +9697,14 @@ sub_806241C: @ 806241C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062438 @ =gMapObjects + ldr r2, _08062438 @ =gObjectEvents adds r0, r2 ldr r2, _0806243C @ =sub_8062440 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062438: .4byte gMapObjects +_08062438: .4byte gObjectEvents _0806243C: .4byte sub_8062440 thumb_func_end sub_806241C @@ -9754,7 +9754,7 @@ _0806248C: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9774,14 +9774,14 @@ sub_80624A8: @ 80624A8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080624C4 @ =gMapObjects + ldr r2, _080624C4 @ =gObjectEvents adds r0, r2 ldr r2, _080624C8 @ =sub_80624CC - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080624C4: .4byte gMapObjects +_080624C4: .4byte gObjectEvents _080624C8: .4byte sub_80624CC thumb_func_end sub_80624A8 @@ -9831,7 +9831,7 @@ _08062518: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9851,14 +9851,14 @@ sub_8062534: @ 8062534 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062550 @ =gMapObjects + ldr r2, _08062550 @ =gObjectEvents adds r0, r2 ldr r2, _08062554 @ =sub_8062558 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062550: .4byte gMapObjects +_08062550: .4byte gObjectEvents _08062554: .4byte sub_8062558 thumb_func_end sub_8062534 @@ -9908,7 +9908,7 @@ _080625A4: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -9928,14 +9928,14 @@ sub_80625C0: @ 80625C0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080625DC @ =gMapObjects + ldr r2, _080625DC @ =gObjectEvents adds r0, r2 ldr r2, _080625E0 @ =sub_80625E4 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080625DC: .4byte gMapObjects +_080625DC: .4byte gObjectEvents _080625E0: .4byte sub_80625E4 thumb_func_end sub_80625C0 @@ -9985,7 +9985,7 @@ _08062630: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -10005,14 +10005,14 @@ sub_806264C: @ 806264C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062668 @ =gMapObjects + ldr r2, _08062668 @ =gObjectEvents adds r0, r2 ldr r2, _0806266C @ =sub_8062670 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062668: .4byte gMapObjects +_08062668: .4byte gObjectEvents _0806266C: .4byte sub_8062670 thumb_func_end sub_806264C @@ -10062,7 +10062,7 @@ _080626BC: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -10082,14 +10082,14 @@ sub_80626D8: @ 80626D8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080626F4 @ =gMapObjects + ldr r2, _080626F4 @ =gObjectEvents adds r0, r2 ldr r2, _080626F8 @ =sub_80626FC - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080626F4: .4byte gMapObjects +_080626F4: .4byte gObjectEvents _080626F8: .4byte sub_80626FC thumb_func_end sub_80626D8 @@ -10139,7 +10139,7 @@ _08062748: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -10159,14 +10159,14 @@ sub_8062764: @ 8062764 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062780 @ =gMapObjects + ldr r2, _08062780 @ =gObjectEvents adds r0, r2 ldr r2, _08062784 @ =sub_8062788 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062780: .4byte gMapObjects +_08062780: .4byte gObjectEvents _08062784: .4byte sub_8062788 thumb_func_end sub_8062764 @@ -10216,7 +10216,7 @@ _080627D4: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -10236,14 +10236,14 @@ sub_80627F0: @ 80627F0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806280C @ =gMapObjects + ldr r2, _0806280C @ =gObjectEvents adds r0, r2 ldr r2, _08062810 @ =sub_8062814 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0806280C: .4byte gMapObjects +_0806280C: .4byte gObjectEvents _08062810: .4byte sub_8062814 thumb_func_end sub_80627F0 @@ -10293,7 +10293,7 @@ _08062860: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp - bl MoveFieldObjectInNextDirectionInSequence + bl MoveObjectEventInNextDirectionInSequence lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -10313,14 +10313,14 @@ sub_806287C: @ 806287C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062898 @ =gMapObjects + ldr r2, _08062898 @ =gObjectEvents adds r0, r2 ldr r2, _0806289C @ =sub_80628A0 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062898: .4byte gMapObjects +_08062898: .4byte gObjectEvents _0806289C: .4byte sub_80628A0 thumb_func_end sub_806287C @@ -10368,7 +10368,7 @@ sub_80628E4: @ 80628E4 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 - ldr r2, _08062908 @ =gMapObjects + ldr r2, _08062908 @ =gObjectEvents ldr r3, _0806290C @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -10385,7 +10385,7 @@ _08062904: movs r0, 0 b _08062938 .align 2, 0 -_08062908: .4byte gMapObjects +_08062908: .4byte gObjectEvents _0806290C: .4byte gPlayerAvatar _08062910: ldr r5, _08062940 @ =gUnknown_83A6390 @@ -10449,7 +10449,7 @@ sub_8062970: @ 8062970 adds r5, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r1, _080629B4 @ =gUnknown_839FD5D + ldr r1, _080629B4 @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10475,7 +10475,7 @@ sub_8062970: @ 8062970 pop {r1} bx r1 .align 2, 0 -_080629B4: .4byte gUnknown_839FD5D +_080629B4: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062970 thumb_func_start sub_80629B8 @@ -10489,7 +10489,7 @@ sub_80629B8: @ 80629B8 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062A6C @ =gUnknown_839FD5D + ldr r1, _08062A6C @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10505,7 +10505,7 @@ sub_80629B8: @ 80629B8 adds r1, r6, 0 mov r2, sp adds r3, r5, 0 - bl FieldObjectMoveDestCoords + bl ObjectEventMoveDestCoords adds r0, r6, 0 bl sub_8063F84 adds r2, r0, 0 @@ -10564,7 +10564,7 @@ _08062A52: pop {r1} bx r1 .align 2, 0 -_08062A6C: .4byte gUnknown_839FD5D +_08062A6C: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_80629B8 thumb_func_start sub_8062A70 @@ -10578,7 +10578,7 @@ sub_8062A70: @ 8062A70 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062B24 @ =gUnknown_839FD5D + ldr r1, _08062B24 @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10594,7 +10594,7 @@ sub_8062A70: @ 8062A70 adds r1, r6, 0 mov r2, sp adds r3, r5, 0 - bl FieldObjectMoveDestCoords + bl ObjectEventMoveDestCoords adds r0, r6, 0 bl sub_8063FB0 adds r2, r0, 0 @@ -10653,7 +10653,7 @@ _08062B0A: pop {r1} bx r1 .align 2, 0 -_08062B24: .4byte gUnknown_839FD5D +_08062B24: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062A70 thumb_func_start sub_8062B28 @@ -10667,7 +10667,7 @@ sub_8062B28: @ 8062B28 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062BDC @ =gUnknown_839FD5D + ldr r1, _08062BDC @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10683,7 +10683,7 @@ sub_8062B28: @ 8062B28 adds r1, r6, 0 mov r2, sp adds r3, r5, 0 - bl FieldObjectMoveDestCoords + bl ObjectEventMoveDestCoords adds r0, r6, 0 bl sub_8064034 adds r2, r0, 0 @@ -10742,7 +10742,7 @@ _08062BC2: pop {r1} bx r1 .align 2, 0 -_08062BDC: .4byte gUnknown_839FD5D +_08062BDC: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062B28 thumb_func_start sub_8062BE0 @@ -10756,7 +10756,7 @@ sub_8062BE0: @ 8062BE0 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062C94 @ =gUnknown_839FD5D + ldr r1, _08062C94 @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10772,7 +10772,7 @@ sub_8062BE0: @ 8062BE0 adds r1, r6, 0 mov r2, sp adds r3, r5, 0 - bl FieldObjectMoveDestCoords + bl ObjectEventMoveDestCoords adds r0, r6, 0 bl sub_8064060 adds r2, r0, 0 @@ -10831,7 +10831,7 @@ _08062C7A: pop {r1} bx r1 .align 2, 0 -_08062C94: .4byte gUnknown_839FD5D +_08062C94: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062BE0 thumb_func_start cph_IM_DIFFERENT @@ -10841,7 +10841,7 @@ cph_IM_DIFFERENT: @ 8062C98 adds r5, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r1, _08062CDC @ =gUnknown_839FD5D + ldr r1, _08062CDC @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10867,7 +10867,7 @@ cph_IM_DIFFERENT: @ 8062C98 pop {r1} bx r1 .align 2, 0 -_08062CDC: .4byte gUnknown_839FD5D +_08062CDC: .4byte gInitialMovementTypeFacingDirections thumb_func_end cph_IM_DIFFERENT thumb_func_start sub_8062CE0 @@ -10881,7 +10881,7 @@ sub_8062CE0: @ 8062CE0 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062D94 @ =gUnknown_839FD5D + ldr r1, _08062D94 @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10897,7 +10897,7 @@ sub_8062CE0: @ 8062CE0 adds r1, r6, 0 mov r2, sp adds r3, r5, 0 - bl FieldObjectMoveDestCoords + bl ObjectEventMoveDestCoords adds r0, r6, 0 bl sub_8064194 adds r2, r0, 0 @@ -10956,7 +10956,7 @@ _08062D7A: pop {r1} bx r1 .align 2, 0 -_08062D94: .4byte gUnknown_839FD5D +_08062D94: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062CE0 thumb_func_start oac_hopping @@ -10970,7 +10970,7 @@ oac_hopping: @ 8062D98 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062E5C @ =gUnknown_839FD5D + ldr r1, _08062E5C @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -11052,7 +11052,7 @@ _08062E40: pop {r1} bx r1 .align 2, 0 -_08062E5C: .4byte gUnknown_839FD5D +_08062E5C: .4byte gInitialMovementTypeFacingDirections thumb_func_end oac_hopping thumb_func_start sub_8062E60 @@ -11064,14 +11064,14 @@ sub_8062E60: @ 8062E60 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062E7C @ =gMapObjects + ldr r2, _08062E7C @ =gObjectEvents adds r0, r2 ldr r2, _08062E80 @ =sub_8062E84 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_08062E7C: .4byte gMapObjects +_08062E7C: .4byte gObjectEvents _08062E80: .4byte sub_8062E84 thumb_func_end sub_8062E60 @@ -11099,7 +11099,7 @@ mss_08062EA4: @ 8062EA4 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 - ldr r2, _08062EC8 @ =gMapObjects + ldr r2, _08062EC8 @ =gObjectEvents ldr r3, _08062ECC @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -11116,7 +11116,7 @@ _08062EC4: movs r0, 0 b _08062EF8 .align 2, 0 -_08062EC8: .4byte gMapObjects +_08062EC8: .4byte gObjectEvents _08062ECC: .4byte gPlayerAvatar _08062ED0: ldr r5, _08062F00 @ =gUnknown_83A6390 @@ -11145,8 +11145,8 @@ _08062F00: .4byte gUnknown_83A6390 _08062F04: .4byte MetatileBehavior_IsTallGrass thumb_func_end mss_08062EA4 - thumb_func_start FieldObjectCB_TreeDisguise -FieldObjectCB_TreeDisguise: @ 8062F08 + thumb_func_start ObjectEventCB_TreeDisguise +ObjectEventCB_TreeDisguise: @ 8062F08 push {r4-r6,lr} adds r5, r0, 0 movs r1, 0x2E @@ -11154,7 +11154,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08062F6C @ =gMapObjects + ldr r0, _08062F6C @ =gObjectEvents adds r4, r1, r0 adds r6, r4, 0 adds r6, 0x21 @@ -11173,7 +11173,7 @@ _08062F30: adds r3, r1, 0 adds r3, 0x8 adds r0, r4, 0 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0x1C bl FieldEffectStart strb r0, [r4, 0x1A] @@ -11188,19 +11188,19 @@ _08062F50: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08062F6C @ =gMapObjects + ldr r1, _08062F6C @ =gObjectEvents adds r0, r1 ldr r2, _08062F74 @ =sub_8062F78 adds r1, r5, 0 - bl FieldObjectStep + bl ObjectEventStep pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08062F6C: .4byte gMapObjects +_08062F6C: .4byte gObjectEvents _08062F70: .4byte gFieldEffectArguments _08062F74: .4byte sub_8062F78 - thumb_func_end FieldObjectCB_TreeDisguise + thumb_func_end ObjectEventCB_TreeDisguise thumb_func_start sub_8062F78 sub_8062F78: @ 8062F78 @@ -11211,8 +11211,8 @@ sub_8062F78: @ 8062F78 bx r1 thumb_func_end sub_8062F78 - thumb_func_start FieldObjectCB_MountainDisguise -FieldObjectCB_MountainDisguise: @ 8062F84 + thumb_func_start ObjectEventCB_MountainDisguise +ObjectEventCB_MountainDisguise: @ 8062F84 push {r4-r6,lr} adds r5, r0, 0 movs r1, 0x2E @@ -11220,7 +11220,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08062FE8 @ =gMapObjects + ldr r0, _08062FE8 @ =gObjectEvents adds r4, r1, r0 adds r6, r4, 0 adds r6, 0x21 @@ -11239,7 +11239,7 @@ _08062FAC: adds r3, r1, 0 adds r3, 0x8 adds r0, r4, 0 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0x1D bl FieldEffectStart strb r0, [r4, 0x1A] @@ -11254,27 +11254,27 @@ _08062FCC: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08062FE8 @ =gMapObjects + ldr r1, _08062FE8 @ =gObjectEvents adds r0, r1 ldr r2, _08062FF0 @ =sub_8062F78 adds r1, r5, 0 - bl FieldObjectStep + bl ObjectEventStep pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08062FE8: .4byte gMapObjects +_08062FE8: .4byte gObjectEvents _08062FEC: .4byte gFieldEffectArguments _08062FF0: .4byte sub_8062F78 - thumb_func_end FieldObjectCB_MountainDisguise + thumb_func_end ObjectEventCB_MountainDisguise - thumb_func_start FieldObjectCB_Hidden1 -FieldObjectCB_Hidden1: @ 8062FF4 + thumb_func_start ObjectEventCB_Hidden1 +ObjectEventCB_Hidden1: @ 8062FF4 push {r4,lr} adds r3, r0, 0 movs r1, 0x3C ldrsh r0, [r3, r1] - ldr r4, _08063050 @ =gMapObjects + ldr r4, _08063050 @ =gObjectEvents cmp r0, 0 bne _08063034 movs r0, 0x2E @@ -11311,14 +11311,14 @@ _08063034: adds r0, r4 ldr r2, _08063054 @ =sub_8063058 adds r1, r3, 0 - bl FieldObjectStep + bl ObjectEventStep pop {r4} pop {r0} bx r0 .align 2, 0 -_08063050: .4byte gMapObjects +_08063050: .4byte gObjectEvents _08063054: .4byte sub_8063058 - thumb_func_end FieldObjectCB_Hidden1 + thumb_func_end ObjectEventCB_Hidden1 thumb_func_start sub_8063058 sub_8063058: @ 8063058 @@ -11374,14 +11374,14 @@ sub_80630A0: @ 80630A0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080630BC @ =gMapObjects + ldr r2, _080630BC @ =gObjectEvents adds r0, r2 ldr r2, _080630C0 @ =sub_80630C4 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080630BC: .4byte gMapObjects +_080630BC: .4byte gObjectEvents _080630C0: .4byte sub_80630C4 thumb_func_end sub_80630A0 @@ -11436,14 +11436,14 @@ sub_8063110: @ 8063110 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806312C @ =gMapObjects + ldr r2, _0806312C @ =gObjectEvents adds r0, r2 ldr r2, _08063130 @ =sub_8063134 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0806312C: .4byte gMapObjects +_0806312C: .4byte gObjectEvents _08063130: .4byte sub_8063134 thumb_func_end sub_8063110 @@ -11498,14 +11498,14 @@ sub_8063180: @ 8063180 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806319C @ =gMapObjects + ldr r2, _0806319C @ =gObjectEvents adds r0, r2 ldr r2, _080631A0 @ =sub_80631A4 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0806319C: .4byte gMapObjects +_0806319C: .4byte gObjectEvents _080631A0: .4byte sub_80631A4 thumb_func_end sub_8063180 @@ -11560,14 +11560,14 @@ sub_80631F0: @ 80631F0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806320C @ =gMapObjects + ldr r2, _0806320C @ =gObjectEvents adds r0, r2 ldr r2, _08063210 @ =sub_8063214 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0806320C: .4byte gMapObjects +_0806320C: .4byte gObjectEvents _08063210: .4byte sub_8063214 thumb_func_end sub_80631F0 @@ -11657,14 +11657,14 @@ sub_8063298: @ 8063298 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632B4 @ =gMapObjects + ldr r2, _080632B4 @ =gObjectEvents adds r0, r2 ldr r2, _080632B8 @ =sub_8063304 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080632B4: .4byte gMapObjects +_080632B4: .4byte gObjectEvents _080632B8: .4byte sub_8063304 thumb_func_end sub_8063298 @@ -11677,14 +11677,14 @@ sub_80632BC: @ 80632BC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632D8 @ =gMapObjects + ldr r2, _080632D8 @ =gObjectEvents adds r0, r2 ldr r2, _080632DC @ =sub_8063324 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080632D8: .4byte gMapObjects +_080632D8: .4byte gObjectEvents _080632DC: .4byte sub_8063324 thumb_func_end sub_80632BC @@ -11697,14 +11697,14 @@ sub_80632E0: @ 80632E0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632FC @ =gMapObjects + ldr r2, _080632FC @ =gObjectEvents adds r0, r2 ldr r2, _08063300 @ =sub_8063344 - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_080632FC: .4byte gMapObjects +_080632FC: .4byte gObjectEvents _08063300: .4byte sub_8063344 thumb_func_end sub_80632E0 @@ -11885,8 +11885,8 @@ npc_reset: @ 8063410 bx lr thumb_func_end npc_reset - thumb_func_start FieldObjectDirectionToImageAnimId -FieldObjectDirectionToImageAnimId: @ 8063430 + thumb_func_start ObjectEventDirectionToImageAnimId +ObjectEventDirectionToImageAnimId: @ 8063430 lsls r0, 24 lsrs r0, 24 ldr r1, _0806343C @ =gUnknown_83A640C @@ -11895,7 +11895,7 @@ FieldObjectDirectionToImageAnimId: @ 8063430 bx lr .align 2, 0 _0806343C: .4byte gUnknown_83A640C - thumb_func_end FieldObjectDirectionToImageAnimId + thumb_func_end ObjectEventDirectionToImageAnimId thumb_func_start get_go_image_anim_num get_go_image_anim_num: @ 8063440 @@ -12235,7 +12235,7 @@ SetTrainerMovementType: @ 8063610 adds r2, r4, 0 adds r2, 0x1C adds r0, r2 - ldr r2, _08063658 @ =gUnknown_839FBC8 + ldr r2, _08063658 @ =gMovementTypeCallbacks lsls r1, 2 adds r1, r2 ldr r1, [r1] @@ -12252,7 +12252,7 @@ SetTrainerMovementType: @ 8063610 bx r0 .align 2, 0 _08063654: .4byte gSprites -_08063658: .4byte gUnknown_839FBC8 +_08063658: .4byte gMovementTypeCallbacks thumb_func_end SetTrainerMovementType thumb_func_start GetTrainerFacingDirectionMovementType @@ -12323,7 +12323,7 @@ npc_block_way: @ 80636AC adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 - bl IsCoordOutsideFieldObjectMovementRect + bl IsCoordOutsideObjectEventMovementRect lsls r0, 24 cmp r0, 0 beq _080636E2 @@ -12384,7 +12384,7 @@ _0806374C: adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 - bl CheckForCollisionBetweenFieldObjects + bl CheckForCollisionBetweenObjectEvents lsls r0, 24 cmp r0, 0 bne _08063760 @@ -12424,7 +12424,7 @@ sub_8063770: @ 8063770 adds r0, r7, 0 adds r1, r6, 0 adds r2, r5, 0 - bl IsCoordOutsideFieldObjectMovementRect + bl IsCoordOutsideObjectEventMovementRect lsls r0, 24 lsrs r0, 24 negs r1, r0 @@ -12486,7 +12486,7 @@ _08063814: adds r0, r7, 0 adds r1, r6, 0 adds r2, r5, 0 - bl CheckForCollisionBetweenFieldObjects + bl CheckForCollisionBetweenObjectEvents lsls r0, 24 cmp r0, 0 beq _0806382C @@ -12505,8 +12505,8 @@ _0806382C: bx r1 thumb_func_end sub_8063770 - thumb_func_start IsCoordOutsideFieldObjectMovementRect -IsCoordOutsideFieldObjectMovementRect: @ 806383C + thumb_func_start IsCoordOutsideObjectEventMovementRect +IsCoordOutsideObjectEventMovementRect: @ 806383C push {r4,r5,lr} adds r4, r0, 0 lsls r1, 16 @@ -12567,7 +12567,7 @@ _080638A6: pop {r4,r5} pop {r1} bx r1 - thumb_func_end IsCoordOutsideFieldObjectMovementRect + thumb_func_end IsCoordOutsideObjectEventMovementRect thumb_func_start IsMetatileDirectionallyImpassable IsMetatileDirectionallyImpassable: @ 80638AC @@ -12615,8 +12615,8 @@ _080638FE: bx r1 thumb_func_end IsMetatileDirectionallyImpassable - thumb_func_start CheckForCollisionBetweenFieldObjects -CheckForCollisionBetweenFieldObjects: @ 8063904 + thumb_func_start CheckForCollisionBetweenObjectEvents +CheckForCollisionBetweenObjectEvents: @ 8063904 push {r4-r7,lr} adds r6, r0, 0 lsls r1, 16 @@ -12628,7 +12628,7 @@ _08063912: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _08063968 @ =gMapObjects + ldr r1, _08063968 @ =gObjectEvents adds r2, r0, r1 ldrb r0, [r2] lsls r0, 31 @@ -12669,7 +12669,7 @@ _0806394C: movs r0, 0x1 b _08063978 .align 2, 0 -_08063968: .4byte gMapObjects +_08063968: .4byte gObjectEvents _0806396C: adds r0, r4, 0x1 lsls r0, 24 @@ -12681,7 +12681,7 @@ _08063978: pop {r4-r7} pop {r1} bx r1 - thumb_func_end CheckForCollisionBetweenFieldObjects + thumb_func_end CheckForCollisionBetweenObjectEvents thumb_func_start IsBerryTreeSparkling IsBerryTreeSparkling: @ 8063980 @@ -12694,12 +12694,12 @@ IsBerryTreeSparkling: @ 8063980 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080639CC ldr r3, _080639C4 @ =gSprites - ldr r2, _080639C8 @ =gMapObjects + ldr r2, _080639C8 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -12720,7 +12720,7 @@ IsBerryTreeSparkling: @ 8063980 b _080639CE .align 2, 0 _080639C4: .4byte gSprites -_080639C8: .4byte gMapObjects +_080639C8: .4byte gObjectEvents _080639CC: movs r0, 0 _080639CE: @@ -12740,12 +12740,12 @@ sub_80639D4: @ 80639D4 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08063A12 ldr r3, _08063A18 @ =gSprites - ldr r2, _08063A1C @ =gMapObjects + ldr r2, _08063A1C @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -12767,7 +12767,7 @@ _08063A12: bx r0 .align 2, 0 _08063A18: .4byte gSprites -_08063A1C: .4byte gMapObjects +_08063A1C: .4byte gObjectEvents thumb_func_end sub_80639D4 thumb_func_start MoveCoords @@ -13039,8 +13039,8 @@ sub_8063BC4: @ 8063BC4 bx r0 thumb_func_end sub_8063BC4 - thumb_func_start GetFieldObjectMovingCameraOffset -GetFieldObjectMovingCameraOffset: @ 8063C10 + thumb_func_start GetObjectEventMovingCameraOffset +GetObjectEventMovingCameraOffset: @ 8063C10 push {lr} adds r2, r0, 0 movs r0, 0 @@ -13077,10 +13077,10 @@ _08063C48: bx r0 .align 2, 0 _08063C4C: .4byte gUnknown_3005050 - thumb_func_end GetFieldObjectMovingCameraOffset + thumb_func_end GetObjectEventMovingCameraOffset - thumb_func_start FieldObjectMoveDestCoords -FieldObjectMoveDestCoords: @ 8063C50 + thumb_func_start ObjectEventMoveDestCoords +ObjectEventMoveDestCoords: @ 8063C50 push {r4,lr} lsls r1, 24 lsrs r1, 24 @@ -13095,10 +13095,10 @@ FieldObjectMoveDestCoords: @ 8063C50 pop {r4} pop {r0} bx r0 - thumb_func_end FieldObjectMoveDestCoords + thumb_func_end ObjectEventMoveDestCoords - thumb_func_start FieldObjectIsMovementOverridden -FieldObjectIsMovementOverridden: @ 8063C70 + thumb_func_start ObjectEventIsMovementOverridden +ObjectEventIsMovementOverridden: @ 8063C70 push {lr} ldrb r1, [r0] movs r0, 0x42 @@ -13112,10 +13112,10 @@ _08063C80: _08063C82: pop {r1} bx r1 - thumb_func_end FieldObjectIsMovementOverridden + thumb_func_end ObjectEventIsMovementOverridden - thumb_func_start FieldObjectIsSpecialAnimActive -FieldObjectIsSpecialAnimActive: @ 8063C88 + thumb_func_start ObjectEventIsSpecialAnimActive +ObjectEventIsSpecialAnimActive: @ 8063C88 push {lr} adds r1, r0, 0 ldrb r0, [r1] @@ -13132,10 +13132,10 @@ _08063C9E: _08063CA0: pop {r1} bx r1 - thumb_func_end FieldObjectIsSpecialAnimActive + thumb_func_end ObjectEventIsSpecialAnimActive - thumb_func_start FieldObjectSetHeldMovement -FieldObjectSetHeldMovement: @ 8063CA4 + thumb_func_start ObjectEventSetHeldMovement +ObjectEventSetHeldMovement: @ 8063CA4 push {r4,r5,lr} adds r4, r0, 0 lsls r1, 24 @@ -13146,7 +13146,7 @@ FieldObjectSetHeldMovement: @ 8063CA4 cmp r0, 0x1 beq _08063CC8 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _08063CCE @@ -13154,7 +13154,7 @@ FieldObjectSetHeldMovement: @ 8063CA4 b _08063CF4 _08063CC8: adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimActive + bl ObjectEventClearAnimIfSpecialAnimActive _08063CCE: adds r0, r4, 0 bl npc_sync_anim_pause_bits @@ -13180,25 +13180,25 @@ _08063CF4: bx r1 .align 2, 0 _08063CFC: .4byte gSprites - thumb_func_end FieldObjectSetHeldMovement + thumb_func_end ObjectEventSetHeldMovement - thumb_func_start FieldObjectForceSetSpecialAnim -FieldObjectForceSetSpecialAnim: @ 8063D00 + thumb_func_start ObjectEventForceSetSpecialAnim +ObjectEventForceSetSpecialAnim: @ 8063D00 push {r4,r5,lr} adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - bl FieldObjectClearAnimIfSpecialAnimActive + bl ObjectEventClearAnimIfSpecialAnimActive adds r0, r5, 0 adds r1, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement pop {r4,r5} pop {r0} bx r0 - thumb_func_end FieldObjectForceSetSpecialAnim + thumb_func_end ObjectEventForceSetSpecialAnim - thumb_func_start FieldObjectClearAnimIfSpecialAnimActive -FieldObjectClearAnimIfSpecialAnimActive: @ 8063D1C + thumb_func_start ObjectEventClearAnimIfSpecialAnimActive +ObjectEventClearAnimIfSpecialAnimActive: @ 8063D1C push {lr} adds r1, r0, 0 ldrb r0, [r1] @@ -13206,14 +13206,14 @@ FieldObjectClearAnimIfSpecialAnimActive: @ 8063D1C cmp r0, 0 bge _08063D2E adds r0, r1, 0 - bl FieldObjectClearAnim + bl ObjectEventClearAnim _08063D2E: pop {r0} bx r0 - thumb_func_end FieldObjectClearAnimIfSpecialAnimActive + thumb_func_end ObjectEventClearAnimIfSpecialAnimActive - thumb_func_start FieldObjectClearAnim -FieldObjectClearAnim: @ 8063D34 + thumb_func_start ObjectEventClearAnim +ObjectEventClearAnim: @ 8063D34 movs r1, 0xFF strb r1, [r0, 0x1C] ldrb r2, [r0] @@ -13240,10 +13240,10 @@ FieldObjectClearAnim: @ 8063D34 bx lr .align 2, 0 _08063D64: .4byte gSprites - thumb_func_end FieldObjectClearAnim + thumb_func_end ObjectEventClearAnim - thumb_func_start FieldObjectCheckHeldMovementStatus -FieldObjectCheckHeldMovementStatus: @ 8063D68 + thumb_func_start ObjectEventCheckHeldMovementStatus +ObjectEventCheckHeldMovementStatus: @ 8063D68 push {lr} ldrb r1, [r0] lsls r0, r1, 25 @@ -13256,13 +13256,13 @@ _08063D76: _08063D78: pop {r1} bx r1 - thumb_func_end FieldObjectCheckHeldMovementStatus + thumb_func_end ObjectEventCheckHeldMovementStatus - thumb_func_start FieldObjectClearHeldMovementIfFinished -FieldObjectClearHeldMovementIfFinished: @ 8063D7C + thumb_func_start ObjectEventClearHeldMovementIfFinished +ObjectEventClearHeldMovementIfFinished: @ 8063D7C push {r4,r5,lr} adds r5, r0, 0 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -13270,16 +13270,16 @@ FieldObjectClearHeldMovementIfFinished: @ 8063D7C cmp r4, 0x10 beq _08063D96 adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimActive + bl ObjectEventClearAnimIfSpecialAnimActive _08063D96: adds r0, r4, 0 pop {r4,r5} pop {r1} bx r1 - thumb_func_end FieldObjectClearHeldMovementIfFinished + thumb_func_end ObjectEventClearHeldMovementIfFinished - thumb_func_start FieldObjectGetSpecialAnim -FieldObjectGetSpecialAnim: @ 8063DA0 + thumb_func_start ObjectEventGetSpecialAnim +ObjectEventGetSpecialAnim: @ 8063DA0 push {lr} adds r1, r0, 0 ldrb r0, [r1] @@ -13293,10 +13293,10 @@ _08063DB0: _08063DB2: pop {r1} bx r1 - thumb_func_end FieldObjectGetSpecialAnim + thumb_func_end ObjectEventGetSpecialAnim - thumb_func_start FieldObjectStep -FieldObjectStep: @ 8063DB8 + thumb_func_start ObjectEventStep +ObjectEventStep: @ 8063DB8 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -13306,13 +13306,13 @@ FieldObjectStep: @ 8063DB8 adds r1, r5, 0 bl sub_80679C8 adds r0, r4, 0 - bl FieldObjectIsSpecialAnimActive + bl ObjectEventIsSpecialAnimActive lsls r0, 24 cmp r0, 0 beq _08063DE2 adds r0, r4, 0 adds r1, r5, 0 - bl FieldObjectExecSpecialAnim + bl ObjectEventExecSpecialAnim b _08063DF8 _08063DE2: ldrb r0, [r4, 0x1] @@ -13341,11 +13341,11 @@ _08063DF8: bl sub_80679F8 adds r0, r4, 0 adds r1, r5, 0 - bl FieldObjectUpdateSubpriority + bl ObjectEventUpdateSubpriority pop {r4-r6} pop {r0} bx r0 - thumb_func_end FieldObjectStep + thumb_func_end ObjectEventStep thumb_func_start sub_8063E28 sub_8063E28: @ 8063E28 @@ -13357,7 +13357,7 @@ sub_8063E28: @ 8063E28 adds r1, r5, 0 bl sub_80679C8 adds r0, r4, 0 - bl FieldObjectIsSpecialAnimActive + bl ObjectEventIsSpecialAnimActive lsls r0, 24 cmp r0, 0 beq _08063E5C @@ -13410,7 +13410,7 @@ _08063E88: bl sub_80679F8 adds r0, r4, 0 adds r1, r5, 0 - bl FieldObjectUpdateSubpriority + bl ObjectEventUpdateSubpriority pop {r4,r5} pop {r0} bx r0 @@ -14009,8 +14009,8 @@ _080642B4: _080642C4: .4byte gUnknown_83A655F thumb_func_end GetStepInPlaceDelay4AnimId - thumb_func_start FieldObjectFaceOppositeDirection -FieldObjectFaceOppositeDirection: @ 80642C8 + thumb_func_start ObjectEventFaceOppositeDirection +ObjectEventFaceOppositeDirection: @ 80642C8 push {r4,lr} adds r4, r0, 0 lsls r0, r1, 24 @@ -14023,13 +14023,13 @@ FieldObjectFaceOppositeDirection: @ 80642C8 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement lsls r0, 24 lsrs r0, 24 pop {r4} pop {r1} bx r1 - thumb_func_end FieldObjectFaceOppositeDirection + thumb_func_end ObjectEventFaceOppositeDirection thumb_func_start sub_80642F4 sub_80642F4: @ 80642F4 @@ -14340,8 +14340,8 @@ _08064502: _08064508: .4byte gUnknown_83A65A9 thumb_func_end state_to_direction - thumb_func_start FieldObjectExecSpecialAnim -FieldObjectExecSpecialAnim: @ 806450C + thumb_func_start ObjectEventExecSpecialAnim +ObjectEventExecSpecialAnim: @ 806450C push {r4,lr} adds r4, r0, 0 ldr r2, _08064540 @ =gUnknown_83A65BC @@ -14369,7 +14369,7 @@ _08064538: bx r0 .align 2, 0 _08064540: .4byte gUnknown_83A65BC - thumb_func_end FieldObjectExecSpecialAnim + thumb_func_end ObjectEventExecSpecialAnim thumb_func_start sub_8064544 sub_8064544: @ 8064544 @@ -14477,7 +14477,7 @@ an_look_any: @ 80645F4 adds r5, r1, 0 lsls r1, r2, 24 lsrs r1, 24 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r4, 0 bl npc_coords_shift_still ldrb r0, [r4, 0x18] @@ -14568,7 +14568,7 @@ sub_8064678: @ 8064678 strh r0, [r5] mov r0, r8 adds r1, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r4, 0 mov r1, sp adds r2, r5, 0 @@ -14731,7 +14731,7 @@ sub_80647C0: @ 80647C0 strh r0, [r4] adds r0, r6, 0 adds r1, r5, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r5, 0 mov r1, sp adds r2, r4, 0 @@ -14842,7 +14842,7 @@ sub_8064894: @ 8064894 strh r0, [r4] adds r0, r6, 0 adds r1, r5, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r5, 0 mov r1, sp adds r2, r4, 0 @@ -15249,7 +15249,7 @@ sub_8064B68: @ 8064B68 strh r0, [r4] adds r0, r6, 0 adds r1, r5, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r5, 0 mov r1, sp adds r2, r4, 0 @@ -15675,7 +15675,7 @@ sub_8064E3C: @ 8064E3C strh r0, [r6] adds r0, r7, 0 adds r1, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection mov r1, r8 lsls r0, r1, 1 add r0, sp @@ -15947,7 +15947,7 @@ _08065072: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 @@ -16468,7 +16468,7 @@ sub_80653F8: @ 80653F8 cmp r0, 0x1 beq _0806541A movs r0, 0x1 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -16526,7 +16526,7 @@ sub_8065464: @ 8065464 cmp r0, 0x2 beq _08065486 movs r0, 0x2 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -16584,7 +16584,7 @@ sub_80654D0: @ 80654D0 cmp r0, 0x3 beq _080654F2 movs r0, 0x3 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -16642,7 +16642,7 @@ sub_806553C: @ 806553C cmp r0, 0x4 beq _0806555E movs r0, 0x4 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -16696,7 +16696,7 @@ sub_80655A8: @ 80655A8 adds r5, r1, 0 lsls r1, r2, 24 lsrs r1, 24 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r4, 0 bl npc_coords_shift_still adds r2, r5, 0 @@ -16724,7 +16724,7 @@ sub_80655D4: @ 80655D4 cmp r0, 0x1 beq _080655F6 movs r0, 0x1 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -16754,7 +16754,7 @@ sub_8065610: @ 8065610 cmp r0, 0x2 beq _08065632 movs r0, 0x2 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -16784,7 +16784,7 @@ sub_806564C: @ 806564C cmp r0, 0x3 beq _0806566E movs r0, 0x3 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -16814,7 +16814,7 @@ sub_8065688: @ 8065688 cmp r0, 0x4 beq _080656AA movs r0, 0x4 - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -16849,7 +16849,7 @@ sub_80656C4: @ 80656C4 lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - bl FieldObjectSetDirection + bl ObjectEventSetDirection mov r0, r8 adds r1, r6, 0 adds r2, r4, 0 @@ -18002,7 +18002,7 @@ sub_8065EF0: @ 8065EF0 strh r0, [r4] adds r0, r6, 0 adds r1, r5, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r5, 0 mov r1, sp adds r2, r4, 0 @@ -18258,7 +18258,7 @@ npc_set_direction_and_anim__an_proceed: @ 80660C4 bl obj_anim_image_set_and_seek adds r0, r6, 0 adds r1, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x1 strh r0, [r5, 0x32] pop {r4-r6} @@ -18653,7 +18653,7 @@ sub_806637C: @ 806637C movs r1, 0 movs r2, 0 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080663C6 @@ -18661,7 +18661,7 @@ sub_806637C: @ 806637C ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - ldr r4, _080663D4 @ =gMapObjects + ldr r4, _080663D4 @ =gObjectEvents mov r2, sp ldrb r2, [r2] lsls r3, r2, 3 @@ -18687,7 +18687,7 @@ _080663C6: pop {r1} bx r1 .align 2, 0 -_080663D4: .4byte gMapObjects +_080663D4: .4byte gObjectEvents thumb_func_end sub_806637C thumb_func_start sub_80663D8 @@ -18700,7 +18700,7 @@ sub_80663D8: @ 80663D8 movs r1, 0 movs r2, 0 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0806642A @@ -18708,7 +18708,7 @@ sub_80663D8: @ 80663D8 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - ldr r4, _08066438 @ =gMapObjects + ldr r4, _08066438 @ =gObjectEvents mov r2, sp ldrb r2, [r2] lsls r3, r2, 3 @@ -18737,7 +18737,7 @@ _0806642A: pop {r1} bx r1 .align 2, 0 -_08066438: .4byte gMapObjects +_08066438: .4byte gObjectEvents thumb_func_end sub_80663D8 thumb_func_start sub_806643C @@ -19354,7 +19354,7 @@ _08066874: thumb_func_start sub_806687C sub_806687C: @ 806687C push {lr} - ldr r3, _08066890 @ =gUnknown_839FD5D + ldr r3, _08066890 @ =gInitialMovementTypeFacingDirections ldrb r2, [r0, 0x6] adds r2, r3 ldrb r2, [r2] @@ -19363,7 +19363,7 @@ sub_806687C: @ 806687C pop {r1} bx r1 .align 2, 0 -_08066890: .4byte gUnknown_839FD5D +_08066890: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_806687C thumb_func_start sub_8066894 @@ -19417,7 +19417,7 @@ sub_80668D4: @ 80668D4 adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldrb r1, [r0, 0xC] lsls r1, 25 lsrs r1, 31 @@ -19466,7 +19466,7 @@ do_exclamation_mark_bubble_1: @ 8066920 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0 bl FieldEffectStart movs r0, 0x1 @@ -19486,7 +19486,7 @@ do_exclamation_mark_bubble_2: @ 8066944 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0x21 bl FieldEffectStart movs r0, 0x1 @@ -19506,7 +19506,7 @@ do_heart_bubble: @ 8066968 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0x2E bl FieldEffectStart movs r0, 0x1 @@ -19526,7 +19526,7 @@ sub_806698C: @ 806698C adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0x42 bl FieldEffectStart movs r0, 0x1 @@ -19546,7 +19546,7 @@ sub_80669B0: @ 80669B0 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0x40 bl FieldEffectStart movs r0, 0x1 @@ -19643,7 +19643,7 @@ sub_8066A54: @ 8066A54 beq _08066A70 adds r0, r4, 0 movs r1, 0x20 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer movs r0, 0x2 strh r0, [r4, 0x32] _08066A70: @@ -19669,7 +19669,7 @@ sub_8066A78: @ 8066A78 orrs r0, r1 strb r0, [r4, 0x1] adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 beq _08066AAA @@ -19713,7 +19713,7 @@ sub_8066AD0: @ 8066AD0 beq _08066AEC adds r0, r4, 0 movs r1, 0x20 - bl SetFieldObjectStepTimer + bl SetObjectEventStepTimer movs r0, 0x2 strh r0, [r4, 0x32] _08066AEC: @@ -19739,7 +19739,7 @@ sub_8066AF4: @ 8066AF4 orrs r0, r1 strb r0, [r4, 0x1] adds r0, r5, 0 - bl RunFieldObjectStepTimer + bl RunObjectEventStepTimer lsls r0, 24 cmp r0, 0 beq _08066B26 @@ -19943,7 +19943,7 @@ sub_8066C70: @ 8066C70 lsls r4, r2, 24 lsrs r4, 24 adds r1, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection adds r0, r5, 0 bl npc_coords_shift_still adds r0, r4, 0 @@ -21913,7 +21913,7 @@ sub_8067A10: @ 8067A10 ands r0, r1 strb r0, [r5, 0x1] ldrb r0, [r5, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r7, r0, 0 adds r0, r4, 0 adds r0, 0x3E diff --git a/asm/field_camera.s b/asm/field_camera.s index 0016e6381..cf9fff21d 100644 --- a/asm/field_camera.s +++ b/asm/field_camera.s @@ -939,7 +939,7 @@ _0805AC54: bl CameraMove adds r0, r4, 0 adds r1, r5, 0 - bl UpdateFieldObjectsForCameraUpdate + bl UpdateObjectEventsForCameraUpdate ldr r6, _0805ACA8 @ =gUnknown_3000E90 lsls r4, 1 lsls r5, 1 @@ -987,7 +987,7 @@ sub_805ACB4: @ 805ACB4 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl UpdateFieldObjectsForCameraUpdate + bl UpdateObjectEventsForCameraUpdate bl DrawWholeMapView ldr r1, _0805ACE8 @ =gUnknown_300506C lsls r4, 4 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index c0efe9975..85799d9da 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -901,12 +901,12 @@ _0806CF60: lsrs r1, 16 _0806CF7E: ldrb r2, [r4, 0x4] - bl GetFieldObjectIdByXYZ + bl GetObjectEventIdByXYZ lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x10 beq _0806CF9E - ldr r1, _0806CFA8 @ =gMapObjects + ldr r1, _0806CFA8 @ =gObjectEvents lsls r2, r3, 3 adds r0, r2, r3 lsls r0, 2 @@ -920,7 +920,7 @@ _0806CF9E: b _0806CFDE .align 2, 0 _0806CFA4: .4byte gDirectionToVectors -_0806CFA8: .4byte gMapObjects +_0806CFA8: .4byte gObjectEvents _0806CFAC: movs r4, 0 ldr r1, _0806CFE4 @ =gUnknown_2031DEC @@ -936,7 +936,7 @@ _0806CFBC: adds r4, 0x1 cmp r4, 0x3 ble _0806CFB0 - ldr r0, _0806CFE8 @ =gSelectedEventObject + ldr r0, _0806CFE8 @ =gSelectedObjectEvent strb r3, [r0] ldr r1, _0806CFEC @ =gSpecialVar_LastTalked adds r0, r2, r3 @@ -947,14 +947,14 @@ _0806CFBC: ldr r0, _0806CFF0 @ =gSpecialVar_Facing strh r6, [r0] adds r0, r3, 0 - bl GetFieldObjectScriptPointerByFieldObjectId + bl GetObjectEventScriptPointerByObjectEventId _0806CFDE: pop {r4-r6} pop {r1} bx r1 .align 2, 0 _0806CFE4: .4byte gUnknown_2031DEC -_0806CFE8: .4byte gSelectedEventObject +_0806CFE8: .4byte gSelectedObjectEvent _0806CFEC: .4byte gSpecialVar_LastTalked _0806CFF0: .4byte gSpecialVar_Facing thumb_func_end sub_806CF38 @@ -973,12 +973,12 @@ sub_806CFF4: @ 806CFF4 ldrh r0, [r4] ldrh r1, [r4, 0x2] ldrb r2, [r4, 0x4] - bl GetFieldObjectIdByXYZ + bl GetObjectEventIdByXYZ lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x10 beq _0806D02A - ldr r2, _0806D098 @ =gMapObjects + ldr r2, _0806D098 @ =gObjectEvents lsls r1, r5, 3 adds r0, r1, r5 lsls r0, 2 @@ -1011,12 +1011,12 @@ _0806D02A: lsls r1, 16 lsrs r1, 16 ldrb r2, [r4, 0x4] - bl GetFieldObjectIdByXYZ + bl GetObjectEventIdByXYZ lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x10 beq _0806D092 - ldr r2, _0806D098 @ =gMapObjects + ldr r2, _0806D098 @ =gObjectEvents lsls r1, r5, 3 adds r0, r1, r5 lsls r0, 2 @@ -1031,9 +1031,9 @@ _0806D078: bne _0806D0A0 adds r0, r6, r5 lsls r0, 2 - ldr r1, _0806D098 @ =gMapObjects + ldr r1, _0806D098 @ =gObjectEvents adds r0, r1 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 bne _0806D0A0 @@ -1041,13 +1041,13 @@ _0806D092: movs r0, 0 b _0806D0C8 .align 2, 0 -_0806D098: .4byte gMapObjects +_0806D098: .4byte gObjectEvents _0806D09C: .4byte gDirectionToVectors _0806D0A0: - ldr r0, _0806D0D4 @ =gSelectedEventObject + ldr r0, _0806D0D4 @ =gSelectedObjectEvent strb r5, [r0] ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked - ldr r1, _0806D0DC @ =gMapObjects + ldr r1, _0806D0DC @ =gObjectEvents adds r0, r6, r5 lsls r0, 2 adds r0, r1 @@ -1057,7 +1057,7 @@ _0806D0A0: mov r1, r8 strh r1, [r0] adds r0, r5, 0 - bl GetFieldObjectScriptPointerByFieldObjectId + bl GetObjectEventScriptPointerByObjectEventId adds r1, r0, 0 ldrb r0, [r4] bl GetRamScript @@ -1069,9 +1069,9 @@ _0806D0C8: pop {r1} bx r1 .align 2, 0 -_0806D0D4: .4byte gSelectedEventObject +_0806D0D4: .4byte gSelectedObjectEvent _0806D0D8: .4byte gSpecialVar_LastTalked -_0806D0DC: .4byte gMapObjects +_0806D0DC: .4byte gObjectEvents _0806D0E0: .4byte gSpecialVar_Facing thumb_func_end sub_806CFF4 @@ -1093,7 +1093,7 @@ sub_806D0E4: @ 806D0E4 lsrs r2, 16 ldrb r3, [r0, 0x4] adds r0, r4, 0 - bl FindInvisibleMapObjectByPosition + bl FindInvisibleObjectEventByPosition adds r5, r0, 0 cmp r5, 0 beq _0806D164 @@ -2139,7 +2139,7 @@ sub_806D928: @ 806D928 lsrs r2, 16 ldrb r3, [r0, 0x4] adds r0, r4, 0 - bl FindInvisibleMapObjectByPosition + bl FindInvisibleObjectEventByPosition cmp r0, 0 bne _0806D950 movs r0, 0 @@ -2809,7 +2809,7 @@ sub_806DE28: @ 806DE28 ldr r2, [r4] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl RemoveFieldObjectByLocalIdAndMap + bl RemoveObjectEventByLocalIdAndMap ldrb r0, [r5, 0x8] ldr r2, [r4] ldrb r1, [r2, 0x5] @@ -2892,8 +2892,8 @@ sub_806DEC4: @ 806DEC4 _0806DEE8: .4byte gMapHeader thumb_func_end sub_806DEC4 - thumb_func_start FindInvisibleMapObjectByPosition -FindInvisibleMapObjectByPosition: @ 806DEEC + thumb_func_start FindInvisibleObjectEventByPosition +FindInvisibleObjectEventByPosition: @ 806DEEC push {r4-r7,lr} lsls r1, 16 lsrs r7, r1, 16 @@ -2938,7 +2938,7 @@ _0806DF34: pop {r4-r7} pop {r1} bx r1 - thumb_func_end FindInvisibleMapObjectByPosition + thumb_func_end FindInvisibleObjectEventByPosition thumb_func_start dive_warp dive_warp: @ 806DF3C @@ -3079,8 +3079,8 @@ _0806E046: bx r1 thumb_func_end sub_806DFB8 - thumb_func_start GetFieldObjectScriptPointerForComparison -GetFieldObjectScriptPointerForComparison: @ 806E050 + thumb_func_start GetObjectEventScriptPointerForComparison +GetObjectEventScriptPointerForComparison: @ 806E050 push {r4,r5,lr} sub sp, 0x8 bl player_get_direction_upper_nybble @@ -3106,7 +3106,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050 pop {r4,r5} pop {r1} bx r1 - thumb_func_end GetFieldObjectScriptPointerForComparison + thumb_func_end GetObjectEventScriptPointerForComparison thumb_func_start SetCableClubWarp SetCableClubWarp: @ 806E08C diff --git a/asm/field_effect.s b/asm/field_effect.s index 41c33c6fc..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] @@ -2067,7 +2067,7 @@ mapldr_08084390: @ 8084390 ldr r0, _080843E8 @ =c3_080843F8 movs r1, 0 bl CreateTask - ldr r4, _080843EC @ =gMapObjects + ldr r4, _080843EC @ =gObjectEvents ldr r3, _080843F0 @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -2089,10 +2089,10 @@ mapldr_08084390: @ 8084390 lsls r0, 2 adds r0, r4 movs r1, 0x3 - bl FieldObjectTurn + bl ObjectEventTurn _080843D2: bl ScriptContext2_Enable - bl FreezeEventObjects + bl FreezeObjectEvents ldr r1, _080843F4 @ =gFieldCallback movs r0, 0 str r0, [r1] @@ -2101,7 +2101,7 @@ _080843D2: bx r0 .align 2, 0 _080843E8: .4byte c3_080843F8 -_080843EC: .4byte gMapObjects +_080843EC: .4byte gObjectEvents _080843F0: .4byte gPlayerAvatar _080843F4: .4byte gFieldCallback thumb_func_end mapldr_08084390 @@ -2139,7 +2139,7 @@ _0808442A: cmp r0, 0 bne _08084444 bl ScriptContext2_Disable - bl UnfreezeMapObjects + bl UnfreezeObjectEvents adds r0, r5, 0 bl DestroyTask _08084444: @@ -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 @@ -2214,7 +2214,7 @@ sub_80844BC: @ 80844BC lsls r5, r0, 3 adds r5, r0 lsls r5, 2 - ldr r0, _0808455C @ =gMapObjects + ldr r0, _0808455C @ =gObjectEvents mov r8, r0 add r5, r8 ldrb r0, [r6, 0x4] @@ -2243,7 +2243,7 @@ sub_80844BC: @ 80844BC lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement adds r3, r4, 0 adds r3, 0x42 ldrb r0, [r3] @@ -2279,7 +2279,7 @@ sub_80844BC: @ 80844BC bx r1 .align 2, 0 _08084558: .4byte gPlayerAvatar -_0808455C: .4byte gMapObjects +_0808455C: .4byte gObjectEvents _08084560: .4byte gSprites thumb_func_end sub_80844BC @@ -2331,7 +2331,7 @@ sub_8084580: @ 8084580 movs r0, 0x1 strh r0, [r5, 0xA] strh r1, [r5, 0xC] - ldr r2, _080845F0 @ =gMapObjects + ldr r2, _080845F0 @ =gObjectEvents ldrb r0, [r6, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -2355,7 +2355,7 @@ sub_8084580: @ 8084580 _080845E4: .4byte gPlayerAvatar _080845E8: .4byte gSprites _080845EC: .4byte gSpriteCoordOffsetY -_080845F0: .4byte gMapObjects +_080845F0: .4byte gObjectEvents thumb_func_end sub_8084580 thumb_func_start sub_80845F4 @@ -2367,7 +2367,7 @@ sub_80845F4: @ 80845F4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080846A4 @ =gMapObjects + ldr r1, _080846A4 @ =gObjectEvents adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -2450,7 +2450,7 @@ _08084698: bx r1 .align 2, 0 _080846A0: .4byte gPlayerAvatar -_080846A4: .4byte gMapObjects +_080846A4: .4byte gObjectEvents _080846A8: .4byte gSprites thumb_func_end sub_80845F4 @@ -2516,7 +2516,7 @@ sub_8084708: @ 8084708 strb r0, [r1, 0x6] bl ScriptContext2_Disable bl CameraObjectReset1 - bl UnfreezeMapObjects + bl UnfreezeObjectEvents bl InstallCameraPanAheadCallback mov r4, sp adds r4, 0x2 @@ -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 @@ -2650,15 +2650,15 @@ sub_8084820: @ 8084820 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808488C @ =gMapObjects + ldr r1, _0808488C @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0808484A adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808487E @@ -2671,7 +2671,7 @@ _0808484A: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 movs r1, 0 @@ -2693,7 +2693,7 @@ _0808487E: bx r1 .align 2, 0 _08084888: .4byte gPlayerAvatar -_0808488C: .4byte gMapObjects +_0808488C: .4byte gObjectEvents thumb_func_end sub_8084820 thumb_func_start sub_8084890 @@ -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 @@ -2944,7 +2944,7 @@ sub_8084A5C: @ 8084A5C lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08084AC0 @ =gMapObjects + ldr r0, _08084AC0 @ =gObjectEvents adds r4, r0 movs r0, 0x4 bl sub_8063EB8 @@ -2952,7 +2952,7 @@ sub_8084A5C: @ 8084A5C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement mov r4, sp adds r4, 0x2 mov r0, sp @@ -2979,7 +2979,7 @@ sub_8084A5C: @ 8084A5C b _08084AC6 .align 2, 0 _08084ABC: .4byte gPlayerAvatar -_08084AC0: .4byte gMapObjects +_08084AC0: .4byte gObjectEvents _08084AC4: movs r1, 0 _08084AC6: @@ -3189,23 +3189,23 @@ sub_8084C3C: @ 8084C3C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08084C98 @ =gMapObjects + ldr r1, _08084C98 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08084C8A bl CameraObjectReset1 bl ScriptContext2_Disable - bl UnfreezeMapObjects + bl UnfreezeObjectEvents movs r0, 0x4 bl sub_8063F84 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldr r0, _08084C9C @ =sub_8084A24 bl FindTaskIdByFunc lsls r0, 24 @@ -3220,7 +3220,7 @@ _08084C8A: bx r1 .align 2, 0 _08084C94: .4byte gPlayerAvatar -_08084C98: .4byte gMapObjects +_08084C98: .4byte gObjectEvents _08084C9C: .4byte sub_8084A24 thumb_func_end sub_8084C3C @@ -3273,7 +3273,7 @@ _08084CEA: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08084D20 @ =gMapObjects + ldr r0, _08084D20 @ =gObjectEvents adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3288,7 +3288,7 @@ _08084CEA: _08084D14: .4byte gUnknown_83CC084 _08084D18: .4byte gTasks _08084D1C: .4byte gPlayerAvatar -_08084D20: .4byte gMapObjects +_08084D20: .4byte gObjectEvents thumb_func_end sub_8084CD8 thumb_func_start sub_8084D24 @@ -3317,12 +3317,12 @@ waterfall_1_do_anim_probably: @ 8084D44 adds r5, r1, 0 bl ScriptContext2_Enable adds r0, r5, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 bne _08084D74 adds r0, r5, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished ldr r1, _08084D7C @ =gFieldEffectArguments movs r2, 0xA ldrsh r0, [r4, r2] @@ -3374,7 +3374,7 @@ sub_8084DA4: @ 8084DA4 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -3390,7 +3390,7 @@ sub_8084DCC: @ 8084DCC adds r5, r0, 0 adds r4, r1, 0 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 bne _08084DE2 @@ -3537,7 +3537,7 @@ dive_3_unknown: @ 8084ED4 lsls r0, 24 cmp r0, 0 bne _08084F18 - ldr r2, _08084F20 @ =gMapObjects + ldr r2, _08084F20 @ =gObjectEvents ldr r0, _08084F24 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -3560,7 +3560,7 @@ _08084F18: pop {r1} bx r1 .align 2, 0 -_08084F20: .4byte gMapObjects +_08084F20: .4byte gObjectEvents _08084F24: .4byte gPlayerAvatar _08084F28: .4byte sub_8084E60 thumb_func_end dive_3_unknown @@ -3600,7 +3600,7 @@ _08084F58: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08084F98 @ =gMapObjects + ldr r0, _08084F98 @ =gObjectEvents adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -3621,7 +3621,7 @@ _08084F58: _08084F8C: .4byte gUnknown_83CC0A4 _08084F90: .4byte gTasks _08084F94: .4byte gPlayerAvatar -_08084F98: .4byte gMapObjects +_08084F98: .4byte gObjectEvents _08084F9C: .4byte gSprites thumb_func_end sub_8084F44 @@ -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 @@ -3946,7 +3946,7 @@ _080851FC: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0808523C @ =gMapObjects + ldr r0, _0808523C @ =gObjectEvents adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -3967,7 +3967,7 @@ _080851FC: _08085230: .4byte gUnknown_83CC0BC _08085234: .4byte gTasks _08085238: .4byte gPlayerAvatar -_0808523C: .4byte gMapObjects +_0808523C: .4byte gObjectEvents _08085240: .4byte gSprites thumb_func_end sub_80851E8 @@ -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] @@ -4070,7 +4070,7 @@ sub_80852C0: @ 80852C0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement _08085308: movs r0, 0 pop {r4} @@ -4084,7 +4084,7 @@ _08085310: .4byte gSprites sub_8085314: @ 8085314 push {lr} adds r0, r1, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808533E @@ -4092,7 +4092,7 @@ sub_8085314: @ 8085314 movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable - bl UnfreezeMapObjects + bl UnfreezeObjectEvents ldr r0, _08085348 @ =sub_80851E8 bl FindTaskIdByFunc lsls r0, 24 @@ -4116,7 +4116,7 @@ FldEff_LavaridgeGymWarp: @ 808534C movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080853A8 @ =gUnknown_83A0010 + ldr r0, _080853A8 @ =gFieldEffectObjectTemplatePointers adds r0, 0x84 ldr r0, [r0] movs r2, 0 @@ -4152,7 +4152,7 @@ FldEff_LavaridgeGymWarp: @ 808534C bx r1 .align 2, 0 _080853A4: .4byte gFieldEffectArguments -_080853A8: .4byte gUnknown_83A0010 +_080853A8: .4byte gFieldEffectObjectTemplatePointers _080853AC: .4byte gSprites thumb_func_end FldEff_LavaridgeGymWarp @@ -4209,7 +4209,7 @@ _080853F8: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08085438 @ =gMapObjects + ldr r0, _08085438 @ =gObjectEvents adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -4230,7 +4230,7 @@ _080853F8: _0808542C: .4byte gUnknown_83CC0CC _08085430: .4byte gTasks _08085434: .4byte gPlayerAvatar -_08085438: .4byte gMapObjects +_08085438: .4byte gObjectEvents _0808543C: .4byte gSprites thumb_func_end sub_80853E4 @@ -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 @@ -4266,7 +4266,7 @@ sub_8085470: @ 8085470 adds r4, r1, 0 adds r6, r2, 0 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _080854E4 @@ -4311,7 +4311,7 @@ _080854C4: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement movs r0, 0x21 bl PlaySE _080854E4: @@ -4420,7 +4420,7 @@ FldEff_PopOutOfAsh: @ 80855A0 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080855FC @ =gUnknown_83A0010 + ldr r0, _080855FC @ =gFieldEffectObjectTemplatePointers adds r0, 0x80 ldr r0, [r0] movs r2, 0 @@ -4456,7 +4456,7 @@ FldEff_PopOutOfAsh: @ 80855A0 bx r1 .align 2, 0 _080855F8: .4byte gFieldEffectArguments -_080855FC: .4byte gUnknown_83A0010 +_080855FC: .4byte gFieldEffectObjectTemplatePointers _08085600: .4byte gSprites thumb_func_end FldEff_PopOutOfAsh @@ -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 @@ -4546,7 +4546,7 @@ sub_8085690: @ 8085690 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080856D8 @ =gMapObjects + ldr r1, _080856D8 @ =gObjectEvents adds r6, r0, r1 adds r4, r5, 0 adds r4, 0x8 @@ -4572,7 +4572,7 @@ sub_8085690: @ 8085690 b _08085702 .align 2, 0 _080856D4: .4byte gPlayerAvatar -_080856D8: .4byte gMapObjects +_080856D8: .4byte gObjectEvents _080856DC: movs r1, 0x8 ldrsh r0, [r4, r1] @@ -4610,7 +4610,7 @@ _08085702: lsls r1, 24 lsrs r1, 24 adds r0, r6, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection bl sub_80555E0 bl WarpIntoMap ldr r1, _0808575C @ =gFieldCallback @@ -4641,12 +4641,12 @@ sub_808576C: @ 808576C adds r4, r0, 0 adds r6, r1, 0 adds r5, r2, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0808578A adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _080857E4 @@ -4673,7 +4673,7 @@ _0808579E: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r1, [r5] movs r2, 0 ldrsh r0, [r5, r2] @@ -4969,11 +4969,11 @@ 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] - ldr r2, _08085A18 @ =gMapObjects + ldr r2, _08085A18 @ =gObjectEvents ldr r0, _08085A1C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -4991,7 +4991,7 @@ sub_80859D4: @ 80859D4 bx r0 .align 2, 0 _08085A14: .4byte gFieldCallback -_08085A18: .4byte gMapObjects +_08085A18: .4byte gObjectEvents _08085A1C: .4byte gPlayerAvatar _08085A20: .4byte sub_8085A24 thumb_func_end sub_80859D4 @@ -5056,7 +5056,7 @@ sub_8085A80: @ 8085A80 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085AD8 @ =gMapObjects + ldr r1, _08085AD8 @ =gObjectEvents adds r6, r0, r1 adds r1, r4, 0 adds r1, 0xA @@ -5088,7 +5088,7 @@ sub_8085A80: @ 8085A80 b _08085B10 .align 2, 0 _08085AD4: .4byte gPlayerAvatar -_08085AD8: .4byte gMapObjects +_08085AD8: .4byte gObjectEvents _08085ADC: movs r2, 0xE ldrsh r0, [r5, r2] @@ -5125,7 +5125,7 @@ _08085B10: cmp r1, r0 bne _08085B58 adds r0, r6, 0 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5141,7 +5141,7 @@ _08085B10: ands r0, r1 strb r0, [r6, 0x3] bl ScriptContext2_Disable - bl UnfreezeMapObjects + bl UnfreezeObjectEvents ldr r0, _08085B60 @ =sub_8085A24 bl FindTaskIdByFunc lsls r0, 24 @@ -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 @@ -5226,7 +5226,7 @@ sub_8085BD0: @ 8085BD0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085C5C @ =gMapObjects + ldr r1, _08085C5C @ =gObjectEvents adds r5, r0, r1 ldrh r1, [r4, 0xA] movs r2, 0xA @@ -5245,7 +5245,7 @@ _08085C02: add r0, sp ldrb r1, [r0] adds r0, r5, 0 - bl FieldObjectTurn + bl ObjectEventTurn movs r0, 0x8 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] @@ -5282,7 +5282,7 @@ _08085C4A: .align 2, 0 _08085C54: .4byte gUnknown_83CC108 _08085C58: .4byte gPlayerAvatar -_08085C5C: .4byte gMapObjects +_08085C5C: .4byte gObjectEvents thumb_func_end sub_8085BD0 thumb_func_start sub_8085C60 @@ -5299,7 +5299,7 @@ sub_8085C60: @ 8085C60 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085D2C @ =gMapObjects + ldr r1, _08085D2C @ =gObjectEvents adds r3, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -5321,7 +5321,7 @@ sub_8085C60: @ 8085C60 add r0, sp ldrb r1, [r0] adds r0, r3, 0 - bl FieldObjectTurn + bl ObjectEventTurn _08085CAA: ldrh r0, [r5, 0x22] ldrh r1, [r4, 0xE] @@ -5387,7 +5387,7 @@ _08085D1A: .align 2, 0 _08085D24: .4byte gUnknown_83CC108 _08085D28: .4byte gPlayerAvatar -_08085D2C: .4byte gMapObjects +_08085D2C: .4byte gObjectEvents _08085D30: .4byte gSprites thumb_func_end sub_8085C60 @@ -5435,11 +5435,11 @@ 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] - ldr r2, _08085DD0 @ =gMapObjects + ldr r2, _08085DD0 @ =gObjectEvents ldr r0, _08085DD4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -5458,7 +5458,7 @@ mapldr_08085D88: @ 8085D88 bx r0 .align 2, 0 _08085DCC: .4byte gFieldCallback -_08085DD0: .4byte gMapObjects +_08085DD0: .4byte gObjectEvents _08085DD4: .4byte gPlayerAvatar _08085DD8: .4byte sub_8085DDC thumb_func_end mapldr_08085D88 @@ -5518,7 +5518,7 @@ sub_8085E0C: @ 8085E0C adds r0, r1 negs r0, r0 strh r0, [r2, 0x26] - ldr r3, _08085E94 @ =gMapObjects + ldr r3, _08085E94 @ =gObjectEvents ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -5554,7 +5554,7 @@ _08085E82: _08085E88: .4byte gPlayerAvatar _08085E8C: .4byte gSprites _08085E90: .4byte gSpriteCoordOffsetY -_08085E94: .4byte gMapObjects +_08085E94: .4byte gObjectEvents thumb_func_end sub_8085E0C thumb_func_start sub_8085E98 @@ -5571,7 +5571,7 @@ sub_8085E98: @ 8085E98 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085F08 @ =gMapObjects + ldr r1, _08085F08 @ =gObjectEvents adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -5613,7 +5613,7 @@ sub_8085E98: @ 8085E98 .align 2, 0 _08085F00: .4byte gUnknown_83CC108 _08085F04: .4byte gPlayerAvatar -_08085F08: .4byte gMapObjects +_08085F08: .4byte gObjectEvents _08085F0C: .4byte gSprites _08085F10: ldrb r1, [r5, 0x5] @@ -5670,7 +5670,7 @@ _08085F5A: add r0, sp ldrb r1, [r0] adds r0, r6, 0 - bl FieldObjectTurn + bl ObjectEventTurn _08085F7C: movs r1, 0x26 ldrsh r0, [r5, r1] @@ -5704,7 +5704,7 @@ sub_8085F9C: @ 8085F9C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086020 @ =gMapObjects + ldr r1, _08086020 @ =gObjectEvents adds r5, r0, r1 ldrh r0, [r4, 0xA] subs r0, 0x1 @@ -5718,7 +5718,7 @@ sub_8085F9C: @ 8085F9C add r0, sp ldrb r1, [r0] adds r0, r5, 0 - bl FieldObjectTurn + bl ObjectEventTurn movs r0, 0x8 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] @@ -5737,7 +5737,7 @@ sub_8085F9C: @ 8085F9C bne _08086010 bl ScriptContext2_Disable bl CameraObjectReset1 - bl UnfreezeMapObjects + bl UnfreezeObjectEvents ldr r0, _08086024 @ =sub_8085DDC bl FindTaskIdByFunc lsls r0, 24 @@ -5751,7 +5751,7 @@ _08086010: .align 2, 0 _08086018: .4byte gUnknown_83CC108 _0808601C: .4byte gPlayerAvatar -_08086020: .4byte gMapObjects +_08086020: .4byte gObjectEvents _08086024: .4byte sub_8085DDC thumb_func_end sub_8085F9C @@ -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] @@ -7014,7 +7014,7 @@ sub_80869C0: @ 80869C0 adds r0, r6, 0 mov r1, r8 bl PlayerGetDestCoords - ldr r2, _08086A1C @ =gMapObjects + ldr r2, _08086A1C @ =gObjectEvents ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7035,7 +7035,7 @@ sub_80869C0: @ 80869C0 bx r0 .align 2, 0 _08086A18: .4byte gPlayerAvatar -_08086A1C: .4byte gMapObjects +_08086A1C: .4byte gObjectEvents thumb_func_end sub_80869C0 thumb_func_start sub_8086A20 @@ -7047,15 +7047,15 @@ sub_8086A20: @ 8086A20 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086A68 @ =gMapObjects + ldr r1, _08086A68 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _08086A4A adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08086A5C @@ -7063,7 +7063,7 @@ _08086A4A: bl sub_805CB70 adds r0, r4, 0 movs r1, 0x45 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -7073,7 +7073,7 @@ _08086A5C: bx r0 .align 2, 0 _08086A64: .4byte gPlayerAvatar -_08086A68: .4byte gMapObjects +_08086A68: .4byte gObjectEvents thumb_func_end sub_8086A20 thumb_func_start sub_8086A6C @@ -7085,9 +7085,9 @@ sub_8086A6C: @ 8086A6C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086AAC @ =gMapObjects + ldr r1, _08086AAC @ =gObjectEvents adds r0, r1 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 beq _08086AA2 @@ -7109,7 +7109,7 @@ _08086AA2: bx r0 .align 2, 0 _08086AA8: .4byte gPlayerAvatar -_08086AAC: .4byte gMapObjects +_08086AAC: .4byte gObjectEvents _08086AB0: .4byte gFieldEffectArguments thumb_func_end sub_8086A6C @@ -7127,7 +7127,7 @@ sub_8086AB4: @ 8086AB4 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08086B28 @ =gMapObjects + ldr r0, _08086B28 @ =gObjectEvents adds r4, r0 movs r0, 0x2 bl sub_805C808 @@ -7135,9 +7135,9 @@ sub_8086AB4: @ 8086AB4 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl EventObjectSetGraphicsId + bl ObjectEventSetGraphicsId adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished ldrb r0, [r4, 0x18] lsrs r0, 4 bl sub_80641C0 @@ -7145,7 +7145,7 @@ sub_8086AB4: @ 8086AB4 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldr r1, _08086B2C @ =gFieldEffectArguments movs r2, 0xA ldrsh r0, [r6, r2] @@ -7167,7 +7167,7 @@ _08086B1E: bx r0 .align 2, 0 _08086B24: .4byte gPlayerAvatar -_08086B28: .4byte gMapObjects +_08086B28: .4byte gObjectEvents _08086B2C: .4byte gFieldEffectArguments thumb_func_end sub_8086AB4 @@ -7179,10 +7179,10 @@ sub_8086B30: @ 8086B30 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086BA0 @ =gMapObjects + ldr r1, _08086BA0 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08086B96 @@ -7199,11 +7199,11 @@ sub_8086B30: @ 8086B30 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrb r0, [r4, 0x1A] movs r1, 0x1 bl sub_80DC44C - bl UnfreezeMapObjects + bl UnfreezeObjectEvents bl ScriptContext2_Disable movs r0, 0x9 bl FieldEffectActiveListRemove @@ -7220,7 +7220,7 @@ _08086B96: bx r0 .align 2, 0 _08086B9C: .4byte gPlayerAvatar -_08086BA0: .4byte gMapObjects +_08086BA0: .4byte gObjectEvents _08086BA4: .4byte sub_8086990 thumb_func_end sub_8086B30 @@ -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] @@ -7299,15 +7299,15 @@ sub_8086C24: @ 8086C24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086C6C @ =gMapObjects + ldr r1, _08086C6C @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _08086C4E adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08086C60 @@ -7315,7 +7315,7 @@ _08086C4E: bl sub_805CBE8 adds r0, r4, 0 movs r1, 0x45 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -7325,7 +7325,7 @@ _08086C60: bx r0 .align 2, 0 _08086C68: .4byte gPlayerAvatar -_08086C6C: .4byte gMapObjects +_08086C6C: .4byte gObjectEvents thumb_func_end sub_8086C24 thumb_func_start sub_8086C70 @@ -7337,10 +7337,10 @@ sub_8086C70: @ 8086C70 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086CA0 @ =gMapObjects + ldr r1, _08086CA0 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08086CEE @@ -7353,7 +7353,7 @@ sub_8086C70: @ 8086C70 b _08086CAE .align 2, 0 _08086C9C: .4byte gPlayerAvatar -_08086CA0: .4byte gMapObjects +_08086CA0: .4byte gObjectEvents _08086CA4: movs r0, 0x8 ands r0, r1 @@ -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 @@ -7385,7 +7385,7 @@ _08086CD2: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectForceSetSpecialAnim + bl ObjectEventForceSetSpecialAnim ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] @@ -7403,9 +7403,9 @@ sub_8086CF4: @ 8086CF4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086D30 @ =gMapObjects + ldr r1, _08086D30 @ =gObjectEvents adds r0, r1 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08086D26 @@ -7424,14 +7424,14 @@ _08086D26: bx r0 .align 2, 0 _08086D2C: .4byte gPlayerAvatar -_08086D30: .4byte gMapObjects +_08086D30: .4byte gObjectEvents _08086D34: .4byte sub_8086BD0 thumb_func_end sub_8086CF4 thumb_func_start sub_8086D38 sub_8086D38: @ 8086D38 push {r4,lr} - ldr r0, _08086D84 @ =gUnknown_83A0010 + ldr r0, _08086D84 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x68] movs r1, 0x78 movs r2, 0 @@ -7466,7 +7466,7 @@ sub_8086D38: @ 8086D38 pop {r1} bx r1 .align 2, 0 -_08086D84: .4byte gUnknown_83A0010 +_08086D84: .4byte gFieldEffectObjectTemplatePointers _08086D88: .4byte gSprites _08086D8C: .4byte sub_8086D94 _08086D90: .4byte gFieldEffectArguments @@ -7596,15 +7596,15 @@ sub_8086E70: @ 8086E70 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086EC4 @ =gMapObjects + ldr r1, _08086EC4 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _08086E9A adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08086EB8 @@ -7617,7 +7617,7 @@ _08086E9A: bl sub_805CB70 adds r0, r4, 0 movs r1, 0x45 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -7627,7 +7627,7 @@ _08086EB8: bx r0 .align 2, 0 _08086EC0: .4byte gPlayerAvatar -_08086EC4: .4byte gMapObjects +_08086EC4: .4byte gObjectEvents thumb_func_end sub_8086E70 thumb_func_start sub_8086EC8 @@ -7639,9 +7639,9 @@ sub_8086EC8: @ 8086EC8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086F04 @ =gMapObjects + ldr r1, _08086F04 @ =gObjectEvents adds r0, r1 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08086EF8 @@ -7660,7 +7660,7 @@ _08086EF8: bx r0 .align 2, 0 _08086F00: .4byte gPlayerAvatar -_08086F04: .4byte gMapObjects +_08086F04: .4byte gObjectEvents _08086F08: .4byte gFieldEffectArguments thumb_func_end sub_8086EC8 @@ -7678,7 +7678,7 @@ sub_8086F0C: @ 8086F0C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086F60 @ =gMapObjects + ldr r1, _08086F60 @ =gObjectEvents adds r5, r0, r1 ldrh r1, [r4, 0x26] movs r0, 0x8 @@ -7705,7 +7705,7 @@ _08086F54: bx r0 .align 2, 0 _08086F5C: .4byte gPlayerAvatar -_08086F60: .4byte gMapObjects +_08086F60: .4byte gObjectEvents thumb_func_end sub_8086F0C thumb_func_start sub_8086F64 @@ -7729,17 +7729,17 @@ sub_8086F64: @ 8086F64 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086FA4 @ =gMapObjects + ldr r1, _08086FA4 @ =gObjectEvents adds r0, r1 movs r1, 0x2 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement _08086F98: pop {r4} pop {r0} bx r0 .align 2, 0 _08086FA0: .4byte gPlayerAvatar -_08086FA4: .4byte gMapObjects +_08086FA4: .4byte gObjectEvents thumb_func_end sub_8086F64 thumb_func_start sub_8086FA8 @@ -7751,7 +7751,7 @@ sub_8086FA8: @ 8086FA8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086FF8 @ =gMapObjects + ldr r1, _08086FF8 @ =gObjectEvents adds r2, r0, r1 ldrh r1, [r4, 0xC] movs r3, 0xC @@ -7765,7 +7765,7 @@ sub_8086FA8: @ 8086FA8 bne _08086FEC _08086FCE: adds r0, r2, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08086FEC @@ -7782,7 +7782,7 @@ _08086FEC: bx r0 .align 2, 0 _08086FF4: .4byte gPlayerAvatar -_08086FF8: .4byte gMapObjects +_08086FF8: .4byte gObjectEvents thumb_func_end sub_8086FA8 thumb_func_start sub_8086FFC @@ -7801,7 +7801,7 @@ sub_8086FFC: @ 8086FFC lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087064 @ =gMapObjects + ldr r0, _08087064 @ =gObjectEvents adds r4, r0 movs r0, 0x2 bl sub_805C808 @@ -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 @@ -7824,7 +7824,7 @@ sub_8086FFC: @ 8086FFC strb r0, [r4, 0x1] adds r0, r4, 0 movs r1, 0x54 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -7836,7 +7836,7 @@ _0808705A: bx r0 .align 2, 0 _08087060: .4byte gPlayerAvatar -_08087064: .4byte gMapObjects +_08087064: .4byte gObjectEvents _08087068: .4byte gSprites thumb_func_end sub_8086FFC @@ -7856,10 +7856,10 @@ sub_808706C: @ 808706C lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087108 @ =gMapObjects + ldr r0, _08087108 @ =gObjectEvents adds r4, r0 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimActive + bl ObjectEventClearAnimIfSpecialAnimActive ldrb r1, [r4, 0x1] movs r0, 0x11 negs r0, r0 @@ -7915,7 +7915,7 @@ _080870FC: bx r0 .align 2, 0 _08087104: .4byte gPlayerAvatar -_08087108: .4byte gMapObjects +_08087108: .4byte gObjectEvents _0808710C: .4byte gSprites _08087110: .4byte gSaveBlock2Ptr _08087114: .4byte sub_8087828 @@ -7967,7 +7967,7 @@ _08087164: .4byte sub_8086E40 thumb_func_start sub_8087168 sub_8087168: @ 8087168 push {lr} - ldr r0, _080871A0 @ =gUnknown_83A0010 + ldr r0, _080871A0 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x68] movs r1, 0xFF movs r2, 0xB4 @@ -7994,7 +7994,7 @@ sub_8087168: @ 8087168 pop {r1} bx r1 .align 2, 0 -_080871A0: .4byte gUnknown_83A0010 +_080871A0: .4byte gFieldEffectObjectTemplatePointers _080871A4: .4byte gSprites _080871A8: .4byte sub_8087220 thumb_func_end sub_8087168 @@ -8430,15 +8430,15 @@ sub_80874C8: @ 80874C8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080875B8 @ =gMapObjects + ldr r1, _080875B8 @ =gObjectEvents adds r5, r0, r1 adds r0, r5, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _080874F2 adds r0, r5, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _080875AE @@ -8468,11 +8468,11 @@ _0808751A: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl EventObjectSetGraphicsId + bl ObjectEventSetGraphicsId bl CameraObjectReset2 adds r0, r5, 0 movs r1, 0x3 - bl FieldObjectTurn + bl ObjectEventTurn ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -8532,7 +8532,7 @@ _080875AE: bx r0 .align 2, 0 _080875B4: .4byte gPlayerAvatar -_080875B8: .4byte gMapObjects +_080875B8: .4byte gObjectEvents _080875BC: .4byte gSprites _080875C0: .4byte gSaveBlock2Ptr _080875C4: .4byte sub_8087828 @@ -8566,7 +8566,7 @@ _080875F2: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087640 @ =gMapObjects + ldr r1, _08087640 @ =gObjectEvents adds r0, r1 ldrb r0, [r0, 0x4] lsls r4, r0, 4 @@ -8598,7 +8598,7 @@ _08087630: .align 2, 0 _08087638: .4byte gSprites _0808763C: .4byte gPlayerAvatar -_08087640: .4byte gMapObjects +_08087640: .4byte gObjectEvents thumb_func_end sub_80875C8 thumb_func_start sub_8087644 @@ -8658,7 +8658,7 @@ sub_8087698: @ 8087698 lsls r5, r0, 3 adds r5, r0 lsls r5, 2 - ldr r0, _08087708 @ =gMapObjects + ldr r0, _08087708 @ =gObjectEvents adds r5, r0 ldrb r0, [r5, 0x4] lsls r4, r0, 4 @@ -8688,7 +8688,7 @@ sub_8087698: @ 8087698 bl sub_805CB70 adds r0, r5, 0 movs r1, 0x45 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] @@ -8698,7 +8698,7 @@ _080876FC: bx r0 .align 2, 0 _08087704: .4byte gPlayerAvatar -_08087708: .4byte gMapObjects +_08087708: .4byte gObjectEvents _0808770C: .4byte gSprites thumb_func_end sub_8087698 @@ -8711,9 +8711,9 @@ sub_8087710: @ 8087710 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087744 @ =gMapObjects + ldr r1, _08087744 @ =gObjectEvents adds r0, r1 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08087738 @@ -8728,7 +8728,7 @@ _08087738: bx r0 .align 2, 0 _08087740: .4byte gPlayerAvatar -_08087744: .4byte gMapObjects +_08087744: .4byte gObjectEvents thumb_func_end sub_8087710 thumb_func_start sub_8087748 @@ -8776,7 +8776,7 @@ fishE: @ 8087780 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080877F4 @ =gMapObjects + ldr r1, _080877F4 @ =gObjectEvents adds r4, r0, r1 movs r7, 0 ldrh r1, [r5, 0x26] @@ -8795,10 +8795,10 @@ _080877B4: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl EventObjectSetGraphicsId + bl ObjectEventSetGraphicsId adds r0, r4, 0 movs r1, 0x1 - bl FieldObjectTurn + bl ObjectEventTurn ldrh r0, [r5, 0x26] strb r0, [r6] movs r0, 0 @@ -8816,7 +8816,7 @@ _080877EA: bx r0 .align 2, 0 _080877F0: .4byte gPlayerAvatar -_080877F4: .4byte gMapObjects +_080877F4: .4byte gObjectEvents _080877F8: .4byte sub_8087498 thumb_func_end fishE @@ -8982,7 +8982,7 @@ sub_8087924: @ 8087924 ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080879BA @@ -8991,7 +8991,7 @@ sub_8087924: @ 8087924 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080879C8 @ =gMapObjects + ldr r0, _080879C8 @ =gObjectEvents adds r4, r0 movs r0, 0x10 ldrsh r5, [r4, r0] @@ -9055,7 +9055,7 @@ _080879BA: bx r1 .align 2, 0 _080879C4: .4byte gFieldEffectArguments -_080879C8: .4byte gMapObjects +_080879C8: .4byte gObjectEvents _080879CC: .4byte sub_80879D8 _080879D0: .4byte gTasks _080879D4: .4byte gSprites @@ -9148,7 +9148,7 @@ _08087A78: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087AB0 @ =gMapObjects + ldr r0, _08087AB0 @ =gObjectEvents adds r4, r0 ldrh r0, [r5, 0x4] strh r0, [r6, 0x20] @@ -9169,7 +9169,7 @@ _08087AA8: pop {r0} bx r0 .align 2, 0 -_08087AB0: .4byte gMapObjects +_08087AB0: .4byte gObjectEvents thumb_func_end sub_80879D8 thumb_func_start sub_8087AB4 @@ -9181,7 +9181,7 @@ sub_8087AB4: @ 8087AB4 ldrb r1, [r4, 0x4] ldrb r2, [r4, 0x8] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08087B04 @@ -9381,7 +9381,7 @@ sub_8087C2C: @ 8087C2C asrs r0, 16 cmp r0, 0x78 ble _08087C9A - ldr r2, _08087CA4 @ =gMapObjects + ldr r2, _08087CA4 @ =gObjectEvents movs r1, 0x4 ldrsh r0, [r7, r1] lsls r1, r0, 3 @@ -9427,7 +9427,7 @@ _08087C9A: pop {r0} bx r0 .align 2, 0 -_08087CA4: .4byte gMapObjects +_08087CA4: .4byte gObjectEvents _08087CA8: .4byte gSprites _08087CAC: .4byte 0x0000ffff _08087CB0: .4byte 0x00007fff @@ -9454,7 +9454,7 @@ sub_8087CB4: @ 8087CB4 ldrb r0, [r4, 0xC] ldrb r1, [r4, 0xE] ldrb r2, [r4, 0x10] - bl RemoveFieldObjectByLocalIdAndMap + bl RemoveObjectEventByLocalIdAndMap movs r0, 0x44 bl FieldEffectActiveListRemove adds r0, r5, 0 diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 7003a10f2..3f2cf04d1 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -105,7 +105,7 @@ _080DAE3C: .4byte gDummySpriteAffineAnimTable sub_80DAE40: @ 80DAE40 push {lr} ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldrh r0, [r0, 0xA] subs r0, 0x2 lsls r0, 16 @@ -127,7 +127,7 @@ npc_pal_op: @ 80DAE54 movs r0, 0 strh r0, [r4, 0x32] ldrb r0, [r5, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldrb r1, [r0, 0xC] movs r0, 0x80 ands r0, r1 @@ -176,7 +176,7 @@ npc_pal_op_B: @ 80DAEC4 lsls r1, 24 lsrs r4, r1, 24 ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r2, r0, 0 ldrh r1, [r2, 0x4] ldr r0, _080DAEF0 @ =0x000011ff @@ -222,7 +222,7 @@ npc_pal_op_A: @ 80DAF20 lsls r1, 24 lsrs r4, r1, 24 ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r2, r0, 0 ldrh r1, [r2, 0x4] ldr r0, _080DAF4C @ =0x000011ff @@ -253,7 +253,7 @@ sub_80DAF50: @ 80DAF50 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DAF98 @ =gMapObjects + ldr r1, _080DAF98 @ =gObjectEvents adds r7, r0, r1 ldrb r1, [r7, 0x4] lsls r0, r1, 4 @@ -281,7 +281,7 @@ _080DAF88: strb r0, [r2] b _080DB0AE .align 2, 0 -_080DAF98: .4byte gMapObjects +_080DAF98: .4byte gObjectEvents _080DAF9C: .4byte gSprites _080DAFA0: .4byte 0x00020001 _080DAFA4: @@ -432,7 +432,7 @@ _080DB0C0: .4byte 0xfffffc00 thumb_func_start sub_80DB0C4 sub_80DB0C4: @ 80DB0C4 push {r4,lr} - ldr r0, _080DB10C @ =gUnknown_83A0010 + ldr r0, _080DB10C @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x20] movs r1, 0 movs r2, 0 @@ -467,7 +467,7 @@ _080DB102: pop {r1} bx r1 .align 2, 0 -_080DB10C: .4byte gUnknown_83A0010 +_080DB10C: .4byte gFieldEffectObjectTemplatePointers _080DB110: .4byte gSprites thumb_func_end sub_80DB0C4 @@ -584,18 +584,18 @@ oei_shadow: @ 80DB1DC ldrb r0, [r5] ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetObjectEventIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 - ldr r2, _080DB26C @ =gMapObjects + ldr r2, _080DB26C @ =gObjectEvents lsls r1, r0, 3 adds r1, r0 lsls r1, 2 adds r1, r2 ldrb r0, [r1, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r4, r0, 0 - ldr r2, _080DB270 @ =gUnknown_83A0010 + ldr r2, _080DB270 @ =gFieldEffectObjectTemplatePointers ldr r1, _080DB274 @ =gUnknown_83FECD2 ldrb r0, [r4, 0xC] lsls r0, 26 @@ -649,8 +649,8 @@ _080DB260: bx r1 .align 2, 0 _080DB268: .4byte gFieldEffectArguments -_080DB26C: .4byte gMapObjects -_080DB270: .4byte gUnknown_83A0010 +_080DB26C: .4byte gObjectEvents +_080DB270: .4byte gFieldEffectObjectTemplatePointers _080DB274: .4byte gUnknown_83FECD2 _080DB278: .4byte gSprites _080DB27C: .4byte gUnknown_83FECD6 @@ -671,7 +671,7 @@ oamc_shadow: @ 80DB280 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _080DB2AE @@ -685,7 +685,7 @@ _080DB2AE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB33C @ =gMapObjects + ldr r1, _080DB33C @ =gObjectEvents adds r4, r0, r1 ldrb r0, [r4, 0x4] lsls r1, r0, 4 @@ -748,7 +748,7 @@ _080DB334: pop {r0} bx r0 .align 2, 0 -_080DB33C: .4byte gMapObjects +_080DB33C: .4byte gObjectEvents _080DB340: .4byte gSprites _080DB344: .4byte 0x00400001 thumb_func_end oamc_shadow @@ -770,7 +770,7 @@ oei_grass_normal: @ 80DB348 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DB3E4 @ =gUnknown_83A0010 + ldr r0, _080DB3E4 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x10] mov r1, sp movs r2, 0 @@ -830,7 +830,7 @@ _080DB3D4: bx r1 .align 2, 0 _080DB3E0: .4byte gFieldEffectArguments -_080DB3E4: .4byte gUnknown_83A0010 +_080DB3E4: .4byte gFieldEffectObjectTemplatePointers _080DB3E8: .4byte gSprites thumb_func_end oei_grass_normal @@ -895,7 +895,7 @@ _080DB438: adds r1, r4, 0 adds r2, r7, 0 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080DB48C @@ -929,7 +929,7 @@ _080DB4A0: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB4F0 @ =gMapObjects + ldr r1, _080DB4F0 @ =gObjectEvents adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -966,7 +966,7 @@ _080DB4E4: pop {r0} bx r0 .align 2, 0 -_080DB4F0: .4byte gMapObjects +_080DB4F0: .4byte gObjectEvents thumb_func_end unc_grass_normal thumb_func_start FldEff_JumpTallGrass @@ -978,7 +978,7 @@ FldEff_JumpTallGrass: @ 80DB4F4 movs r2, 0x8 movs r3, 0xC bl sub_8063BC4 - ldr r0, _080DB55C @ =gUnknown_83A0010 + ldr r0, _080DB55C @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x28] movs r2, 0 ldrsh r1, [r4, r2] @@ -1022,7 +1022,7 @@ _080DB550: bx r1 .align 2, 0 _080DB558: .4byte gFieldEffectArguments -_080DB55C: .4byte gUnknown_83A0010 +_080DB55C: .4byte gFieldEffectObjectTemplatePointers _080DB560: .4byte gSprites thumb_func_end FldEff_JumpTallGrass @@ -1120,7 +1120,7 @@ FldEff_LongGrass: @ 80DB5F4 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DB694 @ =gUnknown_83A0010 + ldr r0, _080DB694 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x3C] mov r1, sp movs r2, 0 @@ -1181,7 +1181,7 @@ _080DB684: bx r1 .align 2, 0 _080DB690: .4byte gFieldEffectArguments -_080DB694: .4byte gUnknown_83A0010 +_080DB694: .4byte gFieldEffectObjectTemplatePointers _080DB698: .4byte gSprites thumb_func_end FldEff_LongGrass @@ -1246,7 +1246,7 @@ _080DB6E8: adds r1, r7, 0 adds r2, r6, 0 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080DB73C @@ -1280,7 +1280,7 @@ _080DB750: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB794 @ =gMapObjects + ldr r1, _080DB794 @ =gObjectEvents adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -1309,7 +1309,7 @@ _080DB786: pop {r0} bx r0 .align 2, 0 -_080DB794: .4byte gMapObjects +_080DB794: .4byte gObjectEvents thumb_func_end unc_grass_tall thumb_func_start FldEff_JumpLongGrass @@ -1321,7 +1321,7 @@ FldEff_JumpLongGrass: @ 80DB798 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DB800 @ =gUnknown_83A0010 + ldr r0, _080DB800 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x40] movs r2, 0 ldrsh r1, [r4, r2] @@ -1365,7 +1365,7 @@ _080DB7F4: bx r1 .align 2, 0 _080DB7FC: .4byte gFieldEffectArguments -_080DB800: .4byte gUnknown_83A0010 +_080DB800: .4byte gFieldEffectObjectTemplatePointers _080DB804: .4byte gSprites thumb_func_end FldEff_JumpLongGrass @@ -1376,15 +1376,15 @@ sub_80DB808: @ 80DB808 ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetObjectEventIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DB8A0 @ =gMapObjects + ldr r0, _080DB8A0 @ =gObjectEvents adds r5, r1, r0 - ldr r0, _080DB8A4 @ =gUnknown_83A0010 + ldr r0, _080DB8A4 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x78] movs r1, 0 movs r2, 0 @@ -1446,8 +1446,8 @@ _080DB894: bx r1 .align 2, 0 _080DB89C: .4byte gFieldEffectArguments -_080DB8A0: .4byte gMapObjects -_080DB8A4: .4byte gUnknown_83A0010 +_080DB8A0: .4byte gObjectEvents +_080DB8A4: .4byte gFieldEffectObjectTemplatePointers _080DB8A8: .4byte gSprites thumb_func_end sub_80DB808 @@ -1468,11 +1468,11 @@ sub_80DB8AC: @ 80DB8AC lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080DB8EA - ldr r5, _080DB8F4 @ =gMapObjects + ldr r5, _080DB8F4 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1489,10 +1489,10 @@ _080DB8EA: bl FieldEffectStop b _080DB98E .align 2, 0 -_080DB8F4: .4byte gMapObjects +_080DB8F4: .4byte gObjectEvents _080DB8F8: ldrb r0, [r1, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo mov r8, r0 mov r0, sp ldrb r1, [r0] @@ -1585,7 +1585,7 @@ FldEff_SandFootprints: @ 80DB9A0 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DBA0C @ =gUnknown_83A0010 + ldr r0, _080DBA0C @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x2C] movs r2, 0 ldrsh r1, [r4, r2] @@ -1629,7 +1629,7 @@ _080DB9FE: bx r1 .align 2, 0 _080DBA08: .4byte gFieldEffectArguments -_080DBA0C: .4byte gUnknown_83A0010 +_080DBA0C: .4byte gFieldEffectObjectTemplatePointers _080DBA10: .4byte gSprites thumb_func_end FldEff_SandFootprints @@ -1642,7 +1642,7 @@ FldEff_DeepSandFootprints: @ 80DBA14 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DBA80 @ =gUnknown_83A0010 + ldr r0, _080DBA80 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x5C] movs r2, 0 ldrsh r1, [r4, r2] @@ -1687,7 +1687,7 @@ _080DBA74: bx r1 .align 2, 0 _080DBA7C: .4byte gFieldEffectArguments -_080DBA80: .4byte gUnknown_83A0010 +_080DBA80: .4byte gFieldEffectObjectTemplatePointers _080DBA84: .4byte gSprites thumb_func_end FldEff_DeepSandFootprints @@ -1700,7 +1700,7 @@ FldEff_BikeTireTracks: @ 80DBA88 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DBAF4 @ =gUnknown_83A0010 + ldr r0, _080DBAF4 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x6C] movs r2, 0 ldrsh r1, [r4, r2] @@ -1745,7 +1745,7 @@ _080DBAE8: bx r1 .align 2, 0 _080DBAF0: .4byte gFieldEffectArguments -_080DBAF4: .4byte gUnknown_83A0010 +_080DBAF4: .4byte gFieldEffectObjectTemplatePointers _080DBAF8: .4byte gSprites thumb_func_end FldEff_BikeTireTracks @@ -1833,15 +1833,15 @@ FldEff_Splash: @ 80DBB88 ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetObjectEventIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBC20 @ =gMapObjects + ldr r0, _080DBC20 @ =gObjectEvents adds r5, r1, r0 - ldr r0, _080DBC24 @ =gUnknown_83A0010 + ldr r0, _080DBC24 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x34] movs r1, 0 movs r2, 0 @@ -1852,7 +1852,7 @@ FldEff_Splash: @ 80DBB88 cmp r4, 0x40 beq _080DBC12 ldrb r0, [r5, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo lsls r3, r4, 4 adds r3, r4 lsls r3, 2 @@ -1900,8 +1900,8 @@ _080DBC12: bx r1 .align 2, 0 _080DBC1C: .4byte gFieldEffectArguments -_080DBC20: .4byte gMapObjects -_080DBC24: .4byte gUnknown_83A0010 +_080DBC20: .4byte gObjectEvents +_080DBC24: .4byte gFieldEffectObjectTemplatePointers _080DBC28: .4byte gSprites thumb_func_end FldEff_Splash @@ -1926,7 +1926,7 @@ sub_80DBC2C: @ 80DBC2C lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _080DBC66 @@ -1937,7 +1937,7 @@ _080DBC5C: b _080DBCA6 _080DBC66: ldr r3, _080DBCB0 @ =gSprites - ldr r2, _080DBCB4 @ =gMapObjects + ldr r2, _080DBCB4 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1974,7 +1974,7 @@ _080DBCA6: bx r0 .align 2, 0 _080DBCB0: .4byte gSprites -_080DBCB4: .4byte gMapObjects +_080DBCB4: .4byte gObjectEvents thumb_func_end sub_80DBC2C thumb_func_start FldEff_JumpSmallSplash @@ -1986,7 +1986,7 @@ FldEff_JumpSmallSplash: @ 80DBCB8 movs r2, 0x8 movs r3, 0xC bl sub_8063BC4 - ldr r0, _080DBD20 @ =gUnknown_83A0010 + ldr r0, _080DBD20 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x38] movs r2, 0 ldrsh r1, [r4, r2] @@ -2030,7 +2030,7 @@ _080DBD14: bx r1 .align 2, 0 _080DBD1C: .4byte gFieldEffectArguments -_080DBD20: .4byte gUnknown_83A0010 +_080DBD20: .4byte gFieldEffectObjectTemplatePointers _080DBD24: .4byte gSprites thumb_func_end FldEff_JumpSmallSplash @@ -2043,7 +2043,7 @@ oei_water_drop_tall: @ 80DBD28 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DBD90 @ =gUnknown_83A0010 + ldr r0, _080DBD90 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x30] movs r2, 0 ldrsh r1, [r4, r2] @@ -2087,7 +2087,7 @@ _080DBD84: bx r1 .align 2, 0 _080DBD8C: .4byte gFieldEffectArguments -_080DBD90: .4byte gUnknown_83A0010 +_080DBD90: .4byte gFieldEffectObjectTemplatePointers _080DBD94: .4byte gSprites thumb_func_end oei_water_drop_tall @@ -2098,15 +2098,15 @@ FldEff_FeetInFlowingWater: @ 80DBD98 ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetObjectEventIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBE3C @ =gMapObjects + ldr r0, _080DBE3C @ =gObjectEvents adds r6, r1, r0 - ldr r0, _080DBE40 @ =gUnknown_83A0010 + ldr r0, _080DBE40 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x34] movs r1, 0 movs r2, 0 @@ -2117,7 +2117,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98 cmp r5, 0x40 beq _080DBE2E ldrb r0, [r6, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r4, r0, 0 lsls r0, r5, 4 adds r0, r5 @@ -2171,8 +2171,8 @@ _080DBE2E: bx r1 .align 2, 0 _080DBE38: .4byte gFieldEffectArguments -_080DBE3C: .4byte gMapObjects -_080DBE40: .4byte gUnknown_83A0010 +_080DBE3C: .4byte gObjectEvents +_080DBE40: .4byte gFieldEffectObjectTemplatePointers _080DBE44: .4byte gSprites _080DBE48: .4byte sub_80DBE50 _080DBE4C: .4byte 0x0000ffff @@ -2193,11 +2193,11 @@ sub_80DBE50: @ 80DBE50 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080DBE8A - ldr r2, _080DBE94 @ =gMapObjects + ldr r2, _080DBE94 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2214,7 +2214,7 @@ _080DBE8A: bl FieldEffectStop b _080DBEE2 .align 2, 0 -_080DBE94: .4byte gMapObjects +_080DBE94: .4byte gObjectEvents _080DBE98: ldrb r1, [r5, 0x4] lsls r0, r1, 4 @@ -2263,7 +2263,7 @@ _080DBEEC: .4byte gSprites thumb_func_start oei_ripples oei_ripples: @ 80DBEF0 push {r4,lr} - ldr r0, _080DBF44 @ =gUnknown_83A0010 + ldr r0, _080DBF44 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x14] ldr r4, _080DBF48 @ =gFieldEffectArguments movs r2, 0 @@ -2305,7 +2305,7 @@ _080DBF3C: pop {r1} bx r1 .align 2, 0 -_080DBF44: .4byte gUnknown_83A0010 +_080DBF44: .4byte gFieldEffectObjectTemplatePointers _080DBF48: .4byte gFieldEffectArguments _080DBF4C: .4byte gSprites thumb_func_end oei_ripples @@ -2317,15 +2317,15 @@ sub_80DBF50: @ 80DBF50 ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetObjectEventIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBFE8 @ =gMapObjects + ldr r0, _080DBFE8 @ =gObjectEvents adds r5, r1, r0 - ldr r0, _080DBFEC @ =gUnknown_83A0010 + ldr r0, _080DBFEC @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x7C] movs r1, 0 movs r2, 0 @@ -2387,8 +2387,8 @@ _080DBFDC: bx r1 .align 2, 0 _080DBFE4: .4byte gFieldEffectArguments -_080DBFE8: .4byte gMapObjects -_080DBFEC: .4byte gUnknown_83A0010 +_080DBFE8: .4byte gObjectEvents +_080DBFEC: .4byte gFieldEffectObjectTemplatePointers _080DBFF0: .4byte gSprites thumb_func_end sub_80DBF50 @@ -2407,11 +2407,11 @@ sub_80DBFF4: @ 80DBFF4 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080DC02E - ldr r5, _080DC038 @ =gMapObjects + ldr r5, _080DC038 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2428,10 +2428,10 @@ _080DC02E: bl FieldEffectStop b _080DC080 .align 2, 0 -_080DC038: .4byte gMapObjects +_080DC038: .4byte gObjectEvents _080DC03C: ldrb r0, [r1, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo mov r1, sp ldrb r2, [r1] lsls r1, r2, 3 @@ -2480,7 +2480,7 @@ FldEff_Unknown19: @ 80DC08C movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DC0F0 @ =gUnknown_83A0010 + ldr r0, _080DC0F0 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x44] movs r2, 0 ldrsh r1, [r4, r2] @@ -2522,7 +2522,7 @@ _080DC0E4: bx r1 .align 2, 0 _080DC0EC: .4byte gFieldEffectArguments -_080DC0F0: .4byte gUnknown_83A0010 +_080DC0F0: .4byte gFieldEffectObjectTemplatePointers _080DC0F4: .4byte gSprites thumb_func_end FldEff_Unknown19 @@ -2535,7 +2535,7 @@ FldEff_Unknown20: @ 80DC0F8 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DC15C @ =gUnknown_83A0010 + ldr r0, _080DC15C @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x48] movs r2, 0 ldrsh r1, [r4, r2] @@ -2577,7 +2577,7 @@ _080DC150: bx r1 .align 2, 0 _080DC158: .4byte gFieldEffectArguments -_080DC15C: .4byte gUnknown_83A0010 +_080DC15C: .4byte gFieldEffectObjectTemplatePointers _080DC160: .4byte gSprites thumb_func_end FldEff_Unknown20 @@ -2590,7 +2590,7 @@ FldEff_Unknown21: @ 80DC164 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DC1C8 @ =gUnknown_83A0010 + ldr r0, _080DC1C8 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x4C] movs r2, 0 ldrsh r1, [r4, r2] @@ -2632,7 +2632,7 @@ _080DC1BC: bx r1 .align 2, 0 _080DC1C4: .4byte gFieldEffectArguments -_080DC1C8: .4byte gUnknown_83A0010 +_080DC1C8: .4byte gFieldEffectObjectTemplatePointers _080DC1CC: .4byte gSprites thumb_func_end FldEff_Unknown21 @@ -2645,7 +2645,7 @@ FldEff_Unknown22: @ 80DC1D0 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DC234 @ =gUnknown_83A0010 + ldr r0, _080DC234 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x50] movs r2, 0 ldrsh r1, [r4, r2] @@ -2687,7 +2687,7 @@ _080DC228: bx r1 .align 2, 0 _080DC230: .4byte gFieldEffectArguments -_080DC234: .4byte gUnknown_83A0010 +_080DC234: .4byte gFieldEffectObjectTemplatePointers _080DC238: .4byte gSprites thumb_func_end FldEff_Unknown22 @@ -2737,7 +2737,7 @@ oei_ash: @ 80DC270 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DC2F4 @ =gUnknown_83A0010 + ldr r0, _080DC2F4 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x18] mov r1, sp movs r2, 0 @@ -2787,7 +2787,7 @@ _080DC2E6: bx r1 .align 2, 0 _080DC2F0: .4byte gFieldEffectArguments -_080DC2F4: .4byte gUnknown_83A0010 +_080DC2F4: .4byte gFieldEffectObjectTemplatePointers _080DC2F8: .4byte gSprites thumb_func_end oei_ash @@ -2863,7 +2863,7 @@ sub_80DC348: @ 80DC348 movs r2, 0x32 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt - ldr r2, _080DC3A0 @ =gMapObjects + ldr r2, _080DC3A0 @ =gObjectEvents ldr r0, _080DC3A4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2880,7 +2880,7 @@ sub_80DC348: @ 80DC348 pop {r0} bx r0 .align 2, 0 -_080DC3A0: .4byte gMapObjects +_080DC3A0: .4byte gObjectEvents _080DC3A4: .4byte gPlayerAvatar thumb_func_end sub_80DC348 @@ -2915,7 +2915,7 @@ sub_80DC3D0: @ 80DC3D0 movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DC440 @ =gUnknown_83A0010 + ldr r0, _080DC440 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x1C] movs r2, 0 ldrsh r1, [r4, r2] @@ -2961,7 +2961,7 @@ _080DC42C: bx r1 .align 2, 0 _080DC43C: .4byte gFieldEffectArguments -_080DC440: .4byte gUnknown_83A0010 +_080DC440: .4byte gFieldEffectObjectTemplatePointers _080DC444: .4byte gSprites _080DC448: .4byte 0x0000ffff thumb_func_end sub_80DC3D0 @@ -3081,7 +3081,7 @@ sub_80DC4F8: @ 80DC4F8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080DC548 @ =gMapObjects + ldr r0, _080DC548 @ =gObjectEvents adds r4, r0 ldrb r0, [r4, 0x4] lsls r5, r0, 4 @@ -3112,7 +3112,7 @@ sub_80DC4F8: @ 80DC4F8 pop {r0} bx r0 .align 2, 0 -_080DC548: .4byte gMapObjects +_080DC548: .4byte gObjectEvents _080DC54C: .4byte gSprites thumb_func_end sub_80DC4F8 @@ -3393,7 +3393,7 @@ FldEff_Dust: @ 80DC740 movs r2, 0x8 movs r3, 0xC bl sub_8063BC4 - ldr r0, _080DC7A8 @ =gUnknown_83A0010 + ldr r0, _080DC7A8 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x24] movs r2, 0 ldrsh r1, [r4, r2] @@ -3437,7 +3437,7 @@ _080DC79C: bx r1 .align 2, 0 _080DC7A4: .4byte gFieldEffectArguments -_080DC7A8: .4byte gUnknown_83A0010 +_080DC7A8: .4byte gFieldEffectObjectTemplatePointers _080DC7AC: .4byte gSprites thumb_func_end FldEff_Dust @@ -3448,15 +3448,15 @@ FldEff_SandPile: @ 80DC7B0 ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetObjectEventIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DC860 @ =gMapObjects + ldr r0, _080DC860 @ =gObjectEvents adds r6, r1, r0 - ldr r0, _080DC864 @ =gUnknown_83A0010 + ldr r0, _080DC864 @ =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x74] movs r1, 0 movs r2, 0 @@ -3467,7 +3467,7 @@ FldEff_SandPile: @ 80DC7B0 cmp r4, 0x40 beq _080DC854 ldrb r0, [r6, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo adds r5, r0, 0 lsls r0, r4, 4 adds r0, r4 @@ -3528,8 +3528,8 @@ _080DC854: bx r1 .align 2, 0 _080DC85C: .4byte gFieldEffectArguments -_080DC860: .4byte gMapObjects -_080DC864: .4byte gUnknown_83A0010 +_080DC860: .4byte gObjectEvents +_080DC864: .4byte gFieldEffectObjectTemplatePointers _080DC868: .4byte gSprites thumb_func_end FldEff_SandPile @@ -3548,11 +3548,11 @@ sub_80DC86C: @ 80DC86C lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080DC8A6 - ldr r2, _080DC8B0 @ =gMapObjects + ldr r2, _080DC8B0 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3569,7 +3569,7 @@ _080DC8A6: bl FieldEffectStop b _080DC926 .align 2, 0 -_080DC8B0: .4byte gMapObjects +_080DC8B0: .4byte gObjectEvents _080DC8B4: ldr r2, _080DC930 @ =gSprites ldrb r1, [r1, 0x4] @@ -3608,7 +3608,7 @@ _080DC8F6: strh r6, [r4, 0x20] strh r5, [r4, 0x22] ldr r3, _080DC930 @ =gSprites - ldr r2, _080DC934 @ =gMapObjects + ldr r2, _080DC934 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3635,7 +3635,7 @@ _080DC926: bx r0 .align 2, 0 _080DC930: .4byte gSprites -_080DC934: .4byte gMapObjects +_080DC934: .4byte gObjectEvents thumb_func_end sub_80DC86C thumb_func_start FldEff_Bubbles @@ -3647,7 +3647,7 @@ FldEff_Bubbles: @ 80DC938 movs r2, 0x8 movs r3, 0 bl sub_8063BC4 - ldr r0, _080DC994 @ =gUnknown_83A0010 + ldr r0, _080DC994 @ =gFieldEffectObjectTemplatePointers adds r0, 0x88 ldr r0, [r0] movs r2, 0 @@ -3685,7 +3685,7 @@ _080DC988: bx r1 .align 2, 0 _080DC990: .4byte gFieldEffectArguments -_080DC994: .4byte gUnknown_83A0010 +_080DC994: .4byte gFieldEffectObjectTemplatePointers _080DC998: .4byte gSprites thumb_func_end FldEff_Bubbles @@ -3780,7 +3780,7 @@ ShowDisguiseFieldEffect: @ 80DCA10 ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _080DCA48 @@ -3791,7 +3791,7 @@ ShowDisguiseFieldEffect: @ 80DCA10 .align 2, 0 _080DCA44: .4byte gFieldEffectArguments _080DCA48: - ldr r1, _080DCAC0 @ =gUnknown_83A0010 + ldr r1, _080DCAC0 @ =gFieldEffectObjectTemplatePointers lsls r0, r6, 2 adds r0, r1 ldr r0, [r0] @@ -3853,7 +3853,7 @@ _080DCAB4: pop {r1} bx r1 .align 2, 0 -_080DCAC0: .4byte gUnknown_83A0010 +_080DCAC0: .4byte gFieldEffectObjectTemplatePointers _080DCAC4: .4byte gSprites thumb_func_end ShowDisguiseFieldEffect @@ -3872,7 +3872,7 @@ sub_80DCAC8: @ 80DCAC8 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _080DCAF8 @@ -3882,7 +3882,7 @@ sub_80DCAC8: @ 80DCAC8 adds r0, r5, 0 bl FieldEffectStop _080DCAF8: - ldr r4, _080DCBB0 @ =gMapObjects + ldr r4, _080DCBB0 @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3890,7 +3890,7 @@ _080DCAF8: lsls r0, 2 adds r0, r4 ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo mov r1, sp ldrb r2, [r1] lsls r1, r2, 3 @@ -3975,7 +3975,7 @@ _080DCBA8: pop {r0} bx r0 .align 2, 0 -_080DCBB0: .4byte gMapObjects +_080DCBB0: .4byte gObjectEvents _080DCBB4: .4byte gSprites thumb_func_end sub_80DCAC8 @@ -4055,7 +4055,7 @@ FldEff_Sparkle: @ 80DCC1C movs r2, 0x8 movs r3, 0x8 bl sub_8063BC4 - ldr r0, _080DCC88 @ =gUnknown_83A0010 + ldr r0, _080DCC88 @ =gFieldEffectObjectTemplatePointers adds r0, 0x8C ldr r0, [r0] movs r2, 0 @@ -4095,7 +4095,7 @@ _080DCC7C: bx r1 .align 2, 0 _080DCC84: .4byte gFieldEffectArguments -_080DCC88: .4byte gUnknown_83A0010 +_080DCC88: .4byte gFieldEffectObjectTemplatePointers _080DCC8C: .4byte gSprites thumb_func_end FldEff_Sparkle @@ -4217,14 +4217,14 @@ _080DCD5E: lsls r0, r7, 3 adds r0, r7 lsls r0, 2 - ldr r1, _080DCDF8 @ =gMapObjects + ldr r1, _080DCDF8 @ =gObjectEvents adds r4, r0, r1 ldrb r0, [r4] lsls r0, 31 cmp r0, 0 beq _080DCE00 ldrb r0, [r4, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4291,7 +4291,7 @@ _080DCDD8: strb r0, [r2] b _080DCE0A .align 2, 0 -_080DCDF8: .4byte gMapObjects +_080DCDF8: .4byte gObjectEvents _080DCDFC: .4byte gSprites _080DCE00: adds r0, r7, 0x1 diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index b5ec3a622..b9f0c842d 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -10,7 +10,7 @@ GetAllGroundEffectFlags_OnSpawn: @ 8067B34 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - bl FieldObjectUpdateMetatileBehaviors + bl ObjectEventUpdateMetatileBehaviors adds r0, r4, 0 adds r1, r5, 0 bl GetGroundEffectFlags_Reflection @@ -42,7 +42,7 @@ GetAllGroundEffectFlags_OnBeginStep: @ 8067B7C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - bl FieldObjectUpdateMetatileBehaviors + bl ObjectEventUpdateMetatileBehaviors adds r0, r4, 0 adds r1, r5, 0 bl GetGroundEffectFlags_Reflection @@ -80,7 +80,7 @@ GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - bl FieldObjectUpdateMetatileBehaviors + bl ObjectEventUpdateMetatileBehaviors adds r0, r4, 0 adds r1, r5, 0 bl GetGroundEffectFlags_ShallowFlowingWater @@ -110,8 +110,8 @@ GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4 bx r0 thumb_func_end GetAllGroundEffectFlags_OnFinishStep - thumb_func_start FieldObjectUpdateMetatileBehaviors -FieldObjectUpdateMetatileBehaviors: @ 8067C24 + thumb_func_start ObjectEventUpdateMetatileBehaviors +ObjectEventUpdateMetatileBehaviors: @ 8067C24 push {r4,lr} adds r4, r0, 0 movs r1, 0x14 @@ -129,7 +129,7 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24 pop {r4} pop {r0} bx r0 - thumb_func_end FieldObjectUpdateMetatileBehaviors + thumb_func_end ObjectEventUpdateMetatileBehaviors thumb_func_start GetGroundEffectFlags_Reflection GetGroundEffectFlags_Reflection: @ 8067C4C @@ -602,7 +602,7 @@ sub_8067F88: @ 8067F88 push {r5-r7} adds r5, r0, 0 ldrb r0, [r5, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo movs r4, 0 movs r0, 0x1 mov r10, r0 @@ -828,8 +828,8 @@ _0806814E: bx r1 thumb_func_end GetLedgeJumpDirection - thumb_func_start FieldObjectSetSpriteOamTableForLongGrass -FieldObjectSetSpriteOamTableForLongGrass: @ 8068154 + thumb_func_start ObjectEventSetSpriteOamTableForLongGrass +ObjectEventSetSpriteOamTableForLongGrass: @ 8068154 push {r4-r6,lr} adds r5, r0, 0 adds r4, r1, 0 @@ -873,7 +873,7 @@ _080681A8: pop {r4-r6} pop {r0} bx r0 - thumb_func_end FieldObjectSetSpriteOamTableForLongGrass + thumb_func_end ObjectEventSetSpriteOamTableForLongGrass thumb_func_start IsZCoordMismatchAt IsZCoordMismatchAt: @ 80681B0 @@ -910,8 +910,8 @@ _080681E4: bx r1 thumb_func_end IsZCoordMismatchAt - thumb_func_start FieldObjectUpdateZCoordAndPriority -FieldObjectUpdateZCoordAndPriority: @ 80681EC + thumb_func_start ObjectEventUpdateZCoordAndPriority +ObjectEventUpdateZCoordAndPriority: @ 80681EC push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -920,7 +920,7 @@ FieldObjectUpdateZCoordAndPriority: @ 80681EC cmp r0, 0 blt _0806823A adds r0, r4, 0 - bl FieldObjectUpdateZCoord + bl ObjectEventUpdateZCoord ldr r1, _08068240 @ =gUnknown_83A708C ldrb r2, [r4, 0xB] lsls r2, 24 @@ -957,7 +957,7 @@ _0806823A: .align 2, 0 _08068240: .4byte gUnknown_83A708C _08068244: .4byte gUnknown_83A707C - thumb_func_end FieldObjectUpdateZCoordAndPriority + thumb_func_end ObjectEventUpdateZCoordAndPriority thumb_func_start InitObjectPriorityByZCoord InitObjectPriorityByZCoord: @ 8068248 @@ -1012,8 +1012,8 @@ ZCoordToPriority: @ 8068294 _080682A0: .4byte gUnknown_83A707C thumb_func_end ZCoordToPriority - thumb_func_start FieldObjectUpdateZCoord -FieldObjectUpdateZCoord: @ 80682A4 + thumb_func_start ObjectEventUpdateZCoord +ObjectEventUpdateZCoord: @ 80682A4 push {r4,r5,lr} adds r4, r0, 0 movs r1, 0x10 @@ -1055,7 +1055,7 @@ _080682F2: pop {r4,r5} pop {r0} bx r0 - thumb_func_end FieldObjectUpdateZCoord + thumb_func_end ObjectEventUpdateZCoord thumb_func_start SetObjectSubpriorityByZCoord SetObjectSubpriorityByZCoord: @ 80682F8 @@ -1096,8 +1096,8 @@ _08068338: .4byte gSpriteCoordOffsetY _0806833C: .4byte gUnknown_83A706C thumb_func_end SetObjectSubpriorityByZCoord - thumb_func_start FieldObjectUpdateSubpriority -FieldObjectUpdateSubpriority: @ 8068340 + thumb_func_start ObjectEventUpdateSubpriority +ObjectEventUpdateSubpriority: @ 8068340 push {lr} adds r2, r0, 0 ldrb r0, [r2, 0x3] @@ -1111,7 +1111,7 @@ FieldObjectUpdateSubpriority: @ 8068340 _08068356: pop {r0} bx r0 - thumb_func_end FieldObjectUpdateSubpriority + thumb_func_end ObjectEventUpdateSubpriority thumb_func_start AreZCoordsCompatible AreZCoordsCompatible: @ 806835C @@ -1330,7 +1330,7 @@ GroundEffect_SandTracks: @ 80684D4 adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldr r1, _080684FC @ =gUnknown_83A709C ldrb r0, [r0, 0xD] lsls r0, 2 @@ -1353,7 +1353,7 @@ GroundEffect_DeepSandTracks: @ 8068500 adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetObjectEventGraphicsInfo ldr r1, _08068528 @ =gUnknown_83A709C ldrb r0, [r0, 0xD] lsls r0, 2 @@ -1781,13 +1781,13 @@ DoGroundEffects_OnSpawn: @ 80687F0 movs r0, 0 str r0, [sp] adds r0, r4, 0 - bl FieldObjectUpdateZCoordAndPriority + bl ObjectEventUpdateZCoordAndPriority adds r0, r4, 0 mov r1, sp bl GetAllGroundEffectFlags_OnSpawn adds r0, r4, 0 adds r1, r5, 0 - bl FieldObjectSetSpriteOamTableForLongGrass + bl ObjectEventSetSpriteOamTableForLongGrass ldr r2, [sp] adds r0, r4, 0 adds r1, r5, 0 @@ -1820,13 +1820,13 @@ DoGroundEffects_OnBeginStep: @ 806883C movs r0, 0 str r0, [sp] adds r0, r4, 0 - bl FieldObjectUpdateZCoordAndPriority + bl ObjectEventUpdateZCoordAndPriority adds r0, r4, 0 mov r1, sp bl GetAllGroundEffectFlags_OnBeginStep adds r0, r4, 0 adds r1, r5, 0 - bl FieldObjectSetSpriteOamTableForLongGrass + bl ObjectEventSetSpriteOamTableForLongGrass adds r0, r4, 0 mov r1, sp bl filters_out_some_ground_effects @@ -1862,13 +1862,13 @@ DoGroundEffects_OnFinishStep: @ 8068890 movs r0, 0 str r0, [sp] adds r0, r4, 0 - bl FieldObjectUpdateZCoordAndPriority + bl ObjectEventUpdateZCoordAndPriority adds r0, r4, 0 mov r1, sp bl GetAllGroundEffectFlags_OnFinishStep adds r0, r4, 0 adds r1, r5, 0 - bl FieldObjectSetSpriteOamTableForLongGrass + bl ObjectEventSetSpriteOamTableForLongGrass adds r0, r4, 0 mov r1, sp bl FilterOutStepOnPuddleGroundEffectIfJumping diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index f6b50bdc6..e4b28d6c6 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -14,14 +14,14 @@ sub_805B3B8: @ 805B3B8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805B3D4 @ =gMapObjects + ldr r2, _0805B3D4 @ =gObjectEvents adds r0, r2 ldr r2, _0805B3D8 @ =sub_805B3DC - bl FieldObjectStep + bl ObjectEventStep pop {r0} bx r0 .align 2, 0 -_0805B3D4: .4byte gMapObjects +_0805B3D4: .4byte gObjectEvents _0805B3D8: .4byte sub_805B3DC thumb_func_end sub_805B3B8 @@ -48,7 +48,7 @@ sub_805B3E0: @ 805B3E0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B458 @ =gMapObjects + ldr r1, _0805B458 @ =gObjectEvents adds r5, r0, r1 adds r0, r5, 0 bl sub_805CC40 @@ -85,7 +85,7 @@ _0805B448: bx r0 .align 2, 0 _0805B454: .4byte gPlayerAvatar -_0805B458: .4byte gMapObjects +_0805B458: .4byte gObjectEvents thumb_func_end sub_805B3E0 thumb_func_start sub_805B45C @@ -94,17 +94,17 @@ sub_805B45C: @ 805B45C adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0805B4A6 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 bne _0805B4A6 adds r0, r4, 0 - bl FieldObjectGetSpecialAnim + bl ObjectEventGetSpecialAnim lsls r0, 24 movs r1, 0xDF lsls r1, 24 @@ -119,7 +119,7 @@ sub_805B45C: @ 805B45C cmp r0, r5 beq _0805B4A2 adds r0, r4, 0 - bl FieldObjectClearAnim + bl ObjectEventClearAnim b _0805B4A6 _0805B4A2: movs r0, 0x1 @@ -222,7 +222,7 @@ sub_805B528: @ 805B528 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B594 @ =gMapObjects + ldr r1, _0805B594 @ =gObjectEvents adds r1, r0, r1 str r1, [r4] ldrb r0, [r1] @@ -245,7 +245,7 @@ sub_805B528: @ 805B528 strh r0, [r5, 0x1C] _0805B57A: ldr r0, [r4] - bl FieldObjectClearAnim + bl ObjectEventClearAnim ldrb r0, [r5, 0x1C] bl sub_805C2CC _0805B586: @@ -254,7 +254,7 @@ _0805B586: .align 2, 0 _0805B58C: .4byte gPlayerAvatar _0805B590: .4byte gUnknown_2036E30 -_0805B594: .4byte gMapObjects +_0805B594: .4byte gObjectEvents _0805B598: movs r0, 0 _0805B59A: @@ -273,7 +273,7 @@ sub_805B5A0: @ 805B5A0 ands r0, r1 cmp r0, 0 bne _0805B610 - ldr r2, _0805B5F8 @ =gMapObjects + ldr r2, _0805B5F8 @ =gObjectEvents ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -308,7 +308,7 @@ _0805B5CC: b _0805B628 .align 2, 0 _0805B5F4: .4byte gPlayerAvatar -_0805B5F8: .4byte gMapObjects +_0805B5F8: .4byte gObjectEvents _0805B5FC: .4byte gUnknown_835B764 _0805B600: ldr r0, _0805B60C @ =gPlayerAvatar @@ -362,7 +362,7 @@ ForcedMovement_None: @ 805B644 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B68C @ =gMapObjects + ldr r1, _0805B68C @ =gObjectEvents adds r0, r1 ldrb r2, [r0, 0x1] movs r1, 0x3 @@ -374,7 +374,7 @@ ForcedMovement_None: @ 805B644 ldrb r1, [r0, 0x18] lsls r1, 28 lsrs r1, 28 - bl FieldObjectSetDirection + bl ObjectEventSetDirection ldrb r1, [r4] movs r0, 0xBF ands r0, r1 @@ -386,7 +386,7 @@ _0805B67E: bx r1 .align 2, 0 _0805B688: .4byte gPlayerAvatar -_0805B68C: .4byte gMapObjects +_0805B68C: .4byte gObjectEvents thumb_func_end ForcedMovement_None thumb_func_start DoForcedMovement @@ -461,7 +461,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805B738 @ =gMapObjects + ldr r2, _0805B738 @ =gObjectEvents adds r0, r2 ldrb r2, [r0, 0x1] movs r3, 0x4 @@ -476,7 +476,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 bx r1 .align 2, 0 _0805B734: .4byte gPlayerAvatar -_0805B738: .4byte gMapObjects +_0805B738: .4byte gObjectEvents thumb_func_end DoForcedMovementInCurrentDirection thumb_func_start ForcedMovement_Slip @@ -683,7 +683,7 @@ ForcedMovement_Slide: @ 805B88C lsls r2, r3, 3 adds r2, r3 lsls r2, 2 - ldr r3, _0805B8C0 @ =gMapObjects + ldr r3, _0805B8C0 @ =gObjectEvents adds r2, r3 ldrb r3, [r2, 0x1] movs r4, 0x4 @@ -699,7 +699,7 @@ ForcedMovement_Slide: @ 805B88C bx r1 .align 2, 0 _0805B8BC: .4byte gPlayerAvatar -_0805B8C0: .4byte gMapObjects +_0805B8C0: .4byte gObjectEvents thumb_func_end ForcedMovement_Slide thumb_func_start ForcedMovement_SlideSouth @@ -919,7 +919,7 @@ _0805BA30: lsls r0, 24 cmp r0, 0 beq _0805BA8C - ldr r2, _0805BA70 @ =gMapObjects + ldr r2, _0805BA70 @ =gObjectEvents ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -938,7 +938,7 @@ _0805BA30: b _0805BA7A .align 2, 0 _0805BA6C: .4byte 0x0000082f -_0805BA70: .4byte gMapObjects +_0805BA70: .4byte gObjectEvents _0805BA74: adds r0, r4, 0 bl sub_805C17C @@ -979,7 +979,7 @@ sub_805BAAC: @ 805BAAC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BAE8 @ =gMapObjects + ldr r1, _0805BAE8 @ =gObjectEvents adds r0, r1 ldrh r2, [r0, 0x10] mov r1, sp @@ -1000,7 +1000,7 @@ sub_805BAAC: @ 805BAAC b _0805BB00 .align 2, 0 _0805BAE4: .4byte gPlayerAvatar -_0805BAE8: .4byte gMapObjects +_0805BAE8: .4byte gObjectEvents _0805BAEC: movs r0, 0x1 mov r1, sp @@ -1039,7 +1039,7 @@ sub_805BB1C: @ 805BB1C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BB98 @ =gMapObjects + ldr r1, _0805BB98 @ =gObjectEvents adds r5, r0, r1 ldrh r1, [r5, 0x10] add r0, sp, 0x4 @@ -1086,7 +1086,7 @@ sub_805BB1C: @ 805BB1C b _0805BB9E .align 2, 0 _0805BB94: .4byte gPlayerAvatar -_0805BB98: .4byte gMapObjects +_0805BB98: .4byte gObjectEvents _0805BB9C: movs r0, 0x8 _0805BB9E: @@ -1218,7 +1218,7 @@ sub_805BC60: @ 805BC60 lsrs r0, r5, 16 lsrs r1, r4, 16 movs r2, 0x3 - bl GetFieldObjectIdByXYZ + bl GetObjectEventIdByXYZ lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 @@ -1286,12 +1286,12 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl GetFieldObjectIdByXY + bl GetObjectEventIdByXY lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x10 beq _0805BDA0 - ldr r0, _0805BD9C @ =gMapObjects + ldr r0, _0805BD9C @ =gObjectEvents lsls r1, r6, 3 adds r1, r6 lsls r1, 2 @@ -1347,7 +1347,7 @@ _0805BD8A: b _0805BDA2 .align 2, 0 _0805BD98: .4byte 0x00000805 -_0805BD9C: .4byte gMapObjects +_0805BD9C: .4byte gObjectEvents _0805BDA0: movs r0, 0 _0805BDA2: @@ -1431,7 +1431,7 @@ _0805BE14: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BE58 @ =gMapObjects + ldr r1, _0805BE58 @ =gObjectEvents adds r0, r1 ldr r1, [r2] bl _call_via_r1 @@ -1452,7 +1452,7 @@ _0805BE48: .align 2, 0 _0805BE50: .4byte gPlayerAvatar _0805BE54: .4byte gUnknown_835B844 -_0805BE58: .4byte gMapObjects +_0805BE58: .4byte gObjectEvents thumb_func_end DoPlayerAvatarTransition thumb_func_start nullsub_22 @@ -1552,7 +1552,7 @@ _0805BEF6: thumb_func_start player_is_anim_in_certain_ranges player_is_anim_in_certain_ranges: @ 805BEFC push {lr} - ldr r2, _0805BF48 @ =gMapObjects + ldr r2, _0805BF48 @ =gObjectEvents ldr r0, _0805BF4C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -1590,7 +1590,7 @@ _0805BF42: movs r0, 0x1 b _0805BF52 .align 2, 0 -_0805BF48: .4byte gMapObjects +_0805BF48: .4byte gObjectEvents _0805BF4C: .4byte gPlayerAvatar _0805BF50: movs r0, 0 @@ -1629,16 +1629,16 @@ PlayerIsAnimActive: @ 805BF7C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BF9C @ =gMapObjects + ldr r1, _0805BF9C @ =gObjectEvents adds r0, r1 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 _0805BF98: .4byte gPlayerAvatar -_0805BF9C: .4byte gMapObjects +_0805BF9C: .4byte gObjectEvents thumb_func_end PlayerIsAnimActive thumb_func_start PlayerCheckIfAnimFinishedOrInactive @@ -1649,21 +1649,21 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BFC0 @ =gMapObjects + ldr r1, _0805BFC0 @ =gObjectEvents adds r0, r1 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 _0805BFBC: .4byte gPlayerAvatar -_0805BFC0: .4byte gMapObjects +_0805BFC0: .4byte gObjectEvents thumb_func_end PlayerCheckIfAnimFinishedOrInactive thumb_func_start player_set_x22 player_set_x22: @ 805BFC4 - ldr r3, _0805BFD8 @ =gMapObjects + ldr r3, _0805BFD8 @ =gObjectEvents ldr r1, _0805BFDC @ =gPlayerAvatar ldrb r2, [r1, 0x5] lsls r1, r2, 3 @@ -1674,13 +1674,13 @@ player_set_x22: @ 805BFC4 strb r0, [r1] bx lr .align 2, 0 -_0805BFD8: .4byte gMapObjects +_0805BFD8: .4byte gObjectEvents _0805BFDC: .4byte gPlayerAvatar thumb_func_end player_set_x22 thumb_func_start player_get_x22 player_get_x22: @ 805BFE0 - ldr r2, _0805BFF4 @ =gMapObjects + ldr r2, _0805BFF4 @ =gObjectEvents ldr r0, _0805BFF8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -1691,7 +1691,7 @@ player_get_x22: @ 805BFE0 ldrb r0, [r0] bx lr .align 2, 0 -_0805BFF4: .4byte gMapObjects +_0805BFF4: .4byte gObjectEvents _0805BFF8: .4byte gPlayerAvatar thumb_func_end player_get_x22 @@ -1706,14 +1706,14 @@ sub_805BFFC: @ 805BFFC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805C020 @ =gMapObjects + ldr r2, _0805C020 @ =gObjectEvents adds r0, r2 - bl FieldObjectForceSetSpecialAnim + bl ObjectEventForceSetSpecialAnim pop {r0} bx r0 .align 2, 0 _0805C01C: .4byte gPlayerAvatar -_0805C020: .4byte gMapObjects +_0805C020: .4byte gObjectEvents thumb_func_end sub_805BFFC thumb_func_start sub_805C024 @@ -1734,10 +1734,10 @@ sub_805C024: @ 805C024 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C068 @ =gMapObjects + ldr r1, _0805C068 @ =gObjectEvents adds r0, r1 adds r1, r5, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement lsls r0, 24 cmp r0, 0 bne _0805C05E @@ -1749,7 +1749,7 @@ _0805C05E: bx r0 .align 2, 0 _0805C064: .4byte gPlayerAvatar -_0805C068: .4byte gMapObjects +_0805C068: .4byte gObjectEvents thumb_func_end sub_805C024 thumb_func_start sub_805C06C @@ -1762,10 +1762,10 @@ sub_805C06C: @ 805C06C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C0A0 @ =gMapObjects + ldr r1, _0805C0A0 @ =gObjectEvents adds r0, r1 adds r1, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement lsls r0, 24 cmp r0, 0 bne _0805C094 @@ -1778,7 +1778,7 @@ _0805C094: bx r0 .align 2, 0 _0805C09C: .4byte gPlayerAvatar -_0805C0A0: .4byte gMapObjects +_0805C0A0: .4byte gObjectEvents thumb_func_end sub_805C06C thumb_func_start sub_805C0A4 @@ -1789,7 +1789,7 @@ sub_805C0A4: @ 805C0A4 lsls r1, 24 lsrs r5, r1, 24 adds r1, r5, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement lsls r0, 24 cmp r0, 0 bne _0805C0CA @@ -2056,7 +2056,7 @@ _0805C27E: lsls r0, 24 cmp r0, 0 beq _0805C2A6 - ldr r2, _0805C2B0 @ =gMapObjects + ldr r2, _0805C2B0 @ =gObjectEvents ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2075,7 +2075,7 @@ _0805C2A6: bx r0 .align 2, 0 _0805C2AC: .4byte gPlayerAvatar -_0805C2B0: .4byte gMapObjects +_0805C2B0: .4byte gObjectEvents thumb_func_end sub_805C270 thumb_func_start sub_805C2B4 @@ -2301,7 +2301,7 @@ sub_805C438: @ 805C438 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r2, _0805C4E8 @ =gMapObjects + ldr r2, _0805C4E8 @ =gObjectEvents ldr r0, _0805C4EC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2378,7 +2378,7 @@ _0805C4DE: pop {r0} bx r0 .align 2, 0 -_0805C4E8: .4byte gMapObjects +_0805C4E8: .4byte gObjectEvents _0805C4EC: .4byte gPlayerAvatar _0805C4F0: .4byte gUnknown_835B864 thumb_func_end sub_805C438 @@ -2388,7 +2388,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r3, _0805C530 @ =gMapObjects + ldr r3, _0805C530 @ =gObjectEvents ldr r2, _0805C534 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -2414,14 +2414,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 pop {r0} bx r0 .align 2, 0 -_0805C530: .4byte gMapObjects +_0805C530: .4byte gObjectEvents _0805C534: .4byte gPlayerAvatar thumb_func_end GetXYCoordsOneStepInFrontOfPlayer thumb_func_start PlayerGetDestCoords PlayerGetDestCoords: @ 805C538 push {r4,r5,lr} - ldr r5, _0805C560 @ =gMapObjects + ldr r5, _0805C560 @ =gObjectEvents ldr r4, _0805C564 @ =gPlayerAvatar ldrb r3, [r4, 0x5] lsls r2, r3, 3 @@ -2441,7 +2441,7 @@ PlayerGetDestCoords: @ 805C538 pop {r0} bx r0 .align 2, 0 -_0805C560: .4byte gMapObjects +_0805C560: .4byte gObjectEvents _0805C564: .4byte gPlayerAvatar thumb_func_end PlayerGetDestCoords @@ -2455,7 +2455,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C5C0 @ =gMapObjects + ldr r1, _0805C5C0 @ =gObjectEvents adds r3, r0, r1 ldrb r1, [r3] movs r0, 0xC0 @@ -2493,7 +2493,7 @@ _0805C5B0: mov pc, r0 .align 2, 0 _0805C5BC: .4byte gPlayerAvatar -_0805C5C0: .4byte gMapObjects +_0805C5C0: .4byte gObjectEvents _0805C5C4: .4byte gSprites _0805C5C8: .4byte _0805C5CC .align 2, 0 @@ -2584,7 +2584,7 @@ _0805C6BC: thumb_func_start GetPlayerFacingDirection GetPlayerFacingDirection: @ 805C6C4 - ldr r2, _0805C6DC @ =gMapObjects + ldr r2, _0805C6DC @ =gObjectEvents ldr r0, _0805C6E0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2596,13 +2596,13 @@ GetPlayerFacingDirection: @ 805C6C4 lsrs r0, 28 bx lr .align 2, 0 -_0805C6DC: .4byte gMapObjects +_0805C6DC: .4byte gObjectEvents _0805C6E0: .4byte gPlayerAvatar thumb_func_end GetPlayerFacingDirection thumb_func_start player_get_direction_upper_nybble player_get_direction_upper_nybble: @ 805C6E4 - ldr r2, _0805C6F8 @ =gMapObjects + ldr r2, _0805C6F8 @ =gObjectEvents ldr r0, _0805C6FC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2613,13 +2613,13 @@ player_get_direction_upper_nybble: @ 805C6E4 lsrs r0, 4 bx lr .align 2, 0 -_0805C6F8: .4byte gMapObjects +_0805C6F8: .4byte gObjectEvents _0805C6FC: .4byte gPlayerAvatar thumb_func_end player_get_direction_upper_nybble thumb_func_start PlayerGetZCoord PlayerGetZCoord: @ 805C700 - ldr r2, _0805C714 @ =gMapObjects + ldr r2, _0805C714 @ =gObjectEvents ldr r0, _0805C718 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2630,7 +2630,7 @@ PlayerGetZCoord: @ 805C700 lsrs r0, 4 bx lr .align 2, 0 -_0805C714: .4byte gMapObjects +_0805C714: .4byte gObjectEvents _0805C718: .4byte gPlayerAvatar thumb_func_end PlayerGetZCoord @@ -2644,7 +2644,7 @@ sub_805C71C: @ 805C71C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C748 @ =gMapObjects + ldr r1, _0805C748 @ =gObjectEvents adds r0, r1 lsls r3, 16 asrs r3, 16 @@ -2656,7 +2656,7 @@ sub_805C71C: @ 805C71C bx r0 .align 2, 0 _0805C744: .4byte gPlayerAvatar -_0805C748: .4byte gMapObjects +_0805C748: .4byte gObjectEvents thumb_func_end sub_805C71C thumb_func_start TestPlayerAvatarFlags @@ -2704,7 +2704,7 @@ sub_805C780: @ 805C780 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805C7C4 @ =gMapObjects + ldr r0, _0805C7C4 @ =gObjectEvents adds r4, r0 adds r0, r4, 0 bl npc_clear_strange_bits @@ -2712,7 +2712,7 @@ sub_805C780: @ 805C780 lsls r1, 28 lsrs r1, 28 adds r0, r4, 0 - bl FieldObjectSetDirection + bl ObjectEventSetDirection movs r0, 0x6 bl TestPlayerAvatarFlags lsls r0, 24 @@ -2727,7 +2727,7 @@ _0805C7B8: bx r0 .align 2, 0 _0805C7C0: .4byte gPlayerAvatar -_0805C7C4: .4byte gMapObjects +_0805C7C4: .4byte gObjectEvents thumb_func_end sub_805C780 thumb_func_start sub_805C7C8 @@ -2882,7 +2882,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805C928 @ =gMapObjects + ldr r0, _0805C928 @ =gObjectEvents adds r4, r0 ldrh r1, [r4, 0x10] mov r0, sp @@ -2930,7 +2930,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 b _0805C92E .align 2, 0 _0805C924: .4byte gPlayerAvatar -_0805C928: .4byte gMapObjects +_0805C928: .4byte gObjectEvents _0805C92C: movs r0, 0 _0805C92E: @@ -3145,14 +3145,14 @@ InitPlayerAvatar: @ 805CA3C strh r3, [r0, 0xE] str r3, [sp, 0x10] strh r3, [r0, 0x14] - bl SpawnSpecialFieldObject + bl SpawnSpecialObjectEvent adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 lsls r4, r5, 3 adds r4, r5 lsls r4, 2 - ldr r0, _0805CAFC @ =gMapObjects + ldr r0, _0805CAFC @ =gObjectEvents adds r4, r0 ldrb r0, [r4, 0x2] movs r1, 0x1 @@ -3162,7 +3162,7 @@ InitPlayerAvatar: @ 805CA3C strb r0, [r4, 0x1B] adds r0, r4, 0 mov r1, r9 - bl FieldObjectTurn + bl ObjectEventTurn bl ClearPlayerAvatarInfo ldr r0, _0805CB00 @ =gPlayerAvatar strb r6, [r0, 0x2] @@ -3182,7 +3182,7 @@ InitPlayerAvatar: @ 805CA3C pop {r0} bx r0 .align 2, 0 -_0805CAFC: .4byte gMapObjects +_0805CAFC: .4byte gObjectEvents _0805CB00: .4byte gPlayerAvatar thumb_func_end InitPlayerAvatar @@ -3191,7 +3191,7 @@ sub_805CB04: @ 805CB04 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _0805CB64 @ =gMapObjects + ldr r6, _0805CB64 @ =gObjectEvents ldr r5, _0805CB68 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r1, r0, 3 @@ -3236,7 +3236,7 @@ _0805CB5C: pop {r0} bx r0 .align 2, 0 -_0805CB64: .4byte gMapObjects +_0805CB64: .4byte gObjectEvents _0805CB68: .4byte gPlayerAvatar _0805CB6C: .4byte gSprites thumb_func_end sub_805CB04 @@ -3249,7 +3249,7 @@ sub_805CB70: @ 805CB70 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805CBB0 @ =gMapObjects + ldr r0, _0805CBB0 @ =gObjectEvents adds r4, r0 movs r0, 0x3 bl sub_805C808 @@ -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 @@ -3271,7 +3271,7 @@ sub_805CB70: @ 805CB70 bx r0 .align 2, 0 _0805CBAC: .4byte gPlayerAvatar -_0805CBB0: .4byte gMapObjects +_0805CBB0: .4byte gObjectEvents _0805CBB4: .4byte gSprites thumb_func_end sub_805CB70 @@ -3311,14 +3311,14 @@ sub_805CBE8: @ 805CBE8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805CC24 @ =gMapObjects + ldr r0, _0805CC24 @ =gObjectEvents adds r4, r0 bl sub_805CBB8 adds r1, r0, 0 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 @@ -3332,7 +3332,7 @@ sub_805CBE8: @ 805CBE8 bx r0 .align 2, 0 _0805CC20: .4byte gPlayerAvatar -_0805CC24: .4byte gMapObjects +_0805CC24: .4byte gObjectEvents _0805CC28: .4byte gSprites thumb_func_end sub_805CBE8 @@ -3468,7 +3468,7 @@ taskFF_bump_boulder: @ 805CD0C lsrs r0, 24 ldr r6, _0805CD54 @ =gUnknown_835B8A0 ldr r2, _0805CD58 @ =gTasks - ldr r5, _0805CD5C @ =gMapObjects + ldr r5, _0805CD5C @ =gObjectEvents lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3502,7 +3502,7 @@ _0805CD20: .align 2, 0 _0805CD54: .4byte gUnknown_835B8A0 _0805CD58: .4byte gTasks -_0805CD5C: .4byte gMapObjects +_0805CD5C: .4byte gObjectEvents _0805CD60: .4byte gPlayerAvatar thumb_func_end taskFF_bump_boulder @@ -3532,19 +3532,19 @@ sub_805CD84: @ 805CD84 adds r5, r1, 0 adds r4, r2, 0 adds r0, r5, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 bne _0805CE0E adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 bne _0805CE0E adds r0, r5, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished ldrb r0, [r6, 0xC] bl GetStepInPlaceDelay16AnimId adds r1, r0, 0 @@ -3602,19 +3602,19 @@ sub_805CE20: @ 805CE20 adds r5, r1, 0 adds r4, r2, 0 adds r0, r5, 0 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 beq _0805CE70 adds r0, r4, 0 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 beq _0805CE70 adds r0, r5, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished adds r0, r4, 0 bl sub_806DE28 ldrh r0, [r4, 0x10] @@ -3677,7 +3677,7 @@ _0805CEB2: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805CEE8 @ =gMapObjects + ldr r0, _0805CEE8 @ =gObjectEvents adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3692,7 +3692,7 @@ _0805CEB2: _0805CEDC: .4byte gUnknown_835B8AC _0805CEE0: .4byte gTasks _0805CEE4: .4byte gPlayerAvatar -_0805CEE8: .4byte gMapObjects +_0805CEE8: .4byte gObjectEvents thumb_func_end sub_805CEA0 thumb_func_start PlayerAvatar_DoSecretBaseMatJump @@ -3704,7 +3704,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC movs r0, 0x1 strb r0, [r5, 0x6] adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0805CF48 @@ -3785,7 +3785,7 @@ _0805CF8A: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805CFC0 @ =gMapObjects + ldr r0, _0805CFC0 @ =gObjectEvents adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3800,7 +3800,7 @@ _0805CF8A: _0805CFB4: .4byte gUnknown_835B8B0 _0805CFB8: .4byte gTasks _0805CFBC: .4byte gPlayerAvatar -_0805CFC0: .4byte gMapObjects +_0805CFC0: .4byte gObjectEvents thumb_func_end sub_805CF78 thumb_func_start sub_805CFC4 @@ -3836,7 +3836,7 @@ sub_805CFEC: @ 805CFEC movs r2, 0x4 bl memcpy adds r0, r5, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0805D054 @@ -3896,7 +3896,7 @@ sub_805D064: @ 805D064 movs r2, 0x5 bl memcpy adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0805D094 @@ -3924,7 +3924,7 @@ sub_805D0A4: @ 805D0A4 adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0805D0E8 @@ -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 @@ -4070,15 +4070,15 @@ taskFF_0805D1D4: @ 805D1D4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805D234 @ =gMapObjects + ldr r1, _0805D234 @ =gObjectEvents adds r5, r0, r1 adds r0, r5, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0805D200 adds r0, r5, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0805D228 @@ -4106,7 +4106,7 @@ _0805D228: bx r0 .align 2, 0 _0805D230: .4byte gPlayerAvatar -_0805D234: .4byte gMapObjects +_0805D234: .4byte gObjectEvents _0805D238: .4byte gTasks _0805D23C: .4byte sub_805D240 thumb_func_end taskFF_0805D1D4 @@ -4121,10 +4121,10 @@ sub_805D240: @ 805D240 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805D2B8 @ =gMapObjects + ldr r1, _0805D2B8 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0805D2AE @@ -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 @@ -4147,7 +4147,7 @@ sub_805D240: @ 805D240 movs r0, 0 strb r0, [r6, 0x6] bl ScriptContext2_Disable - bl UnfreezeMapObjects + bl UnfreezeObjectEvents ldrb r1, [r4, 0x1A] lsls r0, r1, 4 adds r0, r1 @@ -4164,7 +4164,7 @@ _0805D2AE: bx r0 .align 2, 0 _0805D2B4: .4byte gPlayerAvatar -_0805D2B8: .4byte gMapObjects +_0805D2B8: .4byte gObjectEvents _0805D2BC: .4byte gSprites thumb_func_end sub_805D240 @@ -4281,7 +4281,7 @@ fish1: @ 805D35C ldrh r1, [r6] adds r1, r0 strh r1, [r5, 0x22] - ldr r3, _0805D3EC @ =gMapObjects + ldr r3, _0805D3EC @ =gObjectEvents ldr r2, _0805D3F0 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -4296,7 +4296,7 @@ fish1: @ 805D35C lsls r4, 2 adds r4, r3 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimActive + bl ObjectEventClearAnimIfSpecialAnimActive ldrb r0, [r4, 0x1] movs r1, 0x8 orrs r0, r1 @@ -4316,7 +4316,7 @@ fish1: @ 805D35C .align 2, 0 _0805D3E4: .4byte gUnknown_835B90C _0805D3E8: .4byte gUnknown_835B912 -_0805D3EC: .4byte gMapObjects +_0805D3EC: .4byte gObjectEvents _0805D3F0: .4byte gPlayerAvatar thumb_func_end fish1 @@ -4727,18 +4727,18 @@ _0805D6EA: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805D77C @ =gMapObjects + ldr r0, _0805D77C @ =gObjectEvents mov r8, r0 add r4, r8 ldrh r1, [r5, 0x24] 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 - bl FieldObjectTurn + bl ObjectEventTurn ldrb r1, [r7] movs r0, 0x8 ands r0, r1 @@ -4777,7 +4777,7 @@ _0805D748: .align 2, 0 _0805D774: .4byte gPlayerAvatar _0805D778: .4byte gSprites -_0805D77C: .4byte gMapObjects +_0805D77C: .4byte gObjectEvents _0805D780: movs r1, 0xA ldrsh r0, [r5, r1] @@ -4971,18 +4971,18 @@ sub_805D8D8: @ 805D8D8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805D97C @ =gMapObjects + ldr r0, _0805D97C @ =gObjectEvents mov r8, r0 add r4, r8 ldrh r1, [r6, 0x24] 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 - bl FieldObjectTurn + bl ObjectEventTurn ldrb r1, [r5] movs r0, 0x8 ands r0, r1 @@ -5024,7 +5024,7 @@ _0805D968: .align 2, 0 _0805D974: .4byte gPlayerAvatar _0805D978: .4byte gSprites -_0805D97C: .4byte gMapObjects +_0805D97C: .4byte gObjectEvents thumb_func_end sub_805D8D8 thumb_func_start sub_805D980 @@ -5040,7 +5040,7 @@ sub_805D980: @ 805D980 ldr r0, _0805D9BC @ =gPlayerAvatar strb r1, [r0, 0x6] bl ScriptContext2_Disable - bl UnfreezeMapObjects + bl UnfreezeObjectEvents movs r0, 0 movs r1, 0x1 bl ClearDialogWindowAndFrame @@ -5159,7 +5159,7 @@ _0805DA78: ands r0, r1 cmp r0, 0 beq _0805DA9C - ldr r2, _0805DAAC @ =gMapObjects + ldr r2, _0805DAAC @ =gObjectEvents ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5177,7 +5177,7 @@ _0805DA9C: .align 2, 0 _0805DAA4: .4byte 0x0000fff8 _0805DAA8: .4byte gPlayerAvatar -_0805DAAC: .4byte gMapObjects +_0805DAAC: .4byte gObjectEvents thumb_func_end sub_805D9C4 thumb_func_start sub_805DAB0 @@ -5247,7 +5247,7 @@ sub_805DB04: @ 805DB04 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805DB4C @ =gMapObjects + ldr r1, _0805DB4C @ =gObjectEvents adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5271,7 +5271,7 @@ sub_805DB04: @ 805DB04 b _0805DBFA .align 2, 0 _0805DB48: .4byte gPlayerAvatar -_0805DB4C: .4byte gMapObjects +_0805DB4C: .4byte gObjectEvents _0805DB50: .4byte gSprites _0805DB54: .4byte gTasks+0x8 _0805DB58: @@ -5280,7 +5280,7 @@ _0805DB58: b _0805DBFA _0805DB5E: adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0805DBFA @@ -5406,7 +5406,7 @@ sub_805DC38: @ 805DC38 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805DC84 @ =gMapObjects + ldr r1, _0805DC84 @ =gObjectEvents adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5431,7 +5431,7 @@ sub_805DC38: @ 805DC38 b _0805DDBA .align 2, 0 _0805DC80: .4byte gPlayerAvatar -_0805DC84: .4byte gMapObjects +_0805DC84: .4byte gObjectEvents _0805DC88: .4byte gSprites _0805DC8C: .4byte gTasks+0x8 _0805DC90: @@ -5455,7 +5455,7 @@ _0805DC9A: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectForceSetSpecialAnim + bl ObjectEventForceSetSpecialAnim movs r0, 0 mov r9, r0 strh r6, [r5, 0x2] @@ -5608,7 +5608,7 @@ sub_805DDC8: @ 805DDC8 ble _0805DE20 _0805DDE4: adds r0, r5, 0 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 beq _0805DE20 @@ -5623,7 +5623,7 @@ _0805DDE4: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl FieldObjectForceSetSpecialAnim + bl ObjectEventForceSetSpecialAnim movs r0, 0 strh r0, [r6] ldrb r0, [r5, 0x18] diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index 8d07f3779..f6e1c2f05 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -942,10 +942,10 @@ _0807F542: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807F580 @ =gMapObjects + ldr r1, _0807F580 @ =gObjectEvents adds r0, r1 movs r1, 0x2 - bl FieldObjectTurn + bl ObjectEventTurn ldr r1, _0807F584 @ =gTasks lsls r0, r6, 2 adds r0, r6 @@ -958,7 +958,7 @@ _0807F542: .align 2, 0 _0807F578: .4byte gUnknown_841B5B6 _0807F57C: .4byte gPlayerAvatar -_0807F580: .4byte gMapObjects +_0807F580: .4byte gObjectEvents _0807F584: .4byte gTasks _0807F588: lsls r4, r6, 2 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/link_rfu_3.s b/asm/link_rfu_3.s index d1f18a8ae..3b76df047 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -10857,7 +10857,7 @@ _0811B294: .4byte gUnknown_203B06C sub_811B298: @ 811B298 push {lr} bl ScriptContext2_Enable - bl ScriptFreezeMapObjects + bl ScriptFreezeObjectEvents pop {r0} bx r0 thumb_func_end sub_811B298 @@ -11348,7 +11348,7 @@ sub_811B64C: @ 811B64C ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl RemoveFieldObjectByLocalIdAndMap + bl RemoveObjectEventByLocalIdAndMap pop {r0} bx r0 .align 2, 0 @@ -11369,7 +11369,7 @@ sub_811B66C: @ 811B66C ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0811B6D0 @@ -11378,16 +11378,16 @@ sub_811B66C: @ 811B66C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0811B6C0 @ =gMapObjects + ldr r1, _0811B6C0 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 bne _0811B6D0 ldrb r1, [r5] adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement lsls r0, 24 cmp r0, 0 bne _0811B6C4 @@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C .align 2, 0 _0811B6B8: .4byte gUnknown_8457120 _0811B6BC: .4byte gSaveBlock1Ptr -_0811B6C0: .4byte gMapObjects +_0811B6C0: .4byte gObjectEvents _0811B6C4: ldr r0, _0811B6DC @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811B6E0 @ =0x00000183 @@ -11428,7 +11428,7 @@ sub_811B6E8: @ 811B6E8 ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _0811B748 @@ -11437,10 +11437,10 @@ sub_811B6E8: @ 811B6E8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0811B72C @ =gMapObjects + ldr r1, _0811B72C @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 bne _0811B730 @@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8 .align 2, 0 _0811B724: .4byte gUnknown_8457120 _0811B728: .4byte gSaveBlock1Ptr -_0811B72C: .4byte gMapObjects +_0811B72C: .4byte gObjectEvents _0811B730: bl ScriptContext2_IsEnabled lsls r0, 24 @@ -11460,7 +11460,7 @@ _0811B730: b _0811B748 _0811B742: adds r0, r4, 0 - bl FreezeMapObject + bl FreezeObjectEvent _0811B748: movs r0, 0x1 _0811B74A: diff --git a/asm/macros.inc b/asm/macros.inc index 4eae2cccc..3cc26c6f7 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -119,6 +119,12 @@ .fill 4 @ padding .endm + .macro overworld_frame ptr:req, width:req, height:req, frame:req + .4byte (\ptr + (\width * \height * \frame * 64) / 2) + .2byte (\width * \height * 64) / 2 + .2byte 0 @ padding + .endm + .macro credits_entry number, text .4byte \number .4byte \text 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 370aa054d..21fce8cac 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3841,7 +3841,7 @@ CB2_ContinueSavedGame: @ 8056938 bl sub_8056420 bl set_current_map_header_from_sav1 bl sub_80550A8 - bl UnfreezeMapObjects + bl UnfreezeObjectEvents bl sub_8054E40 bl sub_80589E8 bl PlayTimeCounter_Start @@ -4734,7 +4734,7 @@ sub_8057100: @ 8057100 thumb_func_start sub_8057114 sub_8057114: @ 8057114 push {lr} - ldr r2, _08057138 @ =gMapObjects + ldr r2, _08057138 @ =gObjectEvents ldr r3, _0805713C @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -4750,7 +4750,7 @@ sub_8057114: @ 8057114 pop {r0} bx r0 .align 2, 0 -_08057138: .4byte gMapObjects +_08057138: .4byte gObjectEvents _0805713C: .4byte gPlayerAvatar thumb_func_end sub_8057114 @@ -4852,7 +4852,7 @@ _080571D8: adds r4, r7 ldrb r3, [r4, 0x13] adds r0, r5, 0 - bl SpawnLinkPlayerMapObject + bl SpawnLinkPlayerObjectEvent ldrb r1, [r4] adds r0, r5, 0 bl sub_8058878 @@ -5126,7 +5126,7 @@ sub_8057430: @ 8057430 bl sub_8056420 bl set_current_map_header_from_sav1 bl sub_80550A8 - bl UnfreezeMapObjects + bl UnfreezeObjectEvents bl sub_8054E40 bl sub_80589E8 bl PlayTimeCounter_Start @@ -7136,12 +7136,12 @@ _08058368: .4byte gUnknown_3005450 _0805836C: .4byte 0x000008d2 thumb_func_end sub_805833C - thumb_func_start ZeroLinkPlayerMapObject -ZeroLinkPlayerMapObject: @ 8058370 + thumb_func_start ZeroLinkPlayerObjectEvent +ZeroLinkPlayerObjectEvent: @ 8058370 movs r1, 0 str r1, [r0] bx lr - thumb_func_end ZeroLinkPlayerMapObject + thumb_func_end ZeroLinkPlayerObjectEvent thumb_func_start strange_npc_table_clear strange_npc_table_clear: @ 8058378 @@ -7156,18 +7156,18 @@ strange_npc_table_clear: @ 8058378 _08058388: .4byte gUnknown_2031DEC thumb_func_end strange_npc_table_clear - thumb_func_start ZeroMapObject -ZeroMapObject: @ 805838C + thumb_func_start ZeroObjectEvent +ZeroObjectEvent: @ 805838C push {lr} movs r1, 0 movs r2, 0x24 bl memset pop {r0} bx r0 - thumb_func_end ZeroMapObject + thumb_func_end ZeroObjectEvent - thumb_func_start SpawnLinkPlayerMapObject -SpawnLinkPlayerMapObject: @ 805839C + thumb_func_start SpawnLinkPlayerObjectEvent +SpawnLinkPlayerObjectEvent: @ 805839C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -7200,12 +7200,12 @@ SpawnLinkPlayerMapObject: @ 805839C lsls r5, r6, 3 adds r5, r6 lsls r5, 2 - ldr r0, _08058444 @ =gMapObjects + ldr r0, _08058444 @ =gObjectEvents adds r5, r0 adds r0, r4, 0 - bl ZeroLinkPlayerMapObject + bl ZeroLinkPlayerObjectEvent adds r0, r5, 0 - bl ZeroMapObject + bl ZeroObjectEvent movs r2, 0 movs r1, 0x1 movs r0, 0x1 @@ -7238,7 +7238,7 @@ SpawnLinkPlayerMapObject: @ 805839C adds r0, r5, 0 mov r1, r9 mov r2, r10 - bl InitLinkPlayerMapObjectPos + bl InitLinkPlayerObjectEventPos pop {r3-r5} mov r8, r3 mov r9, r4 @@ -7248,11 +7248,11 @@ SpawnLinkPlayerMapObject: @ 805839C bx r0 .align 2, 0 _08058440: .4byte gUnknown_2031DEC -_08058444: .4byte gMapObjects - thumb_func_end SpawnLinkPlayerMapObject +_08058444: .4byte gObjectEvents + thumb_func_end SpawnLinkPlayerObjectEvent - thumb_func_start InitLinkPlayerMapObjectPos -InitLinkPlayerMapObjectPos: @ 8058448 + thumb_func_start InitLinkPlayerObjectEventPos +InitLinkPlayerObjectEventPos: @ 8058448 push {r4,lr} adds r4, r0, 0 adds r0, r1, 0 @@ -7278,11 +7278,11 @@ InitLinkPlayerMapObjectPos: @ 8058448 adds r0, 0x8 strh r0, [r4, 0xC] adds r0, r4, 0 - bl FieldObjectUpdateZCoord + bl ObjectEventUpdateZCoord pop {r4} pop {r0} bx r0 - thumb_func_end InitLinkPlayerMapObjectPos + thumb_func_end InitLinkPlayerObjectEventPos thumb_func_start sub_8058488 sub_8058488: @ 8058488 @@ -7300,7 +7300,7 @@ sub_8058488: @ 8058488 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080584B4 @ =gMapObjects + ldr r0, _080584B4 @ =gObjectEvents adds r1, r0 strb r2, [r1, 0x19] _080584AA: @@ -7308,7 +7308,7 @@ _080584AA: bx r0 .align 2, 0 _080584B0: .4byte gUnknown_2031DEC -_080584B4: .4byte gMapObjects +_080584B4: .4byte gObjectEvents thumb_func_end sub_8058488 thumb_func_start sub_80584B8 @@ -7322,7 +7322,7 @@ sub_80584B8: @ 80584B8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080584FC @ =gMapObjects + ldr r1, _080584FC @ =gObjectEvents adds r4, r0, r1 ldrb r0, [r4, 0x4] cmp r0, 0x40 @@ -7346,7 +7346,7 @@ _080584E4: bx r0 .align 2, 0 _080584F8: .4byte gUnknown_2031DEC -_080584FC: .4byte gMapObjects +_080584FC: .4byte gObjectEvents _08058500: .4byte gSprites thumb_func_end sub_80584B8 @@ -7360,13 +7360,13 @@ sub_8058504: @ 8058504 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058520 @ =gMapObjects + ldr r1, _08058520 @ =gObjectEvents adds r0, r1 ldrb r0, [r0, 0x4] bx lr .align 2, 0 _0805851C: .4byte gUnknown_2031DEC -_08058520: .4byte gMapObjects +_08058520: .4byte gObjectEvents thumb_func_end sub_8058504 thumb_func_start sub_8058524 @@ -7379,7 +7379,7 @@ sub_8058524: @ 8058524 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r3, _08058548 @ =gMapObjects + ldr r3, _08058548 @ =gObjectEvents adds r0, r3 ldrh r3, [r0, 0x10] strh r3, [r1] @@ -7388,7 +7388,7 @@ sub_8058524: @ 8058524 bx lr .align 2, 0 _08058544: .4byte gUnknown_2031DEC -_08058548: .4byte gMapObjects +_08058548: .4byte gObjectEvents thumb_func_end sub_8058524 thumb_func_start sub_805854C @@ -7401,13 +7401,13 @@ sub_805854C: @ 805854C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058568 @ =gMapObjects + ldr r1, _08058568 @ =gObjectEvents adds r0, r1 ldrb r0, [r0, 0x19] bx lr .align 2, 0 _08058564: .4byte gUnknown_2031DEC -_08058568: .4byte gMapObjects +_08058568: .4byte gObjectEvents thumb_func_end sub_805854C thumb_func_start sub_805856C @@ -7420,7 +7420,7 @@ sub_805856C: @ 805856C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805858C @ =gMapObjects + ldr r1, _0805858C @ =gObjectEvents adds r0, r1 ldrb r0, [r0, 0xB] lsls r0, 28 @@ -7428,7 +7428,7 @@ sub_805856C: @ 805856C bx lr .align 2, 0 _08058588: .4byte gUnknown_2031DEC -_0805858C: .4byte gMapObjects +_0805858C: .4byte gObjectEvents thumb_func_end sub_805856C thumb_func_start sub_8058590 @@ -7441,7 +7441,7 @@ sub_8058590: @ 8058590 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080585B4 @ =gMapObjects + ldr r1, _080585B4 @ =gObjectEvents adds r0, r1 adds r0, 0x21 movs r1, 0 @@ -7451,7 +7451,7 @@ sub_8058590: @ 8058590 bx lr .align 2, 0 _080585B0: .4byte gUnknown_2031DEC -_080585B4: .4byte gMapObjects +_080585B4: .4byte gObjectEvents thumb_func_end sub_8058590 thumb_func_start GetLinkPlayerIdAt @@ -7479,7 +7479,7 @@ _080585DA: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058600 @ =gMapObjects + ldr r1, _08058600 @ =gObjectEvents adds r1, r0, r1 movs r6, 0x10 ldrsh r0, [r1, r6] @@ -7493,7 +7493,7 @@ _080585DA: b _08058610 .align 2, 0 _080585FC: .4byte gUnknown_2031DEC -_08058600: .4byte gMapObjects +_08058600: .4byte gObjectEvents _08058604: adds r0, r2, 0x1 lsls r0, 24 @@ -7521,7 +7521,7 @@ sub_8058618: @ 8058618 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805864C @ =gMapObjects + ldr r1, _0805864C @ =gObjectEvents adds r6, r0, r1 ldrb r0, [r5] cmp r0, 0 @@ -7535,7 +7535,7 @@ sub_8058618: @ 8058618 b _08058674 .align 2, 0 _08058648: .4byte gUnknown_2031DEC -_0805864C: .4byte gMapObjects +_0805864C: .4byte gObjectEvents _08058650: ldr r4, _0805867C @ =gUnknown_826D374 ldr r1, _08058680 @ =gUnknown_826D33C @@ -7629,7 +7629,7 @@ sub_80586CC: @ 80586CC adds r0, r5, 0 mov r2, sp adds r3, r6, 0 - bl FieldObjectMoveDestCoords + bl ObjectEventMoveDestCoords ldrb r0, [r4, 0x2] ldrb r1, [r5, 0x19] mov r2, sp @@ -7653,7 +7653,7 @@ sub_80586CC: @ 80586CC adds r0, r5, 0 bl npc_coords_shift adds r0, r5, 0 - bl FieldObjectUpdateZCoord + bl ObjectEventUpdateZCoord movs r0, 0x1 b _0805872C _0805872A: @@ -7780,7 +7780,7 @@ npc_080587EC: @ 80587EC mov r12, r2 lsls r3, 16 movs r4, 0 - ldr r0, _08058850 @ =gMapObjects + ldr r0, _08058850 @ =gObjectEvents mov r9, r0 lsrs r2, r3, 16 mov r10, r2 @@ -7820,7 +7820,7 @@ _0805884A: movs r0, 0x1 b _0805886A .align 2, 0 -_08058850: .4byte gMapObjects +_08058850: .4byte gObjectEvents _08058854: adds r0, r4, 0x1 lsls r0, 24 @@ -7857,7 +7857,7 @@ sub_8058878: @ 8058878 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080588B8 @ =gMapObjects + ldr r1, _080588B8 @ =gObjectEvents adds r4, r0, r1 ldrb r0, [r2] cmp r0, 0 @@ -7875,7 +7875,7 @@ sub_8058878: @ 8058878 b _080588C6 .align 2, 0 _080588B4: .4byte gUnknown_2031DEC -_080588B8: .4byte gMapObjects +_080588B8: .4byte gObjectEvents _080588BC: ldrb r0, [r4] lsls r0, 30 @@ -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 @@ -7931,7 +7931,7 @@ SpriteCB_LinkPlayer: @ 805890C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058974 @ =gMapObjects + ldr r1, _08058974 @ =gObjectEvents adds r6, r0, r1 ldrh r0, [r6, 0xC] strh r0, [r5, 0x20] @@ -7958,7 +7958,7 @@ SpriteCB_LinkPlayer: @ 805890C cmp r0, 0 bne _08058978 ldrb r0, [r6, 0x19] - bl FieldObjectDirectionToImageAnimId + bl ObjectEventDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7967,7 +7967,7 @@ SpriteCB_LinkPlayer: @ 805890C b _0805898A .align 2, 0 _08058970: .4byte gUnknown_2031DEC -_08058974: .4byte gMapObjects +_08058974: .4byte gObjectEvents _08058978: ldrb r0, [r6, 0x19] bl get_go_image_anim_num diff --git a/asm/script_movement.s b/asm/script_movement.s index a2d48d44a..7a7adec6c 100644 --- a/asm/script_movement.s +++ b/asm/script_movement.s @@ -17,7 +17,7 @@ ScriptMovement_StartObjectMovementScript: @ 8097434 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _08097456 @@ -61,7 +61,7 @@ ScriptMovement_IsObjectMovementFinished: @ 809748C lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080974CE @@ -480,7 +480,7 @@ _0809777C: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080977A8 @ =gMapObjects + ldr r1, _080977A8 @ =gObjectEvents adds r0, r1 bl npc_sync_anim_pause_bits _08097792: @@ -495,7 +495,7 @@ _08097792: bx r0 .align 2, 0 _080977A4: .4byte gTasks+0x8 -_080977A8: .4byte gMapObjects +_080977A8: .4byte gObjectEvents thumb_func_end UnfreezeObjects thumb_func_start Task_80A244C @@ -557,15 +557,15 @@ sub_80977F0: @ 80977F0 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _08097850 @ =gMapObjects + ldr r1, _08097850 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsSpecialAnimActive + bl ObjectEventIsSpecialAnimActive lsls r0, 24 cmp r0, 0 beq _08097838 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0809786A @@ -577,13 +577,13 @@ _08097838: adds r1, r5, 0 bl sub_80976A8 adds r0, r4, 0 - bl FreezeMapObject + bl FreezeObjectEvent b _0809786A .align 2, 0 -_08097850: .4byte gMapObjects +_08097850: .4byte gObjectEvents _08097854: adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement lsls r0, 24 cmp r0, 0 bne _0809786A diff --git a/asm/trainer_see.s b/asm/trainer_see.s index a2210173a..c12bcaeeb 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -19,7 +19,7 @@ _08081B40: b _08081B7A _08081B44: movs r4, 0 - ldr r5, _08081B80 @ =gMapObjects + ldr r5, _08081B80 @ =gObjectEvents _08081B48: lsls r0, r4, 3 adds r0, r4 @@ -53,7 +53,7 @@ _08081B7A: pop {r1} bx r1 .align 2, 0 -_08081B80: .4byte gMapObjects +_08081B80: .4byte gObjectEvents thumb_func_end CheckForTrainersWantingBattle thumb_func_start sub_8081B84 @@ -62,7 +62,7 @@ sub_8081B84: @ 8081B84 lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 - bl GetFieldObjectScriptPointerByFieldObjectId + bl GetObjectEventScriptPointerByObjectEventId adds r6, r0, 0 bl GetTrainerFlagFromScriptPointer cmp r0, 0 @@ -70,7 +70,7 @@ sub_8081B84: @ 8081B84 lsls r4, r5, 3 adds r0, r4, r5 lsls r0, 2 - ldr r1, _08081BE0 @ =gMapObjects + ldr r1, _08081BE0 @ =gObjectEvents adds r0, r1 bl sub_8081BEC lsls r0, 24 @@ -90,7 +90,7 @@ _08081BC0: bl ConfigureAndSetUpOneTrainerBattle adds r0, r4, r5 lsls r0, 2 - ldr r1, _08081BE0 @ =gMapObjects + ldr r1, _08081BE0 @ =gObjectEvents adds r0, r1 subs r1, r7, 0x1 lsls r1, 24 @@ -99,7 +99,7 @@ _08081BC0: movs r0, 0x1 b _08081BE6 .align 2, 0 -_08081BE0: .4byte gMapObjects +_08081BE0: .4byte gObjectEvents _08081BE4: movs r0, 0 _08081BE6: @@ -590,7 +590,7 @@ _08081F54: adds r3, r1, 0 adds r3, 0x8 adds r0, r4, 0 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0 bl FieldEffectStart ldrb r0, [r4, 0x18] @@ -601,7 +601,7 @@ _08081F54: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 _08081F82: @@ -658,12 +658,12 @@ sub_8081FD0: @ 8081FD0 adds r5, r1, 0 adds r4, r2, 0 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _08081FEE adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08082022 @@ -680,7 +680,7 @@ _08081FEE: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0xE] subs r0, 0x1 strh r0, [r5, 0xE] @@ -688,7 +688,7 @@ _08081FEE: _08082014: adds r0, r4, 0 movs r1, 0x4A - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -705,12 +705,12 @@ sub_808202C: @ 808202C adds r5, r1, 0 adds r4, r2, 0 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0808204A adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _080820AC @@ -740,15 +740,15 @@ _0808204A: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080820B8 @ =gMapObjects + ldr r1, _080820B8 @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _080820A2 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _080820AC @@ -764,7 +764,7 @@ _080820AC: bx r1 .align 2, 0 _080820B4: .4byte gPlayerAvatar -_080820B8: .4byte gMapObjects +_080820B8: .4byte gObjectEvents thumb_func_end sub_808202C thumb_func_start sub_80820BC @@ -777,15 +777,15 @@ sub_80820BC: @ 80820BC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080820FC @ =gMapObjects + ldr r1, _080820FC @ =gObjectEvents adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _080820E8 adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _080820EE @@ -799,7 +799,7 @@ _080820EE: bx r1 .align 2, 0 _080820F8: .4byte gPlayerAvatar -_080820FC: .4byte gMapObjects +_080820FC: .4byte gObjectEvents thumb_func_end sub_80820BC thumb_func_start sub_8082100 @@ -808,19 +808,19 @@ sub_8082100: @ 8082100 adds r5, r1, 0 adds r4, r2, 0 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0808211E adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808212C _0808211E: adds r0, r4, 0 movs r1, 0x67 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -836,7 +836,7 @@ sub_8082134: @ 8082134 push {r4,lr} adds r4, r1, 0 adds r0, r2, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _08082148 @@ -855,19 +855,19 @@ sub_8082150: @ 8082150 adds r5, r1, 0 adds r4, r2, 0 adds r0, r4, 0 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0808216E adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808217C _0808216E: adds r0, r4, 0 movs r1, 0x4A - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -884,7 +884,7 @@ sub_8082184: @ 8082184 adds r5, r1, 0 adds r4, r2, 0 adds r0, r4, 0 - bl FieldObjectCheckHeldMovementStatus + bl ObjectEventCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 beq _080821CA @@ -961,7 +961,7 @@ sub_80821DC: @ 80821DC orrs r1, r2 strb r1, [r0, 0x5] adds r0, r4, 0 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 @@ -970,7 +970,7 @@ sub_80821DC: @ 80821DC lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -1024,8 +1024,8 @@ sub_808226C: @ 808226C movs r0, 0x12 movs r1, 0x7 movs r2, 0x7F - bl SpawnSpecialFieldObjectParameterized - ldr r2, _080822C8 @ =gMapObjects + bl SpawnSpecialObjectEventParameterized + ldr r2, _080822C8 @ =gObjectEvents lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -1046,7 +1046,7 @@ sub_808226C: @ 808226C bx r1 .align 2, 0 _080822C4: .4byte gSaveBlock1Ptr -_080822C8: .4byte gMapObjects +_080822C8: .4byte gObjectEvents thumb_func_end sub_808226C thumb_func_start sub_80822CC @@ -1061,15 +1061,15 @@ sub_80822CC: @ 80822CC ldrb r2, [r0, 0x4] movs r0, 0x7F mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _0808234C @ =gMapObjects + ldr r4, _0808234C @ =gObjectEvents adds r0, r4 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _08082312 @@ -1079,7 +1079,7 @@ sub_80822CC: @ 80822CC adds r0, r1 lsls r0, 2 adds r0, r4 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808236E @@ -1096,7 +1096,7 @@ _08082312: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808234C @ =gMapObjects + ldr r0, _0808234C @ =gObjectEvents adds r4, r0 movs r0, 0x2 bl sub_8063FB0 @@ -1104,21 +1104,21 @@ _08082312: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x12] adds r0, 0x1 strh r0, [r5, 0x12] b _0808236E .align 2, 0 _08082348: .4byte gSaveBlock1Ptr -_0808234C: .4byte gMapObjects +_0808234C: .4byte gObjectEvents _08082350: ldr r1, _08082378 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 adds r0, r6, 0 - bl FieldObjectGetLocalIdAndMap + bl ObjectEventGetLocalIdAndMap movs r0, 0 bl FieldEffectStart movs r0, 0 @@ -1147,7 +1147,7 @@ sub_808237C: @ 808237C ldrb r2, [r0, 0x4] movs r0, 0x7F mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap movs r0, 0 bl FieldEffectActiveListContains lsls r0, 24 @@ -1158,9 +1158,9 @@ sub_808237C: @ 808237C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _08082408 @ =gMapObjects + ldr r4, _08082408 @ =gObjectEvents adds r0, r4 - bl FieldObjectIsMovementOverridden + bl ObjectEventIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _080823CC @@ -1170,7 +1170,7 @@ sub_808237C: @ 808237C adds r0, r1 lsls r0, 2 adds r0, r4 - bl FieldObjectClearHeldMovementIfFinished + bl ObjectEventClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808242E @@ -1187,7 +1187,7 @@ _080823CC: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08082408 @ =gMapObjects + ldr r0, _08082408 @ =gObjectEvents adds r4, r0 movs r0, 0x1 bl sub_8063FB0 @@ -1195,14 +1195,14 @@ _080823CC: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetHeldMovement + bl ObjectEventSetHeldMovement ldrh r0, [r5, 0x12] adds r0, 0x1 strh r0, [r5, 0x12] b _0808242E .align 2, 0 _08082404: .4byte gSaveBlock1Ptr -_08082408: .4byte gMapObjects +_08082408: .4byte gObjectEvents _0808240C: bl GetPlayerAvatarObjectId lsls r0, 24 @@ -1213,7 +1213,7 @@ _0808240C: ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] movs r0, 0x7F - bl RemoveFieldObjectByLocalIdAndMap + bl RemoveObjectEventByLocalIdAndMap movs r0, 0 strh r0, [r5, 0x12] movs r0, 0x2 @@ -1249,7 +1249,7 @@ sub_808243C: @ 808243C cmp r0, 0 bne _0808246E ldr r0, [sp] - bl FieldObjectClearAnim + bl ObjectEventClearAnim ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] @@ -1560,7 +1560,7 @@ objc_exclamation_mark_probably: @ 80826A8 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetObjectEventIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _080826DA @@ -1579,7 +1579,7 @@ _080826DA: bl FieldEffectStop b _08082736 _080826E8: - ldr r2, _0808272C @ =gMapObjects + ldr r2, _0808272C @ =gObjectEvents mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1614,7 +1614,7 @@ _080826E8: strh r0, [r4, 0x34] b _08082736 .align 2, 0 -_0808272C: .4byte gMapObjects +_0808272C: .4byte gObjectEvents _08082730: .4byte gSprites _08082734: strh r2, [r4, 0x34] 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 f876e5a56..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,8 +309,8 @@ struct Camera s32 y; }; -extern struct EventObject gMapObjects[]; -extern u8 gSelectedEventObject; +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/map_obj_80688E4.s b/data/event_object_80688E4.s index 884bf379f..884bf379f 100644 --- a/data/map_obj_80688E4.s +++ b/data/event_object_80688E4.s diff --git a/data/field_map_obj.s b/data/event_object_movement.s index 19f0fac9f..9c4f0a7ca 100644 --- a/data/field_map_obj.s +++ b/data/event_object_movement.s @@ -14,710 +14,1190 @@ gUnknown_835B95C:: @ 835B95C .4byte CameraObject_2 gUnknown_835B968:: @ 835B968 - .incbin "graphics/map_objects/0.gbapal" + .incbin "graphics/object_events/0.gbapal" gUnknown_835B988:: - .incbin "graphics/map_objects/unk_835B988.gbapal" + .incbin "graphics/object_events/unk_835B988.gbapal" gUnknown_835B9A0:: .space 0x1C0 gUnknown_835BB68:: @ 835BB68 - .incbin "graphics/map_objects/000.4bpp" + .incbin "graphics/object_events/000.4bpp" gUnknown_835C468:: @ 835C468 - .incbin "graphics/map_objects/002.4bpp" + .incbin "graphics/object_events/002.4bpp" gUnknown_835D268:: @ 835D268 - .incbin "graphics/map_objects/007.4bpp" + .incbin "graphics/object_events/007.4bpp" gUnknown_835DB68:: @ 835DB68 - .incbin "graphics/map_objects/009.4bpp" + .incbin "graphics/object_events/009.4bpp" gUnknown_835E968:: @ 835E968 - .incbin "graphics/map_objects/1.gbapal" + .incbin "graphics/object_events/1.gbapal" gUnknown_835E988:: @ 835E988 - .incbin "graphics/map_objects/2.gbapal" + .incbin "graphics/object_events/2.gbapal" gUnknown_835E9A8:: @ 835E9A8 - .incbin "graphics/map_objects/005.4bpp" + .incbin "graphics/object_events/005.4bpp" gUnknown_835F2A8:: @ 835F2A8 - .incbin "graphics/map_objects/012.4bpp" + .incbin "graphics/object_events/012.4bpp" -@ 35FBA8 - .incbin "graphics/map_objects/male_surf.4bpp" +gObjectEventPic_MaleSurfing:: @ 835FBA8 + .incbin "graphics/object_events/male_surf.4bpp" -@ 360DA8 - .incbin "graphics/map_objects/female_surf.4bpp" +gObjectEventPic_FemaleSurfing:: @ 360DA8 + .incbin "graphics/object_events/female_surf.4bpp" gUnknown_8361FA8:: @ 8361FA8 - .incbin "graphics/map_objects/001.4bpp" + .incbin "graphics/object_events/001.4bpp" gUnknown_83631A8:: @ 83631A8 - .incbin "graphics/map_objects/006.4bpp" + .incbin "graphics/object_events/006.4bpp" gUnknown_8363DA8:: @ 8363DA8 - .incbin "graphics/map_objects/008.4bpp" + .incbin "graphics/object_events/008.4bpp" gUnknown_8364FA8:: @ 8364FA8 - .incbin "graphics/map_objects/013.4bpp" + .incbin "graphics/object_events/013.4bpp" gUnknown_8365BA8:: @ 8365BA8 - .incbin "graphics/map_objects/014.4bpp" + .incbin "graphics/object_events/014.4bpp" gUnknown_83664A8:: @ 83664A8 - .incbin "graphics/map_objects/015.4bpp" + .incbin "graphics/object_events/015.4bpp" gUnknown_8366DA8:: @ 8366DA8 - .incbin "graphics/map_objects/004.4bpp" + .incbin "graphics/object_events/004.4bpp" gUnknown_83685A8:: @ 83685A8 - .incbin "graphics/map_objects/011.4bpp" + .incbin "graphics/object_events/011.4bpp" gUnknown_8369DA8:: @ 8369DA8 - .incbin "graphics/map_objects/094.4bpp" + .incbin "graphics/object_events/094.4bpp" gUnknown_8369E28:: @ 8369E28 - .incbin "graphics/map_objects/093.4bpp" + .incbin "graphics/object_events/093.4bpp" @ 8369F28 - .incbin "graphics/map_objects/unk_8369F28.4bpp" + .incbin "graphics/object_events/unk_8369F28.4bpp" gUnknown_836A228:: @ 836A228 - .incbin "graphics/map_objects/087.4bpp" + .incbin "graphics/object_events/087.4bpp" gUnknown_836AB28:: @ 836AB28 - .incbin "graphics/map_objects/086.4bpp" + .incbin "graphics/object_events/086.4bpp" gUnknown_836AE28:: @ 836AE28 - .incbin "graphics/map_objects/085.4bpp" + .incbin "graphics/object_events/085.4bpp" gUnknown_836B128:: @ 836B128 - .incbin "graphics/map_objects/076.4bpp" + .incbin "graphics/object_events/076.4bpp" gUnknown_836BA28:: @ 836BA28 - .incbin "graphics/map_objects/077.4bpp" + .incbin "graphics/object_events/077.4bpp" gUnknown_836C328:: @ 836C328 - .incbin "graphics/map_objects/083.4bpp" + .incbin "graphics/object_events/083.4bpp" gUnknown_836C628:: @ 836C628 - .incbin "graphics/map_objects/084.4bpp" + .incbin "graphics/object_events/084.4bpp" gUnknown_836C928:: @ 836C928 - .incbin "graphics/map_objects/080.4bpp" + .incbin "graphics/object_events/080.4bpp" gUnknown_836CC28:: @ 836CC28 - .incbin "graphics/map_objects/082.4bpp" + .incbin "graphics/object_events/082.4bpp" gUnknown_836CF28:: @ 836CF28 - .incbin "graphics/map_objects/073.4bpp" + .incbin "graphics/object_events/073.4bpp" gUnknown_836D828:: @ 836D828 - .incbin "graphics/map_objects/3.gbapal" + .incbin "graphics/object_events/3.gbapal" gUnknown_836D848:: @ 836D848 - .incbin "graphics/map_objects/4.gbapal" + .incbin "graphics/object_events/4.gbapal" gUnknown_836D868:: @ 836D868 - .incbin "graphics/map_objects/5.gbapal" + .incbin "graphics/object_events/5.gbapal" gUnknown_836D888:: @ 836D888 - .incbin "graphics/map_objects/6.gbapal" + .incbin "graphics/object_events/6.gbapal" gUnknown_836D8A8:: @ 836D8A8 - .incbin "graphics/map_objects/7.gbapal" + .incbin "graphics/object_events/7.gbapal" gUnknown_836D8C8:: @ 836D8C8 - .incbin "graphics/map_objects/8.gbapal" + .incbin "graphics/object_events/8.gbapal" gUnknown_836D8E8:: @ 836D8E8 - .incbin "graphics/map_objects/9.gbapal" + .incbin "graphics/object_events/9.gbapal" gUnknown_836D908:: @ 836D908 - .incbin "graphics/map_objects/10.gbapal" + .incbin "graphics/object_events/10.gbapal" gUnknown_836D928:: @ 836D928 - .incbin "graphics/map_objects/016.4bpp" + .incbin "graphics/object_events/016.4bpp" gUnknown_836DDA8:: @ 836DDA8 - .incbin "graphics/map_objects/017.4bpp" + .incbin "graphics/object_events/017.4bpp" gUnknown_836E2A8:: @ 836E2A8 - .incbin "graphics/map_objects/021.4bpp" + .incbin "graphics/object_events/021.4bpp" gUnknown_836E5A8:: @ 836E5A8 - .incbin "graphics/map_objects/022.4bpp" + .incbin "graphics/object_events/022.4bpp" gUnknown_836EFA8:: @ 836EFA8 - .incbin "graphics/map_objects/018.4bpp" + .incbin "graphics/object_events/018.4bpp" gUnknown_836F9A8:: @ 836F9A8 - .incbin "graphics/map_objects/019.4bpp" + .incbin "graphics/object_events/019.4bpp" gUnknown_83703A8:: @ 83703A8 - .incbin "graphics/map_objects/023.4bpp" + .incbin "graphics/object_events/023.4bpp" gUnknown_8370DA8:: @ 8370DA8 - .incbin "graphics/map_objects/031.4bpp" + .incbin "graphics/object_events/031.4bpp" gUnknown_83716A8:: @ 83716A8 - .incbin "graphics/map_objects/020.4bpp" + .incbin "graphics/object_events/020.4bpp" gUnknown_83720A8:: @ 83720A8 - .incbin "graphics/map_objects/024.4bpp" + .incbin "graphics/object_events/024.4bpp" -@ 8372AA8 - .incbin "graphics/map_objects/unk_8372AA8.4bpp" +gUnknown_8372AA8:: @ 8372AA8 + .incbin "graphics/object_events/unk_8372AA8.4bpp" gUnknown_83733A8:: @ 83733A8 - .incbin "graphics/map_objects/027.4bpp" + .incbin "graphics/object_events/027.4bpp" gUnknown_8373CA8:: @ 8373CA8 - .incbin "graphics/map_objects/030.4bpp" + .incbin "graphics/object_events/030.4bpp" gUnknown_83746A8:: @ 83746A8 - .incbin "graphics/map_objects/028.4bpp" + .incbin "graphics/object_events/028.4bpp" gUnknown_83750A8:: @ 83750A8 - .incbin "graphics/map_objects/032.4bpp" + .incbin "graphics/object_events/032.4bpp" gUnknown_8375AA8:: @ 8375AA8 - .incbin "graphics/map_objects/034.4bpp" + .incbin "graphics/object_events/034.4bpp" gUnknown_8375CA8:: @ 8375CA8 - .incbin "graphics/map_objects/047.4bpp" + .incbin "graphics/object_events/047.4bpp" gUnknown_83766A8:: @ 83766A8 - .incbin "graphics/map_objects/048.4bpp" + .incbin "graphics/object_events/048.4bpp" gUnknown_83770A8:: @ 83770A8 - .incbin "graphics/map_objects/029.4bpp" + .incbin "graphics/object_events/029.4bpp" gUnknown_8377AA8:: @ 8377AA8 - .incbin "graphics/map_objects/059.4bpp" + .incbin "graphics/object_events/059.4bpp" gUnknown_83783A8:: @ 83783A8 - .incbin "graphics/map_objects/033.4bpp" + .incbin "graphics/object_events/033.4bpp" gUnknown_8378CA8:: @ 8378CA8 - .incbin "graphics/map_objects/035.4bpp" + .incbin "graphics/object_events/035.4bpp" gUnknown_83795A8:: @ 83795A8 - .incbin "graphics/map_objects/039.4bpp" + .incbin "graphics/object_events/039.4bpp" gUnknown_8379FA8:: @ 8379FA8 - .incbin "graphics/map_objects/040.4bpp" + .incbin "graphics/object_events/040.4bpp" gUnknown_837A9A8:: @ 837A9A8 - .incbin "graphics/map_objects/041.4bpp" + .incbin "graphics/object_events/041.4bpp" gUnknown_837B3A8:: @ 837B3A8 - .incbin "graphics/map_objects/042.4bpp" + .incbin "graphics/object_events/042.4bpp" gUnknown_837BDA8:: @ 837BDA8 - .incbin "graphics/map_objects/121.4bpp" + .incbin "graphics/object_events/121.4bpp" gUnknown_837BF28:: @ 837BF28 - .incbin "graphics/map_objects/052.4bpp" + .incbin "graphics/object_events/052.4bpp" gUnknown_837C928:: @ 837C928 - .incbin "graphics/map_objects/058.4bpp" + .incbin "graphics/object_events/058.4bpp" gUnknown_837D328:: @ 837D328 - .incbin "graphics/map_objects/050.4bpp" + .incbin "graphics/object_events/050.4bpp" gUnknown_837DC28:: @ 837DC28 - .incbin "graphics/map_objects/043.4bpp" + .incbin "graphics/object_events/043.4bpp" gUnknown_837E628:: @ 837E628 - .incbin "graphics/map_objects/044.4bpp" + .incbin "graphics/object_events/044.4bpp" gUnknown_837F028:: @ 837F028 - .incbin "graphics/map_objects/045.4bpp" + .incbin "graphics/object_events/045.4bpp" gUnknown_837FA28:: @ 837FA28 - .incbin "graphics/map_objects/046.4bpp" + .incbin "graphics/object_events/046.4bpp" gUnknown_8380428:: @ 8380428 - .incbin "graphics/map_objects/054.4bpp" + .incbin "graphics/object_events/054.4bpp" gUnknown_8380E28:: @ 8380E28 - .incbin "graphics/map_objects/055.4bpp" + .incbin "graphics/object_events/055.4bpp" gUnknown_8381828:: @ 8381828 - .incbin "graphics/map_objects/061.4bpp" + .incbin "graphics/object_events/061.4bpp" gUnknown_8382228:: @ 8382228 - .incbin "graphics/map_objects/062.4bpp" + .incbin "graphics/object_events/062.4bpp" gUnknown_8382C28:: @ 8382C28 - .incbin "graphics/map_objects/063.4bpp" + .incbin "graphics/object_events/063.4bpp" gUnknown_8383528:: @ 8383528 - .incbin "graphics/map_objects/057.4bpp" + .incbin "graphics/object_events/057.4bpp" gUnknown_8383F28:: @ 8383F28 - .incbin "graphics/map_objects/090.4bpp" + .incbin "graphics/object_events/090.4bpp" gUnknown_8384828:: @ 8384828 - .incbin "graphics/map_objects/152.4bpp" + .incbin "graphics/object_events/152.4bpp" gUnknown_8385128:: @ 8385128 - .incbin "graphics/map_objects/037.4bpp" + .incbin "graphics/object_events/037.4bpp" gUnknown_8385628:: @ 8385628 - .incbin "graphics/map_objects/036.4bpp" + .incbin "graphics/object_events/036.4bpp" gUnknown_8385B28:: @ 8385B28 - .incbin "graphics/map_objects/038.4bpp" + .incbin "graphics/object_events/038.4bpp" gUnknown_8386028:: @ 8386028 - .incbin "graphics/map_objects/056.4bpp" + .incbin "graphics/object_events/056.4bpp" gUnknown_8386A28:: @ 8386A28 - .incbin "graphics/map_objects/053.4bpp" + .incbin "graphics/object_events/053.4bpp" gUnknown_8387E28:: @ 8387E28 - .incbin "graphics/map_objects/091.4bpp" + .incbin "graphics/object_events/091.4bpp" gUnknown_8388728:: @ 8388728 - .incbin "graphics/map_objects/025.4bpp" + .incbin "graphics/object_events/025.4bpp" gUnknown_8389128:: @ 8389128 - .incbin "graphics/map_objects/026.4bpp" + .incbin "graphics/object_events/026.4bpp" gUnknown_8389B28:: @ 8389B28 - .incbin "graphics/map_objects/071.4bpp" + .incbin "graphics/object_events/071.4bpp" gUnknown_838A428:: @ 838A428 - .incbin "graphics/map_objects/072.4bpp" + .incbin "graphics/object_events/072.4bpp" gUnknown_838AD28:: @ 838AD28 - .incbin "graphics/map_objects/064.4bpp" + .incbin "graphics/object_events/064.4bpp" gUnknown_838B128:: @ 838B128 - .incbin "graphics/map_objects/065.4bpp" + .incbin "graphics/object_events/065.4bpp" gUnknown_838B428:: @ 838B428 - .incbin "graphics/map_objects/066.4bpp" + .incbin "graphics/object_events/066.4bpp" gUnknown_838B728:: @ 838B728 - .incbin "graphics/map_objects/067.4bpp" + .incbin "graphics/object_events/067.4bpp" gUnknown_838BA28:: @ 838BA28 - .incbin "graphics/map_objects/092.4bpp" + .incbin "graphics/object_events/092.4bpp" gUnknown_838BAA8:: @ 838BAA8 - .incbin "graphics/map_objects/078.4bpp" + .incbin "graphics/object_events/078.4bpp" gUnknown_838C3A8:: @ 838C3A8 - .incbin "graphics/map_objects/079.4bpp" + .incbin "graphics/object_events/079.4bpp" gUnknown_838C6A8:: @ 838C6A8 - .incbin "graphics/map_objects/068.4bpp" + .incbin "graphics/object_events/068.4bpp" gUnknown_838CFA8:: @ 838CFA8 - .incbin "graphics/map_objects/069.4bpp" + .incbin "graphics/object_events/069.4bpp" gUnknown_838D2A8:: @ 838D2A8 - .incbin "graphics/map_objects/070.4bpp" + .incbin "graphics/object_events/070.4bpp" gUnknown_838D5A8:: @ 838D5A8 - .incbin "graphics/map_objects/unk_838D5A8.4bpp" + .incbin "graphics/object_events/unk_838D5A8.4bpp" gUnknown_838DEA8:: @ 838DEA8 - .incbin "graphics/map_objects/049.4bpp" + .incbin "graphics/object_events/049.4bpp" gUnknown_838E7A8:: @ 838E7A8 - .incbin "graphics/map_objects/089.4bpp" + .incbin "graphics/object_events/089.4bpp" gUnknown_838F0A8:: @ 838F0A8 - .incbin "graphics/map_objects/135.4bpp" + .incbin "graphics/object_events/135.4bpp" gUnknown_838F228:: @ 838F228 - .incbin "graphics/map_objects/136.4bpp" + .incbin "graphics/object_events/136.4bpp" gUnknown_838F428:: @ 838F428 - .incbin "graphics/map_objects/137.4bpp" + .incbin "graphics/object_events/137.4bpp" gUnknown_838F628:: @ 838F628 - .incbin "graphics/map_objects/138.4bpp" + .incbin "graphics/object_events/138.4bpp" gUnknown_838F828:: @ 838F828 - .incbin "graphics/map_objects/139.4bpp" + .incbin "graphics/object_events/139.4bpp" gUnknown_838F8A8:: @ 838F8A8 - .incbin "graphics/map_objects/140.4bpp" + .incbin "graphics/object_events/140.4bpp" gUnknown_838F928:: @ 838F928 - .incbin "graphics/map_objects/141.4bpp" + .incbin "graphics/object_events/141.4bpp" gUnknown_838F9A8:: @ 838F9A8 - .incbin "graphics/map_objects/143.4bpp" + .incbin "graphics/object_events/143.4bpp" gUnknown_838FA28:: @ 838FA28 - .incbin "graphics/map_objects/142.4bpp" + .incbin "graphics/object_events/142.4bpp" gUnknown_838FAA8:: @ 838FAA8 - .incbin "graphics/map_objects/144.4bpp" + .incbin "graphics/object_events/144.4bpp" gUnknown_838FEA8:: @ 838FEA8 - .incbin "graphics/map_objects/145.4bpp" + .incbin "graphics/object_events/145.4bpp" gUnknown_83902A8:: @ 83902A8 - .incbin "graphics/map_objects/146.4bpp" + .incbin "graphics/object_events/146.4bpp" gUnknown_8390328:: @ 8390328 - .incbin "graphics/map_objects/148.4bpp" + .incbin "graphics/object_events/148.4bpp" gUnknown_8390728:: @ 8390728 - .incbin "graphics/map_objects/149.4bpp" + .incbin "graphics/object_events/149.4bpp" gUnknown_8390B28:: @ 8390B28 - .incbin "graphics/map_objects/150.4bpp" + .incbin "graphics/object_events/150.4bpp" gUnknown_8390F28:: @ 8390F28 - .incbin "graphics/map_objects/075.4bpp" + .incbin "graphics/object_events/075.4bpp" gUnknown_8391228:: @ 8391228 - .incbin "graphics/map_objects/081.4bpp" + .incbin "graphics/object_events/081.4bpp" gUnknown_8391528:: @ 8391528 - .incbin "graphics/map_objects/074.4bpp" + .incbin "graphics/object_events/074.4bpp" gUnknown_8391828:: @ 8391828 - .incbin "graphics/map_objects/051.4bpp" + .incbin "graphics/object_events/051.4bpp" gUnknown_8391B28:: @ 8391B28 - .incbin "graphics/map_objects/088.4bpp" + .incbin "graphics/object_events/088.4bpp" gUnknown_8391E28:: @ 8391E28 - .incbin "graphics/map_objects/114.4bpp" + .incbin "graphics/object_events/114.4bpp" gUnknown_8391FA8:: @ 8391FA8 - .incbin "graphics/map_objects/118.4bpp" + .incbin "graphics/object_events/118.4bpp" gUnknown_8392128:: @ 8392128 - .incbin "graphics/map_objects/119.4bpp" + .incbin "graphics/object_events/119.4bpp" gUnknown_83922A8:: @ 83922A8 - .incbin "graphics/map_objects/122.4bpp" + .incbin "graphics/object_events/122.4bpp" gUnknown_8392428:: @ 8392428 - .incbin "graphics/map_objects/123.4bpp" + .incbin "graphics/object_events/123.4bpp" gUnknown_83925A8:: @ 83925A8 - .incbin "graphics/map_objects/124.4bpp" + .incbin "graphics/object_events/124.4bpp" gUnknown_8392728:: @ 8392728 - .incbin "graphics/map_objects/125.4bpp" + .incbin "graphics/object_events/125.4bpp" gUnknown_83928A8:: @ 83928A8 - .incbin "graphics/map_objects/126.4bpp" + .incbin "graphics/object_events/126.4bpp" gUnknown_8392A28:: @ 8392A28 - .incbin "graphics/map_objects/127.4bpp" + .incbin "graphics/object_events/127.4bpp" gUnknown_8392BA8:: @ 8392BA8 - .incbin "graphics/map_objects/128.4bpp" + .incbin "graphics/object_events/128.4bpp" gUnknown_8392D28:: @ 8392D28 - .incbin "graphics/map_objects/129.4bpp" + .incbin "graphics/object_events/129.4bpp" gUnknown_8392EA8:: @ 8392EA8 - .incbin "graphics/map_objects/130.4bpp" + .incbin "graphics/object_events/130.4bpp" gUnknown_8393028:: @ 8393028 - .incbin "graphics/map_objects/131.4bpp" + .incbin "graphics/object_events/131.4bpp" gUnknown_83931A8:: @ 83931A8 - .incbin "graphics/map_objects/132.4bpp" + .incbin "graphics/object_events/132.4bpp" gUnknown_8393328:: @ 8393328 - .incbin "graphics/map_objects/133.4bpp" + .incbin "graphics/object_events/133.4bpp" gUnknown_83934A8:: @ 83934A8 - .incbin "graphics/map_objects/147.4bpp" + .incbin "graphics/object_events/147.4bpp" gUnknown_8393628:: @ 8393628 - .incbin "graphics/map_objects/134.4bpp" + .incbin "graphics/object_events/134.4bpp" gUnknown_83937A8:: @ 83937A8 - .incbin "graphics/map_objects/109.4bpp" + .incbin "graphics/object_events/109.4bpp" gUnknown_83939A8:: @ 83939A8 - .incbin "graphics/map_objects/110.4bpp" + .incbin "graphics/object_events/110.4bpp" gUnknown_8393B28:: @ 8393B28 - .incbin "graphics/map_objects/111.4bpp" + .incbin "graphics/object_events/111.4bpp" gUnknown_8393CA8:: @ 8393CA8 - .incbin "graphics/map_objects/112.4bpp" + .incbin "graphics/object_events/112.4bpp" gUnknown_8393E28:: @ 8393E28 - .incbin "graphics/map_objects/117.4bpp" + .incbin "graphics/object_events/117.4bpp" gUnknown_8393FA8:: @ 8393FA8 - .incbin "graphics/map_objects/120.4bpp" + .incbin "graphics/object_events/120.4bpp" gUnknown_8394128:: @ 8394128 - .incbin "graphics/map_objects/115.4bpp" + .incbin "graphics/object_events/115.4bpp" gUnknown_83942A8:: @ 83942A8 - .incbin "graphics/map_objects/116.4bpp" + .incbin "graphics/object_events/116.4bpp" gUnknown_8394428:: @ 8394428 - .incbin "graphics/map_objects/113.4bpp" + .incbin "graphics/object_events/113.4bpp" gUnknown_83945A8:: @ 83945A8 - .incbin "graphics/map_objects/095.4bpp" + .incbin "graphics/object_events/095.4bpp" gUnknown_83947A8:: @ 83947A8 - .incbin "graphics/map_objects/096.4bpp" + .incbin "graphics/object_events/096.4bpp" gUnknown_83949A8:: @ 83949A8 - .incbin "graphics/map_objects/097.4bpp" + .incbin "graphics/object_events/097.4bpp" gUnknown_8394A28:: @ 8394A28 - .incbin "graphics/map_objects/098.4bpp" + .incbin "graphics/object_events/098.4bpp" gUnknown_8394AA8:: @ 8394AA8 - .incbin "graphics/map_objects/099.4bpp" + .incbin "graphics/object_events/099.4bpp" gUnknown_8394B28:: @ 8394B28 - .incbin "graphics/map_objects/100.4bpp" + .incbin "graphics/object_events/100.4bpp" gUnknown_8394BA8:: @ 8394BA8 - .incbin "graphics/map_objects/101.4bpp" + .incbin "graphics/object_events/101.4bpp" gUnknown_8394C28:: @ 8394C28 - .incbin "graphics/map_objects/102.4bpp" + .incbin "graphics/object_events/102.4bpp" gUnknown_8394D28:: @ 8394D28 - .incbin "graphics/map_objects/103.4bpp" + .incbin "graphics/object_events/103.4bpp" gUnknown_8394DA8:: @ 8394DA8 - .incbin "graphics/map_objects/104.4bpp" + .incbin "graphics/object_events/104.4bpp" gUnknown_8394E28:: @ 8394E28 - .incbin "graphics/map_objects/105.4bpp" + .incbin "graphics/object_events/105.4bpp" gUnknown_8394EA8:: @ 8394EA8 - .incbin "graphics/map_objects/19.gbapal" + .incbin "graphics/object_events/19.gbapal" gUnknown_8394EC8:: @ 8394EC8 - .incbin "graphics/map_objects/106.4bpp" + .incbin "graphics/object_events/106.4bpp" gUnknown_83950C8:: @ 83950C8 - .incbin "graphics/map_objects/107.4bpp" + .incbin "graphics/object_events/107.4bpp" gUnknown_83952C8:: @ 83952C8 - .incbin "graphics/map_objects/20.gbapal" + .incbin "graphics/object_events/20.gbapal" gUnknown_83952E8:: @ 83952E8 - .incbin "graphics/map_objects/108.4bpp" + .incbin "graphics/object_events/108.4bpp" gUnknown_8395AE8:: @ 8395AE8 - .incbin "graphics/map_objects/21.gbapal" + .incbin "graphics/object_events/21.gbapal" gUnknown_8395B08:: @ 8395B08 - .incbin "graphics/map_objects/151.4bpp" - .incbin "graphics/map_objects/unk_396B08.4bpp" + .incbin "graphics/object_events/151.4bpp" + +gUnknown_8396B08:: @ 8396B08 + .incbin "graphics/object_events/unk_396B08.4bpp" gUnknown_8397708:: @ 8397708 - .incbin "graphics/map_objects/060.4bpp" + .incbin "graphics/object_events/060.4bpp" gUnknown_8398008:: @ 8398008 - .incbin "graphics/map_objects/11.gbapal" + .incbin "graphics/object_events/11.gbapal" gUnknown_8398028:: @ 8398028 - .incbin "graphics/map_objects/12.gbapal" + .incbin "graphics/object_events/12.gbapal" + +gUnknown_8398048:: @ 8398048 + .incbin "graphics/object_events/pics/effects/shadow_small.4bpp" + +gUnknown_8398068:: @ 8398068 + .incbin "graphics/object_events/pics/effects/shadow_medium.4bpp" + +gUnknown_83980A8:: @ 83980A8 + .incbin "graphics/object_events/pics/effects/shadow_large.4bpp" - .incbin "baserom.gba", 0x398048, 0x600 +gUnknown_8398128:: @ 8398128 + .incbin "graphics/object_events/pics/effects/shadow_extra_large.4bpp" + +filler_8398528:: @ 8398528 + .fill 0x48, 0x4, 0x00 gUnknown_8398648:: - .incbin "graphics/map_objects/fldeff_cut.4bpp" - .incbin "graphics/map_objects/fldeff_cut.4bpp" + .incbin "graphics/object_events/fldeff_cut.4bpp" + +gUnknown_8398668:: + .incbin "graphics/object_events/fldeff_cut.4bpp" gUnknown_8398688:: - .incbin "graphics/map_objects/fldeff_cut.gbapal" - .incbin "baserom.gba", 0x3986A8, 0xCE0 - -gUnknown_8399388:: @ 8399388 - .incbin "baserom.gba", 0x399388, 0x908 - -gUnknown_8399C90:: @ 8399C90 - .incbin "baserom.gba", 0x399C90, 0x5F38 - -gUnknown_839FBC8:: @ 839FBC8 - .incbin "baserom.gba", 0x39FBC8, 0x144 - -gUnknown_839FD0C:: @ 839FD0C - .incbin "baserom.gba", 0x39FD0C, 0x51 - -gUnknown_839FD5D:: @ 839FD5D - .incbin "baserom.gba", 0x39FD5D, 0x53 - -gMapObjectGraphicsInfoPointers:: @ 839FDB0 - .4byte gMapObjectGraphicsInfo_83A3BB0 - .4byte gMapObjectGraphicsInfo_83A3BD4 - .4byte gMapObjectGraphicsInfo_83A3BF8 - .4byte gMapObjectGraphicsInfo_83A3C1C - .4byte gMapObjectGraphicsInfo_83A4858 - .4byte gMapObjectGraphicsInfo_83A48A0 - .4byte gMapObjectGraphicsInfo_83A48C4 - .4byte gMapObjectGraphicsInfo_83A4564 - .4byte gMapObjectGraphicsInfo_83A4588 - .4byte gMapObjectGraphicsInfo_83A45AC - .4byte gMapObjectGraphicsInfo_83A45D0 - .4byte gMapObjectGraphicsInfo_83A487C - .4byte gMapObjectGraphicsInfo_83A48E8 - .4byte gMapObjectGraphicsInfo_83A490C - .4byte gMapObjectGraphicsInfo_83A3C64 - .4byte gMapObjectGraphicsInfo_83A3C88 - .4byte gMapObjectGraphicsInfo_83A3CAC - .4byte gMapObjectGraphicsInfo_83A3CD0 - .4byte gMapObjectGraphicsInfo_83A3D3C - .4byte gMapObjectGraphicsInfo_83A3DA8 - .4byte gMapObjectGraphicsInfo_83A3DF0 - .4byte gMapObjectGraphicsInfo_83A3CF4 - .4byte gMapObjectGraphicsInfo_83A3D18 - .4byte gMapObjectGraphicsInfo_83A3D60 - .4byte gMapObjectGraphicsInfo_83A3DCC - .4byte gMapObjectGraphicsInfo_83A4390 - .4byte gMapObjectGraphicsInfo_83A43B4 - .4byte gMapObjectGraphicsInfo_83A3E14 - .4byte gMapObjectGraphicsInfo_83A3E5C - .4byte gMapObjectGraphicsInfo_83A3EEC - .4byte gMapObjectGraphicsInfo_83A3E38 - .4byte gMapObjectGraphicsInfo_83A3D84 - .4byte gMapObjectGraphicsInfo_83A3E80 - .4byte gMapObjectGraphicsInfo_83A3F34 - .4byte gMapObjectGraphicsInfo_83A4420 - .4byte gMapObjectGraphicsInfo_83A3F58 - .4byte gMapObjectGraphicsInfo_83A424C - .4byte gMapObjectGraphicsInfo_83A4228 - .4byte gMapObjectGraphicsInfo_83A4270 - .4byte gMapObjectGraphicsInfo_83A3F7C - .4byte gMapObjectGraphicsInfo_83A3FA0 - .4byte gMapObjectGraphicsInfo_83A3FC4 - .4byte gMapObjectGraphicsInfo_83A3FE8 - .4byte gMapObjectGraphicsInfo_83A4078 - .4byte gMapObjectGraphicsInfo_83A409C - .4byte gMapObjectGraphicsInfo_83A40C0 - .4byte gMapObjectGraphicsInfo_83A40E4 - .4byte gMapObjectGraphicsInfo_83A3EA4 - .4byte gMapObjectGraphicsInfo_83A3EC8 - .4byte gMapObjectGraphicsInfo_83A4618 - .4byte gMapObjectGraphicsInfo_83A4054 - .4byte gMapObjectGraphicsInfo_83A4978 - .4byte gMapObjectGraphicsInfo_83A400C - .4byte gMapObjectGraphicsInfo_83A42B8 - .4byte gMapObjectGraphicsInfo_83A4108 - .4byte gMapObjectGraphicsInfo_83A412C - .4byte gMapObjectGraphicsInfo_83A4294 - .4byte gMapObjectGraphicsInfo_83A41BC - .4byte gMapObjectGraphicsInfo_83A4030 - .4byte gMapObjectGraphicsInfo_83A3F10 - .4byte gMapObjectGraphicsInfo_83A3C40 - .4byte gMapObjectGraphicsInfo_83A4150 - .4byte gMapObjectGraphicsInfo_83A4174 - .4byte gMapObjectGraphicsInfo_83A4198 - .4byte gMapObjectGraphicsInfo_83A4300 - .4byte gMapObjectGraphicsInfo_83A44D4 - .4byte gMapObjectGraphicsInfo_83A44F8 - .4byte gMapObjectGraphicsInfo_83A4324 - .4byte gMapObjectGraphicsInfo_83A4468 - .4byte gMapObjectGraphicsInfo_83A448C - .4byte gMapObjectGraphicsInfo_83A44B0 - .4byte gMapObjectGraphicsInfo_83A436C - .4byte gMapObjectGraphicsInfo_83A4834 - .4byte gMapObjectGraphicsInfo_83A47A4 - .4byte gMapObjectGraphicsInfo_83A4810 - .4byte gMapObjectGraphicsInfo_83A4660 - .4byte gMapObjectGraphicsInfo_83A47C8 - .4byte gMapObjectGraphicsInfo_83A47EC - .4byte gMapObjectGraphicsInfo_83A43D8 - .4byte gMapObjectGraphicsInfo_83A43FC - .4byte gMapObjectGraphicsInfo_83A4684 - .4byte gMapObjectGraphicsInfo_83A46A8 - .4byte gMapObjectGraphicsInfo_83A46CC - .4byte gMapObjectGraphicsInfo_83A46F0 - .4byte gMapObjectGraphicsInfo_83A4714 - .4byte gMapObjectGraphicsInfo_83A4780 - .4byte gMapObjectGraphicsInfo_83A475C - .4byte gMapObjectGraphicsInfo_83A4738 - .4byte gMapObjectGraphicsInfo_83A50EC - .4byte gMapObjectGraphicsInfo_83A463C - .4byte gMapObjectGraphicsInfo_83A41E0 - .4byte gMapObjectGraphicsInfo_83A42DC - .4byte gMapObjectGraphicsInfo_83A4348 - .4byte gMapObjectGraphicsInfo_83A4930 - .4byte gMapObjectGraphicsInfo_83A4954 - .4byte gMapObjectGraphicsInfo_83A4444 - .4byte gMapObjectGraphicsInfo_83A451C - .4byte gMapObjectGraphicsInfo_83A4540 - .4byte gMapObjectGraphicsInfo_83A49C0 - .4byte gMapObjectGraphicsInfo_83A49E4 - .4byte gMapObjectGraphicsInfo_83A4A08 - .4byte gMapObjectGraphicsInfo_83A4A2C - .4byte gMapObjectGraphicsInfo_83A4A50 - .4byte gMapObjectGraphicsInfo_83A4A74 - .4byte gMapObjectGraphicsInfo_83A4A98 - .4byte gMapObjectGraphicsInfo_83A4ABC - .4byte gMapObjectGraphicsInfo_83A4AE0 - .4byte gMapObjectGraphicsInfo_83A4B04 - .4byte gMapObjectGraphicsInfo_83A5110 - .4byte gMapObjectGraphicsInfo_83A499C - .4byte gMapObjectGraphicsInfo_83A4B28 - .4byte gMapObjectGraphicsInfo_83A4F84 - .4byte gMapObjectGraphicsInfo_83A4FF0 - .4byte gMapObjectGraphicsInfo_83A50C8 - .4byte gMapObjectGraphicsInfo_83A5014 - .4byte gMapObjectGraphicsInfo_83A5080 - .4byte gMapObjectGraphicsInfo_83A50A4 - .4byte gMapObjectGraphicsInfo_83A5038 - .4byte gMapObjectGraphicsInfo_83A4B4C - .4byte gMapObjectGraphicsInfo_83A4B70 - .4byte gMapObjectGraphicsInfo_83A505C - .4byte gMapObjectGraphicsInfo_83A4B94 - .4byte gMapObjectGraphicsInfo_83A4BB8 - .4byte gMapObjectGraphicsInfo_83A4BDC - .4byte gMapObjectGraphicsInfo_83A4C00 - .4byte gMapObjectGraphicsInfo_83A4C24 - .4byte gMapObjectGraphicsInfo_83A4C48 - .4byte gMapObjectGraphicsInfo_83A4C6C - .4byte gMapObjectGraphicsInfo_83A4C90 - .4byte gMapObjectGraphicsInfo_83A4CB4 - .4byte gMapObjectGraphicsInfo_83A4CD8 - .4byte gMapObjectGraphicsInfo_83A4CFC - .4byte gMapObjectGraphicsInfo_83A4D20 - .4byte gMapObjectGraphicsInfo_83A4D44 - .4byte gMapObjectGraphicsInfo_83A4FA8 - .4byte gMapObjectGraphicsInfo_83A4D68 - .4byte gMapObjectGraphicsInfo_83A4D8C - .4byte gMapObjectGraphicsInfo_83A4DB0 - .4byte gMapObjectGraphicsInfo_83A4DD4 - .4byte gMapObjectGraphicsInfo_83A4E64 - .4byte gMapObjectGraphicsInfo_83A4E88 - .4byte gMapObjectGraphicsInfo_83A4EAC - .4byte gMapObjectGraphicsInfo_83A4EF4 - .4byte gMapObjectGraphicsInfo_83A4ED0 - .4byte gMapObjectGraphicsInfo_83A4F18 - .4byte gMapObjectGraphicsInfo_83A4F3C - .4byte gMapObjectGraphicsInfo_83A4F60 - .4byte gMapObjectGraphicsInfo_83A4FCC - .4byte gMapObjectGraphicsInfo_83A4DF8 - .4byte gMapObjectGraphicsInfo_83A4E1C - .4byte gMapObjectGraphicsInfo_83A4E40 - .4byte gMapObjectGraphicsInfo_83A5134 - -gUnknown_83A0010:: @ 83A0010 - .incbin "baserom.gba", 0x3A0010, 0x90 + .incbin "graphics/object_events/fldeff_cut.gbapal" + +gUnknown_83986A8:: @ 83986A8 + .incbin "graphics/object_events/pics/unknown/83986A8.4bpp" + +gUnknown_8398928:: @ 8398928 + .incbin "graphics/object_events/pics/unknown/8398928.4bpp" + +gUnknown_8398BA8:: @ 8398BA8 + .incbin "graphics/object_events/pics/unknown/8398BA8.4bpp" + +gUnknown_8398FA8:: @ 8398FA8 + .incbin "graphics/object_events/palettes/8398FA8.gbapal" + +gUnknown_8398FC8:: @ 8398FC8 + .incbin "graphics/object_events/palettes/8398FC8.gbapal" + +gUnknown_8399008:: @ 8399008 + .incbin "graphics/object_events/pics/unknown/8399008.4bpp" + +gUnknown_83990C8:: @ 83990C8 + .incbin "graphics/object_events/pics/unknown/83990C8.4bpp" + +gUnknown_8399188:: @ 8399188 + .incbin "graphics/object_events/pics/unknown/8399188.4bpp" + +gUnknown_8399288:: @ 8399288 + .incbin "graphics/object_events/pics/unknown/8399288.4bpp" + +gUnknown_8399488:: @ 8399488 + .incbin "graphics/object_events/pics/unknown/8399488.4bpp" + +gUnknown_8399788:: @ 8399788 + .incbin "graphics/object_events/pics/unknown/8399788.4bpp" + +gUnknown_8399C08:: @ 8399C08 + .incbin "graphics/object_events/pics/unknown/8399C08.4bpp" + +gUnknown_8399E08:: @ 8399E08 + .incbin "graphics/object_events/pics/unknown/8399E08.4bpp" + +gUnknown_8399E88:: @ 8399E88 + .incbin "graphics/object_events/pics/unknown/8399E88.4bpp" + +gUnknown_8399F08:: @ 8399F08 + .incbin "graphics/object_events/pics/unknown/8399F08.4bpp" + +gUnknown_8399F88:: @ 8399F88 + .incbin "graphics/object_events/pics/unknown/8399F88.4bpp" + +gUnknown_839A008:: @ 839A008 + .incbin "graphics/object_events/pics/unknown/839A008.4bpp" + +gUnknown_839A288:: @ 839A288 + .incbin "graphics/object_events/pics/unknown/839A288.4bpp" + +gUnknown_839A388:: @ 839A388 + .incbin "graphics/object_events/pics/unknown/839A388.4bpp" + +gUnknown_839A408:: @ 839A408 + .incbin "graphics/object_events/pics/unknown/839A408.4bpp" + +gUnknown_839A488:: @ 839A488 + .incbin "graphics/object_events/pics/unknown/839A488.4bpp" + +gUnknown_839A508:: @ 839A508 + .incbin "graphics/object_events/pics/unknown/839A508.4bpp" + +gUnknown_839A588:: @ 839A588 + .incbin "graphics/object_events/pics/unknown/839A588.4bpp" + +gUnknown_839A608:: @ 839A608 + .incbin "graphics/object_events/pics/unknown/839A608.4bpp" + +gUnknown_839A688:: @ 839A688 + .incbin "graphics/object_events/pics/unknown/839A688.4bpp" + +gUnknown_839A708:: @ 839A708 + .incbin "graphics/object_events/pics/unknown/839A708.4bpp" + +gUnknown_839A788:: @ 839A788 + .incbin "graphics/object_events/pics/unknown/839A788.4bpp" + +gUnknown_839A988:: @ 839A988 + .incbin "graphics/object_events/pics/unknown/839A988.4bpp" + +gUnknown_839AA48:: @ 839AA48 + .incbin "graphics/object_events/pics/unknown/839AA48.4bpp" + +gUnknown_839AAC8:: @ 839AAC8 + .incbin "graphics/object_events/pics/unknown/839AAC8.4bpp" + +gUnknown_839AB48:: @ 839AB48 + .incbin "graphics/object_events/pics/unknown/839AB48.4bpp" + +gUnknown_839ABC8:: @ 839ABC8 + .incbin "graphics/object_events/pics/unknown/839ABC8.4bpp" + +gUnknown_839AC48:: @ 839AC48 + .incbin "graphics/object_events/pics/unknown/839AC48.4bpp" + +gUnknown_839AC88:: @ 839AC88 + .incbin "graphics/object_events/pics/unknown/839AC88.4bpp" + +gUnknown_839ACC8:: @ 839ACC8 + .incbin "graphics/object_events/pics/unknown/839ACC8.4bpp" + +gUnknown_839AD08:: @ 839AD08 + .incbin "graphics/object_events/pics/unknown/839AD08.4bpp" + +gUnknown_839AD48:: @ 839AD48 + .incbin "graphics/object_events/pics/unknown/839AD48.4bpp" + +gUnknown_839AD88:: @ 839AD88 + .incbin "graphics/object_events/pics/unknown/839AD88.4bpp" + +gUnknown_839B008:: @ 839B008 + .incbin "graphics/object_events/pics/unknown/839B008.4bpp" + +gUnknown_839B708:: @ 839B708 + .incbin "graphics/object_events/pics/unknown/839B708.4bpp" + +gUnknown_839BE08:: @ 839BE08 + .incbin "graphics/object_events/pics/unknown/839BE08.4bpp" + +gUnknown_839C508:: @ 839C508 + .incbin "graphics/object_events/pics/unknown/839C508.4bpp" + +gUnknown_839C588:: @ 839C588 + .incbin "graphics/object_events/palettes/839C588.gbapal" + +gUnknown_839C5A8:: @ 839C5A8 + .incbin "graphics/object_events/pics/unknown/839C5A8.4bpp" + +gUnknown_839C628:: @ 839C628 + .incbin "graphics/object_events/pics/unknown/839C628.4bpp" + +gUnknown_839C6A8:: @ 839C6A8 + .incbin "graphics/object_events/pics/unknown/839C6A8.4bpp" + +gUnknown_839C728:: @ 839C728 + .incbin "graphics/object_events/pics/unknown/839C728.4bpp" + +gUnknown_839C7A8:: @ 839C7A8 + .incbin "graphics/object_events/pics/unknown/839C7A8.4bpp" + +gUnknown_839C828:: @ 839C828 + .incbin "graphics/object_events/pics/unknown/839C828.4bpp" + +gUnknown_839C8A8:: @ 839C8A8 + .incbin "graphics/object_events/pics/unknown/839C8A8.4bpp" + +gUnknown_839C928:: @ 839C928 + .incbin "graphics/object_events/pics/unknown/839C928.4bpp" + +gUnknown_839C9A8:: @ 839C9A8 + .incbin "graphics/object_events/pics/unknown/839C9A8.4bpp" + +gUnknown_839CA28:: @ 839CA28 + .incbin "graphics/object_events/pics/unknown/839CA28.4bpp" + +gUnknown_839CAA8:: @ 839CAA8 + .incbin "graphics/object_events/pics/unknown/839CAA8.4bpp" + +gUnknown_839CBA8:: @ 839CBA8 + .incbin "graphics/object_events/pics/unknown/839CBA8.4bpp" + +gUnknown_839CCA8:: @ 839CCA8 + .incbin "graphics/object_events/pics/unknown/839CCA8.4bpp" + +gUnknown_839CDA8:: @ 839CDA8 + .incbin "graphics/object_events/pics/unknown/839CDA8.4bpp" + +gUnknown_839CEA8:: @ 839CEA8 + .incbin "graphics/object_events/pics/unknown/839CEA8.4bpp" +gUnknown_839CFA8:: @ 839CFA8 + .incbin "graphics/object_events/pics/unknown/839CFA8.4bpp" + +gUnknown_839D0A8:: @ 839D0A8 + .incbin "graphics/object_events/pics/unknown/839D0A8.4bpp" + +gUnknown_839D1A8:: @ 839D1A8 + .incbin "graphics/object_events/pics/unknown/839D1A8.4bpp" + +gUnknown_839D2A8:: @ 839D2A8 + .incbin "graphics/object_events/pics/unknown/839D2A8.4bpp" + +gUnknown_839D328:: @ 839D328 + .incbin "graphics/object_events/pics/unknown/839D328.4bpp" + +gUnknown_839D3A8:: @ 839D3A8 + .incbin "graphics/object_events/palettes/839D3A8.gbapal" + +gUnknown_839D3C8:: @ 839D3C8 + .incbin "graphics/object_events/pics/unknown/839D3C8.4bpp" + +gMovementTypeCallbacks:: @ 839FBC8 + .4byte sub_805FFB4 + .4byte sub_806058C + .4byte sub_805FFDC + .4byte sub_80606CC + .4byte sub_80606CC + .4byte sub_8060850 + .4byte sub_8060850 + .4byte sub_80609D4 + .4byte sub_80609D4 + .4byte sub_80609D4 + .4byte sub_80609D4 + .4byte sub_805B3B8 + .4byte NULL + .4byte sub_8060A74 + .4byte sub_8060BB4 + .4byte sub_8060CF4 + .4byte sub_8060E34 + .4byte sub_8060F74 + .4byte sub_80610B4 + .4byte sub_80611F4 + .4byte sub_8061334 + .4byte sub_8061474 + .4byte sub_80615B4 + .4byte sub_80616F4 + .4byte sub_80617F8 + .4byte sub_80618FC + .4byte sub_80618FC + .4byte sub_80618FC + .4byte sub_80618FC + .4byte sub_8061B5C + .4byte sub_8061BE8 + .4byte sub_8061C74 + .4byte sub_8061D00 + .4byte sub_8061D8C + .4byte sub_8061E18 + .4byte sub_8061EA4 + .4byte sub_8061F30 + .4byte sub_8061FBC + .4byte sub_8062048 + .4byte sub_80620D4 + .4byte sub_8062160 + .4byte sub_80621EC + .4byte sub_8062278 + .4byte sub_8062304 + .4byte sub_8062390 + .4byte sub_806241C + .4byte sub_80624A8 + .4byte sub_8062534 + .4byte sub_80625C0 + .4byte sub_806264C + .4byte sub_80626D8 + .4byte sub_8062764 + .4byte sub_80627F0 + .4byte sub_806287C + .4byte sub_806287C + .4byte sub_806287C + .4byte sub_806287C + .4byte ObjectEventCB_TreeDisguise + .4byte ObjectEventCB_MountainDisguise + .4byte sub_8062E60 + .4byte sub_8062E60 + .4byte sub_8062E60 + .4byte sub_8062E60 + .4byte ObjectEventCB_Hidden1 + .4byte sub_80630A0 + .4byte sub_80630A0 + .4byte sub_80630A0 + .4byte sub_80630A0 + .4byte sub_8063110 + .4byte sub_8063110 + .4byte sub_8063110 + .4byte sub_8063110 + .4byte sub_8063180 + .4byte sub_8063180 + .4byte sub_8063180 + .4byte sub_8063180 + .4byte sub_80631F0 + .4byte sub_8063298 + .4byte sub_80632BC + .4byte sub_80632E0 + .4byte sub_8060020 + +gRangedMovementTypes:: @ 839FD0C + .byte FALSE @ MOVEMENT_TYPE_NONE + .byte FALSE @ MOVEMENT_TYPE_LOOK_AROUND + .byte TRUE @ MOVEMENT_TYPE_WANDER_AROUND + .byte TRUE @ MOVEMENT_TYPE_WANDER_UP_AND_DOWN + .byte TRUE @ MOVEMENT_TYPE_WANDER_DOWN_AND_UP + .byte TRUE @ MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_FACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_PLAYER + .byte FALSE @ MOVEMENT_TYPE_BERRY_TREE_GROWTH + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_UP + .byte FALSE @ MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE + .byte FALSE @ MOVEMENT_TYPE_ROTATE_CLOCKWISE + .byte TRUE @ MOVEMENT_TYPE_WALK_UP_AND_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_DOWN_AND_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE + .byte FALSE @ MOVEMENT_TYPE_TREE_DISGUISE + .byte FALSE @ MOVEMENT_TYPE_MOUNTAIN_DISGUISE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS + .byte FALSE @ MOVEMENT_TYPE_HIDDEN + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_INVISIBLE + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + +gInitialMovementTypeFacingDirections:: @ 839FD5D + .byte 1 @ [MOVEMENT_TYPE_NONE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_SOUTH, + +.align 2, 0 +gObjectEventGraphicsInfoPointers:: @ 839FDB0 + .4byte gObjectEventGraphicsInfo_83A3BB0 + .4byte gObjectEventGraphicsInfo_83A3BD4 + .4byte gObjectEventGraphicsInfo_83A3BF8 + .4byte gObjectEventGraphicsInfo_83A3C1C + .4byte gObjectEventGraphicsInfo_83A4858 + .4byte gObjectEventGraphicsInfo_83A48A0 + .4byte gObjectEventGraphicsInfo_83A48C4 + .4byte gObjectEventGraphicsInfo_83A4564 + .4byte gObjectEventGraphicsInfo_83A4588 + .4byte gObjectEventGraphicsInfo_83A45AC + .4byte gObjectEventGraphicsInfo_83A45D0 + .4byte gObjectEventGraphicsInfo_83A487C + .4byte gObjectEventGraphicsInfo_83A48E8 + .4byte gObjectEventGraphicsInfo_83A490C + .4byte gObjectEventGraphicsInfo_83A3C64 + .4byte gObjectEventGraphicsInfo_83A3C88 + .4byte gObjectEventGraphicsInfo_83A3CAC + .4byte gObjectEventGraphicsInfo_83A3CD0 + .4byte gObjectEventGraphicsInfo_83A3D3C + .4byte gObjectEventGraphicsInfo_83A3DA8 + .4byte gObjectEventGraphicsInfo_83A3DF0 + .4byte gObjectEventGraphicsInfo_83A3CF4 + .4byte gObjectEventGraphicsInfo_83A3D18 + .4byte gObjectEventGraphicsInfo_83A3D60 + .4byte gObjectEventGraphicsInfo_83A3DCC + .4byte gObjectEventGraphicsInfo_83A4390 + .4byte gObjectEventGraphicsInfo_83A43B4 + .4byte gObjectEventGraphicsInfo_83A3E14 + .4byte gObjectEventGraphicsInfo_83A3E5C + .4byte gObjectEventGraphicsInfo_83A3EEC + .4byte gObjectEventGraphicsInfo_83A3E38 + .4byte gObjectEventGraphicsInfo_83A3D84 + .4byte gObjectEventGraphicsInfo_83A3E80 + .4byte gObjectEventGraphicsInfo_83A3F34 + .4byte gObjectEventGraphicsInfo_83A4420 + .4byte gObjectEventGraphicsInfo_83A3F58 + .4byte gObjectEventGraphicsInfo_83A424C + .4byte gObjectEventGraphicsInfo_83A4228 + .4byte gObjectEventGraphicsInfo_83A4270 + .4byte gObjectEventGraphicsInfo_83A3F7C + .4byte gObjectEventGraphicsInfo_83A3FA0 + .4byte gObjectEventGraphicsInfo_83A3FC4 + .4byte gObjectEventGraphicsInfo_83A3FE8 + .4byte gObjectEventGraphicsInfo_83A4078 + .4byte gObjectEventGraphicsInfo_83A409C + .4byte gObjectEventGraphicsInfo_83A40C0 + .4byte gObjectEventGraphicsInfo_83A40E4 + .4byte gObjectEventGraphicsInfo_83A3EA4 + .4byte gObjectEventGraphicsInfo_83A3EC8 + .4byte gObjectEventGraphicsInfo_83A4618 + .4byte gObjectEventGraphicsInfo_83A4054 + .4byte gObjectEventGraphicsInfo_83A4978 + .4byte gObjectEventGraphicsInfo_83A400C + .4byte gObjectEventGraphicsInfo_83A42B8 + .4byte gObjectEventGraphicsInfo_83A4108 + .4byte gObjectEventGraphicsInfo_83A412C + .4byte gObjectEventGraphicsInfo_83A4294 + .4byte gObjectEventGraphicsInfo_83A41BC + .4byte gObjectEventGraphicsInfo_83A4030 + .4byte gObjectEventGraphicsInfo_83A3F10 + .4byte gObjectEventGraphicsInfo_83A3C40 + .4byte gObjectEventGraphicsInfo_83A4150 + .4byte gObjectEventGraphicsInfo_83A4174 + .4byte gObjectEventGraphicsInfo_83A4198 + .4byte gObjectEventGraphicsInfo_83A4300 + .4byte gObjectEventGraphicsInfo_83A44D4 + .4byte gObjectEventGraphicsInfo_83A44F8 + .4byte gObjectEventGraphicsInfo_83A4324 + .4byte gObjectEventGraphicsInfo_83A4468 + .4byte gObjectEventGraphicsInfo_83A448C + .4byte gObjectEventGraphicsInfo_83A44B0 + .4byte gObjectEventGraphicsInfo_83A436C + .4byte gObjectEventGraphicsInfo_83A4834 + .4byte gObjectEventGraphicsInfo_83A47A4 + .4byte gObjectEventGraphicsInfo_83A4810 + .4byte gObjectEventGraphicsInfo_83A4660 + .4byte gObjectEventGraphicsInfo_83A47C8 + .4byte gObjectEventGraphicsInfo_83A47EC + .4byte gObjectEventGraphicsInfo_83A43D8 + .4byte gObjectEventGraphicsInfo_83A43FC + .4byte gObjectEventGraphicsInfo_83A4684 + .4byte gObjectEventGraphicsInfo_83A46A8 + .4byte gObjectEventGraphicsInfo_83A46CC + .4byte gObjectEventGraphicsInfo_83A46F0 + .4byte gObjectEventGraphicsInfo_83A4714 + .4byte gObjectEventGraphicsInfo_83A4780 + .4byte gObjectEventGraphicsInfo_83A475C + .4byte gObjectEventGraphicsInfo_83A4738 + .4byte gObjectEventGraphicsInfo_83A50EC + .4byte gObjectEventGraphicsInfo_83A463C + .4byte gObjectEventGraphicsInfo_83A41E0 + .4byte gObjectEventGraphicsInfo_83A42DC + .4byte gObjectEventGraphicsInfo_83A4348 + .4byte gObjectEventGraphicsInfo_83A4930 + .4byte gObjectEventGraphicsInfo_83A4954 + .4byte gObjectEventGraphicsInfo_83A4444 + .4byte gObjectEventGraphicsInfo_83A451C + .4byte gObjectEventGraphicsInfo_83A4540 + .4byte gObjectEventGraphicsInfo_83A49C0 + .4byte gObjectEventGraphicsInfo_83A49E4 + .4byte gObjectEventGraphicsInfo_83A4A08 + .4byte gObjectEventGraphicsInfo_83A4A2C + .4byte gObjectEventGraphicsInfo_83A4A50 + .4byte gObjectEventGraphicsInfo_83A4A74 + .4byte gObjectEventGraphicsInfo_83A4A98 + .4byte gObjectEventGraphicsInfo_83A4ABC + .4byte gObjectEventGraphicsInfo_83A4AE0 + .4byte gObjectEventGraphicsInfo_83A4B04 + .4byte gObjectEventGraphicsInfo_83A5110 + .4byte gObjectEventGraphicsInfo_83A499C + .4byte gObjectEventGraphicsInfo_83A4B28 + .4byte gObjectEventGraphicsInfo_83A4F84 + .4byte gObjectEventGraphicsInfo_83A4FF0 + .4byte gObjectEventGraphicsInfo_83A50C8 + .4byte gObjectEventGraphicsInfo_83A5014 + .4byte gObjectEventGraphicsInfo_83A5080 + .4byte gObjectEventGraphicsInfo_83A50A4 + .4byte gObjectEventGraphicsInfo_83A5038 + .4byte gObjectEventGraphicsInfo_83A4B4C + .4byte gObjectEventGraphicsInfo_83A4B70 + .4byte gObjectEventGraphicsInfo_83A505C + .4byte gObjectEventGraphicsInfo_83A4B94 + .4byte gObjectEventGraphicsInfo_83A4BB8 + .4byte gObjectEventGraphicsInfo_83A4BDC + .4byte gObjectEventGraphicsInfo_83A4C00 + .4byte gObjectEventGraphicsInfo_83A4C24 + .4byte gObjectEventGraphicsInfo_83A4C48 + .4byte gObjectEventGraphicsInfo_83A4C6C + .4byte gObjectEventGraphicsInfo_83A4C90 + .4byte gObjectEventGraphicsInfo_83A4CB4 + .4byte gObjectEventGraphicsInfo_83A4CD8 + .4byte gObjectEventGraphicsInfo_83A4CFC + .4byte gObjectEventGraphicsInfo_83A4D20 + .4byte gObjectEventGraphicsInfo_83A4D44 + .4byte gObjectEventGraphicsInfo_83A4FA8 + .4byte gObjectEventGraphicsInfo_83A4D68 + .4byte gObjectEventGraphicsInfo_83A4D8C + .4byte gObjectEventGraphicsInfo_83A4DB0 + .4byte gObjectEventGraphicsInfo_83A4DD4 + .4byte gObjectEventGraphicsInfo_83A4E64 + .4byte gObjectEventGraphicsInfo_83A4E88 + .4byte gObjectEventGraphicsInfo_83A4EAC + .4byte gObjectEventGraphicsInfo_83A4EF4 + .4byte gObjectEventGraphicsInfo_83A4ED0 + .4byte gObjectEventGraphicsInfo_83A4F18 + .4byte gObjectEventGraphicsInfo_83A4F3C + .4byte gObjectEventGraphicsInfo_83A4F60 + .4byte gObjectEventGraphicsInfo_83A4FCC + .4byte gObjectEventGraphicsInfo_83A4DF8 + .4byte gObjectEventGraphicsInfo_83A4E1C + .4byte gObjectEventGraphicsInfo_83A4E40 + .4byte gObjectEventGraphicsInfo_83A5134 + +gFieldEffectObjectTemplatePointers:: @ 83A0010 + .4byte gUnknown_83A537C + .4byte gUnknown_83A5394 + .4byte gUnknown_83A53AC + .4byte gUnknown_83A53C4 + .4byte gUnknown_83A5420 + .4byte gUnknown_83A5488 + .4byte gUnknown_83A54E4 + .4byte gUnknown_83A556C + .4byte gUnknown_83A5604 + .4byte gUnknown_83A5648 + .4byte gUnknown_83A5698 + .4byte gUnknown_83A56F4 + .4byte gUnknown_83A583C + .4byte gUnknown_83A589C + .4byte gUnknown_83A58E0 + .4byte gUnknown_83A593C + .4byte gUnknown_83A59A4 + .4byte gUnknown_83A5A30 + .4byte gUnknown_83A5A88 + .4byte gUnknown_83A5AD8 + .4byte gUnknown_83A5B74 + .4byte gUnknown_83A5C34 + .4byte NULL + .4byte gUnknown_83A5750 + .4byte gUnknown_83A5CB4 + .4byte gUnknown_83A5D34 + .4byte gUnknown_83A5E00 + .4byte gUnknown_83A57EC + .4byte gUnknown_83A5D84 + .4byte gUnknown_83A5B1C + .4byte gUnknown_83A5E38 + .4byte gUnknown_83A5E64 + .4byte gUnknown_83A5EC0 + .4byte gUnknown_83A5F24 + .4byte gUnknown_83A5FA4 + .4byte gUnknown_83A5FE0 gSpriteImages_83A00A0:: @ 83A00A0 obj_frame_tiles gUnknown_835BB68, 0x100 @@ -3170,7 +3650,22 @@ gAnimCmd_83A3298:: @ 83A3298 obj_image_anim_frame 3, 30, 0x40 obj_image_anim_jump 0 - .incbin "baserom.gba", 0x3A32AC, 0x68 +gUnknown_83A32AC:: @ 83A32AC + obj_rot_scal_anim_frame 0, 0, 1, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_loop 7 + obj_rot_scal_anim_jump 0 + +gUnknown_83A32DC:: @ 83A32DC + obj_rot_scal_anim_frame 0, 0, -1, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_loop 15 + obj_rot_scal_anim_frame 0, 0, 1, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_loop 15 + obj_rot_scal_anim_jump 0 gAnimTable_83A3314:: @ 83A3314 .4byte gAnimCmd_83A2950 @@ -3445,25 +3940,31 @@ gUnknown_83A3698:: @ 83A3698 .byte 3, 7, 0, 4 .4byte 0x00000000, 0x00000000 -gEventObjectBaseOam_128x64:: +gObjectEventBaseOam_128x64:: .4byte 0x00000000, 0x00000800 + +gObjectEventBaseOam_Unknown1:: .4byte 0x00004000, 0x00000800 -gEventObjectBaseOam_16x16:: +gObjectEventBaseOam_16x16:: .4byte 0x40000000, 0x00000800 -gEventObjectBaseOam_32x16:: +gObjectEventBaseOam_32x16:: .4byte 0x80004000, 0x00000800 + +gObjectEventBaseOam_Unknown2:: .4byte 0x40004000, 0x00000800 + +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 @@ -3582,7 +4083,71 @@ gSubspriteTables_83A37F0:: @ 83A37F0 .align 2 .4byte gSubsprites_83A37E8 - .incbin "baserom.gba", 0x3a3820, 0xa0 +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 @@ -3616,7 +4181,93 @@ gSubspriteTables_83A38D0:: @ 83A38D0 .align 2 .4byte gSubsprites_83A38CC - .incbin "baserom.gba", 0x3a3900, 0x120 +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 @@ -3656,2181 +4307,4877 @@ gSubspriteTables_83A3A50:: @ 83A3A50 .align 2 .4byte gSubsprites_83A3A40 - .incbin "baserom.gba", 0x3A3A80, 0x130 - -gMapObjectGraphicsInfo_83A3BB0:: @ 83A3BB0 +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 + +gObjectEventGraphicsInfo_83A3BB0:: @ 83A3BB0 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3BD4:: @ 83A3BD4 +gObjectEventGraphicsInfo_83A3BD4:: @ 83A3BD4 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3BF8:: @ 83A3BF8 +gObjectEventGraphicsInfo_83A3BF8:: @ 83A3BF8 .2byte 0xFFFF, 0x1100, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3C1C:: @ 83A3C1C +gObjectEventGraphicsInfo_83A3C1C:: @ 83A3C1C .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3C40:: @ 83A3C40 +gObjectEventGraphicsInfo_83A3C40:: @ 83A3C40 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3C64:: @ 83A3C64 +gObjectEventGraphicsInfo_83A3C64:: @ 83A3C64 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3C88:: @ 83A3C88 +gObjectEventGraphicsInfo_83A3C88:: @ 83A3C88 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3CAC:: @ 83A3CAC +gObjectEventGraphicsInfo_83A3CAC:: @ 83A3CAC .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3CD0:: @ 83A3CD0 +gObjectEventGraphicsInfo_83A3CD0:: @ 83A3CD0 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3CF4:: @ 83A3CF4 +gObjectEventGraphicsInfo_83A3CF4:: @ 83A3CF4 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3D18:: @ 83A3D18 +gObjectEventGraphicsInfo_83A3D18:: @ 83A3D18 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3D3C:: @ 83A3D3C +gObjectEventGraphicsInfo_83A3D3C:: @ 83A3D3C .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3D60:: @ 83A3D60 +gObjectEventGraphicsInfo_83A3D60:: @ 83A3D60 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3D84:: @ 83A3D84 +gObjectEventGraphicsInfo_83A3D84:: @ 83A3D84 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3DA8:: @ 83A3DA8 +gObjectEventGraphicsInfo_83A3DA8:: @ 83A3DA8 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3DCC:: @ 83A3DCC +gObjectEventGraphicsInfo_83A3DCC:: @ 83A3DCC .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3DF0:: @ 83A3DF0 +gObjectEventGraphicsInfo_83A3DF0:: @ 83A3DF0 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3E14:: @ 83A3E14 +gObjectEventGraphicsInfo_83A3E14:: @ 83A3E14 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3E38:: @ 83A3E38 +gObjectEventGraphicsInfo_83A3E38:: @ 83A3E38 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3E5C:: @ 83A3E5C +gObjectEventGraphicsInfo_83A3E5C:: @ 83A3E5C .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3E80:: @ 83A3E80 +gObjectEventGraphicsInfo_83A3E80:: @ 83A3E80 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3EA4:: @ 83A3EA4 +gObjectEventGraphicsInfo_83A3EA4:: @ 83A3EA4 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3EC8:: @ 83A3EC8 +gObjectEventGraphicsInfo_83A3EC8:: @ 83A3EC8 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3EEC:: @ 83A3EEC +gObjectEventGraphicsInfo_83A3EEC:: @ 83A3EEC .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3F10:: @ 83A3F10 +gObjectEventGraphicsInfo_83A3F10:: @ 83A3F10 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3F34:: @ 83A3F34 +gObjectEventGraphicsInfo_83A3F34:: @ 83A3F34 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3F58:: @ 83A3F58 +gObjectEventGraphicsInfo_83A3F58:: @ 83A3F58 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3F7C:: @ 83A3F7C +gObjectEventGraphicsInfo_83A3F7C:: @ 83A3F7C .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3FA0:: @ 83A3FA0 +gObjectEventGraphicsInfo_83A3FA0:: @ 83A3FA0 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3FC4:: @ 83A3FC4 +gObjectEventGraphicsInfo_83A3FC4:: @ 83A3FC4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3FE8:: @ 83A3FE8 +gObjectEventGraphicsInfo_83A3FE8:: @ 83A3FE8 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A400C:: @ 83A400C +gObjectEventGraphicsInfo_83A400C:: @ 83A400C .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4030:: @ 83A4030 +gObjectEventGraphicsInfo_83A4030:: @ 83A4030 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4054:: @ 83A4054 +gObjectEventGraphicsInfo_83A4054:: @ 83A4054 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4078:: @ 83A4078 +gObjectEventGraphicsInfo_83A4078:: @ 83A4078 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A409C:: @ 83A409C +gObjectEventGraphicsInfo_83A409C:: @ 83A409C .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A40C0:: @ 83A40C0 +gObjectEventGraphicsInfo_83A40C0:: @ 83A40C0 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A40E4:: @ 83A40E4 +gObjectEventGraphicsInfo_83A40E4:: @ 83A40E4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4108:: @ 83A4108 +gObjectEventGraphicsInfo_83A4108:: @ 83A4108 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A412C:: @ 83A412C +gObjectEventGraphicsInfo_83A412C:: @ 83A412C .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4150:: @ 83A4150 +gObjectEventGraphicsInfo_83A4150:: @ 83A4150 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4174:: @ 83A4174 +gObjectEventGraphicsInfo_83A4174:: @ 83A4174 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4198:: @ 83A4198 +gObjectEventGraphicsInfo_83A4198:: @ 83A4198 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A41BC:: @ 83A41BC +gObjectEventGraphicsInfo_83A41BC:: @ 83A41BC .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A41E0:: @ 83A41E0 +gObjectEventGraphicsInfo_83A41E0:: @ 83A41E0 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4204:: @ 83A4204 +gObjectEventGraphicsInfo_83A4204:: @ 83A4204 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4228:: @ 83A4228 +gObjectEventGraphicsInfo_83A4228:: @ 83A4228 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A424C:: @ 83A424C +gObjectEventGraphicsInfo_83A424C:: @ 83A424C .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4270:: @ 83A4270 +gObjectEventGraphicsInfo_83A4270:: @ 83A4270 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4294:: @ 83A4294 +gObjectEventGraphicsInfo_83A4294:: @ 83A4294 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A42B8:: @ 83A42B8 +gObjectEventGraphicsInfo_83A42B8:: @ 83A42B8 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A42DC:: @ 83A42DC +gObjectEventGraphicsInfo_83A42DC:: @ 83A42DC .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4300:: @ 83A4300 +gObjectEventGraphicsInfo_83A4300:: @ 83A4300 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4324:: @ 83A4324 +gObjectEventGraphicsInfo_83A4324:: @ 83A4324 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4348:: @ 83A4348 +gObjectEventGraphicsInfo_83A4348:: @ 83A4348 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A436C:: @ 83A436C +gObjectEventGraphicsInfo_83A436C:: @ 83A436C .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4390:: @ 83A4390 +gObjectEventGraphicsInfo_83A4390:: @ 83A4390 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A43B4:: @ 83A43B4 +gObjectEventGraphicsInfo_83A43B4:: @ 83A43B4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A43D8:: @ 83A43D8 +gObjectEventGraphicsInfo_83A43D8:: @ 83A43D8 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A43FC:: @ 83A43FC +gObjectEventGraphicsInfo_83A43FC:: @ 83A43FC .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4420:: @ 83A4420 +gObjectEventGraphicsInfo_83A4420:: @ 83A4420 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4444:: @ 83A4444 +gObjectEventGraphicsInfo_83A4444:: @ 83A4444 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4468:: @ 83A4468 +gObjectEventGraphicsInfo_83A4468:: @ 83A4468 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A448C:: @ 83A448C +gObjectEventGraphicsInfo_83A448C:: @ 83A448C .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A44B0:: @ 83A44B0 +gObjectEventGraphicsInfo_83A44B0:: @ 83A44B0 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A44D4:: @ 83A44D4 +gObjectEventGraphicsInfo_83A44D4:: @ 83A44D4 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A44F8:: @ 83A44F8 +gObjectEventGraphicsInfo_83A44F8:: @ 83A44F8 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A451C:: @ 83A451C +gObjectEventGraphicsInfo_83A451C:: @ 83A451C .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4540:: @ 83A4540 +gObjectEventGraphicsInfo_83A4540:: @ 83A4540 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4564:: @ 83A4564 +gObjectEventGraphicsInfo_83A4564:: @ 83A4564 .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4588:: @ 83A4588 +gObjectEventGraphicsInfo_83A4588:: @ 83A4588 .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A45AC:: @ 83A45AC +gObjectEventGraphicsInfo_83A45AC:: @ 83A45AC .2byte 0xFFFF, 0x1110, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A45D0:: @ 83A45D0 +gObjectEventGraphicsInfo_83A45D0:: @ 83A45D0 .2byte 0xFFFF, 0x1110, 0x1102, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A45F4:: @ 83A45F4 +gObjectEventGraphicsInfo_83A45F4:: @ 83A45F4 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4618:: @ 83A4618 +gObjectEventGraphicsInfo_83A4618:: @ 83A4618 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A463C:: @ 83A463C +gObjectEventGraphicsInfo_83A463C:: @ 83A463C .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4660:: @ 83A4660 +gObjectEventGraphicsInfo_83A4660:: @ 83A4660 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4684:: @ 83A4684 +gObjectEventGraphicsInfo_83A4684:: @ 83A4684 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A46A8:: @ 83A46A8 +gObjectEventGraphicsInfo_83A46A8:: @ 83A46A8 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A46CC:: @ 83A46CC +gObjectEventGraphicsInfo_83A46CC:: @ 83A46CC .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A46F0:: @ 83A46F0 +gObjectEventGraphicsInfo_83A46F0:: @ 83A46F0 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4714:: @ 83A4714 +gObjectEventGraphicsInfo_83A4714:: @ 83A4714 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4738:: @ 83A4738 +gObjectEventGraphicsInfo_83A4738:: @ 83A4738 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A475C:: @ 83A475C +gObjectEventGraphicsInfo_83A475C:: @ 83A475C .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4780:: @ 83A4780 +gObjectEventGraphicsInfo_83A4780:: @ 83A4780 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A47A4:: @ 83A47A4 +gObjectEventGraphicsInfo_83A47A4:: @ 83A47A4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A47C8:: @ 83A47C8 +gObjectEventGraphicsInfo_83A47C8:: @ 83A47C8 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A47EC:: @ 83A47EC +gObjectEventGraphicsInfo_83A47EC:: @ 83A47EC .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4810:: @ 83A4810 +gObjectEventGraphicsInfo_83A4810:: @ 83A4810 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4834:: @ 83A4834 +gObjectEventGraphicsInfo_83A4834:: @ 83A4834 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4858:: @ 83A4858 +gObjectEventGraphicsInfo_83A4858:: @ 83A4858 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A487C:: @ 83A487C +gObjectEventGraphicsInfo_83A487C:: @ 83A487C .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A48A0:: @ 83A48A0 +gObjectEventGraphicsInfo_83A48A0:: @ 83A48A0 .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A48C4:: @ 83A48C4 +gObjectEventGraphicsInfo_83A48C4:: @ 83A48C4 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A48E8:: @ 83A48E8 +gObjectEventGraphicsInfo_83A48E8:: @ 83A48E8 .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A490C:: @ 83A490C +gObjectEventGraphicsInfo_83A490C:: @ 83A490C .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4930:: @ 83A4930 +gObjectEventGraphicsInfo_83A4930:: @ 83A4930 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 32, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4954:: @ 83A4954 +gObjectEventGraphicsInfo_83A4954:: @ 83A4954 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4978:: @ 83A4978 +gObjectEventGraphicsInfo_83A4978:: @ 83A4978 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A499C:: @ 83A499C +gObjectEventGraphicsInfo_83A499C:: @ 83A499C .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A49C0:: @ 83A49C0 +gObjectEventGraphicsInfo_83A49C0:: @ 83A49C0 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A49E4:: @ 83A49E4 +gObjectEventGraphicsInfo_83A49E4:: @ 83A49E4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A08:: @ 83A4A08 +gObjectEventGraphicsInfo_83A4A08:: @ 83A4A08 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A2C:: @ 83A4A2C +gObjectEventGraphicsInfo_83A4A2C:: @ 83A4A2C .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A50:: @ 83A4A50 +gObjectEventGraphicsInfo_83A4A50:: @ 83A4A50 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A74:: @ 83A4A74 +gObjectEventGraphicsInfo_83A4A74:: @ 83A4A74 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A98:: @ 83A4A98 +gObjectEventGraphicsInfo_83A4A98:: @ 83A4A98 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4ABC:: @ 83A4ABC +gObjectEventGraphicsInfo_83A4ABC:: @ 83A4ABC .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4AE0:: @ 83A4AE0 +gObjectEventGraphicsInfo_83A4AE0:: @ 83A4AE0 .2byte 0xFFFF, 0x1113, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B04:: @ 83A4B04 +gObjectEventGraphicsInfo_83A4B04:: @ 83A4B04 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B28:: @ 83A4B28 +gObjectEventGraphicsInfo_83A4B28:: @ 83A4B28 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B4C:: @ 83A4B4C +gObjectEventGraphicsInfo_83A4B4C:: @ 83A4B4C .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B70:: @ 83A4B70 +gObjectEventGraphicsInfo_83A4B70:: @ 83A4B70 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B94:: @ 83A4B94 +gObjectEventGraphicsInfo_83A4B94:: @ 83A4B94 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4BB8:: @ 83A4BB8 +gObjectEventGraphicsInfo_83A4BB8:: @ 83A4BB8 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4BDC:: @ 83A4BDC +gObjectEventGraphicsInfo_83A4BDC:: @ 83A4BDC .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C00:: @ 83A4C00 +gObjectEventGraphicsInfo_83A4C00:: @ 83A4C00 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C24:: @ 83A4C24 +gObjectEventGraphicsInfo_83A4C24:: @ 83A4C24 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C48:: @ 83A4C48 +gObjectEventGraphicsInfo_83A4C48:: @ 83A4C48 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C6C:: @ 83A4C6C +gObjectEventGraphicsInfo_83A4C6C:: @ 83A4C6C .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C90:: @ 83A4C90 +gObjectEventGraphicsInfo_83A4C90:: @ 83A4C90 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4CB4:: @ 83A4CB4 +gObjectEventGraphicsInfo_83A4CB4:: @ 83A4CB4 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4CD8:: @ 83A4CD8 +gObjectEventGraphicsInfo_83A4CD8:: @ 83A4CD8 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4CFC:: @ 83A4CFC +gObjectEventGraphicsInfo_83A4CFC:: @ 83A4CFC .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4D20:: @ 83A4D20 +gObjectEventGraphicsInfo_83A4D20:: @ 83A4D20 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4D44:: @ 83A4D44 +gObjectEventGraphicsInfo_83A4D44:: @ 83A4D44 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4D68:: @ 83A4D68 +gObjectEventGraphicsInfo_83A4D68:: @ 83A4D68 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4D8C:: @ 83A4D8C +gObjectEventGraphicsInfo_83A4D8C:: @ 83A4D8C .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4DB0:: @ 83A4DB0 +gObjectEventGraphicsInfo_83A4DB0:: @ 83A4DB0 .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4DD4:: @ 83A4DD4 +gObjectEventGraphicsInfo_83A4DD4:: @ 83A4DD4 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4DF8:: @ 83A4DF8 +gObjectEventGraphicsInfo_83A4DF8:: @ 83A4DF8 .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4E1C:: @ 83A4E1C +gObjectEventGraphicsInfo_83A4E1C:: @ 83A4E1C .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4E40:: @ 83A4E40 +gObjectEventGraphicsInfo_83A4E40:: @ 83A4E40 .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4E64:: @ 83A4E64 +gObjectEventGraphicsInfo_83A4E64:: @ 83A4E64 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4E88:: @ 83A4E88 +gObjectEventGraphicsInfo_83A4E88:: @ 83A4E88 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4EAC:: @ 83A4EAC +gObjectEventGraphicsInfo_83A4EAC:: @ 83A4EAC .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4ED0:: @ 83A4ED0 +gObjectEventGraphicsInfo_83A4ED0:: @ 83A4ED0 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4EF4:: @ 83A4EF4 +gObjectEventGraphicsInfo_83A4EF4:: @ 83A4EF4 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4F18:: @ 83A4F18 +gObjectEventGraphicsInfo_83A4F18:: @ 83A4F18 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4F3C:: @ 83A4F3C +gObjectEventGraphicsInfo_83A4F3C:: @ 83A4F3C .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4F60:: @ 83A4F60 +gObjectEventGraphicsInfo_83A4F60:: @ 83A4F60 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4F84:: @ 83A4F84 +gObjectEventGraphicsInfo_83A4F84:: @ 83A4F84 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4FA8:: @ 83A4FA8 +gObjectEventGraphicsInfo_83A4FA8:: @ 83A4FA8 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4FCC:: @ 83A4FCC +gObjectEventGraphicsInfo_83A4FCC:: @ 83A4FCC .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4FF0:: @ 83A4FF0 +gObjectEventGraphicsInfo_83A4FF0:: @ 83A4FF0 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5014:: @ 83A5014 +gObjectEventGraphicsInfo_83A5014:: @ 83A5014 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5038:: @ 83A5038 +gObjectEventGraphicsInfo_83A5038:: @ 83A5038 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A505C:: @ 83A505C +gObjectEventGraphicsInfo_83A505C:: @ 83A505C .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5080:: @ 83A5080 +gObjectEventGraphicsInfo_83A5080:: @ 83A5080 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A50A4:: @ 83A50A4 +gObjectEventGraphicsInfo_83A50A4:: @ 83A50A4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A50C8:: @ 83A50C8 +gObjectEventGraphicsInfo_83A50C8:: @ 83A50C8 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A50EC:: @ 83A50EC +gObjectEventGraphicsInfo_83A50EC:: @ 83A50EC .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5110:: @ 83A5110 +gObjectEventGraphicsInfo_83A5110:: @ 83A5110 .2byte 0xFFFF, 0x1114, 0x11FF, 0x800, 64, 64 .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 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5134:: @ 83A5134 +gObjectEventGraphicsInfo_83A5134:: @ 83A5134 .2byte 0xFFFF, 0x1115, 0x11FF, 0x1000, 128, 64 .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 .4byte gDummySpriteAffineAnimTable -gUnknown_83A5158:: @ 83A5158 - .incbin "baserom.gba", 0x3A5158, 0xB0 +gObjectEventSpritePalettes:: @ 83A5158 + obj_pal gUnknown_836D828, 0x1103 + obj_pal gUnknown_836D848, 0x1104 + obj_pal gUnknown_836D868, 0x1105 + obj_pal gUnknown_836D888, 0x1106 + obj_pal gUnknown_836D8A8, 0x1107 + obj_pal gUnknown_836D8C8, 0x1108 + obj_pal gUnknown_836D8E8, 0x1109 + obj_pal gUnknown_836D908, 0x110a + obj_pal gUnknown_835B968, 0x1100 + obj_pal gUnknown_835E968, 0x1101 + obj_pal gUnknown_835E988, 0x1102 + obj_pal gUnknown_8398008, 0x110b + obj_pal gUnknown_8398028, 0x110c + obj_pal gUnknown_835B968, 0x1110 + obj_pal gUnknown_835E968, 0x1111 + obj_pal gUnknown_8394EA8, 0x1113 + obj_pal gUnknown_8395AE8, 0x1115 + obj_pal gUnknown_83952C8, 0x1114 + null_obj_pal + +gPlayerReflectionPaletteTags:: @ 83A51F0 + .2byte 0x1101 + .2byte 0x1101 + .2byte 0x1101 + .2byte 0x1101 + .2byte 0x1111 + .2byte 0x1111 + .2byte 0x1111 + .2byte 0x1111 + +gUnknownPaletteTags_83A5200:: @ 83A5200 + .2byte 0x1116 + .2byte 0x1116 + .2byte 0x1116 + .2byte 0x1116 gUnknown_83A5208:: @ 83A5208 - .incbin "baserom.gba", 0x3A5208, 0x70 + .2byte 0x1100 + .2byte 0x0 + .4byte gPlayerReflectionPaletteTags + .2byte 0x1110 + .2byte 0x0 + .4byte gPlayerReflectionPaletteTags + .2byte 0x1116 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5200 + .2byte 0x11FF + .2byte 0x0 + .4byte NULL + +gUnknownPaletteTags_83A5228:: @ 83A5228 + .2byte 0x110c + .2byte 0x110c + .2byte 0x110c + .2byte 0x110c + +gUnknownPaletteTags_83A5230:: @ 83A5230 + .2byte 0x110d + .2byte 0x110d + .2byte 0x110d + .2byte 0x110d + +gUnknownPaletteTags_83A5238:: + .2byte 0x110e + .2byte 0x110e + .2byte 0x110e + .2byte 0x110e + +gUnknownPaletteTags_83A5240:: + .2byte 0x1112 + .2byte 0x1112 + .2byte 0x1112 + .2byte 0x1112 + +gUnknownPaletteTags_83A5248:: + .2byte 0x1113 + .2byte 0x1113 + .2byte 0x1113 + .2byte 0x1113 + +gUnknownPaletteTags_83A5250:: + .2byte 0x1114 + .2byte 0x1114 + .2byte 0x1114 + .2byte 0x1114 + +gUnknownPaletteTags_83A5258:: + .2byte 0x111b + .2byte 0x111b + .2byte 0x111b + .2byte 0x111b + +gUnknownPaletteTags_83A5260:: + .2byte 0x1118 + .2byte 0x1118 + .2byte 0x1118 + .2byte 0x1118 + +gUnknownPaletteTags_83A5268:: + .2byte 0x111a + .2byte 0x111a + .2byte 0x111a + .2byte 0x111a + +gUnknownPaletteTags_83A5270:: + .2byte 0x1109 + .2byte 0x1109 + .2byte 0x1109 + .2byte 0x1109 gUnknown_83A5278:: @ 83A5278 - .incbin "baserom.gba", 0x3A5278, 0xB8 + .2byte 0x1100 + .2byte 0x0 + .4byte gPlayerReflectionPaletteTags + .2byte 0x1110 + .2byte 0x0 + .4byte gPlayerReflectionPaletteTags + .2byte 0x110b + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5228 + .2byte 0x110d + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5230 + .2byte 0x110e + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5238 + .2byte 0x1112 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5240 + .2byte 0x1113 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5248 + .2byte 0x1114 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5250 + .2byte 0x1117 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5260 + .2byte 0x1119 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5268 + .2byte 0x1105 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5270 + .2byte 0x111b + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5258 + .2byte 0x11ff + .2byte 0x0 + .4byte NULL + +gUnknownPaletteTags_83A52E0:: + .2byte 0x1100 + .2byte 0x1101 + .2byte 0x1103 + .2byte 0x1104 + .2byte 0x1105 + .2byte 0x1106 + .2byte 0x1107 + .2byte 0x1108 + .2byte 0x1109 + .2byte 0x110a + +gUnknownPaletteTags_83A52F4:: + .2byte 0x1100 + .2byte 0x1110 + .2byte 0x1103 + .2byte 0x1104 + .2byte 0x1105 + .2byte 0x1106 + .2byte 0x1107 + .2byte 0x1108 + .2byte 0x1109 + .2byte 0x110a + +gUnknownPaletteTags_83A5308:: + .2byte 0x1100 + .2byte 0x1101 + .2byte 0x1103 + .2byte 0x1104 + .2byte 0x1105 + .2byte 0x1106 + .2byte 0x1107 + .2byte 0x1108 + .2byte 0x1109 + .2byte 0x110a + +gUnknownPaletteTags_83A531C:: + .2byte 0x1100 + .2byte 0x1101 + .2byte 0x1103 + .2byte 0x1104 + .2byte 0x1105 + .2byte 0x1106 + .2byte 0x1107 + .2byte 0x1108 + .2byte 0x1109 + .2byte 0x110a gUnknown_83A5330:: @ 83A5330 - .incbin "baserom.gba", 0x3A5330, 0x10 + .4byte gUnknownPaletteTags_83A52E0 + .4byte gUnknownPaletteTags_83A52F4 + .4byte gUnknownPaletteTags_83A5308 + .4byte gUnknownPaletteTags_83A531C gUnknown_83A5340:: - .incbin "baserom.gba", 0x3A5340, 0x8 + obj_pal gUnknown_8398FA8, 0x1004 gUnknown_83A5348:: @ 83A5348 - .incbin "baserom.gba", 0x3A5348, 0xB90 + obj_pal gUnknown_8398FC8, 0x1005 + +gUnknown_83A5350:: @ 83A5350 + obj_image_anim_frame 0, 1, 0 + obj_image_anim_end + +gUnknown_83A5358:: @ 83A5358 + .4byte gUnknown_83A5350 + +gUnknown_83A535C:: @ 83A535C + obj_frame_tiles gUnknown_8398048, 0x20 + +gUnknown_83A5364:: @ 83A5364 + obj_frame_tiles gUnknown_8398068, 0x40 + +gUnknown_83A536C:: @ 83A536C + obj_frame_tiles gUnknown_83980A8, 0x80 + +gUnknown_83A5374:: @ 83A5374 + obj_frame_tiles gUnknown_8398128, 0x400 + +gUnknown_83A537C:: @ 83A537C + spr_template 65535, 65535, gObjectEventBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, oamc_shadow + +gUnknown_83A5394:: @ 83A5394 + spr_template 65535, 65535, gObjectEventBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, oamc_shadow + +gUnknown_83A53AC:: @ 83A53AC + spr_template 65535, 65535, gObjectEventBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, oamc_shadow + +gUnknown_83A53C4:: @ 83A53C4 + spr_template 65535, 65535, gObjectEventBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, oamc_shadow + +gUnknown_83A53DC:: @ 83A53DC + overworld_frame gUnknown_839A008, 2, 2, 0 + overworld_frame gUnknown_839A008, 2, 2, 1 + overworld_frame gUnknown_839A008, 2, 2, 2 + overworld_frame gUnknown_839A008, 2, 2, 3 + overworld_frame gUnknown_839A008, 2, 2, 4 + +gUnknown_83A5404:: @ 83A5404 + obj_image_anim_frame 1, 10 + obj_image_anim_frame 2, 10 + obj_image_anim_frame 3, 10 + obj_image_anim_frame 4, 10 + obj_image_anim_frame 0, 10 + obj_image_anim_end + +gUnknown_83A541C:: @ 83A541C + .4byte gUnknown_83A5404 + +gUnknown_83A5420:: @ 83A5420 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, unc_grass_normal + +gUnknown_83A5438:: @ 83A5438 + overworld_frame gUnknown_83986A8, 2, 2, 0 + overworld_frame gUnknown_83986A8, 2, 2, 1 + overworld_frame gUnknown_83986A8, 2, 2, 2 + overworld_frame gUnknown_83986A8, 2, 2, 3 + overworld_frame gUnknown_83986A8, 2, 2, 4 + +gUnknown_83A5460:: @ 83A5460 + obj_image_anim_frame 0, 12 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 9 + obj_image_anim_frame 3, 9 + obj_image_anim_frame 0, 9 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 11 + obj_image_anim_frame 4, 11 + obj_image_anim_end + +gUnknown_83A5484:: @ 83A5484 + .4byte gUnknown_83A5460 + +gUnknown_83A5488:: @ 83A5488 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A54A0:: @ 83A54A0 + overworld_frame gUnknown_8398928, 2, 2, 0 + overworld_frame gUnknown_8398928, 2, 2, 1 + overworld_frame gUnknown_8398928, 2, 2, 2 + overworld_frame gUnknown_8398928, 2, 2, 3 + overworld_frame gUnknown_8398928, 2, 2, 4 + +gUnknown_83A54C8:: @ 83A54C8 + obj_image_anim_frame 0, 12 + obj_image_anim_frame 1, 12 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 12 + obj_image_anim_frame 4, 12 + obj_image_anim_end + +gUnknown_83A54E0:: @ 83A54E0 + .4byte gUnknown_83A54C8 -gUnknown_83A5ED8:: - .incbin "baserom.gba", 0x3A5ED8, 0x120 +gUnknown_83A54E4:: @ 83A54E4 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, sub_80DC2FC + +gUnknown_83A54FC:: @ 83A54FC + overworld_frame gUnknown_8396B08, 2, 8, 0 + overworld_frame gUnknown_8396B08, 2, 8, 1 + overworld_frame gUnknown_8396B08, 2, 8, 2 + overworld_frame gUnknown_8396B08, 2, 8, 3 + overworld_frame gUnknown_8396B08, 2, 8, 4 + overworld_frame gUnknown_8396B08, 2, 8, 5 + +gUnknown_83A552C:: @ 83A552C + obj_image_anim_frame 0, 48 + obj_image_anim_frame 1, 48 + obj_image_anim_jump 0 + +gUnknown_83A5538:: @ 83A5538 + obj_image_anim_frame 2, 48 + obj_image_anim_frame 3, 48 + obj_image_anim_jump 0 + +gUnknown_83A5544:: @ 83A5544 + obj_image_anim_frame 4, 48 + obj_image_anim_frame 5, 48 + obj_image_anim_jump 0 + +gUnknown_83A5550:: @ 83A5550 + obj_image_anim_frame 4, 112 + obj_image_anim_frame 5, 112 + obj_image_anim_jump 0 + +gUnknown_83A555C:: @ 83A555C + .4byte gUnknown_83A552C + .4byte gUnknown_83A5538 + .4byte gUnknown_83A5544 + .4byte gUnknown_83A5550 + +gUnknown_83A556C:: @ 83A556C + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, sub_80DC4F8 + +gUnknown_83A5584:: @ 83A5584 + overworld_frame gUnknown_8398BA8, 2, 2, 0 + overworld_frame gUnknown_8398BA8, 2, 2, 1 + overworld_frame gUnknown_8398BA8, 2, 2, 2 + overworld_frame gUnknown_8398BA8, 2, 2, 3 + overworld_frame gUnknown_8398BA8, 2, 2, 4 + overworld_frame gUnknown_8398BA8, 2, 2, 5 + overworld_frame gUnknown_8398BA8, 2, 2, 6 + overworld_frame gUnknown_8398BA8, 2, 2, 7 + +gUnknown_83A55C4:: @ 83A55C4 + obj_image_anim_frame 2, 32 + obj_image_anim_frame 3, 32 + obj_image_anim_jump 0 + +gUnknown_83A55D0:: @ 83A55D0 + obj_image_anim_frame 0, 32 + obj_image_anim_frame 1, 32 + obj_image_anim_jump 0 + +gUnknown_83A55DC:: @ 83A55DC + obj_image_anim_frame 4, 32 + obj_image_anim_frame 5, 32 + obj_image_anim_jump 0 + +gUnknown_83A55E8:: @ 83A55E8 + obj_image_anim_frame 6, 32 + obj_image_anim_frame 7, 32 + obj_image_anim_jump 0 + +gUnknown_83A55F4:: @ 83A55F4 + .4byte gUnknown_83A55C4 + .4byte gUnknown_83A55D0 + .4byte gUnknown_83A55DC + .4byte gUnknown_83A55E8 + +gUnknown_83A5604:: @ 83A5604 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x16, gUnknown_83A55F4, gUnknown_83A5584, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83A561C:: @ 83A561C + overworld_frame gUnknown_8399008, 2, 1, 0 + overworld_frame gUnknown_8399008, 2, 1, 1 + overworld_frame gUnknown_8399008, 2, 1, 2 + +gUnknown_83A5634:: @ 83A5634 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_end + +gUnknown_83A5644:: @ 83A5644 + .4byte gUnknown_83A5634 + +gUnknown_83A5648:: @ 83A5648 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5644, gUnknown_83A561C, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A5660:: @ 83A5660 + overworld_frame gUnknown_8399188, 2, 1, 0 + overworld_frame gUnknown_8399188, 2, 1, 1 + overworld_frame gUnknown_8399188, 2, 1, 2 + overworld_frame gUnknown_8399188, 2, 1, 3 + +gUnknown_83A5680:: @ 83A5680 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_end + +gUnknown_83A5694:: @ 83A5694 + .4byte gUnknown_83A5680 + +gUnknown_83A5698:: @ 83A5698 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_Unknown1, gUnknown_83A5694, gUnknown_83A5660, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A56B0:: @ 83A56B0 + overworld_frame gUnknown_839A388, 2, 2, 0 + overworld_frame gUnknown_839A388, 2, 2, 1 + +gUnknown_83A56C0:: @ 83A56C0 + obj_image_anim_frame 0, 129 + obj_image_anim_end + +gUnknown_83A56C8:: @ 83A56C8 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_83A56D0:: @ 83A56D0 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A56D8:: @ 83A56D8 + obj_image_anim_frame 1, 65 + obj_image_anim_end + +gUnknown_83A56E0:: @ 83A56E0 + .4byte gUnknown_83A56C0 + .4byte gUnknown_83A56C0 + .4byte gUnknown_83A56C8 + .4byte gUnknown_83A56D0 + .4byte gUnknown_83A56D8 + +gUnknown_83A56F4:: @ 83A56F4 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, sub_80DBAFC + +gUnknown_83A570C:: @ 83A570C + overworld_frame gUnknown_839A488, 2, 2, 0 + overworld_frame gUnknown_839A488, 2, 2, 1 + +gUnknown_83A571C:: @ 83A571C + obj_image_anim_frame 0, 129 + obj_image_anim_end + +gUnknown_83A5724:: @ 83A5724 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_83A572C:: @ 83A572C + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A5734:: @ 83A5734 + obj_image_anim_frame 1, 65 + obj_image_anim_end + +gUnknown_83A573C:: @ 83A573C + .4byte gUnknown_83A571C + .4byte gUnknown_83A571C + .4byte gUnknown_83A5724 + .4byte gUnknown_83A572C + .4byte gUnknown_83A5734 + +gUnknown_83A5750:: @ 83A5750 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, sub_80DBAFC + +gUnknown_83A5768:: @ 83A5768 + overworld_frame gUnknown_839A588, 2, 2, 0 + overworld_frame gUnknown_839A588, 2, 2, 1 + overworld_frame gUnknown_839A588, 2, 2, 2 + overworld_frame gUnknown_839A588, 2, 2, 3 + +gUnknown_83A5788:: @ 83A5788 + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_83A5790:: @ 83A5790 + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_83A5798:: @ 83A5798 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A57A0:: @ 83A57A0 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A57A8:: @ 83A57A8 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_83A57B0:: @ 83A57B0 + obj_image_anim_frame 0, 65 + obj_image_anim_end + +gUnknown_83A57B8:: @ 83A57B8 + obj_image_anim_frame 3, 65 + obj_image_anim_end + +gUnknown_83A57C0:: @ 83A57C0 + obj_image_anim_frame 3, 1 + obj_image_anim_end + +gUnknown_83A57C8:: @ 83A57C8 + .4byte gUnknown_83A5788 + .4byte gUnknown_83A5788 + .4byte gUnknown_83A5790 + .4byte gUnknown_83A5798 + .4byte gUnknown_83A57A0 + .4byte gUnknown_83A57A8 + .4byte gUnknown_83A57B0 + .4byte gUnknown_83A57B8 + .4byte gUnknown_83A57C0 + +gUnknown_83A57EC:: @ 83A57EC + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, sub_80DBAFC + +gUnknown_83A5804:: @ 83A5804 + overworld_frame gUnknown_839AA48, 2, 2, 0 + overworld_frame gUnknown_839AA48, 2, 2, 1 + overworld_frame gUnknown_839AA48, 2, 2, 2 + overworld_frame gUnknown_839AA48, 2, 2, 3 + +gUnknown_83A5824:: @ 83A5824 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_end + +gUnknown_83A5838:: @ 83A5838 + .4byte gUnknown_83A5824 + +gUnknown_83A583C:: @ 83A583C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5838, gUnknown_83A5804, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A5854:: @ 83A5854 + overworld_frame gUnknown_839AC48, 2, 1, 0 + overworld_frame gUnknown_839AC48, 2, 1, 1 + +gUnknown_83A5864:: @ 83A5864 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_end + +gUnknown_83A5870:: @ 83A5870 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_jump 0 + +gUnknown_83A5894:: @ 83A5894 + .4byte gUnknown_83A5864 + .4byte gUnknown_83A5870 + +gUnknown_83A589C:: @ 83A589C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, sub_80DBC2C + +gUnknown_83A58B4:: @ 83A58B4 + overworld_frame gUnknown_839ACC8, 2, 1, 0 + overworld_frame gUnknown_839ACC8, 2, 1, 1 + overworld_frame gUnknown_839ACC8, 2, 1, 2 + +gUnknown_83A58CC:: @ 83A58CC + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_end + +gUnknown_83A58DC:: @ 83A58DC + .4byte gUnknown_83A58CC + +gUnknown_83A58E0:: @ 83A58E0 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A58DC, gUnknown_83A58B4, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A58F8:: @ 83A58F8 + overworld_frame gUnknown_8399E08, 2, 2, 0 + overworld_frame gUnknown_8399E08, 2, 2, 1 + overworld_frame gUnknown_8399E08, 2, 2, 2 + overworld_frame gUnknown_8399E08, 2, 2, 3 + +gUnknown_83A5918:: @ 83A5918 + obj_image_anim_frame 1, 3 + obj_image_anim_frame 2, 3 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gUnknown_83A5938:: @ 83A5938 + .4byte gUnknown_83A5918 + +gUnknown_83A593C:: @ 83A593C + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, unc_grass_tall + +gUnknown_83A5954:: @ 83A5954 + overworld_frame gUnknown_8399488, 2, 2, 0 + overworld_frame gUnknown_8399488, 2, 2, 1 + overworld_frame gUnknown_8399488, 2, 2, 2 + overworld_frame gUnknown_8399488, 2, 2, 3 + overworld_frame gUnknown_8399488, 2, 2, 4 + overworld_frame gUnknown_8399488, 2, 2, 6 + +gUnknown_83A5984:: @ 83A5984 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_frame 5, 8 + obj_image_anim_end + +gUnknown_83A59A0:: @ 83A59A0 + .4byte gUnknown_83A5984 + +gUnknown_83A59A4:: @ 83A59A4 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A59A0, gUnknown_83A5954, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A59BC:: @ 83A59BC + overworld_frame gUnknown_8399788, 2, 2, 0 + overworld_frame gUnknown_8399788, 2, 2, 1 + overworld_frame gUnknown_8399788, 2, 2, 2 + overworld_frame gUnknown_8399788, 2, 2, 3 + overworld_frame gUnknown_8399788, 2, 2, 4 + overworld_frame gUnknown_8399788, 2, 2, 5 + overworld_frame gUnknown_8399788, 2, 2, 6 + overworld_frame gUnknown_8399788, 2, 2, 7 + overworld_frame gUnknown_8399788, 2, 2, 8 + +gUnknown_83A5A04:: @ 83A5A04 + obj_image_anim_frame 0, 10 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 7, 4 + obj_image_anim_frame 8, 4 + obj_image_anim_jump 7 + +gUnknown_83A5A2C:: @ 83A5A2C + .4byte gUnknown_83A5A04 + +gUnknown_83A5A30:: @ 83A5A30 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A5A48:: @ 83A5A48 + overworld_frame gUnknown_8399C08, 2, 2, 0 + overworld_frame gUnknown_8399C08, 2, 2, 1 + overworld_frame gUnknown_8399C08, 2, 2, 2 + overworld_frame gUnknown_8399C08, 2, 2, 3 + +gUnknown_83A5A68:: @ 83A5A68 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gUnknown_83A5A84:: @ 83A5A84 + .4byte gUnknown_83A5A68 + +gUnknown_83A5A88:: @ 83A5A88 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A5AA0:: @ 83A5AA0 + overworld_frame gUnknown_839A788, 2, 2, 0 + overworld_frame gUnknown_839A788, 2, 2, 1 + overworld_frame gUnknown_839A788, 2, 2, 2 + overworld_frame gUnknown_839A788, 2, 2, 3 + +gUnknown_83A5AC0:: @ 83A5AC0 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_jump 0 + +gUnknown_83A5AD4:: @ 83A5AD4 + .4byte gUnknown_83A5AC0 + +gUnknown_83A5AD8:: @ 83A5AD8 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A5AF0:: @ 83A5AF0 + overworld_frame gUnknown_839A988, 2, 1, 0 + overworld_frame gUnknown_839A988, 2, 1, 1 + overworld_frame gUnknown_839A988, 2, 1, 2 + +gUnknown_83A5B08:: @ 83A5B08 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_end + +gUnknown_83A5B18:: @ 83A5B18 + .4byte gUnknown_83A5B08 + +gUnknown_83A5B1C:: @ 83A5B1C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, sub_80DC86C + +gUnknown_83A5B34:: @ 83A5B34 + overworld_frame gUnknown_839AD88, 2, 2, 0 + overworld_frame gUnknown_839AD88, 2, 2, 1 + overworld_frame gUnknown_839AD88, 2, 2, 2 + overworld_frame gUnknown_839AD88, 2, 2, 3 + +gUnknown_83A5B54:: @ 83A5B54 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gUnknown_83A5B70:: @ 83A5B70 + .4byte gUnknown_83A5B54 + +gUnknown_83A5B74:: @ 83A5B74 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A5B8C:: @ 83A5B8C + obj_rot_scal_anim_frame -256, 256, 128, 0 + obj_rot_scal_anim_frame 1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame -1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame -1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame 1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_jump 1 + +gUnknown_83A5BDC:: @ 83A5BDC + obj_rot_scal_anim_frame 256, 256, 128, 0 + obj_rot_scal_anim_frame -1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame 1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame 1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame -1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_jump 1 + +gUnknown_83A5C2C:: @ 83A5C2C + .4byte gUnknown_83A5B8C + .4byte gUnknown_83A5BDC + +gUnknown_83A5C34:: @ 83A5C34 + spr_template 0x0, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gUnknown_83A5C2C, SpriteCallbackDummy + +gUnknown_83A5C4C:: @ 83A5C4C + overworld_frame gUnknown_839B008, 2, 4, 0 + overworld_frame gUnknown_839B008, 2, 4, 1 + overworld_frame gUnknown_839B008, 2, 4, 2 + overworld_frame gUnknown_839B008, 2, 4, 3 + overworld_frame gUnknown_839B008, 2, 4, 4 + overworld_frame gUnknown_839B008, 2, 4, 5 + overworld_frame gUnknown_839B008, 2, 4, 6 + +gUnknown_83A5C84:: @ 83A5C84 + obj_image_anim_frame 0, 16 + obj_image_anim_end + +gUnknown_83A5C8C:: @ 83A5C8C + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_end + +gUnknown_83A5CAC:: @ 83A5CAC + .4byte gUnknown_83A5C84 + .4byte gUnknown_83A5C8C + +gUnknown_83A5CB4:: @ 83A5CB4 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, sub_80DCAC8 + +gUnknown_83A5CCC:: @ 83A5CCC + overworld_frame gUnknown_839B708, 2, 4, 0 + overworld_frame gUnknown_839B708, 2, 4, 1 + overworld_frame gUnknown_839B708, 2, 4, 2 + overworld_frame gUnknown_839B708, 2, 4, 3 + overworld_frame gUnknown_839B708, 2, 4, 4 + overworld_frame gUnknown_839B708, 2, 4, 5 + overworld_frame gUnknown_839B708, 2, 4, 6 + +gUnknown_83A5D04:: @ 83A5D04 + obj_image_anim_frame 0, 16 + obj_image_anim_end + +gUnknown_83A5D0C:: @ 83A5D0C + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_end + +gUnknown_83A5D2C:: @ 83A5D2C + .4byte gUnknown_83A5D04 + .4byte gUnknown_83A5D0C + +gUnknown_83A5D34:: @ 83A5D34 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, sub_80DCAC8 + +gUnknown_83A5D4C:: @ 83A5D4C + overworld_frame gUnknown_839BE08, 2, 4, 0 + overworld_frame gUnknown_839BE08, 2, 4, 1 + overworld_frame gUnknown_839BE08, 2, 4, 2 + overworld_frame gUnknown_839BE08, 2, 4, 3 + overworld_frame gUnknown_839BE08, 2, 4, 4 + overworld_frame gUnknown_839BE08, 2, 4, 5 + overworld_frame gUnknown_839BE08, 2, 4, 6 + +gUnknown_83A5D84:: @ 83A5D84 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, sub_80DCAC8 + +gUnknown_83A5D9C:: @ 83A5D9C + overworld_frame gUnknown_839D3C8, 8, 8, 0 + overworld_frame gUnknown_839D3C8, 8, 8, 1 + overworld_frame gUnknown_839D3C8, 8, 8, 2 + overworld_frame gUnknown_839D3C8, 8, 8, 3 + overworld_frame gUnknown_839D3C8, 8, 8, 4 + +gUnknown_83A5DC4:: @ 83A5DC4 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_83A5DCC:: @ 83A5DCC + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A5DD4:: @ 83A5DD4 + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_83A5DDC:: @ 83A5DDC + obj_image_anim_frame 3, 1 + obj_image_anim_end + +gUnknown_83A5DE4:: @ 83A5DE4 + obj_image_anim_frame 4, 1 + obj_image_anim_end + +gUnknown_83A5DEC:: @ 83A5DEC + .4byte gUnknown_83A5DC4 + .4byte gUnknown_83A5DCC + .4byte gUnknown_83A5DD4 + .4byte gUnknown_83A5DDC + .4byte gUnknown_83A5DE4 + +gUnknown_83A5E00:: @ 83A5E00 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_64x64, gUnknown_83A5DEC, gUnknown_83A5D9C, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83A5E18:: @ 83A5E18 + overworld_frame gUnknown_839A288, 2, 2, 0 + overworld_frame gUnknown_839A288, 2, 2, 1 + +gUnknown_83A5E28:: @ 83A5E28 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_end + +gUnknown_83A5E34:: @ 83A5E34 + .4byte gUnknown_83A5E28 + +gUnknown_83A5E38:: @ 83A5E38 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, sub_80DB8AC + +gUnknown_83A5E50:: @ 83A5E50 + overworld_frame gUnknown_839C508, 2, 2, 0 + +gUnknown_83A5E58:: @ 83A5E58 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gUnknown_83A5E60:: @ 83A5E60 + .4byte gUnknown_83A5E58 + +gUnknown_83A5E64:: @ 83A5E64 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, sub_80DBFF4 + +gUnknown_83A5E7C:: @ 83A5E7C + overworld_frame gUnknown_839C5A8, 2, 2, 0 + overworld_frame gUnknown_839C5A8, 2, 2, 1 + overworld_frame gUnknown_839C5A8, 2, 2, 2 + overworld_frame gUnknown_839C5A8, 2, 2, 3 + overworld_frame gUnknown_839C5A8, 2, 2, 4 + +gUnknown_83A5EA4:: @ 83A5EA4 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 2, 6 + obj_image_anim_frame 3, 6 + obj_image_anim_frame 4, 6 + obj_image_anim_end + +gUnknown_83A5EBC:: @ 83A5EBC + .4byte gUnknown_83A5EA4 + +gUnknown_83A5EC0:: @ 83A5EC0 + spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, sub_8085604 + +gUnknown_83A5ED8:: @ 83A5ED8 + obj_pal gUnknown_839C588, 0x100D + +gUnknown_83A5EE0:: @ 83A5EE0 + overworld_frame gUnknown_839C828, 2, 2, 0 + overworld_frame gUnknown_839C828, 2, 2, 1 + overworld_frame gUnknown_839C828, 2, 2, 2 + overworld_frame gUnknown_839C828, 2, 2, 3 + overworld_frame gUnknown_839C828, 2, 2, 4 + +gUnknown_83A5F08:: @ 83A5F08 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 2, 6 + obj_image_anim_frame 3, 6 + obj_image_anim_frame 4, 6 + obj_image_anim_end + +gUnknown_83A5F20:: @ 83A5F20 + .4byte gUnknown_83A5F08 + +gUnknown_83A5F24:: @ 83A5F24 + spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, sub_80853B0 + +gUnknown_83A5F3C:: @ 83A5F3C + overworld_frame gUnknown_839CAA8, 2, 4, 0 + overworld_frame gUnknown_839CAA8, 2, 4, 1 + overworld_frame gUnknown_839CAA8, 2, 4, 2 + overworld_frame gUnknown_839CAA8, 2, 4, 3 + overworld_frame gUnknown_839CAA8, 2, 4, 4 + overworld_frame gUnknown_839CAA8, 2, 4, 5 + overworld_frame gUnknown_839CAA8, 2, 4, 6 + overworld_frame gUnknown_839CAA8, 2, 4, 7 + +gUnknown_83A5F7C:: @ 83A5F7C + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 6 + obj_image_anim_frame 4, 6 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 7, 4 + obj_image_anim_end + +gUnknown_83A5FA0:: @ 83A5FA0 + .4byte gUnknown_83A5F7C + +gUnknown_83A5FA4:: @ 83A5FA4 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, sub_80DC99C + +gUnknown_83A5FBC:: @ 83A5FBC + overworld_frame gUnknown_839D2A8, 2, 2, 0 + overworld_frame gUnknown_839D2A8, 2, 2, 1 + +gUnknown_83A5FCC:: @ 83A5FCC + obj_image_anim_frame 0, 3 + obj_image_anim_frame 1, 5 + obj_image_anim_frame 0, 5 + obj_image_anim_end + +gUnknown_83A5FDC:: @ 83A5FDC + .4byte gUnknown_83A5FCC + +gUnknown_83A5FE0:: @ 83A5FE0 + spr_template 0xFFFF, 0x100F, gObjectEventBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, sub_80DCC90 gUnknown_83A5FF8:: - .incbin "baserom.gba", 0x3A5FF8, 0x8 + obj_pal gUnknown_839D3A8, 0x100F gUnknown_83A6000:: @ 83A6000 - .incbin "baserom.gba", 0x3A6000, 0x10 + .2byte 0x0020 + .2byte 0x0040 + .2byte 0x0060 + .2byte 0x0080 + +gUnknown_83A6008:: @ 83A6008 + .2byte 0x0020 + .2byte 0x0040 + .2byte 0x0080 + .2byte 0x00C0 gUnknown_83A6010:: @ 83A6010 - .incbin "baserom.gba", 0x3A6010, 0x8 + .2byte 0x0020 + .2byte 0x0030 + .2byte 0x0040 + .2byte 0x0050 gUnknown_83A6018:: @ 83A6018 - .incbin "baserom.gba", 0x3A6018, 0x1C + .4byte sub_8060064 + .4byte sub_8060078 + .4byte sub_80600A4 + .4byte sub_80600E0 + .4byte sub_8060100 + .4byte sub_806014C + .4byte sub_80601AC gUnknown_83A6034:: @ 83A6034 - .incbin "baserom.gba", 0x3A6034, 0x1C + .4byte sub_8060064 + .4byte sub_8060078 + .4byte sub_80600A4 + .4byte sub_80600E0 + .4byte sub_8060100 + .4byte sub_806017C + .4byte sub_80601AC gUnknown_83A6050:: @ 83A6050 - .incbin "baserom.gba", 0x3A6050, 0x4 + .byte 1 @ DIR_SOUTH + .byte 2 @ DIR_NORTH + .byte 3 @ DIR_WEST + .byte 4 @ DIR_EAST gUnknown_83A6054:: @ 83A6054 - .incbin "baserom.gba", 0x3A6054, 0x2C + .4byte GetRegularRunningPastFacingDirection + .4byte GetNorthSouthRunningPastFacingDirection + .4byte GetEastWestRunningPastFacingDirection + .4byte GetNorthEastRunningPastFacingDirection + .4byte GetNorthWestRunningPastFacingDirection + .4byte GetSouthEastRunningPastFacingDirection + .4byte GetSouthWestRunningPastFacingDirection + .4byte GetNonEastRunningPastFacingDirection + .4byte GetNonWestRunningPastFacingDirection + .4byte GetNonSouthRunningPastFacingDirection + .4byte GetNonNorthRunningPastFacingDirection gUnknown_83A6080:: @ 83A6080 - .incbin "baserom.gba", 0x3A6080, 0x14 + .4byte sub_80605D0 + .4byte sub_80605E4 + .4byte sub_8060610 + .4byte sub_8060654 + .4byte sub_8060684 gUnknown_83A6094:: @ 83A6094 - .incbin "baserom.gba", 0x3A6094, 0x1C + .4byte sub_8060710 + .4byte sub_8060724 + .4byte sub_8060750 + .4byte sub_806078C + .4byte sub_80607AC + .4byte sub_80607F8 + .4byte sub_8060828 gUnknown_83A60B0:: @ 83A60B0 - .incbin "baserom.gba", 0x3A60B0, 0x4 + .byte 1 @ DIR_SOUTH + .byte 2 @ DIR_NORTH + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A60B4:: @ 83A60B4 - .incbin "baserom.gba", 0x3A60B4, 0x1C + .4byte sub_8060894 + .4byte sub_80608A8 + .4byte sub_80608D4 + .4byte sub_8060910 + .4byte sub_8060930 + .4byte sub_806097C + .4byte sub_80609AC gUnknown_83A60D0:: @ 83A60D0 - .incbin "baserom.gba", 0x3A60D0, 0x4 + .byte 3 @ DIR_WEST + .byte 4 @ DIR_EAST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A60D4:: @ 83A60D4 - .incbin "baserom.gba", 0x3A60D4, 0xC + .4byte sub_8060A18 + .4byte sub_8060A44 + .4byte sub_8060A64 gUnknown_83A60E0:: @ 83A60E0 - .incbin "baserom.gba", 0x3A60E0, 0x14 + .4byte sub_8060AB8 + .4byte sub_8060ACC + .4byte sub_8060AF8 + .4byte sub_8060B3C + .4byte sub_8060B6C gUnknown_83A60F4:: @ 83A60F4 - .incbin "baserom.gba", 0x3A60F4, 0x14 + .4byte sub_8060BF8 + .4byte sub_8060C0C + .4byte sub_8060C38 + .4byte sub_8060C7C + .4byte sub_8060CAC gUnknown_83A6108:: @ 83A6108 - .incbin "baserom.gba", 0x3A6108, 0x14 + .4byte sub_8060D38 + .4byte sub_8060D4C + .4byte sub_8060D78 + .4byte sub_8060DBC + .4byte sub_8060DEC gUnknown_83A611C:: @ 83A611C - .incbin "baserom.gba", 0x3A611C, 0x4 + .byte 2 @ DIR_NORTH + .byte 3 @ DIR_WEST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A6120:: @ 83A6120 - .incbin "baserom.gba", 0x3A6120, 0x14 + .4byte sub_8060E78 + .4byte sub_8060E8C + .4byte sub_8060EB8 + .4byte sub_8060EFC + .4byte sub_8060F2C gUnknown_83A6134:: @ 83A6134 - .incbin "baserom.gba", 0x3A6134, 0x4 + .byte 2 @ DIR_NORTH + .byte 4 @ DIR_EAST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A6138:: @ 83A6138 - .incbin "baserom.gba", 0x3A6138, 0x14 + .4byte sub_8060FB8 + .4byte sub_8060FCC + .4byte sub_8060FF8 + .4byte sub_806103C + .4byte sub_806106C gUnknown_83A614C:: @ 83A614C - .incbin "baserom.gba", 0x3A614C, 0x4 + .byte 1 @ DIR_SOUTH + .byte 3 @ DIR_WEST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A6150:: @ 83A6150 - .incbin "baserom.gba", 0x3A6150, 0x14 + .4byte sub_80610F8 + .4byte sub_806110C + .4byte sub_8061138 + .4byte sub_806117C + .4byte sub_80611AC gUnknown_83A6164:: @ 83A6164 - .incbin "baserom.gba", 0x3A6164, 0x4 + .byte 1 @ DIR_SOUTH + .byte 4 @ DIR_EAST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A6168:: @ 83A6168 - .incbin "baserom.gba", 0x3A6168, 0x14 + .4byte sub_8061238 + .4byte sub_806124C + .4byte sub_8061278 + .4byte sub_80612BC + .4byte sub_80612EC gUnknown_83A617C:: @ 83A617C - .incbin "baserom.gba", 0x3A617C, 0x4 + .byte 2 @ DIR_NORTH + .byte 1 @ DIR_SOUTH + .byte 3 @ DIR_WEST + .byte 1 @ DIR_SOUTH gUnknown_83A6180:: @ 83A6180 - .incbin "baserom.gba", 0x3A6180, 0x14 + .4byte sub_8061378 + .4byte sub_806138C + .4byte sub_80613B8 + .4byte sub_80613FC + .4byte sub_806142C gUnknown_83A6194:: @ 83A6194 - .incbin "baserom.gba", 0x3A6194, 0x4 + .byte 1 @ DIR_SOUTH + .byte 2 @ DIR_NORTH + .byte 4 @ DIR_EAST + .byte 1 @ DIR_SOUTH gUnknown_83A6198:: @ 83A6198 - .incbin "baserom.gba", 0x3A6198, 0x14 + .4byte sub_80614B8 + .4byte sub_80614CC + .4byte sub_80614F8 + .4byte sub_806153C + .4byte sub_806156C gUnknown_83A61AC:: @ 83A61AC - .incbin "baserom.gba", 0x3A61AC, 0x4 + .byte 2 @ DIR_NORTH + .byte 3 @ DIR_WEST + .byte 4 @ DIR_EAST + .byte 2 @ DIR_NORTH gUnknown_83A61B0:: @ 83A61B0 - .incbin "baserom.gba", 0x3A61B0, 0x14 + .4byte sub_80615F8 + .4byte sub_806160C + .4byte sub_8061638 + .4byte sub_806167C + .4byte sub_80616AC gUnknown_83A61C4:: @ 83A61C4 - .incbin "baserom.gba", 0x3A61C4, 0x4 + .byte 3 @ DIR_WEST + .byte 4 @ DIR_EAST + .byte 1 @ DIR_SOUTH + .byte 1 @ DIR_SOUTH gUnknown_83A61C8:: @ 83A61C8 - .incbin "baserom.gba", 0x3A61C8, 0x10 + .4byte sub_8061738 + .4byte sub_8061764 + .4byte sub_8061788 + .4byte sub_80617B4 gUnknown_83A61D8:: @ 83A61D8 - .incbin "baserom.gba", 0x3A61D8, 0x8 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 + .byte 0x00 + .byte 0x00 + .byte 0x00 gUnknown_83A61E0:: @ 83A61E0 - .incbin "baserom.gba", 0x3A61E0, 0x10 + .4byte sub_806183C + .4byte sub_8061868 + .4byte sub_806188C + .4byte sub_80618B8 gUnknown_83A61F0:: @ 83A61F0 - .incbin "baserom.gba", 0x3A61F0, 0x8 + .byte 0x01 + .byte 0x03 + .byte 0x04 + .byte 0x02 + .byte 0x01 + .byte 0x00 + .byte 0x00 + .byte 0x00 gUnknown_83A61F8:: @ 83A61F8 - .incbin "baserom.gba", 0x3A61F8, 0x10 + .4byte sub_8061940 + .4byte sub_8061954 + .4byte sub_806198C + .4byte sub_8061A44 gUnknown_83A6208:: @ 83A6208 - .incbin "baserom.gba", 0x3A6208, 0xC + .4byte sub_8061A6C + .4byte sub_8061BA0 + .4byte sub_8061B34 gUnknown_83A6214:: @ 83A6214 - .incbin "baserom.gba", 0x3A6214, 0x4 + .byte 2 + .byte 4 + .byte 3 + .byte 1 gUnknown_83A6218:: @ 83A6218 - .incbin "baserom.gba", 0x3A6218, 0xC + .4byte sub_8061A6C + .4byte sub_8061C2C + .4byte sub_8061B34 gUnknown_83A6224:: @ 83A6224 - .incbin "baserom.gba", 0x3A6224, 0x4 + .byte 4 + .byte 3 + .byte 1 + .byte 2 gUnknown_83A6228:: @ 83A6228 - .incbin "baserom.gba", 0x3A6228, 0xC + .4byte sub_8061A6C + .4byte sub_8061CB8 + .4byte sub_8061B34 gUnknown_83A6234:: @ 83A6234 - .incbin "baserom.gba", 0x3A6234, 0x4 + .byte 1 + .byte 2 + .byte 4 + .byte 3 gUnknown_83A6238:: @ 83A6238 - .incbin "baserom.gba", 0x3A6238, 0xC + .4byte sub_8061A6C + .4byte sub_8061D44 + .4byte sub_8061B34 gUnknown_83A6244:: @ 83A6244 - .incbin "baserom.gba", 0x3A6244, 0x4 + .byte 3 + .byte 1 + .byte 2 + .byte 4 gUnknown_83A6248:: @ 83A6248 - .incbin "baserom.gba", 0x3A6248, 0xC + .4byte sub_8061A6C + .4byte sub_8061DD0 + .4byte sub_8061B34 gUnknown_83A6254:: @ 83A6254 - .incbin "baserom.gba", 0x3A6254, 0x4 + .byte 2 + .byte 3 + .byte 4 + .byte 1 gUnknown_83A6258:: @ 83A6258 - .incbin "baserom.gba", 0x3A6258, 0xC + .4byte sub_8061A6C + .4byte sub_8061E5C + .4byte sub_8061B34 gUnknown_83A6264:: @ 83A6264 - .incbin "baserom.gba", 0x3A6264, 0x4 + .byte 3 + .byte 4 + .byte 1 + .byte 2 gUnknown_83A6268:: @ 83A6268 - .incbin "baserom.gba", 0x3A6268, 0xC + .4byte sub_8061A6C + .4byte sub_8061EE8 + .4byte sub_8061B34 gUnknown_83A6274:: @ 83A6274 - .incbin "baserom.gba", 0x3A6274, 0xC + .4byte sub_8061A6C + .4byte sub_8061F74 + .4byte sub_8061B34 gUnknown_83A6280:: @ 83A6280 - .incbin "baserom.gba", 0x3A6280, 0x4 + .byte 4 + .byte 1 + .byte 2 + .byte 3 gUnknown_83A6284:: @ 83A6284 - .incbin "baserom.gba", 0x3A6284, 0xC + .4byte sub_8061A6C + .4byte sub_8062000 + .4byte sub_8061B34 gUnknown_83A6290:: @ 83A6290 - .incbin "baserom.gba", 0x3A6290, 0x4 + .byte 3 + .byte 2 + .byte 1 + .byte 4 gUnknown_83A6294:: @ 83A6294 - .incbin "baserom.gba", 0x3A6294, 0xC + .4byte sub_8061A6C + .4byte sub_806208C + .4byte sub_8061B34 gUnknown_83A62A0:: @ 83A62A0 - .incbin "baserom.gba", 0x3A62A0, 0x4 + .byte 2 + .byte 1 + .byte 4 + .byte 3 gUnknown_83A62A4:: @ 83A62A4 - .incbin "baserom.gba", 0x3A62A4, 0xC + .4byte sub_8061A6C + .4byte sub_8062118 + .4byte sub_8061B34 gUnknown_83A62B0:: @ 83A62B0 - .incbin "baserom.gba", 0x3A62B0, 0x4 + .byte 4 + .byte 3 + .byte 2 + .byte 1 gUnknown_83A62B4:: @ 83A62B4 - .incbin "baserom.gba", 0x3A62B4, 0xC + .4byte sub_8061A6C + .4byte sub_80621A4 + .4byte sub_8061B34 gUnknown_83A62C0:: @ 83A62C0 - .incbin "baserom.gba", 0x3A62C0, 0x4 + .byte 1 + .byte 4 + .byte 3 + .byte 2 gUnknown_83A62C4:: @ 83A62C4 - .incbin "baserom.gba", 0x3A62C4, 0xC + .4byte sub_8061A6C + .4byte sub_8062230 + .4byte sub_8061B34 gUnknown_83A62D0:: @ 83A62D0 - .incbin "baserom.gba", 0x3A62D0, 0x4 + .byte 4 + .byte 2 + .byte 1 + .byte 3 gUnknown_83A62D4:: @ 83A62D4 - .incbin "baserom.gba", 0x3A62D4, 0xC + .4byte sub_8061A6C + .4byte sub_80622BC + .4byte sub_8061B34 gUnknown_83A62E0:: @ 83A62E0 - .incbin "baserom.gba", 0x3A62E0, 0x4 + .byte 2 + .byte 1 + .byte 3 + .byte 4 gUnknown_83A62E4:: @ 83A62E4 - .incbin "baserom.gba", 0x3A62E4, 0xC + .4byte sub_8061A6C + .4byte sub_8062348 + .4byte sub_8061B34 gUnknown_83A62F0:: @ 83A62F0 - .incbin "baserom.gba", 0x3A62F0, 0x4 + .byte 3 + .byte 4 + .byte 2 + .byte 1 gUnknown_83A62F4:: @ 83A62F4 - .incbin "baserom.gba", 0x3A62F4, 0xC + .4byte sub_8061A6C + .4byte sub_80623D4 + .4byte sub_8061B34 gUnknown_83A6300:: @ 83A6300 - .incbin "baserom.gba", 0x3A6300, 0x4 + .byte 1 + .byte 3 + .byte 4 + .byte 2 gUnknown_83A6304:: @ 83A6304 - .incbin "baserom.gba", 0x3A6304, 0xC + .4byte sub_8061A6C + .4byte sub_8062460 + .4byte sub_8061B34 gUnknown_83A6310:: @ 83A6310 - .incbin "baserom.gba", 0x3A6310, 0x4 + .byte 2 + .byte 3 + .byte 1 + .byte 4 gUnknown_83A6314:: @ 83A6314 - .incbin "baserom.gba", 0x3A6314, 0xC + .4byte sub_8061A6C + .4byte sub_80624EC + .4byte sub_8061B34 gUnknown_83A6320:: @ 83A6320 - .incbin "baserom.gba", 0x3A6320, 0x4 + .byte 1 + .byte 4 + .byte 2 + .byte 3 gUnknown_83A6324:: @ 83A6324 - .incbin "baserom.gba", 0x3A6324, 0xC + .4byte sub_8061A6C + .4byte sub_8062578 + .4byte sub_8061B34 gUnknown_83A6330:: @ 83A6330 - .incbin "baserom.gba", 0x3A6330, 0x4 + .byte 3 + .byte 1 + .byte 4 + .byte 2 gUnknown_83A6334:: @ 83A6334 - .incbin "baserom.gba", 0x3A6334, 0xC + .4byte sub_8061A6C + .4byte sub_8062604 + .4byte sub_8061B34 gUnknown_83A6340:: @ 83A6340 - .incbin "baserom.gba", 0x3A6340, 0x4 + .byte 4 + .byte 2 + .byte 3 + .byte 1 gUnknown_83A6344:: @ 83A6344 - .incbin "baserom.gba", 0x3A6344, 0xC + .4byte sub_8061A6C + .4byte sub_8062690 + .4byte sub_8061B34 gUnknown_83A6350:: @ 83A6350 - .incbin "baserom.gba", 0x3A6350, 0x4 + .byte 2 + .byte 4 + .byte 1 + .byte 3 gUnknown_83A6354:: @ 83A6354 - .incbin "baserom.gba", 0x3A6354, 0xC + .4byte sub_8061A6C + .4byte sub_806271C + .4byte sub_8061B34 gUnknown_83A6360:: @ 83A6360 - .incbin "baserom.gba", 0x3A6360, 0x4 + .byte 1 + .byte 3 + .byte 2 + .byte 4 gUnknown_83A6364:: @ 83A6364 - .incbin "baserom.gba", 0x3A6364, 0xC + .4byte sub_8061A6C + .4byte sub_80627A8 + .4byte sub_8061B34 gUnknown_83A6370:: @ 83A6370 - .incbin "baserom.gba", 0x3A6370, 0x4 + .byte 3 + .byte 2 + .byte 4 + .byte 1 gUnknown_83A6374:: @ 83A6374 - .incbin "baserom.gba", 0x3A6374, 0xC + .4byte sub_8061A6C + .4byte sub_8062834 + .4byte sub_8061B34 gUnknown_83A6380:: @ 83A6380 - .incbin "baserom.gba", 0x3A6380, 0x4 + .byte 4 + .byte 1 + .byte 3 + .byte 2 gUnknown_83A6384:: @ 83A6384 - .incbin "baserom.gba", 0x3A6384, 0xC + .4byte mss_npc_reset_oampriv3_1_unk2_unk3 + .4byte sub_80628E4 + .4byte sub_8062944 gUnknown_83A6390:: @ 83A6390 - .incbin "baserom.gba", 0x3A6390, 0x2C + .4byte sub_806296C + .4byte sub_8062970 + .4byte sub_80629B8 + .4byte sub_8062A70 + .4byte sub_8062B28 + .4byte sub_8062BE0 + .4byte cph_IM_DIFFERENT + .4byte sub_8062CE0 + .4byte oac_hopping + .4byte sub_806296C + .4byte sub_806296C gUnknown_83A63BC:: @ 83A63BC - .incbin "baserom.gba", 0x3A63BC, 0xC + .4byte mss_npc_reset_oampriv3_1_unk2_unk3 + .4byte mss_08062EA4 + .4byte sub_8062944 gUnknown_83A63C8:: @ 83A63C8 - .incbin "baserom.gba", 0x3A63C8, 0x4 + .4byte sub_8063078 gUnknown_83A63CC:: @ 83A63CC - .incbin "baserom.gba", 0x3A63CC, 0x8 + .4byte sub_80630E4 + .4byte sub_8063084 gUnknown_83A63D4:: @ 83A63D4 - .incbin "baserom.gba", 0x3A63D4, 0x8 + .4byte sub_8063154 + .4byte sub_8063084 gUnknown_83A63DC:: @ 83A63DC - .incbin "baserom.gba", 0x3A63DC, 0x8 + .4byte sub_80631C4 + .4byte sub_8063084 gUnknown_83A63E4:: @ 83A63E4 - .incbin "baserom.gba", 0x3A63E4, 0xC + .4byte sub_8063234 + .4byte sub_8063268 + .4byte sub_8063288 gUnknown_83A63F0:: @ 83A63F0 - .incbin "baserom.gba", 0x3A63F0, 0xC + .4byte sub_8063364 + .4byte sub_8063384 + .4byte sub_80633A4 gUnknown_83A63FC:: @ 83A63FC - .incbin "baserom.gba", 0x3A63FC, 0x8 + .4byte sub_80633B4 + .4byte sub_80633F4 gUnknown_83A6404:: @ 83A6404 - .incbin "baserom.gba", 0x3A6404, 0x8 + .4byte sub_80633D4 + .4byte sub_80633F4 +@ gFaceDirectionAnimNums ? gUnknown_83A640C:: @ 83A640C - .incbin "baserom.gba", 0x3A640C, 0x9 + .byte 0x00 + .byte 0x00 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x00 + .byte 0x00 + .byte 0x01 + .byte 0x01 gUnknown_83A6415:: @ 83A6415 - .incbin "baserom.gba", 0x3A6415, 0x9 + .byte 0x4 @ DIR_NONE + .byte 0x4 @ DIR_SOUTH + .byte 0x5 @ DIR_NORTH + .byte 0x6 @ DIR_WEST + .byte 0x7 @ DIR_EAST + .byte 0x4 @ DIR_SOUTHWEST + .byte 0x4 @ DIR_SOUTHEAST + .byte 0x5 @ DIR_NORTHWEST + .byte 0x5 @ DIR_NORTHEAST gUnknown_83A641E:: @ 83A641E - .incbin "baserom.gba", 0x3A641E, 0x9 + .byte 0x8 @ DIR_NONE + .byte 0x8 @ DIR_SOUTH + .byte 0x9 @ DIR_NORTH + .byte 0xA @ DIR_WEST + .byte 0xB @ DIR_EAST + .byte 0x8 @ DIR_SOUTHWEST + .byte 0x8 @ DIR_SOUTHEAST + .byte 0x9 @ DIR_NORTHWEST + .byte 0x9 @ DIR_NORTHEAST gUnknown_83A6427:: @ 83A6427 - .incbin "baserom.gba", 0x3A6427, 0x9 + .byte 0xC @ DIR_NONE + .byte 0xC @ DIR_SOUTH + .byte 0xD @ DIR_NORTH + .byte 0xE @ DIR_WEST + .byte 0xF @ DIR_EAST + .byte 0xC @ DIR_SOUTHWEST + .byte 0xC @ DIR_SOUTHEAST + .byte 0xD @ DIR_NORTHWEST + .byte 0xD @ DIR_NORTHEAST gUnknown_83A6430:: @ 83A6430 - .incbin "baserom.gba", 0x3A6430, 0x9 + .byte 0x10 @ DIR_NONE + .byte 0x10 @ DIR_SOUTH + .byte 0x11 @ DIR_NORTH + .byte 0x12 @ DIR_WEST + .byte 0x13 @ DIR_EAST + .byte 0x10 @ DIR_SOUTHWEST + .byte 0x10 @ DIR_SOUTHEAST + .byte 0x11 @ DIR_NORTHWEST + .byte 0x11 @ DIR_NORTHEAST gUnknown_83A6439:: @ 83A6439 - .incbin "baserom.gba", 0x3A6439, 0x9 + .byte 0x14 @ DIR_NONE + .byte 0x14 @ DIR_SOUTH + .byte 0x15 @ DIR_NORTH + .byte 0x16 @ DIR_WEST + .byte 0x17 @ DIR_EAST + .byte 0x14 @ DIR_SOUTHWEST + .byte 0x14 @ DIR_SOUTHEAST + .byte 0x15 @ DIR_NORTHWEST + .byte 0x15 @ DIR_NORTHEAST gUnknown_83A6442:: @ 83A6442 - .incbin "baserom.gba", 0x3A6442, 0x9 + .byte 0x14 @ DIR_NONE + .byte 0x14 @ DIR_SOUTH + .byte 0x15 @ DIR_NORTH + .byte 0x16 @ DIR_WEST + .byte 0x17 @ DIR_EAST + .byte 0x14 @ DIR_SOUTHWEST + .byte 0x14 @ DIR_SOUTHEAST + .byte 0x15 @ DIR_NORTHWEST + .byte 0x15 @ DIR_NORTHEAST gUnknown_83A644B:: @ 83A644B - .incbin "baserom.gba", 0x3A644B, 0x9 + .byte 0x18 @ DIR_NONE + .byte 0x18 @ DIR_SOUTH + .byte 0x19 @ DIR_NORTH + .byte 0x1A @ DIR_WEST + .byte 0x1B @ DIR_EAST + .byte 0x18 @ DIR_SOUTHWEST + .byte 0x18 @ DIR_SOUTHEAST + .byte 0x19 @ DIR_NORTHWEST + .byte 0x19 @ DIR_NORTHEAST gUnknown_83A6454:: @ 83A6454 - .incbin "baserom.gba", 0x3A6454, 0x9 + .byte 0x1C @ DIR_NONE + .byte 0x1C @ DIR_SOUTH + .byte 0x1D @ DIR_NORTH + .byte 0x1E @ DIR_WEST + .byte 0x1F @ DIR_EAST + .byte 0x1C @ DIR_SOUTHWEST + .byte 0x1C @ DIR_SOUTHEAST + .byte 0x1D @ DIR_NORTHWEST + .byte 0x1D @ DIR_NORTHEAST gUnknown_83A645D:: @ 83A645D - .incbin "baserom.gba", 0x3A645D, 0x9 + .byte 0x18 @ DIR_NONE + .byte 0x18 @ DIR_SOUTH + .byte 0x19 @ DIR_NORTH + .byte 0x1A @ DIR_WEST + .byte 0x1B @ DIR_EAST + .byte 0x18 @ DIR_SOUTHWEST + .byte 0x19 @ DIR_SOUTHEAST + .byte 0x1A @ DIR_NORTHWEST + .byte 0x1B @ DIR_NORTHEAST gUnknown_83A6466:: @ 83A6466 - .incbin "baserom.gba", 0x3A6466, 0x9 + .byte 0x20 @ DIR_NONE + .byte 0x20 @ DIR_SOUTH + .byte 0x21 @ DIR_NORTH + .byte 0x22 @ DIR_WEST + .byte 0x23 @ DIR_EAST + .byte 0x20 @ DIR_SOUTHWEST + .byte 0x20 @ DIR_SOUTHEAST + .byte 0x21 @ DIR_NORTHWEST + .byte 0x21 @ DIR_NORTHEAST gUnknown_83A646F:: @ 83A646F - .incbin "baserom.gba", 0x3A646F, 0x9 + .byte 0x24 @ DIR_NONE + .byte 0x24 @ DIR_SOUTH + .byte 0x25 @ DIR_NORTH + .byte 0x26 @ DIR_WEST + .byte 0x27 @ DIR_EAST + .byte 0x24 @ DIR_SOUTHWEST + .byte 0x24 @ DIR_SOUTHEAST + .byte 0x25 @ DIR_NORTHWEST + .byte 0x25 @ DIR_NORTHEAST gUnknown_83A6478:: @ 83A6478 - .incbin "baserom.gba", 0x3A6478, 0x9 + .byte 0x0 @ DIR_NONE + .byte 0x0 @ DIR_SOUTH + .byte 0x1 @ DIR_NORTH + .byte 0x2 @ DIR_WEST + .byte 0x3 @ DIR_EAST + .byte 0x0 @ DIR_SOUTHWEST + .byte 0x0 @ DIR_SOUTHEAST + .byte 0x1 @ DIR_NORTHWEST + .byte 0x1 @ DIR_NORTHEAST gUnknown_83A6481:: @ 83A6481 - .incbin "baserom.gba", 0x3A6481, 0x9 + .byte 0x4 @ DIR_NONE + .byte 0x4 @ DIR_SOUTH + .byte 0x5 @ DIR_NORTH + .byte 0x6 @ DIR_WEST + .byte 0x7 @ DIR_EAST + .byte 0x4 @ DIR_SOUTHWEST + .byte 0x4 @ DIR_SOUTHEAST + .byte 0x5 @ DIR_NORTHWEST + .byte 0x5 @ DIR_NORTHEAST gUnknown_83A648A:: @ 83A648A - .incbin "baserom.gba", 0x3A648A, 0x9 + .byte 0x8 @ DIR_NONE + .byte 0x8 @ DIR_SOUTH + .byte 0x9 @ DIR_NORTH + .byte 0xA @ DIR_WEST + .byte 0xB @ DIR_EAST + .byte 0x8 @ DIR_SOUTHWEST + .byte 0x8 @ DIR_SOUTHEAST + .byte 0x9 @ DIR_NORTHWEST + .byte 0x9 @ DIR_NORTHEAST gUnknown_83A6493:: @ 83A6493 - .incbin "baserom.gba", 0x3A6493, 0x9 + .byte 0x14 @ DIR_NONE + .byte 0x14 @ DIR_SOUTH + .byte 0x15 @ DIR_NORTH + .byte 0x16 @ DIR_WEST + .byte 0x17 @ DIR_EAST + .byte 0x14 @ DIR_SOUTHWEST + .byte 0x14 @ DIR_SOUTHEAST + .byte 0x15 @ DIR_NORTHWEST + .byte 0x15 @ DIR_NORTHEAST gUnknown_83A649C:: @ 83A649C - .incbin "baserom.gba", 0x3A649C, 0xC + .byte 0x08 + .byte 0x08 + .byte 0x07 + .byte 0x09 + .byte 0x0A + .byte 0x08 + .byte 0x08 + .byte 0x07 + .byte 0x07 + .byte 0x00 + .byte 0x00 + .byte 0x00 gUnknown_83A64A8:: @ 83A64A8 - .incbin "baserom.gba", 0x3A64A8, 0x10 + .4byte MetatileBehavior_IsSouthBlocked + .4byte MetatileBehavior_IsNorthBlocked + .4byte MetatileBehavior_IsWestBlocked + .4byte MetatileBehavior_IsEastBlocked gUnknown_83A64B8:: @ 83A64B8 - .incbin "baserom.gba", 0x3A64B8, 0x10 + .4byte MetatileBehavior_IsNorthBlocked + .4byte MetatileBehavior_IsSouthBlocked + .4byte MetatileBehavior_IsEastBlocked + .4byte MetatileBehavior_IsWestBlocked +@ sDirectionToVectors gUnknown_83A64C8:: @ 83A64C8 - .incbin "baserom.gba", 0x3A64C8, 0x24 - + .2byte 0, 0 @ DIR_NONE + .2byte 0, 1 @ DIR_SOUTH + .2byte 0, -1 @ DIR_NORTH + .2byte -1, 0 @ DIR_WEST + .2byte 1, 0 @ DIR_EAST + .2byte -1, 1 @ DIR_SOUTHWEST + .2byte 1, 1 @ DIR_SOUTHEAST + .2byte -1, -1 @ DIR_NORTHWEST + .2byte 1, -1 @ DIR_NORTHEAST + +@ gFaceDirectionMovementActions gUnknown_83A64EC:: @ 83A64EC - .incbin "baserom.gba", 0x3A64EC, 0x5 + .byte 0x0 @ DIR_NONE + .byte 0x0 @ DIR_SOUTH + .byte 0x1 @ DIR_NORTH + .byte 0x2 @ DIR_WEST + .byte 0x3 @ DIR_EAST gUnknown_83A64F1:: @ 83A64F1 - .incbin "baserom.gba", 0x3A64F1, 0x5 + .byte 0x4 @ DIR_NONE + .byte 0x4 @ DIR_SOUTH + .byte 0x5 @ DIR_NORTH + .byte 0x6 @ DIR_WEST + .byte 0x7 @ DIR_EAST gUnknown_83A64F6:: @ 83A64F6 - .incbin "baserom.gba", 0x3A64F6, 0x5 + .byte 0x9B @ DIR_NONE + .byte 0x9B @ DIR_SOUTH + .byte 0x9C @ DIR_NORTH + .byte 0x9D @ DIR_WEST + .byte 0x9E @ DIR_EAST gUnknown_83A64FB:: @ 83A64FB - .incbin "baserom.gba", 0x3A64FB, 0x5 + .byte 0x8 @ DIR_NONE + .byte 0x8 @ DIR_SOUTH + .byte 0x9 @ DIR_NORTH + .byte 0xA @ DIR_WEST + .byte 0xB @ DIR_EAST gUnknown_83A6500:: @ 83A6500 - .incbin "baserom.gba", 0x3A6500, 0x5 + .byte 0xC @ DIR_NONE + .byte 0xC @ DIR_SOUTH + .byte 0xD @ DIR_NORTH + .byte 0xE @ DIR_WEST + .byte 0xF @ DIR_EAST gUnknown_83A6505:: @ 83A6505 - .incbin "baserom.gba", 0x3A6505, 0x5 + .byte 0x10 @ DIR_NONE + .byte 0x10 @ DIR_SOUTH + .byte 0x11 @ DIR_NORTH + .byte 0x12 @ DIR_WEST + .byte 0x13 @ DIR_EAST gUnknown_83A650A:: @ 83A650A - .incbin "baserom.gba", 0x3A650A, 0x5 + .byte 0x1D @ DIR_NONE + .byte 0x1D @ DIR_SOUTH + .byte 0x1E @ DIR_NORTH + .byte 0x1F @ DIR_WEST + .byte 0x20 @ DIR_EAST gUnknown_83A650F:: @ 83A650F - .incbin "baserom.gba", 0x3A650F, 0x5 + .byte 0xA0 @ DIR_NONE + .byte 0xA0 @ DIR_SOUTH + .byte 0xA1 @ DIR_NORTH + .byte 0xA2 @ DIR_WEST + .byte 0xA3 @ DIR_EAST gUnknown_83A6514:: @ 83A6514 - .incbin "baserom.gba", 0x3A6514, 0x5 + .byte 0x31 @ DIR_NONE + .byte 0x31 @ DIR_SOUTH + .byte 0x32 @ DIR_NORTH + .byte 0x33 @ DIR_WEST + .byte 0x34 @ DIR_EAST gUnknown_83A6519:: @ 83A6519 - .incbin "baserom.gba", 0x3A6519, 0x5 + .byte 0x35 @ DIR_NONE + .byte 0x35 @ DIR_SOUTH + .byte 0x36 @ DIR_NORTH + .byte 0x37 @ DIR_WEST + .byte 0x38 @ DIR_EAST gUnknown_83A651E:: @ 83A651E - .incbin "baserom.gba", 0x3A651E, 0x5 + .byte 0x39 @ DIR_NONE + .byte 0x39 @ DIR_SOUTH + .byte 0x3A @ DIR_NORTH + .byte 0x3B @ DIR_WEST + .byte 0x3C @ DIR_EAST gUnknown_83A6523:: @ 83A6523 - .incbin "baserom.gba", 0x3A6523, 0x5 + .byte 0x3D @ DIR_NONE + .byte 0x3D @ DIR_SOUTH + .byte 0x3E @ DIR_NORTH + .byte 0x3F @ DIR_WEST + .byte 0x40 @ DIR_EAST gUnknown_83A6528:: @ 83A6528 - .incbin "baserom.gba", 0x3A6528, 0x5 + .byte 0x41 @ DIR_NONE + .byte 0x41 @ DIR_SOUTH + .byte 0x42 @ DIR_NORTH + .byte 0x43 @ DIR_WEST + .byte 0x44 @ DIR_EAST gUnknown_83A652D:: @ 83A652D - .incbin "baserom.gba", 0x3A652D, 0x5 + .byte 0x94 @ DIR_NONE + .byte 0x94 @ DIR_SOUTH + .byte 0x95 @ DIR_NORTH + .byte 0x96 @ DIR_WEST + .byte 0x97 @ DIR_EAST gUnknown_83A6532:: @ 83A6532 - .incbin "baserom.gba", 0x3A6532, 0x5 + .byte 0x14 @ DIR_NONE + .byte 0x14 @ DIR_SOUTH + .byte 0x15 @ DIR_NORTH + .byte 0x16 @ DIR_WEST + .byte 0x17 @ DIR_EAST gUnknown_83A6537:: @ 83A6537 - .incbin "baserom.gba", 0x3A6537, 0x5 + .byte 0x52 @ DIR_NONE + .byte 0x52 @ DIR_SOUTH + .byte 0x53 @ DIR_NORTH + .byte 0x54 @ DIR_WEST + .byte 0x55 @ DIR_EAST gUnknown_83A653C:: @ 83A653C - .incbin "baserom.gba", 0x3A653C, 0x5 + .byte 0x57 @ DIR_NONE + .byte 0x57 @ DIR_SOUTH + .byte 0x56 @ DIR_NORTH + .byte 0x59 @ DIR_WEST + .byte 0x58 @ DIR_EAST gUnknown_83A6541:: @ 83A6541 - .incbin "baserom.gba", 0x3A6541, 0x5 + .byte 0x4E @ DIR_NONE + .byte 0x4E @ DIR_SOUTH + .byte 0x4F @ DIR_NORTH + .byte 0x50 @ DIR_WEST + .byte 0x51 @ DIR_EAST gUnknown_83A6546:: @ 83A6546 - .incbin "baserom.gba", 0x3A6546, 0x5 + .byte 0x46 @ DIR_NONE + .byte 0x46 @ DIR_SOUTH + .byte 0x47 @ DIR_NORTH + .byte 0x48 @ DIR_WEST + .byte 0x49 @ DIR_EAST gUnknown_83A654B:: @ 83A654B - .incbin "baserom.gba", 0x3A654B, 0x5 + .byte 0xA6 @ DIR_NONE + .byte 0xA6 @ DIR_SOUTH + .byte 0xA7 @ DIR_NORTH + .byte 0xA8 @ DIR_WEST + .byte 0xA9 @ DIR_EAST gUnknown_83A6550:: @ 83A6550 - .incbin "baserom.gba", 0x3A6550, 0x5 + .byte 0x21 @ DIR_NONE + .byte 0x21 @ DIR_SOUTH + .byte 0x22 @ DIR_NORTH + .byte 0x23 @ DIR_WEST + .byte 0x24 @ DIR_EAST gUnknown_83A6555:: @ 83A6555 - .incbin "baserom.gba", 0x3A6555, 0x5 + .byte 0x25 @ DIR_NONE + .byte 0x25 @ DIR_SOUTH + .byte 0x26 @ DIR_NORTH + .byte 0x27 @ DIR_WEST + .byte 0x28 @ DIR_EAST gUnknown_83A655A:: @ 83A655A - .incbin "baserom.gba", 0x3A655A, 0x5 + .byte 0x29 @ DIR_NONE + .byte 0x29 @ DIR_SOUTH + .byte 0x2A @ DIR_NORTH + .byte 0x2B @ DIR_WEST + .byte 0x2C @ DIR_EAST gUnknown_83A655F:: @ 83A655F - .incbin "baserom.gba", 0x3A655F, 0x5 + .byte 0x2D @ DIR_NONE + .byte 0x2D @ DIR_SOUTH + .byte 0x2E @ DIR_NORTH + .byte 0x2F @ DIR_WEST + .byte 0x30 @ DIR_EAST gUnknown_83A6564:: @ 83A6564 - .incbin "baserom.gba", 0x3A6564, 0x5 + .byte 0x70 @ DIR_NONE + .byte 0x70 @ DIR_SOUTH + .byte 0x71 @ DIR_NORTH + .byte 0x72 @ DIR_WEST + .byte 0x73 @ DIR_EAST gUnknown_83A6569:: @ 83A6569 - .incbin "baserom.gba", 0x3A6569, 0x5 + .byte 0x74 @ DIR_NONE + .byte 0x74 @ DIR_SOUTH + .byte 0x75 @ DIR_NORTH + .byte 0x76 @ DIR_WEST + .byte 0x77 @ DIR_EAST gUnknown_83A656E:: @ 83A656E - .incbin "baserom.gba", 0x3A656E, 0x5 + .byte 0x78 @ DIR_NONE + .byte 0x78 @ DIR_SOUTH + .byte 0x79 @ DIR_NORTH + .byte 0x7A @ DIR_WEST + .byte 0x7B @ DIR_EAST gUnknown_83A6573:: @ 83A6573 - .incbin "baserom.gba", 0x3A6573, 0x5 + .byte 0x7C @ DIR_NONE + .byte 0x7C @ DIR_SOUTH + .byte 0x7D @ DIR_NORTH + .byte 0x7E @ DIR_WEST + .byte 0x7F @ DIR_EAST gUnknown_83A6578:: @ 83A6578 - .incbin "baserom.gba", 0x3A6578, 0x5 + .byte 0x80 @ DIR_NONE + .byte 0x80 @ DIR_SOUTH + .byte 0x81 @ DIR_NORTH + .byte 0x82 @ DIR_WEST + .byte 0x83 @ DIR_EAST gUnknown_83A657D:: @ 83A657D - .incbin "baserom.gba", 0x3A657D, 0x5 + .byte 0x84 @ DIR_NONE + .byte 0x84 @ DIR_SOUTH + .byte 0x85 @ DIR_NORTH + .byte 0x86 @ DIR_WEST + .byte 0x87 @ DIR_EAST gUnknown_83A6582:: @ 83A6582 - .incbin "baserom.gba", 0x3A6582, 0x5 + .byte 0x88 @ DIR_NONE + .byte 0x88 @ DIR_SOUTH + .byte 0x89 @ DIR_NORTH + .byte 0x8A @ DIR_WEST + .byte 0x8B @ DIR_EAST gUnknown_83A6587:: @ 83A6587 - .incbin "baserom.gba", 0x3A6587, 0x5 + .byte 0x8C @ DIR_NONE + .byte 0x8C @ DIR_SOUTH + .byte 0x8D @ DIR_NORTH + .byte 0x8E @ DIR_WEST + .byte 0x8F @ DIR_EAST gUnknown_83A658C:: @ 83A658C - .incbin "baserom.gba", 0x3A658C, 0x5 + .byte 0x90 @ DIR_NONE + .byte 0x90 @ DIR_SOUTH + .byte 0x91 @ DIR_NORTH + .byte 0x92 @ DIR_WEST + .byte 0x93 @ DIR_EAST +@ gOppositeDirections ? gUnknown_83A6591:: @ 83A6591 - .incbin "baserom.gba", 0x3A6591, 0x8 + .byte 0x02 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x08 + .byte 0x07 + .byte 0x06 + .byte 0x05 gUnknown_83A6599:: @ 83A6599 - .incbin "baserom.gba", 0x3A6599, 0x10 + .byte 0x02 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x04 + .byte 0x03 + .byte 0x04 + .byte 0x02 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 gUnknown_83A65A9:: @ 83A65A9 - .incbin "baserom.gba", 0x3A65A9, 0x13 - + .byte 0x02 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x04 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x04 + .byte 0x02 + .byte 0x01 + .byte 0x00 + .byte 0x00 + .byte 0x00 + +@ gMovementActionFuncs gUnknown_83A65BC:: @ 83A65BC - .incbin "baserom.gba", 0x3A65BC, 0x2C8 + .4byte gUnknown_83A6864 + .4byte gUnknown_83A686C + .4byte gUnknown_83A6874 + .4byte gUnknown_83A687C + .4byte gUnknown_83A6A30 + .4byte gUnknown_83A6A38 + .4byte gUnknown_83A6A40 + .4byte gUnknown_83A6A48 + .4byte gUnknown_83A68C8 + .4byte gUnknown_83A68D4 + .4byte gUnknown_83A68E0 + .4byte gUnknown_83A68EC + .4byte gUnknown_83A6904 + .4byte gUnknown_83A68F8 + .4byte gUnknown_83A6910 + .4byte gUnknown_83A691C + .4byte gUnknown_83A6928 + .4byte gUnknown_83A6934 + .4byte gUnknown_83A6940 + .4byte gUnknown_83A694C + .4byte gUnknown_83A6964 + .4byte gUnknown_83A6970 + .4byte gUnknown_83A697C + .4byte gUnknown_83A6988 + .4byte gUnknown_83A6994 + .4byte gUnknown_83A69A0 + .4byte gUnknown_83A69AC + .4byte gUnknown_83A69B8 + .4byte gUnknown_83A69C4 + .4byte gUnknown_83A69D0 + .4byte gUnknown_83A69DC + .4byte gUnknown_83A69E8 + .4byte gUnknown_83A69F4 + .4byte gUnknown_83A6A50 + .4byte gUnknown_83A6A5C + .4byte gUnknown_83A6A68 + .4byte gUnknown_83A6A74 + .4byte gUnknown_83A6A80 + .4byte gUnknown_83A6A8C + .4byte gUnknown_83A6A98 + .4byte gUnknown_83A6AA4 + .4byte gUnknown_83A6AB0 + .4byte gUnknown_83A6ABC + .4byte gUnknown_83A6AC8 + .4byte gUnknown_83A6AD4 + .4byte gUnknown_83A6AE0 + .4byte gUnknown_83A6AEC + .4byte gUnknown_83A6AF8 + .4byte gUnknown_83A6B04 + .4byte gUnknown_83A6B10 + .4byte gUnknown_83A6B1C + .4byte gUnknown_83A6B28 + .4byte gUnknown_83A6B34 + .4byte gUnknown_83A6B40 + .4byte gUnknown_83A6B4C + .4byte gUnknown_83A6B58 + .4byte gUnknown_83A6B64 + .4byte gUnknown_83A6B70 + .4byte gUnknown_83A6B7C + .4byte gUnknown_83A6B88 + .4byte gUnknown_83A6B94 + .4byte gUnknown_83A6BA0 + .4byte gUnknown_83A6BAC + .4byte gUnknown_83A6BB8 + .4byte gUnknown_83A6BC4 + .4byte gUnknown_83A6BD0 + .4byte gUnknown_83A6BDC + .4byte gUnknown_83A6BE8 + .4byte gUnknown_83A6BF4 + .4byte gUnknown_83A6C00 + .4byte gUnknown_83A6C0C + .4byte gUnknown_83A6C18 + .4byte gUnknown_83A6C24 + .4byte gUnknown_83A6C30 + .4byte gUnknown_83A6C6C + .4byte gUnknown_83A6C74 + .4byte gUnknown_83A6C7C + .4byte gUnknown_83A6C84 + .4byte gUnknown_83A6C8C + .4byte gUnknown_83A6C98 + .4byte gUnknown_83A6CA4 + .4byte gUnknown_83A6CB0 + .4byte gUnknown_83A6CBC + .4byte gUnknown_83A6CC8 + .4byte gUnknown_83A6CD4 + .4byte gUnknown_83A6CE0 + .4byte gUnknown_83A6CEC + .4byte gUnknown_83A6CF8 + .4byte gUnknown_83A6D04 + .4byte gUnknown_83A6D10 + .4byte gUnknown_83A6D1C + .4byte gUnknown_83A6D24 + .4byte gUnknown_83A6D30 + .4byte gUnknown_83A6D38 + .4byte gUnknown_83A6D40 + .4byte gUnknown_83A6D48 + .4byte gUnknown_83A6D50 + .4byte gUnknown_83A6D58 + .4byte gUnknown_83A6D60 + .4byte gUnknown_83A6D68 + .4byte gUnknown_83A6D70 + .4byte gUnknown_83A6D78 + .4byte gUnknown_83A6D80 + .4byte gUnknown_83A6D88 + .4byte gUnknown_83A6D94 + .4byte gUnknown_83A6DA4 + .4byte gUnknown_83A6DB4 + .4byte gUnknown_83A6DBC + .4byte gUnknown_83A6DC4 + .4byte gUnknown_83A6DCC + .4byte gUnknown_83A6DD4 + .4byte gUnknown_83A6DE0 + .4byte gUnknown_83A6DEC + .4byte gUnknown_83A6DF4 + .4byte gUnknown_83A6DFC + .4byte gUnknown_83A6E04 + .4byte gUnknown_83A6E0C + .4byte gUnknown_83A6E18 + .4byte gUnknown_83A6E24 + .4byte gUnknown_83A6E30 + .4byte gUnknown_83A6E3C + .4byte gUnknown_83A6E48 + .4byte gUnknown_83A6E54 + .4byte gUnknown_83A6E60 + .4byte gUnknown_83A6E9C + .4byte gUnknown_83A6EA8 + .4byte gUnknown_83A6EB4 + .4byte gUnknown_83A6EC0 + .4byte gUnknown_83A6ECC + .4byte gUnknown_83A6ED8 + .4byte gUnknown_83A6EE4 + .4byte gUnknown_83A6EF0 + .4byte gUnknown_83A6EFC + .4byte gUnknown_83A6F08 + .4byte gUnknown_83A6F14 + .4byte gUnknown_83A6F20 + .4byte gUnknown_83A6F2C + .4byte gUnknown_83A6F38 + .4byte gUnknown_83A6F44 + .4byte gUnknown_83A6F50 + .4byte gUnknown_83A6F5C + .4byte gUnknown_83A6F68 + .4byte gUnknown_83A6F74 + .4byte gUnknown_83A6F80 + .4byte gUnknown_83A6F8C + .4byte gUnknown_83A6F98 + .4byte gUnknown_83A6FA4 + .4byte gUnknown_83A6FB0 + .4byte gUnknown_83A6FBC + .4byte gUnknown_83A6FC8 + .4byte gUnknown_83A6FD4 + .4byte gUnknown_83A6FE0 + .4byte gUnknown_83A6FEC + .4byte gUnknown_83A6FF4 + .4byte gUnknown_83A6FFC + .4byte gUnknown_83A6898 + .4byte gUnknown_83A68A4 + .4byte gUnknown_83A68B0 + .4byte gUnknown_83A68BC + .4byte gUnknown_83A7004 + .4byte gUnknown_83A6A00 + .4byte gUnknown_83A6A0C + .4byte gUnknown_83A6A18 + .4byte gUnknown_83A6A24 + .4byte gUnknown_83A700C + .4byte gUnknown_83A7018 + .4byte gUnknown_83A6C3C + .4byte gUnknown_83A6C48 + .4byte gUnknown_83A6C54 + .4byte gUnknown_83A6C60 + +gUnknown_83A6864:: @ 83A6864 + .4byte sub_8064638 + .4byte sub_8067934 + +gUnknown_83A686C:: @ 83A686C + .4byte sub_8064648 + .4byte sub_8067934 + +gUnknown_83A6874:: @ 83A6874 + .4byte sub_8064658 + .4byte sub_8067934 + +gUnknown_83A687C:: @ 83A687C + .4byte sub_8064668 + .4byte sub_8067934 gUnknown_83A6884:: @ 83A6884 - .incbin "baserom.gba", 0x3A6884, 0xD4 + .4byte get_go_image_anim_num + .4byte get_go_fast_image_anim_num + .4byte get_go_fast_image_anim_num + .4byte get_go_faster_image_anim_num + .4byte sub_8063470 + +gUnknown_83A6898:: @ 83A6898 + .4byte sub_8064968 + .4byte sub_8064988 + .4byte sub_8067934 + +gUnknown_83A68A4:: @ 83A68A4 + .4byte sub_80649A8 + .4byte sub_80649C8 + .4byte sub_8067934 + +gUnknown_83A68B0:: @ 83A68B0 + .4byte sub_80649E8 + .4byte sub_8064A08 + .4byte sub_8067934 + +gUnknown_83A68BC:: @ 83A68BC + .4byte sub_8064A28 + .4byte sub_8064A48 + .4byte sub_8067934 + +gUnknown_83A68C8:: @ 83A68C8 + .4byte sub_8064A68 + .4byte sub_8064A88 + .4byte sub_8067934 + +gUnknown_83A68D4:: @ 83A68D4 + .4byte sub_8064AA8 + .4byte sub_8064AC8 + .4byte sub_8067934 + +gUnknown_83A68E0:: @ 83A68E0 + .4byte sub_8064AE8 + .4byte sub_8064B08 + .4byte sub_8067934 + +gUnknown_83A68EC:: @ 83A68EC + .4byte sub_8064B28 + .4byte sub_8064B48 + .4byte sub_8067934 + +gUnknown_83A68F8:: @ 83A68F8 + .4byte sub_8064C3C + .4byte sub_8064C5C + .4byte sub_8067934 + +gUnknown_83A6904:: @ 83A6904 + .4byte sub_8064C7C + .4byte sub_8064C9C + .4byte sub_8067934 + +gUnknown_83A6910:: @ 83A6910 + .4byte sub_8064CBC + .4byte sub_8064CDC + .4byte sub_8067934 + +gUnknown_83A691C:: @ 83A691C + .4byte sub_8064CFC + .4byte sub_8064D1C + .4byte sub_8067934 + +gUnknown_83A6928:: @ 83A6928 + .4byte sub_8064D3C + .4byte sub_8064D5C + .4byte sub_8067934 + +gUnknown_83A6934:: @ 83A6934 + .4byte sub_8064D7C + .4byte sub_8064D9C + .4byte sub_8067934 + +gUnknown_83A6940:: @ 83A6940 + .4byte sub_8064DBC + .4byte sub_8064DDC + .4byte sub_8067934 + +gUnknown_83A694C:: @ 83A694C + .4byte sub_8064DFC + .4byte sub_8064E1C + .4byte sub_8067934 gUnknown_83A6958:: @ 83A6958 - .incbin "baserom.gba", 0x3A6958, 0x6 + .2byte 0x0000 + .2byte 0x0001 + .2byte 0x0001 gUnknown_83A695E:: @ 83A695E - .incbin "baserom.gba", 0x3A695E, 0x6C6 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0001 + +gUnknown_83A6964:: @ 83A6964 + .4byte sub_80650A8 + .4byte sub_80650D4 + .4byte sub_8067934 + +gUnknown_83A6970:: @ 83A6970 + .4byte sub_8065100 + .4byte sub_806512C + .4byte sub_8067934 + +gUnknown_83A697C:: @ 83A697C + .4byte sub_8065158 + .4byte sub_8065184 + .4byte sub_8067934 + +gUnknown_83A6988:: @ 83A6988 + .4byte sub_80651B0 + .4byte sub_80651DC + .4byte sub_8067934 + +gUnknown_83A6994:: @ 83A6994 + .4byte sub_806522C + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69A0:: @ 83A69A0 + .4byte sub_806524C + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69AC:: @ 83A69AC + .4byte sub_806526C + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69B8:: @ 83A69B8 + .4byte sub_806528C + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69C4:: @ 83A69C4 + .4byte sub_80652AC + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69D0:: @ 83A69D0 + .4byte sub_80652CC + .4byte sub_80652EC + .4byte sub_8067934 + +gUnknown_83A69DC:: @ 83A69DC + .4byte sub_806530C + .4byte sub_806532C + .4byte sub_8067934 + +gUnknown_83A69E8:: @ 83A69E8 + .4byte sub_806534C + .4byte sub_806536C + .4byte sub_8067934 + +gUnknown_83A69F4:: @ 83A69F4 + .4byte sub_806538C + .4byte sub_80653AC + .4byte sub_8067934 + +gUnknown_83A6A00:: @ 83A6A00 + .4byte sub_80653F8 + .4byte sub_8065438 + .4byte sub_8067930 + +gUnknown_83A6A0C:: @ 83A6A0C + .4byte sub_8065464 + .4byte sub_80654A4 + .4byte sub_8067930 + +gUnknown_83A6A18:: @ 83A6A18 + .4byte sub_80654D0 + .4byte sub_8065510 + .4byte sub_8067930 + +gUnknown_83A6A24:: @ 83A6A24 + .4byte sub_806553C + .4byte sub_806557C + .4byte sub_8067930 + +gUnknown_83A6A30:: @ 83A6A30 + .4byte sub_80655D4 + .4byte sub_8067930 + +gUnknown_83A6A38:: @ 83A6A38 + .4byte sub_8065610 + .4byte sub_8067930 + +gUnknown_83A6A40:: @ 83A6A40 + .4byte sub_806564C + .4byte sub_8067930 + +gUnknown_83A6A48:: @ 83A6A48 + .4byte sub_8065688 + .4byte sub_8067930 + +gUnknown_83A6A50:: @ 83A6A50 + .4byte sub_8065770 + .4byte sub_8065734 + .4byte sub_8067934 + +gUnknown_83A6A5C:: @ 83A6A5C + .4byte sub_80657A8 + .4byte sub_8065734 + .4byte sub_8067934 + +gUnknown_83A6A68:: @ 83A6A68 + .4byte sub_80657E0 + .4byte sub_8065734 + .4byte sub_8067934 + +gUnknown_83A6A74:: @ 83A6A74 + .4byte sub_8065818 + .4byte sub_8065734 + .4byte sub_8067934 + +gUnknown_83A6A80:: @ 83A6A80 + .4byte sub_8065850 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6A8C:: @ 83A6A8C + .4byte sub_8065888 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6A98:: @ 83A6A98 + .4byte sub_80658C0 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AA4:: @ 83A6AA4 + .4byte sub_80658F8 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AB0:: @ 83A6AB0 + .4byte sub_8065930 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6ABC:: @ 83A6ABC + .4byte sub_8065968 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AC8:: @ 83A6AC8 + .4byte sub_80659A0 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AD4:: @ 83A6AD4 + .4byte sub_80659D8 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AE0:: @ 83A6AE0 + .4byte sub_8065A10 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AEC:: @ 83A6AEC + .4byte sub_8065A48 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AF8:: @ 83A6AF8 + .4byte sub_8065A80 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6B04:: @ 83A6B04 + .4byte sub_8065AB8 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6B10:: @ 83A6B10 + .4byte sub_8065AF0 + .4byte sub_8065B10 + .4byte sub_8067934 + +gUnknown_83A6B1C:: @ 83A6B1C + .4byte sub_8065B30 + .4byte sub_8065B50 + .4byte sub_8067934 + +gUnknown_83A6B28:: @ 83A6B28 + .4byte sub_8065B70 + .4byte sub_8065B90 + .4byte sub_8067934 + +gUnknown_83A6B34:: @ 83A6B34 + .4byte sub_8065BB0 + .4byte sub_8065BD0 + .4byte sub_8067934 + +gUnknown_83A6B40:: @ 83A6B40 + .4byte sub_8065BF0 + .4byte sub_8065C10 + .4byte sub_8067934 + +gUnknown_83A6B4C:: @ 83A6B4C + .4byte sub_8065C30 + .4byte sub_8065C50 + .4byte sub_8067934 + +gUnknown_83A6B58:: @ 83A6B58 + .4byte sub_8065C70 + .4byte sub_8065C90 + .4byte sub_8067934 + +gUnknown_83A6B64:: @ 83A6B64 + .4byte sub_8065CB0 + .4byte sub_8065CD0 + .4byte sub_8067934 + +gUnknown_83A6B70:: @ 83A6B70 + .4byte sub_8065CF0 + .4byte sub_8065D10 + .4byte sub_8067934 + +gUnknown_83A6B7C:: @ 83A6B7C + .4byte sub_8065D30 + .4byte sub_8065D50 + .4byte sub_8067934 + +gUnknown_83A6B88:: @ 83A6B88 + .4byte sub_8065D70 + .4byte sub_8065D90 + .4byte sub_8067934 + +gUnknown_83A6B94:: @ 83A6B94 + .4byte sub_8065DB0 + .4byte sub_8065DD0 + .4byte sub_8067934 + +gUnknown_83A6BA0:: @ 83A6BA0 + .4byte do_run_south_anim + .4byte sub_8065E10 + .4byte sub_8067934 + +gUnknown_83A6BAC:: @ 83A6BAC + .4byte do_run_north_anim + .4byte sub_8065E50 + .4byte sub_8067934 + +gUnknown_83A6BB8:: @ 83A6BB8 + .4byte do_run_west_anim + .4byte sub_8065E90 + .4byte sub_8067934 + +gUnknown_83A6BC4:: @ 83A6BC4 + .4byte do_run_east_anim + .4byte sub_8065ED0 + .4byte sub_8067934 + +gUnknown_83A6BD0:: @ 83A6BD0 + .4byte sub_8065FC4 + .4byte sub_8065FE4 + .4byte sub_8067934 + +gUnknown_83A6BDC:: @ 83A6BDC + .4byte sub_8066004 + .4byte sub_8066024 + .4byte sub_8067934 + +gUnknown_83A6BE8:: @ 83A6BE8 + .4byte sub_8066044 + .4byte sub_8066064 + .4byte sub_8067934 + +gUnknown_83A6BF4:: @ 83A6BF4 + .4byte sub_8066084 + .4byte sub_80660A4 + .4byte sub_8067934 + +gUnknown_83A6C00:: @ 83A6C00 + .4byte sub_80660F0 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6C0C:: @ 83A6C0C + .4byte sub_806615C + .4byte sub_806617C + .4byte sub_8067934 + +gUnknown_83A6C18:: @ 83A6C18 + .4byte sub_80661A4 + .4byte sub_80661C4 + .4byte sub_8067934 + +gUnknown_83A6C24:: @ 83A6C24 + .4byte sub_80661EC + .4byte sub_806620C + .4byte sub_8067934 + +gUnknown_83A6C30:: @ 83A6C30 + .4byte sub_8066234 + .4byte sub_8066254 + .4byte sub_8067934 + +gUnknown_83A6C3C:: @ 83A6C3C + .4byte sub_806627C + .4byte sub_806629C + .4byte sub_8067934 + +gUnknown_83A6C48:: @ 83A6C48 + .4byte sub_80662BC + .4byte sub_80662DC + .4byte sub_8067934 + +gUnknown_83A6C54:: @ 83A6C54 + .4byte sub_80662FC + .4byte sub_806631C + .4byte sub_8067934 + +gUnknown_83A6C60:: @ 83A6C60 + .4byte sub_806633C + .4byte sub_806635C + .4byte sub_8067934 + +gUnknown_83A6C6C:: @ 83A6C6C + .4byte sub_806637C + .4byte sub_8067934 + +gUnknown_83A6C74:: @ 83A6C74 + .4byte sub_80663D8 + .4byte sub_8067934 + +gUnknown_83A6C7C:: @ 83A6C7C + .4byte sub_806643C + .4byte sub_8067934 + +gUnknown_83A6C84:: @ 83A6C84 + .4byte sub_806644C + .4byte sub_8067934 + +gUnknown_83A6C8C:: @ 83A6C8C + .4byte sub_806645C + .4byte sub_8066488 + .4byte sub_8067934 + +gUnknown_83A6C98:: @ 83A6C98 + .4byte sub_80664B4 + .4byte sub_80664E0 + .4byte sub_8067934 + +gUnknown_83A6CA4:: @ 83A6CA4 + .4byte sub_806650C + .4byte sub_8066538 + .4byte sub_8067934 + +gUnknown_83A6CB0:: @ 83A6CB0 + .4byte sub_8066564 + .4byte sub_8066590 + .4byte sub_8067934 + +gUnknown_83A6CBC:: @ 83A6CBC + .4byte sub_80665BC + .4byte sub_80665E8 + .4byte sub_8067934 + +gUnknown_83A6CC8:: @ 83A6CC8 + .4byte sub_8066614 + .4byte sub_8066640 + .4byte sub_8067934 + +gUnknown_83A6CD4:: @ 83A6CD4 + .4byte sub_806666C + .4byte sub_8066698 + .4byte sub_8067934 + +gUnknown_83A6CE0:: @ 83A6CE0 + .4byte sub_80666C4 + .4byte sub_80666F0 + .4byte sub_8067934 + +gUnknown_83A6CEC:: @ 83A6CEC + .4byte sub_806671C + .4byte sub_8066748 + .4byte sub_8067934 + +gUnknown_83A6CF8:: @ 83A6CF8 + .4byte sub_8066774 + .4byte sub_80667A0 + .4byte sub_8067934 + +gUnknown_83A6D04:: @ 83A6D04 + .4byte sub_80667CC + .4byte sub_80667F8 + .4byte sub_8067934 + +gUnknown_83A6D10:: @ 83A6D10 + .4byte sub_8066824 + .4byte sub_8066850 + .4byte sub_8067934 + +gUnknown_83A6D1C:: @ 83A6D1C + .4byte sub_806687C + .4byte sub_8067934 + +gUnknown_83A6D24:: @ 83A6D24 + .4byte sub_8066894 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6D30:: @ 83A6D30 + .4byte sub_80668A4 + .4byte sub_8067930 + +gUnknown_83A6D38:: @ 83A6D38 + .4byte sub_80668B4 + .4byte sub_8067930 + +gUnknown_83A6D40:: @ 83A6D40 + .4byte sub_80668C4 + .4byte sub_8067930 + +gUnknown_83A6D48:: @ 83A6D48 + .4byte sub_80668D4 + .4byte sub_8067930 + +gUnknown_83A6D50:: @ 83A6D50 + .4byte sub_8066900 + .4byte sub_8067930 + +gUnknown_83A6D58:: @ 83A6D58 + .4byte sub_8066910 + .4byte sub_8067930 + +gUnknown_83A6D60:: @ 83A6D60 + .4byte do_exclamation_mark_bubble_1 + .4byte sub_8067930 + +gUnknown_83A6D68:: @ 83A6D68 + .4byte do_exclamation_mark_bubble_2 + .4byte sub_8067930 + +gUnknown_83A6D70:: @ 83A6D70 + .4byte do_heart_bubble + .4byte sub_8067930 + +gUnknown_83A6D78:: @ 83A6D78 + .4byte sub_806698C + .4byte sub_8067930 + +gUnknown_83A6D80:: @ 83A6D80 + .4byte sub_80669B0 + .4byte sub_8067930 + +gUnknown_83A6D88:: @ 83A6D88 + .4byte sub_80669D4 + .4byte sub_8066A18 + .4byte sub_8067930 + +gUnknown_83A6D94:: @ 83A6D94 + .4byte sub_8066A38 + .4byte sub_8066A54 + .4byte sub_8066A78 + .4byte sub_8067930 + +gUnknown_83A6DA4:: @ 83A6DA4 + .4byte sub_8066AB4 + .4byte sub_8066AD0 + .4byte sub_8066AF4 + .4byte sub_8067930 + +gUnknown_83A6DB4:: @ 83A6DB4 + .4byte sub_8066B30 + .4byte sub_8067930 + +gUnknown_83A6DBC:: @ 83A6DBC + .4byte sub_8066B40 + .4byte sub_8067930 + +gUnknown_83A6DC4:: @ 83A6DC4 + .4byte sub_8066B50 + .4byte sub_8067930 + +gUnknown_83A6DCC:: @ 83A6DCC + .4byte sub_8066B80 + .4byte sub_8067930 + +gUnknown_83A6DD4:: @ 83A6DD4 + .4byte sub_8066BB0 + .4byte sub_8066BE4 + .4byte sub_8067934 + +gUnknown_83A6DE0:: @ 83A6DE0 + .4byte sub_8066C10 + .4byte sub_8066C44 + .4byte sub_8067934 + +gUnknown_83A6DEC:: @ 83A6DEC + .4byte sub_8066CB0 + .4byte sub_8067934 + +gUnknown_83A6DF4:: @ 83A6DF4 + .4byte sub_8066CC0 + .4byte sub_8067934 + +gUnknown_83A6DFC:: @ 83A6DFC + .4byte sub_8066CD0 + .4byte sub_8067934 + +gUnknown_83A6E04:: @ 83A6E04 + .4byte sub_8066CE0 + .4byte sub_8067934 + +gUnknown_83A6E0C:: @ 83A6E0C + .4byte sub_8066CF0 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E18:: @ 83A6E18 + .4byte sub_8066D14 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E24:: @ 83A6E24 + .4byte sub_8066D38 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E30:: @ 83A6E30 + .4byte sub_8066D5C + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E3C:: @ 83A6E3C + .4byte sub_8066D80 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E48:: @ 83A6E48 + .4byte sub_8066DA4 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E54:: @ 83A6E54 + .4byte sub_8066DC8 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E60:: @ 83A6E60 + .4byte sub_8066DEC + .4byte sub_8066108 + .4byte sub_8067934 + .4byte sub_8066E10 + .4byte sub_8066108 + .4byte sub_8067934 + .4byte sub_8066E34 + .4byte sub_8066108 + .4byte sub_8067934 + .4byte sub_8066E58 + .4byte sub_8066108 + .4byte sub_8067934 + .4byte sub_8066E7C + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E9C:: @ 83A6E9C + .4byte sub_8066EE4 + .4byte sub_8066F10 + .4byte sub_8067934 + +gUnknown_83A6EA8:: @ 83A6EA8 + .4byte sub_8066F3C + .4byte sub_8066F68 + .4byte sub_8067934 + +gUnknown_83A6EB4:: @ 83A6EB4 + .4byte sub_8066F94 + .4byte sub_8066FC0 + .4byte sub_8067934 + +gUnknown_83A6EC0:: @ 83A6EC0 + .4byte sub_8066FEC + .4byte sub_8067018 + .4byte sub_8067934 + +gUnknown_83A6ECC:: @ 83A6ECC + .4byte sub_8067044 + .4byte sub_8067070 + .4byte sub_8067934 + +gUnknown_83A6ED8:: @ 83A6ED8 + .4byte sub_806709C + .4byte sub_80670C8 + .4byte sub_8067934 + +gUnknown_83A6EE4:: @ 83A6EE4 + .4byte sub_80670F4 + .4byte sub_8067120 + .4byte sub_8067934 + +gUnknown_83A6EF0:: @ 83A6EF0 + .4byte sub_806714C + .4byte sub_8067178 + .4byte sub_8067934 + +gUnknown_83A6EFC:: @ 83A6EFC + .4byte sub_80671A4 + .4byte sub_80671D0 + .4byte sub_8067934 + +gUnknown_83A6F08:: @ 83A6F08 + .4byte sub_80671FC + .4byte sub_8067228 + .4byte sub_8067934 + +gUnknown_83A6F14:: @ 83A6F14 + .4byte sub_8067254 + .4byte sub_8067280 + .4byte sub_8067934 + +gUnknown_83A6F20:: @ 83A6F20 + .4byte sub_80672AC + .4byte sub_80672D8 + .4byte sub_8067934 + +gUnknown_83A6F2C:: @ 83A6F2C + .4byte sub_8067304 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6F38:: @ 83A6F38 + .4byte sub_806733C + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6F44:: @ 83A6F44 + .4byte sub_8067374 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6F50:: @ 83A6F50 + .4byte sub_80673AC + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6F5C:: @ 83A6F5C + .4byte sub_806741C + .4byte sub_806743C + .4byte sub_8067934 + +gUnknown_83A6F68:: @ 83A6F68 + .4byte sub_806745C + .4byte sub_806747C + .4byte sub_8067934 + +gUnknown_83A6F74:: @ 83A6F74 + .4byte sub_806749C + .4byte sub_80674BC + .4byte sub_8067934 + +gUnknown_83A6F80:: @ 83A6F80 + .4byte sub_80674DC + .4byte sub_80674FC + .4byte sub_8067934 + +gUnknown_83A6F8C:: @ 83A6F8C + .4byte sub_806754C + .4byte sub_806756C + .4byte sub_8067934 + +gUnknown_83A6F98:: @ 83A6F98 + .4byte sub_806758C + .4byte sub_80675AC + .4byte sub_8067934 + +gUnknown_83A6FA4:: @ 83A6FA4 + .4byte sub_80675CC + .4byte sub_80675EC + .4byte sub_8067934 + +gUnknown_83A6FB0:: @ 83A6FB0 + .4byte sub_806760C + .4byte sub_806762C + .4byte sub_8067934 + +gUnknown_83A6FBC:: @ 83A6FBC + .4byte sub_8067684 + .4byte sub_80676A4 + .4byte sub_8067934 + +gUnknown_83A6FC8:: @ 83A6FC8 + .4byte sub_80676C4 + .4byte sub_80676E4 + .4byte sub_8067934 + +gUnknown_83A6FD4:: @ 83A6FD4 + .4byte sub_8067704 + .4byte sub_8067724 + .4byte sub_8067934 + +gUnknown_83A6FE0:: @ 83A6FE0 + .4byte sub_8067744 + .4byte sub_8067764 + .4byte sub_8067934 + +gUnknown_83A6FEC:: @ 83A6FEC + .4byte sub_8067784 + .4byte sub_80677C0 + +gUnknown_83A6FF4:: @ 83A6FF4 + .4byte sub_8067784 + .4byte sub_80677CC + +gUnknown_83A6FFC:: @ 83A6FFC + .4byte sub_8067784 + .4byte sub_80678C0 + +gUnknown_83A7004:: @ 83A7004 + .4byte sub_80678F0 + .4byte sub_8067924 + +gUnknown_83A700C:: @ 83A700C + .4byte sub_8067944 + .4byte sub_8067954 + .4byte sub_80679A8 + +gUnknown_83A7018:: @ 83A7018 + .4byte sub_8067978 + .4byte sub_806798C + .4byte sub_80679A8 diff --git a/data/event_scripts.s b/data/event_scripts.s index c07f400a1..c2daa0031 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -12,7 +12,7 @@ #include "constants/spawn_points.h" #include "constants/field_effects.h" #include "constants/trainers.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" #include "constants/fame_checker.h" #include "constants/seagallop.h" #include "constants/game_stat.h" diff --git a/data/map_events.s b/data/map_events.s index a36cd149f..99b85e154 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -10,7 +10,7 @@ #include "constants/vars.h" #include "constants/weather.h" @#include "constants/trainer_hill.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "constants/item_data_constants.inc" diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 8e78364f6..563f45333 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_METEORITE", + "graphics_id": "OBJECT_EVENT_GFX_METEORITE", "x": 15, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 15, "y": 3, "elevation": 3, diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 0c20c59b8..0d7c001ee 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,7 +10,7 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213 BirthIsland_Exterior_MapScript1_165217:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 setvar VAR_DEOXYS_INTERACTION_NUM, 0 checkflag FLAG_FOUGHT_DEOXYS diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index eed07d984..f8c4be078 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 0f323d993..d60b4da02 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 48, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 38, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLIWRATH", + "graphics_id": "OBJECT_EVENT_GFX_POLIWRATH", "x": 36, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 11, "y": 18, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 18, "y": 22, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 30, "y": 24, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 26, "y": 19, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 38, "y": 31, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 30, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 52, "y": 22, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 40, "y": 35, "elevation": 0, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 25, "y": 10, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index eed6a38a6..b9d14c154 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MEOWTH", + "graphics_id": "OBJECT_EVENT_GFX_MEOWTH", "x": 1, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", + "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY", "x": 5, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", "x": 5, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 9, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 41561f349..b468bf984 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 0, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 3, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 4, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 0, "y": 13, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index b66f7bc8a..3b94da798 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index f40f5c2fe..3db8fd602 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 6, "y": 10, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index f5333e88a..566deb0a9 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 5, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 1, "y": 8, "elevation": 0, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 11, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 3ac411820..c1cc95ac4 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 10, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 11, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 4, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 1, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 14, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index e68119e01..8f13009f7 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 6, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 10, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 3, "y": 13, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 2c30cb8b5..4686cea40 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 6, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 1, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 1d499c195..bde4fd50b 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 9, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 31a03a047..3056f37d1 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 4, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 1, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 1, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 4, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 7, "y": 10, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 7, "y": 8, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 13, "y": 7, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 16, "y": 10, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 658ec5bd4..15a8770af 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 6, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 539f0cb0d..81b0a0954 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 9, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 10, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 2, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 5, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 7, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ERIKA", + "graphics_id": "OBJECT_EVENT_GFX_ERIKA", "x": 6, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 8, "y": 7, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 6, "y": 8, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 3, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 4d1d99203..04c2602a4 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 3, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index ea37835d1..36ea4b0df 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index c29be0604..84b6c620c 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index e5bc26a2a..c0cac69eb 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 1e96149ad..e64cc7298 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 12, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 11, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 9, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index a2373d45c..8914af7e7 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 25, "y": 5, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 20, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 14, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 18, "elevation": 3, diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index d52fa3da5..89438c4fb 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 18, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 29, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 33, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 28, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 20, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 6, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 20, "elevation": 3, diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 9f93a9557..87b278438 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 31, "y": 9, "elevation": 4, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 32, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_MEWTWO", + "graphics_id": "OBJECT_EVENT_GFX_MEWTWO", "x": 7, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_MEWTWO" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 1, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 38, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 1, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 2, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 1, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 1, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index f3fcae4ab..87d7dd8bf 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -35,7 +35,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 31, "y": 12, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 33, "y": 6, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "FLAG_HIDE_CERULEAN_ROCKET" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 16, "y": 21, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 9, "y": 23, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SLOWBRO", + "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO", "x": 32, "y": 29, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 33, "y": 29, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 34, "y": 22, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 22, "y": 0, "elevation": 3, @@ -139,7 +139,7 @@ "flag": "FLAG_HIDE_CERULEAN_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 26, "y": 32, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 12, "y": 30, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 1, "y": 13, "elevation": 3, diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 34b8b351a..0f3aec9c9 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 9, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 9, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index 6cf69cf3e..e707b7c3e 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 12, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 4, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MISTY", + "graphics_id": "OBJECT_EVENT_GFX_MISTY", "x": 8, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 7, "y": 16, "elevation": 3, diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 9326a9234..b2e5699ec 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 44fcd2b45..aee9d5bbe 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 1, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index c1ce74bf3..8ada074dd 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 13ef69f13..cfa2c4d36 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 9feb1ced4..b1b38b2ff 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index 182e8ccf6..fcf185a81 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 9, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 85e02720a..976935818 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 5, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 3, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index a5f191ced..e15dbda8e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index f5ab2fb9f..ecc68bb6d 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 14, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 20, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_CINNABAR_BILL" }, { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 23, "y": 7, "elevation": 1, diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index f442fb26a..b67761ea8 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 25, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 25, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 17, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 16, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 16, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 4, "y": 19, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 4, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLAINE", + "graphics_id": "OBJECT_EVENT_GFX_BLAINE", "x": 5, "y": 4, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 24, "y": 20, "elevation": 3, diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 59430b7ed..0febfbc73 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index e45fcd735..7d2f4f416 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 527b4a67d..4bb297599 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 1e35330d9..8db54fd38 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index a942a9ca8..fcc7c282d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 11, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 12, "y": 3, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 6542e543c..1710cc88c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 5, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 4, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 0402b218a..093cf61c7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index ac1360466..347f76e17 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 9b1a1ce89..aef56bde7 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index ecb5fb9d9..fa6366c19 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 8, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 10, "elevation": 3, diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index d1220b637..fb35c7b47 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 00af7faf1..9de0bb25c 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index b7e3229c8..c316f2bc6 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 05d20f0d4..5f1389b26 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 5626f8a64..606513822 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_LOST_CAVE_SELPHY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 82463cc38..52b658dcb 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 6e3a0ffc7..09392a2ca 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index dc558c6b2..028c7cea6 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 046685c55..f25b7ee72 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 5a6782d59..24abad1d6 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 1ac91ff3c..66ac71058 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_F", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", "x": 18, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 17, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 11, "y": 27, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 8, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 19, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 22, "elevation": 3, diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 33ee6f13c..2054a0159 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 8, "y": 44, "elevation": 4, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 12, "y": 6, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 14, "y": 17, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 17, "y": 31, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 47, "elevation": 3, diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 053a14a62..82c5e2a44 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 8a64b44fa..dc97dcdc3 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index ba96caa5a..dba3d3d21 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 44, "y": 10, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 33, "y": 12, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 12, "y": 10, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 23, "y": 9, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 33, "y": 8, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 33, "y": 3, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 56, "y": 7, "elevation": 1, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 39, "y": 9, "elevation": 3, diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index cb950d16f..570c291b4 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 7ac00f1cc..a89fe7b45 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 15, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 17, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_F", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", "x": 27, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 25, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_F", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", "x": 6, "y": 6, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 27, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 8, "y": 25, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 3, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 16, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index e9f0eb16a..0dc66d822 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 14, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 54e4e9849..0e7b31ad7 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_DODUO", + "graphics_id": "OBJECT_EVENT_GFX_DODUO", "x": 12, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", "x": 13, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", "x": 14, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PSYDUCK", + "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", "x": 17, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 26, "y": 19, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 6, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 32, "y": 19, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 8, "y": 25, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 36, "y": 13, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 31, "y": 21, "elevation": 3, diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index 5b550da70..0b3ede231 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index c47859aff..0fd639d54 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 8, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index a11437ab1..f9ef214bb 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 995ac7728..575294c84 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 16, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 0fbf41a57..c6b9e866e 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 10, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 21, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 12e4daece..ade705c51 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 11, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 13, "y": 14, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_LORELEI", + "graphics_id": "OBJECT_EVENT_GFX_LORELEI", "x": 12, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index b40738201..553467495 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LORELEI", + "graphics_id": "OBJECT_EVENT_GFX_LORELEI", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { - "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", + "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF", "x": 0, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SEEL", + "graphics_id": "OBJECT_EVENT_GFX_SEEL", "x": 10, "y": 3, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PIKACHU", + "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", "x": 9, "y": 3, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SLOWPOKE", + "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE", "x": 7, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SLOWBRO", + "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO", "x": 6, "y": 2, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PSYDUCK", + "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", "x": 6, "y": 4, "elevation": 0, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MEOWTH", + "graphics_id": "OBJECT_EVENT_GFX_MEOWTH", "x": 9, "y": 4, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_CHANSEY", + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", "x": 10, "y": 4, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", + "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", "x": 0, "y": 3, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", "x": 0, "y": 5, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", "x": 1, "y": 5, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_PIDGEOT", + "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT", "x": 9, "y": 0, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_FEAROW", + "graphics_id": "OBJECT_EVENT_GFX_FEAROW", "x": 10, "y": 0, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL", + "graphics_id": "OBJECT_EVENT_GFX_LAPRAS_DOLL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 5b9164382..11985d6a9 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 6, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 8, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index f6db941e8..c41dd4742 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 10, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index dbb6bb145..332a0efa7 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index be2f8dc9d..27f280e43 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 9b484daec..6c4b76320 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 37, "y": 17, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SLOWPOKE", + "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE", "x": 36, "y": 15, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_VOLTORB", + "graphics_id": "OBJECT_EVENT_GFX_VOLTORB", "x": 33, "y": 8, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 33, "y": 11, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANSEY", + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", "x": 39, "y": 8, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 15, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LAPRAS", + "graphics_id": "OBJECT_EVENT_GFX_LAPRAS", "x": 12, "y": 20, "elevation": 1, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 36, "y": 20, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 8, "y": 8, "elevation": 1, @@ -147,7 +147,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_KANGASKHAN", + "graphics_id": "OBJECT_EVENT_GFX_KANGASKHAN", "x": 16, "y": 9, "elevation": 3, @@ -160,7 +160,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 30, "y": 10, "elevation": 3, @@ -173,7 +173,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 21, "y": 13, "elevation": 3, @@ -186,7 +186,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 32, "y": 16, "elevation": 3, @@ -199,7 +199,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 24, "y": 22, "elevation": 3, @@ -212,7 +212,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 11, "elevation": 3, @@ -225,7 +225,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 40, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index ea921b4d1..f66cf33e6 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -11,11 +11,11 @@ FuchsiaCity_MapScript1_166D7B:: @ 8166D7B end EventScript_166D91:: @ 8166D91 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OMANYTE + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OMANYTE return EventScript_166D97:: @ 8166D97 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_KABUTO + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_KABUTO return FuchsiaCity_EventScript_166D9D:: @ 8166D9D diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 7fbd2870c..8b91a19fa 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 4ee96a265..cacf8a3ab 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 12, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 2, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 11, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 13, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 6, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 2, "y": 16, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_KOGA", + "graphics_id": "OBJECT_EVENT_GFX_KOGA", "x": 7, "y": 13, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 11, "y": 19, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index a0b11d62e..d9cb2b507 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 1, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 2f57e17fb..a3619a5ef 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 4e47edc91..2c5f0837a 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index d8da727b1..357b824d5 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 6, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 6246ddfb2..8684bc17e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 13, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index c54ed2085..6e82de7a9 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index d0451f0aa..13f4ee261 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json index 42e36142c..499deb4c9 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/map.json +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 12, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 6, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 9a4761ba7..314a75275 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 11, "y": 6, "elevation": 0, @@ -33,7 +33,7 @@ "flag": "FLAG_HIDE_CREDITS_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 11, "y": 6, "elevation": 0, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index f86588559..4bc3abec2 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 0, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 13, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 7, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 5, "y": 3, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 23, "y": 13, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 16, "y": 15, "elevation": 3, diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 7da5e0706..81a413874 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index ff8bd94a4..cac78d8e1 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 19, "y": 10, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 12, "y": 12, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 10, "y": 7, "elevation": 3, diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 8cd810223..e026daa1a 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUBONE", + "graphics_id": "OBJECT_EVENT_GFX_CUBONE", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 5d754bc7c..109ea9cde 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index fab6c58ac..cccd65956 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 9, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 3c3062b4b..c8aef2900 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 5, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 2, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index c99020e41..1880c2425 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 617fae94b..95890a431 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MR_FUJI", + "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_POKEHOUSE_FUJI" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORINO", + "graphics_id": "OBJECT_EVENT_GFX_NIDORINO", "x": 1, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PSYDUCK", + "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", "x": 9, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 9, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 3, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 1b6927eb8..45fcd4703 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 29, "y": 45, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 41, "y": 40, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 42, "y": 40, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 22, "y": 35, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 15, "y": 28, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 14, "y": 42, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 29, "y": 41, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 42, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 45, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 46, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 36, "y": 14, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 34, "y": 14, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 36, "y": 15, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 14, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 17, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 39, "elevation": 3, @@ -222,7 +222,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 40, "elevation": 3, @@ -235,7 +235,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 13, "y": 6, "elevation": 3, @@ -248,7 +248,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 38, "y": 10, "elevation": 3, @@ -261,7 +261,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 48, "y": 20, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index b0d678752..c8e3cf79e 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 20, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 21, "y": 15, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index b56e52770..965fdaa58 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 14, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 76a7c17e2..645a76950 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 5fd04b480..a1d6f74d4 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 5b72aa5c3..85f9e084e 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index ac41ffbcb..78e5824b8 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index ce5dbc269..dc8ab175e 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_RUBY", + "graphics_id": "OBJECT_EVENT_GFX_RUBY", "x": 7, "y": 7, "elevation": 0, diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 1715ccf58..e37d10962 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MOLTRES", + "graphics_id": "OBJECT_EVENT_GFX_MOLTRES", "x": 9, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_MOLTRES" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 5712426b2..cd8f39c65 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 40, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 19, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 23, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 38, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 35, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 34, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 26, "elevation": 3, diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 2701adad6..432699237 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 20, "y": 26, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 36, "y": 30, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 30, "y": 35, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 33, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 26, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 13, "y": 17, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 7, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 22, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 35, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 42, "y": 35, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 44, "y": 21, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 42, "y": 7, "elevation": 3, diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 652a883b3..478a00f7d 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FOSSIL", + "graphics_id": "OBJECT_EVENT_GFX_FOSSIL", "x": 13, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_DOME_FOSSIL" }, { - "graphics_id": "MAP_OBJ_GFX_FOSSIL", + "graphics_id": "OBJECT_EVENT_GFX_FOSSIL", "x": 14, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 13, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 37, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 12, "y": 20, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 35, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 18, "y": 27, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 30, "y": 26, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 35, "y": 5, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 24, "y": 6, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 0441624ed..f483a5f85 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LUGIA", + "graphics_id": "OBJECT_EVENT_GFX_LUGIA", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index cdbf54da8..334886745 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index fe7c5dd8b..6baaa256f 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HO_OH", + "graphics_id": "OBJECT_EVENT_GFX_HO_OH", "x": 9, "y": 6, "elevation": 0, diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index fb1e43775..e79709023 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 12, "y": 16, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_BILL" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 13, "y": 9, "elevation": 3, diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 861731295..66fda50c4 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 216436861..b481baf9b 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 06f7031e1..48ad4a077 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index b618253aa..3520eaac0 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 11, "y": 32, "elevation": 1, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_LAND", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_LAND", "x": 17, "y": 132, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 7, "y": 39, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", "x": 19, "y": 79, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 15, "y": 25, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 53, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 18, "y": 105, "elevation": 4, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 16, "y": 64, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 11, "y": 64, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 11, "y": 89, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 9, "y": 108, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 8, "y": 68, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 68, "elevation": 3, @@ -189,7 +189,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 8, "y": 104, "elevation": 3, @@ -202,7 +202,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 95, "elevation": 3, @@ -215,7 +215,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 96, "elevation": 3, @@ -228,7 +228,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 95, "elevation": 3, @@ -241,7 +241,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 105, "elevation": 3, @@ -254,7 +254,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 75, "elevation": 3, @@ -267,7 +267,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 84, "elevation": 3, @@ -280,7 +280,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 74, "elevation": 3, @@ -293,7 +293,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 73, "elevation": 3, @@ -306,7 +306,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 111, "elevation": 4, @@ -319,7 +319,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 86, "elevation": 3, @@ -332,7 +332,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 110, "elevation": 3, @@ -345,7 +345,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 112, "elevation": 4, @@ -358,7 +358,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 15, "y": 70, "elevation": 3, @@ -371,7 +371,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 103, "elevation": 3, @@ -384,7 +384,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 114, "elevation": 4, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index cefa0b75b..a04cfa085 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 15, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 6, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 20, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 11, "y": 20, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index b5575d3fd..85352beb1 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { - "graphics_id": "MAP_OBJ_GFX_CELIO", + "graphics_id": "OBJECT_EVENT_GFX_CELIO", "x": 15, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 3, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index aacfae373..96d913b13 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 2d351ae47..2d5c09ac0 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 13, "y": 20, "elevation": 3, diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 344d30be7..2b2c4330a 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 3, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 13, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index c2c15b1b8..d53da31c1 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_DAISY", + "graphics_id": "OBJECT_EVENT_GFX_DAISY", "x": 10, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TOWN_MAP", + "graphics_id": "OBJECT_EVENT_GFX_TOWN_MAP", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 4e281c43a..54b41dbf8 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MOM", + "graphics_id": "OBJECT_EVENT_GFX_MOM", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 9ff650466..3aefa7fa2 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 2, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 11, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 6, "y": 3, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 8, "y": 4, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 4, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 10, "y": 4, "elevation": 0, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 5, "y": 4, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { - "graphics_id": "MAP_OBJ_GFX_POKEDEX", + "graphics_id": "OBJECT_EVENT_GFX_POKEDEX", "x": 4, "y": 1, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_POKEDEX" }, { - "graphics_id": "MAP_OBJ_GFX_POKEDEX", + "graphics_id": "OBJECT_EVENT_GFX_POKEDEX", "x": 5, "y": 1, "elevation": 0, diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 2f51e7462..dbf624f2a 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 6, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 33, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 21, "y": 28, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 33, "y": 27, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 42, "y": 20, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 30, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 46, "y": 20, "elevation": 3, diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 16d0992be..adc0b397b 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BROCK", + "graphics_id": "OBJECT_EVENT_GFX_BROCK", "x": 6, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 3, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 7, "y": 12, "elevation": 3, diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 5f177362a..4478ca348 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 83699d95f..677ae5cc0 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 08555943c..275478428 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 8, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 6, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 7dcbbe776..76945d8ca 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 16, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 21, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_AMBER", + "graphics_id": "OBJECT_EVENT_GFX_OLD_AMBER", "x": 22, "y": 3, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_OLD_AMBER" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 26, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 26, "y": 7, "elevation": 3, diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 069f33249..12d797fe6 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 10, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 0, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 15, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 16, "y": 8, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index a4a4bee9f..1a54e269b 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", + "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 1, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 13, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 10, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 32a9afe45..f223ec1fc 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 30d6cc36c..357aef9a4 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_AGATHA", + "graphics_id": "OBJECT_EVENT_GFX_AGATHA", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index b3ff9a6e6..699130e5f 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BRUNO", + "graphics_id": "OBJECT_EVENT_GFX_BRUNO", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 2154adc3a..ec8d5db18 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 6, "y": 15, "elevation": 0, diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index cacd686ab..03029ea74 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 0a995986e..fe17526ee 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LANCE", + "graphics_id": "OBJECT_EVENT_GFX_LANCE", "x": 6, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 1a8512901..b5dd7cf45 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LORELEI", + "graphics_id": "OBJECT_EVENT_GFX_LORELEI", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 3c015536e..8f26c3d11 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 22, "y": 24, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 29, "y": 32, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 22, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 8, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 4a618c86d..b5bf6d6d3 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 5, "y": 23, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 36, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 23, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 35, "y": 17, "elevation": 3, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index b76f6bb0b..47ef76894 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 22, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 19, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 32, "y": 6, "elevation": 3, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index cbbc3f9a2..5a6b105ab 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 6, "y": 21, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 20, "y": 25, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 34, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 23, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 29, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 5185ebec7..88446bcf4 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 18, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 18, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 15, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 7, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 8, "y": 12, "elevation": 3, diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index a155ee492..de6a03ac6 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 16, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_TOWER_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 49ca729a0..668f87e73 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 10, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 9, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 12, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 13, "y": 2, "elevation": 3, diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 94832e3da..e24927018 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 17, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 15, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 4, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 8, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 7f06f059d..bd64e246e 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 11, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 19, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 7, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 11, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 12, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 6, "y": 16, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 9, "elevation": 3, diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 4f1934e2c..6c9e9aefb 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 13, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 18, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 9, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 15, "y": 15, "elevation": 3, diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index bb49bbecd..3d8a1a5be 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MR_FUJI", + "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI", "x": 11, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_TOWER_FUJI" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 9, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 13, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 7a8d2c1f2..751b0448a 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 27, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 40, "y": 22, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 46, "y": 37, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 45, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 26, "y": 22, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ZAPDOS", + "graphics_id": "OBJECT_EVENT_GFX_ZAPDOS", "x": 5, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_ZAPDOS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 36, "y": 5, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 30, "y": 38, "elevation": 3, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index ab85b27d2..381dc663b 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 26, "y": 28, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 39, "y": 27, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 45, "y": 24, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 5, "y": 20, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 7, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 27, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 37, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 33, "y": 22, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 22, "y": 22, "elevation": 3, diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index c904e3b4b..1dd0f419e 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 5, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 11, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 36, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 41, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 23, "y": 23, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 15, "y": 33, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 29, "y": 35, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 2, "y": 29, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 37, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 2, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 22, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 23, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 23, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 39, "y": 26, "elevation": 3, @@ -222,7 +222,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 42, "y": 26, "elevation": 3, @@ -235,7 +235,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 43, "y": 28, "elevation": 3, @@ -248,7 +248,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 30, "elevation": 3, @@ -261,7 +261,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 33, "elevation": 3, @@ -274,7 +274,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 1, "elevation": 3, @@ -287,7 +287,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 4, "elevation": 3, @@ -300,7 +300,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 2, "elevation": 3, @@ -313,7 +313,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 26, "y": 2, "elevation": 3, @@ -326,7 +326,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 24, "y": 7, "elevation": 3, @@ -339,7 +339,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 6, "elevation": 3, diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 5e1e205d8..1ae6a2b49 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 4, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 24, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 6, "y": 32, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 10, "y": 22, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 21, "y": 27, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 16, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 22, "elevation": 3, diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index c306907fd..4bdde29e9 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 20, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 15, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 0, "y": 14, "elevation": 3, diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 84326943e..40f6c205f 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 19, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 2, "y": 20, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 19, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 14, "y": 24, "elevation": 3, diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 6a88db1a7..85113e7c6 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GIOVANNI", + "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", "x": 19, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 20, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_SCOPE" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_LIFT_KEY" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 19, "y": 14, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 16, "y": 14, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 14, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 6, "y": 23, "elevation": 0, diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 265822796..e133094f3 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 6, "y": 28, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 19, "y": 16, "elevation": 3, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 04ea2bf57..a0339bf58 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 7, "y": 60, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 4, "y": 62, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 15, "y": 70, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 4, "y": 68, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 13, "y": 44, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 9, "y": 27, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 10, "y": 20, "elevation": 0, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 10, "y": 22, "elevation": 0, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 10, "y": 24, "elevation": 0, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 10, "y": 26, "elevation": 0, diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index c6a6d57c6..ffa9b5483 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index ba0d61e30..e815a98be 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index a7cf69d51..854692035 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 19, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 31, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 28, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 38, "y": 15, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 50, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 42, "y": 8, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 50, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 57, "y": 16, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 32, "y": 18, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 42, "y": 12, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 63, "y": 13, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 2806f681c..672ff606f 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 4, "y": 10, "elevation": 0, diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index dfe0c5030..86a3a8650 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 9d660528e..cfc684de8 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 17, "y": 32, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 9, "y": 40, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 16, "y": 47, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 13, "y": 59, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SNORLAX", + "graphics_id": "OBJECT_EVENT_GFX_SNORLAX", "x": 14, "y": 70, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "FLAG_HIDE_ROUTE_12_SNORLAX" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 13, "y": 92, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 10, "y": 99, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 18, "y": 108, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 11, "y": 100, "elevation": 3, @@ -147,7 +147,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 36, "elevation": 3, @@ -160,7 +160,7 @@ "flag": "FLAG_HIDE_ROUTE12_TM48" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 101, "elevation": 3, @@ -173,7 +173,7 @@ "flag": "FLAG_HIDE_ROUTE12_IRON" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 19, "y": 64, "elevation": 3, @@ -186,7 +186,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 19, "y": 63, "elevation": 3, @@ -199,7 +199,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 12, "y": 111, "elevation": 3, diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 366c3e2c7..bcb35b07f 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index a133ae23f..1f5ecbe0d 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 687ac9bf6..57d619ddb 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 86a682dfb..8905899b1 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 62, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 63, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 54, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 42, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 43, "y": 7, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 35, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 29, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 9, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 16, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 14, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 44, "y": 5, "elevation": 3, diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 831e178d6..cb71cd411 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 7, "y": 37, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 18, "y": 35, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 10, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 16, "y": 16, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 7, "y": 31, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 7, "y": 34, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 8, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 7, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 10, "y": 37, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 18, "y": 47, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 7, "y": 26, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 12, "y": 35, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 1, "y": 47, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 13, "y": 51, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 12, "y": 51, "elevation": 3, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 6d33098a6..4c6fa5d47 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 22, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 31, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 37, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 44, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 50, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 59, "y": 12, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 63, "y": 13, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 52, "y": 8, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 54, "y": 12, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 28, "y": 6, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 20, "y": 6, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_ROUTE15_TM18" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 39, "y": 7, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 40, "y": 7, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 745e9e2c2..af929b0e1 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index fc6391217..43a338c6c 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index f6dc03f3e..fba9847f1 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 16, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 14, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 12, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 8, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 10, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 6, "y": 14, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 41, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 30, "y": 5, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 31, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SNORLAX", + "graphics_id": "OBJECT_EVENT_GFX_SNORLAX", "x": 31, "y": 13, "elevation": 3, diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index eb7e79232..248a93f35 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 4, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FEAROW", + "graphics_id": "OBJECT_EVENT_GFX_FEAROW", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 52272f873..6288d8418 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index adec1e6b3..3d1f285c6 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 10, "y": 6, "elevation": 0, diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 7158ae516..4ec96dc6c 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 4, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 11, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 15, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 18, "y": 41, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 7, "y": 38, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 2, "y": 61, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 21, "y": 61, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 18, "y": 94, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 16, "y": 134, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 4, "y": 116, "elevation": 3, diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 9ced2a41f..636acc2a7 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 46, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 41, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 39, "y": 12, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 803722807..6dfc516fd 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 5731ecd8c..37094e443 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 439c5f405..3280d8588 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", "x": 15, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", "x": 10, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 17, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 18, "y": 33, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 8, "y": 27, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 16, "y": 22, "elevation": 1, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 11, "y": 47, "elevation": 1, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 48, "elevation": 1, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 12, "y": 49, "elevation": 1, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 9, "y": 48, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 41, "elevation": 1, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", "x": 9, "y": 41, "elevation": 1, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index c211c5b72..aecf7a7de 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 16, "y": 62, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 15, "y": 69, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 11, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 18, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 54, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 64, "elevation": 3, diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 231efcf51..60b59fc66 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 16, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 34, "y": 7, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 43, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 23, "y": 10, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 73, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 111, "y": 9, "elevation": 1, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 106, "y": 11, "elevation": 1, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 93, "y": 10, "elevation": 1, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 54, "y": 11, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 69, "y": 3, "elevation": 3, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 8d504c75c..ceda4c2db 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 7, "y": 27, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 16, "y": 26, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 44, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 35, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", "x": 15, "y": 35, "elevation": 1, diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 0895e18f1..7a45953bf 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 14, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 24, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 38, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 29, "elevation": 1, diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 1b3e558b4..0772e9303 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 25, "y": 4, "elevation": 3, diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 1a034d844..ee3f73dcb 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index f9d0f142e..145e8cdd7 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 15, "y": 149, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 8, "y": 140, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 14, "y": 123, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 16, "y": 112, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 10, "y": 94, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 14, "y": 61, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 35, "elevation": 3, diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 9fe5db518..9cf6bf74d 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 12, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 12, "y": 19, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 10, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 12, "y": 25, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 10, "y": 28, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 31, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 5, "y": 21, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 4, "elevation": 3, diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index a17f32488..d369225d3 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 18, "y": 2, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 17, "y": 7, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 22, "y": 4, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 22, "y": 8, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 27, "y": 9, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 28, "y": 4, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 36, "y": 4, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 42, "y": 5, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 26, "y": 2, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "FLAG_HIDE_ROUTE25_TM43" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 30, "y": 3, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 49, "y": 10, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 49, "y": 11, "elevation": 3, diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index ac63be354..d08181f06 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 7, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { - "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", + "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY", "x": 10, "y": 6, "elevation": 3, diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index e895e6c89..708a8f5a8 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 4, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 9833021a2..a04e5c546 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 4, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 1ee618faa..37c58ebbd 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 808232f30..841360fe0 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 4, "y": 7, "elevation": 3, diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 837e483b8..0def5e68f 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 70, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 40, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 32, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 30, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 29, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 19, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 17, "y": 4, "elevation": 3, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index dc2f902d7..b628beefc 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 9, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 75, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 67, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_ROUTE4_TM05" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 15, "y": 14, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 47, "y": 3, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 50, "y": 3, "elevation": 3, diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 936900208..c9216ca84 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 1, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 5, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", + "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", "x": 12, "y": 6, "elevation": 0, diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index a4189df66..2501fc3f4 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index efa1789d8..99f47dba4 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 7cf88dbcb..f34ea88bf 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index b5f66bf88..c0e0968bb 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 3, "y": 16, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 12, "y": 21, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 13, "y": 21, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 20, "y": 25, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 13, "y": 32, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 13, "y": 33, "elevation": 3, diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index f354d825c..3ffcf414a 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index baf05fc78..e08a364f1 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 9a15eca59..b1ff3747a 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 62, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 55, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 51, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 29, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 29, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 29, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 29, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 21, "y": 3, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 9, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 33, "y": 15, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 47, "y": 12, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 40, "y": 3, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 41, "y": 3, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 14, "y": 16, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 24, "y": 17, "elevation": 3, diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 9a8bd58ba..02365a2b4 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index e6fff0498..b8e4aef83 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 14, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 61, "y": 16, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 26, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 26, "y": 1, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 49, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 53, "y": 2, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 60, "y": 9, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 36, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 2, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 17, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_ROUTE9_TM40" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 65, "y": 17, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index fff50854a..ba206ecd0 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 18, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 12, "y": 9, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 784405a63..18ef8fc04 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 1895ff07a..a9ec320be 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 5, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 0, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 2, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index da0466b37..e5c78e2b6 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", + "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 0, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 4f8d00d91..8011082b6 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index bd987f990..92f493357 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 8eca10460..0d7dbf323 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index b93710fe4..d5ca318a5 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 3, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index b45106629..32aa20766 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 30, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SS_ANNE_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 2, "y": 7, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index c590cad89..06830f6cc 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 124f37b4f..1aeabe4d5 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 5, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 3, "elevation": 0, diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index cec02b750..ee86853c8 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 966b86cf6..8cba587e6 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 0, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 3, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 3759a810b..0583bd2a1 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 4583c0fcb..b1a3c0f8f 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 1, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 654973f7d..8933f6f60 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 4a7460d85..a82071d9e 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index c69229610..173d2149e 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index d4f6b9c97..f1acb1d5a 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index 8fb8e9349..32f9351fb 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index bd70e785b..6313e108a 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MACHOKE", + "graphics_id": "OBJECT_EVENT_GFX_MACHOKE", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 2, "elevation": 0, diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 3c5b166f4..b8f968c32 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CAPTAIN", + "graphics_id": "OBJECT_EVENT_GFX_CAPTAIN", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index fcf2204fe..2ac95ca72 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 12, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 14, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 13, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 6, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 65461e33a..7be9b5fb5 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SS_ANNE", + "graphics_id": "OBJECT_EVENT_GFX_SS_ANNE", "x": 30, "y": 16, "elevation": 1, diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 45404e0cc..968d87938 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 1, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 6, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 10, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 8, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 14, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 14, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 14, "y": 9, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 10, "elevation": 3, diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json index 700aa87d1..3a1d5491f 100644 --- a/data/maps/SafariZone_Building1/map.json +++ b/data/maps/SafariZone_Building1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json index 17b2fb57a..856b8b647 100644 --- a/data/maps/SafariZone_Building2/map.json +++ b/data/maps/SafariZone_Building2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 6, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json index de59e1575..0dca9cb75 100644 --- a/data/maps/SafariZone_Building3/map.json +++ b/data/maps/SafariZone_Building3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 7, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 6, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json index 09b1e09a7..2ca3a9a4f 100644 --- a/data/maps/SafariZone_Building4/map.json +++ b/data/maps/SafariZone_Building4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 2, "y": 2, "elevation": 0, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 39b950060..e40c94cee 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 24, "y": 15, "elevation": 3, diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index dae5d93f8..17f951070 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 37, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 31, "y": 18, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 36, "y": 17, "elevation": 4, diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 5d15f61f9..0e47573f6 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 33, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 28, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 29, "y": 17, "elevation": 3, diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 88838d5ff..806455000 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index bad880c1b..cdccbbe45 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 28, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 16, "y": 27, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 27, "y": 24, "elevation": 3, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index b70aa83c1..cec8e2fca 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -36,7 +36,7 @@ "connections_no_include": true, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 22, "y": 15, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 26, "y": 16, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 46, "y": 13, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 27, "y": 22, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 25, "y": 33, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 34, "y": 31, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 30, "y": 39, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 48, "y": 24, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 37, "y": 32, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 21, "y": 23, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 39, "y": 16, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 44, "y": 22, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_PIDGEOT", + "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT", "x": 45, "y": 22, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 32, "y": 39, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 91bf8e662..a0137ad22 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 11, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 1, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 11, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 1, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 6, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 4f6f13afc..407084933 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 18, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 14, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 4, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 4, "y": 18, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SABRINA", + "graphics_id": "OBJECT_EVENT_GFX_SABRINA", "x": 14, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 10, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 15, "y": 20, "elevation": 3, diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index 6a233f785..a6e09da5c 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 8, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 3, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANSEY", + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json index 8598b129a..279ebff20 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_DODUO", + "graphics_id": "OBJECT_EVENT_GFX_DODUO", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PIKACHU", + "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", "x": 4, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", + "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index 4c6e64a1d..8f61b1054 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PIDGEY", + "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", "x": 0, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 4, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", + "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index 51f9c8294..858646db5 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index d4248d680..8e4b9ce60 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 9fbefc7f3..a10d91a62 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index dd7076a54..fd1021732 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index dbeccc674..9bb75dc81 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 3, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 3, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 9, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 7, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 9, "y": 12, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 5, "y": 11, "elevation": 3, diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 95261f368..ac46adf1f 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 32, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index ded9935d2..113bfe865 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 19, "y": 18, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 24, "y": 14, "elevation": 4, diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index cc9d54955..f1a234d05 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 15, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index a1068f489..6201fb5ea 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 23, "y": 8, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 24, "y": 8, "elevation": 1, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 13, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 16, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 8ef4ca3b2..edd644634 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 18, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 18, "elevation": 1, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_ARTICUNO", + "graphics_id": "OBJECT_EVENT_GFX_ARTICUNO", "x": 9, "y": 2, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ARTICUNO" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 22, "y": 19, "elevation": 4, diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index c9fe0c17b..d83f81ed4 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 9, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 15, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index cd88eae20..1e86aa88b 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 066f3d18d..822cc960a 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 2336916fa..219481590 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 0, diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 94f07f060..715183f88 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 9, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 702c10d3b..dc68e4013 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 14, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 9817d6ff1..bcd215d25 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index cf4f14540..350cb0060 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 13, "y": 43, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 13, "y": 36, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 3, "y": 35, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 3, "y": 36, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 56, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 63, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 14, "y": 13, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 41, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 13, "y": 47, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 44, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 47, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 46, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 16, "y": 47, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 47, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 31, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 45, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 38, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 23, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 8, "y": 26, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 90a26bff2..d0ad8bc08 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 12, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 3, "y": 34, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 34, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 11, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 10, "y": 26, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 11, "y": 17, "elevation": 5, diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 8fa5f28fb..09447abbf 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 2, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANSEY", + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 6, "y": 4, "elevation": 0, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 4f492d72d..c1b70fd2d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 812fa7fc3..619d30729 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 35, "y": 7, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 121, "y": 11, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 85, "y": 8, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 85, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 9d9244f89..9973bc923 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 56, "y": 26, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 56, "y": 29, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index 8340ada47..524654792 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 11, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 10, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index 3cab31165..dde2e99ac 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index 32b53f781..ddc7e3009 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index cfb7f97c7..010f213de 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index 7aae856d4..933e07d80 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 6c9ab9fa5..522d796dd 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index e3984966b..55ca3f1b7 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index c83e9128b..78e1fe89d 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index 0b3bc2fc5..e4bbd291f 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 4, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 12, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 2, "y": 12, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index 4fb265a15..cff922886 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 666d811f8..f3e5abafe 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 10, "y": 17, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 0, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 15, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 17, "elevation": 3, diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 10f0bc778..bd9d83597 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 9, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 11, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GIOVANNI", + "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", "x": 6, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 16, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 2, "y": 19, "elevation": 3, diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 1adffa9bf..06a5b7ac0 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 3, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 8abb2ed86..a2d405b3a 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 29, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 28, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 20, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 5, "y": 19, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 10, "y": 4, "elevation": 0, diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index ced5b0efa..5581d6926 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 25, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 31, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 4, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 37566a737..2bfb46286 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 33, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 10, "y": 19, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 14, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 5, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 13, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 30, "y": 18, "elevation": 0, diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 0391f0718..a59f7836b 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 35, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 23, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 16, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 11, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 9, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 18, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 22, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index bdb8020b4..82eda6e92 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 21, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 23, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 24, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 22, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 14, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 16, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 9, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 17, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 18, "y": 17, "elevation": 3, diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index fcaeaef00..ec2735f05 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 0, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 24, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 24, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 13, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 10, "y": 10, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 13, "y": 14, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 9, "y": 14, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 0, "y": 12, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 30, "y": 11, "elevation": 3, diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 05f29bbd3..7d1f410dc 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 28, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 10, "y": 17, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 9, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 2, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 24, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 29, "y": 9, "elevation": 3, diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 7d3227d08..b350f620c 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 26, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 15, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 2, "y": 16, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 072d78313..86eb5ca6d 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 10, "y": 15, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 9f1c986c9..6d0b3c957 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAPPHIRE", + "graphics_id": "OBJECT_EVENT_GFX_SAPPHIRE", "x": 7, "y": 7, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SAPPHIRE" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 5, "y": 9, "elevation": 3, diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index c104478d5..57be8be4a 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 4469af84e..be77bd7eb 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 447c0a10c..026d381e1 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index e0852cc49..988fddd5f 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 8, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 7, "y": 7, "elevation": 3, diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 47e361882..0997aafc7 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 9, "y": 24, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 12, "y": 15, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 34, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 61, "elevation": 1, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 10, "y": 44, "elevation": 1, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", "x": 11, "y": 44, "elevation": 1, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 8763c72fa..733c0c958 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 48, "y": 15, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 51, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 37, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 32, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 52, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 8, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 39, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 3, "y": 9, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 19, "y": 24, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 30, "y": 19, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index eae20e595..2f3c4b610 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 5, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 13, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index bf48ee91c..2c1c53efb 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index d31b0fe31..c3be304c9 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 24, "y": 25, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 32, "y": 11, "elevation": 5, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 33, "y": 16, "elevation": 5, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 31, "y": 24, "elevation": 5, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 14, "y": 10, "elevation": 5, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 21, "y": 29, "elevation": 5, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 10, "elevation": 5, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 12, "elevation": 5, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 18, "y": 11, "elevation": 5, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 33, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 34, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 41, "y": 32, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 41, "y": 33, "elevation": 3, @@ -189,7 +189,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 42, "y": 33, "elevation": 3, @@ -202,7 +202,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 33, "elevation": 3, @@ -215,7 +215,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 19, "y": 11, "elevation": 5, @@ -228,7 +228,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 43, "y": 32, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 470b708c5..f1bd689c9 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 12, "y": 13, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 11, "y": 52, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 35, "elevation": 1, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 15, "y": 45, "elevation": 1, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 21, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 21, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 11, "y": 76, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 19, "elevation": 0, @@ -134,7 +134,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 87, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index c889d7a5a..6cc57af62 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index 818e179f4..cf4c1dad2 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 49100e7a0..fc30c5a41 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 7, "y": 24, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 8, "y": 23, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 8, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 9, "y": 23, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 9, "y": 24, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 10, "y": 22, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 10, "y": 24, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 11, "y": 23, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 20, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 17, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 15, "y": 7, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 14, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_DODUO", + "graphics_id": "OBJECT_EVENT_GFX_DODUO", "x": 15, "y": 14, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 15, "y": 31, "elevation": 3, diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 0e14592f6..a9a72b4ae 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 12, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 19, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 23, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 38, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 44, "y": 23, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 44, "y": 29, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 16, "y": 43, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 17, "y": 39, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 14, "y": 39, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 11, "y": 39, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 5, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 43, "elevation": 3, diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 02ac7426c..71dbfd64d 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 27, "y": 10, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 68, "y": 10, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_F", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_F", "x": 33, "y": 13, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_F", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_F", "x": 50, "y": 11, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 36, "y": 4, "elevation": 1, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 77, "y": 5, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 78, "y": 5, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 72, "y": 8, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 86, "y": 13, "elevation": 3, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 317fb6580..18fddbfc1 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 23, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index dfce743a3..b11ac06db 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index e21901499..a8aa72fdf 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 0, diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 681380cc9..f692de547 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index df96d64eb..65e391a96 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index a518b76d8..1933aab5e 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index c5f567825..2a9a5665a 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index f27177490..c7db3c25c 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 2, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 83fec9da8..7a6688bc6 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 12, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 3, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index bb174d2f2..af562f042 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index e49bb1224..e7adfec0b 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 14, "y": 9, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 8, "y": 8, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 13, "y": 10, "elevation": 3, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 64aba9d7f..24db68596 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 28, "y": 4, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 31, "y": 6, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 30, "y": 11, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 26, "y": 5, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 27, "y": 6, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 30, "y": 16, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 39, "y": 16, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 37, "y": 12, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 24, "y": 12, "elevation": 3, diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 93538a4c9..4aa63fd0b 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 0fb8e4f6b..6d992c355 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 66f6aabed..684033ce5 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index fd3c9fac2..4caef4f41 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 5, "y": 5, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 5, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 5, "elevation": 1, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 4b227d7b7..4d3db31f6 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 11, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 43f5eb4ad..a9c4b0c27 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 107b622f6..8ad44f032 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index a839da159..93aa45550 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index cce927999..fd06be101 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index dd73060a4..bc4e4f4aa 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index dc4ac7d19..a4da32612 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index 65c7875bb..a427bdc14 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index de002c33f..611a3c092 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 10, "y": 5, "elevation": 0, diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json index 3c0340f01..b18296b2c 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnknownMap_00_04/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 3, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 1, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_7", + "graphics_id": "OBJECT_EVENT_GFX_VAR_7", "x": 7, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_8" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_6", + "graphics_id": "OBJECT_EVENT_GFX_VAR_6", "x": 1, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_7" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_5", + "graphics_id": "OBJECT_EVENT_GFX_VAR_5", "x": 7, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_4", + "graphics_id": "OBJECT_EVENT_GFX_VAR_4", "x": 13, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_5" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 13, "y": 8, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 4, "y": 6, "elevation": 3, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index e9d3a097d..216206ad1 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 22, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 36, "y": 10, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MACHOP", + "graphics_id": "OBJECT_EVENT_GFX_MACHOP", "x": 35, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 31, "y": 30, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 24, "y": 33, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 19, "y": 24, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 25, "y": 7, "elevation": 3, diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index c5a9d6d38..128b723d6 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LT_SURGE", + "graphics_id": "OBJECT_EVENT_GFX_LT_SURGE", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 2, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 4, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 7, "y": 8, "elevation": 3, diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index c45c3f65f..b712f5c9f 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 94cbf7c94..547e72ba9 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index d1a3688f0..aa5247c5d 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PIDGEY", + "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", + "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", "x": 6, "y": 4, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index f53ba795a..754b3c81b 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index aaf4bc861..b5b5467c8 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 789cc891a..9edc3d8bf 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index f4ec8fe14..761fac2ab 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 5, "y": 4, "elevation": 4, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 6, "y": 4, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PIKACHU", + "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", "x": 7, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SEEL", + "graphics_id": "OBJECT_EVENT_GFX_SEEL", "x": 4, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 0, diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 4fb068476..2f1147e86 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 6, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 7, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 4, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 16, "y": 3, "elevation": 3, diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index dfbe906bd..02d2c8369 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 20, "y": 11, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 31, "y": 16, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 26, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 36, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 40, "y": 7, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 25, "y": 13, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 14, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 7, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 33, "y": 19, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 9, "elevation": 3, diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 13e9e1481..f9bbe5bc2 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 21, "y": 5, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 10, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 38, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 19, "y": 15, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 33, "y": 18, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 32, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 38, "y": 13, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 39, "y": 13, "elevation": 3, diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 081e17e98..4e1b2cd0e 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 8, "y": 26, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 11, "y": 24, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 34, "y": 11, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 21, "y": 6, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 20, "y": 12, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 33, "y": 26, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 16, "y": 22, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 18, "y": 5, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 24c38bfd7..070c162c6 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -15,17 +15,17 @@ ViridianCity_MapScript1_1658D9:: @ 81658D9 end EventScript_165909:: @ 8165909 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1 + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 return EventScript_16590F:: @ 816590F - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1 + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 setobjectxyperm 4, 21, 8 setobjectmovementtype 4, 1 return EventScript_165920:: @ 8165920 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_VIRIDIAN_DRUNK + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_VIRIDIAN_DRUNK setobjectxyperm 4, 21, 11 setobjectmovementtype 4, 8 return diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 451a6a6e2..1361dfb46 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 10, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 12, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 11, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 10, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 2, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 3, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 6, "y": 8, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GIOVANNI", + "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", "x": 2, "y": 2, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 13, "y": 7, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 16, "y": 20, "elevation": 3, diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index edc6072ab..668ae37da 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SPEAROW", + "graphics_id": "OBJECT_EVENT_GFX_SPEAROW", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index a3abf9f9d..0f027934d 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 350ed4020..e4761721c 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 419e7b4ca..6dbd242bb 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 4, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 3711140e9..cf764b446 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 7a17aca4c..af19f7f56 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 29, "y": 58, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 45, "y": 58, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 45, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 29, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 22, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 41, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 40, "y": 21, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 21, "y": 34, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 43, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 49, "y": 60, "elevation": 3, diff --git a/data/trainer_see.s b/data/trainer_see.s index 3392f090f..3014d8ba0 100644 --- a/data/trainer_see.s +++ b/data/trainer_see.s @@ -5,7 +5,7 @@ .align 2 gUnknown_83C6AC8:: - .incbin "graphics/map_objects/emoticons.4bpp" + .incbin "graphics/object_events/emoticons.4bpp" gUnknown_83C7248:: @ 83C7248 .4byte IsTrainerInRangeSouth diff --git a/graphics/map_objects/0.pal b/graphics/object_events/0.pal index 3097a6556..3097a6556 100644 --- a/graphics/map_objects/0.pal +++ b/graphics/object_events/0.pal diff --git a/graphics/map_objects/000.png b/graphics/object_events/000.png Binary files differindex 8b72a852f..8b72a852f 100644 --- a/graphics/map_objects/000.png +++ b/graphics/object_events/000.png diff --git a/graphics/map_objects/001.png b/graphics/object_events/001.png Binary files differindex ee7d0a1d3..ee7d0a1d3 100644 --- a/graphics/map_objects/001.png +++ b/graphics/object_events/001.png diff --git a/graphics/map_objects/002.png b/graphics/object_events/002.png Binary files differindex 961bff7a8..961bff7a8 100644 --- a/graphics/map_objects/002.png +++ b/graphics/object_events/002.png diff --git a/graphics/map_objects/004.png b/graphics/object_events/004.png Binary files differindex a5ae8b3d1..a5ae8b3d1 100644 --- a/graphics/map_objects/004.png +++ b/graphics/object_events/004.png diff --git a/graphics/map_objects/005.png b/graphics/object_events/005.png Binary files differindex 66d53ea88..66d53ea88 100644 --- a/graphics/map_objects/005.png +++ b/graphics/object_events/005.png diff --git a/graphics/map_objects/006.png b/graphics/object_events/006.png Binary files differindex 90b198edb..90b198edb 100644 --- a/graphics/map_objects/006.png +++ b/graphics/object_events/006.png diff --git a/graphics/map_objects/007.png b/graphics/object_events/007.png Binary files differindex c65b97a5c..c65b97a5c 100644 --- a/graphics/map_objects/007.png +++ b/graphics/object_events/007.png diff --git a/graphics/map_objects/008.png b/graphics/object_events/008.png Binary files differindex b1e1ede7a..b1e1ede7a 100644 --- a/graphics/map_objects/008.png +++ b/graphics/object_events/008.png diff --git a/graphics/map_objects/009.png b/graphics/object_events/009.png Binary files differindex 7246e388d..7246e388d 100644 --- a/graphics/map_objects/009.png +++ b/graphics/object_events/009.png diff --git a/graphics/map_objects/011.png b/graphics/object_events/011.png Binary files differindex 61446035c..61446035c 100644 --- a/graphics/map_objects/011.png +++ b/graphics/object_events/011.png diff --git a/graphics/map_objects/012.png b/graphics/object_events/012.png Binary files differindex c1cd5c574..c1cd5c574 100644 --- a/graphics/map_objects/012.png +++ b/graphics/object_events/012.png diff --git a/graphics/map_objects/013.png b/graphics/object_events/013.png Binary files differindex f4140b8d0..f4140b8d0 100644 --- a/graphics/map_objects/013.png +++ b/graphics/object_events/013.png diff --git a/graphics/map_objects/014.png b/graphics/object_events/014.png Binary files differindex b79967c4b..b79967c4b 100644 --- a/graphics/map_objects/014.png +++ b/graphics/object_events/014.png diff --git a/graphics/map_objects/015.png b/graphics/object_events/015.png Binary files differindex 6cc84665c..6cc84665c 100644 --- a/graphics/map_objects/015.png +++ b/graphics/object_events/015.png diff --git a/graphics/map_objects/016.png b/graphics/object_events/016.png Binary files differindex e53418256..e53418256 100644 --- a/graphics/map_objects/016.png +++ b/graphics/object_events/016.png diff --git a/graphics/map_objects/017.png b/graphics/object_events/017.png Binary files differindex 2ce6d6355..2ce6d6355 100644 --- a/graphics/map_objects/017.png +++ b/graphics/object_events/017.png diff --git a/graphics/map_objects/018.png b/graphics/object_events/018.png Binary files differindex 13f4ee1f2..13f4ee1f2 100644 --- a/graphics/map_objects/018.png +++ b/graphics/object_events/018.png diff --git a/graphics/map_objects/019.png b/graphics/object_events/019.png Binary files differindex 749051218..749051218 100644 --- a/graphics/map_objects/019.png +++ b/graphics/object_events/019.png diff --git a/graphics/map_objects/020.png b/graphics/object_events/020.png Binary files differindex dd33a7921..dd33a7921 100644 --- a/graphics/map_objects/020.png +++ b/graphics/object_events/020.png diff --git a/graphics/map_objects/021.png b/graphics/object_events/021.png Binary files differindex 15eabb0b3..15eabb0b3 100644 --- a/graphics/map_objects/021.png +++ b/graphics/object_events/021.png diff --git a/graphics/map_objects/022.png b/graphics/object_events/022.png Binary files differindex 82d08630c..82d08630c 100644 --- a/graphics/map_objects/022.png +++ b/graphics/object_events/022.png diff --git a/graphics/map_objects/023.png b/graphics/object_events/023.png Binary files differindex b3922d5f8..b3922d5f8 100644 --- a/graphics/map_objects/023.png +++ b/graphics/object_events/023.png diff --git a/graphics/map_objects/024.png b/graphics/object_events/024.png Binary files differindex 20125262a..20125262a 100644 --- a/graphics/map_objects/024.png +++ b/graphics/object_events/024.png diff --git a/graphics/map_objects/025.png b/graphics/object_events/025.png Binary files differindex d3c38275a..d3c38275a 100644 --- a/graphics/map_objects/025.png +++ b/graphics/object_events/025.png diff --git a/graphics/map_objects/026.png b/graphics/object_events/026.png Binary files differindex 44b8b5c50..44b8b5c50 100644 --- a/graphics/map_objects/026.png +++ b/graphics/object_events/026.png diff --git a/graphics/map_objects/027.png b/graphics/object_events/027.png Binary files differindex b5ed884fd..b5ed884fd 100644 --- a/graphics/map_objects/027.png +++ b/graphics/object_events/027.png diff --git a/graphics/map_objects/028.png b/graphics/object_events/028.png Binary files differindex 95d3c5e0f..95d3c5e0f 100644 --- a/graphics/map_objects/028.png +++ b/graphics/object_events/028.png diff --git a/graphics/map_objects/029.png b/graphics/object_events/029.png Binary files differindex 006b67036..006b67036 100644 --- a/graphics/map_objects/029.png +++ b/graphics/object_events/029.png diff --git a/graphics/map_objects/030.png b/graphics/object_events/030.png Binary files differindex 1c2d8eb63..1c2d8eb63 100644 --- a/graphics/map_objects/030.png +++ b/graphics/object_events/030.png diff --git a/graphics/map_objects/031.png b/graphics/object_events/031.png Binary files differindex fc278b97e..fc278b97e 100644 --- a/graphics/map_objects/031.png +++ b/graphics/object_events/031.png diff --git a/graphics/map_objects/032.png b/graphics/object_events/032.png Binary files differindex 87d1e4ce4..87d1e4ce4 100644 --- a/graphics/map_objects/032.png +++ b/graphics/object_events/032.png diff --git a/graphics/map_objects/033.png b/graphics/object_events/033.png Binary files differindex f6913ed9b..f6913ed9b 100644 --- a/graphics/map_objects/033.png +++ b/graphics/object_events/033.png diff --git a/graphics/map_objects/034.png b/graphics/object_events/034.png Binary files differindex 05a775388..05a775388 100644 --- a/graphics/map_objects/034.png +++ b/graphics/object_events/034.png diff --git a/graphics/map_objects/035.png b/graphics/object_events/035.png Binary files differindex a99ab0238..a99ab0238 100644 --- a/graphics/map_objects/035.png +++ b/graphics/object_events/035.png diff --git a/graphics/map_objects/036.png b/graphics/object_events/036.png Binary files differindex 23fe7c6e3..23fe7c6e3 100644 --- a/graphics/map_objects/036.png +++ b/graphics/object_events/036.png diff --git a/graphics/map_objects/037.png b/graphics/object_events/037.png Binary files differindex c4f962acb..c4f962acb 100644 --- a/graphics/map_objects/037.png +++ b/graphics/object_events/037.png diff --git a/graphics/map_objects/038.png b/graphics/object_events/038.png Binary files differindex b53913af7..b53913af7 100644 --- a/graphics/map_objects/038.png +++ b/graphics/object_events/038.png diff --git a/graphics/map_objects/039.png b/graphics/object_events/039.png Binary files differindex 45d4400d8..45d4400d8 100644 --- a/graphics/map_objects/039.png +++ b/graphics/object_events/039.png diff --git a/graphics/map_objects/040.png b/graphics/object_events/040.png Binary files differindex 8bff4d72e..8bff4d72e 100644 --- a/graphics/map_objects/040.png +++ b/graphics/object_events/040.png diff --git a/graphics/map_objects/041.png b/graphics/object_events/041.png Binary files differindex df48acad0..df48acad0 100644 --- a/graphics/map_objects/041.png +++ b/graphics/object_events/041.png diff --git a/graphics/map_objects/042.png b/graphics/object_events/042.png Binary files differindex 63a47e95b..63a47e95b 100644 --- a/graphics/map_objects/042.png +++ b/graphics/object_events/042.png diff --git a/graphics/map_objects/043.png b/graphics/object_events/043.png Binary files differindex ded67966a..ded67966a 100644 --- a/graphics/map_objects/043.png +++ b/graphics/object_events/043.png diff --git a/graphics/map_objects/044.png b/graphics/object_events/044.png Binary files differindex a76e9bd47..a76e9bd47 100644 --- a/graphics/map_objects/044.png +++ b/graphics/object_events/044.png diff --git a/graphics/map_objects/045.png b/graphics/object_events/045.png Binary files differindex 9e862173a..9e862173a 100644 --- a/graphics/map_objects/045.png +++ b/graphics/object_events/045.png diff --git a/graphics/map_objects/046.png b/graphics/object_events/046.png Binary files differindex 2f7a5f796..2f7a5f796 100644 --- a/graphics/map_objects/046.png +++ b/graphics/object_events/046.png diff --git a/graphics/map_objects/047.png b/graphics/object_events/047.png Binary files differindex 361e028c4..361e028c4 100644 --- a/graphics/map_objects/047.png +++ b/graphics/object_events/047.png diff --git a/graphics/map_objects/048.png b/graphics/object_events/048.png Binary files differindex 20a4e3a15..20a4e3a15 100644 --- a/graphics/map_objects/048.png +++ b/graphics/object_events/048.png diff --git a/graphics/map_objects/049.png b/graphics/object_events/049.png Binary files differindex 07222b9ba..07222b9ba 100644 --- a/graphics/map_objects/049.png +++ b/graphics/object_events/049.png diff --git a/graphics/map_objects/050.png b/graphics/object_events/050.png Binary files differindex 8c3817c82..8c3817c82 100644 --- a/graphics/map_objects/050.png +++ b/graphics/object_events/050.png diff --git a/graphics/map_objects/051.png b/graphics/object_events/051.png Binary files differindex 358a4dd1b..358a4dd1b 100644 --- a/graphics/map_objects/051.png +++ b/graphics/object_events/051.png diff --git a/graphics/map_objects/052.png b/graphics/object_events/052.png Binary files differindex 95089c7ee..95089c7ee 100644 --- a/graphics/map_objects/052.png +++ b/graphics/object_events/052.png diff --git a/graphics/map_objects/053.png b/graphics/object_events/053.png Binary files differindex 6671943dd..6671943dd 100644 --- a/graphics/map_objects/053.png +++ b/graphics/object_events/053.png diff --git a/graphics/map_objects/054.png b/graphics/object_events/054.png Binary files differindex 7717ce43b..7717ce43b 100644 --- a/graphics/map_objects/054.png +++ b/graphics/object_events/054.png diff --git a/graphics/map_objects/055.png b/graphics/object_events/055.png Binary files differindex b85011c3c..b85011c3c 100644 --- a/graphics/map_objects/055.png +++ b/graphics/object_events/055.png diff --git a/graphics/map_objects/056.png b/graphics/object_events/056.png Binary files differindex 7c4d443a2..7c4d443a2 100644 --- a/graphics/map_objects/056.png +++ b/graphics/object_events/056.png diff --git a/graphics/map_objects/057.png b/graphics/object_events/057.png Binary files differindex 8961c0765..8961c0765 100644 --- a/graphics/map_objects/057.png +++ b/graphics/object_events/057.png diff --git a/graphics/map_objects/058.png b/graphics/object_events/058.png Binary files differindex f6925577d..f6925577d 100644 --- a/graphics/map_objects/058.png +++ b/graphics/object_events/058.png diff --git a/graphics/map_objects/059.png b/graphics/object_events/059.png Binary files differindex a251297b6..a251297b6 100644 --- a/graphics/map_objects/059.png +++ b/graphics/object_events/059.png diff --git a/graphics/map_objects/060.png b/graphics/object_events/060.png Binary files differindex aedee9f67..aedee9f67 100644 --- a/graphics/map_objects/060.png +++ b/graphics/object_events/060.png diff --git a/graphics/map_objects/061.png b/graphics/object_events/061.png Binary files differindex de57e641f..de57e641f 100644 --- a/graphics/map_objects/061.png +++ b/graphics/object_events/061.png diff --git a/graphics/map_objects/062.png b/graphics/object_events/062.png Binary files differindex 175e14e47..175e14e47 100644 --- a/graphics/map_objects/062.png +++ b/graphics/object_events/062.png diff --git a/graphics/map_objects/063.png b/graphics/object_events/063.png Binary files differindex fbf6aa689..fbf6aa689 100644 --- a/graphics/map_objects/063.png +++ b/graphics/object_events/063.png diff --git a/graphics/map_objects/064.png b/graphics/object_events/064.png Binary files differindex 328d1f6b7..328d1f6b7 100644 --- a/graphics/map_objects/064.png +++ b/graphics/object_events/064.png diff --git a/graphics/map_objects/065.png b/graphics/object_events/065.png Binary files differindex 74e081153..74e081153 100644 --- a/graphics/map_objects/065.png +++ b/graphics/object_events/065.png diff --git a/graphics/map_objects/066.png b/graphics/object_events/066.png Binary files differindex ef0ecdba4..ef0ecdba4 100644 --- a/graphics/map_objects/066.png +++ b/graphics/object_events/066.png diff --git a/graphics/map_objects/067.png b/graphics/object_events/067.png Binary files differindex d1c20e818..d1c20e818 100644 --- a/graphics/map_objects/067.png +++ b/graphics/object_events/067.png diff --git a/graphics/map_objects/068.png b/graphics/object_events/068.png Binary files differindex 485678492..485678492 100644 --- a/graphics/map_objects/068.png +++ b/graphics/object_events/068.png diff --git a/graphics/map_objects/069.png b/graphics/object_events/069.png Binary files differindex f503cf0c9..f503cf0c9 100644 --- a/graphics/map_objects/069.png +++ b/graphics/object_events/069.png diff --git a/graphics/map_objects/070.png b/graphics/object_events/070.png Binary files differindex a3f994a83..a3f994a83 100644 --- a/graphics/map_objects/070.png +++ b/graphics/object_events/070.png diff --git a/graphics/map_objects/071.png b/graphics/object_events/071.png Binary files differindex fab2b23ac..fab2b23ac 100644 --- a/graphics/map_objects/071.png +++ b/graphics/object_events/071.png diff --git a/graphics/map_objects/072.png b/graphics/object_events/072.png Binary files differindex a66593653..a66593653 100644 --- a/graphics/map_objects/072.png +++ b/graphics/object_events/072.png diff --git a/graphics/map_objects/073.png b/graphics/object_events/073.png Binary files differindex 85b82a47f..85b82a47f 100644 --- a/graphics/map_objects/073.png +++ b/graphics/object_events/073.png diff --git a/graphics/map_objects/074.png b/graphics/object_events/074.png Binary files differindex b7426b280..b7426b280 100644 --- a/graphics/map_objects/074.png +++ b/graphics/object_events/074.png diff --git a/graphics/map_objects/075.png b/graphics/object_events/075.png Binary files differindex b8bf3ede6..b8bf3ede6 100644 --- a/graphics/map_objects/075.png +++ b/graphics/object_events/075.png diff --git a/graphics/map_objects/076.png b/graphics/object_events/076.png Binary files differindex 5ba2f26f8..5ba2f26f8 100644 --- a/graphics/map_objects/076.png +++ b/graphics/object_events/076.png diff --git a/graphics/map_objects/077.png b/graphics/object_events/077.png Binary files differindex 0b535572e..0b535572e 100644 --- a/graphics/map_objects/077.png +++ b/graphics/object_events/077.png diff --git a/graphics/map_objects/078.png b/graphics/object_events/078.png Binary files differindex 4b6983de6..4b6983de6 100644 --- a/graphics/map_objects/078.png +++ b/graphics/object_events/078.png diff --git a/graphics/map_objects/079.png b/graphics/object_events/079.png Binary files differindex ac5ee5e9f..ac5ee5e9f 100644 --- a/graphics/map_objects/079.png +++ b/graphics/object_events/079.png diff --git a/graphics/map_objects/080.png b/graphics/object_events/080.png Binary files differindex bf48c8dd7..bf48c8dd7 100644 --- a/graphics/map_objects/080.png +++ b/graphics/object_events/080.png diff --git a/graphics/map_objects/081.png b/graphics/object_events/081.png Binary files differindex 0e4a837b5..0e4a837b5 100644 --- a/graphics/map_objects/081.png +++ b/graphics/object_events/081.png diff --git a/graphics/map_objects/082.png b/graphics/object_events/082.png Binary files differindex 07435e777..07435e777 100644 --- a/graphics/map_objects/082.png +++ b/graphics/object_events/082.png diff --git a/graphics/map_objects/083.png b/graphics/object_events/083.png Binary files differindex 015b6bbe3..015b6bbe3 100644 --- a/graphics/map_objects/083.png +++ b/graphics/object_events/083.png diff --git a/graphics/map_objects/084.png b/graphics/object_events/084.png Binary files differindex b45ec3f25..b45ec3f25 100644 --- a/graphics/map_objects/084.png +++ b/graphics/object_events/084.png diff --git a/graphics/map_objects/085.png b/graphics/object_events/085.png Binary files differindex 101dfb0e0..101dfb0e0 100644 --- a/graphics/map_objects/085.png +++ b/graphics/object_events/085.png diff --git a/graphics/map_objects/086.png b/graphics/object_events/086.png Binary files differindex 19ccb8fcc..19ccb8fcc 100644 --- a/graphics/map_objects/086.png +++ b/graphics/object_events/086.png diff --git a/graphics/map_objects/087.png b/graphics/object_events/087.png Binary files differindex 5f9585a61..5f9585a61 100644 --- a/graphics/map_objects/087.png +++ b/graphics/object_events/087.png diff --git a/graphics/map_objects/088.png b/graphics/object_events/088.png Binary files differindex c7e79eefd..c7e79eefd 100644 --- a/graphics/map_objects/088.png +++ b/graphics/object_events/088.png diff --git a/graphics/map_objects/089.png b/graphics/object_events/089.png Binary files differindex 1dc91873d..1dc91873d 100644 --- a/graphics/map_objects/089.png +++ b/graphics/object_events/089.png diff --git a/graphics/map_objects/090.png b/graphics/object_events/090.png Binary files differindex 320da6daa..320da6daa 100644 --- a/graphics/map_objects/090.png +++ b/graphics/object_events/090.png diff --git a/graphics/map_objects/091.png b/graphics/object_events/091.png Binary files differindex 8a55cd3d3..8a55cd3d3 100644 --- a/graphics/map_objects/091.png +++ b/graphics/object_events/091.png diff --git a/graphics/map_objects/092.png b/graphics/object_events/092.png Binary files differindex 5b91624c7..5b91624c7 100644 --- a/graphics/map_objects/092.png +++ b/graphics/object_events/092.png diff --git a/graphics/map_objects/093.png b/graphics/object_events/093.png Binary files differindex 1092e5695..1092e5695 100644 --- a/graphics/map_objects/093.png +++ b/graphics/object_events/093.png diff --git a/graphics/map_objects/094.png b/graphics/object_events/094.png Binary files differindex 9089df959..9089df959 100644 --- a/graphics/map_objects/094.png +++ b/graphics/object_events/094.png diff --git a/graphics/map_objects/095.png b/graphics/object_events/095.png Binary files differindex ce110cd9e..ce110cd9e 100644 --- a/graphics/map_objects/095.png +++ b/graphics/object_events/095.png diff --git a/graphics/map_objects/096.png b/graphics/object_events/096.png Binary files differindex 315fb0089..315fb0089 100644 --- a/graphics/map_objects/096.png +++ b/graphics/object_events/096.png diff --git a/graphics/map_objects/097.png b/graphics/object_events/097.png Binary files differindex 2f594708f..2f594708f 100644 --- a/graphics/map_objects/097.png +++ b/graphics/object_events/097.png diff --git a/graphics/map_objects/098.png b/graphics/object_events/098.png Binary files differindex 2e87e553a..2e87e553a 100644 --- a/graphics/map_objects/098.png +++ b/graphics/object_events/098.png diff --git a/graphics/map_objects/099.png b/graphics/object_events/099.png Binary files differindex 099670aa3..099670aa3 100644 --- a/graphics/map_objects/099.png +++ b/graphics/object_events/099.png diff --git a/graphics/map_objects/1.pal b/graphics/object_events/1.pal index 5537faa0f..5537faa0f 100644 --- a/graphics/map_objects/1.pal +++ b/graphics/object_events/1.pal diff --git a/graphics/map_objects/10.pal b/graphics/object_events/10.pal index ae8272ec4..ae8272ec4 100644 --- a/graphics/map_objects/10.pal +++ b/graphics/object_events/10.pal diff --git a/graphics/map_objects/100.png b/graphics/object_events/100.png Binary files differindex 97a278aa5..97a278aa5 100644 --- a/graphics/map_objects/100.png +++ b/graphics/object_events/100.png diff --git a/graphics/map_objects/101.png b/graphics/object_events/101.png Binary files differindex 82d7d9424..82d7d9424 100644 --- a/graphics/map_objects/101.png +++ b/graphics/object_events/101.png diff --git a/graphics/map_objects/102.png b/graphics/object_events/102.png Binary files differindex 537e9b718..537e9b718 100644 --- a/graphics/map_objects/102.png +++ b/graphics/object_events/102.png diff --git a/graphics/map_objects/103.png b/graphics/object_events/103.png Binary files differindex c255ad15a..c255ad15a 100644 --- a/graphics/map_objects/103.png +++ b/graphics/object_events/103.png diff --git a/graphics/map_objects/104.png b/graphics/object_events/104.png Binary files differindex 2717cf7a9..2717cf7a9 100644 --- a/graphics/map_objects/104.png +++ b/graphics/object_events/104.png diff --git a/graphics/map_objects/105.png b/graphics/object_events/105.png Binary files differindex d5cef50ea..d5cef50ea 100644 --- a/graphics/map_objects/105.png +++ b/graphics/object_events/105.png diff --git a/graphics/map_objects/106.png b/graphics/object_events/106.png Binary files differindex 706049ee0..706049ee0 100644 --- a/graphics/map_objects/106.png +++ b/graphics/object_events/106.png diff --git a/graphics/map_objects/107.png b/graphics/object_events/107.png Binary files differindex e0d216fb3..e0d216fb3 100644 --- a/graphics/map_objects/107.png +++ b/graphics/object_events/107.png diff --git a/graphics/map_objects/108.png b/graphics/object_events/108.png Binary files differindex a28a5ab9a..a28a5ab9a 100644 --- a/graphics/map_objects/108.png +++ b/graphics/object_events/108.png diff --git a/graphics/map_objects/109.png b/graphics/object_events/109.png Binary files differindex b8affc19b..b8affc19b 100644 --- a/graphics/map_objects/109.png +++ b/graphics/object_events/109.png diff --git a/graphics/map_objects/11.pal b/graphics/object_events/11.pal index b36c29ab1..b36c29ab1 100644 --- a/graphics/map_objects/11.pal +++ b/graphics/object_events/11.pal diff --git a/graphics/map_objects/110.png b/graphics/object_events/110.png Binary files differindex 499f51e8c..499f51e8c 100644 --- a/graphics/map_objects/110.png +++ b/graphics/object_events/110.png diff --git a/graphics/map_objects/111.png b/graphics/object_events/111.png Binary files differindex ba51eaddc..ba51eaddc 100644 --- a/graphics/map_objects/111.png +++ b/graphics/object_events/111.png diff --git a/graphics/map_objects/112.png b/graphics/object_events/112.png Binary files differindex 0c8428fd3..0c8428fd3 100644 --- a/graphics/map_objects/112.png +++ b/graphics/object_events/112.png diff --git a/graphics/map_objects/113.png b/graphics/object_events/113.png Binary files differindex e5817bac8..e5817bac8 100644 --- a/graphics/map_objects/113.png +++ b/graphics/object_events/113.png diff --git a/graphics/map_objects/114.png b/graphics/object_events/114.png Binary files differindex 55748d9a0..55748d9a0 100644 --- a/graphics/map_objects/114.png +++ b/graphics/object_events/114.png diff --git a/graphics/map_objects/115.png b/graphics/object_events/115.png Binary files differindex ccd46b1f8..ccd46b1f8 100644 --- a/graphics/map_objects/115.png +++ b/graphics/object_events/115.png diff --git a/graphics/map_objects/116.png b/graphics/object_events/116.png Binary files differindex a109eb2c6..a109eb2c6 100644 --- a/graphics/map_objects/116.png +++ b/graphics/object_events/116.png diff --git a/graphics/map_objects/117.png b/graphics/object_events/117.png Binary files differindex 550a58260..550a58260 100644 --- a/graphics/map_objects/117.png +++ b/graphics/object_events/117.png diff --git a/graphics/map_objects/118.png b/graphics/object_events/118.png Binary files differindex 083897483..083897483 100644 --- a/graphics/map_objects/118.png +++ b/graphics/object_events/118.png diff --git a/graphics/map_objects/119.png b/graphics/object_events/119.png Binary files differindex ed82e390e..ed82e390e 100644 --- a/graphics/map_objects/119.png +++ b/graphics/object_events/119.png diff --git a/graphics/map_objects/12.pal b/graphics/object_events/12.pal index b69e9ac0a..b69e9ac0a 100644 --- a/graphics/map_objects/12.pal +++ b/graphics/object_events/12.pal diff --git a/graphics/map_objects/120.png b/graphics/object_events/120.png Binary files differindex 7b837e11b..7b837e11b 100644 --- a/graphics/map_objects/120.png +++ b/graphics/object_events/120.png diff --git a/graphics/map_objects/121.png b/graphics/object_events/121.png Binary files differindex 1f0dd24e0..1f0dd24e0 100644 --- a/graphics/map_objects/121.png +++ b/graphics/object_events/121.png diff --git a/graphics/map_objects/122.png b/graphics/object_events/122.png Binary files differindex b25ee75f4..b25ee75f4 100644 --- a/graphics/map_objects/122.png +++ b/graphics/object_events/122.png diff --git a/graphics/map_objects/123.png b/graphics/object_events/123.png Binary files differindex 4a2768475..4a2768475 100644 --- a/graphics/map_objects/123.png +++ b/graphics/object_events/123.png diff --git a/graphics/map_objects/124.png b/graphics/object_events/124.png Binary files differindex 8cdfa0ef2..8cdfa0ef2 100644 --- a/graphics/map_objects/124.png +++ b/graphics/object_events/124.png diff --git a/graphics/map_objects/125.png b/graphics/object_events/125.png Binary files differindex 31203db01..31203db01 100644 --- a/graphics/map_objects/125.png +++ b/graphics/object_events/125.png diff --git a/graphics/map_objects/126.png b/graphics/object_events/126.png Binary files differindex 2cd14040c..2cd14040c 100644 --- a/graphics/map_objects/126.png +++ b/graphics/object_events/126.png diff --git a/graphics/map_objects/127.png b/graphics/object_events/127.png Binary files differindex 973306673..973306673 100644 --- a/graphics/map_objects/127.png +++ b/graphics/object_events/127.png diff --git a/graphics/map_objects/128.png b/graphics/object_events/128.png Binary files differindex 9baab0bbe..9baab0bbe 100644 --- a/graphics/map_objects/128.png +++ b/graphics/object_events/128.png diff --git a/graphics/map_objects/129.png b/graphics/object_events/129.png Binary files differindex 1cd63f1eb..1cd63f1eb 100644 --- a/graphics/map_objects/129.png +++ b/graphics/object_events/129.png diff --git a/graphics/map_objects/130.png b/graphics/object_events/130.png Binary files differindex db791455b..db791455b 100644 --- a/graphics/map_objects/130.png +++ b/graphics/object_events/130.png diff --git a/graphics/map_objects/131.png b/graphics/object_events/131.png Binary files differindex c8252a957..c8252a957 100644 --- a/graphics/map_objects/131.png +++ b/graphics/object_events/131.png diff --git a/graphics/map_objects/132.png b/graphics/object_events/132.png Binary files differindex 9a63cab7e..9a63cab7e 100644 --- a/graphics/map_objects/132.png +++ b/graphics/object_events/132.png diff --git a/graphics/map_objects/133.png b/graphics/object_events/133.png Binary files differindex c26ced826..c26ced826 100644 --- a/graphics/map_objects/133.png +++ b/graphics/object_events/133.png diff --git a/graphics/map_objects/134.png b/graphics/object_events/134.png Binary files differindex 74a29680c..74a29680c 100644 --- a/graphics/map_objects/134.png +++ b/graphics/object_events/134.png diff --git a/graphics/map_objects/135.png b/graphics/object_events/135.png Binary files differindex 3fd66ec1d..3fd66ec1d 100644 --- a/graphics/map_objects/135.png +++ b/graphics/object_events/135.png diff --git a/graphics/map_objects/136.png b/graphics/object_events/136.png Binary files differindex 58dfd65fa..58dfd65fa 100644 --- a/graphics/map_objects/136.png +++ b/graphics/object_events/136.png diff --git a/graphics/map_objects/137.png b/graphics/object_events/137.png Binary files differindex d9b6a0b68..d9b6a0b68 100644 --- a/graphics/map_objects/137.png +++ b/graphics/object_events/137.png diff --git a/graphics/map_objects/138.png b/graphics/object_events/138.png Binary files differindex c062c6022..c062c6022 100644 --- a/graphics/map_objects/138.png +++ b/graphics/object_events/138.png diff --git a/graphics/map_objects/139.png b/graphics/object_events/139.png Binary files differindex a587d78a9..a587d78a9 100644 --- a/graphics/map_objects/139.png +++ b/graphics/object_events/139.png diff --git a/graphics/map_objects/140.png b/graphics/object_events/140.png Binary files differindex 934aec110..934aec110 100644 --- a/graphics/map_objects/140.png +++ b/graphics/object_events/140.png diff --git a/graphics/map_objects/141.png b/graphics/object_events/141.png Binary files differindex c646f7bce..c646f7bce 100644 --- a/graphics/map_objects/141.png +++ b/graphics/object_events/141.png diff --git a/graphics/map_objects/142.png b/graphics/object_events/142.png Binary files differindex f471416e6..f471416e6 100644 --- a/graphics/map_objects/142.png +++ b/graphics/object_events/142.png diff --git a/graphics/map_objects/143.png b/graphics/object_events/143.png Binary files differindex 727d674e8..727d674e8 100644 --- a/graphics/map_objects/143.png +++ b/graphics/object_events/143.png diff --git a/graphics/map_objects/144.png b/graphics/object_events/144.png Binary files differindex 22794f5c6..22794f5c6 100644 --- a/graphics/map_objects/144.png +++ b/graphics/object_events/144.png diff --git a/graphics/map_objects/145.png b/graphics/object_events/145.png Binary files differindex 3d2a7f11b..3d2a7f11b 100644 --- a/graphics/map_objects/145.png +++ b/graphics/object_events/145.png diff --git a/graphics/map_objects/146.png b/graphics/object_events/146.png Binary files differindex 743a072d2..743a072d2 100644 --- a/graphics/map_objects/146.png +++ b/graphics/object_events/146.png diff --git a/graphics/map_objects/147.png b/graphics/object_events/147.png Binary files differindex 50339fbc0..50339fbc0 100644 --- a/graphics/map_objects/147.png +++ b/graphics/object_events/147.png diff --git a/graphics/map_objects/148.png b/graphics/object_events/148.png Binary files differindex 9079690f0..9079690f0 100644 --- a/graphics/map_objects/148.png +++ b/graphics/object_events/148.png diff --git a/graphics/map_objects/149.png b/graphics/object_events/149.png Binary files differindex 84c160d61..84c160d61 100644 --- a/graphics/map_objects/149.png +++ b/graphics/object_events/149.png diff --git a/graphics/map_objects/150.png b/graphics/object_events/150.png Binary files differindex 48695b960..48695b960 100644 --- a/graphics/map_objects/150.png +++ b/graphics/object_events/150.png diff --git a/graphics/map_objects/151.png b/graphics/object_events/151.png Binary files differindex 0331e4440..0331e4440 100644 --- a/graphics/map_objects/151.png +++ b/graphics/object_events/151.png diff --git a/graphics/map_objects/152.png b/graphics/object_events/152.png Binary files differindex d39504689..d39504689 100644 --- a/graphics/map_objects/152.png +++ b/graphics/object_events/152.png diff --git a/graphics/map_objects/16.pal b/graphics/object_events/16.pal index 3097a6556..3097a6556 100644 --- a/graphics/map_objects/16.pal +++ b/graphics/object_events/16.pal diff --git a/graphics/map_objects/17.pal b/graphics/object_events/17.pal index 5537faa0f..5537faa0f 100644 --- a/graphics/map_objects/17.pal +++ b/graphics/object_events/17.pal diff --git a/graphics/map_objects/19.pal b/graphics/object_events/19.pal index c20bacb57..c20bacb57 100644 --- a/graphics/map_objects/19.pal +++ b/graphics/object_events/19.pal diff --git a/graphics/map_objects/2.pal b/graphics/object_events/2.pal index 0cebd6c4d..0cebd6c4d 100644 --- a/graphics/map_objects/2.pal +++ b/graphics/object_events/2.pal diff --git a/graphics/map_objects/20.pal b/graphics/object_events/20.pal index c25501332..c25501332 100644 --- a/graphics/map_objects/20.pal +++ b/graphics/object_events/20.pal diff --git a/graphics/map_objects/21.pal b/graphics/object_events/21.pal index cf19fedfa..cf19fedfa 100644 --- a/graphics/map_objects/21.pal +++ b/graphics/object_events/21.pal diff --git a/graphics/map_objects/3.pal b/graphics/object_events/3.pal index c62e8ce06..c62e8ce06 100644 --- a/graphics/map_objects/3.pal +++ b/graphics/object_events/3.pal diff --git a/graphics/map_objects/4.pal b/graphics/object_events/4.pal index e245ba013..e245ba013 100644 --- a/graphics/map_objects/4.pal +++ b/graphics/object_events/4.pal diff --git a/graphics/map_objects/5.pal b/graphics/object_events/5.pal index 0c60b08a5..0c60b08a5 100644 --- a/graphics/map_objects/5.pal +++ b/graphics/object_events/5.pal diff --git a/graphics/map_objects/6.pal b/graphics/object_events/6.pal index 1646e805e..1646e805e 100644 --- a/graphics/map_objects/6.pal +++ b/graphics/object_events/6.pal diff --git a/graphics/map_objects/7.pal b/graphics/object_events/7.pal index 9fdd95ccc..9fdd95ccc 100644 --- a/graphics/map_objects/7.pal +++ b/graphics/object_events/7.pal diff --git a/graphics/map_objects/8.pal b/graphics/object_events/8.pal index d0e386c7c..d0e386c7c 100644 --- a/graphics/map_objects/8.pal +++ b/graphics/object_events/8.pal diff --git a/graphics/map_objects/9.pal b/graphics/object_events/9.pal index ae24bbfe4..ae24bbfe4 100644 --- a/graphics/map_objects/9.pal +++ b/graphics/object_events/9.pal diff --git a/graphics/map_objects/emoticons.png b/graphics/object_events/emoticons.png Binary files differindex 43cb818da..43cb818da 100644 --- a/graphics/map_objects/emoticons.png +++ b/graphics/object_events/emoticons.png diff --git a/graphics/map_objects/female_surf.png b/graphics/object_events/female_surf.png Binary files differindex 325af3f5e..325af3f5e 100644 --- a/graphics/map_objects/female_surf.png +++ b/graphics/object_events/female_surf.png diff --git a/graphics/map_objects/fldeff_cut.png b/graphics/object_events/fldeff_cut.png Binary files differindex 031d04b40..031d04b40 100644 --- a/graphics/map_objects/fldeff_cut.png +++ b/graphics/object_events/fldeff_cut.png diff --git a/graphics/map_objects/male_surf.png b/graphics/object_events/male_surf.png Binary files differindex 310e6900f..310e6900f 100644 --- a/graphics/map_objects/male_surf.png +++ b/graphics/object_events/male_surf.png diff --git a/graphics/object_events/palettes/8398FA8.pal b/graphics/object_events/palettes/8398FA8.pal new file mode 100644 index 000000000..40f7022bf --- /dev/null +++ b/graphics/object_events/palettes/8398FA8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 238 +246 230 197 +238 213 180 +222 180 148 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +98 156 180 +0 0 0 +0 0 0 +238 230 164 +222 213 139 +213 189 115 +197 180 90 +0 0 0 diff --git a/graphics/object_events/palettes/8398FC8.pal b/graphics/object_events/palettes/8398FC8.pal new file mode 100644 index 000000000..26f8fc1f4 --- /dev/null +++ b/graphics/object_events/palettes/8398FC8.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 0 238 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +49 65 0 +98 172 238 +98 172 197 +139 205 246 +148 230 255 +0 0 0 +0 0 0 +164 230 197 +115 205 164 +65 180 139 +24 164 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/object_events/palettes/839C588.pal b/graphics/object_events/palettes/839C588.pal new file mode 100644 index 000000000..e3a76c035 --- /dev/null +++ b/graphics/object_events/palettes/839C588.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +98 98 98 +213 213 139 +172 172 90 +139 139 65 +230 246 205 +189 238 180 +131 222 180 +98 172 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/object_events/palettes/839D3A8.pal b/graphics/object_events/palettes/839D3A8.pal new file mode 100644 index 000000000..b170eb1f5 --- /dev/null +++ b/graphics/object_events/palettes/839D3A8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 74 +255 255 255 +205 246 255 +156 213 255 +74 197 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/object_events/pics/effects/shadow_extra_large.png b/graphics/object_events/pics/effects/shadow_extra_large.png Binary files differnew file mode 100644 index 000000000..567c63948 --- /dev/null +++ b/graphics/object_events/pics/effects/shadow_extra_large.png diff --git a/graphics/object_events/pics/effects/shadow_large.png b/graphics/object_events/pics/effects/shadow_large.png Binary files differnew file mode 100644 index 000000000..8cf80f166 --- /dev/null +++ b/graphics/object_events/pics/effects/shadow_large.png diff --git a/graphics/object_events/pics/effects/shadow_medium.png b/graphics/object_events/pics/effects/shadow_medium.png Binary files differnew file mode 100644 index 000000000..264230afd --- /dev/null +++ b/graphics/object_events/pics/effects/shadow_medium.png diff --git a/graphics/object_events/pics/effects/shadow_small.png b/graphics/object_events/pics/effects/shadow_small.png Binary files differnew file mode 100644 index 000000000..204d6afad --- /dev/null +++ b/graphics/object_events/pics/effects/shadow_small.png diff --git a/graphics/object_events/pics/unknown/83986A8.png b/graphics/object_events/pics/unknown/83986A8.png Binary files differnew file mode 100644 index 000000000..d05031f54 --- /dev/null +++ b/graphics/object_events/pics/unknown/83986A8.png diff --git a/graphics/object_events/pics/unknown/8398928.png b/graphics/object_events/pics/unknown/8398928.png Binary files differnew file mode 100644 index 000000000..a80b8680b --- /dev/null +++ b/graphics/object_events/pics/unknown/8398928.png diff --git a/graphics/object_events/pics/unknown/8398BA8.png b/graphics/object_events/pics/unknown/8398BA8.png Binary files differnew file mode 100644 index 000000000..d77d0dfbb --- /dev/null +++ b/graphics/object_events/pics/unknown/8398BA8.png diff --git a/graphics/object_events/pics/unknown/8399008.png b/graphics/object_events/pics/unknown/8399008.png Binary files differnew file mode 100644 index 000000000..95b472557 --- /dev/null +++ b/graphics/object_events/pics/unknown/8399008.png diff --git a/graphics/object_events/pics/unknown/83990C8.png b/graphics/object_events/pics/unknown/83990C8.png Binary files differnew file mode 100644 index 000000000..931eba7d6 --- /dev/null +++ b/graphics/object_events/pics/unknown/83990C8.png diff --git a/graphics/object_events/pics/unknown/8399188.png b/graphics/object_events/pics/unknown/8399188.png Binary files differnew file mode 100644 index 000000000..215d422ec --- /dev/null +++ b/graphics/object_events/pics/unknown/8399188.png diff --git a/graphics/object_events/pics/unknown/8399288.png b/graphics/object_events/pics/unknown/8399288.png Binary files differnew file mode 100644 index 000000000..43765df43 --- /dev/null +++ b/graphics/object_events/pics/unknown/8399288.png diff --git a/graphics/object_events/pics/unknown/8399488.png b/graphics/object_events/pics/unknown/8399488.png Binary files differnew file mode 100644 index 000000000..5ee8decee --- /dev/null +++ b/graphics/object_events/pics/unknown/8399488.png diff --git a/graphics/object_events/pics/unknown/8399788.png b/graphics/object_events/pics/unknown/8399788.png Binary files differnew file mode 100644 index 000000000..5178c54d9 --- /dev/null +++ b/graphics/object_events/pics/unknown/8399788.png diff --git a/graphics/object_events/pics/unknown/8399C08.png b/graphics/object_events/pics/unknown/8399C08.png Binary files differnew file mode 100644 index 000000000..b7a8966ad --- /dev/null +++ b/graphics/object_events/pics/unknown/8399C08.png diff --git a/graphics/object_events/pics/unknown/8399E08.png b/graphics/object_events/pics/unknown/8399E08.png Binary files differnew file mode 100644 index 000000000..dc862d6b7 --- /dev/null +++ b/graphics/object_events/pics/unknown/8399E08.png diff --git a/graphics/object_events/pics/unknown/8399E88.png b/graphics/object_events/pics/unknown/8399E88.png Binary files differnew file mode 100644 index 000000000..d0cc84b83 --- /dev/null +++ b/graphics/object_events/pics/unknown/8399E88.png diff --git a/graphics/object_events/pics/unknown/8399F08.png b/graphics/object_events/pics/unknown/8399F08.png Binary files differnew file mode 100644 index 000000000..adb1a1fba --- /dev/null +++ b/graphics/object_events/pics/unknown/8399F08.png diff --git a/graphics/object_events/pics/unknown/8399F88.png b/graphics/object_events/pics/unknown/8399F88.png Binary files differnew file mode 100644 index 000000000..0209125e8 --- /dev/null +++ b/graphics/object_events/pics/unknown/8399F88.png diff --git a/graphics/object_events/pics/unknown/839A008.png b/graphics/object_events/pics/unknown/839A008.png Binary files differnew file mode 100644 index 000000000..3b79059b1 --- /dev/null +++ b/graphics/object_events/pics/unknown/839A008.png diff --git a/graphics/object_events/pics/unknown/839A288.png b/graphics/object_events/pics/unknown/839A288.png Binary files differnew file mode 100644 index 000000000..99fae019c --- /dev/null +++ b/graphics/object_events/pics/unknown/839A288.png diff --git a/graphics/object_events/pics/unknown/839A388.png b/graphics/object_events/pics/unknown/839A388.png Binary files differnew file mode 100644 index 000000000..3b7170512 --- /dev/null +++ b/graphics/object_events/pics/unknown/839A388.png diff --git a/graphics/object_events/pics/unknown/839A408.png b/graphics/object_events/pics/unknown/839A408.png Binary files differnew file mode 100644 index 000000000..5f260a6fb --- /dev/null +++ b/graphics/object_events/pics/unknown/839A408.png diff --git a/graphics/object_events/pics/unknown/839A488.png b/graphics/object_events/pics/unknown/839A488.png Binary files differnew file mode 100644 index 000000000..ff782e7a8 --- /dev/null +++ b/graphics/object_events/pics/unknown/839A488.png diff --git a/graphics/object_events/pics/unknown/839A508.png b/graphics/object_events/pics/unknown/839A508.png Binary files differnew file mode 100644 index 000000000..c4f247a8c --- /dev/null +++ b/graphics/object_events/pics/unknown/839A508.png diff --git a/graphics/object_events/pics/unknown/839A588.png b/graphics/object_events/pics/unknown/839A588.png Binary files differnew file mode 100644 index 000000000..63edde656 --- /dev/null +++ b/graphics/object_events/pics/unknown/839A588.png diff --git a/graphics/object_events/pics/unknown/839A608.png b/graphics/object_events/pics/unknown/839A608.png Binary files differnew file mode 100644 index 000000000..60008b509 --- /dev/null +++ b/graphics/object_events/pics/unknown/839A608.png diff --git a/graphics/object_events/pics/unknown/839A688.png b/graphics/object_events/pics/unknown/839A688.png Binary files differnew file mode 100644 index 000000000..9ede2749b --- /dev/null +++ b/graphics/object_events/pics/unknown/839A688.png diff --git a/graphics/object_events/pics/unknown/839A708.png b/graphics/object_events/pics/unknown/839A708.png Binary files differnew file mode 100644 index 000000000..e8c55ddfb --- /dev/null +++ b/graphics/object_events/pics/unknown/839A708.png diff --git a/graphics/object_events/pics/unknown/839A788.png b/graphics/object_events/pics/unknown/839A788.png Binary files differnew file mode 100644 index 000000000..a16d93402 --- /dev/null +++ b/graphics/object_events/pics/unknown/839A788.png diff --git a/graphics/object_events/pics/unknown/839A988.png b/graphics/object_events/pics/unknown/839A988.png Binary files differnew file mode 100644 index 000000000..fcd4ed22c --- /dev/null +++ b/graphics/object_events/pics/unknown/839A988.png diff --git a/graphics/object_events/pics/unknown/839AA48.png b/graphics/object_events/pics/unknown/839AA48.png Binary files differnew file mode 100644 index 000000000..369e522ba --- /dev/null +++ b/graphics/object_events/pics/unknown/839AA48.png diff --git a/graphics/object_events/pics/unknown/839AAC8.png b/graphics/object_events/pics/unknown/839AAC8.png Binary files differnew file mode 100644 index 000000000..1e21258d7 --- /dev/null +++ b/graphics/object_events/pics/unknown/839AAC8.png diff --git a/graphics/object_events/pics/unknown/839AB48.png b/graphics/object_events/pics/unknown/839AB48.png Binary files differnew file mode 100644 index 000000000..272bb1319 --- /dev/null +++ b/graphics/object_events/pics/unknown/839AB48.png diff --git a/graphics/object_events/pics/unknown/839ABC8.png b/graphics/object_events/pics/unknown/839ABC8.png Binary files differnew file mode 100644 index 000000000..2a748583f --- /dev/null +++ b/graphics/object_events/pics/unknown/839ABC8.png diff --git a/graphics/object_events/pics/unknown/839AC48.png b/graphics/object_events/pics/unknown/839AC48.png Binary files differnew file mode 100644 index 000000000..4900af580 --- /dev/null +++ b/graphics/object_events/pics/unknown/839AC48.png diff --git a/graphics/object_events/pics/unknown/839AC88.png b/graphics/object_events/pics/unknown/839AC88.png Binary files differnew file mode 100644 index 000000000..b0194c78f --- /dev/null +++ b/graphics/object_events/pics/unknown/839AC88.png diff --git a/graphics/object_events/pics/unknown/839ACC8.png b/graphics/object_events/pics/unknown/839ACC8.png Binary files differnew file mode 100644 index 000000000..adb52f29b --- /dev/null +++ b/graphics/object_events/pics/unknown/839ACC8.png diff --git a/graphics/object_events/pics/unknown/839AD08.png b/graphics/object_events/pics/unknown/839AD08.png Binary files differnew file mode 100644 index 000000000..890068ec3 --- /dev/null +++ b/graphics/object_events/pics/unknown/839AD08.png diff --git a/graphics/object_events/pics/unknown/839AD48.png b/graphics/object_events/pics/unknown/839AD48.png Binary files differnew file mode 100644 index 000000000..8b2fbb553 --- /dev/null +++ b/graphics/object_events/pics/unknown/839AD48.png diff --git a/graphics/object_events/pics/unknown/839AD88.png b/graphics/object_events/pics/unknown/839AD88.png Binary files differnew file mode 100644 index 000000000..7c3fbb7ca --- /dev/null +++ b/graphics/object_events/pics/unknown/839AD88.png diff --git a/graphics/object_events/pics/unknown/839B008.png b/graphics/object_events/pics/unknown/839B008.png Binary files differnew file mode 100644 index 000000000..196adbba4 --- /dev/null +++ b/graphics/object_events/pics/unknown/839B008.png diff --git a/graphics/object_events/pics/unknown/839B708.png b/graphics/object_events/pics/unknown/839B708.png Binary files differnew file mode 100644 index 000000000..06c9e2589 --- /dev/null +++ b/graphics/object_events/pics/unknown/839B708.png diff --git a/graphics/object_events/pics/unknown/839BE08.png b/graphics/object_events/pics/unknown/839BE08.png Binary files differnew file mode 100644 index 000000000..230a4842b --- /dev/null +++ b/graphics/object_events/pics/unknown/839BE08.png diff --git a/graphics/object_events/pics/unknown/839C508.png b/graphics/object_events/pics/unknown/839C508.png Binary files differnew file mode 100644 index 000000000..cf0f22e19 --- /dev/null +++ b/graphics/object_events/pics/unknown/839C508.png diff --git a/graphics/object_events/pics/unknown/839C5A8.png b/graphics/object_events/pics/unknown/839C5A8.png Binary files differnew file mode 100644 index 000000000..53dc362af --- /dev/null +++ b/graphics/object_events/pics/unknown/839C5A8.png diff --git a/graphics/object_events/pics/unknown/839C628.png b/graphics/object_events/pics/unknown/839C628.png Binary files differnew file mode 100644 index 000000000..0217e5a7c --- /dev/null +++ b/graphics/object_events/pics/unknown/839C628.png diff --git a/graphics/object_events/pics/unknown/839C6A8.png b/graphics/object_events/pics/unknown/839C6A8.png Binary files differnew file mode 100644 index 000000000..830497ee8 --- /dev/null +++ b/graphics/object_events/pics/unknown/839C6A8.png diff --git a/graphics/object_events/pics/unknown/839C728.png b/graphics/object_events/pics/unknown/839C728.png Binary files differnew file mode 100644 index 000000000..bea1171fc --- /dev/null +++ b/graphics/object_events/pics/unknown/839C728.png diff --git a/graphics/object_events/pics/unknown/839C7A8.png b/graphics/object_events/pics/unknown/839C7A8.png Binary files differnew file mode 100644 index 000000000..ecc4aae1a --- /dev/null +++ b/graphics/object_events/pics/unknown/839C7A8.png diff --git a/graphics/object_events/pics/unknown/839C828.png b/graphics/object_events/pics/unknown/839C828.png Binary files differnew file mode 100644 index 000000000..daf690bc6 --- /dev/null +++ b/graphics/object_events/pics/unknown/839C828.png diff --git a/graphics/object_events/pics/unknown/839C8A8.png b/graphics/object_events/pics/unknown/839C8A8.png Binary files differnew file mode 100644 index 000000000..e6e4495d9 --- /dev/null +++ b/graphics/object_events/pics/unknown/839C8A8.png diff --git a/graphics/object_events/pics/unknown/839C928.png b/graphics/object_events/pics/unknown/839C928.png Binary files differnew file mode 100644 index 000000000..3252c12f8 --- /dev/null +++ b/graphics/object_events/pics/unknown/839C928.png diff --git a/graphics/object_events/pics/unknown/839C9A8.png b/graphics/object_events/pics/unknown/839C9A8.png Binary files differnew file mode 100644 index 000000000..8461222d3 --- /dev/null +++ b/graphics/object_events/pics/unknown/839C9A8.png diff --git a/graphics/object_events/pics/unknown/839CA28.png b/graphics/object_events/pics/unknown/839CA28.png Binary files differnew file mode 100644 index 000000000..691427c8f --- /dev/null +++ b/graphics/object_events/pics/unknown/839CA28.png diff --git a/graphics/object_events/pics/unknown/839CAA8.png b/graphics/object_events/pics/unknown/839CAA8.png Binary files differnew file mode 100644 index 000000000..c0abb16b7 --- /dev/null +++ b/graphics/object_events/pics/unknown/839CAA8.png diff --git a/graphics/object_events/pics/unknown/839CBA8.png b/graphics/object_events/pics/unknown/839CBA8.png Binary files differnew file mode 100644 index 000000000..e7dc7746e --- /dev/null +++ b/graphics/object_events/pics/unknown/839CBA8.png diff --git a/graphics/object_events/pics/unknown/839CCA8.png b/graphics/object_events/pics/unknown/839CCA8.png Binary files differnew file mode 100644 index 000000000..d702ef9cd --- /dev/null +++ b/graphics/object_events/pics/unknown/839CCA8.png diff --git a/graphics/object_events/pics/unknown/839CDA8.png b/graphics/object_events/pics/unknown/839CDA8.png Binary files differnew file mode 100644 index 000000000..e0c2c531f --- /dev/null +++ b/graphics/object_events/pics/unknown/839CDA8.png diff --git a/graphics/object_events/pics/unknown/839CEA8.png b/graphics/object_events/pics/unknown/839CEA8.png Binary files differnew file mode 100644 index 000000000..778a4ee24 --- /dev/null +++ b/graphics/object_events/pics/unknown/839CEA8.png diff --git a/graphics/object_events/pics/unknown/839CFA8.png b/graphics/object_events/pics/unknown/839CFA8.png Binary files differnew file mode 100644 index 000000000..14b409734 --- /dev/null +++ b/graphics/object_events/pics/unknown/839CFA8.png diff --git a/graphics/object_events/pics/unknown/839D0A8.png b/graphics/object_events/pics/unknown/839D0A8.png Binary files differnew file mode 100644 index 000000000..5691f1333 --- /dev/null +++ b/graphics/object_events/pics/unknown/839D0A8.png diff --git a/graphics/object_events/pics/unknown/839D1A8.png b/graphics/object_events/pics/unknown/839D1A8.png Binary files differnew file mode 100644 index 000000000..8f2ddd84c --- /dev/null +++ b/graphics/object_events/pics/unknown/839D1A8.png diff --git a/graphics/object_events/pics/unknown/839D2A8.png b/graphics/object_events/pics/unknown/839D2A8.png Binary files differnew file mode 100644 index 000000000..b46950eb0 --- /dev/null +++ b/graphics/object_events/pics/unknown/839D2A8.png diff --git a/graphics/object_events/pics/unknown/839D328.png b/graphics/object_events/pics/unknown/839D328.png Binary files differnew file mode 100644 index 000000000..d0afd946b --- /dev/null +++ b/graphics/object_events/pics/unknown/839D328.png diff --git a/graphics/object_events/pics/unknown/839D3C8.png b/graphics/object_events/pics/unknown/839D3C8.png Binary files differnew file mode 100644 index 000000000..1e9a0bbc2 --- /dev/null +++ b/graphics/object_events/pics/unknown/839D3C8.png diff --git a/graphics/map_objects/unk_396B08.png b/graphics/object_events/unk_396B08.png Binary files differindex ae2222d45..ae2222d45 100644 --- a/graphics/map_objects/unk_396B08.png +++ b/graphics/object_events/unk_396B08.png diff --git a/graphics/map_objects/unk_835B988.pal b/graphics/object_events/unk_835B988.pal index 27436be92..27436be92 100644 --- a/graphics/map_objects/unk_835B988.pal +++ b/graphics/object_events/unk_835B988.pal diff --git a/graphics/map_objects/unk_8369F28.png b/graphics/object_events/unk_8369F28.png Binary files differindex e01e3ea8e..e01e3ea8e 100644 --- a/graphics/map_objects/unk_8369F28.png +++ b/graphics/object_events/unk_8369F28.png diff --git a/graphics/map_objects/unk_8372AA8.png b/graphics/object_events/unk_8372AA8.png Binary files differindex 36f112e85..36f112e85 100644 --- a/graphics/map_objects/unk_8372AA8.png +++ b/graphics/object_events/unk_8372AA8.png diff --git a/graphics/map_objects/unk_838D5A8.png b/graphics/object_events/unk_838D5A8.png Binary files differindex bb0ca5d34..bb0ca5d34 100644 --- a/graphics/map_objects/unk_838D5A8.png +++ b/graphics/object_events/unk_838D5A8.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 81f8d8d42..57fcb3c2e 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -526,10 +526,10 @@ $(POKEDEXAREAMARKERSDATADIR)/marker.4bpp: $(POKEDEXAREAMARKERFILES) graphics/pokemon/heracross/unk_icon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -graphics/map_objects/151.4bpp: %.4bpp: %.png +graphics/object_events/151.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 4 -graphics/map_objects/emoticons.4bpp: %.4bpp: %.png +graphics/object_events/emoticons.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 $(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png diff --git a/include/berry.h b/include/berry.h index d55192301..5bf272d42 100644 --- a/include/berry.h +++ b/include/berry.h @@ -25,7 +25,7 @@ enum #define NUM_BERRIES 44 -extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES]; +extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[NUM_BERRIES]; extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[NUM_BERRIES]; extern const u8 *const gBerryTreePaletteSlotTablePointers[NUM_BERRIES]; @@ -35,7 +35,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); -bool32 FieldObjectInteractionWaterBerryTree(void); +bool32 ObjectEventInteractionWaterBerryTree(void); bool8 IsPlayerFacingPlantedBerryTree(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -56,10 +56,10 @@ u8 CalcBerryYield(struct BerryTree *tree); u8 GetBerryCountByBerryTreeId(u8 id); u16 GetStageDurationByBerryType(u8); void Bag_ChooseBerry(void); -void FieldObjectInteractionGetBerryTreeData(void); -void FieldObjectInteractionPlantBerryTree(void); -void FieldObjectInteractionPickBerryTree(void); -void FieldObjectInteractionRemoveBerryTree(void); +void ObjectEventInteractionGetBerryTreeData(void); +void ObjectEventInteractionPlantBerryTree(void); +void ObjectEventInteractionPickBerryTree(void); +void ObjectEventInteractionRemoveBerryTree(void); u8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); void sub_809C794(void); diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h new file mode 100644 index 000000000..6a4405b65 --- /dev/null +++ b/include/constants/event_object_movement.h @@ -0,0 +1,247 @@ +#ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H +#define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H + +#define MOVEMENT_TYPE_NONE 0x0 +#define MOVEMENT_TYPE_LOOK_AROUND 0x1 +#define MOVEMENT_TYPE_WANDER_AROUND 0x2 +#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 +#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 +#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 +#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 +#define MOVEMENT_TYPE_FACE_UP 0x7 +#define MOVEMENT_TYPE_FACE_DOWN 0x8 +#define MOVEMENT_TYPE_FACE_LEFT 0x9 +#define MOVEMENT_TYPE_FACE_RIGHT 0xA +#define MOVEMENT_TYPE_PLAYER 0xB +#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC +#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD +#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE +#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF +#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 +#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 +#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 +#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 +#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 +#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 +#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 +#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 +#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A +#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B +#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 +#define MOVEMENT_TYPE_COPY_PLAYER 0x35 +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 +#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 +#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A +#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E +#define MOVEMENT_TYPE_HIDDEN 0x3F +#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 +#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 +#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 +#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 +#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 +#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 +#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 +#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 +#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 +#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 +#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A +#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B +#define MOVEMENT_TYPE_INVISIBLE 0x4C +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x4D +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x4E +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x4F +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x50 + +#define MOVEMENT_ACTION_FACE_DOWN 0x0 +#define MOVEMENT_ACTION_FACE_UP 0x1 +#define MOVEMENT_ACTION_FACE_LEFT 0x2 +#define MOVEMENT_ACTION_FACE_RIGHT 0x3 +#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 +#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 +#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 +#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 +#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 +#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA +#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB +#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC +#define MOVEMENT_ACTION_JUMP_2_UP 0xD +#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE +#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF +#define MOVEMENT_ACTION_DELAY_1 0x10 +#define MOVEMENT_ACTION_DELAY_2 0x11 +#define MOVEMENT_ACTION_DELAY_4 0x12 +#define MOVEMENT_ACTION_DELAY_8 0x13 +#define MOVEMENT_ACTION_DELAY_16 0x14 +#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 +#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 +#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 +#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C +#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E +#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 +#define MOVEMENT_ACTION_SLIDE_UP 0x32 +#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 +#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 +#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 +#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 +#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A +#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B +#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C +#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D +#define MOVEMENT_ACTION_FACE_PLAYER 0x3E +#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F +#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 +#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 +#define MOVEMENT_ACTION_JUMP_DOWN 0x42 +#define MOVEMENT_ACTION_JUMP_UP 0x43 +#define MOVEMENT_ACTION_JUMP_LEFT 0x44 +#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D +#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E +#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F +#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 +#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 +#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 +#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 +#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 +#define MOVEMENT_ACTION_SET_VISIBLE 0x55 +#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 +#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 +#define MOVEMENT_ACTION_EMOTE_HEART 0x58 +#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 +#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A +#define MOVEMENT_ACTION_CUT_TREE 0x5B +#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C +#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D +#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E +#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F +#define MOVEMENT_ACTION_HIDE_REFLECTION 0x60 +#define MOVEMENT_ACTION_SHOW_REFLECTION 0x61 +#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x62 +#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x63 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x64 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x65 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x66 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x67 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x68 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x69 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x6A +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x6B +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6C +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6D +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6E +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6F +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x70 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x71 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x72 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x73 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x74 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x75 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x76 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x77 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x78 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x79 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x7A +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x7B +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7C +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7D +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7E +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7F +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x80 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x81 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x82 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x83 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x84 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x85 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x86 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x87 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x88 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x89 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x8A +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x8B +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT 0x8C +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT 0x8D +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT 0x8E +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x8F +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT 0x90 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT 0x91 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT 0x92 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT 0x93 +#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM 0x94 +#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM 0x95 +#define MOVEMENT_ACTION_WALK_LEFT_AFFINE 0x96 +#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE 0x97 +#define MOVEMENT_ACTION_LEVITATE 0x98 +#define MOVEMENT_ACTION_STOP_LEVITATE 0x99 +#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP 0x9A +#define MOVEMENT_ACTION_FIGURE_8 0x9B +#define MOVEMENT_ACTION_FLY_UP 0x9C +#define MOVEMENT_ACTION_FLY_DOWN 0x9D + +#define MOVEMENT_ACTION_STEP_END 0xFE + +#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/constants/flags.h b/include/constants/flags.h index bd356064c..8e7a6a694 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1310,7 +1310,8 @@ #define FLAG_TRAINER_FLAG_START 0x500 // Vanilla: SYS_FLAGS = 0x800 -#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + ((NUM_TRAINERS) + 31) / 32 * 32) +//#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + ((NUM_TRAINERS) + 31) / 32 * 32) +#define SYS_FLAGS 0x800 // SYSTEM FLAGS diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h deleted file mode 100644 index 39c8871e1..000000000 --- a/include/constants/map_objects.h +++ /dev/null @@ -1,186 +0,0 @@ -#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H -#define GUARD_CONSTANTS_MAP_OBJECTS_H - -#define MAP_OBJ_GFX_RED_NORMAL 0 -#define MAP_OBJ_GFX_RED_BIKE 1 -#define MAP_OBJ_GFX_RED_RUN 2 -#define MAP_OBJ_GFX_RED_ITEM 3 -#define MAP_OBJ_GFX_RED_FISH 4 -#define MAP_OBJ_GFX_RED_ITEM_COPY 5 -#define MAP_OBJ_GFX_RED_VS_SEEKER 6 -#define MAP_OBJ_GFX_GREEN_NORMAL 7 -#define MAP_OBJ_GFX_GREEN_BIKE 8 -#define MAP_OBJ_GFX_GREEN_RUN 9 -#define MAP_OBJ_GFX_GREEN_ITEM 10 -#define MAP_OBJ_GFX_GREEN_FISH 11 -#define MAP_OBJ_GFX_GREEN_ITEM_COPY 12 -#define MAP_OBJ_GFX_GREEN_VS_SEEKER 13 -#define MAP_OBJ_GFX_RS_BRENDAN 14 -#define MAP_OBJ_GFX_RS_MAY 15 -#define MAP_OBJ_GFX_LITTLE_BOY 16 -#define MAP_OBJ_GFX_LITTLE_GIRL 17 -#define MAP_OBJ_GFX_YOUNGSTER 18 -#define MAP_OBJ_GFX_BOY 19 -#define MAP_OBJ_GFX_BUG_CATCHER 20 -#define MAP_OBJ_GFX_SITTING_BOY 21 -#define MAP_OBJ_GFX_LASS 22 -#define MAP_OBJ_GFX_WOMAN_1 23 -#define MAP_OBJ_GFX_BATTLE_GIRL 24 -#define MAP_OBJ_GFX_MAN 25 -#define MAP_OBJ_GFX_ROCKER 26 -#define MAP_OBJ_GFX_FAT_MAN 27 -#define MAP_OBJ_GFX_WOMAN_2 28 -#define MAP_OBJ_GFX_BEAUTY 29 -#define MAP_OBJ_GFX_BALDING_MAN 30 -#define MAP_OBJ_GFX_WOMAN_3 31 -#define MAP_OBJ_GFX_OLD_MAN_1 32 -#define MAP_OBJ_GFX_OLD_MAN_2 33 -#define MAP_OBJ_GFX_VIRIDIAN_DRUNK 34 -#define MAP_OBJ_GFX_OLD_WOMAN 35 -#define MAP_OBJ_GFX_TUBER_M_1 36 -#define MAP_OBJ_GFX_TUBER_F 37 -#define MAP_OBJ_GFX_TUBER_M_2 38 -#define MAP_OBJ_GFX_CAMPER 39 -#define MAP_OBJ_GFX_PICNICKER 40 -#define MAP_OBJ_GFX_COOLTRAINER_M 41 -#define MAP_OBJ_GFX_COOLTRAINER_F 42 -#define MAP_OBJ_GFX_SWIMMER_M_WATER 43 -#define MAP_OBJ_GFX_SWIMMER_F_WATER 44 -#define MAP_OBJ_GFX_SWIMMER_M_LAND 45 -#define MAP_OBJ_GFX_SWIMMER_F_LAND 46 -#define MAP_OBJ_GFX_WORKER_M 47 -#define MAP_OBJ_GFX_WORKER_F 48 -#define MAP_OBJ_GFX_ROCKET_M 49 -#define MAP_OBJ_GFX_ROCKET_F 50 -#define MAP_OBJ_GFX_GBA_KID 51 -#define MAP_OBJ_GFX_SUPER_NERD 52 -#define MAP_OBJ_GFX_BIKER 53 -#define MAP_OBJ_GFX_BLACKBELT 54 -#define MAP_OBJ_GFX_SCIENTIST 55 -#define MAP_OBJ_GFX_HIKER 56 -#define MAP_OBJ_GFX_FISHER 57 -#define MAP_OBJ_GFX_CHANNELER 58 -#define MAP_OBJ_GFX_CHEF 59 -#define MAP_OBJ_GFX_POLICEMAN 60 -#define MAP_OBJ_GFX_GENTLEMAN 61 -#define MAP_OBJ_GFX_SAILOR 62 -#define MAP_OBJ_GFX_CAPTAIN 63 -#define MAP_OBJ_GFX_NURSE 64 -#define MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST 65 -#define MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST 66 -#define MAP_OBJ_GFX_UNUSED_MALE_RECEPTIONIST 67 -#define MAP_OBJ_GFX_CLERK 68 -#define MAP_OBJ_GFX_MG_DELIVERYMAN 69 -#define MAP_OBJ_GFX_TRAINER_TOWER_DUDE 70 -#define MAP_OBJ_GFX_PROF_OAK 71 -#define MAP_OBJ_GFX_BLUE 72 -#define MAP_OBJ_GFX_BILL 73 -#define MAP_OBJ_GFX_LANCE 74 -#define MAP_OBJ_GFX_AGATHA 75 -#define MAP_OBJ_GFX_DAISY 76 -#define MAP_OBJ_GFX_LORELEI 77 -#define MAP_OBJ_GFX_MR_FUJI 78 -#define MAP_OBJ_GFX_BRUNO 79 -#define MAP_OBJ_GFX_BROCK 80 -#define MAP_OBJ_GFX_MISTY 81 -#define MAP_OBJ_GFX_LT_SURGE 82 -#define MAP_OBJ_GFX_ERIKA 83 -#define MAP_OBJ_GFX_KOGA 84 -#define MAP_OBJ_GFX_SABRINA 85 -#define MAP_OBJ_GFX_BLAINE 86 -#define MAP_OBJ_GFX_GIOVANNI 87 -#define MAP_OBJ_GFX_MOM 88 -#define MAP_OBJ_GFX_CELIO 89 -#define MAP_OBJ_GFX_TEACHY_TV_HOST 90 -#define MAP_OBJ_GFX_GYM_GUY 91 -#define MAP_OBJ_GFX_ITEM_BALL 92 -#define MAP_OBJ_GFX_TOWN_MAP 93 -#define MAP_OBJ_GFX_POKEDEX 94 -#define MAP_OBJ_GFX_CUT_TREE 95 -#define MAP_OBJ_GFX_ROCK_SMASH_ROCK 96 -#define MAP_OBJ_GFX_STRENGTH_BOULDER 97 -#define MAP_OBJ_GFX_FOSSIL 98 -#define MAP_OBJ_GFX_RUBY 99 -#define MAP_OBJ_GFX_SAPPHIRE 100 -#define MAP_OBJ_GFX_OLD_AMBER 101 -#define MAP_OBJ_GFX_GYM_SIGN 102 -#define MAP_OBJ_GFX_SIGN 103 -#define MAP_OBJ_GFX_TRAINER_TIPS 104 -#define MAP_OBJ_GFX_CLIPBOARD 105 -#define MAP_OBJ_GFX_METEORITE 106 -#define MAP_OBJ_GFX_LAPRAS_DOLL 107 -#define MAP_OBJ_GFX_SEAGALLOP 108 -#define MAP_OBJ_GFX_SNORLAX 109 -#define MAP_OBJ_GFX_SPEAROW 110 -#define MAP_OBJ_GFX_CUBONE 111 -#define MAP_OBJ_GFX_POLIWRATH 112 -#define MAP_OBJ_GFX_CLEFAIRY 113 -#define MAP_OBJ_GFX_PIDGEOT 114 -#define MAP_OBJ_GFX_JIGGLYPUFF 115 -#define MAP_OBJ_GFX_PIDGEY 116 -#define MAP_OBJ_GFX_CHANSEY 117 -#define MAP_OBJ_GFX_OMANYTE 118 -#define MAP_OBJ_GFX_KANGASKHAN 119 -#define MAP_OBJ_GFX_PIKACHU 120 -#define MAP_OBJ_GFX_PSYDUCK 121 -#define MAP_OBJ_GFX_NIDORAN_F 122 -#define MAP_OBJ_GFX_NIDORAN_M 123 -#define MAP_OBJ_GFX_NIDORINO 124 -#define MAP_OBJ_GFX_MEOWTH 125 -#define MAP_OBJ_GFX_SEEL 126 -#define MAP_OBJ_GFX_VOLTORB 127 -#define MAP_OBJ_GFX_SLOWPOKE 128 -#define MAP_OBJ_GFX_SLOWBRO 129 -#define MAP_OBJ_GFX_MACHOP 130 -#define MAP_OBJ_GFX_WIGGLYTUFF 131 -#define MAP_OBJ_GFX_DODUO 132 -#define MAP_OBJ_GFX_FEAROW 133 -#define MAP_OBJ_GFX_MACHOKE 134 -#define MAP_OBJ_GFX_LAPRAS 135 -#define MAP_OBJ_GFX_ZAPDOS 136 -#define MAP_OBJ_GFX_MOLTRES 137 -#define MAP_OBJ_GFX_ARTICUNO 138 -#define MAP_OBJ_GFX_MEWTWO 139 -#define MAP_OBJ_GFX_MEW 140 -#define MAP_OBJ_GFX_ENTEI 141 -#define MAP_OBJ_GFX_SUICUNE 142 -#define MAP_OBJ_GFX_RAIKOU 143 -#define MAP_OBJ_GFX_LUGIA 144 -#define MAP_OBJ_GFX_HO_OH 145 -#define MAP_OBJ_GFX_CELEBI 146 -#define MAP_OBJ_GFX_KABUTO 147 -#define MAP_OBJ_GFX_DEOXYS_D 148 -#define MAP_OBJ_GFX_DEOXYS_A 149 -#define MAP_OBJ_GFX_DEOXYS_N 150 -#define MAP_OBJ_GFX_SS_ANNE 151 - -#define MAP_OBJ_GFX_VAR_0 240 -#define MAP_OBJ_GFX_VAR_1 241 -#define MAP_OBJ_GFX_VAR_2 242 -#define MAP_OBJ_GFX_VAR_3 243 -#define MAP_OBJ_GFX_VAR_4 244 -#define MAP_OBJ_GFX_VAR_5 245 -#define MAP_OBJ_GFX_VAR_6 246 -#define MAP_OBJ_GFX_VAR_7 247 -#define MAP_OBJ_GFX_VAR_8 248 -#define MAP_OBJ_GFX_VAR_9 249 -#define MAP_OBJ_GFX_VAR_A 250 -#define MAP_OBJ_GFX_VAR_B 251 -#define MAP_OBJ_GFX_VAR_C 252 -#define MAP_OBJ_GFX_VAR_D 253 -#define MAP_OBJ_GFX_VAR_E 254 -#define MAP_OBJ_GFX_VAR_F 255 - -#define SHADOW_SIZE_S 0 -#define SHADOW_SIZE_M 1 -#define SHADOW_SIZE_L 2 -#define SHADOW_SIZE_XL 3 - -#define F_INANIMATE (1 << 6) -#define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7) - -#define TRACKS_NONE 0 -#define TRACKS_FOOT 1 -#define TRACKS_BIKE_TIRE 2 - -#endif // GUARD_CONSTANTS_MAP_OBJECTS_H diff --git a/include/constants/object_events.h b/include/constants/object_events.h new file mode 100644 index 000000000..c1793827e --- /dev/null +++ b/include/constants/object_events.h @@ -0,0 +1,186 @@ +#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H +#define GUARD_CONSTANTS_MAP_OBJECTS_H + +#define OBJECT_EVENT_GFX_RED_NORMAL 0 +#define OBJECT_EVENT_GFX_RED_BIKE 1 +#define OBJECT_EVENT_GFX_RED_RUN 2 +#define OBJECT_EVENT_GFX_RED_ITEM 3 +#define OBJECT_EVENT_GFX_RED_FISH 4 +#define OBJECT_EVENT_GFX_RED_ITEM_COPY 5 +#define OBJECT_EVENT_GFX_RED_VS_SEEKER 6 +#define OBJECT_EVENT_GFX_GREEN_NORMAL 7 +#define OBJECT_EVENT_GFX_GREEN_BIKE 8 +#define OBJECT_EVENT_GFX_GREEN_RUN 9 +#define OBJECT_EVENT_GFX_GREEN_ITEM 10 +#define OBJECT_EVENT_GFX_GREEN_FISH 11 +#define OBJECT_EVENT_GFX_GREEN_ITEM_COPY 12 +#define OBJECT_EVENT_GFX_GREEN_VS_SEEKER 13 +#define OBJECT_EVENT_GFX_RS_BRENDAN 14 +#define OBJECT_EVENT_GFX_RS_MAY 15 +#define OBJECT_EVENT_GFX_LITTLE_BOY 16 +#define OBJECT_EVENT_GFX_LITTLE_GIRL 17 +#define OBJECT_EVENT_GFX_YOUNGSTER 18 +#define OBJECT_EVENT_GFX_BOY 19 +#define OBJECT_EVENT_GFX_BUG_CATCHER 20 +#define OBJECT_EVENT_GFX_SITTING_BOY 21 +#define OBJECT_EVENT_GFX_LASS 22 +#define OBJECT_EVENT_GFX_WOMAN_1 23 +#define OBJECT_EVENT_GFX_BATTLE_GIRL 24 +#define OBJECT_EVENT_GFX_MAN 25 +#define OBJECT_EVENT_GFX_ROCKER 26 +#define OBJECT_EVENT_GFX_FAT_MAN 27 +#define OBJECT_EVENT_GFX_WOMAN_2 28 +#define OBJECT_EVENT_GFX_BEAUTY 29 +#define OBJECT_EVENT_GFX_BALDING_MAN 30 +#define OBJECT_EVENT_GFX_WOMAN_3 31 +#define OBJECT_EVENT_GFX_OLD_MAN_1 32 +#define OBJECT_EVENT_GFX_OLD_MAN_2 33 +#define OBJECT_EVENT_GFX_VIRIDIAN_DRUNK 34 +#define OBJECT_EVENT_GFX_OLD_WOMAN 35 +#define OBJECT_EVENT_GFX_TUBER_M_1 36 +#define OBJECT_EVENT_GFX_TUBER_F 37 +#define OBJECT_EVENT_GFX_TUBER_M_2 38 +#define OBJECT_EVENT_GFX_CAMPER 39 +#define OBJECT_EVENT_GFX_PICNICKER 40 +#define OBJECT_EVENT_GFX_COOLTRAINER_M 41 +#define OBJECT_EVENT_GFX_COOLTRAINER_F 42 +#define OBJECT_EVENT_GFX_SWIMMER_M_WATER 43 +#define OBJECT_EVENT_GFX_SWIMMER_F_WATER 44 +#define OBJECT_EVENT_GFX_SWIMMER_M_LAND 45 +#define OBJECT_EVENT_GFX_SWIMMER_F_LAND 46 +#define OBJECT_EVENT_GFX_WORKER_M 47 +#define OBJECT_EVENT_GFX_WORKER_F 48 +#define OBJECT_EVENT_GFX_ROCKET_M 49 +#define OBJECT_EVENT_GFX_ROCKET_F 50 +#define OBJECT_EVENT_GFX_GBA_KID 51 +#define OBJECT_EVENT_GFX_SUPER_NERD 52 +#define OBJECT_EVENT_GFX_BIKER 53 +#define OBJECT_EVENT_GFX_BLACKBELT 54 +#define OBJECT_EVENT_GFX_SCIENTIST 55 +#define OBJECT_EVENT_GFX_HIKER 56 +#define OBJECT_EVENT_GFX_FISHER 57 +#define OBJECT_EVENT_GFX_CHANNELER 58 +#define OBJECT_EVENT_GFX_CHEF 59 +#define OBJECT_EVENT_GFX_POLICEMAN 60 +#define OBJECT_EVENT_GFX_GENTLEMAN 61 +#define OBJECT_EVENT_GFX_SAILOR 62 +#define OBJECT_EVENT_GFX_CAPTAIN 63 +#define OBJECT_EVENT_GFX_NURSE 64 +#define OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST 65 +#define OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST 66 +#define OBJECT_EVENT_GFX_UNUSED_MALE_RECEPTIONIST 67 +#define OBJECT_EVENT_GFX_CLERK 68 +#define OBJECT_EVENT_GFX_MG_DELIVERYMAN 69 +#define OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE 70 +#define OBJECT_EVENT_GFX_PROF_OAK 71 +#define OBJECT_EVENT_GFX_BLUE 72 +#define OBJECT_EVENT_GFX_BILL 73 +#define OBJECT_EVENT_GFX_LANCE 74 +#define OBJECT_EVENT_GFX_AGATHA 75 +#define OBJECT_EVENT_GFX_DAISY 76 +#define OBJECT_EVENT_GFX_LORELEI 77 +#define OBJECT_EVENT_GFX_MR_FUJI 78 +#define OBJECT_EVENT_GFX_BRUNO 79 +#define OBJECT_EVENT_GFX_BROCK 80 +#define OBJECT_EVENT_GFX_MISTY 81 +#define OBJECT_EVENT_GFX_LT_SURGE 82 +#define OBJECT_EVENT_GFX_ERIKA 83 +#define OBJECT_EVENT_GFX_KOGA 84 +#define OBJECT_EVENT_GFX_SABRINA 85 +#define OBJECT_EVENT_GFX_BLAINE 86 +#define OBJECT_EVENT_GFX_GIOVANNI 87 +#define OBJECT_EVENT_GFX_MOM 88 +#define OBJECT_EVENT_GFX_CELIO 89 +#define OBJECT_EVENT_GFX_TEACHY_TV_HOST 90 +#define OBJECT_EVENT_GFX_GYM_GUY 91 +#define OBJECT_EVENT_GFX_ITEM_BALL 92 +#define OBJECT_EVENT_GFX_TOWN_MAP 93 +#define OBJECT_EVENT_GFX_POKEDEX 94 +#define OBJECT_EVENT_GFX_CUT_TREE 95 +#define OBJECT_EVENT_GFX_ROCK_SMASH_ROCK 96 +#define OBJECT_EVENT_GFX_STRENGTH_BOULDER 97 +#define OBJECT_EVENT_GFX_FOSSIL 98 +#define OBJECT_EVENT_GFX_RUBY 99 +#define OBJECT_EVENT_GFX_SAPPHIRE 100 +#define OBJECT_EVENT_GFX_OLD_AMBER 101 +#define OBJECT_EVENT_GFX_GYM_SIGN 102 +#define OBJECT_EVENT_GFX_SIGN 103 +#define OBJECT_EVENT_GFX_TRAINER_TIPS 104 +#define OBJECT_EVENT_GFX_CLIPBOARD 105 +#define OBJECT_EVENT_GFX_METEORITE 106 +#define OBJECT_EVENT_GFX_LAPRAS_DOLL 107 +#define OBJECT_EVENT_GFX_SEAGALLOP 108 +#define OBJECT_EVENT_GFX_SNORLAX 109 +#define OBJECT_EVENT_GFX_SPEAROW 110 +#define OBJECT_EVENT_GFX_CUBONE 111 +#define OBJECT_EVENT_GFX_POLIWRATH 112 +#define OBJECT_EVENT_GFX_CLEFAIRY 113 +#define OBJECT_EVENT_GFX_PIDGEOT 114 +#define OBJECT_EVENT_GFX_JIGGLYPUFF 115 +#define OBJECT_EVENT_GFX_PIDGEY 116 +#define OBJECT_EVENT_GFX_CHANSEY 117 +#define OBJECT_EVENT_GFX_OMANYTE 118 +#define OBJECT_EVENT_GFX_KANGASKHAN 119 +#define OBJECT_EVENT_GFX_PIKACHU 120 +#define OBJECT_EVENT_GFX_PSYDUCK 121 +#define OBJECT_EVENT_GFX_NIDORAN_F 122 +#define OBJECT_EVENT_GFX_NIDORAN_M 123 +#define OBJECT_EVENT_GFX_NIDORINO 124 +#define OBJECT_EVENT_GFX_MEOWTH 125 +#define OBJECT_EVENT_GFX_SEEL 126 +#define OBJECT_EVENT_GFX_VOLTORB 127 +#define OBJECT_EVENT_GFX_SLOWPOKE 128 +#define OBJECT_EVENT_GFX_SLOWBRO 129 +#define OBJECT_EVENT_GFX_MACHOP 130 +#define OBJECT_EVENT_GFX_WIGGLYTUFF 131 +#define OBJECT_EVENT_GFX_DODUO 132 +#define OBJECT_EVENT_GFX_FEAROW 133 +#define OBJECT_EVENT_GFX_MACHOKE 134 +#define OBJECT_EVENT_GFX_LAPRAS 135 +#define OBJECT_EVENT_GFX_ZAPDOS 136 +#define OBJECT_EVENT_GFX_MOLTRES 137 +#define OBJECT_EVENT_GFX_ARTICUNO 138 +#define OBJECT_EVENT_GFX_MEWTWO 139 +#define OBJECT_EVENT_GFX_MEW 140 +#define OBJECT_EVENT_GFX_ENTEI 141 +#define OBJECT_EVENT_GFX_SUICUNE 142 +#define OBJECT_EVENT_GFX_RAIKOU 143 +#define OBJECT_EVENT_GFX_LUGIA 144 +#define OBJECT_EVENT_GFX_HO_OH 145 +#define OBJECT_EVENT_GFX_CELEBI 146 +#define OBJECT_EVENT_GFX_KABUTO 147 +#define OBJECT_EVENT_GFX_DEOXYS_D 148 +#define OBJECT_EVENT_GFX_DEOXYS_A 149 +#define OBJECT_EVENT_GFX_DEOXYS_N 150 +#define OBJECT_EVENT_GFX_SS_ANNE 151 + +#define OBJECT_EVENT_GFX_VAR_0 240 +#define OBJECT_EVENT_GFX_VAR_1 241 +#define OBJECT_EVENT_GFX_VAR_2 242 +#define OBJECT_EVENT_GFX_VAR_3 243 +#define OBJECT_EVENT_GFX_VAR_4 244 +#define OBJECT_EVENT_GFX_VAR_5 245 +#define OBJECT_EVENT_GFX_VAR_6 246 +#define OBJECT_EVENT_GFX_VAR_7 247 +#define OBJECT_EVENT_GFX_VAR_8 248 +#define OBJECT_EVENT_GFX_VAR_9 249 +#define OBJECT_EVENT_GFX_VAR_A 250 +#define OBJECT_EVENT_GFX_VAR_B 251 +#define OBJECT_EVENT_GFX_VAR_C 252 +#define OBJECT_EVENT_GFX_VAR_D 253 +#define OBJECT_EVENT_GFX_VAR_E 254 +#define OBJECT_EVENT_GFX_VAR_F 255 + +#define SHADOW_SIZE_S 0 +#define SHADOW_SIZE_M 1 +#define SHADOW_SIZE_L 2 +#define SHADOW_SIZE_XL 3 + +#define F_INANIMATE (1 << 6) +#define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7) + +#define TRACKS_NONE 0 +#define TRACKS_FOOT 1 +#define TRACKS_BIKE_TIRE 2 + +#endif // GUARD_CONSTANTS_MAP_OBJECTS_H diff --git a/include/event_data.h b/include/event_data.h index 719ba37b2..7987720f1 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -46,7 +46,7 @@ bool32 CanResetRTC(void); u16 *GetVarPointer(u16 id); u16 VarGet(u16 id); bool8 VarSet(u16 id, u16 value); -u8 VarGetFieldObjectGraphicsId(u8 id); +u8 VarGetObjectEventGraphicsId(u8 id); u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); diff --git a/include/event_object_80688E4.h b/include/event_object_80688E4.h new file mode 100644 index 000000000..cee8ff707 --- /dev/null +++ b/include/event_object_80688E4.h @@ -0,0 +1,10 @@ +#ifndef GUARD_EVENT_OBJECT_80688E4_H +#define GUARD_EVENT_OBJECT_80688E4_H + +#include "global.h" + +void FreezeObjectEvents(void); +void FreezeObjectEvent(struct ObjectEvent *); +void FreezeObjectEventsExceptOne(u8 objEventId); + +#endif // GUARD_EVENT_OBJECT_80688E4_H diff --git a/include/map_obj_8097404.h b/include/event_object_8097404.h index ad90bed9c..77781943e 100644 --- a/include/map_obj_8097404.h +++ b/include/event_object_8097404.h @@ -2,8 +2,8 @@ // Created by scott on 9/7/2017. // -#ifndef GUARD_MAP_OBJ_8097404_H -#define GUARD_MAP_OBJ_8097404_H +#ifndef GUARD_EVENT_OBJECT_8097404_H +#define GUARD_EVENT_OBJECT_8097404_H #include "global.h" @@ -14,21 +14,21 @@ extern void *gUnknown_020375B8; // Exported ROM declarations void sub_8097AC8(struct Sprite *); -void npc_sync_anim_pause_bits(struct MapObject *); +void npc_sync_anim_pause_bits(struct ObjectEvent *); void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -u8 sub_8097F78(struct MapObject *); +u8 sub_8097F78(struct ObjectEvent *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); void sub_80976DC(struct Sprite *, u8); void sub_809783C(struct Sprite *, u8, u8, u8); -void DoShadowFieldEffect(struct MapObject *); +void DoShadowFieldEffect(struct ObjectEvent *); u8 sub_809785C(struct Sprite *); u8 sub_80978E4(struct Sprite *); void obj_anim_image_set_and_seek(struct Sprite *, u8, u8); bool8 sub_80979BC(struct Sprite *); void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); -void sub_8097FA4(struct MapObject *); +void sub_8097FA4(struct ObjectEvent *); void sub_8098044(u8); -#endif //GUARD_MAP_OBJ_8097404_H +#endif // GUARD_EVENT_OBJECT_8097404_H diff --git a/include/map_obj_lock.h b/include/event_object_lock.h index 0d130973b..c5c32857b 100644 --- a/include/map_obj_lock.h +++ b/include/event_object_lock.h @@ -1,15 +1,15 @@ -#ifndef GUARD_MAP_OBJ_LOCK_H -#define GUARD_MAP_OBJ_LOCK_H +#ifndef GUARD_EVENT_OBJECT_LOCK_H +#define GUARD_EVENT_OBJECT_LOCK_H #include "global.h" bool8 sub_8069590(void); -void ScriptFreezeMapObjects(void); +void ScriptFreezeObjectEvents(void); bool8 sub_8069648(void); -void LockSelectedMapObject(void); +void LockSelectedObjectEvent(void); void sub_8098630(void); bool8 sub_8098734(void); void sub_80696C0(void); bool8 walkrun_is_standing_still(void); -#endif // GUARD_MAP_OBJ_LOCK_H +#endif // GUARD_EVENT_OBJECT_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h new file mode 100644 index 000000000..5b7c3f784 --- /dev/null +++ b/include/event_object_movement.h @@ -0,0 +1,108 @@ +#ifndef GUARD_EVENT_OBJECT_MOVEMENT_H +#define GUARD_EVENT_OBJECT_MOVEMENT_H + +#include "global.h" + +#define NUM_OBJECT_GRAPHICS_INFO 239 +#define SPRITE_VAR 240 + +// Exported struct declarations + +enum SpinnerRunnerFollowPatterns { + RUNFOLLOW_ANY, + RUNFOLLOW_NORTH_SOUTH, + RUNFOLLOW_EAST_WEST, + RUNFOLLOW_NORTH_WEST, + RUNFOLLOW_NORTH_EAST, + RUNFOLLOW_SOUTH_WEST, + RUNFOLLOW_SOUTH_EAST, + RUNFOLLOW_NORTH_SOUTH_WEST, + RUNFOLLOW_NORTH_SOUTH_EAST, + RUNFOLLOW_NORTH_EAST_WEST, + RUNFOLLOW_SOUTH_EAST_WEST +}; + +// Exported RAM declarations + +// Exported ROM declarations + +void sub_808D438(void); +u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetObjectEventIdByXY(s16, s16); +void ObjectEventSetDirection(struct ObjectEvent *, u8); +u8 sub_808D4F4(void); +void RemoveObjectEventByLocalIdAndMap(u8, u8, u8); +void npc_load_two_palettes__no_record(u16, u8); +void npc_load_two_palettes__and_record(u16, u8); +void sub_805F7C4(u8, u8, u8, s16, s16); +void pal_patch_for_npc(u16, u8); +void sub_808E16C(s16, s16); +void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); +void sub_8092FF0(s16, s16, s16 *, s16 *); +u8 ObjectEventDirectionToImageAnimId(u8); +void sub_80930E0(s16 *, s16 *, s16, s16); +void ObjectEventClearAnim(struct ObjectEvent *); +void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *); +void SpawnObjectEventsInView(s16, s16); +u8 sprite_new(u8, u8, s16, s16, u8, 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 *); +void sub_8093038(s16, s16, s16 *, s16 *); +void CameraObjectReset1(void); +void CameraObjectReset2(void); +void ObjectEventSetGraphicsId(struct ObjectEvent *, u8); +void ObjectEventTurn(struct ObjectEvent *, u8); +void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8); +void ObjectEventForceSetSpecialAnim(struct ObjectEvent *, u8); +u8 sub_8064270(u8 a0); +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8); +void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); +void gpu_pal_allocator_reset__manage_upper_four(void); +void sub_808E82C(u8, u8, u8, s16, s16); +void sub_805F400(u8, u8, u8); +void sub_805F3A8(u8, u8, u8, u8); +void sub_808E75C(s16, s16); +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *, u8 *, u8 *, u8 *); +void npc_coords_shift(struct ObjectEvent *, s16, s16); +void sub_808EB08(struct ObjectEvent *, s16, s16); +void sub_805FE94(u8, u8, u8); +void ObjectEventStep(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *)); +u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8); +u8 GetOppositeDirection(u8); +u8 GetStepInPlaceDelay4AnimId(u32); +u8 GetStepInPlaceDelay8AnimId(u32); +u8 GetStepInPlaceDelay16AnimId(u32); +u8 GetStepInPlaceDelay32AnimId(u32); +u8 npc_block_way(struct ObjectEvent *, s16, s16, u32); +void MoveCoords(u8, s16 *, s16 *); +bool8 ObjectEventIsSpecialAnimActive(struct ObjectEvent *); +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *); +u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z); +void sub_8063E28(struct ObjectEvent *, struct Sprite *); +void ObjectEventSetHeldMovement(struct ObjectEvent *, u8); +void npc_coords_shift_still(struct ObjectEvent *); +void sub_805FE7C(struct ObjectEvent *, u8); +void SetTrainerMovementType(struct ObjectEvent *, u8); +u8 sub_80634F0(u8 direction); +u8 sub_8063500(u8 a0); +void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 a1); +u8 sub_805EB44(u8, u8, s16, s16); +void npc_paltag_set_load(u8 mode); +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent); +u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); +u8 sub_8063F84(u8 direction); +u8 GetTrainerFacingDirectionMovementType(u8 direction); +void CameraObjectSetFollowedObjectId(u8 spriteId); +void UnfreezeObjectEvents(void); +void sub_8069058(u8, u8); + +// Exported data declarations + +extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; +extern const struct SpritePalette gUnknown_83A5348; +extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[]; + +#endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 5cd29fc5b..f2a4f83a7 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -13,7 +13,7 @@ // Exported ROM declarations u8 sub_8154228(void); -bool8 sub_8155DA0(struct MapObject *); +bool8 sub_8155DA0(struct ObjectEvent *); void sub_80DC44C(u8, u8); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h index 49448db6a..1233dec69 100644 --- a/include/field_ground_effect.h +++ b/include/field_ground_effect.h @@ -16,9 +16,9 @@ void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); void InitObjectPriorityByZCoord(struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); bool8 AreZCoordsCompatible(u8, u8); -void FieldObjectUpdateSubpriority(struct MapObject *, struct Sprite *); -void DoGroundEffects_OnSpawn(struct MapObject *, struct Sprite *); -void DoGroundEffects_OnBeginStep(struct MapObject *, struct Sprite *); -void DoGroundEffects_OnFinishStep(struct MapObject *, struct Sprite *); +void ObjectEventUpdateSubpriority(struct ObjectEvent *, struct Sprite *); +void DoGroundEffects_OnSpawn(struct ObjectEvent *, struct Sprite *); +void DoGroundEffects_OnBeginStep(struct ObjectEvent *, struct Sprite *); +void DoGroundEffects_OnFinishStep(struct ObjectEvent *, struct Sprite *); #endif //GUARD_FIELD_GROUND_EFFECT_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h deleted file mode 100644 index 6177cba1c..000000000 --- a/include/field_map_obj.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef GUARD_FIELD_MAP_OBJ_H -#define GUARD_FIELD_MAP_OBJ_H - -#include "global.h" - -#define NUM_OBJECT_GRAPHICS_INFO 239 -#define SPRITE_VAR 240 - -// Exported struct declarations - -enum SpinnerRunnerFollowPatterns { - RUNFOLLOW_ANY, - RUNFOLLOW_NORTH_SOUTH, - RUNFOLLOW_EAST_WEST, - RUNFOLLOW_NORTH_WEST, - RUNFOLLOW_NORTH_EAST, - RUNFOLLOW_SOUTH_WEST, - RUNFOLLOW_SOUTH_EAST, - RUNFOLLOW_NORTH_SOUTH_WEST, - RUNFOLLOW_NORTH_SOUTH_EAST, - RUNFOLLOW_NORTH_EAST_WEST, - RUNFOLLOW_SOUTH_EAST_WEST -}; - -// Exported RAM declarations - -// Exported ROM declarations - -void sub_808D438(void); -u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); -bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); -u8 GetFieldObjectIdByXY(s16, s16); -void FieldObjectSetDirection(struct MapObject *, u8); -u8 sub_808D4F4(void); -void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8); -void npc_load_two_palettes__no_record(u16, u8); -void npc_load_two_palettes__and_record(u16, u8); -void sub_805F7C4(u8, u8, u8, s16, s16); -void pal_patch_for_npc(u16, u8); -void sub_808E16C(s16, s16); -void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); -void sub_8092FF0(s16, s16, s16 *, s16 *); -u8 FieldObjectDirectionToImageAnimId(u8); -void sub_80930E0(s16 *, s16 *, s16, s16); -void FieldObjectClearAnim(struct MapObject *); -void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); -void SpawnFieldObjectsInView(s16, s16); -u8 sprite_new(u8, u8, s16, s16, u8, u8); -u8 AddPseudoEventObject(u16, SpriteCallback, s16, s16, u8); -u8 show_sprite(u8, u8, u8); -u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8); -u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); -void sub_8093038(s16, s16, s16 *, s16 *); -void CameraObjectReset1(void); -void CameraObjectReset2(void); -void FieldObjectSetGraphicsId(struct MapObject *, u8); -void FieldObjectTurn(struct MapObject *, u8); -void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -void FieldObjectForceSetSpecialAnim(struct MapObject *, u8); -u8 sub_8064270(u8 a0); -const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8); -void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); -void gpu_pal_allocator_reset__manage_upper_four(void); -void sub_808E82C(u8, u8, u8, s16, s16); -void sub_805F400(u8, u8, u8); -void sub_805F3A8(u8, u8, u8, u8); -void sub_808E75C(s16, s16); -void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *); -void npc_coords_shift(struct MapObject *, s16, s16); -void sub_808EB08(struct MapObject *, s16, s16); -void sub_805FE94(u8, u8, u8); -void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *)); -u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8); -u8 GetOppositeDirection(u8); -u8 GetStepInPlaceDelay4AnimId(u32); -u8 GetStepInPlaceDelay8AnimId(u32); -u8 GetStepInPlaceDelay16AnimId(u32); -u8 GetStepInPlaceDelay32AnimId(u32); -u8 npc_block_way(struct MapObject *, s16, s16, u32); -void MoveCoords(u8, s16 *, s16 *); -bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); -u8 FieldObjectClearHeldMovementIfFinished(struct MapObject *); -u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); -void sub_8063E28(struct MapObject *, struct Sprite *); -void FieldObjectSetHeldMovement(struct MapObject *, u8); -void npc_coords_shift_still(struct MapObject *); -void sub_805FE7C(struct MapObject *, u8); -void SetTrainerMovementType(struct MapObject *, u8); -u8 sub_80634F0(u8 direction); -u8 sub_8063500(u8 a0); -void EventObjectSetGraphicsId(struct MapObject *mapObject, u8 a1); -u8 sub_805EB44(u8, u8, s16, s16); -void npc_paltag_set_load(u8 mode); -bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject); -u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject); -u8 sub_8063F84(u8 direction); -u8 GetTrainerFacingDirectionMovementType(u8 direction); -void CameraObjectSetFollowedObjectId(u8 spriteId); - -// Exported data declarations - -extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; -extern const struct SpritePalette gUnknown_83A5348; -extern const struct SpriteTemplate * const gUnknown_83A0010[]; - -#endif //GUARD_FIELD_MAP_OBJ_H diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h deleted file mode 100644 index cd1b19eaf..000000000 --- a/include/field_map_obj_helpers.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef GUARD_FIELDMAPOBJHELP_H -#define GUARD_FIELDMAPOBJHELP_H - -#include "global.h" - -void UnfreezeMapObjects(void); -void sub_8069058(u8, u8); - -#endif diff --git a/include/fieldmap.h b/include/fieldmap.h index f1107100f..1560a0841 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -11,8 +11,8 @@ #define NUM_PALS_TOTAL 13 #define VIRTUAL_MAP_SIZE 0x2800 -extern struct BackupMapData VMap; -extern const struct MapData Route1_Layout; +extern struct BackupMapLayout VMap; +extern const struct MapLayout Route1_Layout; u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileBehaviorAt(int, int); @@ -23,7 +23,7 @@ void GetCameraCoords(u16*, u16*); bool8 MapGridIsImpassableAt(s32, s32); s32 GetMapBorderIdAt(s32, s32); bool32 CanCameraMoveInDirection(s32); -u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr); +u32 GetBehaviorByMetatileIdAndMapLayout(struct MapLayout *mapLayout, u16 metatile, u8 attr); const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection); struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y); void sub_8059948(u8 a0, u8 a1); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 186185104..e567c6d5f 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,7 +1,7 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H -#define NUM_FIELD_OBJECTS 16 +#define OBJECT_EVENTS_COUNT 16 enum { @@ -26,7 +26,7 @@ struct Tileset /*0x14*/ void *metatileAttributes; }; -struct MapData +struct MapLayout { /*0x00*/ s32 width; /*0x04*/ s32 height; @@ -38,14 +38,14 @@ struct MapData /*0x19*/ u8 unk19; }; -struct BackupMapData +struct BackupMapLayout { s32 Xsize; s32 Ysize; u16 *map; }; -union __attribute__((packed)) MapObjectRange { +union __attribute__((packed)) ObjectEventRange { u8 as_byte; struct __attribute__((packed)) { u8 x:4; @@ -53,7 +53,7 @@ union __attribute__((packed)) MapObjectRange { } __attribute__((aligned (1))) as_nybbles; } __attribute__((aligned (1))); -struct MapObjectTemplate +struct ObjectEventTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; @@ -123,12 +123,12 @@ struct BgEvent struct MapEvents { - u8 mapObjectCount; + u8 objectEventCount; u8 warpCount; u8 coordEventCount; u8 bgEventCount; - struct MapObjectTemplate *mapObjects; + struct ObjectEventTemplate *objectEvents; struct WarpEvent *warps; struct CoordEvent *coordEvents; struct BgEvent *bgEvents; @@ -150,12 +150,12 @@ struct MapConnections struct MapHeader { - /* 0x00 */ struct MapData *mapData; + /* 0x00 */ struct MapLayout *mapLayout; /* 0x04 */ struct MapEvents *events; /* 0x08 */ u8 *mapScripts; /* 0x0C */ struct MapConnections *connections; /* 0x10 */ u16 music; - /* 0x12 */ u16 mapDataId; + /* 0x12 */ u16 mapLayoutId; /* 0x14 */ u8 regionMapSectionId; /* 0x15 */ u8 cave; /* 0x16 */ u8 weather; @@ -166,7 +166,7 @@ struct MapHeader /* 0x1B */ u8 battleType; }; -struct MapObject +struct ObjectEvent { /*0x00*/ u32 active:1; u32 mapobj_bit_1:1; @@ -214,7 +214,7 @@ struct MapObject /*0x14*/ struct Coords16 coords3; /*0x18*/ u8 facingDirection:4; //current direction? /*0x18*/ u8 placeholder18:4; - /*0x19*/ union MapObjectRange range; + /*0x19*/ union ObjectEventRange range; /*0x1A*/ u8 mapobj_unk_1A; /*0x1B*/ u8 mapobj_unk_1B; /*0x1C*/ u8 mapobj_unk_1C; @@ -227,7 +227,7 @@ struct MapObject /*size = 0x24*/ }; -struct MapObjectGraphicsInfo +struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; /*0x02*/ u16 paletteTag1; @@ -288,7 +288,7 @@ struct PlayerAvatar /* 0x202E858 */ /*0x02*/ u8 running2; /*0x03*/ u8 running1; /*0x04*/ u8 spriteId; - /*0x05*/ u8 mapObjectId; + /*0x05*/ u8 objectEventId; /*0x06*/ u8 unk6; /*0x07*/ u8 gender; u8 acroBikeState; @@ -309,8 +309,8 @@ struct Camera s32 y; }; -extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS]; -extern u8 gSelectedEventObject; +extern struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT]; +extern u8 gSelectedObjectEvent; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; extern struct Camera gCamera; diff --git a/include/global.h b/include/global.h index 9df153270..f4d21704b 100644 --- a/include/global.h +++ b/include/global.h @@ -544,7 +544,6 @@ typedef union QuestLogScene QuestLogScene; // This name is a complete guess and may change. -#define MAP_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 // 300 #define VARS_COUNT 256 @@ -564,7 +563,7 @@ union QuestLogMovement } ident_struct; }; -struct QuestLogMapObject +struct QuestLogObjectEvent { /*0x00*/ u8 active:1; /*0x00*/ u8 mapobj_bit_3:1; @@ -609,7 +608,7 @@ struct QuestLog /*0x0003*/ s8 unk_003; /*0x0004*/ s16 unk_004; /*0x0006*/ s16 unk_006; - /*0x0008*/ struct QuestLogMapObject unk_008[MAP_OBJECTS_COUNT]; + /*0x0008*/ struct QuestLogObjectEvent unk_008[OBJECT_EVENTS_COUNT]; // These arrays hold the game state for // playing back the quest log @@ -727,7 +726,7 @@ struct SaveBlock1 /*0x002E*/ u8 weather; /*0x002F*/ u8 filler_2F; /*0x0030*/ u8 flashLevel; - /*0x0032*/ u16 mapDataId; + /*0x0032*/ u16 mapLayoutId; /*0x0034*/ u8 playerPartyCount; /*0x0038*/ struct Pokemon playerParty[PARTY_SIZE]; /*0x0290*/ u32 money; @@ -744,8 +743,8 @@ struct SaveBlock1 /*0x0632*/ u8 field_632[6]; // unused? /*0x0638*/ u16 trainerRematchStepCounter; /*0x063A*/ u8 ALIGNED(2) trainerRematches[100]; - /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; - /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; + /*0x06A0*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; + /*0x08E0*/ struct ObjectEventTemplate objectEventTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; /*0x1200*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h deleted file mode 100644 index bfd5dd3c7..000000000 --- a/include/map_obj_80688E4.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef GUARD_MAP_OBJ_80688E4_H -#define GUARD_MAP_OBJ_80688E4_H - -#include "global.h" - -void FreezeEventObjects(void); -void FreezeMapObject(struct MapObject *); -void FreezeMapObjectsExceptOne(u8 mapObjectId); - -#endif //GUARD_MAP_OBJ_80688E4_H diff --git a/include/overworld.h b/include/overworld.h index ab20d9ff0..08f9be912 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -10,7 +10,7 @@ struct UnkPlayerStruct u8 player_field_1; }; -struct LinkPlayerMapObject +struct LinkPlayerObjectEvent { u8 active; u8 linkPlayerId; @@ -32,7 +32,7 @@ struct CreditsOverworldCmd extern struct UCoords32 gDirectionToVectors[]; -extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern MainCallback gFieldCallback; extern struct WarpData gUnknown_2031DB4; @@ -73,7 +73,7 @@ bool32 IsUpdateLinkStateCBActive(void); void strange_npc_table_clear(void); const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16); -void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); +void ObjectEventMoveDestCoords(struct ObjectEvent *, u32, s16 *, s16 *); void sub_8086230(void); void CB2_ReturnToField(void); bool32 sub_8087598(void); @@ -99,11 +99,11 @@ void Overworld_PlaySpecialMapMusic(void); u8 GetCurrentRegionMapSectionId(void); -void SetCurrentMapLayout(u16 mapDataId); +void SetCurrentMapLayout(u16 mapLayoutId); void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); void ResetInitialPlayerAvatarState(void); -void sub_8055D40(u16 mapDataId); +void sub_8055D40(u16 mapLayoutId); void CleanupOverworldWindowsAndTilemaps(void); u32 ComputeWhiteOutMoneyLoss(void); diff --git a/include/quest_log_815A008.h b/include/quest_log_815A008.h index 2577450a4..72613be86 100644 --- a/include/quest_log_815A008.h +++ b/include/quest_log_815A008.h @@ -4,6 +4,6 @@ #include "global.h" void sub_815A008(struct QuestLog *); -void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *); +void sub_815A1F8(struct QuestLog *, struct ObjectEventTemplate *); #endif //GUARD_QUEST_LOG_815A008_H diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h index fa439d8da..17b02ffa4 100644 --- a/include/rom_81BE66C.h +++ b/include/rom_81BE66C.h @@ -8,7 +8,7 @@ #include "global.h" bool32 InTrainerHill(void); -bool8 FieldObjectIsFarawayIslandMew(struct MapObject *); +bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *); u32 sub_81D427C(void); #endif //GUARD_ROM_81BE66C_H diff --git a/include/save_location.h b/include/save_location.h index 4e01c64e4..fb71ab728 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -12,4 +12,4 @@ bool32 IsCurMapPokeCenter(void); void sub_810B810(void); void sub_810B82C(void); -#endif // GUARD_SAVE_LOCATION_H
\ No newline at end of file +#endif // GUARD_SAVE_LOCATION_H diff --git a/include/trainer_see.h b/include/trainer_see.h index f87189377..511edf404 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -3,8 +3,8 @@ #include "global.h" -void sub_80B4578(struct MapObject *); +void sub_80B4578(struct ObjectEvent *); u8 sub_80B47BC(void); -void sub_8155D78(struct MapObject *); +void sub_8155D78(struct ObjectEvent *); #endif //GUARD_TRAINER_SEE_H diff --git a/ld_script.txt b/ld_script.txt index 42fc57437..245ac2df0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -95,11 +95,11 @@ SECTIONS { asm/field_camera.o(.text); src/field_door.o(.text); asm/field_player_avatar.o(.text); - asm/field_map_obj.o(.text); + asm/event_object_movement.o(.text); asm/field_ground_effect.o(.text); - asm/map_obj_80688E4.o(.text); + asm/event_object_80688E4.o(.text); asm/field_message_box.o(.text); - src/map_obj_lock.o(.text); + src/event_object_lock.o(.text); src/text_window_graphics.o(.text); src/script.o(.text); src/scrcmd.o(.text); @@ -412,9 +412,9 @@ SECTIONS { src/metatile_behavior.o(.rodata); src/field_door.o(.rodata); data/field_player_avatar.o(.rodata); - data/field_map_obj.o(.rodata); + data/event_object_movement.o(.rodata); data/field_ground_effect.o(.rodata); - data/map_obj_80688E4.o(.rodata); + data/event_object_80688E4.o(.rodata); src/scrcmd.o(.rodata); src/coord_event_weather.o(.rodata); data/field_tasks.o(.rodata); diff --git a/src/battle_setup.c b/src/battle_setup.c index 9fef6a8a5..17da53083 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -13,7 +13,7 @@ #include "strings.h" #include "string_util.h" #include "event_data.h" -#include "map_obj_80688E4.h" +#include "event_object_80688E4.h" #include "metatile_behavior.h" #include "event_scripts.h" #include "fldeff.h" @@ -22,7 +22,7 @@ #include "field_player_avatar.h" #include "field_screen_effect.h" #include "field_message_box.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "vs_seeker.h" #include "battle.h" #include "battle_setup.h" @@ -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; - gSelectedEventObject = GetFieldObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + gSpecialVar_LastTalked = sTrainerObjectEventLocalId; + gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } @@ -819,8 +819,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript) { - gSelectedEventObject = trainerEventObjId; - gSpecialVar_LastTalked = gMapObjects[trainerEventObjId].localId; + gSelectedObjectEvent = trainerEventObjId; + gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); ScriptContext1_SetupScript(gUnknown_81A4EB4); ScriptContext2_Enable(); @@ -835,9 +835,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) void SetUpTrainerMovement(void) { - struct MapObject *eventObject = &gMapObjects[gSelectedEventObject]; + struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent]; - SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); + SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection)); } u8 ScrSpecial_GetTrainerBattleMode(void) diff --git a/src/battle_tower.c b/src/battle_tower.c index dfbef8fe5..c8098abf4 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -24,7 +24,7 @@ #include "constants/moves.h" #include "constants/pokemon.h" #include "constants/vars.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" static EWRAM_DATA u16 sSpecialVar_0x8004_Copy = 0; @@ -389,7 +389,7 @@ void ChooseNextBattleTowerTrainer(void) static void SetBattleTowerTrainerGfxId(u8 trainerClass) { - VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_YOUNGSTER); + VarSet(VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_YOUNGSTER); } void SetEReaderTrainerGfxId(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/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 4f14c64e9..1f388e05e 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -5030,4 +5030,4 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 337, .trainerOffset = 2, }, -};
\ No newline at end of file +}; diff --git a/src/easy_chat.c b/src/easy_chat.c index be617133b..1d2873fc2 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -25,7 +25,7 @@ #include "text_window.h" #include "window.h" #include "constants/easy_chat.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" #include "constants/flags.h" #include "constants/songs.h" #include "constants/species.h" diff --git a/src/event_data.c b/src/event_data.c index 4aca57e50..9291c06aa 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -238,7 +238,7 @@ bool8 VarSet(u16 idx, u16 val) return TRUE; } -u8 VarGetFieldObjectGraphicsId(u8 idx) +u8 VarGetObjectEventGraphicsId(u8 idx) { return VarGet(VAR_OBJ_GFX_ID_0 + idx); } diff --git a/src/map_obj_lock.c b/src/event_object_lock.c index e28872fd4..17ec57b20 100644 --- a/src/map_obj_lock.c +++ b/src/event_object_lock.c @@ -1,12 +1,11 @@ #include "global.h" #include "task.h" #include "field_player_avatar.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" #include "script_movement.h" -#include "map_obj_80688E4.h" +#include "event_object_80688E4.h" #include "event_data.h" -#include "map_obj_lock.h" +#include "event_object_lock.h" bool8 walkrun_is_standing_still(void) { @@ -36,9 +35,9 @@ bool8 sub_8069590(void) } } -void ScriptFreezeMapObjects(void) +void ScriptFreezeObjectEvents(void) { - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_8069570, 80); } @@ -52,9 +51,9 @@ void sub_80695CC(u8 taskId) task->data[0] = 1; } - if (task->data[1] == 0 && !gMapObjects[gSelectedEventObject].mapobj_bit_1) + if (task->data[1] == 0 && !gObjectEvents[gSelectedObjectEvent].mapobj_bit_1) { - FreezeMapObject(&gMapObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); task->data[1] = 1; } @@ -73,44 +72,44 @@ bool8 sub_8069648(void) } } -void LockSelectedMapObject(void) +void LockSelectedObjectEvent(void) { u8 taskId; - FreezeMapObjectsExceptOne(gSelectedEventObject); + FreezeObjectEventsExceptOne(gSelectedObjectEvent); taskId = CreateTask(sub_80695CC, 80); - if (!gMapObjects[gSelectedEventObject].mapobj_bit_1) + if (!gObjectEvents[gSelectedObjectEvent].mapobj_bit_1) { - FreezeMapObject(&gMapObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); gTasks[taskId].data[1] = 1; } } void sub_80696C0(void) { - u8 fieldObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearHeldMovementIfFinished(&gMapObjects[fieldObjectId]); + u8 objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]); sub_80974D8(); - UnfreezeMapObjects(); + UnfreezeObjectEvents(); } void sub_80696F0(void) { - u8 fieldObjectId; - if (gMapObjects[gSelectedEventObject].active) - FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedEventObject]); - fieldObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearHeldMovementIfFinished(&gMapObjects[fieldObjectId]); + u8 objectEventId; + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]); sub_80974D8(); - UnfreezeMapObjects(); + UnfreezeObjectEvents(); } void sub_8069740(void) { - FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedEventObject], gSpecialVar_Facing); + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } void sub_8069768(void) { - FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedEventObject]); + ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]); } diff --git a/src/fame_checker.c b/src/fame_checker.c index 8c8f5b4ea..b8f2c0055 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -22,7 +22,7 @@ #include "text.h" #include "window.h" #include "string_util.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "menu_indicators.h" #include "text_window.h" #include "fame_checker.h" diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index d6bf4ea07..6627aaf48 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -13,15 +13,14 @@ #include "metatile_behavior.h" #include "quest_log.h" #include "link.h" -#include "map_obj_80688E4.h" +#include "event_object_80688E4.h" #include "sound.h" #include "field_door.h" #include "field_effect.h" #include "field_screen_effect.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" #include "field_specials.h" -#include "map_obj_lock.h" +#include "event_object_lock.h" #include "start_menu.h" #include "constants/songs.h" @@ -323,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; @@ -350,7 +349,7 @@ static void sub_807DFBC(u8 taskId) { PlayerGetDestCoords(&task->data[12], &task->data[13]); sub_807DCB0(TRUE); - FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 16); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 16); task->data[0] = 8; } break; @@ -365,7 +364,7 @@ static void sub_807DFBC(u8 taskId) case 9: if (sub_807E418() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(sub_807F204)) { - FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); task->data[0] = 4; } break; @@ -374,7 +373,7 @@ static void sub_807DFBC(u8 taskId) if (sub_807E418()) { sub_807DCB0(TRUE); - FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 16); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 16); task->data[0] = 2; } break; @@ -382,7 +381,7 @@ static void sub_807DFBC(u8 taskId) if (walkrun_is_standing_still()) { task->data[1] = FieldAnimateDoorClose(*x, *y); - FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); task->data[0] = 3; } break; @@ -391,7 +390,7 @@ static void sub_807DFBC(u8 taskId) task->data[0] = 4; break; case 4: - UnfreezeMapObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); break; @@ -408,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; @@ -416,7 +415,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId) if (sub_807E418()) { sub_807DCB0(TRUE); - FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection())); task->data[0] = 2; } break; @@ -427,7 +426,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId) } break; case 3: - UnfreezeMapObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); break; @@ -439,14 +438,14 @@ 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; case 1: if (sub_807E418()) { - UnfreezeMapObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -459,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]++; @@ -467,7 +466,7 @@ static void sub_807E31C(u8 taskId) case 1: if (sub_807E418() && sub_805DC24() != TRUE) { - UnfreezeMapObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -689,7 +688,7 @@ static void sub_807E718(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -711,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(); @@ -744,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); @@ -753,8 +752,8 @@ static void sub_807E80C(u8 taskId) case 1: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 17); + ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 17); task->data[0] = 2; } break; @@ -762,7 +761,7 @@ static void sub_807E80C(u8 taskId) if (walkrun_is_standing_still()) { task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1); - FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); sub_807DCB0(FALSE); task->data[0] = 3; } @@ -792,18 +791,18 @@ static void sub_807E80C(u8 taskId) static void sub_807E980(u8 taskId) { s16 * data = gTasks[taskId].data; - struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId]; switch (data[0]) { case 0: ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); data[0]++; break; case 1: - if (!FieldObjectIsMovementOverridden(playerObj) || FieldObjectClearHeldMovementIfFinished(playerObj)) + if (!ObjectEventIsMovementOverridden(playerObj) || ObjectEventClearHeldMovementIfFinished(playerObj)) { if (data[15] != 0) data[15]--; @@ -844,7 +843,7 @@ static void sub_807E980(u8 taskId) static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4) { struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId]; - struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (a1 > 0 || *a4 > 6) *a3 += a1; *a2 += a0; @@ -853,13 +852,13 @@ static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4) playerSpr->pos2.y = *a3 >> 5; if (playerObj->mapobj_bit_7) { - FieldObjectForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection())); + ObjectEventForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection())); } } static void sub_807EB64(u16 a0, s16 *a1, s16 *a2) { - FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection())); + ObjectEventForceSetSpecialAnim(&gObjectEvents[gPlayerAvatar.objectEventId], GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection())); sub_807EBBC(a0, a1, a2); } @@ -931,7 +930,7 @@ static void sub_807ECBC(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4) r1 = 3; else r1 = 4; - FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], sub_8064270(r1)); + ObjectEventForceSetSpecialAnim(&gObjectEvents[gPlayerAvatar.objectEventId], sub_8064270(r1)); sub_807EBBC(behavior, a0, a1); *a2 = *a0 * 16; *a3 = *a1 * 16; diff --git a/src/field_specials.c b/src/field_specials.c index 374c74f3c..de3bc7d57 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -19,7 +19,7 @@ #include "battle_tower.h" #include "field_camera.h" #include "field_effect.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "menu_indicators.h" #include "random.h" #include "mail_data.h" @@ -41,7 +41,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/items.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" #include "constants/maps.h" #include "constants/region_map.h" #include "constants/moves.h" @@ -314,15 +314,15 @@ void Special_AnimatePcTurnOff() void SpawnCameraObject(void) { - u8 mapObjectId = SpawnSpecialFieldObjectParameterized(MAP_OBJ_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); - gMapObjects[mapObjectId].mapobj_bit_13 = TRUE; - CameraObjectSetFollowedObjectId(gMapObjects[mapObjectId].spriteId); + u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); + gObjectEvents[objectEventId].mapobj_bit_13 = TRUE; + CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId); } void RemoveCameraObject(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveFieldObjectByLocalIdAndMap(127, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(127, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } void Special_BufferEReaderTrainerName5(void) @@ -1499,7 +1499,7 @@ void Special_SetSeenMon(void) void sub_80CBDE8(void) { - gSelectedEventObject = 0; + gSelectedObjectEvent = 0; gSpecialVar_TextColor = 0xFF; } @@ -1508,13 +1508,13 @@ u8 ContextNpcGetTextColor(void) u8 gfxId; if (gSpecialVar_TextColor != 0xFF) return gSpecialVar_TextColor; - else if (gSelectedEventObject == 0) + else if (gSelectedObjectEvent == 0) return 3; else { - gfxId = gMapObjects[gSelectedEventObject].graphicsId; - if (gfxId >= MAP_OBJ_GFX_VAR_0) - gfxId = VarGetFieldObjectGraphicsId(gfxId - MAP_OBJ_GFX_VAR_0); + gfxId = gObjectEvents[gSelectedObjectEvent].graphicsId; + if (gfxId >= OBJECT_EVENT_GFX_VAR_0) + gfxId = VarGetObjectEventGraphicsId(gfxId - OBJECT_EVENT_GFX_VAR_0); return GetColorFromTextColorTable(gfxId); } } @@ -2359,7 +2359,7 @@ static void MoveDeoxysObject(u8 num) u8 mapObjId; LoadPalette(sDeoxysObjectPals[num], 0x1A0, 0x08); sub_8083598(10); - TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId); + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId); if (num == 0) PlaySE(SE_W109); else diff --git a/src/fieldmap.c b/src/fieldmap.c index e5901c149..5582b6977 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -28,8 +28,8 @@ struct MapConnection *sub_8059600(u8 direction, s32 x, s32 y); bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection); bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset); -struct BackupMapData VMap; -EWRAM_DATA u16 gBackupMapData[VIRTUAL_MAP_SIZE] = {}; +struct BackupMapLayout VMap; +EWRAM_DATA u16 gBackupMapLayout[VIRTUAL_MAP_SIZE] = {}; EWRAM_DATA struct MapHeader gMapHeader = {}; EWRAM_DATA struct Camera gCamera = {}; EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {}; @@ -78,13 +78,13 @@ void sub_80589E8(void) void sub_8058A00(struct MapHeader * mapHeader) { - const struct MapData * mapData = mapHeader->mapData; - CpuFastFill(0x03FF03FF, gBackupMapData, sizeof(gBackupMapData)); - VMap.map = gBackupMapData; - VMap.Xsize = mapData->width + 15; - VMap.Ysize = mapData->height + 14; + const struct MapLayout * mapLayout = mapHeader->mapLayout; + CpuFastFill(0x03FF03FF, gBackupMapLayout, sizeof(gBackupMapLayout)); + VMap.map = gBackupMapLayout; + VMap.Xsize = mapLayout->width + 15; + VMap.Ysize = mapLayout->height + 14; AGB_ASSERT_EX(VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c", 158); - map_copy_with_padding(mapData->map, mapData->width, mapData->height); + map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height); mapheader_copy_mapdata_of_adjacent_maps(mapHeader); } @@ -155,8 +155,8 @@ void sub_8058B54(s32 x, s32 y, const struct MapHeader *connectedMapHeader, s32 x u16 *dest; s32 mapWidth; - mapWidth = connectedMapHeader->mapData->width; - src = &connectedMapHeader->mapData->map[mapWidth * y2 + x2]; + mapWidth = connectedMapHeader->mapLayout->width; + src = &connectedMapHeader->mapLayout->map[mapWidth * y2 + x2]; dest = &VMap.map[VMap.Xsize * y + x]; for (i = 0; i < height; i++) @@ -176,9 +176,9 @@ void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader con if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; + cWidth = connectedMapHeader->mapLayout->width; x = offset + 7; - y = mapHeader->mapData->height + 7; + y = mapHeader->mapLayout->height + 7; if (x < 0) { x2 = -x; @@ -223,8 +223,8 @@ void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader con if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - cHeight = connectedMapHeader->mapData->height; + cWidth = connectedMapHeader->mapLayout->width; + cHeight = connectedMapHeader->mapLayout->height; x = offset + 7; y2 = cHeight - 7; if (x < 0) @@ -271,8 +271,8 @@ void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader cons s32 cWidth, cHeight; if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - cHeight = connectedMapHeader->mapData->height; + cWidth = connectedMapHeader->mapLayout->width; + cHeight = connectedMapHeader->mapLayout->height; y = offset + 7; x2 = cWidth - 7; if (y < 0) @@ -317,8 +317,8 @@ void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader cons s32 cHeight; if (connectedMapHeader) { - cHeight = connectedMapHeader->mapData->height; - x = mapHeader->mapData->width + 7; + cHeight = connectedMapHeader->mapLayout->height; + x = mapHeader->mapLayout->width + 7; y = offset + 7; if (y < 0) { @@ -370,17 +370,17 @@ union Block s32 xprime; \ s32 yprime; \ \ - struct MapData *mapData = gMapHeader.mapData; \ + struct MapLayout *mapLayout = gMapHeader.mapLayout; \ \ xprime = x - 7; \ - xprime += 8 * mapData->unk18; \ - xprime %= mapData->unk18; \ + xprime += 8 * mapLayout->unk18; \ + xprime %= mapLayout->unk18; \ \ yprime = y - 7; \ - yprime += 8 * mapData->unk19; \ - yprime %= mapData->unk19; \ + yprime += 8 * mapLayout->unk19; \ + yprime %= mapLayout->unk19; \ \ - block = mapData->border[xprime + yprime * mapData->unk18]; \ + block = mapLayout->border[xprime + yprime * mapLayout->unk18]; \ block |= 0xC00; \ block; \ }) @@ -390,17 +390,17 @@ union Block s32 xprime; \ s32 yprime; \ \ - struct MapData *mapData = gMapHeader.mapData; \ + struct MapLayout *mapLayout = gMapHeader.mapLayout; \ \ xprime = x - 7; \ - xprime += 8 * mapData->unk18; \ - xprime %= mapData->unk18; \ + xprime += 8 * mapLayout->unk18; \ + xprime %= mapLayout->unk18; \ \ yprime = y - 7; \ - yprime += 8 * mapData->unk19; \ - yprime %= mapData->unk19; \ + yprime += 8 * mapLayout->unk19; \ + yprime %= mapLayout->unk19; \ \ - block = mapData->border[xprime + yprime * mapData->unk18] | 0xC00; \ + block = mapLayout->border[xprime + yprime * mapLayout->unk18] | 0xC00; \ block; \ }) @@ -455,7 +455,7 @@ u32 sub_8058F1C(u32 original, u8 bit) u32 sub_8058F48(s16 x, s16 y, u8 z) { u16 metatileId = MapGridGetMetatileIdAt(x, y); - return GetBehaviorByMetatileIdAndMapData(gMapHeader.mapData, metatileId, z); + return GetBehaviorByMetatileIdAndMapLayout(gMapHeader.mapLayout, metatileId, z); } u32 MapGridGetMetatileBehaviorAt(s32 x, s32 y) @@ -506,18 +506,18 @@ void sub_8059024(s32 x, s32 y, bool32 arg2) } } -u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr) +u32 GetBehaviorByMetatileIdAndMapLayout(struct MapLayout *mapLayout, u16 metatile, u8 attr) { u32 * attributes; if (metatile < NUM_METATILES_IN_PRIMARY) { - attributes = mapData->primaryTileset->metatileAttributes; + attributes = mapLayout->primaryTileset->metatileAttributes; return sub_8058F1C(attributes[metatile], attr); } else if (metatile < 0x400) { - attributes = mapData->secondaryTileset->metatileAttributes; + attributes = mapLayout->secondaryTileset->metatileAttributes; return sub_8058F1C(attributes[metatile - NUM_METATILES_IN_PRIMARY], attr); } else @@ -540,7 +540,7 @@ void save_serialize_map(void) { for (j = x; j < x + 15; j++) { - *mapView++ = gBackupMapData[width * i + j]; + *mapView++ = gBackupMapLayout[width * i + j]; } } } @@ -581,7 +581,7 @@ void LoadSavedMapView(void) { for (j = x; j < x + 15; j++) { - gBackupMapData[j + width * i] = *mapView; + gBackupMapLayout[j + width * i] = *mapView; mapView++; } } @@ -636,7 +636,7 @@ void sub_8059250(u8 a1) desti = width * (y + y0); srci = (y + r8) * 15 + r9; src = &mapView[srci + i]; - dest = &gBackupMapData[x0 + desti + j]; + dest = &gBackupMapLayout[x0 + desti + j]; *dest = *src; i++; j++; @@ -720,7 +720,7 @@ void sub_80594AC(struct MapConnection *connection, int direction, s32 x, s32 y) gSaveBlock1Ptr->pos.y -= connection->offset; break; case CONNECTION_WEST: - gSaveBlock1Ptr->pos.x = mapHeader->mapData->width; + gSaveBlock1Ptr->pos.x = mapHeader->mapLayout->width; gSaveBlock1Ptr->pos.y -= connection->offset; break; case CONNECTION_SOUTH: @@ -729,7 +729,7 @@ void sub_80594AC(struct MapConnection *connection, int direction, s32 x, s32 y) break; case CONNECTION_NORTH: gSaveBlock1Ptr->pos.x -= connection->offset; - gSaveBlock1Ptr->pos.y = mapHeader->mapData->height; + gSaveBlock1Ptr->pos.y = mapHeader->mapLayout->height; break; } } @@ -788,10 +788,10 @@ bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection) { case CONNECTION_SOUTH: case CONNECTION_NORTH: - return sub_80596BC(x, gMapHeader.mapData->width, mapHeader->mapData->width, connection->offset); + return sub_80596BC(x, gMapHeader.mapLayout->width, mapHeader->mapLayout->width, connection->offset); case CONNECTION_WEST: case CONNECTION_EAST: - return sub_80596BC(y, gMapHeader.mapData->height, mapHeader->mapData->height, connection->offset); + return sub_80596BC(y, gMapHeader.mapLayout->height, mapHeader->mapLayout->height, connection->offset); } return FALSE; } @@ -825,10 +825,10 @@ s32 sub_80596FC(struct MapConnection *connection, s32 x, s32 y) { case CONNECTION_SOUTH: case CONNECTION_NORTH: - return sub_80596E8(x - connection->offset, mapHeader->mapData->width); + return sub_80596E8(x - connection->offset, mapHeader->mapLayout->width); case CONNECTION_WEST: case CONNECTION_EAST: - return sub_80596E8(y - connection->offset, mapHeader->mapData->height); + return sub_80596E8(y - connection->offset, mapHeader->mapLayout->height); } return FALSE; } @@ -852,9 +852,9 @@ struct MapConnection *GetMapConnectionAtPos(s16 x, s16 y) direction = connection->direction; if ((direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE) || (direction == CONNECTION_NORTH && y > 6) - || (direction == CONNECTION_SOUTH && y < gMapHeader.mapData->height + 7) + || (direction == CONNECTION_SOUTH && y < gMapHeader.mapLayout->height + 7) || (direction == CONNECTION_WEST && x > 6) - || (direction == CONNECTION_EAST && x < gMapHeader.mapData->width + 7)) + || (direction == CONNECTION_EAST && x < gMapHeader.mapLayout->width + 7)) { continue; } @@ -981,45 +981,45 @@ void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u1 } } -void copy_map_tileset1_to_vram(const struct MapData *mapData) +void copy_map_tileset1_to_vram(const struct MapLayout *mapLayout) { - copy_tileset_patterns_to_vram(mapData->primaryTileset, NUM_TILES_IN_PRIMARY, 0); + copy_tileset_patterns_to_vram(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0); } -void copy_map_tileset2_to_vram(const struct MapData *mapData) +void copy_map_tileset2_to_vram(const struct MapLayout *mapLayout) { - copy_tileset_patterns_to_vram(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY); + copy_tileset_patterns_to_vram(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY); } -void copy_map_tileset2_to_vram_2(const struct MapData *mapData) +void copy_map_tileset2_to_vram_2(const struct MapLayout *mapLayout) { - copy_tileset_patterns_to_vram2(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY); + copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY); } -void apply_map_tileset1_palette(const struct MapData *mapData) +void apply_map_tileset1_palette(const struct MapLayout *mapLayout) { - apply_map_tileset_palette(mapData->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2); + apply_map_tileset_palette(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2); } -void apply_map_tileset2_palette(const struct MapData *mapData) +void apply_map_tileset2_palette(const struct MapLayout *mapLayout) { - apply_map_tileset_palette(mapData->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2); + apply_map_tileset_palette(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2); } -void copy_map_tileset1_tileset2_to_vram(struct MapData const *mapData) +void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout) { - if (mapData) + if (mapLayout) { - copy_tileset_patterns_to_vram2(mapData->primaryTileset, NUM_TILES_IN_PRIMARY, 0); - copy_tileset_patterns_to_vram2(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY); + copy_tileset_patterns_to_vram2(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0); + copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY); } } -void apply_map_tileset1_tileset2_palette(struct MapData const *mapData) +void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout) { - if (mapData) + if (mapLayout) { - apply_map_tileset1_palette(mapData); - apply_map_tileset2_palette(mapData); + apply_map_tileset1_palette(mapLayout); + apply_map_tileset2_palette(mapLayout); } } diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c index 3a28c1adc..7d229ce3f 100644 --- a/src/fldeff_dig.c +++ b/src/fldeff_dig.c @@ -6,7 +6,7 @@ #include "overworld.h" #include "party_menu.h" #include "sprite.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" static void FieldCallback_Dig(void); static void sub_80C9AFC(void); diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 90abda81f..980b72d4f 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -13,9 +13,9 @@ #include "palette.h" #include "overworld.h" #include "wild_encounter.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "constants/songs.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" #include "constants/map_types.h" static void task08_080C9820(u8 taskId); @@ -31,10 +31,10 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); gPlayerFacingPosition.height = PlayerGetZCoord(); - mapObjId = GetFieldObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); - if (gMapObjects[mapObjId].graphicsId != graphicsId) + mapObjId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); + if (gObjectEvents[mapObjId].graphicsId != graphicsId) return FALSE; - gSpecialVar_LastTalked = gMapObjects[mapObjId].localId; + gSpecialVar_LastTalked = gObjectEvents[mapObjId].localId; return TRUE; } @@ -50,9 +50,9 @@ static void task08_080C9820(u8 taskId) ScriptContext2_Enable(); gPlayerAvatar.unk6 = TRUE; - mapObjId = gPlayerAvatar.mapObjectId; - if (!FieldObjectIsMovementOverridden(&gMapObjects[mapObjId]) - || FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId])) + mapObjId = gPlayerAvatar.objectEventId; + if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId]) + || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[mapObjId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -62,7 +62,7 @@ static void task08_080C9820(u8 taskId) else { sub_805CB70(); - FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 0x45); + ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], 0x45); gTasks[taskId].func = sub_80C98B0; } } @@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId) static void sub_80C98B0(u8 taskId) { - if (FieldObjectCheckHeldMovementStatus(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_80C98FC; @@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - EventObjectSetGraphicsId(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_80C99A0; @@ -106,7 +106,7 @@ static void sub_80C99A0(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if (CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_BREAKABLE_ROCK*/0x60) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_ROCK_SMASH_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_80C9A10; diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 3f3254ade..b8d5af31d 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -7,14 +7,14 @@ #include "fldeff.h" #include "event_scripts.h" #include "constants/songs.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" static void FldEff_UseStrength(void); static void sub_80D08A8(void); bool8 SetUpFieldMove_Strength(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_PUSHABLE_BOULDER*/0x61) != TRUE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_STRENGTH_BOULDER) != TRUE) { return FALSE; } diff --git a/src/item_use.c b/src/item_use.c index 256711463..46bd066f9 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -7,7 +7,7 @@ #include "event_data.h" #include "field_effect.h" #include "field_fadetransition.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "field_specials.h" #include "field_weather.h" @@ -19,8 +19,8 @@ #include "mail.h" #include "main.h" #include "malloc.h" -#include "map_obj_80688E4.h" -#include "map_obj_lock.h" +#include "event_object_80688E4.h" +#include "event_object_lock.h" #include "metatile_behavior.h" #include "new_menu_helpers.h" #include "overworld.h" @@ -223,7 +223,7 @@ static void sub_80A1184(void) static bool8 sub_80A1194(void) { - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); sub_807DC00(); CreateTask(sub_80A11C0, 10); @@ -235,7 +235,7 @@ static void sub_80A11C0(u8 taskId) { if (IsWeatherNotFadingIn() == TRUE) { - UnfreezeMapObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } diff --git a/src/itemfinder.c b/src/itemfinder.c index 05072c49e..370fce841 100644 --- a/src/itemfinder.c +++ b/src/itemfinder.c @@ -3,7 +3,7 @@ #include "new_menu_helpers.h" #include "strings.h" #include "event_scripts.h" -#include "map_obj_lock.h" +#include "event_object_lock.h" #include "script.h" #include "sound.h" #include "event_data.h" @@ -325,23 +325,23 @@ static bool8 HiddenItemInConnectedMapAtPos(struct MapConnection * connection, s3 case 2: localOffset = connection->offset + 7; localX = x - localOffset; - localLength = mapHeader->mapData->height - 7; + localLength = mapHeader->mapLayout->height - 7; localY = localLength + y; // additions are reversed for some reason break; case 1: localOffset = connection->offset + 7; localX = x - localOffset; - localLength = gMapHeader.mapData->height + 7; + localLength = gMapHeader.mapLayout->height + 7; localY = y - localLength; break; case 3: - localLength = mapHeader->mapData->width - 7; + localLength = mapHeader->mapLayout->width - 7; localX = localLength + x; // additions are reversed for some reason localOffset = connection->offset + 7; localY = y - localOffset; break; case 4: - localLength = gMapHeader.mapData->width + 7; + localLength = gMapHeader.mapLayout->width + 7; localX = x - localLength; localOffset = connection->offset + 7; localY = y - localOffset; @@ -356,8 +356,8 @@ static void FindHiddenItemsInConnectedMaps(u8 taskId) { s16 x, y; s16 curX, curY; - s16 width = gMapHeader.mapData->width + 7; - s16 height = gMapHeader.mapData->height + 7; + s16 width = gMapHeader.mapLayout->width + 7; + s16 height = gMapHeader.mapLayout->height + 7; s16 var1 = 7; s16 var2 = 7; diff --git a/src/load_save.c b/src/load_save.c index da469d4e6..3881646dd 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -174,32 +174,32 @@ void LoadPlayerParty(void) gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i]; } -void SaveMapObjects(void) +void SaveObjectEvents(void) { int i; - for (i = 0; i < NUM_FIELD_OBJECTS; i++) - gSaveBlock1Ptr->mapObjects[i] = gMapObjects[i]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i]; } -void LoadMapObjects(void) +void LoadObjectEvents(void) { int i; - for (i = 0; i < NUM_FIELD_OBJECTS; i++) - gMapObjects[i] = gSaveBlock1Ptr->mapObjects[i]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i]; } void SaveSerializedGame(void) { SavePlayerParty(); - SaveMapObjects(); + SaveObjectEvents(); } void LoadSerializedGame(void) { LoadPlayerParty(); - LoadMapObjects(); + LoadObjectEvents(); } void LoadPlayerBag(void) diff --git a/src/quest_log.c b/src/quest_log.c index 04369f1c2..6b25150f3 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -19,9 +19,9 @@ #include "overworld.h" #include "field_fadetransition.h" #include "field_weather.h" -#include "field_map_obj.h" -#include "map_obj_80688E4.h" -#include "map_obj_lock.h" +#include "event_object_movement.h" +#include "event_object_80688E4.h" +#include "event_object_lock.h" #include "field_player_avatar.h" #include "field_control_avatar.h" #include "battle.h" @@ -571,30 +571,30 @@ static void sub_8110BE8(u8 a0) sub_815A008(questLog); - for (i = 0; i < NELEMS(gSaveBlock1Ptr->mapObjectTemplates); i++) + for (i = 0; i < NELEMS(gSaveBlock1Ptr->objectEventTemplates); i++) { - if (gSaveBlock1Ptr->mapObjectTemplates[i].x < 0) + if (gSaveBlock1Ptr->objectEventTemplates[i].x < 0) { - questLog->npcData[i].x = -1 * gSaveBlock1Ptr->mapObjectTemplates[i].x; + questLog->npcData[i].x = -1 * gSaveBlock1Ptr->objectEventTemplates[i].x; questLog->npcData[i].negx = TRUE; } else { - questLog->npcData[i].x = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].x; + questLog->npcData[i].x = (u8)gSaveBlock1Ptr->objectEventTemplates[i].x; questLog->npcData[i].negx = FALSE; } - if (gSaveBlock1Ptr->mapObjectTemplates[i].y < 0) + if (gSaveBlock1Ptr->objectEventTemplates[i].y < 0) { - questLog->npcData[i].y = (-gSaveBlock1Ptr->mapObjectTemplates[i].y << 24) >> 24; + questLog->npcData[i].y = (-gSaveBlock1Ptr->objectEventTemplates[i].y << 24) >> 24; questLog->npcData[i].negy = TRUE; } else { - questLog->npcData[i].y = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].y; + questLog->npcData[i].y = (u8)gSaveBlock1Ptr->objectEventTemplates[i].y; questLog->npcData[i].negy = FALSE; } - questLog->npcData[i].elevation = gSaveBlock1Ptr->mapObjectTemplates[i].elevation; - questLog->npcData[i].movementType = gSaveBlock1Ptr->mapObjectTemplates[i].movementType; + questLog->npcData[i].elevation = gSaveBlock1Ptr->objectEventTemplates[i].elevation; + questLog->npcData[i].movementType = gSaveBlock1Ptr->objectEventTemplates[i].movementType; } } @@ -627,7 +627,7 @@ static void sub_8110D94(void) static void sub_8110E20(void) { - VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapDataId); + VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapLayoutId); } static void sub_8110E3C(void) @@ -776,18 +776,18 @@ static void sub_8111150(u8 a0) for (i = 0; i < 64; i++) { if (questLog->npcData[i].negx) - gSaveBlock1Ptr->mapObjectTemplates[i].x = -questLog->npcData[i].x; + gSaveBlock1Ptr->objectEventTemplates[i].x = -questLog->npcData[i].x; else - gSaveBlock1Ptr->mapObjectTemplates[i].x = questLog->npcData[i].x; + gSaveBlock1Ptr->objectEventTemplates[i].x = questLog->npcData[i].x; if (questLog->npcData[i].negy) - gSaveBlock1Ptr->mapObjectTemplates[i].y = -(u8)questLog->npcData[i].y; + gSaveBlock1Ptr->objectEventTemplates[i].y = -(u8)questLog->npcData[i].y; else - gSaveBlock1Ptr->mapObjectTemplates[i].y = questLog->npcData[i].y; - gSaveBlock1Ptr->mapObjectTemplates[i].elevation = questLog->npcData[i].elevation; - gSaveBlock1Ptr->mapObjectTemplates[i].movementType = questLog->npcData[i].movementType; + gSaveBlock1Ptr->objectEventTemplates[i].y = questLog->npcData[i].y; + gSaveBlock1Ptr->objectEventTemplates[i].elevation = questLog->npcData[i].elevation; + gSaveBlock1Ptr->objectEventTemplates[i].movementType = questLog->npcData[i].movementType; } - sub_815A1F8(questLog, gSaveBlock1Ptr->mapObjectTemplates); + sub_815A1F8(questLog, gSaveBlock1Ptr->objectEventTemplates); } void sub_8111274(u8 a0, u8 a1) @@ -984,11 +984,11 @@ void sub_8111708(void) { struct MapHeader sp0; - gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE); - if (gSaveBlock1Ptr->mapDataId == 0) + gSaveBlock1Ptr->mapLayoutId = VarGet(VAR_0x40AE); + if (gSaveBlock1Ptr->mapLayoutId == 0) { sp0 = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); - gSaveBlock1Ptr->mapDataId = sp0.mapDataId; + gSaveBlock1Ptr->mapLayoutId = sp0.mapLayoutId; } } @@ -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(); } } @@ -1532,12 +1532,12 @@ void sub_8112450(void) void sub_811246C(struct Sprite *sprite) { - struct MapObject *mapObject = &gMapObjects[sprite->data[0]]; - if (mapObject->localId == 0xFF) + struct ObjectEvent *objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->localId == 0xFF) { if (gUnknown_203AF9A[0][0] != 0xFF) { - FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[0][0]); + ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[0][0]); gUnknown_203AF9A[0][0] = 0xFF; } if (gUnknown_203AF9A[0][1] != 0xFF) @@ -1545,16 +1545,16 @@ void sub_811246C(struct Sprite *sprite) sub_8150454(); gUnknown_203AF9A[0][1] = 0xFF; } - sub_8063E28(mapObject, sprite); + sub_8063E28(objectEvent, sprite); } else { - if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF) + if (gUnknown_203AF9A[objectEvent->localId][0] != 0xFF) { - FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[mapObject->localId][0]); - gUnknown_203AF9A[mapObject->localId][0] = 0xFF; + ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[objectEvent->localId][0]); + gUnknown_203AF9A[objectEvent->localId][0] = 0xFF; } - sub_8063E28(mapObject, sprite); + sub_8063E28(objectEvent, sprite); } } diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c index 09cf47f93..7665a8a92 100644 --- a/src/quest_log_8150454.c +++ b/src/quest_log_8150454.c @@ -3,8 +3,7 @@ #include "script.h" #include "task.h" #include "field_player_avatar.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" #include "field_effect.h" #include "field_effect_helpers.h" #include "quest_log.h" @@ -20,7 +19,7 @@ static void sub_81507CC(void); static void sub_81507D8(void); static void sub_81507E4(void); static void sub_81507F0(void); -static void sub_81507BC(struct MapObject *a0, u8 a1); +static void sub_81507BC(struct ObjectEvent *a0, u8 a1); static void (*const gUnknown_8471EDC[])(void) = { sub_81504A8, @@ -57,25 +56,25 @@ void sub_8150498(u8 a0) static void sub_81504A8(void) { - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - sub_81507BC(mapObject, sub_805C808(0)); - FieldObjectTurn(mapObject, mapObject->placeholder18); + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sub_81507BC(objectEvent, sub_805C808(0)); + ObjectEventTurn(objectEvent, objectEvent->placeholder18); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } static void sub_81504E8(void) { - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - sub_81507BC(mapObject, sub_805C808(1)); - FieldObjectTurn(mapObject, mapObject->placeholder18); + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sub_81507BC(objectEvent, sub_805C808(1)); + ObjectEventTurn(objectEvent, objectEvent->placeholder18); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); sub_80BD620(0, 0); } static void sub_8150530(void) { - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - struct Sprite *sprite = &gSprites[mapObject->spriteId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct Sprite *sprite = &gSprites[objectEvent->spriteId]; if (gUnknown_3005E88 == 1 || gUnknown_3005E88 == 3) { @@ -87,23 +86,23 @@ static void sub_8150530(void) } else { - sub_81507BC(mapObject, sub_805C808(4)); - StartSpriteAnim(sprite, sub_80634F0(mapObject->facingDirection)); + sub_81507BC(objectEvent, sub_805C808(4)); + StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection)); } } static void sub_81505C4(u8 taskId) { - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - struct Sprite *sprite = &gSprites[mapObject->spriteId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct Sprite *sprite = &gSprites[objectEvent->spriteId]; switch (gTasks[taskId].data[0]) { case 0: - FieldObjectClearAnimIfSpecialAnimActive(mapObject); - mapObject->mapobj_bit_11 = TRUE; - sub_81507BC(mapObject, sub_805C808(4)); - StartSpriteAnim(sprite, sub_80634F0(mapObject->facingDirection)); + ObjectEventClearAnimIfSpecialAnimActive(objectEvent); + objectEvent->mapobj_bit_11 = TRUE; + sub_81507BC(objectEvent, sub_805C808(4)); + StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection)); gTasks[taskId].data[0]++; gTasks[taskId].data[1] = 0; break; @@ -123,10 +122,10 @@ static void sub_81505C4(u8 taskId) if (sprite->animEnded) { if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)) - sub_81507BC(mapObject, sub_805C808(0)); + sub_81507BC(objectEvent, sub_805C808(0)); else - sub_81507BC(mapObject, sub_805C808(2)); - FieldObjectTurn(mapObject, mapObject->placeholder18); + sub_81507BC(objectEvent, sub_805C808(2)); + ObjectEventTurn(objectEvent, objectEvent->placeholder18); sprite->pos2.x = 0; sprite->pos2.y = 0; ScriptContext2_Disable(); @@ -138,19 +137,19 @@ static void sub_81505C4(u8 taskId) static void sub_8150708(void) { - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; u8 fieldEffectId; if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)) { - sub_81507BC(mapObject, sub_805C808(2)); - FieldObjectTurn(mapObject, mapObject->placeholder18); + sub_81507BC(objectEvent, sub_805C808(2)); + ObjectEventTurn(objectEvent, objectEvent->placeholder18); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; - gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; + gFieldEffectArguments[0] = objectEvent->coords2.x; + gFieldEffectArguments[1] = objectEvent->coords2.y; + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; fieldEffectId = FieldEffectStart(FLDEFF_SURF_BLOB); - mapObject->mapobj_unk_1A = fieldEffectId; + objectEvent->mapobj_unk_1A = fieldEffectId; sub_80DC44C(fieldEffectId, 1); } } @@ -165,15 +164,15 @@ static void sub_8150794(u8 taskId) { if (!FieldEffectActiveListContains(0x41)) { - UnfreezeMapObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } } -static void sub_81507BC(struct MapObject * a0, u8 a1) +static void sub_81507BC(struct ObjectEvent * a0, u8 a1) { - EventObjectSetGraphicsId(a0, a1); + ObjectEventSetGraphicsId(a0, a1); } static void sub_81507CC(void) diff --git a/src/quest_log_815A008.c b/src/quest_log_815A008.c index fb49fc880..32d0becbf 100644 --- a/src/quest_log_815A008.c +++ b/src/quest_log_815A008.c @@ -11,125 +11,125 @@ void sub_815A008(struct QuestLog * questLog) { u32 i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - questLog->unk_008[i].active = gMapObjects[i].active; - questLog->unk_008[i].mapobj_bit_3 = gMapObjects[i].mapobj_bit_3; - questLog->unk_008[i].mapobj_bit_4 = gMapObjects[i].mapobj_bit_4; - questLog->unk_008[i].mapobj_bit_5 = gMapObjects[i].mapobj_bit_5; - questLog->unk_008[i].mapobj_bit_8 = gMapObjects[i].mapobj_bit_8; - questLog->unk_008[i].mapobj_bit_9 = gMapObjects[i].mapobj_bit_9; - questLog->unk_008[i].mapobj_bit_10 = gMapObjects[i].mapobj_bit_10; - questLog->unk_008[i].mapobj_bit_11 = gMapObjects[i].mapobj_bit_11; - questLog->unk_008[i].mapobj_bit_12 = gMapObjects[i].mapobj_bit_12; - questLog->unk_008[i].mapobj_bit_13 = gMapObjects[i].mapobj_bit_13; - questLog->unk_008[i].mapobj_bit_14 = gMapObjects[i].mapobj_bit_14; - questLog->unk_008[i].mapobj_bit_15 = gMapObjects[i].mapobj_bit_15; - questLog->unk_008[i].mapobj_bit_16 = gMapObjects[i].mapobj_bit_16; - questLog->unk_008[i].mapobj_bit_23 = gMapObjects[i].mapobj_bit_23; - questLog->unk_008[i].mapobj_bit_24 = gMapObjects[i].mapobj_bit_24; - questLog->unk_008[i].mapobj_bit_25 = gMapObjects[i].mapobj_bit_25; - questLog->unk_008[i].mapobj_bit_26 = gMapObjects[i].mapobj_bit_26; - questLog->unk_008[i].mapobj_unk_18 = gMapObjects[i].facingDirection; - questLog->unk_008[i].mapobj_unk_0B_0 = gMapObjects[i].mapobj_unk_0B_0; - questLog->unk_008[i].elevation = gMapObjects[i].elevation; - questLog->unk_008[i].graphicsId = gMapObjects[i].graphicsId; - questLog->unk_008[i].animPattern = gMapObjects[i].animPattern; - questLog->unk_008[i].trainerType = gMapObjects[i].trainerType; - questLog->unk_008[i].localId = gMapObjects[i].localId; - questLog->unk_008[i].mapNum = gMapObjects[i].mapNum; - questLog->unk_008[i].mapGroup = gMapObjects[i].mapGroup; - questLog->unk_008[i].x = gMapObjects[i].coords2.x; - questLog->unk_008[i].y = gMapObjects[i].coords2.y; - questLog->unk_008[i].trainerRange_berryTreeId = gMapObjects[i].trainerRange_berryTreeId; - questLog->unk_008[i].mapobj_unk_1F = gMapObjects[i].mapobj_unk_1F; - questLog->unk_008[i].mapobj_unk_21 = gMapObjects[i].mapobj_unk_21; - questLog->unk_008[i].animId = gMapObjects[i].animId; + questLog->unk_008[i].active = gObjectEvents[i].active; + questLog->unk_008[i].mapobj_bit_3 = gObjectEvents[i].mapobj_bit_3; + questLog->unk_008[i].mapobj_bit_4 = gObjectEvents[i].mapobj_bit_4; + questLog->unk_008[i].mapobj_bit_5 = gObjectEvents[i].mapobj_bit_5; + questLog->unk_008[i].mapobj_bit_8 = gObjectEvents[i].mapobj_bit_8; + questLog->unk_008[i].mapobj_bit_9 = gObjectEvents[i].mapobj_bit_9; + questLog->unk_008[i].mapobj_bit_10 = gObjectEvents[i].mapobj_bit_10; + questLog->unk_008[i].mapobj_bit_11 = gObjectEvents[i].mapobj_bit_11; + questLog->unk_008[i].mapobj_bit_12 = gObjectEvents[i].mapobj_bit_12; + questLog->unk_008[i].mapobj_bit_13 = gObjectEvents[i].mapobj_bit_13; + questLog->unk_008[i].mapobj_bit_14 = gObjectEvents[i].mapobj_bit_14; + questLog->unk_008[i].mapobj_bit_15 = gObjectEvents[i].mapobj_bit_15; + questLog->unk_008[i].mapobj_bit_16 = gObjectEvents[i].mapobj_bit_16; + questLog->unk_008[i].mapobj_bit_23 = gObjectEvents[i].mapobj_bit_23; + questLog->unk_008[i].mapobj_bit_24 = gObjectEvents[i].mapobj_bit_24; + questLog->unk_008[i].mapobj_bit_25 = gObjectEvents[i].mapobj_bit_25; + questLog->unk_008[i].mapobj_bit_26 = gObjectEvents[i].mapobj_bit_26; + questLog->unk_008[i].mapobj_unk_18 = gObjectEvents[i].facingDirection; + questLog->unk_008[i].mapobj_unk_0B_0 = gObjectEvents[i].mapobj_unk_0B_0; + questLog->unk_008[i].elevation = gObjectEvents[i].elevation; + questLog->unk_008[i].graphicsId = gObjectEvents[i].graphicsId; + questLog->unk_008[i].animPattern = gObjectEvents[i].animPattern; + questLog->unk_008[i].trainerType = gObjectEvents[i].trainerType; + questLog->unk_008[i].localId = gObjectEvents[i].localId; + questLog->unk_008[i].mapNum = gObjectEvents[i].mapNum; + questLog->unk_008[i].mapGroup = gObjectEvents[i].mapGroup; + questLog->unk_008[i].x = gObjectEvents[i].coords2.x; + questLog->unk_008[i].y = gObjectEvents[i].coords2.y; + questLog->unk_008[i].trainerRange_berryTreeId = gObjectEvents[i].trainerRange_berryTreeId; + questLog->unk_008[i].mapobj_unk_1F = gObjectEvents[i].mapobj_unk_1F; + questLog->unk_008[i].mapobj_unk_21 = gObjectEvents[i].mapobj_unk_21; + questLog->unk_008[i].animId = gObjectEvents[i].animId; } } -void sub_815A1F8(const struct QuestLog * questLog, const struct MapObjectTemplate * templates) +void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates) { u32 i, j; - const struct QuestLogMapObject * questLogMapObjects = questLog->unk_008; + const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008; - CpuFill16(0, gMapObjects, sizeof(gMapObjects)); + CpuFill16(0, gObjectEvents, sizeof(gObjectEvents)); - for (i = 0; i < MAP_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - gMapObjects[i].active = questLogMapObjects[i].active; - gMapObjects[i].mapobj_bit_3 = questLogMapObjects[i].mapobj_bit_3; - gMapObjects[i].mapobj_bit_4 = questLogMapObjects[i].mapobj_bit_4; - gMapObjects[i].mapobj_bit_5 = questLogMapObjects[i].mapobj_bit_5; - gMapObjects[i].mapobj_bit_8 = questLogMapObjects[i].mapobj_bit_8; - gMapObjects[i].mapobj_bit_9 = questLogMapObjects[i].mapobj_bit_9; - gMapObjects[i].mapobj_bit_10 = questLogMapObjects[i].mapobj_bit_10; - gMapObjects[i].mapobj_bit_11 = questLogMapObjects[i].mapobj_bit_11; - gMapObjects[i].mapobj_bit_12 = questLogMapObjects[i].mapobj_bit_12; - gMapObjects[i].mapobj_bit_13 = questLogMapObjects[i].mapobj_bit_13; - gMapObjects[i].mapobj_bit_14 = questLogMapObjects[i].mapobj_bit_14; - gMapObjects[i].mapobj_bit_15 = questLogMapObjects[i].mapobj_bit_15; - gMapObjects[i].mapobj_bit_16 = questLogMapObjects[i].mapobj_bit_16; - gMapObjects[i].mapobj_bit_23 = questLogMapObjects[i].mapobj_bit_23; - gMapObjects[i].mapobj_bit_24 = questLogMapObjects[i].mapobj_bit_24; - gMapObjects[i].mapobj_bit_25 = questLogMapObjects[i].mapobj_bit_25; - gMapObjects[i].mapobj_bit_26 = questLogMapObjects[i].mapobj_bit_26; - gMapObjects[i].facingDirection = questLogMapObjects[i].mapobj_unk_18; - gMapObjects[i].mapobj_unk_0B_0 = questLogMapObjects[i].mapobj_unk_0B_0; - gMapObjects[i].elevation = questLogMapObjects[i].elevation; - gMapObjects[i].graphicsId = questLogMapObjects[i].graphicsId; - gMapObjects[i].animPattern = questLogMapObjects[i].animPattern; - gMapObjects[i].trainerType = questLogMapObjects[i].trainerType; - gMapObjects[i].localId = questLogMapObjects[i].localId; - gMapObjects[i].mapNum = questLogMapObjects[i].mapNum; - gMapObjects[i].mapGroup = questLogMapObjects[i].mapGroup; - gMapObjects[i].coords2.x = questLogMapObjects[i].x; - gMapObjects[i].coords2.y = questLogMapObjects[i].y; - gMapObjects[i].trainerRange_berryTreeId = questLogMapObjects[i].trainerRange_berryTreeId; - gMapObjects[i].mapobj_unk_1F = questLogMapObjects[i].mapobj_unk_1F; - gMapObjects[i].mapobj_unk_21 = questLogMapObjects[i].mapobj_unk_21; - gMapObjects[i].animId = questLogMapObjects[i].animId; + gObjectEvents[i].active = questLogObjectEvents[i].active; + gObjectEvents[i].mapobj_bit_3 = questLogObjectEvents[i].mapobj_bit_3; + gObjectEvents[i].mapobj_bit_4 = questLogObjectEvents[i].mapobj_bit_4; + gObjectEvents[i].mapobj_bit_5 = questLogObjectEvents[i].mapobj_bit_5; + gObjectEvents[i].mapobj_bit_8 = questLogObjectEvents[i].mapobj_bit_8; + gObjectEvents[i].mapobj_bit_9 = questLogObjectEvents[i].mapobj_bit_9; + gObjectEvents[i].mapobj_bit_10 = questLogObjectEvents[i].mapobj_bit_10; + gObjectEvents[i].mapobj_bit_11 = questLogObjectEvents[i].mapobj_bit_11; + gObjectEvents[i].mapobj_bit_12 = questLogObjectEvents[i].mapobj_bit_12; + gObjectEvents[i].mapobj_bit_13 = questLogObjectEvents[i].mapobj_bit_13; + gObjectEvents[i].mapobj_bit_14 = questLogObjectEvents[i].mapobj_bit_14; + gObjectEvents[i].mapobj_bit_15 = questLogObjectEvents[i].mapobj_bit_15; + gObjectEvents[i].mapobj_bit_16 = questLogObjectEvents[i].mapobj_bit_16; + gObjectEvents[i].mapobj_bit_23 = questLogObjectEvents[i].mapobj_bit_23; + gObjectEvents[i].mapobj_bit_24 = questLogObjectEvents[i].mapobj_bit_24; + gObjectEvents[i].mapobj_bit_25 = questLogObjectEvents[i].mapobj_bit_25; + gObjectEvents[i].mapobj_bit_26 = questLogObjectEvents[i].mapobj_bit_26; + gObjectEvents[i].facingDirection = questLogObjectEvents[i].mapobj_unk_18; + gObjectEvents[i].mapobj_unk_0B_0 = questLogObjectEvents[i].mapobj_unk_0B_0; + gObjectEvents[i].elevation = questLogObjectEvents[i].elevation; + gObjectEvents[i].graphicsId = questLogObjectEvents[i].graphicsId; + gObjectEvents[i].animPattern = questLogObjectEvents[i].animPattern; + gObjectEvents[i].trainerType = questLogObjectEvents[i].trainerType; + gObjectEvents[i].localId = questLogObjectEvents[i].localId; + gObjectEvents[i].mapNum = questLogObjectEvents[i].mapNum; + gObjectEvents[i].mapGroup = questLogObjectEvents[i].mapGroup; + gObjectEvents[i].coords2.x = questLogObjectEvents[i].x; + gObjectEvents[i].coords2.y = questLogObjectEvents[i].y; + gObjectEvents[i].trainerRange_berryTreeId = questLogObjectEvents[i].trainerRange_berryTreeId; + gObjectEvents[i].mapobj_unk_1F = questLogObjectEvents[i].mapobj_unk_1F; + gObjectEvents[i].mapobj_unk_21 = questLogObjectEvents[i].mapobj_unk_21; + gObjectEvents[i].animId = questLogObjectEvents[i].animId; for (j = 0; j < 0x40; j++) { - if (gMapObjects[i].localId == templates[j].localId) + if (gObjectEvents[i].localId == templates[j].localId) { - gMapObjects[i].coords1.x = templates[j].x + 7; - gMapObjects[i].coords1.y = templates[j].y + 7; - gMapObjects[i].range.as_nybbles.x = templates[j].movementRangeX; - gMapObjects[i].range.as_nybbles.y = templates[j].movementRangeY; + gObjectEvents[i].coords1.x = templates[j].x + 7; + gObjectEvents[i].coords1.y = templates[j].y + 7; + gObjectEvents[i].range.as_nybbles.x = templates[j].movementRangeX; + gObjectEvents[i].range.as_nybbles.y = templates[j].movementRangeY; } } - gMapObjects[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gMapObjects[i].coords2.x, gMapObjects[i].coords2.y); - if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y))) + gObjectEvents[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gObjectEvents[i].coords2.x, gObjectEvents[i].coords2.y); + if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y))) { - gMapObjects[i].coords3.x = gMapObjects[i].coords2.x; - gMapObjects[i].coords3.y = gMapObjects[i].coords2.y; + gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x; + gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y; } - else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x - 1), (s16)(gMapObjects[i].coords2.y))) + else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x - 1), (s16)(gObjectEvents[i].coords2.y))) { - gMapObjects[i].coords3.x = gMapObjects[i].coords2.x - 1; - gMapObjects[i].coords3.y = gMapObjects[i].coords2.y; + gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x - 1; + gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y; } - else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x + 1), (s16)(gMapObjects[i].coords2.y))) + else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x + 1), (s16)(gObjectEvents[i].coords2.y))) { - gMapObjects[i].coords3.x = gMapObjects[i].coords2.x + 1; - gMapObjects[i].coords3.y = gMapObjects[i].coords2.y; + gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x + 1; + gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y; } - else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y - 1))) + else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y - 1))) { - gMapObjects[i].coords3.x = gMapObjects[i].coords2.x; - gMapObjects[i].coords3.y = gMapObjects[i].coords2.y - 1; + gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x; + gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y - 1; } - else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y + 1))) + else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y + 1))) { - gMapObjects[i].coords3.x = gMapObjects[i].coords2.x; - gMapObjects[i].coords3.y = gMapObjects[i].coords2.y + 1; + gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x; + gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y + 1; } } - CpuCopy16(gMapObjects, gSaveBlock1Ptr->mapObjects, sizeof(gMapObjects)); + CpuCopy16(gObjectEvents, gSaveBlock1Ptr->objectEvents, sizeof(gObjectEvents)); } void sub_815A540(void) @@ -141,9 +141,9 @@ void sub_815A540(void) PlayerGetDestCoords(&x, &y); if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) { - struct MapObject * mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; SetPlayerAvatarTransitionFlags(0x01); - DestroySprite(&gSprites[mapObject->mapobj_unk_1A]); + DestroySprite(&gSprites[objectEvent->mapobj_unk_1A]); } } } diff --git a/src/scrcmd.c b/src/scrcmd.c index 9675a132e..6a5d61227 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -16,9 +16,8 @@ #include "field_player_avatar.h" #include "sound.h" #include "script_movement.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" -#include "map_obj_lock.h" +#include "event_object_movement.h" +#include "event_object_lock.h" #include "field_message_box.h" #include "new_menu_helpers.h" #include "window.h" @@ -60,7 +59,7 @@ static EWRAM_DATA u16 sFieldEffectScriptId = 0; struct ScriptContext * gUnknown_3005070; -extern u8 gSelectedEventObject; +extern u8 gSelectedObjectEvent; // This is defined in here so the optimizer can't see its value when compiling // script.c. @@ -1048,7 +1047,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - RemoveFieldObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1058,7 +1057,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - RemoveFieldObjectByLocalIdAndMap(objectId, mapNum, mapGroup); + RemoveObjectEventByLocalIdAndMap(objectId, mapNum, mapGroup); return FALSE; } @@ -1151,9 +1150,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx) bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) { - if (gMapObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedEventObject], + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], GetPlayerFacingDirection()); } return FALSE; @@ -1164,7 +1163,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 direction = ScriptReadByte(ctx); - FieldObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); + ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); return FALSE; } @@ -1207,7 +1206,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } else { - ScriptFreezeMapObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_8069590); return TRUE; } @@ -1221,14 +1220,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } else { - if (gMapObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - LockSelectedMapObject(); + LockSelectedObjectEvent(); SetupNativeScript(ctx, sub_8069648); } else { - ScriptFreezeMapObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_8069590); } return TRUE; @@ -1240,10 +1239,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - playerObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearHeldMovementIfFinished(&gMapObjects[playerObjectId]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); sub_80974D8(); - UnfreezeMapObjects(); + UnfreezeObjectEvents(); return FALSE; } @@ -1252,12 +1251,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - if (gMapObjects[gSelectedEventObject].active) - FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedEventObject]); - playerObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearHeldMovementIfFinished(&gMapObjects[playerObjectId]); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); sub_80974D8(); - UnfreezeMapObjects(); + UnfreezeObjectEvents(); return FALSE; } diff --git a/src/sea_cottage_special_anim.c b/src/sea_cottage_special_anim.c index 18a8da234..56d01ca29 100644 --- a/src/sea_cottage_special_anim.c +++ b/src/sea_cottage_special_anim.c @@ -4,7 +4,7 @@ #include "menu.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_camera.h" static EWRAM_DATA u8 gUnknown_2039984 = 0; diff --git a/src/shop.c b/src/shop.c index 12f3f3263..0eb4baaa1 100644 --- a/src/shop.c +++ b/src/shop.c @@ -31,7 +31,7 @@ #include "menu_indicators.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "money.h" #include "quest_log.h" #include "script.h" @@ -55,7 +55,7 @@ enum // shop view window NPC info enum enum { - EVENT_OBJ_ID, + OBJECT_EVENT_ID, X_COORD, Y_COORD, ANIM_NUM @@ -89,7 +89,7 @@ struct MartHistory /*0x0B*/ u8 unkB; }; /* size = 12 */ -static EWRAM_DATA s16 sViewportMapObjects[MAP_OBJECTS_COUNT][4] = {0}; +static EWRAM_DATA s16 sViewportObjectEvents[OBJECT_EVENTS_COUNT][4] = {0}; EWRAM_DATA struct ShopData gShopData = {0}; static EWRAM_DATA u8 sShopMenuWindowId = 0; EWRAM_DATA u16 (*gShopTilemapBuffer1)[0x400] = {0}; @@ -139,8 +139,8 @@ 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 BuyMenuDrawEventObjects(void); +static void BuyMenuCollectObjectEventData(void); +static void BuyMenuDrawObjectEvents(void); static void BuyMenuCopyTilemapData(void); static void BuyMenuPrintItemQuantityAndPrice(u8 taskId); static void Task_BuyMenu(u8 taskId); @@ -735,19 +735,19 @@ static void BuyMenuRemoveScrollIndicatorArrows(void) static void sub_809B764(void) { - BuyMenuCollectEventObjectData(); - BuyMenuDrawEventObjects(); + BuyMenuCollectObjectEventData(); + BuyMenuDrawObjectEvents(); BuyMenuDrawMapBg(); } static void BuyMenuDrawMapBg(void) { s16 i, j, x, y; - const struct MapData *mapData; + const struct MapLayout *mapLayout; u16 metatile; u8 metatileLayerType; - mapData = gMapHeader.mapData; + mapLayout = gMapHeader.mapLayout; GetXYCoordsOneStepInFrontOfPlayer(&x, &y); x -= 2; y -= 3; @@ -761,11 +761,11 @@ static void BuyMenuDrawMapBg(void) if (metatile < NUM_METATILES_IN_PRIMARY) { - BuyMenuDrawMapMetatile(i, j, (u16*)mapData->primaryTileset->metatiles + metatile * 8, metatileLayerType); + BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType); } else { - BuyMenuDrawMapMetatile(i, j, (u16*)mapData->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType); + BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType); } } } @@ -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; @@ -810,34 +810,34 @@ static void BuyMenuCollectEventObjectData(void) GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); z = PlayerGetZCoord(); - for (y = 0; y < MAP_OBJECTS_COUNT; y++) - sViewportMapObjects[y][EVENT_OBJ_ID] = MAP_OBJECTS_COUNT; + for (y = 0; y < OBJECT_EVENTS_COUNT; y++) + sViewportObjectEvents[y][OBJECT_EVENT_ID] = OBJECT_EVENTS_COUNT; for (y = 0; y < 5; y++) { for (x = 0; x < 7; x++) { - u8 eventObjId = GetFieldObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, z); - if (eventObjId != MAP_OBJECTS_COUNT) + u8 eventObjId = GetObjectEventIdByXYZ(facingX - 3 + x, facingY - 2 + y, z); + if (eventObjId != OBJECT_EVENTS_COUNT) { - sViewportMapObjects[num][EVENT_OBJ_ID] = eventObjId; - sViewportMapObjects[num][X_COORD] = x; - sViewportMapObjects[num][Y_COORD] = y; + sViewportObjectEvents[num][OBJECT_EVENT_ID] = eventObjId; + sViewportObjectEvents[num][X_COORD] = x; + sViewportObjectEvents[num][Y_COORD] = y; - switch (gMapObjects[eventObjId].facingDirection) + switch (gObjectEvents[eventObjId].facingDirection) { case DIR_SOUTH: - sViewportMapObjects[num][ANIM_NUM] = 0; + sViewportObjectEvents[num][ANIM_NUM] = 0; break; case DIR_NORTH: - sViewportMapObjects[num][ANIM_NUM] = 1; + sViewportObjectEvents[num][ANIM_NUM] = 1; break; case DIR_WEST: - sViewportMapObjects[num][ANIM_NUM] = 2; + sViewportObjectEvents[num][ANIM_NUM] = 2; break; case DIR_EAST: default: - sViewportMapObjects[num][ANIM_NUM] = 3; + sViewportObjectEvents[num][ANIM_NUM] = 3; break; } num++; @@ -846,24 +846,24 @@ static void BuyMenuCollectEventObjectData(void) } } -static void BuyMenuDrawEventObjects(void) +static void BuyMenuDrawObjectEvents(void) { u8 i, spriteId; - const struct MapObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (sViewportMapObjects[i][EVENT_OBJ_ID] == MAP_OBJECTS_COUNT) + if (sViewportObjectEvents[i][OBJECT_EVENT_ID] == OBJECT_EVENTS_COUNT) continue; - graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[sViewportMapObjects[i][EVENT_OBJ_ID]].graphicsId); - spriteId = AddPseudoEventObject( - gMapObjects[sViewportMapObjects[i][EVENT_OBJ_ID]].graphicsId, + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId); + spriteId = AddPseudoObjectEvent( + gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId, SpriteCallbackDummy, - (u16)sViewportMapObjects[i][X_COORD] * 16 - 8, - (u16)sViewportMapObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2, + (u16)sViewportObjectEvents[i][X_COORD] * 16 - 8, + (u16)sViewportObjectEvents[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2, 2); - StartSpriteAnim(&gSprites[spriteId], sViewportMapObjects[i][ANIM_NUM]); + StartSpriteAnim(&gSprites[spriteId], sViewportObjectEvents[i][ANIM_NUM]); } } diff --git a/src/ss_anne.c b/src/ss_anne.c index 19c3c8e08..401f4e235 100644 --- a/src/ss_anne.c +++ b/src/ss_anne.c @@ -1,7 +1,7 @@ #include "global.h" #include "task.h" #include "sound.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "script.h" #include "constants/songs.h" @@ -103,8 +103,8 @@ static void Task_SSAnneInit(u8 taskId) static void Task_SSAnneRun(u8 taskId) { s16 * data = gTasks[taskId].data; - u8 mapObjectId; - struct MapObject * boatObject; + u8 objectEventId; + struct ObjectEvent * boatObject; s16 x; data[1]++; @@ -114,8 +114,8 @@ static void Task_SSAnneRun(u8 taskId) data[1] = 0; CreateSmokeSprite(); } - TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId); - boatObject = &gMapObjects[mapObjectId]; + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + boatObject = &gObjectEvents[objectEventId]; if (gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x < -120) { PlaySE(SE_KITEKI); @@ -143,13 +143,13 @@ static void Task_SSAnneFinish(u8 taskId) static void CreateWakeBehindBoat(void) { - u8 mapObjectId; - struct MapObject * boatObject; + u8 objectEventId; + struct ObjectEvent * boatObject; u16 x; u8 spriteId; - TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId); - boatObject = &gMapObjects[mapObjectId]; + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + boatObject = &gObjectEvents[objectEventId]; x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 80; spriteId = CreateSprite(&sWakeSpriteTemplate, x, 109, 0xFF); gSprites[spriteId].oam.priority = 2; @@ -158,12 +158,12 @@ static void CreateWakeBehindBoat(void) static void WakeSpriteCallback(struct Sprite * sprite) { - u8 mapObjectId; - struct MapObject * boatObject; + u8 objectEventId; + struct ObjectEvent * boatObject; u16 x; - TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId); - boatObject = &gMapObjects[mapObjectId]; + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + boatObject = &gObjectEvents[objectEventId]; x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 80; sprite->pos1.x = x; if (sprite->data[0] / 6 < 22) @@ -175,13 +175,13 @@ static void WakeSpriteCallback(struct Sprite * sprite) static void CreateSmokeSprite(void) { - u8 mapObjectId; - struct MapObject * boatObject; + u8 objectEventId; + struct ObjectEvent * boatObject; u16 x; u8 spriteId; - TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId); - boatObject = &gMapObjects[mapObjectId]; + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + boatObject = &gObjectEvents[objectEventId]; x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 49; if ((s16)x >= -32) { diff --git a/src/start_menu.c b/src/start_menu.c index 31bb3beb7..59bfb8643 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -23,8 +23,8 @@ #include "field_fadetransition.h" #include "field_player_avatar.h" #include "new_menu_helpers.h" -#include "map_obj_80688E4.h" -#include "map_obj_lock.h" +#include "event_object_80688E4.h" +#include "event_object_lock.h" #include "script.h" #include "sound.h" #include "quest_log.h" @@ -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 2720f3204..11d4a80b1 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -15,7 +15,7 @@ #include "item_menu.h" #include "item.h" #include "menu_indicators.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "random.h" #include "text.h" #include "constants/songs.h" @@ -112,11 +112,11 @@ static void TeachyTvGrassAnimationObjCallback(struct Sprite *sprite); static void TeachyTvRestorePlayerPartyCallback(void); static void TeachyTvPreBattleAnimAndSetBattleCallback(u8 taskId); static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u16 size); -static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapData *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset); +static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset); static void TeachyTvComputeMapTilesFromTilesetAndMetaTiles(u16 *metaTilesArray, u8 *blockBuf, u8 *tileset); static void TeachyTvComputeSingleMapTileBlockFromTilesetAndMetaTiles(u8 *blockBuf, u8 *tileset, u8 metaTile); static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 metaTile); -static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 *palIndexArray); +static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 *palIndexArray); static const struct BgTemplate sBgTemplates[] = { @@ -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; @@ -1125,7 +1125,7 @@ static void TeachyTvGrassAnimationMain(u8 taskId, s16 x, s16 y, u8 subpriority, if (sResources->grassAnimDisabled != 1 && TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(x - 0x10, y)) { - spriteId = CreateSprite(gUnknown_83A0010[4], 0, 0, subpriority); + spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[4], 0, 0, subpriority); obj = &gSprites[spriteId]; obj->pos2.x = x; obj->pos2.y = y + 8; @@ -1240,7 +1240,7 @@ static void TeachyTvLoadBg3Map(u16 *buffer) void * tilesetsBuffer; void * palIndicesBuffer; u16 numMapTilesRows = 0; - const struct MapData *layout = &Route1_Layout; + const struct MapLayout *layout = &Route1_Layout; u16 * blockIndicesBuffer = AllocZeroed(0x800); tilesetsBuffer = AllocZeroed(0x8000); palIndicesBuffer = Alloc(16); @@ -1307,7 +1307,7 @@ static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u1 } } -static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapData *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset) +static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset) { u16 * metaTileEntryAddr = mapEntry <= 0x27F ? &((u16*)(mStruct->primaryTileset->metatiles))[8 * mapEntry] : &((u16*)(mStruct->secondaryTileset->metatiles))[8 * (mapEntry - 0x280)]; buf1[0] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[0]) << 12) + 4 * offset; @@ -1397,7 +1397,7 @@ static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 return (0xF - i); } -static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 * palIndexArray) +static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 * palIndexArray) { u8 i; const struct Tileset * ts; diff --git a/src/tileset_anims.c b/src/tileset_anims.c index a8539a5d8..44e86448f 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -194,8 +194,8 @@ static void _InitPrimaryTilesetAnimation(void) sPrimaryTilesetAnimCounter = 0; sPrimaryTilesetAnimCounterMax = 0; sPrimaryTilesetAnimCallback = NULL; - if (gMapHeader.mapData->primaryTileset && gMapHeader.mapData->primaryTileset->callback) - gMapHeader.mapData->primaryTileset->callback(); + if (gMapHeader.mapLayout->primaryTileset && gMapHeader.mapLayout->primaryTileset->callback) + gMapHeader.mapLayout->primaryTileset->callback(); } static void _InitSecondaryTilesetAnimation(void) @@ -203,8 +203,8 @@ static void _InitSecondaryTilesetAnimation(void) sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 0; sSecondaryTilesetAnimCallback = NULL; - if (gMapHeader.mapData->secondaryTileset && gMapHeader.mapData->secondaryTileset->callback) - gMapHeader.mapData->secondaryTileset->callback(); + if (gMapHeader.mapLayout->secondaryTileset && gMapHeader.mapLayout->secondaryTileset->callback) + gMapHeader.mapLayout->secondaryTileset->callback(); } static void sub_80700A4(u16 timer) diff --git a/src/trade.c b/src/trade.c index 4921a1ba3..f52950d82 100644 --- a/src/trade.c +++ b/src/trade.c @@ -142,7 +142,7 @@ static u32 sub_804FA14(struct Pokemon * party, int partyCount, int cursorPos); static const size_t gUnknown_8260814[] = { sizeof(struct SaveBlock2), sizeof(struct SaveBlock1), - sizeof(struct MapData), + sizeof(struct MapLayout), 0x530, // unk 0x34, // unk sizeof(struct MailStruct), diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 19d44d7cc..dd00bf854 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -30,7 +30,7 @@ #include "constants/layouts.h" #include "constants/trainers.h" #include "constants/facility_trainer_classes.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" struct UnkStruct_203F458 { @@ -113,102 +113,102 @@ extern const u8 gUnknown_83FE998[]; extern const u8 *const gUnknown_83FE9C4[]; static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { - {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE}, - {MAP_OBJ_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC, MALE}, - {MAP_OBJ_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE}, - {MAP_OBJ_GFX_TUBER_M_2, FACILITY_CLASS_TUBER_2, MALE}, - {MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER, MALE}, - {MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_2, FEMALE}, - {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE}, - {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_LADY, FEMALE}, - {MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_BEAUTY, FEMALE}, - {MAP_OBJ_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE}, - {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE}, - {MAP_OBJ_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE, MALE}, - {MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE}, - {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE}, - {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE}, - {MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE}, - {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE}, - {MAP_OBJ_GFX_BOY, FACILITY_CLASS_PSYCHIC, MALE}, - {MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_2, FEMALE}, - {MAP_OBJ_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE}, - {MAP_OBJ_GFX_BOY, FACILITY_CLASS_SCHOOL_KID, MALE}, - {MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_SCHOOL_KID_2, FEMALE}, - {MAP_OBJ_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN, MALE}, - {MAP_OBJ_GFX_WOMAN_3, FACILITY_CLASS_POKEFAN_2, FEMALE}, - {MAP_OBJ_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT, MALE}, - {MAP_OBJ_GFX_OLD_WOMAN, FACILITY_CLASS_EXPERT_2, FEMALE}, - {MAP_OBJ_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER, MALE}, - {MAP_OBJ_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE}, - {MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE}, - {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE}, - {MAP_OBJ_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE}, - {MAP_OBJ_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE}, - {MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE}, - {MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE, FEMALE}, - {MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE}, - {MAP_OBJ_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE}, - {MAP_OBJ_GFX_FAT_MAN, FACILITY_CLASS_COLLECTOR, MALE}, - {MAP_OBJ_GFX_MAN, FACILITY_CLASS_PKMN_BREEDER, MALE}, - {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_2, FEMALE}, - {MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER, MALE}, - {MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_2, FEMALE}, - {MAP_OBJ_GFX_LASS, FACILITY_CLASS_LASS, FEMALE}, - {MAP_OBJ_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER, MALE}, - {MAP_OBJ_GFX_HIKER, FACILITY_CLASS_HIKER, MALE}, - {MAP_OBJ_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER_2, MALE}, - {MAP_OBJ_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER_2, MALE}, - {MAP_OBJ_GFX_LASS, FACILITY_CLASS_LASS_2, FEMALE}, - {MAP_OBJ_GFX_SAILOR, FACILITY_CLASS_SAILOR_2, MALE}, - {MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_CAMPER_2, MALE}, - {MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PICNICKER_2, FEMALE}, - {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC_2, MALE}, - {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE}, - {MAP_OBJ_GFX_HIKER, FACILITY_CLASS_HIKER_2, MALE}, - {MAP_OBJ_GFX_BIKER, FACILITY_CLASS_BIKER, MALE}, - {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE}, - {MAP_OBJ_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE}, - {MAP_OBJ_GFX_FISHER, FACILITY_CLASS_FISHERMAN_2, MALE}, - {MAP_OBJ_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2, MALE}, - {MAP_OBJ_GFX_BIKER, FACILITY_CLASS_CUE_BALL, MALE}, - {MAP_OBJ_GFX_OLD_MAN_1, FACILITY_CLASS_GAMER, MALE}, - {MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_BEAUTY_2, FEMALE}, - {MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE}, - {MAP_OBJ_GFX_BOY, FACILITY_CLASS_PSYCHIC_3, MALE}, - {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_ROCKER, MALE}, - {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE}, - {MAP_OBJ_GFX_MAN, FACILITY_CLASS_TAMER, MALE}, - {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER_2, MALE}, - {MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT_2, MALE}, - {MAP_OBJ_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE}, - {MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_3, MALE}, - {MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_4, FEMALE}, - {MAP_OBJ_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_2, MALE}, - {MAP_OBJ_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE}, - {MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_4, FEMALE}, - {MAP_OBJ_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE}, - {MAP_OBJ_GFX_TUBER_F, FACILITY_CLASS_TUBER_3, FEMALE}, - {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_3, FEMALE}, - {MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_3, MALE}, - {MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_4, FEMALE}, - {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY_2, FEMALE}, - {MAP_OBJ_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC_2, MALE}, - {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_LADY_2, FEMALE}, - {MAP_OBJ_GFX_LASS, FACILITY_CLASS_PAINTER, FEMALE} + {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE}, + {OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC, MALE}, + {OBJECT_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE}, + {OBJECT_EVENT_GFX_TUBER_M_2, FACILITY_CLASS_TUBER_2, MALE}, + {OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER, MALE}, + {OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_2, FEMALE}, + {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE}, + {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY, FEMALE}, + {OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY, FEMALE}, + {OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE}, + {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE}, + {OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE, MALE}, + {OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE}, + {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE}, + {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE}, + {OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE}, + {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE}, + {OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC, MALE}, + {OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_2, FEMALE}, + {OBJECT_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE}, + {OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_SCHOOL_KID, MALE}, + {OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SCHOOL_KID_2, FEMALE}, + {OBJECT_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN, MALE}, + {OBJECT_EVENT_GFX_WOMAN_3, FACILITY_CLASS_POKEFAN_2, FEMALE}, + {OBJECT_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT, MALE}, + {OBJECT_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_EXPERT_2, FEMALE}, + {OBJECT_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER, MALE}, + {OBJECT_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE}, + {OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE}, + {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE}, + {OBJECT_EVENT_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE}, + {OBJECT_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE}, + {OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE}, + {OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE, FEMALE}, + {OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE}, + {OBJECT_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE}, + {OBJECT_EVENT_GFX_FAT_MAN, FACILITY_CLASS_COLLECTOR, MALE}, + {OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_PKMN_BREEDER, MALE}, + {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_2, FEMALE}, + {OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER, MALE}, + {OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_2, FEMALE}, + {OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_LASS, FEMALE}, + {OBJECT_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER, MALE}, + {OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER, MALE}, + {OBJECT_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER_2, MALE}, + {OBJECT_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER_2, MALE}, + {OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_LASS_2, FEMALE}, + {OBJECT_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR_2, MALE}, + {OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER_2, MALE}, + {OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER_2, FEMALE}, + {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC_2, MALE}, + {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE}, + {OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER_2, MALE}, + {OBJECT_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER, MALE}, + {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE}, + {OBJECT_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE}, + {OBJECT_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN_2, MALE}, + {OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2, MALE}, + {OBJECT_EVENT_GFX_BIKER, FACILITY_CLASS_CUE_BALL, MALE}, + {OBJECT_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_GAMER, MALE}, + {OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY_2, FEMALE}, + {OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE}, + {OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC_3, MALE}, + {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_ROCKER, MALE}, + {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE}, + {OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_TAMER, MALE}, + {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER_2, MALE}, + {OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT_2, MALE}, + {OBJECT_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE}, + {OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_3, MALE}, + {OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_4, FEMALE}, + {OBJECT_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_2, MALE}, + {OBJECT_EVENT_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE}, + {OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_4, FEMALE}, + {OBJECT_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE}, + {OBJECT_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER_3, FEMALE}, + {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_3, FEMALE}, + {OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_3, MALE}, + {OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_4, FEMALE}, + {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY_2, FEMALE}, + {OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC_2, MALE}, + {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY_2, FEMALE}, + {OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_PAINTER, FEMALE} }; static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = { - {MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE}, - {MAP_OBJ_GFX_LITTLE_GIRL, MAP_OBJ_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE}, - {MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE}, - {MAP_OBJ_GFX_OLD_MAN_1, MAP_OBJ_GFX_OLD_WOMAN, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE}, - {MAP_OBJ_GFX_TUBER_M_2, MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO, MALE, FEMALE}, - {MAP_OBJ_GFX_LITTLE_GIRL, MAP_OBJ_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS_2, FEMALE, FEMALE}, - {MAP_OBJ_GFX_COOLTRAINER_M, MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE}, - {MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE}, - {MAP_OBJ_GFX_BATTLE_GIRL, MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE}, - {MAP_OBJ_GFX_SWIMMER_F_LAND, MAP_OBJ_GFX_TUBER_M_2, FACILITY_CLASS_SIS_AND_BRO_2, FEMALE, MALE} + {OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE}, + {OBJECT_EVENT_GFX_LITTLE_GIRL, OBJECT_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE}, + {OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE}, + {OBJECT_EVENT_GFX_OLD_MAN_1, OBJECT_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE}, + {OBJECT_EVENT_GFX_TUBER_M_2, OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO, MALE, FEMALE}, + {OBJECT_EVENT_GFX_LITTLE_GIRL, OBJECT_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS_2, FEMALE, FEMALE}, + {OBJECT_EVENT_GFX_COOLTRAINER_M, OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE}, + {OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE}, + {OBJECT_EVENT_GFX_BATTLE_GIRL, OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE}, + {OBJECT_EVENT_GFX_SWIMMER_F_LAND, OBJECT_EVENT_GFX_TUBER_M_2, FACILITY_CLASS_SIS_AND_BRO_2, FEMALE, MALE} }; static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] = { @@ -521,7 +521,7 @@ static void sub_815DC8C(void) // fakematching const struct TrainerTowerFloor *const * r7; sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState)); - sTrainerTowerState->floorIdx = gMapHeader.mapDataId - 42; + sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - 42; if (sub_815D834() == TRUE) CEReaderTool_LoadTrainerTower(&sTrainerTowerState->unk_0004); else @@ -628,7 +628,7 @@ static void sub_815DD2C(void) static void sub_815DD44(void) { - if (gMapHeader.mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count) + if (gMapHeader.mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count) { gSpecialVar_Result = 3; SetCurrentMapLayout(LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF); @@ -674,8 +674,8 @@ static void SetTrainerTowerNPCGraphics(void) } else { - r1 = MAP_OBJ_GFX_YOUNGSTER; - r4_ = MAP_OBJ_GFX_YOUNGSTER; + r1 = OBJECT_EVENT_GFX_YOUNGSTER; + r4_ = OBJECT_EVENT_GFX_YOUNGSTER; } VarSet(VAR_OBJ_GFX_ID_0, r1); VarSet(VAR_OBJ_GFX_ID_3, r4_); @@ -692,7 +692,7 @@ static void SetTrainerTowerNPCGraphics(void) if (r3 != NELEMS(sSingleBattleTrainerInfo)) r1 = sSingleBattleTrainerInfo[r3].mapObjGfx; else - r1 = MAP_OBJ_GFX_YOUNGSTER; + r1 = OBJECT_EVENT_GFX_YOUNGSTER; switch (r4) { case 0: @@ -831,8 +831,8 @@ static void sub_815E1F0(void) static void TTSpecial_HasReachedTheRoof(void) { - u16 mapDataId = gMapHeader.mapDataId; - if (mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx) + u16 mapLayoutId = gMapHeader.mapLayoutId; + if (mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx) gSpecialVar_Result = FALSE; else gSpecialVar_Result = TRUE; @@ -1008,7 +1008,7 @@ static void sub_815E8CC(void) static void sub_815E908(void) { - if (gMapHeader.mapDataId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0) + if (gMapHeader.mapLayoutId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0) { gSpecialVar_Result = FALSE; } diff --git a/src/vs_seeker.c b/src/vs_seeker.c index bf85c68b3..23eaafd2f 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -3,13 +3,13 @@ #include "sound.h" #include "task.h" #include "malloc.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "new_menu_helpers.h" #include "item_use.h" #include "event_scripts.h" #include "event_data.h" #include "script.h" -#include "map_obj_lock.h" +#include "event_object_lock.h" #include "field_specials.h" #include "item_menu.h" #include "field_effect.h" @@ -17,14 +17,14 @@ #include "battle.h" #include "battle_setup.h" #include "random.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_player_avatar.h" -#include "map_obj_80688E4.h" -#include "map_obj_8097404.h" +#include "event_object_80688E4.h" +#include "event_object_8097404.h" #include "unk_810c3a4.h" #include "vs_seeker.h" #include "constants/movement_commands.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" #include "constants/trainers.h" #include "constants/maps.h" @@ -48,7 +48,7 @@ struct VsSeekerTrainerInfo const u8 *script; u16 trainerIdx; u8 localId; - u8 fieldObjectId; + u8 objectEventId; s16 xCoord; s16 yCoord; u8 graphicsId; @@ -56,10 +56,10 @@ struct VsSeekerTrainerInfo struct VsSeekerStruct { - /*0x000*/ struct VsSeekerTrainerInfo trainerInfo[MAP_OBJECTS_COUNT]; + /*0x000*/ struct VsSeekerTrainerInfo trainerInfo[OBJECT_EVENTS_COUNT]; /*0x100*/ u8 filler_100[0x300]; - /*0x400*/ u16 trainerIdxArray[MAP_OBJECTS_COUNT]; - /*0x420*/ u8 runningBehaviourEtcArray[MAP_OBJECTS_COUNT]; + /*0x400*/ u16 trainerIdxArray[OBJECT_EVENTS_COUNT]; + /*0x420*/ u8 runningBehaviourEtcArray[OBJECT_EVENTS_COUNT]; /*0x430*/ u8 numRematchableTrainers; /*0x431*/ u8 trainerHasNotYetBeenFought:1; /*0x431*/ u8 trainerDoesNotWantRematch:1; @@ -68,8 +68,8 @@ struct VsSeekerStruct }; extern u16 gSpecialVar_LastTalked; -extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT]; -extern u8 gSelectedEventObject; +extern struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT]; +extern u8 gSelectedObjectEvent; // static declarations static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL; @@ -591,13 +591,13 @@ static void sub_810C3B8(u8 taskId) if (task->data[1] == 0) { - for (i = 0; i < MAP_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (sub_810CF04(i) == TRUE) { - if (gMapObjects[i].mapobj_bit_1) + if (gObjectEvents[i].mapobj_bit_1) return; - FreezeMapObject(&gMapObjects[i]); + FreezeObjectEvent(&gObjectEvents[i]); } } } @@ -613,22 +613,22 @@ static void sub_810C3B8(u8 taskId) void sub_810C444(void) { - struct MapObjectTemplate * templates = gSaveBlock1Ptr->mapObjectTemplates; + struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates; u8 i; u8 r6; u8 sp0; - struct MapObject * mapObject; + struct ObjectEvent * objectEvent; - for (i = 0; i < gMapHeader.events->mapObjectCount; i++) + for (i = 0; i < gMapHeader.events->objectEventCount; i++) { if ((templates[i].trainerType == 1 || templates[i].trainerType == 3) && (templates[i].movementType == 0x4D || templates[i].movementType == 0x4E || templates[i].movementType == 0x4F)) { r6 = sub_810CF54(); - TryGetFieldObjectIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0); - mapObject = &gMapObjects[sp0]; + TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0); + objectEvent = &gObjectEvents[sp0]; if (sub_810CF04(sp0) == TRUE) { - SetTrainerMovementType(mapObject, r6); + SetTrainerMovementType(objectEvent, r6); } templates[i].movementType = r6; } @@ -756,17 +756,17 @@ static void sub_810C594(void) { u8 i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - struct MapObject * mapObject = &gMapObjects[i]; - if (mapObject->animPattern == 0x4D || mapObject->animPattern == 0x4E || mapObject->animPattern == 0x4F) + struct ObjectEvent * objectEvent = &gObjectEvents[i]; + if (objectEvent->animPattern == 0x4D || objectEvent->animPattern == 0x4E || objectEvent->animPattern == 0x4F) { u8 r3 = sub_810CF54(); - if (mapObject->active && gSprites[mapObject->spriteId].data[0] == i) + if (objectEvent->active && gSprites[objectEvent->spriteId].data[0] == i) { - gSprites[mapObject->spriteId].pos2.x = 0; - gSprites[mapObject->spriteId].pos2.y = 0; - SetTrainerMovementType(mapObject, r3); + gSprites[objectEvent->spriteId].pos2.x = 0; + gSprites[objectEvent->spriteId].pos2.y = 0; + SetTrainerMovementType(objectEvent, r3); } } } @@ -857,23 +857,23 @@ static void Task_VsSeeker_2(u8 taskId) static void GatherNearbyTrainerInfo(void) { - struct MapObjectTemplate *templates = gSaveBlock1Ptr->mapObjectTemplates; - u8 fieldObjectId = 0; + struct ObjectEventTemplate *templates = gSaveBlock1Ptr->objectEventTemplates; + u8 objectEventId = 0; u8 vsSeekerObjectIdx = 0; - s32 mapObjectIdx; + s32 objectEventIdx; - for (mapObjectIdx = 0; mapObjectIdx < gMapHeader.events->mapObjectCount; mapObjectIdx++) + for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->objectEventCount; objectEventIdx++) { - if (templates[mapObjectIdx].trainerType == 1 || templates[mapObjectIdx].trainerType == 3) + if (templates[objectEventIdx].trainerType == 1 || templates[objectEventIdx].trainerType == 3) { - sVsSeeker->trainerInfo[vsSeekerObjectIdx].script = templates[mapObjectIdx].script; - sVsSeeker->trainerInfo[vsSeekerObjectIdx].trainerIdx = GetTrainerFlagFromScript(templates[mapObjectIdx].script); - sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = templates[mapObjectIdx].localId; - TryGetFieldObjectIdByLocalIdAndMap(templates[mapObjectIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &fieldObjectId); - sVsSeeker->trainerInfo[vsSeekerObjectIdx].fieldObjectId = fieldObjectId; - sVsSeeker->trainerInfo[vsSeekerObjectIdx].xCoord = gMapObjects[fieldObjectId].coords2.x - 7; - sVsSeeker->trainerInfo[vsSeekerObjectIdx].yCoord = gMapObjects[fieldObjectId].coords2.y - 7; - sVsSeeker->trainerInfo[vsSeekerObjectIdx].graphicsId = templates[mapObjectIdx].graphicsId; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].script = templates[objectEventIdx].script; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].trainerIdx = GetTrainerFlagFromScript(templates[objectEventIdx].script); + sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = templates[objectEventIdx].localId; + TryGetObjectEventIdByLocalIdAndMap(templates[objectEventIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + sVsSeeker->trainerInfo[vsSeekerObjectIdx].objectEventId = objectEventId; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].xCoord = gObjectEvents[objectEventId].coords2.x - 7; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].yCoord = gObjectEvents[objectEventId].coords2.y - 7; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].graphicsId = templates[objectEventIdx].graphicsId; vsSeekerObjectIdx++; } } @@ -960,7 +960,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) else { gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[vsSeekerIdx].localId] = r7; - npc_coords_shift_still(&gMapObjects[sVsSeeker->trainerInfo[vsSeekerIdx].fieldObjectId]); + npc_coords_shift_still(&gObjectEvents[sVsSeeker->trainerInfo[vsSeekerIdx].objectEventId]); StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F64); sVsSeeker->trainerIdxArray[sVsSeeker->numRematchableTrainers] = r8; sVsSeeker->runningBehaviourEtcArray[sVsSeeker->numRematchableTrainers] = GetRunningBehaviorFromGraphicsId(sVsSeeker->trainerInfo[vsSeekerIdx].graphicsId); @@ -1120,7 +1120,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) "\tlsls r0, r1, 3\n" "\tadds r0, r1\n" "\tlsls r0, 2\n" - "\tldr r1, _0810CB5C @ =gMapObjects\n" + "\tldr r1, _0810CB5C @ =gObjectEvents\n" "\tadds r0, r1\n" "\tbl npc_coords_shift_still\n" "\tldr r0, [r6]\n" @@ -1194,7 +1194,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) "\t.align 2, 0\n" "_0810CB54: .4byte gSaveBlock1Ptr\n" "_0810CB58: .4byte 0x0000063a\n" - "_0810CB5C: .4byte gMapObjects\n" + "_0810CB5C: .4byte gObjectEvents\n" "_0810CB60: .4byte gUnknown_8453F64\n" "_0810CB64: .4byte 0x00000431\n" "_0810CB68: .4byte sVsSeeker\n" @@ -1223,25 +1223,25 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) void sub_810CB90(void) { u8 sp0 = 0; - struct MapObjectTemplate *r4 = gSaveBlock1Ptr->mapObjectTemplates; + struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->objectEventTemplates; s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A); if (r9 != -1) { s32 r8; - for (r8 = 0; r8 < gMapHeader.events->mapObjectCount; r8++) + for (r8 = 0; r8 < gMapHeader.events->objectEventCount; r8++) { if ((r4[r8].trainerType == 1 || r4[r8].trainerType == 3) && r9 == sub_810CE10(sVsSeekerData, GetTrainerFlagFromScript(r4[r8].script))) { - struct MapObject *r4_2; + struct ObjectEvent *r4_2; - TryGetFieldObjectIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0); - r4_2 = &gMapObjects[sp0]; + TryGetObjectEventIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0); + r4_2 = &gObjectEvents[sp0]; sub_810CF54(&r4[r8]); // You are using this function incorrectly. Please consult the manual. sub_805FE7C(r4_2, gUnknown_8453F67[r4_2->facingDirection]); gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0; - if (gSelectedEventObject == sp0) + if (gSelectedObjectEvent == sp0) r4_2->animPattern = gUnknown_8453F67[r4_2->facingDirection]; else r4_2->animPattern = 0x08; @@ -1384,9 +1384,9 @@ static bool8 sub_810CED0(const VsSeekerData * a0, u16 a1) bool8 sub_810CF04(u8 a0) { - struct MapObject *r1 = &gMapObjects[a0]; + struct ObjectEvent *r1 = &gObjectEvents[a0]; - if (r1->active && gMapHeader.events->mapObjectCount >= r1->localId && gSprites[r1->spriteId].data[0] == a0) + if (r1->active && gMapHeader.events->objectEventCount >= r1->localId && gSprites[r1->spriteId].data[0] == a0) return TRUE; return FALSE; } @@ -1414,32 +1414,32 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId) { switch (graphicsId) { - case MAP_OBJ_GFX_LITTLE_GIRL: - case MAP_OBJ_GFX_YOUNGSTER: - case MAP_OBJ_GFX_BOY: - case MAP_OBJ_GFX_BUG_CATCHER: - case MAP_OBJ_GFX_LASS: - case MAP_OBJ_GFX_WOMAN_1: - case MAP_OBJ_GFX_BATTLE_GIRL: - case MAP_OBJ_GFX_MAN: - case MAP_OBJ_GFX_ROCKER: - case MAP_OBJ_GFX_WOMAN_2: - case MAP_OBJ_GFX_BEAUTY: - case MAP_OBJ_GFX_BALDING_MAN: - case MAP_OBJ_GFX_TUBER_F: - case MAP_OBJ_GFX_CAMPER: - case MAP_OBJ_GFX_PICNICKER: - case MAP_OBJ_GFX_COOLTRAINER_M: - case MAP_OBJ_GFX_COOLTRAINER_F: - case MAP_OBJ_GFX_SWIMMER_M_LAND: - case MAP_OBJ_GFX_SWIMMER_F_LAND: - case MAP_OBJ_GFX_BLACKBELT: - case MAP_OBJ_GFX_HIKER: - case MAP_OBJ_GFX_SAILOR: + case OBJECT_EVENT_GFX_LITTLE_GIRL: + case OBJECT_EVENT_GFX_YOUNGSTER: + case OBJECT_EVENT_GFX_BOY: + case OBJECT_EVENT_GFX_BUG_CATCHER: + case OBJECT_EVENT_GFX_LASS: + case OBJECT_EVENT_GFX_WOMAN_1: + case OBJECT_EVENT_GFX_BATTLE_GIRL: + case OBJECT_EVENT_GFX_MAN: + case OBJECT_EVENT_GFX_ROCKER: + case OBJECT_EVENT_GFX_WOMAN_2: + case OBJECT_EVENT_GFX_BEAUTY: + case OBJECT_EVENT_GFX_BALDING_MAN: + case OBJECT_EVENT_GFX_TUBER_F: + case OBJECT_EVENT_GFX_CAMPER: + case OBJECT_EVENT_GFX_PICNICKER: + case OBJECT_EVENT_GFX_COOLTRAINER_M: + case OBJECT_EVENT_GFX_COOLTRAINER_F: + case OBJECT_EVENT_GFX_SWIMMER_M_LAND: + case OBJECT_EVENT_GFX_SWIMMER_F_LAND: + case OBJECT_EVENT_GFX_BLACKBELT: + case OBJECT_EVENT_GFX_HIKER: + case OBJECT_EVENT_GFX_SAILOR: return 0x4e; - case MAP_OBJ_GFX_TUBER_M_1: - case MAP_OBJ_GFX_SWIMMER_M_WATER: - case MAP_OBJ_GFX_SWIMMER_F_WATER: + case OBJECT_EVENT_GFX_TUBER_M_1: + case OBJECT_EVENT_GFX_SWIMMER_M_WATER: + case OBJECT_EVENT_GFX_SWIMMER_F_WATER: return 0x4f; default: return 0x4d; @@ -1508,7 +1508,7 @@ static bool8 IsTrainerVisibleOnScreen(struct VsSeekerTrainerInfo * trainerInfo) && x + 7 >= trainerInfo->xCoord && y - 5 <= trainerInfo->yCoord && y + 5 >= trainerInfo->yCoord - && sub_810CF04(trainerInfo->fieldObjectId) == 1) + && sub_810CF04(trainerInfo->objectEventId) == 1) return TRUE; return FALSE; } @@ -1560,7 +1560,7 @@ static u8 GetRematchableTrainerLocalId(void) static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo * trainerInfo, const u8 * script) { - npc_sync_anim_pause_bits(&gMapObjects[trainerInfo->fieldObjectId]); + npc_sync_anim_pause_bits(&gObjectEvents[trainerInfo->objectEventId]); ScriptMovement_StartObjectMovementScript(trainerInfo->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, script); } @@ -1596,9 +1596,9 @@ static void StartAllRespondantIdleMovements(void) { if (sVsSeeker->trainerInfo[j].trainerIdx == sVsSeeker->trainerIdxArray[i]) { - struct MapObject *r4 = &gMapObjects[sVsSeeker->trainerInfo[j].fieldObjectId]; + struct ObjectEvent *r4 = &gObjectEvents[sVsSeeker->trainerInfo[j].objectEventId]; - if (sub_810CF04(sVsSeeker->trainerInfo[j].fieldObjectId) == 1) + if (sub_810CF04(sVsSeeker->trainerInfo[j].objectEventId) == 1) SetTrainerMovementType(r4, sVsSeeker->runningBehaviourEtcArray[i]); sub_805FE7C(r4, sVsSeeker->runningBehaviourEtcArray[i]); gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[j].localId] = GetNextAvailableRematchTrainer(sVsSeekerData, sVsSeeker->trainerInfo[j].trainerIdx, &dummy); diff --git a/sym_common.txt b/sym_common.txt index 345829a24..17f0cd306 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -49,7 +49,7 @@ gUnknown_300506C: @ 300506C .include "scrcmd.o" -gSelectedEventObject: @ 3005074 +gSelectedObjectEvent: @ 3005074 .space 0x4 gUnknown_3005078: @ 3005078 diff --git a/sym_ewram.txt b/sym_ewram.txt index ba4f765d0..963159658 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -90,7 +90,7 @@ gUnknown_2036E30: @ 2036E30 gUnknown_2036E34: @ 2036E34 .space 0x4 -gMapObjects: @ 2036E38 +gObjectEvents: @ 2036E38 .space 0x240 gPlayerAvatar: @ 2037078 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]; |
