Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-19 09:21:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Decomped entityExists() (#64)

Browse Source
This commit is contained in:
Cheng Hann Gan 2021-10-15 18:30:33 -04:00 committed by GitHub
parent 18726d97cf
commit 3f7ee3a806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 6714 additions and 6703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/code_803D110.s
View File

@ -3688,7 +3688,7 @@ sub_803EDF0:
b _0803EF42
_0803EE06:
ldr r0, [r6, 0x4]
bl sub_80450E0
bl entityExists
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@ -4668,7 +4668,7 @@ sub_803F580:
b _0803F7A0
_0803F59E:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0803F5AC
@ -4914,7 +4914,7 @@ _0803F774:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0803F79A

14
asm/code_8040094.s
View File

@ -1663,7 +1663,7 @@ _08040E24:
adds r6, r7, 0
_08040E26:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _08040E34
@ -2104,7 +2104,7 @@ _0804118A:
movs r2, 0
str r2, [sp, 0x14]
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080411CA
@ -2137,7 +2137,7 @@ _080411D0:
cmp r5, r0
beq _08041216
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08041216
@ -2452,7 +2452,7 @@ sub_804143C:
cmp r0, 0xED
bne _08041476
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080414A4
@ -2613,7 +2613,7 @@ sub_8041550:
lsls r0, 24
lsrs r6, r0, 24
adds r0, r7, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0804159C
@ -3034,7 +3034,7 @@ _08041890:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080418C0
@ -3065,7 +3065,7 @@ _080418D0: .4byte 0x000135cc
sub_80418D4:
push {r4,lr}
adds r4, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _080418E4

2
asm/code_8041AD0.s
View File

@ -700,7 +700,7 @@ _080427B0:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080427FA

6355
asm/code_80428A0.s
View File

File diff suppressed because it is too large Load Diff

6298
asm/code_80450F8.s Normal file
View File

File diff suppressed because it is too large Load Diff

16
asm/code_8048480.s
View File

@ -603,7 +603,7 @@ _080489A2:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08048A12
@ -660,7 +660,7 @@ _08048A12:
movs r1, 0x1
bl DrawFieldGiveItemMenu
adds r4, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08048A58
@ -741,7 +741,7 @@ _08048AB2:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08048B4A
@ -820,7 +820,7 @@ _08048B4A:
movs r1, 0x1
bl DrawFieldGiveItemMenu
adds r4, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08048B8C
@ -892,7 +892,7 @@ _08048BD6:
ldr r4, [r0]
adds r0, r4, 0
str r2, [sp, 0x1C]
bl sub_80450E0
bl entityExists
lsls r0, 24
ldr r2, [sp, 0x1C]
cmp r0, 0
@ -946,7 +946,7 @@ _08048C3E:
movs r1, 0x1
bl DrawFieldGiveItemMenu
adds r4, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _08048C60
@ -5181,7 +5181,7 @@ _0804ADBE:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0804ADDE
@ -5328,7 +5328,7 @@ _0804AEDE:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0804AEFE

64
asm/code_80521D0.s
View File

@ -1206,7 +1206,7 @@ sub_8052D44:
adds r4, r1, 0
adds r6, r2, 0
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@ -1228,7 +1228,7 @@ _08052D70:
strh r5, [r7]
_08052D7A:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@ -2435,7 +2435,7 @@ sub_8053704:
bl _08055570
_08053724:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _08053734
@ -2671,7 +2671,7 @@ _080538DA:
bl sub_804954C
ldr r0, [r0, 0x10]
str r0, [sp, 0x38]
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080539DC
@ -5662,7 +5662,7 @@ _080554C2:
cmp r0, 0
bne _080555A2
ldr r0, [sp, 0x20]
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080554E6
@ -5676,12 +5676,12 @@ _080554E6:
cmp r4, 0
bne _08055510
adds r0, r7, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055530
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055530
@ -5709,7 +5709,7 @@ _08055510:
strb r0, [r1]
_08055530:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055548
@ -5758,7 +5758,7 @@ _08055570:
cmp r5, 0
beq _080555A2
adds r0, r7, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080555A2
@ -5770,7 +5770,7 @@ _080555A2:
cmp r4, 0
bne _08055604
adds r0, r7, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080555D6
@ -5789,7 +5789,7 @@ _080555A2:
bl sub_807D148
_080555D6:
adds r0, r7, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055604
@ -6081,7 +6081,7 @@ _08055826:
_08055834: .4byte gUnknown_80F9688
_08055838:
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055850
@ -6148,7 +6148,7 @@ sub_8055864:
b _080558D2
_080558BA:
adds r0, r7, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080558D0
@ -6646,7 +6646,7 @@ _08055C82:
movs r0, 0x1
bl sub_804178C
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055CCE
@ -6668,7 +6668,7 @@ _08055C82:
_08055CB4:
mov r6, r8
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055CCE
@ -6679,7 +6679,7 @@ _08055CB4:
b _08055B30
_08055CCE:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055D54
@ -6744,14 +6744,14 @@ _08055D4E:
ble _08055CDC
_08055D54:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055DB2
adds r0, r5, 0
bl sub_8071DA4
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055DB2
@ -6762,7 +6762,7 @@ _08055D54:
movs r0, 0
strb r0, [r1]
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08055DB2
@ -6808,7 +6808,7 @@ _08055DD8: .4byte gUnknown_80F4E70
sub_8055DDC:
push {r4-r7,lr}
adds r4, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _08055DEC
@ -7343,7 +7343,7 @@ _08056278: .4byte gUnknown_202F220
_0805627C: .4byte 0x00000153
_08056280:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0805628E
@ -7498,7 +7498,7 @@ _080563A8:
bl sub_8053704
_080563B8:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08056400
@ -7549,7 +7549,7 @@ _08056418:
cmp r0, 0
beq _08056444
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08056444
@ -8861,7 +8861,7 @@ _08056E3A:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08056E94
@ -8962,7 +8962,7 @@ _08056F06:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08056F38
@ -9191,7 +9191,7 @@ sub_80570AC:
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _080570C2
@ -9237,7 +9237,7 @@ sub_80570F4:
adds r4, r0, 0
lsls r1, 24
lsrs r7, r1, 24
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805713C
@ -9296,7 +9296,7 @@ _08057154:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
adds r5, 0x1
mov r8, r5
@ -9457,12 +9457,12 @@ sub_805727C:
cmp r0, 0
bne _080572FC
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080572FC
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080572FC
@ -9525,7 +9525,7 @@ sub_8057308:
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0805731C
@ -9890,7 +9890,7 @@ sub_8057588:
adds r4, r0, 0
lsls r1, 24
lsrs r6, r1, 24
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080575F8

150
asm/code_8057824.s
View File

@ -2755,7 +2755,7 @@ sub_8058E5C:
cmp r0, 0
beq _08058ED0
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08058ED0
@ -3255,7 +3255,7 @@ sub_80591E4:
movs r4, 0x1
_0805922A:
adds r0, r7, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805927E
@ -5701,7 +5701,7 @@ sub_805A464:
cmp r0, 0
beq _0805A4B4
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@ -6373,7 +6373,7 @@ _0805A9B0:
cmp r4, 0
bne _0805AAB6
mov r0, r8
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805AAB6
@ -6397,13 +6397,13 @@ _0805A9B0:
cmp r0, 0
bne _0805AAB6
mov r0, r8
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805AAB6
_0805A9FE:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805AAB6
@ -6448,7 +6448,7 @@ _0805AA4C:
bl sub_80694C0
_0805AA5E:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805AAB6
@ -6872,7 +6872,7 @@ _0805ADA0:
adds r0, r7
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805AE0C
@ -8806,7 +8806,7 @@ _0805BBF0:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805BC2A
@ -9448,7 +9448,7 @@ _0805C0BA:
_0805C0BE:
ldr r4, [r6]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805C0F2
@ -10866,7 +10866,7 @@ _0805CE08:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805CE46
@ -10909,7 +10909,7 @@ _0805CE5E:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805CE9C
@ -15469,7 +15469,7 @@ _0805F4D8:
adds r0, r1
ldr r5, [r0]
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805F526
@ -15524,7 +15524,7 @@ _0805F544:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805F542
@ -16207,7 +16207,7 @@ _0805FB3A:
adds r0, r1
ldr r5, [r0]
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0805FB86
@ -16662,7 +16662,7 @@ _0805FEF4:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
adds r5, r6, 0x1
mov r12, r5
@ -17658,7 +17658,7 @@ _08060718:
adds r1, r0
ldr r4, [r1]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08060794
@ -18093,7 +18093,7 @@ _08060A86:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08060ABE
@ -18244,7 +18244,7 @@ _08060BD0:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08060CCC
@ -18497,7 +18497,7 @@ _08060DE4:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08060E14
@ -18573,7 +18573,7 @@ _08060E7A:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08060E9E
@ -18928,7 +18928,7 @@ _08061164:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080611AC
@ -19089,7 +19089,7 @@ _0806129E:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _080612BA
@ -21996,7 +21996,7 @@ _080629FC:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08062A5A
@ -25468,7 +25468,7 @@ sub_806455C:
movs r3, 0
bl xxx_call_draw_string
ldr r0, [r4, 0x14]
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080645C0
@ -31266,7 +31266,7 @@ _080674BC:
bl sub_8047190
_080674D0:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080674F8
@ -31777,7 +31777,7 @@ _080678C6:
cmp r0, 0
bne _080678F6
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080678F0
@ -31888,7 +31888,7 @@ _0806798E:
movs r3, 0
bl sub_8055FA0
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080679DE
@ -31907,7 +31907,7 @@ _080679D2:
blt _0806798E
_080679DE:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08067A56
@ -33603,7 +33603,7 @@ _0806876C:
cmp r4, 0
beq _08068796
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08068796
@ -34751,7 +34751,7 @@ _08069044:
cmp r4, 0
beq _08069072
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08069072
@ -34956,7 +34956,7 @@ _080691FE:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080691FC
@ -36627,7 +36627,7 @@ _08069EAA:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08069F3E
@ -36750,14 +36750,14 @@ sub_8069F9C:
mov r8, r0
adds r6, r1, 0
mov r9, r2
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _08069FB8
b _0806A0FA
_08069FB8:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _08069FC6
@ -36935,12 +36935,12 @@ sub_806A120:
adds r7, r0, 0
adds r6, r1, 0
adds r4, r2, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A19C
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A19C
@ -36999,7 +36999,7 @@ sub_806A1B0:
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A1DE
@ -37028,7 +37028,7 @@ sub_806A1E8:
push {r4,r5,lr}
adds r4, r0, 0
movs r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A234
@ -37076,7 +37076,7 @@ sub_806A240:
adds r4, r0, 0
adds r5, r1, 0
movs r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A2B4
@ -37140,7 +37140,7 @@ sub_806A2BC:
adds r4, r0, 0
lsls r1, 24
lsrs r6, r1, 24
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A328
@ -37211,7 +37211,7 @@ _0806A33E:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A384
@ -37552,7 +37552,7 @@ sub_806A5B8:
push {r7}
sub sp, 0x4
adds r6, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806A5CE
@ -37799,7 +37799,7 @@ _0806A7A4:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A7D2
@ -38003,7 +38003,7 @@ _0806A92A:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A95C
@ -38046,7 +38046,7 @@ _0806A978:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806A99E
@ -38072,7 +38072,7 @@ sub_806A9B4:
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806AA02
@ -38184,7 +38184,7 @@ _0806AA7C:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806AB12
@ -38280,7 +38280,7 @@ _0806AB3A:
adds r0, r1
ldr r7, [r0]
adds r0, r7, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
adds r4, 0x1
mov r8, r4
@ -38297,7 +38297,7 @@ _0806AB5C:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806AB8C
@ -39481,7 +39481,7 @@ _0806B460:
str r0, [r2]
bl sub_8083600
adds r5, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806B49C
@ -39755,7 +39755,7 @@ _0806B67C:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806B6B8
@ -41212,7 +41212,7 @@ _0806C1E2:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
adds r5, 0x1
mov r9, r5
@ -42553,7 +42553,7 @@ _0806CC14:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806CC5C
@ -42604,7 +42604,7 @@ _0806CC74:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806CCA0
@ -42749,7 +42749,7 @@ _0806CD94:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806CDC0
@ -42966,7 +42966,7 @@ sub_806CEFC:
sub_806CF18:
push {r4-r6,lr}
adds r4, r0, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806CF4C
@ -43018,7 +43018,7 @@ _0806CF64:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806CF84
@ -43136,14 +43136,14 @@ _0806D04A:
b _0806D514
_0806D054:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806D062
b _0806D514
_0806D062:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806D070
@ -43235,14 +43235,14 @@ _0806D100:
bl sub_8077084
_0806D118:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806D126
b _0806D514
_0806D126:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806D134
@ -43363,14 +43363,14 @@ _0806D1E0:
bl sub_806D528
_0806D216:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806D224
b _0806D514
_0806D224:
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806D232
@ -43665,12 +43665,12 @@ _0806D45A:
strh r0, [r2]
_0806D48A:
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806D514
adds r0, r5, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806D514
@ -44364,7 +44364,7 @@ _0806DA2E:
movs r0, 0x1
mov r8, r0
mov r0, r9
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806DA50
@ -44672,7 +44672,7 @@ _0806DC86:
adds r0, r1
ldr r0, [r0]
mov r8, r0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806DCDE
@ -45094,7 +45094,7 @@ _0806DFF8:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806E020
@ -45138,7 +45138,7 @@ _0806E040:
strb r1, [r0, 0xD]
_0806E066:
mov r0, r9
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806E08A
@ -45246,7 +45246,7 @@ sub_806E100:
movs r1, 0
str r1, [sp, 0x1C]
ldr r0, [sp, 0x18]
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806E14E
@ -45883,7 +45883,7 @@ sub_806E654:
movs r0, 0
str r0, [sp, 0x10]
adds r0, r1, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0806E6DC
@ -48222,7 +48222,7 @@ _0806F8C6:
adds r0, r3
adds r0, r1
ldr r0, [r0]
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806F8C4
@ -48272,7 +48272,7 @@ _0806F91C:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
adds r1, r6, 0x1
mov r8, r1
@ -48848,7 +48848,7 @@ _0806FDBE:
adds r0, r2
adds r0, r1
ldr r0, [r0]
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
bne _0806FDBC

452
asm/code_807001C.s
View File

File diff suppressed because it is too large Load Diff

24
asm/code_80848F0.s
View File

@ -159,7 +159,7 @@ _0808538E:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080853BE
@ -290,7 +290,7 @@ _08085490:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080854C0
@ -336,7 +336,7 @@ _080854E6:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08085504
@ -481,7 +481,7 @@ _080855EC:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08085618
@ -527,7 +527,7 @@ _08085642:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0808566C
@ -565,7 +565,7 @@ _08085688:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080856B8
@ -687,7 +687,7 @@ _08085770:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _0808579E
@ -734,7 +734,7 @@ _080857CA:
adds r0, r1
ldr r6, [r0]
adds r0, r6, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08085840
@ -921,7 +921,7 @@ _0808593C:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08085982
@ -960,7 +960,7 @@ _08085990:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _080859E2
@ -1014,7 +1014,7 @@ _080859FC:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08085A42
@ -1834,7 +1834,7 @@ _080860D0:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08086114

2
asm/code_8086A3C.s
View File

@ -371,7 +371,7 @@ _08086F6A:
adds r0, r1
ldr r4, [r0]
adds r0, r4, 0
bl sub_80450E0
bl entityExists
lsls r0, 24
cmp r0, 0
beq _08086F8E

9
include/dungeon_engine.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef GUARD_DUNGEON_ENGINE_H
#define GUARD_DUNGEON_ENGINE_H
#include "dungeon_entity.h"
// 0x8075990
void decideAction(struct DungeonEntity *pokemon);
#endif

4
include/dungeon_entity.h
View File

@ -229,8 +229,7 @@ struct DungeonEntityData
// Used for Pokémon, items, and traps.
struct DungeonEntity
{
/* 0x0 */ u8 entityType;
u8 fill1[0x4 - 0x1];
/* 0x0 */ u32 entityType;
/* 0x4 */ s16 posWorldX;
/* 0x6 */ s16 posWorldY;
/* 0x8 */ s16 prevPosWorldX;
@ -282,6 +281,7 @@ struct DungeonEntity
enum EntityType
{
ENTITY_NONE = 0,
ENTITY_POKEMON = 1,
ENTITY_ITEM = 2,
ENTITY_TRAP = 3

2
ld_script.txt
View File

@ -182,6 +182,8 @@ SECTIONS {
asm/code_8041AD0.o(.text);
src/code_80428A0.o(.text);
asm/code_80428A0.o(.text);
src/dungeon_engine.o(.text);
asm/code_80450F8.o(.text);
src/code_8048480.o(.text);
asm/code_8048480.o(.text);
src/code_80521D0.o(.text);

4
src/code_80521D0_1.c
View File

@ -94,7 +94,7 @@ extern void sub_8085918(struct DungeonEntity *, u32);
extern void sub_806CE68(struct DungeonEntity *r0, u32);
extern void sub_8052910(u32 *);
extern void sub_803E708(u32, u32);
extern u8 sub_80450E0(struct DungeonEntity *);
extern u8 entityExists(struct DungeonEntity *);
extern u8 HasRecruitedMon(u32);
extern u8 sub_806FD18(struct DungeonEntity *);
extern u8 sub_8083E74(u32);
@ -1102,7 +1102,7 @@ void sub_808C948(struct DungeonEntity *param_1, u8 param_2)
flag = FALSE;
for(iVar3 = 0; iVar3 < 0x10; iVar3++){
iVar2 = gDungeonGlobalData->wildPokemon[iVar3];
if ((iVar2 != param_1) && (sub_80450E0(iVar2) != 0)) {
if ((iVar2 != param_1) && (entityExists(iVar2) != 0)) {
flag = TRUE;
break;
}

4
src/code_8057824_1.c
View File

@ -313,7 +313,7 @@ void sub_808919C();
void sub_8088D30(void);
extern void sub_8083F14();
extern u8 sub_80450E0(struct DungeonEntity *);
extern u8 entityExists(struct DungeonEntity *);
extern u8 sub_8086AE4(u32);
@ -1985,7 +1985,7 @@ void sub_8089788(struct DungeonEntity *param_1, u8 param_2, s32 param_3)
for(iVar3 = 0; iVar3 < 0x10; iVar3++)
{
iVar2 = gDungeonGlobalData->wildPokemon[iVar3];
if ((sub_80450E0(iVar2) != '\0') && (iVar2 != param_1) && (iVar2->entityData->clientFlags == param_2)) {
if ((entityExists(iVar2) != '\0') && (iVar2 != param_1) && (iVar2->entityData->clientFlags == param_2)) {
return;
}
}

11
src/dungeon_engine.c Normal file
View File

@ -0,0 +1,11 @@
#include "global.h"
#include "dungeon_engine.h"
bool8 entityExists(struct DungeonEntity *entity)
{
if (!entity)
{
return FALSE;
}
return entity->entityType != ENTITY_NONE;
}