dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decompile/port event_object_movement

Browse Source
This commit is contained in:
ultima-soul
2020-03-12 12:46:40 -07:00
parent 65690ca7dc
commit 339c2914af
46 changed files with 8790 additions and 23331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bike.s
+3 -3
View File
@@ -79,7 +79,7 @@ sub_80BD100: @ 80BD100
lsls r4, 2
ldr r0, _080BD160 @ =gObjectEvents
adds r4, r0
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0
@@ -195,7 +195,7 @@ sub_80BD1E8: @ 80BD1E8
lsls r2, 16
lsrs r2, 16
mov r8, r2
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
@@ -881,7 +881,7 @@ Bike_HandleBumpySlopeJump: @ 80BD6C4
beq _080BD70C
movs r0, 0x2
strb r0, [r5, 0x8]
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
lsls r0, 24
lsrs r0, 24
bl nullsub_24
asm/event_object_80688E4.s
+30 -30
View File
@@ -241,7 +241,7 @@ _08068A88: .4byte gObjectEvents
thumb_func_start little_step
little_step: @ 8068A8C
lsls r1, 24
ldr r2, _08068AA8 @ =gUnknown_83A64C8
ldr r2, _08068AA8 @ =sDirectionToVectors
lsrs r1, 22
adds r1, r2
ldrh r2, [r1]
@@ -254,13 +254,13 @@ little_step: @ 8068A8C
strh r1, [r0, 0x22]
bx lr
.align 2, 0
_08068AA8: .4byte gUnknown_83A64C8
_08068AA8: .4byte sDirectionToVectors
thumb_func_end little_step
thumb_func_start double_little_steps
double_little_steps: @ 8068AAC
lsls r1, 24
ldr r2, _08068ACC @ =gUnknown_83A64C8
ldr r2, _08068ACC @ =sDirectionToVectors
lsrs r1, 22
adds r1, r2
ldrh r2, [r1]
@@ -275,13 +275,13 @@ double_little_steps: @ 8068AAC
strh r1, [r0, 0x22]
bx lr
.align 2, 0
_08068ACC: .4byte gUnknown_83A64C8
_08068ACC: .4byte sDirectionToVectors
thumb_func_end double_little_steps
thumb_func_start triple_little_steps
triple_little_steps: @ 8068AD0
lsls r1, 24
ldr r2, _08068AF4 @ =gUnknown_83A64C8
ldr r2, _08068AF4 @ =sDirectionToVectors
lsrs r1, 22
adds r1, r2
ldrh r2, [r1]
@@ -298,13 +298,13 @@ triple_little_steps: @ 8068AD0
strh r1, [r0, 0x22]
bx lr
.align 2, 0
_08068AF4: .4byte gUnknown_83A64C8
_08068AF4: .4byte sDirectionToVectors
thumb_func_end triple_little_steps
thumb_func_start quad_little_steps
quad_little_steps: @ 8068AF8
lsls r1, 24
ldr r2, _08068B18 @ =gUnknown_83A64C8
ldr r2, _08068B18 @ =sDirectionToVectors
lsrs r1, 22
adds r1, r2
ldrh r2, [r1]
@@ -319,13 +319,13 @@ quad_little_steps: @ 8068AF8
strh r1, [r0, 0x22]
bx lr
.align 2, 0
_08068B18: .4byte gUnknown_83A64C8
_08068B18: .4byte sDirectionToVectors
thumb_func_end quad_little_steps
thumb_func_start oct_little_steps
oct_little_steps: @ 8068B1C
lsls r1, 24
ldr r2, _08068B3C @ =gUnknown_83A64C8
ldr r2, _08068B3C @ =sDirectionToVectors
lsrs r1, 22
adds r1, r2
ldrh r2, [r1]
@@ -340,7 +340,7 @@ oct_little_steps: @ 8068B1C
strh r1, [r0, 0x22]
bx lr
.align 2, 0
_08068B3C: .4byte gUnknown_83A64C8
_08068B3C: .4byte sDirectionToVectors
thumb_func_end oct_little_steps
thumb_func_start oamt_npc_ministep_reset
@@ -788,14 +788,14 @@ _08068E50: .4byte gUnknown_83A7202
_08068E54: .4byte gUnknown_83A7208
thumb_func_end sub_8068DC4
thumb_func_start SetObjectEventStepTimer
SetObjectEventStepTimer: @ 8068E58
thumb_func_start SetMovementDelay
SetMovementDelay: @ 8068E58
strh r1, [r0, 0x34]
bx lr
thumb_func_end SetObjectEventStepTimer
thumb_func_end SetMovementDelay
thumb_func_start RunObjectEventStepTimer
RunObjectEventStepTimer: @ 8068E5C
thumb_func_start WaitForMovementDelay
WaitForMovementDelay: @ 8068E5C
push {lr}
ldrh r1, [r0, 0x34]
subs r1, 0x1
@@ -810,10 +810,10 @@ _08068E6E:
_08068E70:
pop {r1}
bx r1
thumb_func_end RunObjectEventStepTimer
thumb_func_end WaitForMovementDelay
thumb_func_start obj_anim_image_set_and_seek
obj_anim_image_set_and_seek: @ 8068E74
thumb_func_start SetAndStartSpriteAnim
SetAndStartSpriteAnim: @ 8068E74
push {r4,lr}
lsls r2, 24
lsrs r2, 24
@@ -832,10 +832,10 @@ obj_anim_image_set_and_seek: @ 8068E74
pop {r4}
pop {r0}
bx r0
thumb_func_end obj_anim_image_set_and_seek
thumb_func_end SetAndStartSpriteAnim
thumb_func_start sub_8068E9C
sub_8068E9C: @ 8068E9C
thumb_func_start SpriteAnimEnded
SpriteAnimEnded: @ 8068E9C
push {lr}
adds r0, 0x3F
ldrb r1, [r0]
@@ -850,7 +850,7 @@ _08068EAE:
_08068EB0:
pop {r1}
bx r1
thumb_func_end sub_8068E9C
thumb_func_end SpriteAnimEnded
thumb_func_start sub_8068EB4
sub_8068EB4: @ 8068EB4
@@ -983,8 +983,8 @@ _08068FA2:
bx r0
thumb_func_end sub_8068EB4
thumb_func_start sub_8068FA8
sub_8068FA8: @ 8068FA8
thumb_func_start UpdateObjectEventSpriteSubpriorityAndVisibility
UpdateObjectEventSpriteSubpriorityAndVisibility: @ 8068FA8
push {r4,lr}
adds r4, r0, 0
bl sub_8069248
@@ -1002,7 +1002,7 @@ sub_8068FA8: @ 8068FA8
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8068FA8
thumb_func_end UpdateObjectEventSpriteSubpriorityAndVisibility
thumb_func_start sub_8068FD0
sub_8068FD0: @ 8068FD0
@@ -1020,7 +1020,7 @@ _08068FD6:
cmp r0, 0
beq _08068FF6
ldr r1, [r2, 0x1C]
ldr r0, _08069008 @ =sub_8068FA8
ldr r0, _08069008 @ =UpdateObjectEventSpriteSubpriorityAndVisibility
cmp r1, r0
bne _08068FF6
adds r0, r2, 0
@@ -1035,7 +1035,7 @@ _08068FF6:
bx r0
.align 2, 0
_08069004: .4byte gSprites
_08069008: .4byte sub_8068FA8
_08069008: .4byte UpdateObjectEventSpriteSubpriorityAndVisibility
thumb_func_end sub_8068FD0
thumb_func_start sub_806900C
@@ -1056,7 +1056,7 @@ _08069018:
cmp r0, 0
beq _08069048
ldr r1, [r2, 0x1C]
ldr r0, _08069044 @ =sub_8068FA8
ldr r0, _08069044 @ =UpdateObjectEventSpriteSubpriorityAndVisibility
cmp r1, r0
bne _08069048
ldrh r0, [r2, 0x2E]
@@ -1068,7 +1068,7 @@ _08069018:
b _08069052
.align 2, 0
_08069040: .4byte gSprites
_08069044: .4byte sub_8068FA8
_08069044: .4byte UpdateObjectEventSpriteSubpriorityAndVisibility
_08069048:
adds r4, 0x44
adds r3, 0x1
@@ -1099,7 +1099,7 @@ sub_8069058: @ 8069058
ldr r0, _08069090 @ =gSprites
adds r4, r0
adds r0, r5, 0
bl ObjectEventDirectionToImageAnimId
bl GetFaceDirectionAnimNum
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/event_object_movement.s
-22055
View File
File diff suppressed because it is too large Load Diff
asm/field_camera.s
+23 -23
View File
@@ -797,7 +797,7 @@ _0805AB54: .4byte gSprites
thumb_func_start ResetCameraUpdateInfo
ResetCameraUpdateInfo: @ 805AB58
ldr r1, _0805AB6C @ =gUnknown_3005050
ldr r1, _0805AB6C @ =gFieldCamera
movs r0, 0
str r0, [r1, 0x8]
str r0, [r1, 0xC]
@@ -807,7 +807,7 @@ ResetCameraUpdateInfo: @ 805AB58
str r0, [r1]
bx lr
.align 2, 0
_0805AB6C: .4byte gUnknown_3005050
_0805AB6C: .4byte gFieldCamera
thumb_func_end ResetCameraUpdateInfo
thumb_func_start InitCameraUpdateCallback
@@ -815,7 +815,7 @@ InitCameraUpdateCallback: @ 805AB70
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _0805ABA4 @ =gUnknown_3005050
ldr r4, _0805ABA4 @ =gFieldCamera
ldr r1, [r4, 0x4]
cmp r1, 0
beq _0805AB8C
@@ -838,7 +838,7 @@ _0805AB8C:
pop {r1}
bx r1
.align 2, 0
_0805ABA4: .4byte gUnknown_3005050
_0805ABA4: .4byte gFieldCamera
_0805ABA8: .4byte gSprites
_0805ABAC: .4byte CameraUpdateCallback
thumb_func_end InitCameraUpdateCallback
@@ -848,7 +848,7 @@ CameraUpdate: @ 805ABB0
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r6, _0805ACA4 @ =gUnknown_3005050
ldr r6, _0805ACA4 @ =gFieldCamera
ldr r1, [r6]
cmp r1, 0
beq _0805ABC4
@@ -903,7 +903,7 @@ _0805AC08:
ble _0805AC1C
movs r4, 0x1
_0805AC1C:
ldr r2, _0805ACA4 @ =gUnknown_3005050
ldr r2, _0805ACA4 @ =gFieldCamera
ldr r0, [r2, 0x10]
adds r1, r0, r7
str r1, [r2, 0x10]
@@ -956,11 +956,11 @@ _0805AC7E:
adds r1, r7, 0
mov r2, r8
bl coords8_add
ldr r1, _0805ACAC @ =gUnknown_300506C
ldr r1, _0805ACAC @ =gTotalCameraPixelOffsetX
ldrh r0, [r1]
subs r0, r7
strh r0, [r1]
ldr r1, _0805ACB0 @ =gUnknown_3005068
ldr r1, _0805ACB0 @ =gTotalCameraPixelOffsetY
ldrh r0, [r1]
mov r2, r8
subs r0, r2
@@ -971,10 +971,10 @@ _0805AC7E:
pop {r0}
bx r0
.align 2, 0
_0805ACA4: .4byte gUnknown_3005050
_0805ACA4: .4byte gFieldCamera
_0805ACA8: .4byte gUnknown_3000E90
_0805ACAC: .4byte gUnknown_300506C
_0805ACB0: .4byte gUnknown_3005068
_0805ACAC: .4byte gTotalCameraPixelOffsetX
_0805ACB0: .4byte gTotalCameraPixelOffsetY
thumb_func_end CameraUpdate
thumb_func_start sub_805ACB4
@@ -989,12 +989,12 @@ sub_805ACB4: @ 805ACB4
asrs r1, 16
bl UpdateObjectEventsForCameraUpdate
bl DrawWholeMapView
ldr r1, _0805ACE8 @ =gUnknown_300506C
ldr r1, _0805ACE8 @ =gTotalCameraPixelOffsetX
lsls r4, 4
ldrh r0, [r1]
subs r0, r4
strh r0, [r1]
ldr r1, _0805ACEC @ =gUnknown_3005068
ldr r1, _0805ACEC @ =gTotalCameraPixelOffsetY
lsls r5, 4
ldrh r0, [r1]
subs r0, r5
@@ -1003,8 +1003,8 @@ sub_805ACB4: @ 805ACB4
pop {r0}
bx r0
.align 2, 0
_0805ACE8: .4byte gUnknown_300506C
_0805ACEC: .4byte gUnknown_3005068
_0805ACE8: .4byte gTotalCameraPixelOffsetX
_0805ACEC: .4byte gTotalCameraPixelOffsetY
thumb_func_end sub_805ACB4
thumb_func_start sub_805ACF0
@@ -1012,7 +1012,7 @@ sub_805ACF0: @ 805ACF0
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r4, _0805ADCC @ =gUnknown_3005050
ldr r4, _0805ADCC @ =gFieldCamera
ldr r1, [r4]
cmp r1, 0
beq _0805AD04
@@ -1067,7 +1067,7 @@ _0805AD48:
ble _0805AD5C
movs r5, 0x1
_0805AD5C:
ldr r2, _0805ADCC @ =gUnknown_3005050
ldr r2, _0805ADCC @ =gFieldCamera
ldr r0, [r2, 0x10]
adds r1, r0, r7
str r1, [r2, 0x10]
@@ -1123,7 +1123,7 @@ _0805ADB6:
pop {r0}
bx r0
.align 2, 0
_0805ADCC: .4byte gUnknown_3005050
_0805ADCC: .4byte gFieldCamera
_0805ADD0: .4byte gUnknown_3000E90
thumb_func_end sub_805ACF0
@@ -1184,14 +1184,14 @@ UpdateCameraPanning: @ 805AE28
bl _call_via_r0
_0805AE36:
ldr r2, _0805AE5C @ =gSpriteCoordOffsetX
ldr r0, _0805AE60 @ =gUnknown_300506C
ldr r0, _0805AE60 @ =gTotalCameraPixelOffsetX
ldr r1, _0805AE64 @ =gUnknown_3000E98
ldrh r0, [r0]
ldrh r1, [r1]
subs r0, r1
strh r0, [r2]
ldr r2, _0805AE68 @ =gSpriteCoordOffsetY
ldr r0, _0805AE6C @ =gUnknown_3005068
ldr r0, _0805AE6C @ =gTotalCameraPixelOffsetY
ldr r1, _0805AE70 @ =gUnknown_3000E9A
ldrh r0, [r0]
ldrh r1, [r1]
@@ -1203,10 +1203,10 @@ _0805AE36:
.align 2, 0
_0805AE58: .4byte gUnknown_3000EA0
_0805AE5C: .4byte gSpriteCoordOffsetX
_0805AE60: .4byte gUnknown_300506C
_0805AE60: .4byte gTotalCameraPixelOffsetX
_0805AE64: .4byte gUnknown_3000E98
_0805AE68: .4byte gSpriteCoordOffsetY
_0805AE6C: .4byte gUnknown_3005068
_0805AE6C: .4byte gTotalCameraPixelOffsetY
_0805AE70: .4byte gUnknown_3000E9A
thumb_func_end UpdateCameraPanning
@@ -1242,7 +1242,7 @@ _0805AEA8:
movs r0, 0
strb r0, [r1]
_0805AEAE:
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
asm/field_control_avatar.s
+4 -4
View File
@@ -923,7 +923,7 @@ _0806CFA4: .4byte gDirectionToVectors
_0806CFA8: .4byte gObjectEvents
_0806CFAC:
movs r4, 0
ldr r1, _0806CFE4 @ =gUnknown_2031DEC
ldr r1, _0806CFE4 @ =gLinkPlayerObjectEvents
_0806CFB0:
ldrb r0, [r1]
cmp r0, 0x1
@@ -953,7 +953,7 @@ _0806CFDE:
pop {r1}
bx r1
.align 2, 0
_0806CFE4: .4byte gUnknown_2031DEC
_0806CFE4: .4byte gLinkPlayerObjectEvents
_0806CFE8: .4byte gSelectedObjectEvent
_0806CFEC: .4byte gSpecialVar_LastTalked
_0806CFF0: .4byte gSpecialVar_Facing
@@ -3083,7 +3083,7 @@ _0806E046:
GetObjectEventScriptPointerForComparison: @ 806E050
push {r4,r5,lr}
sub sp, 0x8
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3112,7 +3112,7 @@ GetObjectEventScriptPointerForComparison: @ 806E050
SetCableClubWarp: @ 806E08C
push {r4,lr}
sub sp, 0x8
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
mov r4, sp
mov r0, sp
bl player_get_pos_to_and_height
asm/field_effect.s
+20 -20
View File
@@ -2238,7 +2238,7 @@ sub_80844BC: @ 80844BC
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2666,7 +2666,7 @@ _0808484A:
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2947,7 +2947,7 @@ sub_8084A5C: @ 8084A5C
ldr r0, _08084AC0 @ =gObjectEvents
adds r4, r0
movs r0, 0x4
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3200,7 +3200,7 @@ sub_8084C3C: @ 8084C3C
bl ScriptContext2_Disable
bl UnfreezeObjectEvents
movs r0, 0x4
bl sub_8063F84
bl GetWalkNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4065,7 +4065,7 @@ sub_80852C0: @ 80852C0
movs r0, 0xA8
bl PlaySE
movs r0, 0x4
bl sub_8064194
bl GetJumpMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4306,7 +4306,7 @@ _080854C4:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetStepInPlaceDelay4AnimId
bl GetWalkInPlaceFastMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4610,7 +4610,7 @@ _08085702:
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl ObjectEventSetDirection
bl SetObjectEventDirection
bl sub_80555E0
bl WarpIntoMap
ldr r1, _0808575C @ =gFieldCallback
@@ -4668,7 +4668,7 @@ _0808579E:
lsrs r0, 28
adds r0, r7
ldrb r0, [r0]
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5761,7 +5761,7 @@ FldEff_FieldMoveShowMon: @ 8086028
bl GetCurrentMapType
lsls r0, 24
lsrs r0, 24
bl is_light_level_1_2_3_5_or_6
bl IsMapTypeOutdoors
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -7194,7 +7194,7 @@ sub_8086B30: @ 8086B30
strb r0, [r5]
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7380,12 +7380,12 @@ _08086CD2:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl ObjectEventForceSetSpecialAnim
bl ObjectEventForceSetHeldMovement
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -7859,7 +7859,7 @@ sub_808706C: @ 808706C
ldr r0, _08087108 @ =gObjectEvents
adds r4, r0
adds r0, r4, 0
bl ObjectEventClearAnimIfSpecialAnimActive
bl ObjectEventClearHeldMovementIfActive
ldrb r1, [r4, 0x1]
movs r0, 0x11
negs r0, r0
@@ -8676,7 +8676,7 @@ sub_8087698: @ 8087698
movs r0, 0x12
ldrsh r2, [r5, r0]
adds r0, r5, 0
bl sub_805F724
bl MoveObjectEventToMapCoords
movs r0, 0
strh r0, [r4, 0x24]
strh r0, [r4, 0x26]
@@ -9012,7 +9012,7 @@ sub_8087924: @ 8087924
lsls r2, 16
asrs r2, 16
adds r0, r4, 0
bl npc_coords_shift
bl ShiftObjectEventCoords
ldr r0, _080879CC @ =sub_80879D8
movs r1, 0x50
bl CreateTask
@@ -9155,7 +9155,7 @@ _08087A78:
ldrh r0, [r5, 0x6]
strh r0, [r6, 0x22]
adds r0, r4, 0
bl npc_coords_shift_still
bl ShiftStillObjectEventCoords
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
@@ -9474,7 +9474,7 @@ sub_8087CFC: @ 8087CFC
mov r7, r8
push {r7}
adds r6, r0, 0
ldr r0, _08087D80 @ =gUnknown_300506C
ldr r0, _08087D80 @ =gTotalCameraPixelOffsetX
movs r1, 0
ldrsh r2, [r0, r1]
movs r3, 0x20
@@ -9483,7 +9483,7 @@ sub_8087CFC: @ 8087CFC
movs r1, 0x24
ldrsh r0, [r6, r1]
adds r2, r0
ldr r0, _08087D84 @ =gUnknown_3005068
ldr r0, _08087D84 @ =gTotalCameraPixelOffsetY
movs r3, 0
ldrsh r0, [r0, r3]
movs r3, 0x22
@@ -9536,8 +9536,8 @@ _08087D6E:
pop {r0}
bx r0
.align 2, 0
_08087D80: .4byte gUnknown_300506C
_08087D84: .4byte gUnknown_3005068
_08087D80: .4byte gTotalCameraPixelOffsetX
_08087D84: .4byte gTotalCameraPixelOffsetY
_08087D88: .4byte gUnknown_83CC2A0
_08087D8C: .4byte gSprites
thumb_func_end sub_8087CFC
asm/field_effect_helpers.s
+15 -15
View File
@@ -20,7 +20,7 @@ SetUpReflection: @ 80DAD7C
ldrsh r2, [r4, r0]
adds r0, r4, 0
movs r3, 0x98
bl obj_unfreeze
bl CreateCopySpriteAt
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -34,7 +34,7 @@ SetUpReflection: @ 80DAD7C
movs r0, 0xC
orrs r1, r0
strb r1, [r7, 0x5]
ldr r2, _080DAE34 @ =gUnknown_835B934
ldr r2, _080DAE34 @ =gReflectionEffectPaletteMap
lsrs r0, r1, 4
adds r0, r2
ldrb r0, [r0]
@@ -96,7 +96,7 @@ _080DAE22:
.align 2, 0
_080DAE2C: .4byte gSprites
_080DAE30: .4byte sub_80DAF50
_080DAE34: .4byte gUnknown_835B934
_080DAE34: .4byte gReflectionEffectPaletteMap
_080DAE38: .4byte gDummySpriteAnimTable
_080DAE3C: .4byte gDummySpriteAffineAnimTable
thumb_func_end SetUpReflection
@@ -189,7 +189,7 @@ npc_pal_op_B: @ 80DAEC4
bne _080DAEF4
ldrh r0, [r2, 0x2]
adds r1, r4, 0
bl npc_load_two_palettes__no_record
bl LoadPlayerObjectReflectionPalette
b _080DAF12
.align 2, 0
_080DAEF0: .4byte 0x000011ff
@@ -198,15 +198,15 @@ _080DAEF4:
bne _080DAF02
ldrh r0, [r2, 0x2]
adds r1, r4, 0
bl npc_load_two_palettes__and_record
bl LoadSpecialObjectReflectionPalette
b _080DAF12
_080DAF02:
adds r0, r4, 0
bl npc_paltag_by_palslot
bl GetObjectPaletteTag
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
bl pal_patch_for_npc
bl PatchObjectPalette
_080DAF12:
adds r0, r4, 0
bl sub_807AA8C
@@ -230,7 +230,7 @@ npc_pal_op_A: @ 80DAF20
beq _080DAF44
adds r0, r1, 0
adds r1, r4, 0
bl pal_patch_for_npc
bl PatchObjectPalette
adds r0, r4, 0
bl sub_807AA8C
_080DAF44:
@@ -285,7 +285,7 @@ _080DAF98: .4byte gObjectEvents
_080DAF9C: .4byte gSprites
_080DAFA0: .4byte 0x00020001
_080DAFA4:
ldr r1, _080DB0BC @ =gUnknown_835B934
ldr r1, _080DB0BC @ =gReflectionEffectPaletteMap
ldrb r0, [r5, 0x5]
lsrs r0, 4
adds r0, r1
@@ -425,12 +425,12 @@ _080DB0AE:
pop {r0}
bx r0
.align 2, 0
_080DB0BC: .4byte gUnknown_835B934
_080DB0BC: .4byte gReflectionEffectPaletteMap
_080DB0C0: .4byte 0xfffffc00
thumb_func_end sub_80DAF50
thumb_func_start sub_80DB0C4
sub_80DB0C4: @ 80DB0C4
thumb_func_start CreateWarpArrowSprite
CreateWarpArrowSprite: @ 80DB0C4
push {r4,lr}
ldr r0, _080DB10C @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x20]
@@ -469,7 +469,7 @@ _080DB102:
.align 2, 0
_080DB10C: .4byte gFieldEffectObjectTemplatePointers
_080DB110: .4byte gSprites
thumb_func_end sub_80DB0C4
thumb_func_end CreateWarpArrowSprite
thumb_func_start objid_set_invisible
objid_set_invisible: @ 80DB114
@@ -538,7 +538,7 @@ _080DB17E:
adds r4, 0x2
mov r2, sp
adds r3, r4, 0
bl sub_8063B1C
bl SetSpritePosToMapCoords
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
@@ -714,7 +714,7 @@ _080DB2AE:
cmp r0, r1
bne _080DB32C
ldrb r0, [r4, 0x1E]
bl MetatileBehavior_IsTallGrass
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
cmp r0, 0
bne _080DB32C
asm/field_player_avatar.s
+45 -45
View File
@@ -17,7 +17,7 @@ sub_805B3B8: @ 805B3B8
ldr r2, _0805B3D4 @ =gObjectEvents
adds r0, r2
ldr r2, _0805B3D8 @ =sub_805B3DC
bl ObjectEventStep
bl UpdateObjectEventCurrentMovement
pop {r0}
bx r0
.align 2, 0
@@ -104,7 +104,7 @@ sub_805B45C: @ 805B45C
cmp r0, 0
bne _0805B4A6
adds r0, r4, 0
bl ObjectEventGetSpecialAnim
bl ObjectEventGetHeldMovementActionId
lsls r0, 24
movs r1, 0xDF
lsls r1, 24
@@ -119,7 +119,7 @@ sub_805B45C: @ 805B45C
cmp r0, r5
beq _0805B4A2
adds r0, r4, 0
bl ObjectEventClearAnim
bl ObjectEventClearHeldMovement
b _0805B4A6
_0805B4A2:
movs r0, 0x1
@@ -245,7 +245,7 @@ sub_805B528: @ 805B528
strh r0, [r5, 0x1C]
_0805B57A:
ldr r0, [r4]
bl ObjectEventClearAnim
bl ObjectEventClearHeldMovement
ldrb r0, [r5, 0x1C]
bl sub_805C2CC
_0805B586:
@@ -374,7 +374,7 @@ ForcedMovement_None: @ 805B644
ldrb r1, [r0, 0x18]
lsls r1, 28
lsrs r1, 28
bl ObjectEventSetDirection
bl SetObjectEventDirection
ldrb r1, [r4]
movs r0, 0xBF
ands r0, r1
@@ -816,7 +816,7 @@ CheckMovementInputNotOnBike: @ 805B96C
.align 2, 0
_0805B980: .4byte gPlayerAvatar
_0805B984:
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -1120,7 +1120,7 @@ sub_805BBA8: @ 805BBA8
adds r1, r5, 0
adds r2, r4, 0
adds r3, r6, 0
bl npc_block_way
bl GetCollisionAtCoords
lsls r0, 24
lsrs r0, 24
mov r1, sp
@@ -1323,7 +1323,7 @@ sub_805BCEC: @ 805BCEC
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r7, 0
bl npc_block_way
bl GetCollisionAtCoords
lsls r0, 24
cmp r0, 0
bne _0805BDA0
@@ -1678,8 +1678,8 @@ _0805BFD8: .4byte gObjectEvents
_0805BFDC: .4byte gPlayerAvatar
thumb_func_end player_set_x22
thumb_func_start player_get_x22
player_get_x22: @ 805BFE0
thumb_func_start PlayerGetCopyableMovement
PlayerGetCopyableMovement: @ 805BFE0
ldr r2, _0805BFF4 @ =gObjectEvents
ldr r0, _0805BFF8 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
@@ -1693,7 +1693,7 @@ player_get_x22: @ 805BFE0
.align 2, 0
_0805BFF4: .4byte gObjectEvents
_0805BFF8: .4byte gPlayerAvatar
thumb_func_end player_get_x22
thumb_func_end PlayerGetCopyableMovement
thumb_func_start sub_805BFFC
sub_805BFFC: @ 805BFFC
@@ -1708,7 +1708,7 @@ sub_805BFFC: @ 805BFFC
lsls r0, 2
ldr r2, _0805C020 @ =gObjectEvents
adds r0, r2
bl ObjectEventForceSetSpecialAnim
bl ObjectEventForceSetHeldMovement
pop {r0}
bx r0
.align 2, 0
@@ -1840,7 +1840,7 @@ sub_805C104: @ 805C104
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8063F84
bl GetWalkNormalMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -1854,7 +1854,7 @@ sub_805C11C: @ 805C11C
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8063FB0
bl GetWalkFastMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -1896,7 +1896,7 @@ sub_805C164: @ 805C164
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8064034
bl GetWalkFastestMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -1942,7 +1942,7 @@ PlayerOnBikeCollide: @ 805C1AC
adds r0, r4, 0
bl sub_805C438
adds r0, r4, 0
bl GetStepInPlaceDelay16AnimId
bl GetWalkInPlaceNormalMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -1976,7 +1976,7 @@ PlayerFaceDirection: @ 805C1F4
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
bl GetFaceDirectionMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -1990,7 +1990,7 @@ sub_805C20C: @ 805C20C
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8063EE4
bl GetWalkSlowMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -2004,7 +2004,7 @@ sub_805C224: @ 805C224
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8064270
bl GetWalkInPlaceSlowMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -2022,7 +2022,7 @@ sub_805C23C: @ 805C23C
movs r0, 0xA
bl PlaySE
adds r0, r4, 0
bl GetJumpLedgeAnimId
bl GetJump2MovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x8
@@ -2065,7 +2065,7 @@ _0805C27E:
ldrb r0, [r0, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_8063EB8
bl GetFaceDirectionMovementAction
lsls r0, 24
lsrs r0, 24
bl sub_805BFFC
@@ -2600,8 +2600,8 @@ _0805C6DC: .4byte gObjectEvents
_0805C6E0: .4byte gPlayerAvatar
thumb_func_end GetPlayerFacingDirection
thumb_func_start player_get_direction_upper_nybble
player_get_direction_upper_nybble: @ 805C6E4
thumb_func_start GetPlayerMovementDirection
GetPlayerMovementDirection: @ 805C6E4
ldr r2, _0805C6F8 @ =gObjectEvents
ldr r0, _0805C6FC @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
@@ -2615,7 +2615,7 @@ player_get_direction_upper_nybble: @ 805C6E4
.align 2, 0
_0805C6F8: .4byte gObjectEvents
_0805C6FC: .4byte gPlayerAvatar
thumb_func_end player_get_direction_upper_nybble
thumb_func_end GetPlayerMovementDirection
thumb_func_start PlayerGetZCoord
PlayerGetZCoord: @ 805C700
@@ -2651,7 +2651,7 @@ sub_805C71C: @ 805C71C
lsls r2, 16
asrs r2, 16
adds r1, r3, 0
bl sub_805F724
bl MoveObjectEventToMapCoords
pop {r0}
bx r0
.align 2, 0
@@ -2712,7 +2712,7 @@ sub_805C780: @ 805C780
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
bl ObjectEventSetDirection
bl SetObjectEventDirection
movs r0, 0x6
bl TestPlayerAvatarFlags
lsls r0, 24
@@ -2787,8 +2787,8 @@ sub_805C808: @ 805C808
_0805C820: .4byte gPlayerAvatar
thumb_func_end sub_805C808
thumb_func_start sub_805C824
sub_805C824: @ 805C824
thumb_func_start GetPlayerAvatarGenderByGraphicsId
GetPlayerAvatarGenderByGraphicsId: @ 805C824
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2803,7 +2803,7 @@ _0805C836:
_0805C838:
pop {r1}
bx r1
thumb_func_end sub_805C824
thumb_func_end GetPlayerAvatarGenderByGraphicsId
thumb_func_start PartyHasMonWithSurf
PartyHasMonWithSurf: @ 805C83C
@@ -2854,7 +2854,7 @@ _0805C888: .4byte gPlayerParty
thumb_func_start IsPlayerSurfingNorth
IsPlayerSurfingNorth: @ 805C88C
push {lr}
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -2906,7 +2906,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
lsls r3, 28
lsrs r3, 28
adds r0, r4, 0
bl npc_block_way
bl GetCollisionAtCoords
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -3158,7 +3158,7 @@ InitPlayerAvatar: @ 805CA3C
movs r1, 0x1
orrs r0, r1
strb r0, [r4, 0x2]
bl sub_80DB0C4
bl CreateWarpArrowSprite
strb r0, [r4, 0x1B]
adds r0, r4, 0
mov r1, r9
@@ -3546,7 +3546,7 @@ sub_805CD84: @ 805CD84
adds r0, r4, 0
bl ObjectEventClearHeldMovementIfFinished
ldrb r0, [r6, 0xC]
bl GetStepInPlaceDelay16AnimId
bl GetWalkInPlaceNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3713,7 +3713,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_806413C
bl GetJumpInPlaceMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3846,7 +3846,7 @@ sub_805CFEC: @ 805CFEC
add r0, sp
ldrb r6, [r0]
adds r0, r6, 0
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4138,7 +4138,7 @@ sub_805D240: @ 805D240
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4296,7 +4296,7 @@ fish1: @ 805D35C
lsls r4, 2
adds r4, r3
adds r0, r4, 0
bl ObjectEventClearAnimIfSpecialAnimActive
bl ObjectEventClearHeldMovementIfActive
ldrb r0, [r4, 0x1]
movs r1, 0x8
orrs r0, r1
@@ -4830,7 +4830,7 @@ sub_805D7C0: @ 805D7C0
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063500
bl GetFishingBiteDirectionAnimNum
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4886,7 +4886,7 @@ sub_805D838: @ 805D838
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063500
bl GetFishingBiteDirectionAnimNum
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5337,7 +5337,7 @@ _0805DBBA:
strh r0, [r7, 0x22]
movs r2, 0x22
ldrsh r1, [r7, r2]
ldr r0, _0805DBF0 @ =gUnknown_3005068
ldr r0, _0805DBF0 @ =gTotalCameraPixelOffsetY
movs r2, 0
ldrsh r0, [r0, r2]
adds r1, r0
@@ -5350,7 +5350,7 @@ _0805DBBA:
strh r0, [r5]
b _0805DBFA
.align 2, 0
_0805DBF0: .4byte gUnknown_3005068
_0805DBF0: .4byte gTotalCameraPixelOffsetY
_0805DBF4:
adds r0, r2, 0
bl DestroyTask
@@ -5450,12 +5450,12 @@ _0805DC9A:
ldrsh r0, [r5, r3]
adds r0, r1
ldrb r0, [r0]
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl ObjectEventForceSetSpecialAnim
bl ObjectEventForceSetHeldMovement
movs r0, 0
mov r9, r0
strh r6, [r5, 0x2]
@@ -5618,12 +5618,12 @@ _0805DDE4:
lsrs r0, 28
adds r0, r4
ldrb r0, [r0]
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl ObjectEventForceSetSpecialAnim
bl ObjectEventForceSetHeldMovement
movs r0, 0
strh r0, [r6]
ldrb r0, [r5, 0x18]
asm/field_weather_effects.s
+1 -1
View File
@@ -252,7 +252,7 @@ _0807B456:
adds r2, 0x20
adds r3, r4, 0
adds r3, 0x22
bl sub_8063B1C
bl SetSpritePosToMapCoords
adds r4, 0x3E
ldrb r0, [r4]
movs r1, 0x2
asm/naming_screen.s
+1 -1
View File
@@ -2907,7 +2907,7 @@ sub_809F04C: @ 809F04C
add r3, sp, 0x18
movs r0, 0
mov r2, sp
bl sub_805E8E8
bl MakeObjectTemplateFromObjectEventGraphicsInfo
mov r2, sp
add r0, sp, 0x1C
ldrh r1, [r0, 0x6]
asm/overworld.s
+60 -60
View File
@@ -1242,12 +1242,12 @@ sub_805550C: @ 805550C
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
bl is_light_level_1_2_3_5_or_6
bl IsMapTypeOutdoors
lsls r0, 24
cmp r0, 0
beq _08055590
adds r0, r5, 0
bl is_light_level_1_2_3_5_or_6
bl IsMapTypeOutdoors
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1764,7 +1764,7 @@ sub_8055920: @ 8055920
bl sub_8054F68
ldr r0, _0805599C @ =gMapHeader
ldrb r0, [r0, 0x17]
bl is_light_level_1_2_3_5_or_6
bl IsMapTypeOutdoors
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1815,7 +1815,7 @@ sub_80559A8: @ 80559A8
bl sub_8054F68
ldr r0, _080559E0 @ =gMapHeader
ldrb r0, [r0, 0x17]
bl is_light_level_1_2_3_5_or_6
bl IsMapTypeOutdoors
bl TrySetMapSaveWarpStatus
bl SetSav1WeatherFromCurrMapHeader
bl sub_805610C
@@ -2933,8 +2933,8 @@ sub_80561B4: @ 80561B4
_080561D4: .4byte gUnknown_2031DB4
thumb_func_end sub_80561B4
thumb_func_start is_light_level_1_2_3_5_or_6
is_light_level_1_2_3_5_or_6: @ 80561D8
thumb_func_start IsMapTypeOutdoors
IsMapTypeOutdoors: @ 80561D8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2956,7 +2956,7 @@ _080561F6:
_080561F8:
pop {r1}
bx r1
thumb_func_end is_light_level_1_2_3_5_or_6
thumb_func_end IsMapTypeOutdoors
thumb_func_start Overworld_MapTypeAllowsTeleportAndFly
Overworld_MapTypeAllowsTeleportAndFly: @ 80561FC
@@ -4637,11 +4637,11 @@ sub_8057024: @ 8057024
cmp r4, 0
bne _08057050
movs r0, 0
bl npc_paltag_set_load
bl InitObjectEventPalettes
b _08057056
_08057050:
movs r0, 0x1
bl npc_paltag_set_load
bl InitObjectEventPalettes
_08057056:
bl FieldEffectActiveListClear
bl sub_8079C08
@@ -4659,33 +4659,33 @@ _0805706A:
thumb_func_start sub_8057074
sub_8057074: @ 8057074
push {lr}
ldr r0, _08057094 @ =gUnknown_300506C
ldr r0, _08057094 @ =gTotalCameraPixelOffsetX
movs r1, 0
strh r1, [r0]
ldr r0, _08057098 @ =gUnknown_3005068
ldr r0, _08057098 @ =gTotalCameraPixelOffsetY
strh r1, [r0]
bl sub_805DE74
bl ResetObjectEvents
movs r0, 0
movs r1, 0
bl sub_805EC30
bl TrySpawnObjectEvents
bl mapheader_run_first_tag4_script_list_match
pop {r0}
bx r0
.align 2, 0
_08057094: .4byte gUnknown_300506C
_08057098: .4byte gUnknown_3005068
_08057094: .4byte gTotalCameraPixelOffsetX
_08057098: .4byte gTotalCameraPixelOffsetY
thumb_func_end sub_8057074
thumb_func_start mli4_mapscripts_and_other
mli4_mapscripts_and_other: @ 805709C
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _080570F4 @ =gUnknown_300506C
ldr r0, _080570F4 @ =gTotalCameraPixelOffsetX
movs r1, 0
strh r1, [r0]
ldr r0, _080570F8 @ =gUnknown_3005068
ldr r0, _080570F8 @ =gTotalCameraPixelOffsetY
strh r1, [r0]
bl sub_805DE74
bl ResetObjectEvents
mov r4, sp
adds r4, 0x2
mov r0, sp
@@ -4708,15 +4708,15 @@ mli4_mapscripts_and_other: @ 805709C
bl ResetInitialPlayerAvatarState
movs r0, 0
movs r1, 0
bl sub_805EC30
bl TrySpawnObjectEvents
bl mapheader_run_first_tag4_script_list_match
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080570F4: .4byte gUnknown_300506C
_080570F8: .4byte gUnknown_3005068
_080570F4: .4byte gTotalCameraPixelOffsetX
_080570F8: .4byte gTotalCameraPixelOffsetY
_080570FC: .4byte gSaveBlock2Ptr
thumb_func_end mli4_mapscripts_and_other
@@ -5344,7 +5344,7 @@ _08057620:
beq _08057648
b _0805754E
_0805762C:
ldr r0, _08057640 @ =gUnknown_3005050
ldr r0, _08057640 @ =gFieldCamera
ldr r1, _08057644 @ =sub_8057748
str r1, [r0]
bl SetFieldVBlankCallback
@@ -5353,7 +5353,7 @@ _0805762C:
movs r0, 0x1
b _0805764A
.align 2, 0
_08057640: .4byte gUnknown_3005050
_08057640: .4byte gFieldCamera
_08057644: .4byte sub_8057748
_08057648:
movs r0, 0
@@ -6611,7 +6611,7 @@ sub_8057F84: @ 8057F84
movs r0, 0x1
_08057F96:
strb r0, [r6, 0x1]
ldr r1, _08057FE8 @ =gUnknown_2031DEC
ldr r1, _08057FE8 @ =gLinkPlayerObjectEvents
lsls r0, r4, 2
adds r0, r1
ldrb r0, [r0, 0x3]
@@ -6647,7 +6647,7 @@ _08057F96:
pop {r0}
bx r0
.align 2, 0
_08057FE8: .4byte gUnknown_2031DEC
_08057FE8: .4byte gLinkPlayerObjectEvents
thumb_func_end sub_8057F84
thumb_func_start sub_8057FEC
@@ -7143,18 +7143,18 @@ ZeroLinkPlayerObjectEvent: @ 8058370
bx lr
thumb_func_end ZeroLinkPlayerObjectEvent
thumb_func_start strange_npc_table_clear
strange_npc_table_clear: @ 8058378
thumb_func_start ClearLinkPlayerObjectEvents
ClearLinkPlayerObjectEvents: @ 8058378
push {lr}
ldr r0, _08058388 @ =gUnknown_2031DEC
ldr r0, _08058388 @ =gLinkPlayerObjectEvents
movs r1, 0
movs r2, 0x10
bl memset
pop {r0}
bx r0
.align 2, 0
_08058388: .4byte gUnknown_2031DEC
thumb_func_end strange_npc_table_clear
_08058388: .4byte gLinkPlayerObjectEvents
thumb_func_end ClearLinkPlayerObjectEvents
thumb_func_start ZeroObjectEvent
ZeroObjectEvent: @ 805838C
@@ -7190,12 +7190,12 @@ SpawnLinkPlayerObjectEvent: @ 805839C
lsls r2, 24
lsrs r2, 24
mov r8, r2
bl sub_805DF30
bl GetFirstInactiveObjectEventId
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
lsls r4, r7, 2
ldr r0, _08058440 @ =gUnknown_2031DEC
ldr r0, _08058440 @ =gLinkPlayerObjectEvents
adds r4, r0
lsls r5, r6, 3
adds r5, r6
@@ -7247,7 +7247,7 @@ SpawnLinkPlayerObjectEvent: @ 805839C
pop {r0}
bx r0
.align 2, 0
_08058440: .4byte gUnknown_2031DEC
_08058440: .4byte gLinkPlayerObjectEvents
_08058444: .4byte gObjectEvents
thumb_func_end SpawnLinkPlayerObjectEvent
@@ -7273,7 +7273,7 @@ InitLinkPlayerObjectEventPos: @ 8058448
adds r2, 0xC
adds r3, r4, 0
adds r3, 0xE
bl sub_8063B1C
bl SetSpritePosToMapCoords
ldrh r0, [r4, 0xC]
adds r0, 0x8
strh r0, [r4, 0xC]
@@ -7290,7 +7290,7 @@ sub_8058488: @ 8058488
lsls r0, 24
lsls r1, 24
lsrs r2, r1, 24
ldr r1, _080584B0 @ =gUnknown_2031DEC
ldr r1, _080584B0 @ =gLinkPlayerObjectEvents
lsrs r0, 22
adds r1, r0, r1
ldrb r0, [r1]
@@ -7307,7 +7307,7 @@ _080584AA:
pop {r0}
bx r0
.align 2, 0
_080584B0: .4byte gUnknown_2031DEC
_080584B0: .4byte gLinkPlayerObjectEvents
_080584B4: .4byte gObjectEvents
thumb_func_end sub_8058488
@@ -7316,7 +7316,7 @@ sub_80584B8: @ 80584B8
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 22
ldr r1, _080584F8 @ =gUnknown_2031DEC
ldr r1, _080584F8 @ =gLinkPlayerObjectEvents
adds r5, r0, r1
ldrb r1, [r5, 0x2]
lsls r0, r1, 3
@@ -7345,7 +7345,7 @@ _080584E4:
pop {r0}
bx r0
.align 2, 0
_080584F8: .4byte gUnknown_2031DEC
_080584F8: .4byte gLinkPlayerObjectEvents
_080584FC: .4byte gObjectEvents
_08058500: .4byte gSprites
thumb_func_end sub_80584B8
@@ -7353,7 +7353,7 @@ _08058500: .4byte gSprites
thumb_func_start sub_8058504
sub_8058504: @ 8058504
lsls r0, 24
ldr r1, _0805851C @ =gUnknown_2031DEC
ldr r1, _0805851C @ =gLinkPlayerObjectEvents
lsrs r0, 22
adds r0, r1
ldrb r1, [r0, 0x2]
@@ -7365,14 +7365,14 @@ sub_8058504: @ 8058504
ldrb r0, [r0, 0x4]
bx lr
.align 2, 0
_0805851C: .4byte gUnknown_2031DEC
_0805851C: .4byte gLinkPlayerObjectEvents
_08058520: .4byte gObjectEvents
thumb_func_end sub_8058504
thumb_func_start sub_8058524
sub_8058524: @ 8058524
lsls r0, 24
ldr r3, _08058544 @ =gUnknown_2031DEC
ldr r3, _08058544 @ =gLinkPlayerObjectEvents
lsrs r0, 22
adds r0, r3
ldrb r3, [r0, 0x2]
@@ -7387,14 +7387,14 @@ sub_8058524: @ 8058524
strh r0, [r2]
bx lr
.align 2, 0
_08058544: .4byte gUnknown_2031DEC
_08058544: .4byte gLinkPlayerObjectEvents
_08058548: .4byte gObjectEvents
thumb_func_end sub_8058524
thumb_func_start sub_805854C
sub_805854C: @ 805854C
lsls r0, 24
ldr r1, _08058564 @ =gUnknown_2031DEC
ldr r1, _08058564 @ =gLinkPlayerObjectEvents
lsrs r0, 22
adds r0, r1
ldrb r1, [r0, 0x2]
@@ -7406,14 +7406,14 @@ sub_805854C: @ 805854C
ldrb r0, [r0, 0x19]
bx lr
.align 2, 0
_08058564: .4byte gUnknown_2031DEC
_08058564: .4byte gLinkPlayerObjectEvents
_08058568: .4byte gObjectEvents
thumb_func_end sub_805854C
thumb_func_start sub_805856C
sub_805856C: @ 805856C
lsls r0, 24
ldr r1, _08058588 @ =gUnknown_2031DEC
ldr r1, _08058588 @ =gLinkPlayerObjectEvents
lsrs r0, 22
adds r0, r1
ldrb r1, [r0, 0x2]
@@ -7427,14 +7427,14 @@ sub_805856C: @ 805856C
lsrs r0, 28
bx lr
.align 2, 0
_08058588: .4byte gUnknown_2031DEC
_08058588: .4byte gLinkPlayerObjectEvents
_0805858C: .4byte gObjectEvents
thumb_func_end sub_805856C
thumb_func_start sub_8058590
sub_8058590: @ 8058590
lsls r0, 24
ldr r1, _080585B0 @ =gUnknown_2031DEC
ldr r1, _080585B0 @ =gLinkPlayerObjectEvents
lsrs r0, 22
adds r0, r1
ldrb r1, [r0, 0x2]
@@ -7450,7 +7450,7 @@ sub_8058590: @ 8058590
subs r0, r1
bx lr
.align 2, 0
_080585B0: .4byte gUnknown_2031DEC
_080585B0: .4byte gLinkPlayerObjectEvents
_080585B4: .4byte gObjectEvents
thumb_func_end sub_8058590
@@ -7458,7 +7458,7 @@ _080585B4: .4byte gObjectEvents
GetLinkPlayerIdAt: @ 80585B8
push {r4-r6,lr}
movs r2, 0
ldr r5, _080585FC @ =gUnknown_2031DEC
ldr r5, _080585FC @ =gLinkPlayerObjectEvents
lsls r0, 16
asrs r4, r0, 16
lsls r1, 16
@@ -7492,7 +7492,7 @@ _080585DA:
adds r0, r2, 0
b _08058610
.align 2, 0
_080585FC: .4byte gUnknown_2031DEC
_080585FC: .4byte gLinkPlayerObjectEvents
_08058600: .4byte gObjectEvents
_08058604:
adds r0, r2, 0x1
@@ -7515,7 +7515,7 @@ sub_8058618: @ 8058618
lsrs r3, r1, 24
adds r2, r3, 0
lsrs r0, 22
ldr r1, _08058648 @ =gUnknown_2031DEC
ldr r1, _08058648 @ =gLinkPlayerObjectEvents
adds r5, r0, r1
ldrb r1, [r5, 0x2]
lsls r0, r1, 3
@@ -7534,7 +7534,7 @@ sub_8058618: @ 8058618
strb r0, [r6]
b _08058674
.align 2, 0
_08058648: .4byte gUnknown_2031DEC
_08058648: .4byte gLinkPlayerObjectEvents
_0805864C: .4byte gObjectEvents
_08058650:
ldr r4, _0805867C @ =gUnknown_826D374
@@ -7651,7 +7651,7 @@ sub_80586CC: @ 80586CC
movs r3, 0
ldrsh r2, [r6, r3]
adds r0, r5, 0
bl npc_coords_shift
bl ShiftObjectEventCoords
adds r0, r5, 0
bl ObjectEventUpdateZCoord
movs r0, 0x1
@@ -7708,7 +7708,7 @@ sub_8058754: @ 8058754
cmp r0, 0
bne _08058784
adds r0, r4, 0
bl npc_coords_shift_still
bl ShiftStillObjectEventCoords
movs r0, 0x2
strb r0, [r6, 0x3]
_08058784:
@@ -7851,7 +7851,7 @@ sub_8058878: @ 8058878
lsls r1, 24
lsrs r3, r1, 24
lsls r2, r5, 2
ldr r0, _080588B4 @ =gUnknown_2031DEC
ldr r0, _080588B4 @ =gLinkPlayerObjectEvents
adds r2, r0
ldrb r1, [r2, 0x2]
lsls r0, r1, 3
@@ -7874,7 +7874,7 @@ sub_8058878: @ 8058878
bl sub_805C7C8
b _080588C6
.align 2, 0
_080588B4: .4byte gUnknown_2031DEC
_080588B4: .4byte gLinkPlayerObjectEvents
_080588B8: .4byte gObjectEvents
_080588BC:
ldrb r0, [r4]
@@ -7925,7 +7925,7 @@ SpriteCB_LinkPlayer: @ 805890C
movs r0, 0x2E
ldrsh r4, [r5, r0]
lsls r4, 2
ldr r0, _08058970 @ =gUnknown_2031DEC
ldr r0, _08058970 @ =gLinkPlayerObjectEvents
adds r4, r0
ldrb r1, [r4, 0x2]
lsls r0, r1, 3
@@ -7958,7 +7958,7 @@ SpriteCB_LinkPlayer: @ 805890C
cmp r0, 0
bne _08058978
ldrb r0, [r6, 0x19]
bl ObjectEventDirectionToImageAnimId
bl GetFaceDirectionAnimNum
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7966,11 +7966,11 @@ SpriteCB_LinkPlayer: @ 805890C
bl StartSpriteAnim
b _0805898A
.align 2, 0
_08058970: .4byte gUnknown_2031DEC
_08058970: .4byte gLinkPlayerObjectEvents
_08058974: .4byte gObjectEvents
_08058978:
ldrb r0, [r6, 0x19]
bl get_go_image_anim_num
bl GetMoveDirectionAnimNum
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/script_movement.s
+1 -1
View File
@@ -560,7 +560,7 @@ sub_80977F0: @ 80977F0
ldr r1, _08097850 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
bl ObjectEventIsSpecialAnimActive
bl ObjectEventIsHeldMovementActive
lsls r0, 24
cmp r0, 0
beq _08097838
asm/trainer_see.s
+12 -12
View File
@@ -225,7 +225,7 @@ IsTrainerInRangeSouth: @ 8081C9C
bgt _08081CE4
cmp r1, 0x3
ble _08081CDA
bl sub_805DF30
bl GetFirstInactiveObjectEventId
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
@@ -398,7 +398,7 @@ _08081DEC:
ldrsh r2, [r3, r0]
adds r0, r6, 0
adds r3, r7, 0
bl sub_8063770
bl GetCollisionFlagsAtCoords
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -433,7 +433,7 @@ _08081E26:
ldrsh r2, [r3, r0]
adds r0, r6, 0
adds r3, r7, 0
bl npc_block_way
bl GetCollisionAtCoords
lsls r0, 24
lsrs r1, r0, 24
lsls r4, 4
@@ -596,7 +596,7 @@ _08081F54:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -675,7 +675,7 @@ _08081FEE:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_8063F84
bl GetWalkNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -732,9 +732,9 @@ _0808204A:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805FE7C
bl OverrideMovementTypeForObjectEvent
adds r0, r4, 0
bl sub_805FE5C
bl OverrideTemplateCoordsForObjectEvent
ldr r0, _080820B4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -965,7 +965,7 @@ sub_80821DC: @ 80821DC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_806413C
bl GetJumpInPlaceMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1099,7 +1099,7 @@ _08082312:
ldr r0, _0808234C @ =gObjectEvents
adds r4, r0
movs r0, 0x2
bl sub_8063FB0
bl GetWalkFastMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1190,7 +1190,7 @@ _080823CC:
ldr r0, _08082408 @ =gObjectEvents
adds r4, r0
movs r0, 0x1
bl sub_8063FB0
bl GetWalkFastMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1249,7 +1249,7 @@ sub_808243C: @ 808243C
cmp r0, 0
bne _0808246E
ldr r0, [sp]
bl ObjectEventClearAnim
bl ObjectEventClearHeldMovement
ldrh r0, [r4, 0x16]
adds r0, 0x1
strh r0, [r4, 0x16]
@@ -1292,7 +1292,7 @@ _0808246E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805FE7C
bl OverrideMovementTypeForObjectEvent
adds r0, r5, 0
bl DestroyTask
b _080824E2