From 69c89fbbafc4d9d40d4ff878e0eee54441109fec Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 27 Mar 2025 23:54:01 -0400 Subject: [PATCH] Removed ov29_0235171E symbol --- asm/include/itcm.inc | 1 - asm/include/overlay_29_022E9618.inc | 1 - asm/include/overlay_29_022EE36C.inc | 1 - asm/include/overlay_29_022F05B4.inc | 1 - asm/include/overlay_29_022F59C4.inc | 1 - asm/include/overlay_29_022F7388.inc | 1 - asm/include/overlay_29_022F9744.inc | 1 - asm/include/overlay_29_022FC9C0.inc | 1 - asm/include/overlay_29_022FE4BC.inc | 1 - asm/include/overlay_29_02300D00.inc | 1 - asm/include/overlay_29_02302A5C.inc | 1 - asm/include/overlay_29_0231EDFC.inc | 1 - asm/include/overlay_29_023201A0.inc | 1 - asm/include/overlay_29_02322DDC.inc | 1 - asm/include/overlay_29_0232A3FC.inc | 1 - asm/include/overlay_29_0232C524.inc | 1 - asm/itcm.s | 16 ++++++++-------- asm/overlay_29_022E9618.s | 6 +++--- asm/overlay_29_022EE36C.s | 4 ++-- asm/overlay_29_022F05B4.s | 6 +++--- asm/overlay_29_022F59C4.s | 4 ++-- asm/overlay_29_022F7388.s | 22 +++++++++++----------- asm/overlay_29_022F9744.s | 4 ++-- asm/overlay_29_022FC9C0.s | 4 ++-- asm/overlay_29_022FE4BC.s | 4 ++-- asm/overlay_29_02300D00.s | 24 ++++++++++++------------ asm/overlay_29_02302A5C.s | 4 ++-- asm/overlay_29_0231EDFC.s | 4 ++-- asm/overlay_29_023201A0.s | 4 ++-- asm/overlay_29_02322DDC.s | 12 ++++++------ asm/overlay_29_0232A3FC.s | 4 ++-- asm/overlay_29_0232C524.s | 6 +++--- asm/overlay_29_rodata_0234FD04.s | 5 +---- 33 files changed, 65 insertions(+), 84 deletions(-) diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc index 2f3cdf09..d802b9c5 100644 --- a/asm/include/itcm.inc +++ b/asm/include/itcm.inc @@ -148,7 +148,6 @@ .public ov29_0231B008 .public ov29_02338350 .public ov29_02348D00 -.public ov29_0235171E .public ov29_0235177C .public ov29_02353530 .public RENDER_3D diff --git a/asm/include/overlay_29_022E9618.inc b/asm/include/overlay_29_022E9618.inc index 97407486..bffcdf16 100644 --- a/asm/include/overlay_29_022E9618.inc +++ b/asm/include/overlay_29_022E9618.inc @@ -38,7 +38,6 @@ .public ov29_0234B854 .public ov29_02351628 .public ov29_02351658 -.public ov29_0235171E .public ov29_0235179C .public ov29_023517A0 .public ov29_023517A2 diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc index f9ef2317..8b165e6c 100644 --- a/asm/include/overlay_29_022EE36C.inc +++ b/asm/include/overlay_29_022EE36C.inc @@ -60,7 +60,6 @@ .public ov29_02344B44 .public ov29_02346344 .public ov29_0234B084 -.public ov29_0235171E .public RemoveEmptyItemsInBagWrapper .public RemoveGroundItem .public RemoveHeldItemNoHole diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index 81b8969a..a2a0f1ad 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -151,7 +151,6 @@ .public ov29_0234E8F8 .public ov29_0234FC50 .public ov29_0234FCA8 -.public ov29_0235171E .public ov29_023526A8 .public ov29_023526B8 .public ov29_023526C8 diff --git a/asm/include/overlay_29_022F59C4.inc b/asm/include/overlay_29_022F59C4.inc index 071456d2..080bbd08 100644 --- a/asm/include/overlay_29_022F59C4.inc +++ b/asm/include/overlay_29_022F59C4.inc @@ -59,7 +59,6 @@ .public ov29_0234B0B4 .public ov29_0234CFA0 .public ov29_0234D304 -.public ov29_0235171E .public ov29_02352750 .public ov29_02352758 .public ov29_0237CA80 diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index cc24a2c4..e863e2c3 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/asm/include/overlay_29_022F7388.inc @@ -89,7 +89,6 @@ .public ov29_0234B0B4 .public ov29_0234B1A4 .public ov29_0234EF24 -.public ov29_0235171E .public ov29_0237C9B0 .public PopulateActiveMonsterPtrs .public RemoveHolderForItemInBag diff --git a/asm/include/overlay_29_022F9744.inc b/asm/include/overlay_29_022F9744.inc index 80ac4591..5a1fe5eb 100644 --- a/asm/include/overlay_29_022F9744.inc +++ b/asm/include/overlay_29_022F9744.inc @@ -94,7 +94,6 @@ .public ov29_0234B034 .public ov29_0234B084 .public ov29_0234B09C -.public ov29_0235171E .public PointCameraToMonster .public RandInt .public RemoveEquivItem diff --git a/asm/include/overlay_29_022FC9C0.inc b/asm/include/overlay_29_022FC9C0.inc index 4218f434..2bd95be1 100644 --- a/asm/include/overlay_29_022FC9C0.inc +++ b/asm/include/overlay_29_022FC9C0.inc @@ -86,7 +86,6 @@ .public ov29_023021F0 .public ov29_02304A48 .public ov29_02307DC0 -.public ov29_0235171E .public ov29_02351E28 .public ov29_0235276C .public ov29_0237C690 diff --git a/asm/include/overlay_29_022FE4BC.inc b/asm/include/overlay_29_022FE4BC.inc index 711f8edb..021f4490 100644 --- a/asm/include/overlay_29_022FE4BC.inc +++ b/asm/include/overlay_29_022FE4BC.inc @@ -60,7 +60,6 @@ .public ov29_02346888 .public ov29_0234B024 .public ov29_0234BA54 -.public ov29_0235171E .public ov29_0237C9C0 .public ov29_0237CA68 .public ov29_0237CA6C diff --git a/asm/include/overlay_29_02300D00.inc b/asm/include/overlay_29_02300D00.inc index ca7d458b..18e207d0 100644 --- a/asm/include/overlay_29_02300D00.inc +++ b/asm/include/overlay_29_02300D00.inc @@ -10,7 +10,6 @@ .public IsCurrentTilesetBackground .public IsTacticSet .public ItemIsActive__022FF898 -.public ov29_0235171E .public ov29_02352770 .public ov29_02352778 .public ov29_02352780 diff --git a/asm/include/overlay_29_02302A5C.inc b/asm/include/overlay_29_02302A5C.inc index 1d8ccafc..3f85d335 100644 --- a/asm/include/overlay_29_02302A5C.inc +++ b/asm/include/overlay_29_02302A5C.inc @@ -63,7 +63,6 @@ .public ov29_0234D304 .public ov29_0234D484 .public ov29_0234FAEC -.public ov29_0235171E .public ov29_023527F0 .public ov29_0235280C .public ov29_02352810 diff --git a/asm/include/overlay_29_0231EDFC.inc b/asm/include/overlay_29_0231EDFC.inc index 92945ccb..fc36772c 100644 --- a/asm/include/overlay_29_0231EDFC.inc +++ b/asm/include/overlay_29_0231EDFC.inc @@ -25,7 +25,6 @@ .public ov29_02304A48 .public ov29_0232033C .public ov29_02321238 -.public ov29_0235171E .public ShouldDisplayEntityWrapper .public sub_020018D0 .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_023201A0.inc b/asm/include/overlay_29_023201A0.inc index 053228e7..cd93bb1f 100644 --- a/asm/include/overlay_29_023201A0.inc +++ b/asm/include/overlay_29_023201A0.inc @@ -25,7 +25,6 @@ .public ov29_02320AA4 .public ov29_02321238 .public ov29_02336694 -.public ov29_0235171E .public ov29_023529B8 .public ov29_02353700 .public RemoveGroundItem diff --git a/asm/include/overlay_29_02322DDC.inc b/asm/include/overlay_29_02322DDC.inc index 246c8c69..08a6293b 100644 --- a/asm/include/overlay_29_02322DDC.inc +++ b/asm/include/overlay_29_02322DDC.inc @@ -53,7 +53,6 @@ .public ov29_0234B034 .public ov29_0234B084 .public ov29_0234B4CC -.public ov29_0235171E .public ov29_0235175C .public ov29_02352A54 .public ov29_02352A6C diff --git a/asm/include/overlay_29_0232A3FC.inc b/asm/include/overlay_29_0232A3FC.inc index fd84e652..6610490c 100644 --- a/asm/include/overlay_29_0232A3FC.inc +++ b/asm/include/overlay_29_0232A3FC.inc @@ -79,7 +79,6 @@ .public ov29_02324D60 .public ov29_02332F18 .public ov29_0234B084 -.public ov29_0235171E .public ov29_02352B1C .public ov29_0237CA84 .public POISON_TAIL_POISON_CHANCE diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc index ded6aa9d..972a2e62 100644 --- a/asm/include/overlay_29_0232C524.inc +++ b/asm/include/overlay_29_0232C524.inc @@ -93,7 +93,6 @@ .public ov29_0234B084 .public ov29_0234B0B4 .public ov29_0234BA54 -.public ov29_0235171E .public ov29_02352B38 .public ov29_02352B3C .public PrepareTrapperTrap diff --git a/asm/itcm.s b/asm/itcm.s index 9e90b17c..06460700 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -3074,7 +3074,7 @@ _01FFA754: ldr r0, _01FFB2B8 ; =DIRECTIONS_XY ldrsh r5, [r4, #4] ldrsh r2, [r0, r3] - ldr r1, _01FFB2BC ; =ov29_0235171E + ldr r1, _01FFB2BC ; =DIRECTIONS_XY + 2 mov r0, #1 add r2, r5, r2 strh r2, [sb, #0x8c] @@ -3711,7 +3711,7 @@ _01FFB080: add r0, r1, r0 cmp r3, r0 bne _01FFB0D4 - ldr r0, _01FFB2BC ; =ov29_0235171E + ldr r0, _01FFB2BC ; =DIRECTIONS_XY + 2 ldrsh r1, [r4, #6] ldrsh r0, [r0, r2] ldrsh r2, [sb, #0x8e] @@ -3857,7 +3857,7 @@ _01FFB2AC: .word 0x000003E7 _01FFB2B0: .word 0x000F423F _01FFB2B4: .word DUNGEON_PTR _01FFB2B8: .word DIRECTIONS_XY -_01FFB2BC: .word ov29_0235171E +_01FFB2BC: .word DIRECTIONS_XY + 2 _01FFB2C0: .word 0xFFF0BDC1 _01FFB2C4: .word ov29_0235177C arm_func_end AiMovement @@ -3935,7 +3935,7 @@ _01FFB38C: mov r3, r8, lsl #2 ldrsh r2, [r0, r3] ldrsh r4, [sl, #4] - ldr r1, _01FFB628 ; =ov29_0235171E + ldr r1, _01FFB628 ; =DIRECTIONS_XY + 2 mov r0, #1 add r2, r4, r2 strh r2, [sb, #0x8c] @@ -3982,7 +3982,7 @@ _01FFB3F0: ldr r0, _01FFB624 ; =DIRECTIONS_XY ldrsh r4, [sl, #4] ldrsh r2, [r0, r3] - ldr r1, _01FFB628 ; =ov29_0235171E + ldr r1, _01FFB628 ; =DIRECTIONS_XY + 2 mov r0, #1 add r2, r4, r2 strh r2, [sb, #0x8c] @@ -4005,7 +4005,7 @@ _01FFB460: ldr r0, _01FFB624 ; =DIRECTIONS_XY ldrsh r4, [sl, #4] ldrsh r2, [r0, r3] - ldr r1, _01FFB628 ; =ov29_0235171E + ldr r1, _01FFB628 ; =DIRECTIONS_XY + 2 mov r0, #1 add r2, r4, r2 strh r2, [sb, #0x8c] @@ -4104,7 +4104,7 @@ _01FFB5D8: ldr r0, _01FFB624 ; =DIRECTIONS_XY ldrsh r4, [sl, #4] ldrsh r2, [r0, r3] - ldr r1, _01FFB628 ; =ov29_0235171E + ldr r1, _01FFB628 ; =DIRECTIONS_XY + 2 mov r0, #1 add r2, r4, r2 strh r2, [sb, #0x8c] @@ -4117,7 +4117,7 @@ _01FFB5D8: _01FFB61C: .word DUNGEON_PTR _01FFB620: .word ov29_0235177C _01FFB624: .word DIRECTIONS_XY -_01FFB628: .word ov29_0235171E +_01FFB628: .word DIRECTIONS_XY + 2 arm_func_end CalculateAiTargetPos arm_func_start sub_01FFB62C diff --git a/asm/overlay_29_022E9618.s b/asm/overlay_29_022E9618.s index 51b9a02f..6bd2e9d1 100644 --- a/asm/overlay_29_022E9618.s +++ b/asm/overlay_29_022E9618.s @@ -386,7 +386,7 @@ ov29_022E9A9C: ; 0x022E9A9C mov r2, r4, lsl #2 ldrsh r1, [r0, r2] ldrsh r3, [sb, #4] - ldr r0, _022E9CA4 ; =ov29_0235171E + ldr r0, _022E9CA4 ; =DIRECTIONS_XY + 2 add r1, r1, r1, lsl #1 add r1, r3, r1 strh r1, [sl] @@ -493,7 +493,7 @@ _022E9C44: ldrsh r2, [sb, #4] mov r1, r1, lsl #2 ldrsh r1, [r0, r1] - ldr r0, _022E9CA4 ; =ov29_0235171E + ldr r0, _022E9CA4 ; =DIRECTIONS_XY + 2 add r1, r2, r1, lsl #1 strh r1, [sl] ldrb r1, [r8, #0x4c] @@ -512,7 +512,7 @@ _022E9C98: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022E9CA0: .word DIRECTIONS_XY -_022E9CA4: .word ov29_0235171E +_022E9CA4: .word DIRECTIONS_XY + 2 _022E9CA8: .word DUNGEON_PTR _022E9CAC: .word ov29_0235179C _022E9CB0: .word ov29_023517A0 diff --git a/asm/overlay_29_022EE36C.s b/asm/overlay_29_022EE36C.s index 2e51b951..ba916e1a 100644 --- a/asm/overlay_29_022EE36C.s +++ b/asm/overlay_29_022EE36C.s @@ -925,7 +925,7 @@ _022EEDC4: mov r1, r1, lsl #0x1d mov r4, r1, lsr #0x1b ldrsh r2, [r0, r4] - ldr r1, _022EEE48 ; =ov29_0235171E + ldr r1, _022EEE48 ; =DIRECTIONS_XY + 2 mov r0, r6 add r2, r3, r2 strh r2, [sp, #0xc] @@ -948,7 +948,7 @@ _022EEE38: .align 2, 0 _022EEE40: .word 0x0000130F _022EEE44: .word DIRECTIONS_XY -_022EEE48: .word ov29_0235171E +_022EEE48: .word DIRECTIONS_XY + 2 _022EEE4C: .word DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST arm_func_end ApplyTripTrapEffect diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index e0ed5079..a71a3918 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -3109,7 +3109,7 @@ ShouldLeaderKeepRunning: ; 0x022F308C ldrb r1, [r5, #0x78b] ldr r3, _022F35D8 ; =DIRECTIONS_XY mov r5, r7, lsl #2 - ldr r2, _022F35DC ; =ov29_0235171E + ldr r2, _022F35DC ; =DIRECTIONS_XY + 2 ldrsh r6, [r3, r5] mov r8, r0 cmp r1, #0 @@ -3187,7 +3187,7 @@ _022F31C4: mov r5, r1, lsr #0x1b mov fp, r0, lsr #0x1b ldrsh r1, [r6, r5] - ldr r8, _022F35DC ; =ov29_0235171E + ldr r8, _022F35DC ; =DIRECTIONS_XY + 2 mov r3, r2, lsr #0x1b add r1, sl, r1 ldrsh r2, [r6, r3] @@ -3462,7 +3462,7 @@ _022F35CC: .align 2, 0 _022F35D4: .word DUNGEON_PTR _022F35D8: .word DIRECTIONS_XY -_022F35DC: .word ov29_0235171E +_022F35DC: .word DIRECTIONS_XY + 2 arm_func_end ShouldLeaderKeepRunning arm_func_start ov29_022F35E0 diff --git a/asm/overlay_29_022F59C4.s b/asm/overlay_29_022F59C4.s index c1cf5fc6..844e110a 100644 --- a/asm/overlay_29_022F59C4.s +++ b/asm/overlay_29_022F59C4.s @@ -684,7 +684,7 @@ _022F6198: ldrsh r3, [sl, #4] mov r1, r1, lsl #2 ldrsh r2, [r0, r1] - ldr r1, _022F620C ; =ov29_0235171E + ldr r1, _022F620C ; =DIRECTIONS_XY + 2 add r0, sp, #8 add r2, r3, r2 strh r2, [sp, #8] @@ -713,7 +713,7 @@ _022F6200: .word 0x00000BCD _022F6204: .word 0x00000BCE #endif _022F6208: .word DIRECTIONS_XY -_022F620C: .word ov29_0235171E +_022F620C: .word DIRECTIONS_XY + 2 arm_func_end ov29_022F6058 arm_func_start ov29_022F6210 diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index 802db1d0..e44b3e5b 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -1763,7 +1763,7 @@ ov29_022F87C0: ; 0x022F87C0 beq _022F8820 ldrb r2, [r5, #0x4c] ldr r1, _022F8828 ; =DIRECTIONS_XY - ldr r0, _022F882C ; =ov29_0235171E + ldr r0, _022F882C ; =DIRECTIONS_XY + 2 mov ip, r2, lsl #2 ldrsh lr, [r4, #4] ldrsh r3, [r1, ip] @@ -1783,7 +1783,7 @@ _022F8820: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022F8828: .word DIRECTIONS_XY -_022F882C: .word ov29_0235171E +_022F882C: .word DIRECTIONS_XY + 2 arm_func_end ov29_022F87C0 arm_func_start ov29_022F8830 @@ -1794,7 +1794,7 @@ ov29_022F8830: ; 0x022F8830 ldr r0, _022F88B8 ; =DIRECTIONS_XY ldrb r2, [r5, #0x4c] ldrsh r3, [r4, #4] - ldr r1, _022F88BC ; =ov29_0235171E + ldr r1, _022F88BC ; =DIRECTIONS_XY + 2 mov r2, r2, lsl #2 ldrsh r0, [r0, r2] add r0, r3, r0 @@ -1825,7 +1825,7 @@ _022F88B0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022F88B8: .word DIRECTIONS_XY -_022F88BC: .word ov29_0235171E +_022F88BC: .word DIRECTIONS_XY + 2 arm_func_end ov29_022F8830 arm_func_start ov29_022F88C0 @@ -1836,7 +1836,7 @@ ov29_022F88C0: ; 0x022F88C0 ldr r0, _022F89A4 ; =DIRECTIONS_XY ldrb r2, [r4, #0x4c] ldrsh r3, [r5, #4] - ldr r1, _022F89A8 ; =ov29_0235171E + ldr r1, _022F89A8 ; =DIRECTIONS_XY + 2 mov r2, r2, lsl #2 ldrsh r0, [r0, r2] add r0, r3, r0 @@ -1861,7 +1861,7 @@ ov29_022F88C0: ; 0x022F88C0 ldrsh r2, [r5, #4] mov r1, r1, lsl #2 ldrsh r0, [r0, r1] - ldr r1, _022F89A8 ; =ov29_0235171E + ldr r1, _022F89A8 ; =DIRECTIONS_XY + 2 add r0, r2, r0, lsl #1 strh r0, [sp] ldrb r2, [r4, #0x4c] @@ -1890,7 +1890,7 @@ _022F899C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022F89A4: .word DIRECTIONS_XY -_022F89A8: .word ov29_0235171E +_022F89A8: .word DIRECTIONS_XY + 2 arm_func_end ov29_022F88C0 arm_func_start ov29_022F89AC @@ -2350,7 +2350,7 @@ ov29_022F8FF8: ; 0x022F8FF8 ldr ip, _022F9050 ; =DIRECTIONS_XY ldrb lr, [r2, #0x4c] ldrsh r4, [r1, #4] - ldr r3, _022F9054 ; =ov29_0235171E + ldr r3, _022F9054 ; =DIRECTIONS_XY + 2 mov lr, lr, lsl #2 ldrsh ip, [ip, lr] add r4, r4, ip @@ -2369,7 +2369,7 @@ ov29_022F8FF8: ; 0x022F8FF8 ldmia sp!, {r4, pc} .align 2, 0 _022F9050: .word DIRECTIONS_XY -_022F9054: .word ov29_0235171E +_022F9054: .word DIRECTIONS_XY + 2 arm_func_end ov29_022F8FF8 arm_func_start ov29_022F9058 @@ -2451,7 +2451,7 @@ UpdateAiTargetPos: ; 0x022F9144 add r1, lr, #0x100 mov r3, r3, lsl #2 ldrsh r3, [r2, r3] - ldr r2, _022F9190 ; =ov29_0235171E + ldr r2, _022F9190 ; =DIRECTIONS_XY + 2 add r3, ip, r3 #ifdef JAPAN strh r3, [r1, #0x7a] @@ -2471,7 +2471,7 @@ UpdateAiTargetPos: ; 0x022F9144 ldmia sp!, {r3, pc} .align 2, 0 _022F918C: .word DIRECTIONS_XY -_022F9190: .word ov29_0235171E +_022F9190: .word DIRECTIONS_XY + 2 arm_func_end UpdateAiTargetPos arm_func_start SetMonsterTypeAndAbility diff --git a/asm/overlay_29_022F9744.s b/asm/overlay_29_022F9744.s index 201c7ab7..c3f5408c 100644 --- a/asm/overlay_29_022F9744.s +++ b/asm/overlay_29_022F9744.s @@ -924,7 +924,7 @@ _022FA210: mov r2, r2, lsl #2 ldrsh r3, [r1, r2] ldrsh ip, [r6, #4] - ldr r2, _022FA2EC ; =ov29_0235171E + ldr r2, _022FA2EC ; =DIRECTIONS_XY + 2 mov r1, #0xff add r3, ip, r3 strh r3, [r0, #0x7e + OV29_022FA1D8_OFFSET] @@ -970,7 +970,7 @@ _022FA2B8: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _022FA2E8: .word DIRECTIONS_XY -_022FA2EC: .word ov29_0235171E +_022FA2EC: .word DIRECTIONS_XY + 2 arm_func_end ov29_022FA1D8 arm_func_start ov29_022FA2F0 diff --git a/asm/overlay_29_022FC9C0.s b/asm/overlay_29_022FC9C0.s index 50fe1462..21bd1abe 100644 --- a/asm/overlay_29_022FC9C0.s +++ b/asm/overlay_29_022FC9C0.s @@ -803,7 +803,7 @@ _022FD420: strh r7, [sp, #4] ldrb r3, [r1] ldr r2, _022FD788 ; =DIRECTIONS_XY - ldr r1, _022FD78C ; =ov29_0235171E + ldr r1, _022FD78C ; =DIRECTIONS_XY + 2 mov r3, r3, lsl #2 ldrsh r2, [r2, r3] ldrsh r1, [r1, r3] @@ -1014,7 +1014,7 @@ _022FD77C: .word 0x000001A2 _022FD780: .word DUNGEON_PTR _022FD784: .word ov29_0237C9C0 _022FD788: .word DIRECTIONS_XY -_022FD78C: .word ov29_0235171E +_022FD78C: .word DIRECTIONS_XY + 2 _022FD790: .word ov29_0237C690 _022FD794: .word LEADER_PTR _022FD798: .word ov10_022C4520 diff --git a/asm/overlay_29_022FE4BC.s b/asm/overlay_29_022FE4BC.s index e48724a3..f3d1a74a 100644 --- a/asm/overlay_29_022FE4BC.s +++ b/asm/overlay_29_022FE4BC.s @@ -883,7 +883,7 @@ _022FE818: ldrh r3, [r6] ldr r2, _022FED88 ; =DIRECTIONS_XY mov r8, r1, lsl #2 - ldr r0, _022FED8C ; =ov29_0235171E + ldr r0, _022FED8C ; =DIRECTIONS_XY + 2 ldrsh ip, [sb, #4] ldrsh r7, [r2, r8] ldrsh r5, [sb, #6] @@ -1306,7 +1306,7 @@ _022FED7C: .word ov29_0237C9C0 _022FED80: .word ov29_0237CA6C _022FED84: .word ov29_0237CA68 _022FED88: .word DIRECTIONS_XY -_022FED8C: .word ov29_0235171E +_022FED8C: .word DIRECTIONS_XY + 2 #ifdef JAPAN _0230017C: .word 0x00000163 _022FED90: .word 0x00000B31 diff --git a/asm/overlay_29_02300D00.s b/asm/overlay_29_02300D00.s index 9fb97d6d..3dfbcf4a 100644 --- a/asm/overlay_29_02300D00.s +++ b/asm/overlay_29_02300D00.s @@ -125,7 +125,7 @@ CanMonsterMoveInDirection: ; 0x02300E78 bl GetMobilityTypeCheckSlipAndFloating ldr r2, _02300F24 ; =DIRECTIONS_XY mov ip, r5, lsl #2 - ldr r1, _02300F28 ; =ov29_0235171E + ldr r1, _02300F28 ; =DIRECTIONS_XY + 2 ldrsh r3, [r2, ip] ldrsh lr, [r6, #4] mov r4, r0 @@ -194,7 +194,7 @@ _02302330: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02300F24: .word DIRECTIONS_XY -_02300F28: .word ov29_0235171E +_02300F28: .word DIRECTIONS_XY + 2 _02300F2C: .word ov29_02352798 arm_func_end CanMonsterMoveInDirection @@ -252,7 +252,7 @@ ov29_02300FCC: ; 0x02300FCC mov r4, r1 ldr r1, _02301050 ; =DIRECTIONS_XY mov ip, r4, lsl #2 - ldr r0, _02301054 ; =ov29_0235171E + ldr r0, _02301054 ; =DIRECTIONS_XY + 2 ldrsh r3, [r1, ip] ldrsh lr, [r5, #4] ldrsh r1, [r0, ip] @@ -282,7 +282,7 @@ ov29_02300FCC: ; 0x02300FCC ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02301050: .word DIRECTIONS_XY -_02301054: .word ov29_0235171E +_02301054: .word DIRECTIONS_XY + 2 _02301058: .word ov29_02352790 arm_func_end ov29_02300FCC @@ -296,7 +296,7 @@ ov29_0230105C: ; 0x0230105C bl GetMobilityTypeCheckSlipAndFloating ldr r2, _0230110C ; =DIRECTIONS_XY mov ip, r5, lsl #2 - ldr r1, _02301110 ; =ov29_0235171E + ldr r1, _02301110 ; =DIRECTIONS_XY + 2 ldrsh r3, [r2, ip] ldrsh lr, [r6, #4] mov r4, r0 @@ -372,7 +372,7 @@ _023024DC_JP: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0230110C: .word DIRECTIONS_XY -_02301110: .word ov29_0235171E +_02301110: .word DIRECTIONS_XY + 2 _02301114: .word ov29_02352788 arm_func_end ov29_0230105C @@ -408,7 +408,7 @@ ov29_02301158: ; 0x02301158 bl GetMobilityTypeCheckSlipAndFloating ldr r2, _02301228 ; =DIRECTIONS_XY mov ip, r5, lsl #2 - ldr r1, _0230122C ; =ov29_0235171E + ldr r1, _0230122C ; =DIRECTIONS_XY + 2 ldrsh r3, [r2, ip] ldrsh lr, [r6, #4] mov r4, r0 @@ -487,7 +487,7 @@ _02302654: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02301228: .word DIRECTIONS_XY -_0230122C: .word ov29_0235171E +_0230122C: .word DIRECTIONS_XY + 2 _02301230: .word ov29_02352780 arm_func_end ov29_02301158 @@ -503,7 +503,7 @@ CanAttackInDirection: ; 0x02301234 ldr r1, _023012EC ; =DIRECTIONS_XY mov ip, r5, lsl #2 cmp r4, #1 - ldr r0, _023012F0 ; =ov29_0235171E + ldr r0, _023012F0 ; =DIRECTIONS_XY + 2 ldrsh r3, [r1, ip] ldrsh lr, [r6, #4] ldrsh r1, [r0, ip] @@ -579,7 +579,7 @@ _02302778: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _023012EC: .word DIRECTIONS_XY -_023012F0: .word ov29_0235171E +_023012F0: .word DIRECTIONS_XY + 2 _023012F4: .word ov29_02352778 arm_func_end CanAttackInDirection @@ -596,7 +596,7 @@ CanAiMonsterMoveInDirection: ; 0x023012F8 strb r1, [r6] ldr r2, _02301484 ; =DIRECTIONS_XY mov r4, r7, lsl #2 - ldr r1, _02301488 ; =ov29_0235171E + ldr r1, _02301488 ; =DIRECTIONS_XY + 2 ldrsh r3, [r2, r4] ldrsh ip, [r8, #4] mov r5, r0 @@ -726,7 +726,7 @@ _0230295C: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02301484: .word DIRECTIONS_XY -_02301488: .word ov29_0235171E +_02301488: .word DIRECTIONS_XY + 2 _0230148C: .word DUNGEON_PTR _02301490: .word SECONDARY_TERRAIN_TYPES _02301494: .word ov29_02352770 diff --git a/asm/overlay_29_02302A5C.s b/asm/overlay_29_02302A5C.s index 7bcb9064..099d9ddf 100644 --- a/asm/overlay_29_02302A5C.s +++ b/asm/overlay_29_02302A5C.s @@ -1468,7 +1468,7 @@ _02303D8C: strb r2, [sp, #6] ldrsh r3, [r0, r5] ldrsh r4, [r7, #4] - ldr r1, _02303E08 ; =ov29_0235171E + ldr r1, _02303E08 ; =DIRECTIONS_XY + 2 add r0, sp, #4 add r3, r4, r3 strh r3, [sp, #0xe] @@ -1491,7 +1491,7 @@ _02303DFC: .word 0x00000F29 #endif _02303E00: .word 0x0000013F _02303E04: .word DIRECTIONS_XY -_02303E08: .word ov29_0235171E +_02303E08: .word DIRECTIONS_XY + 2 arm_func_end EvolveMonster arm_func_start ov29_02303E0C diff --git a/asm/overlay_29_0231EDFC.s b/asm/overlay_29_0231EDFC.s index 0a8352cd..5b7494fc 100644 --- a/asm/overlay_29_0231EDFC.s +++ b/asm/overlay_29_0231EDFC.s @@ -299,7 +299,7 @@ _0231F1B0: bl _s32_div_f ldrsh sl, [sp, #0x40] mov r1, #0x18 - ldr r2, _0231F560 ; =ov29_0235171E + ldr r2, _0231F560 ; =DIRECTIONS_XY + 2 mov r3, r6, lsl #2 smulbb r1, sl, r1 add r1, r1, #0xc @@ -527,7 +527,7 @@ _0231F550: .word DUNGEON_PTR _0231F554: .word 0x00000E48 + OV29_0231EDFC_OFFSET _0231F558: .word 0x00000E47 + OV29_0231EDFC_OFFSET _0231F55C: .word 0x00000212 -_0231F560: .word ov29_0235171E +_0231F560: .word DIRECTIONS_XY + 2 _0231F564: .word 0x00000163 _0231F568: .word ov10_022C4458 _0231F56C: .word 0x00000259 diff --git a/asm/overlay_29_023201A0.s b/asm/overlay_29_023201A0.s index 7e6743f3..5602abf2 100644 --- a/asm/overlay_29_023201A0.s +++ b/asm/overlay_29_023201A0.s @@ -38,7 +38,7 @@ ov29_023201D0: ; 0x023201D0 strh r0, [sp] ldrh r3, [sl, #6] ldrsh r6, [r1, r2] - ldr r0, _02320334 ; =ov29_0235171E + ldr r0, _02320334 ; =DIRECTIONS_XY + 2 ldrsh r1, [sp] ldrsh r7, [r0, r2] strh r3, [sp, #2] @@ -117,7 +117,7 @@ _02320328: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _02320330: .word DIRECTIONS_XY -_02320334: .word ov29_0235171E +_02320334: .word DIRECTIONS_XY + 2 _02320338: .word 0x00000212 arm_func_end ov29_023201D0 diff --git a/asm/overlay_29_02322DDC.s b/asm/overlay_29_02322DDC.s index 9c134cdf..56e061ff 100644 --- a/asm/overlay_29_02322DDC.s +++ b/asm/overlay_29_02322DDC.s @@ -266,7 +266,7 @@ ov29_023230FC: ; 0x023230FC _02323160: ldrsh r2, [r8, #4] ldr r0, _023238F8 ; =DIRECTIONS_XY - ldr r1, _023238FC ; =ov29_0235171E + ldr r1, _023238FC ; =DIRECTIONS_XY + 2 strh r2, [sp, #0xbc] ldrsh r2, [r8, #6] mov r4, #0 @@ -356,7 +356,7 @@ _02323250: ldr r0, _023238F8 ; =DIRECTIONS_XY strh r2, [sp, #0xb8] ldrsh r2, [r5, #6] - ldr r1, _023238FC ; =ov29_0235171E + ldr r1, _023238FC ; =DIRECTIONS_XY + 2 strh r2, [sp, #0xba] ldrb r2, [sb, #0x4c] add r2, r2, #4 @@ -372,7 +372,7 @@ _023232E4: ldr r3, _023238F8 ; =DIRECTIONS_XY strh r0, [sp, #0xbc] ldrsh r1, [r8, #6] - ldr r2, _023238FC ; =ov29_0235171E + ldr r2, _023238FC ; =DIRECTIONS_XY + 2 mov r0, #0x18 strh r1, [sp, #0xbe] ldrb r1, [sb, #0x4c] @@ -788,7 +788,7 @@ _023238EC: .align 2, 0 _023238F4: .word ov29_02352A54 _023238F8: .word DIRECTIONS_XY -_023238FC: .word ov29_0235171E +_023238FC: .word DIRECTIONS_XY + 2 _02323900: .word ov29_0235175C _02323904: .word 0x00000FFF _02323908: .word ov29_02352A6C @@ -843,7 +843,7 @@ _02323984: ldr r4, _02323C30 ; =DIRECTIONS_XY ldrb r1, [r0, #0x4c] ldrsh r0, [sl, #4] - ldr r5, _02323C34 ; =ov29_0235171E + ldr r5, _02323C34 ; =DIRECTIONS_XY + 2 add r1, r1, #4 strh r0, [sp, #0x34] and r0, r1, #7 @@ -1032,7 +1032,7 @@ _02323BE0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02323C30: .word DIRECTIONS_XY -_02323C34: .word ov29_0235171E +_02323C34: .word DIRECTIONS_XY + 2 _02323C38: .word ov29_02352A8C _02323C3C: .word DUNGEON_PTR #ifdef JAPAN diff --git a/asm/overlay_29_0232A3FC.s b/asm/overlay_29_0232A3FC.s index 4b145a6c..b20fd36c 100644 --- a/asm/overlay_29_0232A3FC.s +++ b/asm/overlay_29_0232A3FC.s @@ -352,7 +352,7 @@ _0232A7B4: bl LogMessageByIdWithPopupCheckUserTarget ldrb r1, [r4, #0x4c] ldr r0, _0232A82C ; =DIRECTIONS_XY - ldr r5, _0232A830 ; =ov29_0235171E + ldr r5, _0232A830 ; =DIRECTIONS_XY + 2 mov r1, r1, lsl #2 ldrsh r1, [r0, r1] add r2, sp, #4 @@ -383,7 +383,7 @@ _0232A824: .word 0x00000EE8 _0232A828: .word 0x00000EE7 #endif _0232A82C: .word DIRECTIONS_XY -_0232A830: .word ov29_0235171E +_0232A830: .word DIRECTIONS_XY + 2 arm_func_end DoMoveKnockOff arm_func_start ov29_0232A834 diff --git a/asm/overlay_29_0232C524.s b/asm/overlay_29_0232C524.s index 98cfebb0..d1e2280d 100644 --- a/asm/overlay_29_0232C524.s +++ b/asm/overlay_29_0232C524.s @@ -905,7 +905,7 @@ _0232CFB8: ldrsh r3, [r6, #4] mov r1, r1, lsl #2 ldrsh r2, [r0, r1] - ldr r1, _0232D0E8 ; =ov29_0235171E + ldr r1, _0232D0E8 ; =DIRECTIONS_XY + 2 add r0, sp, #0 add r2, r3, r2 strh r2, [sp] @@ -985,12 +985,12 @@ _0232D0D0: #ifdef JAPAN _0232D0E0: .word 0x00000C4D _0232D0E4: .word DIRECTIONS_XY -_0232D0E8: .word ov29_0235171E +_0232D0E8: .word DIRECTIONS_XY + 2 _0232D0EC: .word 0x00000C4C #else _0232D0E0: .word 0x00000F0B _0232D0E4: .word DIRECTIONS_XY -_0232D0E8: .word ov29_0235171E +_0232D0E8: .word DIRECTIONS_XY + 2 _0232D0EC: .word 0x00000F0A #endif arm_func_end DoMoveFillIn diff --git a/asm/overlay_29_rodata_0234FD04.s b/asm/overlay_29_rodata_0234FD04.s index a5b726e4..53dd702a 100644 --- a/asm/overlay_29_rodata_0234FD04.s +++ b/asm/overlay_29_rodata_0234FD04.s @@ -1728,10 +1728,7 @@ ov29_023516FC: .byte 0x06, 0x02, 0x00, 0x04, 0x06, 0x04, 0x02, 0x00, 0x00, 0x04, 0x02, 0x06, 0x00, 0x06, 0x02, 0x04 .global DIRECTIONS_XY DIRECTIONS_XY: - .byte 0x00, 0x00 - .global ov29_0235171E -ov29_0235171E: - .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF + .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF .byte 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x01, 0x00 .global ov29_0235173C ov29_0235173C: