Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-30 14:18:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed ov29_0235171E symbol

Browse Source
This commit is contained in:
AnonymousRandomPerson
2025-03-27 23:54:01 -04:00
parent bed1278163
commit 69c89fbbaf
33 changed files with 65 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
asm/include/itcm.inc
View File

@@ -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

1
asm/include/overlay_29_022E9618.inc
View File

@@ -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

1
asm/include/overlay_29_022EE36C.inc
View File

@@ -60,7 +60,6 @@
.public ov29_02344B44
.public ov29_02346344
.public ov29_0234B084
.public ov29_0235171E
.public RemoveEmptyItemsInBagWrapper
.public RemoveGroundItem
.public RemoveHeldItemNoHole

1
asm/include/overlay_29_022F05B4.inc
View File

@@ -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

1
asm/include/overlay_29_022F59C4.inc
View File

@@ -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

1
asm/include/overlay_29_022F7388.inc
View File

@@ -89,7 +89,6 @@
.public ov29_0234B0B4
.public ov29_0234B1A4
.public ov29_0234EF24
.public ov29_0235171E
.public ov29_0237C9B0
.public PopulateActiveMonsterPtrs
.public RemoveHolderForItemInBag

1
asm/include/overlay_29_022F9744.inc
View File

@@ -94,7 +94,6 @@
.public ov29_0234B034
.public ov29_0234B084
.public ov29_0234B09C
.public ov29_0235171E
.public PointCameraToMonster
.public RandInt
.public RemoveEquivItem

1
asm/include/overlay_29_022FC9C0.inc
View File

@@ -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

1
asm/include/overlay_29_022FE4BC.inc
View File

@@ -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

1
asm/include/overlay_29_02300D00.inc
View File

@@ -10,7 +10,6 @@
.public IsCurrentTilesetBackground
.public IsTacticSet
.public ItemIsActive__022FF898
.public ov29_0235171E
.public ov29_02352770
.public ov29_02352778
.public ov29_02352780

1
asm/include/overlay_29_02302A5C.inc
View File

@@ -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

1
asm/include/overlay_29_0231EDFC.inc
View File

@@ -25,7 +25,6 @@
.public ov29_02304A48
.public ov29_0232033C
.public ov29_02321238
.public ov29_0235171E
.public ShouldDisplayEntityWrapper
.public sub_020018D0
.public SubstitutePlaceholderStringTags

1
asm/include/overlay_29_023201A0.inc
View File

@@ -25,7 +25,6 @@
.public ov29_02320AA4
.public ov29_02321238
.public ov29_02336694
.public ov29_0235171E
.public ov29_023529B8
.public ov29_02353700
.public RemoveGroundItem

1
asm/include/overlay_29_02322DDC.inc
View File

@@ -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

1
asm/include/overlay_29_0232A3FC.inc
View File

@@ -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

1
asm/include/overlay_29_0232C524.inc
View File

@@ -93,7 +93,6 @@
.public ov29_0234B084
.public ov29_0234B0B4
.public ov29_0234BA54
.public ov29_0235171E
.public ov29_02352B38
.public ov29_02352B3C
.public PrepareTrapperTrap

16
asm/itcm.s
View File

@@ -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

6
asm/overlay_29_022E9618.s
View File

@@ -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

4
asm/overlay_29_022EE36C.s
View File

@@ -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

6
asm/overlay_29_022F05B4.s
View File

@@ -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

4
asm/overlay_29_022F59C4.s
View File

@@ -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

22
asm/overlay_29_022F7388.s
View File

@@ -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

4
asm/overlay_29_022F9744.s
View File

@@ -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

4
asm/overlay_29_022FC9C0.s
View File

@@ -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

4
asm/overlay_29_022FE4BC.s
View File

@@ -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

24
asm/overlay_29_02300D00.s
View File

@@ -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

4
asm/overlay_29_02302A5C.s
View File

@@ -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

4
asm/overlay_29_0231EDFC.s
View File

@@ -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

4
asm/overlay_29_023201A0.s
View File

@@ -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

12
asm/overlay_29_02322DDC.s
View File

@@ -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

4
asm/overlay_29_0232A3FC.s
View File

@@ -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

6
asm/overlay_29_0232C524.s
View File

@@ -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

5
asm/overlay_29_rodata_0234FD04.s
View File

@@ -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: