diff options
Diffstat (limited to 'asm/field_effect_helpers.s')
| -rw-r--r-- | asm/field_effect_helpers.s | 244 |
1 files changed, 122 insertions, 122 deletions
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 |