diff options
| author | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-20 21:59:07 -0500 |
|---|---|---|
| committer | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-20 21:59:23 -0500 |
| commit | 60a19d681cda14c4ebeab5d18a98e3b07a5e93a3 (patch) | |
| tree | f660e34515e72a33f68af5f8822dd2eb1628dc08 | |
| parent | 96372eb336d21e5da66246983e0522212f370bdf (diff) | |
Decomped GetMapTile_2
41 files changed, 456 insertions, 487 deletions
diff --git a/asm/code_803D110.s b/asm/code_803D110.s index 0411a71..fe3cd47 100644 --- a/asm/code_803D110.s +++ b/asm/code_803D110.s @@ -4953,7 +4953,7 @@ sub_803F7BC: ldrsh r0, [r5, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r1, [r0, 0x9] ldr r2, _0803F808 adds r0, r4, r2 diff --git a/asm/code_8040094.s b/asm/code_8040094.s index 8c54f30..cdf03f4 100644 --- a/asm/code_8040094.s +++ b/asm/code_8040094.s @@ -232,7 +232,7 @@ _080402FC: _08040302: mov r0, r8 adds r1, r3, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 mov r9, r0 ldrh r0, [r0] movs r5, 0x3 @@ -553,7 +553,7 @@ _0804056C: adds r1, r3, 0 adds r1, 0x1 mov r0, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -567,7 +567,7 @@ _0804058A: adds r1, r5, 0 subs r1, 0x1 mov r0, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -583,7 +583,7 @@ _080405AA: mov r0, r8 adds r0, 0x1 ldr r1, [sp] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -598,7 +598,7 @@ _080405CA: ble _080405E8 subs r0, 0x1 ldr r1, [sp] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -2523,7 +2523,7 @@ sub_80414C0: cmp r0, 0x9C bne _080414DC adds r0, r5, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 bl IsTileGround lsls r0, 24 cmp r0, 0 @@ -2533,7 +2533,7 @@ _080414DC: cmp r0, 0x8 bne _080414F6 adds r0, r5, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s index 5febc6a..6f512f1 100644 --- a/asm/code_80428A0.s +++ b/asm/code_80428A0.s @@ -2410,7 +2410,7 @@ _08043E6A: _08043E6E: adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 ldr r4, [r0, 0x14] adds r0, r4, 0 bl EntityExists diff --git a/asm/code_8044CC8.s b/asm/code_8044CC8.s index f5a3aca..cc76921 100644 --- a/asm/code_8044CC8.s +++ b/asm/code_8044CC8.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start sub_8044CC8 sub_8044CC8: push {lr} @@ -33,7 +33,7 @@ _08044CEC: ldrsh r0, [r2, r1] movs r3, 0x6 ldrsh r1, [r2, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r0, [r0, 0x14] bl GetItemData b _08044D34 diff --git a/asm/code_80450F8.s b/asm/code_80450F8.s index 6d391de..5103e9c 100644 --- a/asm/code_80450F8.s +++ b/asm/code_80450F8.s @@ -792,7 +792,7 @@ sub_8045708: ldrsh r0, [r1, r2] movs r3, 0x2 ldrsh r1, [r1, r3] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 diff --git a/asm/code_8045A00.s b/asm/code_8045A00.s index 944744e..80e2a82 100644 --- a/asm/code_8045A00.s +++ b/asm/code_8045A00.s @@ -426,7 +426,7 @@ _08045CEE: _08045CF6: adds r0, r5, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r0, [r2] movs r3, 0x80 @@ -542,7 +542,7 @@ sub_8045DB4: ldrsh r0, [r1, r2] movs r3, 0x2 ldrsh r1, [r1, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r4, [r0, 0x14] cmp r4, 0 bne _08045DE8 @@ -958,7 +958,7 @@ _08046110: ldrsh r0, [r5, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl GetMapEntity + bl GetMapTile_2 str r4, [r0, 0x14] ldrh r1, [r0] movs r0, 0x20 @@ -1044,7 +1044,7 @@ sub_80461C8: ldrsh r0, [r2, r1] movs r3, 0x2 ldrsh r1, [r2, r3] - bl GetMapEntity + bl GetMapTile_2 adds r6, r0, 0 ldr r5, [r6, 0x14] cmp r5, 0 @@ -1187,7 +1187,7 @@ _080462E4: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r0, [r0] movs r1, 0x3 ands r1, r0 @@ -1492,7 +1492,7 @@ sub_804652C: ldrsh r0, [r5, r1] movs r2, 0x6 ldrsh r1, [r5, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldr r0, [r4, 0x14] movs r3, 0 @@ -1559,7 +1559,7 @@ _080465A8: movs r2, 0 ldrsh r0, [r0, r2] asrs r1, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldrh r1, [r4] movs r6, 0x3 @@ -1630,7 +1630,7 @@ _08046644: ldrsh r0, [r0, r3] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r0, [r0] movs r1, 0x3 ands r1, r0 @@ -1999,7 +1999,7 @@ _08046904: lsls r0, r4, 16 asrs r0, 16 asrs r1, r4, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 diff --git a/asm/code_8046CE4.s b/asm/code_8046CE4.s index 520a378..b8ff1f9 100644 --- a/asm/code_8046CE4.s +++ b/asm/code_8046CE4.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start sub_8046CE4 sub_8046CE4: push {r4,r5,lr} @@ -715,7 +715,7 @@ _08047228: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r1, [r5] movs r0, 0x3 @@ -747,7 +747,7 @@ _0804727A: ldrsh r1, [r1, r3] adds r1, r2 str r2, [sp, 0x234] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -868,7 +868,7 @@ _0804737A: ldrsh r0, [r7, r4] movs r2, 0x6 ldrsh r1, [r7, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r1, [r5] movs r0, 0x3 @@ -1424,7 +1424,7 @@ _080477D0: ldrsh r0, [r3, r1] movs r2, 0x2 ldrsh r1, [r3, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldr r0, [r4, 0x10] cmp r0, 0 diff --git a/asm/code_8049590.s b/asm/code_80495E4.s index 0fb0554..47aa04a 100644 --- a/asm/code_8049590.s +++ b/asm/code_80495E4.s @@ -5,53 +5,6 @@ .text - thumb_func_start GetMapEntity -GetMapEntity: - push {r4,r5,lr} - adds r2, r0, 0 - adds r3, r1, 0 - cmp r2, 0 - blt _080495A6 - cmp r3, 0 - blt _080495A6 - cmp r2, 0x37 - bgt _080495A6 - cmp r3, 0x1F - ble _080495C0 -_080495A6: - ldr r0, _080495B8 - ldr r1, _080495BC - adds r2, r0, 0 - ldr r1, [r1] - ldm r1!, {r3-r5} - stm r2!, {r3-r5} - ldm r1!, {r3-r5} - stm r2!, {r3-r5} - b _080495D6 - .align 2, 0 -_080495B8: .4byte gUnknown_202F190 -_080495BC: .4byte gUnknown_203B430 -_080495C0: - ldr r0, _080495DC - ldr r1, [r0] - lsls r2, 2 - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 5 - adds r2, r0 - ldr r0, _080495E0 - adds r1, r0 - adds r1, r2 - ldr r0, [r1] -_080495D6: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080495DC: .4byte gDungeonGlobalData -_080495E0: .4byte 0x0000e8c0 - thumb_func_end GetMapEntity - thumb_func_start sub_80495E4 sub_80495E4: push {r4-r7,lr} @@ -404,7 +357,7 @@ _080498CA: b _08049B72 _080498D0: movs r7, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r0, [r0] movs r1, 0x3 mov r8, r1 @@ -427,7 +380,7 @@ _080498D0: bgt _0804991C mov r0, r10 mov r1, r9 - bl GetMapEntity + bl GetMapTile_2 ldr r2, [r4] mov r3, r9 lsls r1, r3, 1 @@ -441,7 +394,7 @@ _08049918: .4byte 0x00003a0e _0804991C: mov r0, r10 mov r1, r9 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 b _08049B70 _08049928: @@ -450,7 +403,7 @@ _08049928: str r0, [sp, 0x24] mov r0, r10 ldr r1, [sp, 0x24] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -459,14 +412,14 @@ _08049928: adds r4, 0x1 adds r0, r4, 0 ldr r1, [sp, 0x24] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 str r0, [sp, 0x4] adds r0, r4, 0 mov r1, r9 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -475,14 +428,14 @@ _08049928: subs r5, 0x1 adds r0, r4, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 str r0, [sp, 0xC] mov r0, r10 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -490,21 +443,21 @@ _08049928: subs r4, 0x2 adds r0, r4, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 str r0, [sp, 0x14] adds r0, r4, 0 mov r1, r9 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 str r0, [sp, 0x18] adds r0, r4, 0 ldr r1, [sp, 0x24] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r0, [r0] mov r1, r8 ands r1, r0 @@ -754,7 +707,7 @@ _08049B4A: _08049B56: mov r0, r10 mov r1, r9 - bl GetMapEntity + bl GetMapTile_2 ldr r1, _08049B84 ldr r2, [r1] lsls r1, r7, 1 @@ -823,7 +776,7 @@ sub_8049BB0: mov r9, r0 mov r0, r10 mov r1, r9 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r4, 0x3 adds r0, r4, 0 @@ -834,14 +787,14 @@ sub_8049BB0: adds r5, 0x1 adds r0, r5, 0 mov r1, r9 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r4, 0 ands r0, r1 str r0, [r6, 0x4] adds r0, r5, 0 ldr r1, [sp, 0x40] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r4, 0 ands r0, r1 @@ -851,14 +804,14 @@ sub_8049BB0: mov r8, r0 adds r0, r5, 0 mov r1, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r4, 0 ands r0, r1 str r0, [r6, 0xC] mov r0, r10 mov r1, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r4, 0 ands r0, r1 @@ -866,21 +819,21 @@ sub_8049BB0: subs r5, 0x2 adds r0, r5, 0 mov r1, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r4, 0 ands r0, r1 str r0, [r6, 0x14] adds r0, r5, 0 ldr r1, [sp, 0x40] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r4, 0 ands r0, r1 str r0, [r6, 0x18] adds r0, r5, 0 mov r1, r9 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r0, [r0] ands r4, r0 str r4, [r6, 0x1C] @@ -1200,22 +1153,22 @@ _08049E84: _08049E94: mov r0, r10 ldr r1, [sp, 0x40] - bl GetMapEntity + bl GetMapTile_2 ldr r1, [sp] strb r1, [r0, 0xA] mov r0, r10 ldr r1, [sp, 0x40] - bl GetMapEntity + bl GetMapTile_2 ldr r1, [sp, 0x4] strb r1, [r0, 0xB] mov r0, r10 ldr r1, [sp, 0x40] - bl GetMapEntity + bl GetMapTile_2 ldr r1, [sp, 0x8] strb r1, [r0, 0xC] mov r0, r10 ldr r1, [sp, 0x40] - bl GetMapEntity + bl GetMapTile_2 ldr r1, [sp, 0xC] strb r1, [r0, 0xD] add sp, 0x44 @@ -1296,7 +1249,7 @@ _08049F1C: ldr r0, [sp, 0x10] ldr r1, [sp, 0x14] str r3, [sp, 0x34] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r2, [r5] movs r1, 0x80 @@ -1483,7 +1436,7 @@ _0804A098: ldr r0, [sp, 0x10] adds r1, r2, 0 str r3, [sp, 0x34] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r2, [r5] movs r0, 0x20 @@ -1696,7 +1649,7 @@ sub_804A1F0: adds r6, r3, r0 ldr r0, [sp, 0xC] mov r1, r10 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r1, [r5] movs r0, 0x20 @@ -1846,7 +1799,7 @@ _0804A386: ldr r6, [sp, 0x10] ldr r0, [sp, 0xC] mov r1, r10 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r1, [r5] movs r0, 0x20 @@ -2044,7 +1997,7 @@ sub_804A49C: mov r3, r9 adds r6, r3, r0 mov r0, r10 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r1, [r5] movs r0, 0x20 @@ -2179,7 +2132,7 @@ _0804A60C: adds r6, r0, r3 mov r0, r10 ldr r1, [sp, 0xC] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r1, [r5] movs r0, 0x20 @@ -2787,7 +2740,7 @@ _0804AAB2: _0804AAB6: adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 strh r7, [r0, 0x4] adds r4, 0x1 cmp r4, 0x37 @@ -2854,7 +2807,7 @@ _0804AB2E: _0804AB32: adds r0, r4, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r2, [r0, 0x9] adds r3, r4, 0x1 cmp r2, 0xFF @@ -2983,7 +2936,7 @@ sub_804AC20: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r1, [r0, 0x9] ldr r0, _0804AC6C ldr r3, [r0] @@ -3051,7 +3004,7 @@ _0804ACA8: _0804ACB0: adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x3 orrs r1, r2 @@ -3085,7 +3038,7 @@ sub_804ACE4: movs r3, 0x2 ldrsh r1, [r0, r3] adds r0, r2, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r0, [r0, 0x14] cmp r0, 0 beq _0804AD06 @@ -3109,7 +3062,7 @@ sub_804AD0C: movs r3, 0x2 ldrsh r1, [r0, r3] adds r0, r2, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r1, [r0, 0x10] cmp r1, 0 beq _0804AD2C @@ -3137,7 +3090,7 @@ sub_804AD34: ldrsh r0, [r6, r1] movs r2, 0x2 ldrsh r1, [r6, r2] - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -3242,7 +3195,7 @@ sub_804AE08: ldrsh r0, [r7, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -3304,7 +3257,7 @@ sub_804AE84: ldrsh r0, [r5, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2, 0x4] movs r0, 0x10 @@ -3851,7 +3804,7 @@ _0804B318: _0804B31C: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrh r0, [r1] movs r2, 0x3 @@ -4125,7 +4078,7 @@ _0804B55A: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0xC] - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r0, [r2] ldr r6, _0804B630 @@ -4147,7 +4100,7 @@ _0804B55A: subs r0, r5, 0x1 adds r1, r4, 0 str r2, [sp, 0x8] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r7, 0 ands r0, r1 @@ -4163,7 +4116,7 @@ _0804B5A4: adds r0, r5, 0 str r2, [sp, 0x8] str r3, [sp, 0xC] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -4179,7 +4132,7 @@ _0804B5C4: adds r1, r4, 0 str r2, [sp, 0x8] str r3, [sp, 0xC] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -4196,7 +4149,7 @@ _0804B5E4: adds r1, r6, 0 str r2, [sp, 0x8] str r3, [sp, 0xC] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -4642,7 +4595,7 @@ _0804B962: ldr r2, _0804B9F0 add r2, sp str r3, [r2] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] mov r2, r9 ands r1, r2 @@ -4651,7 +4604,7 @@ _0804B962: strh r1, [r0] adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 ldr r1, _0804B9D0 add r1, sp ldrb r1, [r1] @@ -4740,7 +4693,7 @@ _0804B9F4: strh r0, [r7, 0x6] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r3, _0804BBF8 adds r2, r3, 0 @@ -4750,7 +4703,7 @@ _0804B9F4: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0xFF strb r1, [r0, 0x9] _0804BA72: @@ -5251,7 +5204,7 @@ _0804BE84: ldr r2, _0804BEFC add r2, sp str r3, [r2] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] mov r2, r8 ands r1, r2 @@ -5260,7 +5213,7 @@ _0804BE84: strh r1, [r0] adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 ldr r1, _0804BEE0 add r1, sp ldrb r1, [r1] @@ -5348,7 +5301,7 @@ _0804BF00: strh r0, [r7, 0x6] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r6, _0804C090 adds r2, r6, 0 @@ -5358,7 +5311,7 @@ _0804BF00: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0xFF strb r1, [r0, 0x9] _0804BF88: @@ -5988,7 +5941,7 @@ _0804C498: movs r2, 0 ldrsh r0, [r3, r2] mov r1, r10 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] mov r9, r0 ldr r5, [sp, 0x8] @@ -6009,7 +5962,7 @@ _0804C4C2: _0804C4CE: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ands r1, r7 movs r2, 0x1 @@ -6610,7 +6563,7 @@ _0804C95C: _0804C972: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] mov r2, r8 ands r1, r2 @@ -6619,7 +6572,7 @@ _0804C972: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 mov r1, r9 strb r1, [r0, 0x9] adds r4, 0x1 @@ -6819,7 +6772,7 @@ _0804CB0C: lsls r2, 5 add r2, sp str r3, [r2] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] mov r2, r8 ands r1, r2 @@ -6828,7 +6781,7 @@ _0804CB0C: strh r1, [r0] adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0xE5 lsls r1, 5 add r1, sp @@ -7034,7 +6987,7 @@ _0804CCC0: bge _0804CC84 adds r0, r7, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r5, [r0, 0x9] ldr r1, _0804CCE0 mov r3, r8 @@ -7053,7 +7006,7 @@ _0804CCE4: _0804CCF0: adds r0, r7, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] cmp r5, r0 beq _0804CCE4 @@ -7074,7 +7027,7 @@ _0804CD0C: _0804CD18: adds r0, r7, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r5, 0x3 adds r0, r5, 0 @@ -7083,7 +7036,7 @@ _0804CD18: beq _0804CD0C adds r0, r7, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r5, 0 ands r0, r1 @@ -7138,7 +7091,7 @@ _0804CD72: adds r0, r7, r0 adds r1, r6, r1 str r2, [sp, 0x1C] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r5, 0x3 adds r0, r5, 0 @@ -7159,7 +7112,7 @@ _0804CDA2: ldrsh r1, [r1, r3] adds r0, r7, r0 adds r1, r6, r1 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r5, 0 ands r0, r1 @@ -7177,7 +7130,7 @@ _0804CDD4: .4byte gAdjacentTileOffsets _0804CDD8: adds r0, r7, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x10 ands r0, r1 @@ -7190,7 +7143,7 @@ _0804CDEC: adds r4, r7, 0x1 adds r0, r4, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r10 ands r0, r1 @@ -7200,7 +7153,7 @@ _0804CDEC: adds r5, r6, 0x1 adds r0, r4, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r0, [r0] mov r4, r10 ands r4, r0 @@ -7208,7 +7161,7 @@ _0804CDEC: bne _0804CE32 adds r0, r7, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r0, [r0] mov r1, r10 ands r0, r1 @@ -7220,7 +7173,7 @@ _0804CDEC: _0804CE32: mov r0, r9 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r5, 0x3 adds r0, r5, 0 @@ -7230,7 +7183,7 @@ _0804CE32: subs r4, r6, 0x1 mov r0, r9 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r5, 0 ands r0, r1 @@ -7238,7 +7191,7 @@ _0804CE32: bne _0804CE70 adds r0, r7, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r5, 0 ands r0, r1 @@ -7250,7 +7203,7 @@ _0804CE70: subs r4, r7, 0x1 adds r0, r4, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r2, 0x3 adds r0, r2, 0 @@ -7261,7 +7214,7 @@ _0804CE70: adds r0, r4, 0 adds r1, r5, 0 str r2, [sp, 0x1C] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x1C] adds r0, r2, 0 @@ -7270,7 +7223,7 @@ _0804CE70: bne _0804CEB6 adds r0, r7, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x1C] adds r0, r2, 0 @@ -7282,7 +7235,7 @@ _0804CE70: _0804CEB6: adds r0, r4, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r2, 0x3 adds r0, r2, 0 @@ -7293,7 +7246,7 @@ _0804CEB6: adds r0, r4, 0 adds r1, r5, 0 str r2, [sp, 0x1C] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x1C] adds r0, r2, 0 @@ -7302,7 +7255,7 @@ _0804CEB6: bne _0804CEFA adds r0, r7, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x1C] adds r0, r2, 0 @@ -7317,7 +7270,7 @@ _0804CEFA: beq _0804CF16 adds r0, r7, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r3, _0804D018 adds r2, r3, 0 @@ -7344,7 +7297,7 @@ _0804CF16: adds r0, r7, r0 adds r1, r6, r1 str r2, [sp, 0x1C] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r5, 0x3 adds r0, r5, 0 @@ -7365,7 +7318,7 @@ _0804CF16: ldrsh r1, [r1, r3] adds r0, r7, r0 adds r1, r6, r1 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] adds r0, r5, 0 ands r0, r1 @@ -7431,7 +7384,7 @@ _0804CFD4: bgt _0804CFFC adds r0, r7, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r3, 0x3 mov r10, r3 @@ -7990,7 +7943,7 @@ _0804D3E0: adds r0, r4, 0 adds r1, r5, 0 str r3, [sp, 0x34] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] mov r2, r9 ands r1, r2 @@ -7999,7 +7952,7 @@ _0804D3E0: strh r1, [r0] adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 mov r1, sp ldrb r1, [r1, 0x10] strb r1, [r0, 0x9] @@ -8126,7 +8079,7 @@ _0804D4BA: strh r0, [r7, 0x6] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r3, _0804D530 adds r2, r3, 0 @@ -8136,7 +8089,7 @@ _0804D4BA: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0xFE strb r1, [r0, 0x9] _0804D508: @@ -9244,7 +9197,7 @@ _0804DCCA: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] mov r8, r0 ldr r5, [sp, 0x28] @@ -9261,7 +9214,7 @@ _0804DCF0: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x54] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r3, [sp, 0x54] ands r1, r3 @@ -9374,7 +9327,7 @@ _0804DDB4: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] mov r9, r0 ldr r5, [sp, 0x2C] @@ -9391,7 +9344,7 @@ _0804DDE0: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x54] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r3, [sp, 0x54] ands r1, r3 @@ -9505,7 +9458,7 @@ _0804DEAC: movs r0, 0x2 ldrsh r1, [r4, r0] ldr r0, [sp, 0x30] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] mov r8, r0 ldr r5, [sp, 0x30] @@ -9522,7 +9475,7 @@ _0804DED0: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x54] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r3, [sp, 0x54] ands r1, r3 @@ -9623,7 +9576,7 @@ _0804DF88: ldrsh r0, [r4, r1] adds r1, r6, 0 str r3, [sp, 0x54] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] mov r10, r0 ldr r5, [sp, 0x34] @@ -9641,7 +9594,7 @@ _0804DFB6: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x54] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] mov r2, r9 ands r1, r2 @@ -9960,7 +9913,7 @@ _0804E1EA: mov r1, r8 str r2, [sp, 0x38] str r3, [sp, 0x3C] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -10000,7 +9953,7 @@ _0804E22E: mov r2, r9 adds r1, r2, r5 str r3, [sp, 0x3C] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -10042,7 +9995,7 @@ _0804E278: ldrsh r1, [r1, r3] adds r0, r7, r0 add r1, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -10063,7 +10016,7 @@ _0804E2AA: bne _0804E2F0 adds r0, r7, 0 mov r1, r8 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] ldr r4, _0804E2CC adds r1, r4, 0 @@ -10161,7 +10114,7 @@ _0804E352: _0804E360: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -10169,7 +10122,7 @@ _0804E360: beq _0804E390 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] ldr r3, _0804E38C adds r1, r3, 0 @@ -10211,7 +10164,7 @@ _0804E3B2: _0804E3BC: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -10219,7 +10172,7 @@ _0804E3BC: beq _0804E3EC adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] ldr r3, _0804E3E8 adds r1, r3, 0 @@ -10267,7 +10220,7 @@ _0804E416: _0804E420: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -10275,7 +10228,7 @@ _0804E420: beq _0804E450 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] ldr r3, _0804E44C adds r1, r3, 0 @@ -10321,7 +10274,7 @@ _0804E478: _0804E482: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -10329,7 +10282,7 @@ _0804E482: beq _0804E4B0 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] ldr r3, _0804E4AC adds r1, r3, 0 @@ -10368,7 +10321,7 @@ _0804E4D0: bgt _0804E57E adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -10376,7 +10329,7 @@ _0804E4D0: beq _0804E508 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] ldr r3, _0804E504 adds r1, r3, 0 @@ -10417,7 +10370,7 @@ _0804E52C: bgt _0804E57E adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -10425,7 +10378,7 @@ _0804E52C: beq _0804E564 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] ldr r3, _0804E560 adds r1, r3, 0 @@ -10825,7 +10778,7 @@ _0804E848: ldrsh r0, [r6, r1] movs r2, 0x2 ldrsh r1, [r6, r2] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r3, _0804E99C adds r2, r3, 0 @@ -10940,7 +10893,7 @@ _0804E908: _0804E926: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] ldr r3, _0804E99C adds r1, r3, 0 @@ -11055,7 +11008,7 @@ _0804E9F2: _0804E9F8: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -11066,7 +11019,7 @@ _0804E9F8: _0804EA0E: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] cmp r0, 0xFF bne _0804EAF4 @@ -11074,7 +11027,7 @@ _0804EA0E: ble _0804EA4E subs r0, r5, 0x1 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrb r0, [r2, 0x9] cmp r0, 0xFF @@ -11099,7 +11052,7 @@ _0804EA4E: ble _0804EA82 subs r1, r4, 0x1 adds r0, r5, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrb r0, [r2, 0x9] cmp r0, 0xFF @@ -11126,7 +11079,7 @@ _0804EA82: bgt _0804EABA adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrb r0, [r2, 0x9] cmp r0, 0xFF @@ -11153,7 +11106,7 @@ _0804EABA: bgt _0804EB0E mov r0, r10 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrb r0, [r2, 0x9] cmp r0, 0xFF @@ -11180,13 +11133,13 @@ _0804EAF0: .4byte 0x0000fffc _0804EAF4: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] cmp r0, 0xFE bne _0804EB0E adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0xFF strb r1, [r0, 0x9] _0804EB0E: @@ -11232,7 +11185,7 @@ _0804EB4A: _0804EB4E: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x8 ands r0, r1 @@ -11240,7 +11193,7 @@ _0804EB4E: beq _0804EBA2 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r3, [r0, 0x9] cmp r3, 0x1F bhi _0804EBA2 @@ -11545,7 +11498,7 @@ _0804ED98: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x50] - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] movs r1, 0x20 orrs r1, r2 @@ -11631,7 +11584,7 @@ _0804EE18: _0804EE38: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x10 orrs r1, r2 @@ -11912,14 +11865,14 @@ _0804F046: _0804F05A: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] movs r1, 0x40 orrs r1, r2 strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r1, [r0, 0x9] ldr r2, [sp, 0x104] ldr r3, _0804F0A0 @@ -12218,7 +12171,7 @@ sub_804F278: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] mov r9, r0 movs r5, 0 @@ -12232,7 +12185,7 @@ _0804F2B4: ldrsh r1, [r4, r2] subs r1, 0x1 adds r0, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -12273,7 +12226,7 @@ _0804F306: movs r1, 0x4 ldrsh r0, [r4, r1] adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -12313,7 +12266,7 @@ _0804F354: movs r0, 0x6 ldrsh r1, [r4, r0] adds r0, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -12355,7 +12308,7 @@ _0804F3A4: ldrsh r0, [r4, r1] subs r0, 0x1 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -12406,7 +12359,7 @@ _0804F3F2: _0804F40A: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -12417,7 +12370,7 @@ _0804F40A: beq _0804F438 subs r0, r6, 0x1 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ands r1, r7 movs r2, 0x2 @@ -12428,7 +12381,7 @@ _0804F434: .4byte 0x0000fffc _0804F438: subs r0, r6, 0x1 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ands r1, r7 _0804F444: @@ -12503,7 +12456,7 @@ _0804F4BA: movs r7, 0 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -12555,7 +12508,7 @@ _0804F50A: ldr r3, [sp, 0x2C] cmp r3, r1 ble _0804F534 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r10 ands r0, r1 @@ -12586,7 +12539,7 @@ _0804F550: _0804F55A: adds r0, r5, 0x1 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -12596,7 +12549,7 @@ _0804F55A: _0804F570: subs r1, r4, 0x1 adds r0, r5, 0 - bl GetMapEntity + bl GetMapTile_2 mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -12606,7 +12559,7 @@ _0804F570: _0804F586: subs r0, r5, 0x1 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -12616,7 +12569,7 @@ _0804F586: _0804F59C: adds r1, r4, 0x1 adds r0, r5, 0 - bl GetMapEntity + bl GetMapTile_2 mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -12666,7 +12619,7 @@ _0804F5E2: _0804F5F0: adds r0, r6, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x20 orrs r1, r2 @@ -12711,7 +12664,7 @@ _0804F634: _0804F63C: adds r0, r6, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -12719,7 +12672,7 @@ _0804F63C: bne _0804F660 adds r0, r6, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] cmp r0, 0xFF bne _0804F660 @@ -12846,7 +12799,7 @@ _0804F730: _0804F73C: mov r0, r8 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 adds r4, 0x1 @@ -12871,7 +12824,7 @@ _0804F75E: _0804F76C: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] movs r1, 0x80 orrs r1, r2 @@ -12928,7 +12881,7 @@ _0804F7C8: _0804F7D4: adds r0, r4, 0 mov r1, r8 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 adds r4, 0x1 @@ -12953,7 +12906,7 @@ _0804F7F6: _0804F804: adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] movs r1, 0x80 orrs r1, r2 @@ -13014,7 +12967,7 @@ _0804F864: mov r10, r0 adds r0, r5, 0 mov r1, r10 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 ldr r1, [sp] @@ -13022,12 +12975,12 @@ _0804F864: mov r9, r1 mov r0, r9 mov r1, r10 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 ldr r0, [sp] mov r1, r10 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 ldr r2, [sp] @@ -13035,118 +12988,118 @@ _0804F864: mov r8, r2 mov r0, r8 mov r1, r10 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 ldr r6, [sp, 0x4] subs r6, 0x1 adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 adds r0, r5, 0 ldr r1, [sp, 0x4] - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 ldr r4, [sp, 0x4] adds r4, 0x1 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 mov r0, r9 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 ldr r0, [sp] adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 mov r0, r8 mov r1, r10 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 mov r0, r8 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 mov r0, r8 ldr r1, [sp, 0x4] - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 mov r0, r8 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x4 bl sub_804F5C4 mov r0, r9 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x4 orrs r1, r2 strh r1, [r0, 0x4] mov r0, r9 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0, 0x4] movs r2, 0x40 orrs r1, r2 strh r1, [r0, 0x4] ldr r0, [sp] adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0, 0x4] movs r4, 0x2 orrs r1, r4 strh r1, [r0, 0x4] mov r0, r9 ldr r1, [sp, 0x4] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0, 0x4] orrs r1, r4 strh r1, [r0, 0x4] ldr r0, [sp] ldr r1, [sp, 0x4] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0, 0x4] orrs r1, r4 strh r1, [r0, 0x4] mov r0, r9 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0, 0x4] movs r4, 0x10 orrs r1, r4 strh r1, [r0, 0x4] ldr r0, [sp] adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0, 0x4] orrs r1, r4 strh r1, [r0, 0x4] mov r0, r9 ldr r1, [sp, 0x4] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0, 0x4] orrs r1, r4 strh r1, [r0, 0x4] ldr r0, [sp] ldr r1, [sp, 0x4] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0, 0x4] orrs r4, r1 strh r4, [r0, 0x4] @@ -13235,7 +13188,7 @@ _0804FA6C: _0804FA76: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 adds r4, 0x1 @@ -13307,7 +13260,7 @@ _0804FAD4: movs r4, 0x2 ldrsh r1, [r7, r4] adds r1, r2 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 _0804FB14: @@ -13363,28 +13316,28 @@ _0804FB54: ble _0804FBAE adds r0, r5, 0x1 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 adds r1, r4, 0x1 adds r0, r5, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 subs r0, r5, 0x1 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 subs r1, r4, 0x1 adds r0, r5, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 _0804FBAE: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0 bl sub_804F5C4 b _0804FBD2 @@ -13425,7 +13378,7 @@ _0804FBF4: _0804FBFA: adds r0, r6, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -13505,7 +13458,7 @@ _0804FC86: _0804FC8A: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -13513,7 +13466,7 @@ _0804FC8A: bne _0804FCAE adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ands r1, r7 mov r2, r8 @@ -13548,7 +13501,7 @@ _0804FCD4: _0804FCD8: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x10 ands r0, r1 @@ -13556,7 +13509,7 @@ _0804FCD8: beq _0804FCF8 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ands r1, r7 strh r1, [r0] @@ -13606,7 +13559,7 @@ _0804FD3A: _0804FD3E: adds r0, r6, 0 adds r1, r7, 0 - bl GetMapEntity + bl GetMapTile_2 bl sub_804FD10 subs r3, r7, 0x1 cmp r6, 0 @@ -13744,7 +13697,7 @@ _0804FE20: _0804FE24: adds r0, r6, 0 adds r1, r7, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] movs r1, 0x10 orrs r1, r2 @@ -13904,7 +13857,7 @@ _0804FF4C: _0804FF56: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrh r2, [r1] movs r0, 0x3 @@ -13959,7 +13912,7 @@ _0804FFAA: adds r4, r1, r0 ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl GetMapEntity + bl GetMapTile_2 adds r5, r0, 0 ldrh r1, [r5, 0x4] movs r0, 0x1 @@ -13990,7 +13943,7 @@ _08050002: _08050004: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 adds r1, r0, 0 ldrh r2, [r1] movs r0, 0x3 @@ -14028,7 +13981,7 @@ _0805003E: _0805004A: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrh r2, [r1] movs r0, 0x3 @@ -14098,7 +14051,7 @@ _080500BC: _080500D8: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x2 orrs r1, r2 @@ -14127,7 +14080,7 @@ _08050100: _0805010C: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -14173,7 +14126,7 @@ _08050128: _0805016C: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x2 orrs r1, r2 @@ -14208,7 +14161,7 @@ _080501A0: _080501AC: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x20 ands r0, r1 @@ -14285,7 +14238,7 @@ _0805024C: .4byte 0x00003a0c _08050250: .4byte gUnknown_80F4DA0 _08050254: ldrb r1, [r7, 0x1] - bl GetMapEntity + bl GetMapTile_2 adds r4, r0, 0 movs r0, 0x2 bl DungeonRandomCapped @@ -14332,7 +14285,7 @@ _0805029A: _080502A6: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrh r2, [r1] movs r0, 0x3 @@ -14402,7 +14355,7 @@ _08050318: _08050334: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x4 orrs r1, r2 @@ -14446,7 +14399,7 @@ _08050378: _08050384: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -14579,7 +14532,7 @@ _08050480: _0805048E: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrh r3, [r1] movs r2, 0x3 @@ -14667,7 +14620,7 @@ _0805051C: _0805053C: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x8 orrs r1, r2 @@ -14730,7 +14683,7 @@ _080505A2: _080505B0: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrh r2, [r1] movs r0, 0x3 @@ -14822,7 +14775,7 @@ _0805064E: _0805066A: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0, 0x4] movs r1, 0x8 orrs r1, r2 @@ -14960,7 +14913,7 @@ _08050772: cmp r0, 0x37 bhi _080507B8 mov r1, r10 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -14990,7 +14943,7 @@ _080507A8: bne _080507B8 mov r0, r9 mov r1, r10 - bl GetMapEntity + bl GetMapTile_2 bl sub_80506BC _080507B8: ldr r2, [sp, 0x68] @@ -15038,7 +14991,7 @@ _080507DE: mov r8, r0 adds r0, r4, 0 mov r1, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r2, 0x3 adds r0, r2, 0 @@ -15048,7 +15001,7 @@ _080507DE: adds r0, r4, 0 adds r1, r5, 0 str r2, [sp, 0x9C] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x9C] adds r0, r2, 0 @@ -15058,7 +15011,7 @@ _080507DE: subs r7, r5, 0x1 adds r0, r4, 0 adds r1, r7, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x9C] adds r0, r2, 0 @@ -15067,7 +15020,7 @@ _080507DE: beq _080508B2 adds r0, r6, 0 mov r1, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x9C] adds r0, r2, 0 @@ -15076,7 +15029,7 @@ _080507DE: beq _080508B2 adds r0, r6, 0 adds r1, r7, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x9C] adds r0, r2, 0 @@ -15086,7 +15039,7 @@ _080507DE: subs r4, r6, 0x1 adds r0, r4, 0 mov r1, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x9C] adds r0, r2, 0 @@ -15095,7 +15048,7 @@ _080507DE: beq _080508B2 adds r0, r4, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x9C] adds r0, r2, 0 @@ -15104,7 +15057,7 @@ _080507DE: beq _080508B2 adds r0, r4, 0 adds r1, r7, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] ldr r2, [sp, 0x9C] adds r0, r2, 0 @@ -15131,7 +15084,7 @@ _080508CC: cmp r1, 0 bne _080508DA adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 bl sub_80506BC _080508DA: ldr r1, [sp, 0x7C] @@ -15177,7 +15130,7 @@ _0805091A: adds r0, r4, 0 adds r1, r3, 0 str r3, [sp, 0xA0] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r2, 0x3 mov r8, r2 @@ -15191,7 +15144,7 @@ _0805093A: adds r0, r4, 0 adds r1, r5, 0 str r3, [sp, 0xA0] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -15205,7 +15158,7 @@ _08050952: adds r1, r2, 0 str r2, [sp, 0x9C] str r3, [sp, 0xA0] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -15219,7 +15172,7 @@ _08050970: adds r1, r3, 0 str r2, [sp, 0x9C] str r3, [sp, 0xA0] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -15233,7 +15186,7 @@ _0805098C: adds r1, r2, 0 str r2, [sp, 0x9C] str r3, [sp, 0xA0] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -15247,7 +15200,7 @@ _080509A8: adds r0, r4, 0 adds r1, r3, 0 str r2, [sp, 0x9C] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -15259,7 +15212,7 @@ _080509C2: adds r0, r4, 0 adds r1, r5, 0 str r2, [sp, 0x9C] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -15270,7 +15223,7 @@ _080509C2: _080509DA: adds r0, r4, 0 adds r1, r2, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] mov r0, r8 ands r0, r1 @@ -15299,7 +15252,7 @@ _08050A0A: bne _08050A1A ldr r0, [sp, 0x90] ldr r1, [sp, 0x94] - bl GetMapEntity + bl GetMapTile_2 bl sub_80506BC _08050A1A: adds r5, 0x1 @@ -15503,7 +15456,7 @@ _08050B7C: subs r0, r7, 0x5 adds r1, r6, 0 str r2, [sp, 0x9C] - bl GetMapEntity + bl GetMapTile_2 bl sub_80506BC ldr r2, [sp, 0x9C] _08050B92: @@ -15536,7 +15489,7 @@ _08050BB8: _08050BC0: mov r0, r9 mov r1, r10 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r3, [r2] movs r0, 0x3 @@ -15630,7 +15583,7 @@ _08050C5C: _08050C68: adds r0, r7, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r0, [r2] movs r3, 0x3 @@ -15988,7 +15941,7 @@ _08050F00: _08050F08: adds r0, r7, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrb r1, [r4] movs r0, 0x87 @@ -16227,7 +16180,7 @@ _080510D6: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x38] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] mov r2, r9 ands r1, r2 @@ -16236,7 +16189,7 @@ _080510D6: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 mov r1, sp ldrb r1, [r1, 0x10] strb r1, [r0, 0x9] @@ -16322,7 +16275,7 @@ _08051162: strh r0, [r6, 0x6] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r3, _080511EC adds r2, r3, 0 @@ -16332,7 +16285,7 @@ _08051162: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0xFF strb r1, [r0, 0x9] ldr r4, [sp, 0x14] @@ -16516,7 +16469,7 @@ _080512EE: lsrs r4, 24 adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 movs r1, 0x1 str r1, [sp] adds r1, r4, 0 @@ -16564,7 +16517,7 @@ _08051338: _08051350: adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x10 @@ -16613,7 +16566,7 @@ _080513B8: _080513BC: adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] movs r1, 0x10 orrs r1, r2 @@ -16641,7 +16594,7 @@ _080513EC: _080513F0: adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -16776,7 +16729,7 @@ _080514EE: lsrs r5, 24 adds r0, r7, 0 mov r1, r8 - bl GetMapEntity + bl GetMapTile_2 adds r6, r0, 0 ldr r1, [sp, 0x4] ldr r2, _080515D0 @@ -16900,7 +16853,7 @@ _080515F6: lsrs r4, 24 adds r0, r7, 0 mov r1, r8 - bl GetMapEntity + bl GetMapTile_2 adds r5, r0, 0 ldrb r6, [r5, 0x9] movs r0, 0x1 @@ -17007,7 +16960,7 @@ _080516CA: ldr r0, [r5] adds r1, r4, 0 str r2, [sp, 0xC] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r2, [sp, 0xC] ands r1, r2 @@ -17040,7 +16993,7 @@ _0805170A: ldr r0, [r5, 0x8] adds r1, r4, 0 str r2, [sp, 0xC] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r2, [sp, 0xC] ands r1, r2 @@ -17086,7 +17039,7 @@ _08051762: ldr r1, [r5, 0x4] adds r0, r4, 0 str r2, [sp, 0xC] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r2, [sp, 0xC] ands r1, r2 @@ -17119,7 +17072,7 @@ _080517A2: ldr r1, [r5, 0xC] adds r0, r4, 0 str r2, [sp, 0xC] - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] ldr r2, [sp, 0xC] ands r1, r2 @@ -17159,7 +17112,7 @@ _080517EC: adds r0, r7, 0 adds r1, r5, 0 str r3, [sp, 0x10] - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x20 @@ -17223,7 +17176,7 @@ _08051864: adds r0, r7, 0 adds r1, r5, 0 str r3, [sp, 0x10] - bl GetMapEntity + bl GetMapTile_2 adds r6, r0, 0 ldrh r1, [r6] movs r0, 0x20 @@ -17299,7 +17252,7 @@ sub_80518F0: _080518F8: adds r0, r5, 0 movs r1, 0x1 - bl GetMapEntity + bl GetMapTile_2 adds r4, r0, 0 bl sub_804FD10 cmp r5, 0 @@ -17313,7 +17266,7 @@ _0805190E: _08051914: adds r0, r5, 0 movs r1, 0x1E - bl GetMapEntity + bl GetMapTile_2 adds r4, r0, 0 bl sub_804FD10 cmp r5, 0 @@ -17467,7 +17420,7 @@ sub_8051A24: mov r8, r3 adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 adds r7, r0, 0 lsls r4, 16 lsls r5, 16 @@ -17920,7 +17873,7 @@ _08051E42: _08051E46: adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrb r0, [r2, 0xE] cmp r0, 0xF @@ -17960,7 +17913,7 @@ sub_8051E7C: movs r3, 0x6 ldrsh r1, [r2, r3] subs r1, 0x1 - bl GetMapEntity + bl GetMapTile_2 str r0, [sp, 0x8] ldrh r1, [r0] movs r0, 0x80 @@ -18060,7 +18013,7 @@ _08051F10: bge _08051FCA adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 adds r4, r0, 0 ldrh r0, [r4] movs r3, 0x80 diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index 05ebda7..f8846cd 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -2668,7 +2668,7 @@ _080538DA: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r0, [r0, 0x10] str r0, [sp, 0x38] bl EntityExists @@ -7995,7 +7995,7 @@ _08056780: movs r2, 0 ldrsh r0, [r6, r2] asrs r1, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -8307,7 +8307,7 @@ _08056A0E: ldrsh r0, [r7, r2] movs r6, 0x2 ldrsh r1, [r7, r6] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r6, r0, 0 ldrh r1, [r6] movs r0, 0x3 diff --git a/asm/code_8057144.s b/asm/code_8057144.s index 6aec5b4..e3b2bf9 100644 --- a/asm/code_8057144.s +++ b/asm/code_8057144.s @@ -909,7 +909,7 @@ sub_8057788: movs r0, 0 mov r9, r0 adds r0, r4, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 adds r5, r0, 0 bl IsTileGround lsls r0, 24 diff --git a/asm/code_8057824.s b/asm/code_8057824.s index 37a3b25..0cdad21 100644 --- a/asm/code_8057824.s +++ b/asm/code_8057824.s @@ -4061,7 +4061,7 @@ DiveMoveAction: adds r5, r2, 0 mov r8, r3 movs r6, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 bl IsTileGround lsls r0, 24 cmp r0, 0 @@ -6328,7 +6328,7 @@ _0805A94C: add r4, sp, 0x18 movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapEntity + bl GetMapTile_2 ldr r5, [r0, 0x10] cmp r5, 0 beq _0805AA4C @@ -9264,7 +9264,7 @@ TrapbustOrbAction: movs r0, 0 str r0, [sp, 0x10] adds r0, r1, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 adds r4, r0, 0 bl IsBossBattle lsls r0, 24 @@ -9344,7 +9344,7 @@ _0805BFE0: _0805BFF0: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 ldr r4, [r0, 0x14] cmp r4, 0 beq _0805C028 @@ -9770,7 +9770,7 @@ _0805C2DC: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 diff --git a/asm/code_805CEB8.s b/asm/code_805CEB8.s index 1bfebc8..6448a5c 100644 --- a/asm/code_805CEB8.s +++ b/asm/code_805CEB8.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start CanUseOnTargetWithStatusChecker CanUseOnTargetWithStatusChecker: push {r4-r7,lr} @@ -2837,7 +2837,7 @@ _0805E76A: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldr r0, [r4, 0x10] cmp r0, 0 @@ -2982,7 +2982,7 @@ sub_805E874: ldrsh r2, [r2, r3] str r2, [sp, 0x1C] adds r1, r2, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldr r1, _0805E910 ldr r2, [sp, 0x18] @@ -3023,7 +3023,7 @@ sub_805E874: bne _0805E918 adds r0, r7, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] cmp r0, 0xFF beq _0805E922 @@ -3061,7 +3061,7 @@ _0805E92E: ldrsh r1, [r1, r3] ldr r2, [sp, 0x1C] adds r1, r2, r1 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldr r0, [r1, 0x10] cmp r0, 0 @@ -3128,7 +3128,7 @@ _0805E9BC: _0805E9C8: adds r0, r7, 0 adds r1, r6, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldr r0, [r5, 0x14] cmp r0, 0 @@ -3485,7 +3485,7 @@ sub_805EC4C: lsls r0, r2, 16 asrs r0, 16 asrs r1, r2, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r0, [r0, 0x10] mov r8, r0 cmp r0, 0 @@ -3719,7 +3719,7 @@ _0805EE42: b _0805EF52 _0805EE4E: adds r0, r5, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 adds r4, r0, 0 adds r0, r5, 0 movs r1, 0xD @@ -4818,7 +4818,7 @@ _0805F742: movs r3, 0x6 ldrsh r1, [r0, r3] adds r0, r2, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r4, [r0, 0x14] cmp r4, 0 bne _0805F75C @@ -6609,7 +6609,7 @@ _0806063C: ldrsh r0, [r1, r2] movs r3, 0x6 ldrsh r1, [r1, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r0, [r0, 0x14] bl GetItemData adds r7, r0, 0 @@ -7231,7 +7231,7 @@ _08060B3C: ldrsh r0, [r1, r2] movs r3, 0x6 ldrsh r1, [r1, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r0, [r0, 0x14] cmp r0, 0 bne _08060B68 @@ -14514,7 +14514,7 @@ sub_806455C: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldr r0, _080645D0 ldr r2, [r0] @@ -14658,7 +14658,7 @@ _08064640: ldrsh r0, [r3, r1] movs r2, 0x2 ldrsh r1, [r3, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r4, [r0, 0x14] cmp r4, 0 bne _080646B8 @@ -19433,7 +19433,7 @@ _08066D68: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x80 @@ -19582,7 +19582,7 @@ _08066EA8: ldrsh r0, [r2, r3] movs r3, 0x6 ldrsh r1, [r2, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r0, [r0, 0x14] cmp r0, 0 beq _08066ECC @@ -19708,7 +19708,7 @@ sub_8066FA4: ldrsh r0, [r7, r1] movs r2, 0x6 ldrsh r1, [r7, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 mov r10, r0 adds r0, r7, 0 movs r1, 0 @@ -23721,7 +23721,7 @@ sub_8068F80: cmp r5, 0 beq _08068FCC adds r0, r5, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r0, [r0] lsrs r0, 5 movs r1, 0x1 @@ -23759,7 +23759,7 @@ sub_8068FE0: asrs r1, 16 mov r9, r1 ldr r7, [r0, 0x70] - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 adds r4, r0, 0 ldr r0, [sp, 0x74] cmp r0, 0 @@ -24352,7 +24352,7 @@ sub_80694C0: mov r9, r3 adds r0, r7, 0 mov r1, r8 - bl GetMapEntity + bl GetMapTile_2 mov r10, r0 ldr r5, [r4, 0x70] adds r6, r5, 0 @@ -24399,7 +24399,7 @@ _08069522: blt _08069552 adds r1, r0, 0 adds r0, r2, 0 - bl GetMapEntity + bl GetMapTile_2 adds r1, r0, 0 ldr r0, [r1, 0x10] cmp r0, r4 @@ -24546,7 +24546,7 @@ _08069622: _08069648: adds r0, r6, 0 adds r1, r7, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r1, [r0, 0x9] adds r0, r4, 0 adds r0, 0x25 @@ -24587,7 +24587,7 @@ _0806967C: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r0, [r0, 0x10] _0806969E: pop {r4,r5} @@ -24624,7 +24624,7 @@ sub_80696A8: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r1, [r0, 0x10] cmp r1, 0 beq _080696F4 @@ -24679,7 +24679,7 @@ sub_80696FC: movs r2, 0 ldrsh r0, [r0, r2] asrs r1, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 adds r0, r4, 0 mov r1, sp @@ -24745,7 +24745,7 @@ sub_806977C: movs r2, 0 ldrsh r0, [r0, r2] asrs r1, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 mov r6, sp adds r0, r4, 0 mov r1, sp @@ -24777,7 +24777,7 @@ sub_806977C: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r6, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 adds r0, r4, 0 mov r1, sp diff --git a/asm/code_8069E0C.s b/asm/code_8069E0C.s index 151cdcf..0562664 100644 --- a/asm/code_8069E0C.s +++ b/asm/code_8069E0C.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start sub_8069E0C sub_8069E0C: push {r4-r7,lr} @@ -850,7 +850,7 @@ _0806A488: movs r2, 0x6 ldrsh r1, [r6, r2] adds r1, r7 - bl GetMapEntity + bl GetMapTile_2 adds r4, r0, 0 ldr r0, [r4, 0x10] cmp r0, 0 @@ -1029,7 +1029,7 @@ sub_806A5B8: b _0806A6D2 _0806A5CE: adds r0, r6, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r0, [r0] movs r1, 0x3 ands r1, r0 @@ -2565,7 +2565,7 @@ sub_806B168: adds r1, r4 movs r2, 0 ldrsh r1, [r1, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] str r0, [sp, 0x2C] movs r3, 0 @@ -2764,7 +2764,7 @@ _0806B2D2: ldrsh r1, [r1, r4] adds r1, r6, r1 str r3, [sp, 0x38] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrb r0, [r1, 0x9] ldr r3, [sp, 0x38] @@ -2831,7 +2831,7 @@ _0806B366: movs r3, 0 ldrsh r1, [r1, r3] adds r1, r6, r1 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 mov r4, r8 movs r2, 0xE @@ -2987,7 +2987,7 @@ _0806B4AE: asrs r0, r5, 16 asrs r4, 16 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] str r0, [sp, 0x20] movs r2, 0 @@ -3050,7 +3050,7 @@ _0806B51C: mov r5, r10 adds r1, r5 str r2, [sp, 0x2C] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrb r0, [r1, 0x9] ldr r2, [sp, 0x2C] @@ -3116,7 +3116,7 @@ _0806B5A8: mov r5, r10 adds r1, r5 str r2, [sp, 0x2C] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 movs r3, 0xE ldrsh r0, [r6, r3] @@ -3166,7 +3166,7 @@ _0806B606: ldrsh r0, [r2, r1] movs r3, 0x2 ldrsh r1, [r5, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 movs r3, 0xE ldrsh r0, [r6, r3] @@ -3324,7 +3324,7 @@ _0806B740: _0806B748: adds r0, r5, 0 adds r1, r7, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0, 0x4] movs r0, 0x8 ands r0, r1 @@ -3426,7 +3426,7 @@ sub_806B7F8: ldrsh r0, [r6, r1] movs r2, 0xE ldrsh r1, [r6, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 movs r3, 0 ldrsh r0, [r6, r3] @@ -3572,7 +3572,7 @@ _0806B930: _0806B932: mov r0, r9 mov r1, r10 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 adds r0, r4, 0 bl sub_807034C diff --git a/asm/code_806CD90.s b/asm/code_806CD90.s index d4383f7..509da75 100644 --- a/asm/code_806CD90.s +++ b/asm/code_806CD90.s @@ -142,7 +142,7 @@ _0806CF94: .4byte 0x000135cc sub_806CF98: push {r4-r7,lr} adds r4, r0, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r0, [r0] movs r5, 0x3 ands r5, r0 @@ -1123,7 +1123,7 @@ _0806D760: cmp r0, 0 beq _0806D796 adds r0, r7, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 mov r8, r0 movs r0, 0x14 movs r1, 0x18 diff --git a/asm/code_807034C.s b/asm/code_807034C.s index 8ce57cc..c8f4d56 100644 --- a/asm/code_807034C.s +++ b/asm/code_807034C.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start sub_807034C sub_807034C: push {r4,lr} @@ -67,7 +67,7 @@ sub_80703A0: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 movs r1, 0 ldrsh r0, [r4, r1] @@ -203,7 +203,7 @@ sub_807049C: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 movs r1, 0 ldrsh r0, [r4, r1] @@ -309,7 +309,7 @@ sub_8070564: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 movs r1, 0 ldrsh r0, [r4, r1] @@ -387,7 +387,7 @@ sub_80705F0: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 movs r1, 0 ldrsh r0, [r4, r1] @@ -480,7 +480,7 @@ sub_80706A4: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 movs r1, 0 ldrsh r0, [r4, r1] diff --git a/asm/code_8070E3C.s b/asm/code_8070E3C.s index 7af381e..3f644aa 100644 --- a/asm/code_8070E3C.s +++ b/asm/code_8070E3C.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start sub_8070E3C sub_8070E3C: push {r4-r7,lr} @@ -30,7 +30,7 @@ sub_8070E3C: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x10 @@ -89,7 +89,7 @@ _08070EDC: ldrsh r0, [r6, r1] movs r2, 0x2 ldrsh r1, [r6, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 adds r1, r2, 0 adds r1, 0xA @@ -133,7 +133,7 @@ sub_8070F14: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x10 @@ -147,7 +147,7 @@ sub_8070F14: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldr r1, _08070F74 movs r0, 0x7 @@ -195,7 +195,7 @@ sub_8070F80: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x10 @@ -254,7 +254,7 @@ _08071020: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 adds r1, r2, 0 adds r1, 0xA @@ -304,7 +304,7 @@ sub_8071058: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldrh r1, [r4] movs r0, 0x10 @@ -368,7 +368,7 @@ _08071100: ldrsh r0, [r5, r1] movs r2, 0x6 ldrsh r1, [r5, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 adds r1, r4, 0 adds r1, 0xA @@ -422,7 +422,7 @@ _08071152: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x10 @@ -481,7 +481,7 @@ _080711DC: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 adds r1, r2, 0 adds r1, 0xA @@ -537,7 +537,7 @@ CanMoveForward: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldrh r1, [r5] movs r0, 0x10 @@ -661,7 +661,7 @@ _08071348: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r0, 0xA adds r0, r6 ldr r2, _08071374 @@ -781,7 +781,7 @@ _08071432: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r0, 0xA adds r0, r5 ldrb r0, [r0] diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s index 030fd72..f1fe7a5 100644 --- a/asm/code_80718D8.s +++ b/asm/code_80718D8.s @@ -189,7 +189,7 @@ _08071C08: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r0, [r0] movs r2, 0x80 lsls r2, 1 @@ -2247,7 +2247,7 @@ _08072C0C: movs r3, 0x6 ldrsh r2, [r7, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldr r0, _08072C80 bl sub_807034C diff --git a/asm/code_8073CF0.s b/asm/code_8073CF0.s index 36da354..a948a4d 100644 --- a/asm/code_8073CF0.s +++ b/asm/code_8073CF0.s @@ -39,7 +39,7 @@ sub_8073D14: sub sp, 0xB0 adds r6, r0, 0 ldr r4, [r6, 0x70] - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldr r5, [r0, 0x14] cmp r5, 0 bne _08073D30 @@ -3242,7 +3242,7 @@ sub_8075708: cmp r0, 0 beq _0807580C adds r0, r4, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 adds r5, r0, 0 adds r0, r4, 0 movs r1, 0xD diff --git a/asm/code_8075BA4.s b/asm/code_8075BA4.s index def36e3..f07f25e 100644 --- a/asm/code_8075BA4.s +++ b/asm/code_8075BA4.s @@ -860,7 +860,7 @@ _08076292: _08076298: .4byte gUnknown_80FCE84 _0807629C: adds r0, r5, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -966,7 +966,7 @@ _08076362: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r4, [r0, 0x10] adds r0, r4, 0 bl EntityExists @@ -1198,7 +1198,7 @@ _08076544: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r4, [r0, 0x10] adds r0, r4, 0 bl EntityExists @@ -1421,7 +1421,7 @@ _08076714: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r4, [r0, 0x10] adds r0, r4, 0 bl EntityExists @@ -1542,7 +1542,7 @@ _08076814: _0807682C: .4byte gUnknown_80FCE00 _08076830: adds r0, r5, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -3545,7 +3545,7 @@ _08077874: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r4, [r0, 0x10] adds r0, r4, 0 bl EntityExists @@ -9836,7 +9836,7 @@ sub_807AB38: _0807AB54: adds r0, r2, 0 str r2, [sp, 0x1A4] - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r1, [r0] movs r0, 0x40 ands r0, r1 @@ -9898,7 +9898,7 @@ _0807ABC6: adds r0, r4, 0 adds r1, r6, 0 str r2, [sp, 0x1A4] - bl GetMapEntity + bl GetMapTile_2 adds r1, r0, 0 ldr r0, [r1, 0x10] ldr r2, [sp, 0x1A4] @@ -9988,7 +9988,7 @@ _0807AC72: adds r0, r4, 0 adds r1, r6, 0 str r2, [sp, 0x1A4] - bl GetMapEntity + bl GetMapTile_2 adds r1, r0, 0 ldr r0, [r1, 0x10] ldr r2, [sp, 0x1A4] @@ -10300,7 +10300,7 @@ CanTakeItem: cmp r0, 0 bne _0807AF50 adds r0, r4, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 adds r6, r0, 0 ldr r4, [r6, 0x14] cmp r4, 0 @@ -10658,7 +10658,7 @@ _0807B17C: ldrsh r0, [r2, r3] movs r3, 0x6 ldrsh r1, [r2, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r1, [r0, 0x9] cmp r1, 0xFF bne _0807B1C4 @@ -10712,7 +10712,7 @@ _0807B1FA: _0807B200: adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 ldr r0, [r0, 0x14] cmp r0, 0 beq _0807B216 @@ -11372,7 +11372,7 @@ _0807B6FE: ldrsh r0, [r7, r4] movs r2, 0x6 ldrsh r1, [r7, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x8 ands r0, r1 @@ -11400,7 +11400,7 @@ _0807B71E: lsls r0, r5, 16 asrs r0, 16 asrs r1, r5, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] cmp r0, r10 beq _0807B758 @@ -11848,7 +11848,7 @@ _0807BAA2: ldrsh r0, [r6, r1] movs r2, 0x6 ldrsh r1, [r6, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x8 ands r0, r1 @@ -11878,7 +11878,7 @@ _0807BAC4: adds r5, r2, r0 mov r0, r8 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] cmp r0, 0xFF bne _0807BB04 diff --git a/asm/code_807C4A0.s b/asm/code_807C4A0.s index 03c4fbc..865f009 100644 --- a/asm/code_807C4A0.s +++ b/asm/code_807C4A0.s @@ -584,7 +584,7 @@ _0807C8BE: movs r3, 0x2 ldrsh r2, [r2, r3] adds r1, r2 - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r5, [r0, 0x10] cmp r5, 0 beq _0807C948 diff --git a/asm/code_807CD9C.s b/asm/code_807CD9C.s index f5de8e0..978bf1d 100644 --- a/asm/code_807CD9C.s +++ b/asm/code_807CD9C.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start sub_807CD9C sub_807CD9C: push {r4-r7,lr} @@ -167,7 +167,7 @@ _0807CED8: ldrsh r0, [r7, r1] ldr r1, [sp, 0x18] asrs r1, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r5, r0, 0 ldr r0, [r5, 0x10] cmp r0, 0 @@ -902,7 +902,7 @@ _0807D4DC: .4byte gUnknown_80FD320 thumb_func_start sub_807D4E0 sub_807D4E0: push {r4,lr} - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r4, [r0, 0x14] cmp r4, 0 beq _0807D506 @@ -990,7 +990,7 @@ _0807D580: ldrsh r0, [r5, r1] movs r2, 0x6 ldrsh r1, [r5, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r2, 0x3 adds r0, r2, 0 @@ -1190,7 +1190,7 @@ _0807D6DA: lsls r0, r6, 16 asrs r0, 16 asrs r1, r6, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldrh r1, [r2] movs r3, 0x3 @@ -1631,7 +1631,7 @@ _0807DA8C: bgt _0807DB00 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldr r0, [r1, 0x10] cmp r0, 0 @@ -1752,7 +1752,7 @@ _0807DBB6: _0807DBB8: adds r0, r4, 0 adds r1, r5, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -1892,7 +1892,7 @@ _0807DCD8: movs r6, 0 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] ldr r3, _0807DD6C @@ -2015,7 +2015,7 @@ _0807DDC8: _0807DDCA: adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r3, 0x80 @@ -2062,7 +2062,7 @@ _0807DE1A: beq _0807DE30 adds r0, r5, 0 adds r1, r4, 0 - bl GetMapEntity + bl GetMapTile_2 ldrh r2, [r0] movs r1, 0x40 orrs r1, r2 @@ -2095,7 +2095,7 @@ _0807DE46: ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r1, [r0, 0x9] adds r0, r4, 0 adds r0, 0x25 @@ -2323,7 +2323,7 @@ _0807E014: bgt _0807E112 cmp r1, 0x1F bgt _0807E112 - bl GetMapEntity + bl GetMapTile_2 mov r8, r0 ldr r0, [sp, 0x18] movs r2, 0 @@ -3815,7 +3815,7 @@ _0807EC46: ldrb r0, [r0] str r0, [sp, 0x8] adds r0, r7, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r0, [r0] lsrs r0, 5 mov r10, r0 @@ -4062,7 +4062,7 @@ _0807EE22: ldrsh r0, [r6, r2] asrs r1, 16 str r3, [sp, 0x18] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r0, [r0, 0x9] ldr r3, [sp, 0x18] cmp r0, 0xFF @@ -4238,7 +4238,7 @@ sub_807EF84: cmp r4, 0 beq _0807EFE2 bl GetLeaderEntity - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r1, [r0] movs r0, 0x20 ands r0, r1 @@ -4363,7 +4363,7 @@ _0807F09A: str r0, [sp, 0x4] adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldrh r1, [r4] movs r0, 0x20 @@ -4555,7 +4555,7 @@ _0807F23C: _0807F240: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldrh r1, [r4] movs r0, 0x20 @@ -4699,7 +4699,7 @@ _0807F360: _0807F364: adds r0, r6, 0 adds r1, r5, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldr r0, [r4, 0x14] cmp r0, 0 @@ -5300,7 +5300,7 @@ _0807F7FC: adds r4, r2, 0 movs r3, 0x2 ldrsh r1, [r4, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 ldr r6, [r0, 0x10] adds r0, r6, 0 bl EntityExists @@ -5538,7 +5538,7 @@ _0807FA1E: _0807FA22: adds r0, r5, 0 adds r1, r6, 0 - bl GetMapEntity + bl GetMapTile_2 adds r4, r0, 0 ldrh r1, [r4, 0x4] movs r0, 0x4 @@ -5651,7 +5651,7 @@ _0807FAF8: movs r6, 0 adds r0, r5, 0 mov r1, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldr r0, [r4, 0x14] cmp r0, 0 @@ -5850,7 +5850,7 @@ CanLayTrap: movs r3, 0x2 ldrsh r1, [r0, r3] adds r0, r2, 0 - bl GetMapEntity + bl GetMapTile_2 adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x80 @@ -5904,7 +5904,7 @@ sub_807FCD4: ldrsh r0, [r7, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl GetMapEntity + bl GetMapTile_2 adds r6, r0, 0 cmp r5, 0x13 bls _0807FD12 @@ -6058,7 +6058,7 @@ sub_807FE04: ldrsh r0, [r2, r1] movs r3, 0x2 ldrsh r1, [r2, r3] - bl GetMapEntity + bl GetMapTile_2 adds r4, r0, 0 ldr r0, [r4, 0x14] cmp r0, 0 @@ -6094,7 +6094,7 @@ sub_807FE44: ldrsh r0, [r2, r1] movs r3, 0x2 ldrsh r1, [r2, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldr r0, [r4, 0x14] cmp r0, 0 @@ -6152,7 +6152,7 @@ sub_807FE9C: ldrsh r0, [r1, r2] movs r3, 0x2 ldrsh r1, [r1, r3] - bl GetMapEntity + bl GetMapTile_2 str r0, [sp, 0x4] ldr r0, [r0, 0x14] mov r10, r0 @@ -7449,7 +7449,7 @@ _080808E2: ldrsh r0, [r5, r2] movs r3, 0x2 ldrsh r1, [r5, r3] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r1, [r0, 0x9] cmp r1, 0xFF bne _0808090A @@ -7502,7 +7502,7 @@ _0808093E: _0808094A: adds r0, r6, 0 adds r1, r7, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r4, r0, 0 ldr r0, [r4, 0x14] adds r2, r6, 0x1 @@ -10300,7 +10300,7 @@ _080820FC: mov r3, sp movs r2, 0x6 ldrsh r1, [r3, r2] - bl GetMapEntity + bl GetMapTile_2 adds r4, r0, 0 ldrb r0, [r7] mov r3, r9 @@ -11074,7 +11074,7 @@ _08082856: add r3, sp movs r2, 0 ldrsh r1, [r3, r2] - bl GetMapEntity + bl GetMapTile_2 ldr r1, [r4] str r1, [r7, 0x8] ldr r1, [r4] @@ -11487,7 +11487,7 @@ _08082B46: ldrsh r0, [r5, r1] movs r2, 0x6 ldrsh r1, [r5, r2] - bl GetMapEntity + bl GetMapTile_2 ldrb r1, [r0, 0x9] adds r0, r5, 0 adds r0, 0x25 diff --git a/asm/code_808333C.s b/asm/code_808333C.s index bd38800..87beca7 100644 --- a/asm/code_808333C.s +++ b/asm/code_808333C.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start InSameRoom_3 InSameRoom_3: push {r4-r6,lr} @@ -14,7 +14,7 @@ InSameRoom_3: ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrb r2, [r0, 0x9] cmp r2, 0xFF beq _08083394 @@ -107,7 +107,7 @@ sub_80833E8: ldrsh r0, [r5, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldr r0, _08083438 ldr r3, [r0] @@ -253,7 +253,7 @@ _080834F8: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -292,7 +292,7 @@ _0808353E: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -618,7 +618,7 @@ _0808379C: ldr r2, _0808380C add r2, sp str r3, [r2] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r2, r0, 0 ldr r0, _08083810 ldr r1, _0808380C @@ -730,7 +730,7 @@ _0808386A: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp] - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 ldrh r2, [r1] movs r7, 0x80 diff --git a/asm/code_80848F0.s b/asm/code_80848F0.s index 3b54680..01d27da 100644 --- a/asm/code_80848F0.s +++ b/asm/code_80848F0.s @@ -218,7 +218,7 @@ _080853EE: lsls r0, r4, 16 asrs r0, 16 asrs r1, r4, 16 - bl GetMapTileAtPosition + bl GetMapTile_1 adds r1, r0, 0 mov r0, r8 bl sub_807034C diff --git a/asm/jirachi_wish.s b/asm/jirachi_wish.s index 9055379..ef24a1c 100644 --- a/asm/jirachi_wish.s +++ b/asm/jirachi_wish.s @@ -157,7 +157,7 @@ _0808B6D2: movs r2, 0 ldrsh r0, [r7, r2] asrs r1, 16 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -241,7 +241,7 @@ _0808B77E: movs r2, 0 ldrsh r0, [r7, r2] asrs r1, 16 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -391,7 +391,7 @@ _0808B8F4: movs r2, 0 ldrsh r0, [r7, r2] asrs r1, 16 - bl GetMapEntity + bl GetMapTile_2 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 diff --git a/include/dungeon_global_data.h b/include/dungeon_global_data.h index 948603e..74e052e 100644 --- a/include/dungeon_global_data.h +++ b/include/dungeon_global_data.h @@ -71,7 +71,7 @@ struct DungeonGlobalData /* 0xE277 */ u8 mudSportTurnsLeft; /* 0xE278 */ u8 waterSportTurnsLeft; u8 fillE279[0xE8C0 - 0xE279]; - /* 0xE8C0 */ struct MapTile* mapEntityPointers[DUNGEON_MAX_SIZE_Y][DUNGEON_MAX_SIZE_X]; + /* 0xE8C0 */ struct MapTile* mapTilePointers[DUNGEON_MAX_SIZE_Y][DUNGEON_MAX_SIZE_X]; u8 fill104C0[0x104C4 - 0x104C0]; /* 0x104C4 */ struct MapRoom roomData[MAX_ROOM_COUNT]; u8 fill10764[0x10844 - 0x10764]; diff --git a/include/dungeon_map_access.h b/include/dungeon_map_access.h index 5e4e3da..c715483 100644 --- a/include/dungeon_map_access.h +++ b/include/dungeon_map_access.h @@ -3,7 +3,14 @@ #include "map.h" +struct unkStruct_202F190 +{ + struct MapTile* unk0[6]; +}; + // 0x4954C -struct MapTile* GetMapTileAtPosition(s32 x, s32 y); +struct MapTile* GetMapTile_1(s32 x, s32 y); +// 0x49590 +struct MapTile* GetMapTile_2(s32 x, s32 y); #endif diff --git a/include/dungeon_util.h b/include/dungeon_util.h index 4d91b29..b32b85d 100644 --- a/include/dungeon_util.h +++ b/include/dungeon_util.h @@ -15,6 +15,6 @@ u32 GetEntityType(struct DungeonEntity *entity); struct DungeonEntityData *GetTrapData(struct DungeonEntity *entity); // 0x45108 struct ItemSlot *GetItemData(struct DungeonEntity *entity); -struct MapTile *GetMapEntityForDungeonEntity(struct DungeonEntity *entity); +struct MapTile *GetMapTileForDungeonEntity_2(struct DungeonEntity *entity); #endif diff --git a/ld_script.txt b/ld_script.txt index 790721e..a03b217 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -200,7 +200,7 @@ SECTIONS { asm/code_8048480.o(.text); src/dungeon_ai_item_weight.o(.text); src/dungeon_map_access.o(.text); - asm/code_8049590.o(.text); + asm/code_80495E4.o(.text); src/code_80521D0.o(.text); asm/code_80521D0.o(.text); src/charge_move.o(.text); diff --git a/src/code_8040094.c b/src/code_8040094.c index c0e7eac..f7374e3 100644 --- a/src/code_8040094.c +++ b/src/code_8040094.c @@ -3,6 +3,7 @@ #include "code_80521D0.h" #include "dungeon_entity.h" #include "dungeon_global_data.h" +#include "dungeon_map_access.h" #include "file_system.h" #include "play_time.h" @@ -26,8 +27,6 @@ extern void sub_8040A84(); extern const char *gUnknown_80FD040; // It became brighter on the floor -extern struct MapTile *GetMapEntity(u32, u32); - // Luminous Orb??? void HandleLuminousOrbAction(struct DungeonEntity *param_1) { @@ -41,7 +40,7 @@ void HandleLuminousOrbAction(struct DungeonEntity *param_1) { for(XCoord = 0; XCoord < DUNGEON_MAX_SIZE_X; XCoord++) { - mapTile = GetMapEntity(XCoord, YCoord); + mapTile = GetMapTile_2(XCoord, YCoord); mapTile->unk4 = mapTile->unk4 | 1; } } diff --git a/src/code_80521D0_1.c b/src/code_80521D0_1.c index 2b23a14..53f5586 100644 --- a/src/code_80521D0_1.c +++ b/src/code_80521D0_1.c @@ -3,6 +3,7 @@ #include "constants/friend_area.h" #include "dungeon_global_data.h" #include "dungeon_entity.h" +#include "dungeon_map_access.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "friend_area.h" @@ -138,7 +139,6 @@ extern void sub_8049ED4(); extern void sub_8040A84(); extern void sub_8086A54(struct DungeonEntity *); -extern struct MapTile *GetMapEntity(u32, u32); extern void sub_806BFC0(struct DungeonEntityData *, u32); void sub_808BBA8(struct DungeonEntity *param_1) @@ -207,7 +207,7 @@ void sub_808BCE4(void) { struct MapTile *puVar1; - puVar1 = GetMapEntity(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E); + puVar1 = GetMapTile_2(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E); puVar1->tileType &= ~(TILE_TYPE_FLOOR | TILE_TYPE_LIQUID); puVar1->tileType |= TILE_TYPE_MAP_EDGE; puVar1->tileType &= ~TILE_TYPE_STAIRS; @@ -221,7 +221,7 @@ void sub_808BD38(void) { struct MapTile *puVar1; - puVar1 = GetMapEntity(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E); + puVar1 = GetMapTile_2(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E); puVar1->tileType &= ~(TILE_TYPE_FLOOR | TILE_TYPE_LIQUID); puVar1->tileType |= TILE_TYPE_FLOOR; puVar1->tileType &= ~TILE_TYPE_MAP_EDGE; diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c index f3a7db2..0d48f71 100644 --- a/src/code_8057824_1.c +++ b/src/code_8057824_1.c @@ -3318,7 +3318,7 @@ void sub_808B1CC(u8 r0) "\tldrsh r0, [r0, r2]\n" "\tmovs r3, 0x2\n" "\tldrsh r1, [r5, r3]\n" - "\tbl GetMapEntity\n" + "\tbl GetMapTile_2\n" "\tldrh r2, [r0]\n" "\tmovs r3, 0x80\n" "\tlsls r3, 2\n" diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c index a275081..092bab5 100644 --- a/src/dungeon_ai_attack.c +++ b/src/dungeon_ai_attack.c @@ -377,7 +377,7 @@ s32 FindMoveTarget(struct MoveTargetResults *moveTargetResults, struct DungeonEn { // Double assignment to fix a regswap. s16 rangeTargetingFlags = rangeTargetingFlags2 = targetingFlags & 0xF0; - struct MapTile *adjacentTile = GetMapTileAtPosition(pokemon->posWorld.x + gAdjacentTileOffsets[i].x, + struct MapTile *adjacentTile = GetMapTile_1(pokemon->posWorld.x + gAdjacentTileOffsets[i].x, pokemon->posWorld.y + gAdjacentTileOffsets[i].y); struct DungeonEntity *adjacentPokemon = adjacentTile->pokemon; if (adjacentPokemon != NULL && GetEntityType(adjacentPokemon) == ENTITY_POKEMON) @@ -411,7 +411,7 @@ s32 FindMoveTarget(struct MoveTargetResults *moveTargetResults, struct DungeonEn { for (i = 0; i < NUM_DIRECTIONS; i++) { - struct MapTile *targetTile = GetMapTileAtPosition(pokemon->posWorld.x + gAdjacentTileOffsets[i].x, + struct MapTile *targetTile = GetMapTile_1(pokemon->posWorld.x + gAdjacentTileOffsets[i].x, pokemon->posWorld.y + gAdjacentTileOffsets[i].y); if (CanAttackInFront(pokemon, i)) { @@ -425,7 +425,7 @@ s32 FindMoveTarget(struct MoveTargetResults *moveTargetResults, struct DungeonEn continue; } } - targetTile = GetMapTileAtPosition(pokemon->posWorld.x + gAdjacentTileOffsets[i].x * 2, + targetTile = GetMapTile_1(pokemon->posWorld.x + gAdjacentTileOffsets[i].x * 2, pokemon->posWorld.y + gAdjacentTileOffsets[i].y * 2); targetPokemon = targetTile->pokemon; if (targetPokemon != NULL && GetEntityType(targetPokemon) == ENTITY_POKEMON) diff --git a/src/dungeon_ai_attack_1.c b/src/dungeon_ai_attack_1.c index 8a186ea..641bc8c 100644 --- a/src/dungeon_ai_attack_1.c +++ b/src/dungeon_ai_attack_1.c @@ -57,7 +57,7 @@ bool8 IsTargetStraightAhead(struct DungeonEntity *pokemon, struct DungeonEntity break; } while (0); // Extra label needed to swap branch locations in ASM. - mapTile = GetMapTileAtPosition(currentPosX, currentPosY); + mapTile = GetMapTile_1(currentPosX, currentPosY); if (!(mapTile->tileType & (TILE_TYPE_FLOOR | TILE_TYPE_LIQUID))) { break; diff --git a/src/dungeon_ai_item_weight.c b/src/dungeon_ai_item_weight.c index 5006970..08652b2 100644 --- a/src/dungeon_ai_item_weight.c +++ b/src/dungeon_ai_item_weight.c @@ -448,7 +448,7 @@ bool8 CanTargetAdjacentPokemon(struct DungeonEntity *pokemon) s32 facingDir; for (facingDir = 0; facingDir < NUM_DIRECTIONS; facingDir++) { - struct MapTile *mapTile = GetMapTileAtPosition(pokemon->posWorld.x + gAdjacentTileOffsets[facingDir].x, pokemon->posWorld.y + gAdjacentTileOffsets[facingDir].y); + struct MapTile *mapTile = GetMapTile_1(pokemon->posWorld.x + gAdjacentTileOffsets[facingDir].x, pokemon->posWorld.y + gAdjacentTileOffsets[facingDir].y); struct DungeonEntity *adjacentPokemon = mapTile->pokemon; if (adjacentPokemon != NULL && GetEntityType(adjacentPokemon) != ENTITY_NONE && CanTarget(pokemon, adjacentPokemon, FALSE, TRUE) == TARGET_CAPABILITY_CAN_TARGET) diff --git a/src/dungeon_ai_items.c b/src/dungeon_ai_items.c index 183d143..52aacc4 100644 --- a/src/dungeon_ai_items.c +++ b/src/dungeon_ai_items.c @@ -158,7 +158,7 @@ void DecideUseItem(struct DungeonEntity *pokemon) else if (toolboxIndex == 0) { // This seems unused. toolboxIndex can never be 0. - struct MapTile *mapTile = GetMapTileAtPosition(pokemon->posWorld.x, pokemon->posWorld.y); + struct MapTile *mapTile = GetMapTile_1(pokemon->posWorld.x, pokemon->posWorld.y); struct DungeonEntity *mapObject = mapTile->mapObject; if (mapObject != null) { diff --git a/src/dungeon_ai_movement.c b/src/dungeon_ai_movement.c index 5fa6d87..49609d7 100644 --- a/src/dungeon_ai_movement.c +++ b/src/dungeon_ai_movement.c @@ -49,7 +49,7 @@ u32 sub_8075818(struct DungeonEntity *entity) entityData = entity->entityData; if(EntityExists(entity)) { - tile = GetMapEntityForDungeonEntity(entity); + tile = GetMapTileForDungeonEntity_2(entity); if(HasIQSkill(entity, IQ_SKILL_SUPER_MOBILE)) if(!(tile->tileType & (TILE_TYPE_FLOOR | TILE_TYPE_LIQUID))) return 1; @@ -136,7 +136,7 @@ void sub_8075900(struct DungeonEntity *pokemon, u8 r1) { if(!gDungeonGlobalData->monsterHouseActive) { - if((GetMapEntityForDungeonEntity(pokemon)->tileType & TILE_TYPE_MONSTER_HOUSE)) + if((GetMapTileForDungeonEntity_2(pokemon)->tileType & TILE_TYPE_MONSTER_HOUSE)) { // It's a monster house! SendMessage(GetLeaderEntity(), gPtrItsaMonsterHouseMessage); diff --git a/src/dungeon_capabilities_1.c b/src/dungeon_capabilities_1.c index e6ec6fa..605f9e9 100644 --- a/src/dungeon_capabilities_1.c +++ b/src/dungeon_capabilities_1.c @@ -89,7 +89,7 @@ bool8 CannotAttack(struct DungeonEntity *pokemon, bool8 skipSleep) bool8 CanMoveInDirection(struct DungeonEntity *pokemon, u32 facingDir) { u8 crossableTerrain = GetCrossableTerrain(pokemon->entityData->entityID); - struct MapTile *currentMapTile = GetMapTileAtPosition(pokemon->posWorld.x + gAdjacentTileOffsets[facingDir].x, + struct MapTile *currentMapTile = GetMapTile_1(pokemon->posWorld.x + gAdjacentTileOffsets[facingDir].x, pokemon->posWorld.y + gAdjacentTileOffsets[facingDir].y); if (currentMapTile->tileType & TILE_TYPE_MAP_EDGE || currentMapTile->pokemon != NULL) { @@ -118,7 +118,7 @@ bool8 CanMoveInDirection(struct DungeonEntity *pokemon, u32 facingDir) } } } - currentMapTile = GetMapTileAtPosition(pokemon->posWorld.x, pokemon->posWorld.y); + currentMapTile = GetMapTile_1(pokemon->posWorld.x, pokemon->posWorld.y); if (!(currentMapTile->canMoveAdjacent[crossableTerrain] & gDirectionBitMasks[facingDir & DIRECTION_MASK])) { return FALSE; diff --git a/src/dungeon_map_access.c b/src/dungeon_map_access.c index 43e0e4d..9ffa633 100644 --- a/src/dungeon_map_access.c +++ b/src/dungeon_map_access.c @@ -3,13 +3,25 @@ #include "dungeon_global_data.h" -extern struct MapTile *gUnknown_203B430; +extern struct unkStruct_202F190 gUnknown_202F190; +extern struct unkStruct_202F190 *gUnknown_203B430; -struct MapTile* GetMapTileAtPosition(s32 x, s32 y) +struct MapTile* GetMapTile_1(s32 x, s32 y) { if (x >= 0 && y >= 0 && x < DUNGEON_MAX_SIZE_X && y < DUNGEON_MAX_SIZE_Y) { - return gDungeonGlobalData->mapEntityPointers[y][x]; + return gDungeonGlobalData->mapTilePointers[y][x]; } - return gUnknown_203B430; + return (struct MapTile*) gUnknown_203B430->unk0; +} + +struct MapTile* GetMapTile_2(s32 x, s32 y) +{ + if (x < 0 || y < 0 || x >= DUNGEON_MAX_SIZE_X || y >= DUNGEON_MAX_SIZE_Y) + { + struct MapTile* tile = (struct MapTile*) gUnknown_202F190.unk0; + gUnknown_202F190 = *gUnknown_203B430; + return tile; + } + return gDungeonGlobalData->mapTilePointers[y][x]; } diff --git a/src/dungeon_range.c b/src/dungeon_range.c index facd71d..00b827d 100644 --- a/src/dungeon_range.c +++ b/src/dungeon_range.c @@ -14,7 +14,7 @@ bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2) { visibility = 2; } - tile1 = GetMapTileAtPosition(pos1->x, pos1->y); + tile1 = GetMapTile_1(pos1->x, pos1->y); pos1RoomIndex = tile1->roomIndex; if (pos1RoomIndex == CORRIDOR_ROOM_INDEX) { diff --git a/src/dungeon_util.c b/src/dungeon_util.c index c5b5695..1d443c0 100644 --- a/src/dungeon_util.c +++ b/src/dungeon_util.c @@ -14,8 +14,6 @@ const struct Position gAdjacentTileOffsets[] = { {-1, 1} }; -extern struct MapTile* GetMapEntity(s16, s16); - bool8 EntityExists(struct DungeonEntity *entity) { if (!entity) @@ -55,12 +53,12 @@ struct DungeonEntityData* sub_8045110(struct DungeonEntity *entity) return entity->entityData; } -struct MapTile* GetMapTileForDungeonEntity(struct DungeonEntity *entity) +struct MapTile* GetMapTileForDungeonEntity_1(struct DungeonEntity *entity) { - return GetMapTileAtPosition(entity->posWorld.x, entity->posWorld.y); + return GetMapTile_1(entity->posWorld.x, entity->posWorld.y); } -struct MapTile* GetMapEntityForDungeonEntity(struct DungeonEntity *entity) +struct MapTile* GetMapTileForDungeonEntity_2(struct DungeonEntity *entity) { - return GetMapEntity(entity->posWorld.x, entity->posWorld.y); + return GetMapTile_2(entity->posWorld.x, entity->posWorld.y); } diff --git a/src/status_checker.c b/src/status_checker.c index 379082f..7fbfc51 100644 --- a/src/status_checker.c +++ b/src/status_checker.c @@ -348,14 +348,14 @@ bool8 CanUseOnSelfWithStatusChecker(struct DungeonEntity *pokemon, struct Pokemo } break; case MOVE_DIVE: - if (IsTileGround(GetMapEntityForDungeonEntity(pokemon))) + if (IsTileGround(GetMapTileForDungeonEntity_2(pokemon))) { return FALSE; } break; case MOVE_DIG: { - struct MapTile *tile = GetMapEntityForDungeonEntity(pokemon); + struct MapTile *tile = GetMapTileForDungeonEntity_2(pokemon); if (!IsTileGround(tile) || (tile->tileType & (TILE_TYPE_FLOOR | TILE_TYPE_LIQUID)) != TILE_TYPE_FLOOR) { return FALSE; @@ -364,7 +364,7 @@ bool8 CanUseOnSelfWithStatusChecker(struct DungeonEntity *pokemon, struct Pokemo } case MOVE_TRAP_BUSTER: { - struct DungeonEntity *mapObject = GetMapEntityForDungeonEntity(pokemon)->mapObject; + struct DungeonEntity *mapObject = GetMapTileForDungeonEntity_2(pokemon)->mapObject; if (mapObject == NULL || GetEntityType(mapObject) != ENTITY_TRAP) { return FALSE; |