ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

GetFieldObjectIdByLocalIdAndMapInternal; rename gUnknown_02037350 to gMapObjects

Browse Source
This commit is contained in:
scnorton 2017-09-06 10:48:51 -04:00
parent f15191bfc2
commit 1087d1c822
31 changed files with 354 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/battle_setup.s
View File

@ -1883,7 +1883,7 @@ SingleTrainerWantsBattle: @ 80B162C
ldr r2, =gUnknown_03005DF0
strb r0, [r2]
ldr r4, =gScriptLastTalked
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@ -1911,7 +1911,7 @@ TwoTrainersWantBattle: @ 80B1670
ldr r2, =gUnknown_03005DF0
strb r0, [r2]
ldr r4, =gScriptLastTalked
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@ -1965,7 +1965,7 @@ sub_80B16D8: @ 80B16D8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x18]
lsls r0, 28
@ -2341,7 +2341,7 @@ sub_80B1A14: @ 80B1A14
b _080B1AD8
.pool
_080B1A44:
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
ldr r2, =gUnknown_03006090
ldr r0, =gUnknown_02038BFC
ldrb r1, [r0]
@ -2381,7 +2381,7 @@ _080B1A7C:
b _080B1AD8
.pool
_080B1AAC:
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
ldr r2, =gUnknown_03006090
ldr r0, =gUnknown_02038BFC
ldrb r1, [r0]

2
asm/berry.s
View File

@ -1065,7 +1065,7 @@ ResetBerryTreeSparkleFlags: @ 80E1D6C
lsls r2, 16
asrs r2, 16
mov r9, r2
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
lsls r3, 16
asrs r3, 16
mov r8, r3

38
asm/bike.s
View File

@ -131,7 +131,7 @@ sub_8119238: @ 8119238
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x1E]
adds r0, r5, 0
@ -166,7 +166,7 @@ sub_8119280: @ 8119280
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x1E]
adds r0, r5, 0
@ -525,7 +525,7 @@ CheckMovementInputAcroBikeStandingWheelie: @ 8119540
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r1, r0, r1
movs r0, 0
strb r0, [r5, 0x2]
@ -613,7 +613,7 @@ CheckMovementInputAcroBikeBunnyHop: @ 81195E0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r7, r0, r1
movs r0, 0x2
mov r1, r8
@ -698,7 +698,7 @@ CheckMovementInputAcroBikeMovingWheelie: @ 8119688
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r7, r0, r1
movs r0, 0x2
mov r9, r0
@ -802,7 +802,7 @@ CheckMovementInputAcroBikeUnknownMode5: @ 8119764
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r2, [r0, 0x1]
movs r1, 0x3
@ -868,7 +868,7 @@ sub_81197F4: @ 81197F4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -898,7 +898,7 @@ sub_8119830: @ 8119830
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x1E]
adds r0, r5, 0
@ -966,7 +966,7 @@ sub_81198C0: @ 81198C0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -995,7 +995,7 @@ sub_81198FC: @ 81198FC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -1024,7 +1024,7 @@ sub_8119938: @ 8119938
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -1053,7 +1053,7 @@ sub_8119974: @ 8119974
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -1082,7 +1082,7 @@ sub_81199B0: @ 81199B0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -1161,7 +1161,7 @@ _08119A58:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
movs r0, 0x22
bl PlaySE
@ -1203,7 +1203,7 @@ sub_8119AA4: @ 8119AA4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -1272,7 +1272,7 @@ sub_8119B34: @ 8119B34
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -1341,7 +1341,7 @@ sub_8119BC4: @ 8119BC4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@ -1686,7 +1686,7 @@ sub_8119E38: @ 8119E38
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@ -1965,7 +1965,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 811A044
lsls r0, 24
cmp r0, 0
beq _0811A078
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3

6
asm/field_control_avatar.s
View File

@ -552,7 +552,7 @@ _0809C30E:
lsrs r3, r0, 24
cmp r3, 0x10
beq _0809C32E
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r2, r3, 3
adds r0, r2, r3
lsls r0, 2
@ -615,7 +615,7 @@ TryGetMapObjectScript: @ 809C384
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C3B4
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@ -652,7 +652,7 @@ _0809C3B4:
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C400
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2

82
asm/field_effect.s
View File

@ -2032,7 +2032,7 @@ mapldr_08084390: @ 80B6AA4
ldr r0, =c3_080843F8
movs r1, 0
bl CreateTask
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
ldr r3, =gUnknown_02037590
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@ -2168,7 +2168,7 @@ sub_80B6BCC: @ 80B6BCC
lsls r5, r0, 3
adds r5, r0
lsls r5, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
mov r8, r0
add r5, r8
ldrb r0, [r6, 0x4]
@ -2282,7 +2282,7 @@ sub_80B6C90: @ 80B6C90
movs r0, 0x1
strh r0, [r5, 0xA]
strh r1, [r5, 0xC]
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldrb r0, [r6, 0x5]
lsls r1, r0, 3
adds r1, r0
@ -2314,7 +2314,7 @@ sub_80B6D04: @ 80B6D04
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@ -2556,7 +2556,7 @@ sub_80B6EE0: @ 80B6EE0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -2833,7 +2833,7 @@ sub_80B7114: @ 80B7114
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
movs r0, 0x4
bl GetFaceDirectionAnimId
@ -3068,7 +3068,7 @@ sub_80B72F4: @ 80B72F4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@ -3143,7 +3143,7 @@ _080B7396:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@ -3392,7 +3392,7 @@ dive_3_unknown: @ 80B7580
lsls r0, 24
cmp r0, 0
bne _080B75C4
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -3451,7 +3451,7 @@ _080B7604:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@ -3781,7 +3781,7 @@ _080B78A4:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@ -4030,7 +4030,7 @@ _080B7AA0:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@ -4364,7 +4364,7 @@ _080B7D60:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -4465,7 +4465,7 @@ mapldr_080859D4: @ 80B7E48
ldr r1, =gUnknown_03005DAC
movs r0, 0
str r0, [r1]
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -4542,7 +4542,7 @@ sub_80B7EE8: @ 80B7EE8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r6, r0, r1
ldrh r1, [r5, 0xA]
movs r2, 0xA
@ -4700,7 +4700,7 @@ sub_80B8034: @ 80B8034
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrh r1, [r4, 0xA]
movs r2, 0xA
@ -4770,7 +4770,7 @@ sub_80B80C4: @ 80B80C4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r3, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@ -4910,7 +4910,7 @@ mapldr_08085D88: @ 80B8200
ldr r1, =gUnknown_03005DAC
movs r0, 0
str r0, [r1]
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -4983,7 +4983,7 @@ sub_80B8280: @ 80B8280
adds r0, r1
negs r0, r0
strh r0, [r2, 0x26]
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
adds r1, r0
@ -5032,7 +5032,7 @@ sub_80B830C: @ 80B830C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@ -5161,7 +5161,7 @@ sub_80B8410: @ 80B8410
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrh r0, [r4, 0xA]
subs r0, 0x1
@ -6348,7 +6348,7 @@ sub_80B8DB4: @ 80B8DB4
adds r0, r6, 0
mov r1, r8
bl PlayerGetDestCoords
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -6379,7 +6379,7 @@ sub_80B8E14: @ 80B8E14
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -6415,7 +6415,7 @@ sub_80B8E60: @ 80B8E60
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@ -6454,7 +6454,7 @@ sub_80B8EA8: @ 80B8EA8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
movs r0, 0x3
bl GetPlayerAvatarGraphicsIdByStateId
@ -6503,7 +6503,7 @@ sub_80B8F24: @ 80B8F24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@ -6834,7 +6834,7 @@ sub_80B9204: @ 80B9204
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -6875,7 +6875,7 @@ sub_80B925C: @ 80B925C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
@ -6911,7 +6911,7 @@ sub_80B92A0: @ 80B92A0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrh r1, [r4, 0x26]
movs r0, 0x8
@ -6960,7 +6960,7 @@ sub_80B92F8: @ 80B92F8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
movs r1, 0x2
bl FieldObjectSetSpecialAnim
@ -6980,7 +6980,7 @@ sub_80B933C: @ 80B933C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r2, r0, r1
ldrh r1, [r4, 0xC]
movs r3, 0xC
@ -7028,7 +7028,7 @@ sub_80B9390: @ 80B9390
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
movs r0, 0x3
bl GetPlayerAvatarGraphicsIdByStateId
@ -7092,7 +7092,7 @@ sub_80B9418: @ 80B9418
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimActive
@ -7587,7 +7587,7 @@ sub_80B9804: @ 80B9804
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -7678,7 +7678,7 @@ _080B98D0:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
@ -7765,7 +7765,7 @@ sub_80B9978: @ 80B9978
lsls r5, r0, 3
adds r5, r0
lsls r5, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r5, r0
ldrb r0, [r5, 0x4]
lsls r4, r0, 4
@ -7815,7 +7815,7 @@ sub_80B99F0: @ 80B99F0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
@ -7877,7 +7877,7 @@ sub_80B9A60: @ 80B9A60
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
movs r7, 0
ldrh r1, [r5, 0x26]
@ -8119,7 +8119,7 @@ sub_80B9C54: @ 80B9C54
asrs r0, 16
cmp r0, 0x78
ble _080B9CC2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
movs r1, 0x4
ldrsh r0, [r7, r1]
lsls r1, r0, 3
@ -8357,7 +8357,7 @@ sub_80B9E28: @ 80B9E28
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
movs r0, 0x10
ldrsh r5, [r4, r0]
@ -8507,7 +8507,7 @@ _080B9F7C:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrh r0, [r5, 0x4]
strh r0, [r6, 0x20]

40
asm/field_effect_helpers.s
View File

@ -248,7 +248,7 @@ objc_reflection_maybe: @ 81540A8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r7, r0, r1
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
@ -581,7 +581,7 @@ oei_shadow: @ 8154340
bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@ -673,7 +673,7 @@ _08154412:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
lsls r1, r0, 4
@ -909,7 +909,7 @@ _08154604:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@ -1248,7 +1248,7 @@ _081548B4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@ -1346,7 +1346,7 @@ sub_815496C: @ 815496C
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x78]
@ -1432,7 +1432,7 @@ sub_8154A10: @ 8154A10
lsls r0, 24
cmp r0, 0
bne _08154A4E
ldr r5, =gUnknown_02037350
ldr r5, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -1787,7 +1787,7 @@ sub_8154CEC: @ 8154CEC
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@ -1881,7 +1881,7 @@ _08154DC0:
b _08154E0A
_08154DCA:
ldr r3, =gSprites
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -2040,7 +2040,7 @@ sub_8154EFC: @ 8154EFC
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@ -2127,7 +2127,7 @@ sub_8154FB4: @ 8154FB4
lsls r0, 24
cmp r0, 0
bne _08154FEE
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -2248,7 +2248,7 @@ sub_81550B4: @ 81550B4
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x7C]
@ -2332,7 +2332,7 @@ sub_8155158: @ 8155158
lsls r0, 24
cmp r0, 0
bne _08155192
ldr r5, =gUnknown_02037350
ldr r5, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -2765,7 +2765,7 @@ sub_81554AC: @ 81554AC
movs r2, 0x32
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -2972,7 +2972,7 @@ sub_8155658: @ 8155658
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x4]
lsls r5, r0, 4
@ -3325,7 +3325,7 @@ sub_8155900: @ 8155900
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x74]
@ -3419,7 +3419,7 @@ sub_81559BC: @ 81559BC
lsls r0, 24
cmp r0, 0
bne _081559F6
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -3474,7 +3474,7 @@ _08155A46:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
ldr r3, =gSprites
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -3793,7 +3793,7 @@ sub_8155C88: @ 8155C88
adds r0, r5, 0
bl FieldEffectStop
_08155CB8:
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -4514,7 +4514,7 @@ _08156212:
lsls r0, r7, 3
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r0, [r4]
lsls r0, 31

238
asm/field_map_obj.s
View File

@ -5,52 +5,6 @@
.text
thumb_func_start GetFieldObjectIdByLocalIdAndMapInternal
@ u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId)
GetFieldObjectIdByLocalIdAndMapInternal: @ 808D5B8
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r1, 24
lsrs r4, r1, 24
lsls r2, 24
lsrs r2, 24
movs r1, 0
ldr r6, =gUnknown_02037350
_0808D5CA:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
adds r3, r0, r6
ldrb r0, [r3]
lsls r0, 31
cmp r0, 0
beq _0808D5F4
ldrb r0, [r3, 0x8]
cmp r0, r5
bne _0808D5F4
ldrb r0, [r3, 0x9]
cmp r0, r4
bne _0808D5F4
ldrb r0, [r3, 0xA]
cmp r0, r2
bne _0808D5F4
adds r0, r1, 0
b _0808D600
.pool
_0808D5F4:
adds r0, r1, 0x1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xF
bls _0808D5CA
movs r0, 0x10
_0808D600:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end GetFieldObjectIdByLocalIdAndMapInternal
thumb_func_start GetFieldObjectIdByLocalId
@ u8 GetFieldObjectIdByLocalId(u8 localId)
GetFieldObjectIdByLocalId: @ 808D608
@ -58,7 +12,7 @@ GetFieldObjectIdByLocalId: @ 808D608
lsls r0, 24
lsrs r3, r0, 24
movs r2, 0
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
_0808D612:
lsls r0, r2, 3
adds r0, r2
@ -116,7 +70,7 @@ _0808D66E:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl npc_clear_ids_and_state
@ -333,7 +287,7 @@ GetAvailableFieldObjectSlot: @ 808D810
lsls r2, 24
lsrs r4, r2, 24
movs r2, 0
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
ldrb r0, [r1]
lsls r0, 31
adds r7, r1, 0
@ -378,7 +332,7 @@ _0808D868:
_0808D870:
mov r0, r12
strb r2, [r0]
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
_0808D876:
lsls r0, r2, 3
adds r0, r2
@ -452,7 +406,7 @@ RemoveFieldObjectByLocalIdAndMap: @ 808D8C4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl RemoveFieldObject
_0808D902:
@ -511,7 +465,7 @@ _0808D95C:
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl RemoveFieldObject
_0808D972:
@ -563,7 +517,7 @@ _0808D9C8:
lsls r4, r0, 3
adds r0, r4, r0
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r6, r0, r1
ldrb r0, [r6, 0x5]
bl GetFieldObjectGraphicsInfo
@ -618,7 +572,7 @@ _0808DA24:
mov r8, r0
cmp r0, 0x40
bne _0808DA64
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
mov r2, r9
adds r1, r4, r2
lsls r1, 2
@ -802,7 +756,7 @@ SpawnFieldObject: @ 808DB40
.pool
_0808DBBC:
ldr r4, =gSprites
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
@ -1455,7 +1409,7 @@ _0808E0AA:
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r2, r0, r1
ldr r0, [r2]
ldr r1, =0x00010001
@ -1555,7 +1509,7 @@ sub_808E16C: @ 808E16C
lsrs r5, 16
bl ClearPlayerAvatarInfo
movs r6, 0
ldr r7, =gUnknown_02037350
ldr r7, =gMapObjects
lsls r4, 16
lsls r5, 16
_0808E186:
@ -1623,7 +1577,7 @@ _0808E1EC:
lsls r0, r1, 3
add r0, r9
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r6, r0, r1
movs r0, 0
str r0, [sp, 0x20]
@ -1848,7 +1802,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 808E3C4
ldr r5, =gUnknown_02037590
strb r0, [r5, 0x5]
strb r1, [r5, 0x4]
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
@ -2021,7 +1975,7 @@ sub_808E504: @ 808E504
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
adds r1, r4, 0
bl FieldObjectSetGraphicsId
@ -2097,7 +2051,7 @@ FieldObjectTurnByLocalIdAndMap: @ 808E594
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
adds r1, r4, 0
bl FieldObjectTurn
@ -2118,7 +2072,7 @@ sub_808E5D4: @ 808E5D4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
bl FieldObjectTurn
pop {r0}
@ -2279,7 +2233,7 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 808E6F8
lsls r0, 24
cmp r0, 0
bne _0808E73A
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r0, [r0]
lsls r1, r0, 3
@ -2334,7 +2288,7 @@ sub_808E75C: @ 808E75C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r1, [r0]
movs r2, 0x4
@ -2368,7 +2322,7 @@ sub_808E78C: @ 808E78C
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r2, r0
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@ -2410,7 +2364,7 @@ sub_808E7E4: @ 808E7E4
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r1, r0
ldrb r2, [r1, 0x3]
movs r0, 0x5
@ -2448,7 +2402,7 @@ sub_808E82C: @ 808E82C
lsls r0, 24
cmp r0, 0
bne _0808E870
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -2927,7 +2881,7 @@ sub_808EBA8: @ 808EBA8
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
adds r0, r3
movs r3, 0xE0
lsls r3, 11
@ -2968,7 +2922,7 @@ UpdateFieldObjectCoordsForCameraUpdate: @ 808EC10
cmp r0, 0
beq _0808EC68
movs r3, 0
ldr r5, =gUnknown_02037350
ldr r5, =gMapObjects
movs r0, 0x4
ldrsh r4, [r2, r0]
movs r0, 0x8
@ -3026,7 +2980,7 @@ GetFieldObjectIdByXYZ: @ 808EC78
lsls r2, 24
lsrs r5, r2, 24
movs r4, 0
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
mov r8, r0
_0808EC90:
lsls r0, r4, 3
@ -3546,7 +3500,7 @@ GetFieldObjectScriptPointerByFieldObjectId: @ 808F01C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@ -3582,7 +3536,7 @@ GetFieldObjectFlagIdByFieldObjectId: @ 808F058
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@ -3613,7 +3567,7 @@ sub_808F080: @ 808F080
lsls r0, 24
cmp r0, 0
bne _0808F0B4
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -3635,7 +3589,7 @@ _0808F0B6:
sub_808F0BC: @ 808F0BC
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@ -3660,7 +3614,7 @@ sub_808F0D4: @ 808F0D4
lsls r0, 24
cmp r0, 0
bne _0808F108
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -3683,7 +3637,7 @@ _0808F10A:
FieldObjectGetBerryTreeId: @ 808F110
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@ -3892,7 +3846,7 @@ sub_808F254: @ 808F254
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl sub_808F208
_0808F282:
@ -3930,7 +3884,7 @@ _0808F2B6:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldr r1, =gUnknown_082766A2
bl sub_808F228
@ -3942,7 +3896,7 @@ _0808F2D4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldr r1, =gUnknown_082766A6
bl sub_808F228
@ -4070,7 +4024,7 @@ FieldObjectCB_NoMovement1: @ 808F3E0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_NoMovement1
bl FieldObjectStep
@ -4094,7 +4048,7 @@ FieldObjectCB_GoRandomDirections: @ 808F408
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_GoRandomDirections
bl FieldObjectStep
@ -4833,7 +4787,7 @@ FieldObjectCB_LookRandomDirections: @ 808F944
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_LookRandomDirections
bl FieldObjectStep
@ -5007,7 +4961,7 @@ FieldObjectCB_RandomlyGoNorthOrSouth: @ 808FA84
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_RandomlyGoNorthOrSouth
bl FieldObjectStep
@ -5220,7 +5174,7 @@ FieldObjectCB_RandomlyGoEastOrWest: @ 808FC08
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_RandomlyGoEastOrWest
bl FieldObjectStep
@ -5430,7 +5384,7 @@ FieldObjectCB_FaceFixedDirection: @ 808FD8C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_FaceFixedDirection
bl FieldObjectStep
@ -5524,7 +5478,7 @@ FieldObjectCB_BerryTree: @ 808FE2C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrh r1, [r4, 0x3C]
movs r0, 0x1
@ -5822,7 +5776,7 @@ FieldObjectCB_RandomlyLookNorthOrSouth: @ 8090050
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_RandomlyLookNorthOrSouth
bl FieldObjectStep
@ -5990,7 +5944,7 @@ FieldObjectCB_RandomlyLookEastOrWest: @ 8090190
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_RandomlyLookEastOrWest
bl FieldObjectStep
@ -6158,7 +6112,7 @@ FieldObjectCB_RandomlyLookNorthOrWest: @ 80902D0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_RandomlyLookNorthOrWest
bl FieldObjectStep
@ -6326,7 +6280,7 @@ FieldObjectCB_RandomlyLookNorthOrEast: @ 8090410
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8090434
bl FieldObjectStep
@ -6494,7 +6448,7 @@ FieldObjectCB_RandomlyLookSouthOrWest: @ 8090550
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8090574
bl FieldObjectStep
@ -6662,7 +6616,7 @@ FieldObjectCB_RandomlyLookSouthOrEast: @ 8090690
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80906B4
bl FieldObjectStep
@ -6830,7 +6784,7 @@ FieldObjectCB_RandomlyLookNorthOrSouthOrWest: @ 80907D0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80907F4
bl FieldObjectStep
@ -6998,7 +6952,7 @@ FieldObjectCB_RandomlyLookNorthOrSouthOrEast: @ 8090910
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8090934
bl FieldObjectStep
@ -7166,7 +7120,7 @@ FieldObjectCB_RandomlyLookNorthOrEastOrWest: @ 8090A50
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8090A74
bl FieldObjectStep
@ -7334,7 +7288,7 @@ FieldObjectCB_RandomlyLookSouthOrEastOrWest: @ 8090B90
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8090BB4
bl FieldObjectStep
@ -7502,7 +7456,7 @@ FieldObjectCB_LookAroundCounterclockwise: @ 8090CD0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8090CF4
bl FieldObjectStep
@ -7642,7 +7596,7 @@ FieldObjectCB_LookAroundClockwise: @ 8090DD4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8090DF8
bl FieldObjectStep
@ -7781,7 +7735,7 @@ FieldObjectCB_AlternatelyGoInOppositeDirections: @ 8090ED8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8090EFC
bl FieldObjectStep
@ -8099,7 +8053,7 @@ FieldObjectCB_GoInDirectionSequence1: @ 8091138
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_809115C
bl FieldObjectStep
@ -8172,7 +8126,7 @@ FieldObjectCB_GoInDirectionSequence2: @ 80911C4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80911E8
bl FieldObjectStep
@ -8245,7 +8199,7 @@ FieldObjectCB_GoInDirectionSequence3: @ 8091250
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091274
bl FieldObjectStep
@ -8318,7 +8272,7 @@ FieldObjectCB_GoInDirectionSequence4: @ 80912DC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091300
bl FieldObjectStep
@ -8391,7 +8345,7 @@ FieldObjectCB_GoInDirectionSequence5: @ 8091368
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_809138C
bl FieldObjectStep
@ -8465,7 +8419,7 @@ FieldObjectCB_GoInDirectionSequence6: @ 80913F4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091418
bl FieldObjectStep
@ -8538,7 +8492,7 @@ FieldObjectCB_GoInDirectionSequence7: @ 8091480
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80914A4
bl FieldObjectStep
@ -8611,7 +8565,7 @@ FieldObjectCB_GoInDirectionSequence8: @ 809150C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091530
bl FieldObjectStep
@ -8684,7 +8638,7 @@ FieldObjectCB_GoInDirectionSequence9: @ 8091598
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80915BC
bl FieldObjectStep
@ -8757,7 +8711,7 @@ FieldObjectCB_GoInDirectionSequence10: @ 8091624
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091648
bl FieldObjectStep
@ -8830,7 +8784,7 @@ FieldObjectCB_GoInDirectionSequence11: @ 80916B0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80916D4
bl FieldObjectStep
@ -8903,7 +8857,7 @@ FieldObjectCB_GoInDirectionSequence12: @ 809173C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091760
bl FieldObjectStep
@ -8976,7 +8930,7 @@ FieldObjectCB_GoInDirectionSequence13: @ 80917C8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80917EC
bl FieldObjectStep
@ -9049,7 +9003,7 @@ FieldObjectCB_GoInDirectionSequence14: @ 8091854
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091878
bl FieldObjectStep
@ -9122,7 +9076,7 @@ FieldObjectCB_GoInDirectionSequence15: @ 80918E0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091904
bl FieldObjectStep
@ -9195,7 +9149,7 @@ FieldObjectCB_GoInDirectionSequence16: @ 809196C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091990
bl FieldObjectStep
@ -9268,7 +9222,7 @@ FieldObjectCB_GoInDirectionSequence17: @ 80919F8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091A1C
bl FieldObjectStep
@ -9341,7 +9295,7 @@ FieldObjectCB_GoInDirectionSequence18: @ 8091A84
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091AA8
bl FieldObjectStep
@ -9414,7 +9368,7 @@ FieldObjectCB_GoInDirectionSequence19: @ 8091B10
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091B34
bl FieldObjectStep
@ -9487,7 +9441,7 @@ FieldObjectCB_GoInDirectionSequence20: @ 8091B9C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091BC0
bl FieldObjectStep
@ -9560,7 +9514,7 @@ FieldObjectCB_GoInDirectionSequence21: @ 8091C28
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091C4C
bl FieldObjectStep
@ -9633,7 +9587,7 @@ FieldObjectCB_GoInDirectionSequence22: @ 8091CB4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091CD8
bl FieldObjectStep
@ -9706,7 +9660,7 @@ FieldObjectCB_GoInDirectionSequence23: @ 8091D40
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091D64
bl FieldObjectStep
@ -9779,7 +9733,7 @@ FieldObjectCB_GoInDirectionSequence24: @ 8091DCC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091DF0
bl FieldObjectStep
@ -9852,7 +9806,7 @@ FieldObjectCB_CopyPlayer1: @ 8091E58
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8091E7C
bl FieldObjectStep
@ -9906,7 +9860,7 @@ sub_8091EC0: @ 8091EC0
push {r4-r7,lr}
adds r6, r0, 0
adds r7, r1, 0
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r3, =gUnknown_02037590
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@ -10629,7 +10583,7 @@ FieldObjectCB_CopyPlayer2: @ 8092494
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80924B8
bl FieldObjectStep
@ -10661,7 +10615,7 @@ mss_08062EA4: @ 80924D8
push {r4-r7,lr}
adds r6, r0, 0
adds r7, r1, 0
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r3, =gUnknown_02037590
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@ -10713,7 +10667,7 @@ FieldObjectCB_TreeDisguise: @ 809253C
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r1, r0
adds r6, r4, 0
adds r6, 0x21
@ -10747,7 +10701,7 @@ _08092584:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldr r2, =sub_80925AC
adds r1, r5, 0
@ -10776,7 +10730,7 @@ FieldObjectCB_MountainDisguise: @ 80925B8
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r1, r0
adds r6, r4, 0
adds r6, 0x21
@ -10810,7 +10764,7 @@ _08092600:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldr r2, =sub_80925AC
adds r1, r5, 0
@ -10828,7 +10782,7 @@ FieldObjectCB_Hidden1: @ 8092628
adds r3, r0, 0
movs r1, 0x3C
ldrsh r0, [r3, r1]
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
cmp r0, 0
bne _08092668
movs r0, 0x2E
@ -10926,7 +10880,7 @@ FieldObjectCB_WalkInPlace1: @ 80926D4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80926F8
bl FieldObjectStep
@ -10985,7 +10939,7 @@ FieldObjectCB_WalkInPlace4: @ 8092744
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8092768
bl FieldObjectStep
@ -11044,7 +10998,7 @@ FieldObjectCB_WalkInPlace2: @ 80927B4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80927D8
bl FieldObjectStep
@ -11104,7 +11058,7 @@ FieldObjectCB_WalkInPlace3: @ 8092824
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_8092848
bl FieldObjectStep
@ -11163,7 +11117,7 @@ FieldObjectCB_Hidden2: @ 8092894
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =sub_80928B8
bl FieldObjectStep
@ -11985,7 +11939,7 @@ _08092E2E:
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r2, r0, r1
ldrb r0, [r2]
lsls r0, 31
@ -12055,7 +12009,7 @@ sub_8092E9C: @ 8092E9C
cmp r0, 0
bne _08092EE8
ldr r3, =gSprites
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -12099,7 +12053,7 @@ sub_8092EF0: @ 8092EF0
cmp r0, 0
bne _08092F2E
ldr r3, =gSprites
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -16723,7 +16677,7 @@ sub_8094F38: @ 8094F38
ldrsh r0, [r5, r1]
movs r2, 0x12
ldrsh r1, [r5, r2]
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
mov r2, sp
ldrb r2, [r2]
lsls r3, r2, 3
@ -16769,7 +16723,7 @@ sub_8094F94: @ 8094F94
ldrsh r0, [r5, r1]
movs r2, 0x12
ldrsh r1, [r5, r2]
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
mov r2, sp
ldrb r2, [r2]
lsls r3, r2, 3

96
asm/field_player_avatar.s
View File

@ -15,7 +15,7 @@ FieldObjectCB_NoMovement2: @ 808A998
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldr r2, =FieldObjectCB2_NoMovement2
bl FieldObjectStep
@ -48,7 +48,7 @@ player_step: @ 808A9C0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl sub_808C280
@ -240,7 +240,7 @@ GetForcedMovementByMetatileBehavior: @ 808AB38
ands r0, r1
cmp r0, 0
bne _0808AB8A
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -290,7 +290,7 @@ ForcedMovement_None: @ 808AB94
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r2, [r0, 0x1]
movs r1, 0x3
@ -386,7 +386,7 @@ DoForcedMovementInCurrentDirection: @ 808AC58
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
ldrb r2, [r0, 0x1]
movs r3, 0x4
@ -528,7 +528,7 @@ ForcedMovement_Slide: @ 808AD60
lsls r2, r3, 3
adds r2, r3
lsls r2, 2
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
adds r2, r3
ldrb r3, [r2, 0x1]
movs r4, 0x4
@ -623,7 +623,7 @@ ForcedMovement_MuddySlope: @ 808AE10
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x18]
movs r0, 0xF0
@ -809,7 +809,7 @@ _0808AF68:
lsls r0, 24
cmp r0, 0
beq _0808AFB0
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -848,7 +848,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@ -899,7 +899,7 @@ sub_808B028: @ 808B028
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@ -1187,7 +1187,7 @@ sub_808B238: @ 808B238
lsrs r6, r0, 24
cmp r6, 0x10
beq _0808B2D8
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
lsls r1, r6, 3
adds r1, r6
lsls r1, 2
@ -1290,7 +1290,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324
lsls r1, r2, 3
adds r1, r2
lsls r1, 2
ldr r5, =gUnknown_02037350
ldr r5, =gMapObjects
adds r3, r1, r5
ldrh r2, [r3, 0x10]
mov r1, sp
@ -1401,7 +1401,7 @@ _0808B3F4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldr r1, [r2]
bl _call_via_r1
@ -1621,7 +1621,7 @@ _0808B5B6:
thumb_func_start player_is_anim_in_certain_ranges
player_is_anim_in_certain_ranges: @ 808B5BC
push {lr}
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -1696,7 +1696,7 @@ PlayerIsAnimActive: @ 808B63C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
@ -1715,7 +1715,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@ -1727,7 +1727,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
thumb_func_start player_set_x22
player_set_x22: @ 808B684
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
ldr r1, =gUnknown_02037590
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@ -1742,7 +1742,7 @@ player_set_x22: @ 808B684
thumb_func_start player_get_x22
player_get_x22: @ 808B6A0
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -1766,7 +1766,7 @@ sub_808B6BC: @ 808B6BC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r0, r2
bl FieldObjectForceSetSpecialAnim
pop {r0}
@ -1793,7 +1793,7 @@ player_npc_set_state_and_x22_etc: @ 808B6E4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
adds r1, r5, 0
bl FieldObjectSetSpecialAnim
@ -2013,7 +2013,7 @@ _0808B872:
lsls r0, 24
cmp r0, 0
beq _0808B89A
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2219,7 +2219,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -2275,7 +2275,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
ldr r2, =gUnknown_02037590
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@ -2307,7 +2307,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
@ void PlayerGetDestCoords(u16 *x, u16 *y)
PlayerGetDestCoords: @ 808BAAC
push {r4,r5,lr}
ldr r5, =gUnknown_02037350
ldr r5, =gMapObjects
ldr r4, =gUnknown_02037590
ldrb r3, [r4, 0x5]
lsls r2, r3, 3
@ -2339,7 +2339,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r3, r0, r1
ldrb r1, [r3]
movs r0, 0xC0
@ -2465,7 +2465,7 @@ _0808BC30:
thumb_func_start player_get_direction_lower_nybble
@ u8 player_get_direction_lower_nybble()
player_get_direction_lower_nybble: @ 808BC38
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -2482,7 +2482,7 @@ player_get_direction_lower_nybble: @ 808BC38
thumb_func_start player_get_direction_upper_nybble
@ u8 player_get_direction_upper_nybble()
player_get_direction_upper_nybble: @ 808BC58
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -2498,7 +2498,7 @@ player_get_direction_upper_nybble: @ 808BC58
thumb_func_start PlayerGetZCoord
@ u8 PlayerGetZCoord()
PlayerGetZCoord: @ 808BC74
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -2521,7 +2521,7 @@ sub_808BC90: @ 808BC90
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
lsls r3, 16
asrs r3, 16
@ -2578,7 +2578,7 @@ sub_808BCF4: @ 808BCF4
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
adds r0, r4, 0
bl npc_clear_strange_bits
@ -2809,7 +2809,7 @@ IsPlayerFacingSurfableFishableWater: @ 808BE74
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrh r1, [r4, 0x10]
mov r0, sp
@ -3060,7 +3060,7 @@ InitPlayerAvatar: @ 808BFE0
lsls r4, r5, 3
adds r4, r5
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x2]
movs r1, 0x1
@ -3097,7 +3097,7 @@ sub_808C0A8: @ 808C0A8
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r6, =gUnknown_02037350
ldr r6, =gMapObjects
ldr r5, =gUnknown_02037590
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
@ -3152,7 +3152,7 @@ sub_808C114: @ 808C114
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
movs r0, 0x5
bl GetPlayerAvatarGraphicsIdByStateId
@ -3186,7 +3186,7 @@ sub_808C15C: @ 808C15C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
movs r0, 0x6
bl GetPlayerAvatarGraphicsIdByStateId
@ -3227,7 +3227,7 @@ sub_808C1B4: @ 808C1B4
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
movs r0, 0x2
bl GetPlayerAvatarGraphicsIdByStateId
@ -3276,7 +3276,7 @@ sub_808C228: @ 808C228
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
movs r0, 0x7
bl GetPlayerAvatarGraphicsIdByStateId
@ -3414,7 +3414,7 @@ taskFF_bump_boulder: @ 808C34C
lsrs r0, 24
ldr r6, =gUnknown_08497530
ldr r2, =gTasks
ldr r5, =gUnknown_02037350
ldr r5, =gMapObjects
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@ -3625,7 +3625,7 @@ _0808C50A:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@ -3726,7 +3726,7 @@ _0808C5E2:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@ -3936,7 +3936,7 @@ taskFF_0805D1D4: @ 808C7A8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -3983,7 +3983,7 @@ sub_808C814: @ 808C814
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@ -4127,7 +4127,7 @@ fish1: @ 808C918
ldrh r1, [r6]
adds r1, r0
strh r1, [r5, 0x22]
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
ldr r2, =gUnknown_02037590
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@ -4579,7 +4579,7 @@ _0808CCBC:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
mov r8, r0
add r4, r8
ldrh r1, [r5, 0x24]
@ -4792,7 +4792,7 @@ fishE: @ 808CE8C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
mov r8, r0
add r4, r8
ldrh r1, [r6, 0x24]
@ -4984,7 +4984,7 @@ _0808D03A:
ands r0, r1
cmp r0, 0
beq _0808D05E
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -5037,7 +5037,7 @@ sub_808D094: @ 808D094
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@ -5217,7 +5217,7 @@ sub_808D1FC: @ 808D1FC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4

6
asm/fldeff_80F9BCC.s
View File

@ -1722,7 +1722,7 @@ _080FA9CA:
sub_80FA9D0: @ 80FA9D0
push {r4,lr}
sub sp, 0x4
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
ldr r2, =gUnknown_02037590
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@ -2312,7 +2312,7 @@ sub_80FAEF0: @ 80FAEF0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -2362,7 +2362,7 @@ sub_80FAF64: @ 80FAF64
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished

6
asm/fldeff_emotion.s
View File

@ -167,7 +167,7 @@ _080B4756:
bl FieldEffectStop
b _080B47B2
_080B4764:
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@ -274,7 +274,7 @@ sub_80B4808: @ 80B4808
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x18]
lsls r0, 28
@ -301,7 +301,7 @@ _080B4870:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x18]
lsls r0, 28

8
asm/item_use.s
View File

@ -1306,7 +1306,7 @@ sub_80FDA24: @ 80FDA24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0xFF
@ -1356,7 +1356,7 @@ sub_80FDA94: @ 80FDA94
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@ -1395,7 +1395,7 @@ sub_80FDADC: @ 80FDADC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@ -1759,7 +1759,7 @@ sub_80FDE2C: @ 80FDE2C
lsrs r2, r0, 24
cmp r2, 0x10
beq _080FDE68
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
lsls r1, r2, 3
adds r1, r2
lsls r1, 2

4
asm/link.s
View File

@ -31367,7 +31367,7 @@ sub_8019AD8: @ 8019AD8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -31413,7 +31413,7 @@ sub_8019B3C: @ 8019B3C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished

4
asm/load_save.s
View File

@ -332,7 +332,7 @@ save_serialize_npcs: @ 8076E1C
movs r5, 0xA3
lsls r5, 4
mov r8, r5
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
movs r3, 0
movs r2, 0xF
_08076E32:
@ -370,7 +370,7 @@ save_deserialize_npcs: @ 8076E64
movs r5, 0xA3
lsls r5, 4
mov r8, r5
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
movs r3, 0
movs r2, 0xF
_08076E7A:

8
asm/map_obj_8097404.s
View File

@ -87,7 +87,7 @@ _0809748E:
player_bitmagic: @ 8097494
push {r4,r5,lr}
movs r4, 0
ldr r5, =gUnknown_02037350
ldr r5, =gMapObjects
_0809749A:
lsls r0, r4, 3
adds r0, r4
@ -121,7 +121,7 @@ sub_80974D0: @ 80974D0
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r6, =gUnknown_02037350
ldr r6, =gMapObjects
_080974DA:
cmp r4, r5
beq _080974FC
@ -209,7 +209,7 @@ _0809756C:
sub_809757C: @ 809757C
push {r4,r5,lr}
movs r4, 0
ldr r5, =gUnknown_02037350
ldr r5, =gMapObjects
_08097582:
lsls r0, r4, 3
adds r0, r4
@ -1757,7 +1757,7 @@ sub_8098074: @ 8098074
lsls r1, 24
lsrs r5, r1, 24
movs r4, 0
ldr r7, =gUnknown_02037350
ldr r7, =gMapObjects
_08098082:
cmp r4, r6
beq _080980A8

18
asm/map_obj_lock.s
View File

@ -97,7 +97,7 @@ _0809842A:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _08098452
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
@ -160,7 +160,7 @@ sub_80984A0: @ 80984A0
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldrb r1, [r4]
lsls r0, r1, 3
adds r0, r1
@ -199,7 +199,7 @@ sub_80984F4: @ 80984F4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C
@ -212,7 +212,7 @@ sub_80984F4: @ 80984F4
thumb_func_start sub_8098524
sub_8098524: @ 8098524
push {r4,lr}
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
@ -254,7 +254,7 @@ sub_8098574: @ 8098574
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldr r1, =gScriptFacing
ldrb r1, [r1]
@ -272,7 +272,7 @@ sub_809859C: @ 809859C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimActive
pop {r0}
@ -307,7 +307,7 @@ _080985E8:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0809860C
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
lsls r1, r7, 3
adds r1, r7
lsls r1, 2
@ -374,7 +374,7 @@ sub_8098630: @ 8098630
mov r1, r9
adds r6, r0, r1
strh r4, [r6, 0xC]
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
mov r8, r2
lsls r0, r4, 3
adds r0, r4
@ -429,7 +429,7 @@ _080986E0:
lsls r0, 3
adds r5, r0, r1
strh r4, [r5, 0xC]
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r0, r4, 3
adds r0, r4
lsls r0, 2

2
asm/porthole.s
View File

@ -231,7 +231,7 @@ _080FB75E:
sub_80FB768: @ 80FB768
push {lr}
bl sub_80FB6EC
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3

28
asm/rom4.s
View File

@ -4395,7 +4395,7 @@ sub_8086A68: @ 8086A68
thumb_func_start sub_8086A80
sub_8086A80: @ 8086A80
push {lr}
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r3, =gUnknown_02037590
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@ -6030,7 +6030,7 @@ sub_80876F0: @ 80876F0
lsls r5, r6, 3
adds r5, r6
lsls r5, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r5, r0
adds r0, r4, 0
bl sub_80876C4
@ -6128,7 +6128,7 @@ sub_80877DC: @ 80877DC
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r1, r0
strb r2, [r1, 0x19]
_080877FE:
@ -6148,7 +6148,7 @@ sub_808780C: @ 808780C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
cmp r0, 0x40
@ -6183,7 +6183,7 @@ sub_8087858: @ 8087858
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x4]
bx lr
@ -6200,7 +6200,7 @@ sub_8087878: @ 8087878
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
adds r0, r3
ldrh r3, [r0, 0x10]
strh r3, [r1]
@ -6220,7 +6220,7 @@ sub_80878A0: @ 80878A0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x19]
bx lr
@ -6237,7 +6237,7 @@ sub_80878C0: @ 80878C0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0xB]
lsls r0, 28
@ -6256,7 +6256,7 @@ sub_80878E4: @ 80878E4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
adds r0, 0x21
movs r1, 0
@ -6292,7 +6292,7 @@ _0808792E:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r1, r0, r1
movs r6, 0x10
ldrsh r0, [r1, r6]
@ -6332,7 +6332,7 @@ sub_808796C: @ 808796C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r6, r0, r1
ldrb r0, [r5]
cmp r0, 0
@ -6584,7 +6584,7 @@ npc_080587EC: @ 8087B40
mov r12, r2
lsls r3, 16
movs r4, 0
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
mov r9, r0
lsrs r2, r3, 16
mov r10, r2
@ -6660,7 +6660,7 @@ sub_8087BCC: @ 8087BCC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
ldrb r0, [r2]
cmp r0, 0
@ -6748,7 +6748,7 @@ sub_8087C8C: @ 8087C8C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r6, r0, r1
ldrh r0, [r6, 0xC]
strh r0, [r5, 0x20]

12
asm/rom6.s
View File

@ -23,7 +23,7 @@ npc_before_player_of_type: @ 8135424
bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@ -75,7 +75,7 @@ task08_080C9820: @ 813549C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -132,7 +132,7 @@ sub_813552C: @ 813552C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@ -196,7 +196,7 @@ _081355B8:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
bl GetPlayerAvatarGraphicsIdByCurrentState
adds r1, r0, 0
@ -5673,7 +5673,7 @@ _08138454:
lsrs r2, r0, 24
cmp r2, 0x10
beq _081384E6
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
@ -7257,7 +7257,7 @@ SpawnScriptFieldObject: @ 8139158
bl SpawnSpecialFieldObjectParametrized
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2

10
asm/rom_80AEFFC.s
View File

@ -599,7 +599,7 @@ _080AF4A4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
movs r1, 0x8
bl FieldObjectSetSpecialAnim
@ -630,7 +630,7 @@ _080AF4DC:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0x3
@ -719,7 +719,7 @@ _080AF5A2:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@ -1370,7 +1370,7 @@ _080AFB26:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimActive
movs r0, 0xFF
@ -1414,7 +1414,7 @@ _080AFB6C:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0

4
asm/rom_80C6FA0.s
View File

@ -23955,7 +23955,7 @@ _080D3630:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl npc_sync_anim_pause_bits
_080D3646:
@ -24023,7 +24023,7 @@ sub_80D36A4: @ 80D36A4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimActive

18
asm/rom_818CFC8.s
View File

@ -17486,7 +17486,7 @@ sub_81963F0: @ 81963F0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C
@ -53023,7 +53023,7 @@ _081A896E:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C
@ -53321,7 +53321,7 @@ _081A8BB4:
bne _081A8BDC
b _081A8D32
_081A8BDC:
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
lsls r1, r2, 3
adds r1, r2
lsls r1, 2
@ -54324,7 +54324,7 @@ sub_81A9424: @ 81A9424
lsls r1, 4
adds r1, r0
mov r8, r1
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
@ -54372,7 +54372,7 @@ _081A9488:
mov r9, r0
_081A94AE:
ldr r3, =gUnknown_08613ED8
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
@ -54984,7 +54984,7 @@ sub_81A9998: @ 81A9998
mov r8, r0
ldr r1, =0x0000028e
mov r12, r1
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
mov r9, r0
_081A99CC:
movs r2, 0
@ -55125,7 +55125,7 @@ GetBattlePyramidTrainerFlag: @ 81A9AC4
ldr r1, =0x00000e2a
adds r2, r1
ldr r4, =gBitTable
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@ -55179,7 +55179,7 @@ sub_81A9B44: @ 81A9B44
lsls r0, 16
lsrs r5, r0, 16
movs r3, 0
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
mov r12, r0
ldr r6, =gUnknown_03005DF0
ldr r1, =gSaveBlock1Ptr
@ -86877,4 +86877,4 @@ GetGlyphWidthFont6: @ 81BA6CC
thumb_func_end GetGlyphWidthFont6
.align 2, 0 @ Don't pad with nop.
.align 2, 0 @ Don't pad with nop.

30
asm/rom_81BE66C.s
View File

@ -225,7 +225,7 @@ sub_81BE808: @ 81BE808
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
adds r2, r4
ldr r3, =gSprites
ldrb r1, [r2, 0x4]
@ -42692,7 +42692,7 @@ sub_81D427C: @ 81D427C
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
adds r5, r1, r2
ldr r4, =gUnknown_030012F8
ldr r3, =gUnknown_02037590
@ -42730,7 +42730,7 @@ _081D42CA:
mov r8, r0
cmp r0, 0x3
bls _081D42CA
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -42786,7 +42786,7 @@ _081D4356:
_081D4360:
movs r4, 0
mov r8, r4
ldr r6, =gUnknown_02037350
ldr r6, =gMapObjects
mov r10, r6
_081D4368:
ldr r3, =gUnknown_02037590
@ -42804,7 +42804,7 @@ _081D4368:
ldrsh r2, [r4, r6]
movs r6, 0
ldrsh r0, [r0, r6]
ldr r6, =gUnknown_02037350
ldr r6, =gMapObjects
mov r9, r6
mov r12, r3
adds r7, r1, 0
@ -42952,7 +42952,7 @@ _081D449E:
ldrsh r1, [r4, r3]
movs r3, 0
ldrsh r0, [r0, r3]
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
mov r9, r3
mov r12, r2
cmp r1, r0
@ -43210,7 +43210,7 @@ _081D46D0:
ldrsh r0, [r0, r3]
cmp r0, 0
bne _081D476E
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -43235,7 +43235,7 @@ _081D46D0:
beq _081D470C
b _081D447C
_081D470C:
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -43289,7 +43289,7 @@ _081D476E:
ldrsh r0, [r0, r2]
cmp r0, 0
bne _081D480C
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -43314,7 +43314,7 @@ _081D476E:
beq _081D47AA
b _081D45AA
_081D47AA:
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@ -43385,7 +43385,7 @@ sub_81D4834: @ 81D4834
lsls r0, 16
lsls r1, 16
lsrs r4, r1, 16
ldr r3, =gUnknown_02037350
ldr r3, =gMapObjects
ldr r1, =gUnknown_02037590
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@ -43436,7 +43436,7 @@ sub_81D4890: @ 81D4890
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r1, r0
movs r1, 0
ldr r3, =gUnknown_030012FC
@ -43684,7 +43684,7 @@ sub_81D4A90: @ 81D4A90
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r5, r1, r0
ldrb r1, [r5, 0x1]
movs r0, 0x21
@ -46426,7 +46426,7 @@ GetTrainerHillTrainerFlag: @ 81D619C
bl sub_81D5520
lsls r0, 24
lsrs r0, 23
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
lsls r1, r4, 3
adds r1, r4
lsls r1, 2
@ -56756,4 +56756,4 @@ _081DB66C:
.align 2, 0 @ Don't pad with nop.

10
asm/scrcmd.s
View File

@ -2987,7 +2987,7 @@ sA9_unknown: @ 809A974
thumb_func_start s5A_face_player
s5A_face_player: @ 809A9A4
push {r4,lr}
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
@ -3163,7 +3163,7 @@ sub_809AAEC: @ 809AAEC
movs r0, 0
b _0809AB3A
_0809AAFC:
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
@ -3208,7 +3208,7 @@ s6B_release: @ 809AB44
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C
@ -3223,7 +3223,7 @@ s6B_release: @ 809AB44
s6C_release_2: @ 809AB7C
push {r4,lr}
bl textbox_close
ldr r4, =gUnknown_02037350
ldr r4, =gMapObjects
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
@ -5397,7 +5397,7 @@ sub_809BBFC: @ 809BBFC
movs r0, 0
b _0809BC30
_0809BC0C:
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3

2
asm/script_pokemon_util_80F87D8.s
View File

@ -508,7 +508,7 @@ _080F8BBA:
bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02037350
ldr r2, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2

2
asm/secret_base.s
View File

@ -756,7 +756,7 @@ sub_80E90C8: @ 80E90C8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
movs r1, 0x2
bl FieldObjectTurn

4
asm/shop.s
View File

@ -1633,7 +1633,7 @@ _080E07AA:
lsrs r0, 24
mov r1, r12
strh r0, [r1]
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
lsls r0, r6, 3
adds r0, r6
lsls r0, 2
@ -1730,7 +1730,7 @@ BuyMenuDrawFieldObjects: @ 80E08F0
movs r7, 0
ldr r0, =gUnknown_02039F70
mov r8, r0
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
mov r10, r1
ldr r2, =gSprites
mov r9, r2

14
asm/trainer_see.s
View File

@ -15,7 +15,7 @@ CheckForTrainersWantingBattle: @ 80B3BE8
ldr r0, =gUnknown_02038BFC
strb r1, [r0]
movs r4, 0
ldr r6, =gUnknown_02037350
ldr r6, =gMapObjects
_080B3BF8:
lsls r0, r4, 3
adds r0, r4
@ -180,7 +180,7 @@ _080B3D56:
lsls r4, r5, 3
adds r0, r4, r5
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
bl CheckIfTrainerCanApproachPlayer
lsls r0, 24
@ -227,7 +227,7 @@ _080B3D8A:
mov r1, r8
adds r0, r1, r5
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r0, r1
subs r1, r6, 0x1
lsls r1, 24
@ -691,7 +691,7 @@ c3_8081EDC: @ 80B4118
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r5, r0, r1
ldrb r0, [r5]
lsls r0, 31
@ -887,7 +887,7 @@ _080B427A:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@ -906,7 +906,7 @@ _080B42D2:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02037350
ldr r0, =gMapObjects
adds r4, r0
ldrb r0, [r5, 0x18]
lsls r0, 28
@ -941,7 +941,7 @@ sub_80B4318: @ 80B4318
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02037350
ldr r1, =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive

2
include/field_map_obj.h
View File

@ -5,8 +5,6 @@
// Exported RAM declarations
extern struct MapObject gUnknown_02037350[16];
// Exported ROM declarations
void sub_808D438(void);

4
include/global.fieldmap.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_GLOBAL_FIELDMAP_H
#define GUARD_GLOBAL_FIELDMAP_H
#define NUM_FIELD_OBJECTS 16
enum
{
CONNECTION_SOUTH = 1,
@ -381,7 +383,7 @@ struct Camera
s32 y;
};
extern struct MapObject gMapObjects[];
extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS];
extern u8 gSelectedMapObject;
extern struct MapHeader gMapHeader;
extern struct PlayerAvatar gPlayerAvatar;

29
src/field_map_obj.c
View File

@ -33,9 +33,9 @@ static void npcs_clear_ids_and_state(void)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gUnknown_02037350); i ++)
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
{
npc_clear_ids_and_state(&gUnknown_02037350[i]);
npc_clear_ids_and_state(&gMapObjects[i]);
}
}
@ -68,9 +68,9 @@ u8 sub_808D4F4(void)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gUnknown_02037350); i ++)
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
{
if (!gUnknown_02037350[i].active)
if (!gMapObjects[i].active)
{
break;
}
@ -90,7 +90,7 @@ u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId)
{
*fieldObjectId = GetFieldObjectIdByLocalIdAndMap(localId, mapId, mapGroupId);
if (*fieldObjectId == ARRAY_COUNT(gUnknown_02037350))
if (*fieldObjectId == ARRAY_COUNT(gMapObjects))
{
return TRUE;
}
@ -100,12 +100,27 @@ bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8
u8 GetFieldObjectIdByXY(s16 x, s16 y)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gUnknown_02037350); i ++)
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
{
if (gUnknown_02037350[i].active && gUnknown_02037350[i].coords2.x == x && gUnknown_02037350[i].coords2.y == y)
if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y)
{
break;
}
}
return i;
}
u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
{
if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapId && gMapObjects[i].mapGroup == mapGroupId)
{
return i;
}
}
return ARRAY_COUNT(gMapObjects);
}

2
sym_ewram.txt
View File

@ -761,7 +761,7 @@ gUnknown_02037348: @ 2037348
gUnknown_0203734C: @ 203734C
.space 0x4
gUnknown_02037350: @ 2037350
gMapObjects: @ 2037350
.space 0x240
gUnknown_02037590: @ 2037590