mirror of
https://github.com/zeldaret/ph
synced 2026-07-08 21:55:05 -04:00
Diff JPN func_02033030
This commit is contained in:
+25
@@ -69367,9 +69367,14 @@ func_02033030: ; 0x02033030
|
||||
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
sub sp, sp, #0xc
|
||||
mov sl, r0
|
||||
.ifdef EUR
|
||||
mov r4, #1
|
||||
strb r4, [sl, #0x51]
|
||||
ldrb r5, [sl, #0x4d]
|
||||
.endif
|
||||
.ifdef JPN
|
||||
ldrb r5, [sl, #0x4e]
|
||||
.endif
|
||||
mov r4, r1
|
||||
mov sb, r2
|
||||
add r1, r5, #0xff
|
||||
@@ -69379,14 +69384,24 @@ func_02033030: ; 0x02033030
|
||||
bhi _02033084
|
||||
mov r1, r8
|
||||
bl func_02033cbc
|
||||
.ifdef EUR
|
||||
ldrh r1, [sl, #0x4a]
|
||||
.endif
|
||||
.ifdef JPN
|
||||
ldrh r1, [sl, #0x3e]
|
||||
.endif
|
||||
add r0, r0, r0, lsr #31
|
||||
add r1, r4, r1, lsr #1
|
||||
sub r0, r1, r0, asr #1
|
||||
mov r0, r0, lsl #0x10
|
||||
mov r4, r0, asr #0x10
|
||||
_02033084:
|
||||
.ifdef EUR
|
||||
ldrb r0, [sl, #0x4e]
|
||||
.endif
|
||||
.ifdef JPN
|
||||
ldrb r0, [sl, #0x4f]
|
||||
.endif
|
||||
cmp r0, #0
|
||||
bne _020330cc
|
||||
str r8, [sp]
|
||||
@@ -69408,7 +69423,12 @@ _020330cc:
|
||||
cmp r0, #1
|
||||
addne sp, sp, #0xc
|
||||
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
.ifdef EUR
|
||||
ldrb r1, [sl, #0x4f]
|
||||
.endif
|
||||
.ifdef JPN
|
||||
ldrb r1, [sl, #0x50]
|
||||
.endif
|
||||
ldrh r0, [r8]
|
||||
mov r7, #0
|
||||
add r1, r4, r1, lsr #1
|
||||
@@ -69432,7 +69452,12 @@ _02033100:
|
||||
bl func_02023eec
|
||||
str r5, [sp]
|
||||
ldrsb r1, [r0, #2]
|
||||
.ifdef EUR
|
||||
ldrb r2, [sl, #0x4f]
|
||||
.endif
|
||||
.ifdef JPN
|
||||
ldrb r2, [sl, #0x50]
|
||||
.endif
|
||||
mov r0, sl
|
||||
ldr r6, [r0]
|
||||
mul r3, r2, r7
|
||||
|
||||
Reference in New Issue
Block a user