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

through sub_81127F8

Browse Source
This commit is contained in:
PikalaxALT
2018-10-13 09:28:50 -04:00
parent f0e2b86a7b
commit 4190928a11
34 changed files with 560 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_setup.s
+2 -2
View File
@@ -757,7 +757,7 @@ sub_807FC5C: @ 807FC5C
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r5, r0, 16
lsls r0, r5, 24
@@ -907,7 +907,7 @@ GetBattleTransitionTypeByMap: @ 807FD90
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
bl sav1_get_flash_used_on_map
asm/bike.s
+37 -37
View File
@@ -42,7 +42,7 @@ sub_80BD0D4: @ 80BD0D4
lsls r2, 16
lsrs r2, 16
ldr r4, _080BD0F8 @ =gUnknown_83E7D10
ldr r3, _080BD0FC @ =gUnknown_2037078
ldr r3, _080BD0FC @ =gPlayerAvatar
ldrb r3, [r3, 0x8]
lsls r3, 2
adds r3, r4
@@ -55,7 +55,7 @@ sub_80BD0D4: @ 80BD0D4
bx r1
.align 2, 0
_080BD0F8: .4byte gUnknown_83E7D10
_080BD0FC: .4byte gUnknown_2037078
_080BD0FC: .4byte gPlayerAvatar
thumb_func_end sub_80BD0D4
thumb_func_start sub_80BD100
@@ -72,7 +72,7 @@ sub_80BD100: @ 80BD100
lsls r2, 16
lsrs r2, 16
mov r9, r2
ldr r5, _080BD15C @ =gUnknown_2037078
ldr r5, _080BD15C @ =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -105,7 +105,7 @@ sub_80BD100: @ 80BD100
movs r0, 0x3
b _080BD1B6
.align 2, 0
_080BD15C: .4byte gUnknown_2037078
_080BD15C: .4byte gPlayerAvatar
_080BD160: .4byte gMapObjects
_080BD164: .4byte gMain
_080BD168:
@@ -124,11 +124,11 @@ _080BD176:
bne _080BD18C
_080BD17E:
strb r7, [r6]
ldr r1, _080BD188 @ =gUnknown_2037078
ldr r1, _080BD188 @ =gPlayerAvatar
movs r0, 0
b _080BD1B4
.align 2, 0
_080BD188: .4byte gUnknown_2037078
_080BD188: .4byte gPlayerAvatar
_080BD18C:
cmp r0, r7
beq _080BD1B0
@@ -148,7 +148,7 @@ _080BD18C:
lsrs r0, 24
b _080BD1B6
_080BD1B0:
ldr r1, _080BD1C4 @ =gUnknown_2037078
ldr r1, _080BD1C4 @ =gPlayerAvatar
movs r0, 0x2
_080BD1B4:
strb r0, [r1, 0x2]
@@ -161,13 +161,13 @@ _080BD1B6:
pop {r1}
bx r1
.align 2, 0
_080BD1C4: .4byte gUnknown_2037078
_080BD1C4: .4byte gPlayerAvatar
thumb_func_end sub_80BD100
thumb_func_start sub_80BD1C8
sub_80BD1C8: @ 80BD1C8
push {lr}
ldr r2, _080BD1E4 @ =gUnknown_2037078
ldr r2, _080BD1E4 @ =gPlayerAvatar
ldrb r1, [r2, 0x9]
strb r1, [r0]
movs r1, 0
@@ -179,7 +179,7 @@ sub_80BD1C8: @ 80BD1C8
pop {r1}
bx r1
.align 2, 0
_080BD1E4: .4byte gUnknown_2037078
_080BD1E4: .4byte gPlayerAvatar
thumb_func_end sub_80BD1C8
thumb_func_start sub_80BD1E8
@@ -199,7 +199,7 @@ sub_80BD1E8: @ 80BD1E8
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
ldr r4, _080BD240 @ =gUnknown_2037078
ldr r4, _080BD240 @ =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -226,7 +226,7 @@ sub_80BD1E8: @ 80BD1E8
lsrs r0, 24
b _080BD270
.align 2, 0
_080BD240: .4byte gUnknown_2037078
_080BD240: .4byte gPlayerAvatar
_080BD244: .4byte gMapObjects
_080BD248:
movs r0, 0x2
@@ -276,7 +276,7 @@ sub_80BD28C: @ 80BD28C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080BD2C0 @ =gUnknown_2037078
ldr r0, _080BD2C0 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -298,7 +298,7 @@ _080BD2B2:
pop {r0}
bx r0
.align 2, 0
_080BD2C0: .4byte gUnknown_2037078
_080BD2C0: .4byte gPlayerAvatar
_080BD2C4: .4byte gMapObjects
thumb_func_end sub_80BD28C
@@ -308,7 +308,7 @@ sub_80BD2C8: @ 80BD2C8
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r0, _080BD2F8 @ =gUnknown_2037078
ldr r0, _080BD2F8 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -326,7 +326,7 @@ sub_80BD2C8: @ 80BD2C8
bl sub_80BD27C
b _080BD350
.align 2, 0
_080BD2F8: .4byte gUnknown_2037078
_080BD2F8: .4byte gPlayerAvatar
_080BD2FC: .4byte gMapObjects
_080BD300:
adds r0, r4, 0
@@ -420,7 +420,7 @@ sub_80BD3A0: @ 80BD3A0
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldr r0, _080BD404 @ =gUnknown_2037078
ldr r0, _080BD404 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -443,7 +443,7 @@ sub_80BD3A0: @ 80BD3A0
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
add r1, sp, 0x4
@@ -462,7 +462,7 @@ sub_80BD3A0: @ 80BD3A0
pop {r1}
bx r1
.align 2, 0
_080BD404: .4byte gUnknown_2037078
_080BD404: .4byte gPlayerAvatar
_080BD408: .4byte gMapObjects
thumb_func_end sub_80BD3A0
@@ -645,7 +645,7 @@ _080BD538:
sub_80BD540: @ 80BD540
push {r4,lr}
sub sp, 0x4
ldr r0, _080BD57C @ =gUnknown_2037078
ldr r0, _080BD57C @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x18
ands r0, r1
@@ -661,7 +661,7 @@ sub_80BD540: @ 80BD540
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_80BD4B8
@@ -671,7 +671,7 @@ sub_80BD540: @ 80BD540
movs r0, 0
b _080BD582
.align 2, 0
_080BD57C: .4byte gUnknown_2037078
_080BD57C: .4byte gPlayerAvatar
_080BD580:
movs r0, 0x1
_080BD582:
@@ -690,7 +690,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
cmp r0, 0
beq _080BD5C0
ldr r2, _080BD5B8 @ =gMapObjects
ldr r0, _080BD5BC @ =gUnknown_2037078
ldr r0, _080BD5BC @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -705,7 +705,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
b _080BD5C2
.align 2, 0
_080BD5B8: .4byte gMapObjects
_080BD5BC: .4byte gUnknown_2037078
_080BD5BC: .4byte gPlayerAvatar
_080BD5C0:
movs r0, 0x1
_080BD5C2:
@@ -721,7 +721,7 @@ sub_80BD5C8: @ 80BD5C8
ldr r1, _080BD5F0 @ =gUnknown_2036E2C
movs r0, 0
strb r0, [r1]
ldr r0, _080BD5F4 @ =gUnknown_2037078
ldr r0, _080BD5F4 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -734,7 +734,7 @@ sub_80BD5C8: @ 80BD5C8
b _080BD618
.align 2, 0
_080BD5F0: .4byte gUnknown_2036E2C
_080BD5F4: .4byte gUnknown_2037078
_080BD5F4: .4byte gPlayerAvatar
_080BD5F8:
adds r0, r2, 0
bl SetPlayerAvatarTransitionFlags
@@ -757,7 +757,7 @@ _080BD618:
thumb_func_start sub_80BD620
sub_80BD620: @ 80BD620
push {lr}
ldr r2, _080BD64C @ =gUnknown_2037078
ldr r2, _080BD64C @ =gPlayerAvatar
movs r3, 0
strb r3, [r2, 0x8]
strb r3, [r2, 0x9]
@@ -779,32 +779,32 @@ _080BD638:
pop {r0}
bx r0
.align 2, 0
_080BD64C: .4byte gUnknown_2037078
_080BD64C: .4byte gPlayerAvatar
thumb_func_end sub_80BD620
thumb_func_start Bike_UpdateBikeCounterSpeed
Bike_UpdateBikeCounterSpeed: @ 80BD650
lsls r0, 24
lsrs r0, 24
ldr r2, _080BD660 @ =gUnknown_2037078
ldr r2, _080BD660 @ =gPlayerAvatar
strb r0, [r2, 0xA]
lsrs r1, r0, 1
adds r0, r1
strb r0, [r2, 0xB]
bx lr
.align 2, 0
_080BD660: .4byte gUnknown_2037078
_080BD660: .4byte gPlayerAvatar
thumb_func_end Bike_UpdateBikeCounterSpeed
thumb_func_start sub_80BD664
sub_80BD664: @ 80BD664
ldr r1, _080BD670 @ =gUnknown_2037078
ldr r1, _080BD670 @ =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0xA]
strb r0, [r1, 0xB]
bx lr
.align 2, 0
_080BD670: .4byte gUnknown_2037078
_080BD670: .4byte gPlayerAvatar
thumb_func_end sub_80BD664
thumb_func_start GetPlayerSpeed
@@ -815,7 +815,7 @@ GetPlayerSpeed: @ 80BD674
mov r0, sp
movs r2, 0x6
bl memcpy
ldr r2, _080BD6A0 @ =gUnknown_2037078
ldr r2, _080BD6A0 @ =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0x2
ands r0, r1
@@ -829,7 +829,7 @@ GetPlayerSpeed: @ 80BD674
b _080BD6BE
.align 2, 0
_080BD69C: .4byte gUnknown_83E7D1C
_080BD6A0: .4byte gUnknown_2037078
_080BD6A0: .4byte gPlayerAvatar
_080BD6A4:
movs r0, 0x4
ands r0, r1
@@ -856,7 +856,7 @@ _080BD6BE:
Bike_HandleBumpySlopeJump: @ 80BD6C4
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080BD714 @ =gUnknown_2037078
ldr r5, _080BD714 @ =gPlayerAvatar
ldrb r1, [r5]
movs r0, 0x4
ands r0, r1
@@ -872,7 +872,7 @@ Bike_HandleBumpySlopeJump: @ 80BD6C4
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_805A20C
@@ -891,7 +891,7 @@ _080BD70C:
pop {r0}
bx r0
.align 2, 0
_080BD714: .4byte gUnknown_2037078
_080BD714: .4byte gPlayerAvatar
thumb_func_end Bike_HandleBumpySlopeJump
.align 2, 0 @ Don't pad with nop.
asm/field_camera.s
+2 -2
View File
@@ -1222,7 +1222,7 @@ CameraPanningCB_PanAhead: @ 805AE74
.align 2, 0
_0805AE84: .4byte gUnknown_2036E2C
_0805AE88:
ldr r0, _0805AEA0 @ =gUnknown_2037078
ldr r0, _0805AEA0 @ =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x1
bne _0805AEA8
@@ -1235,7 +1235,7 @@ _0805AE88:
beq _0805AF10
b _0805AEAE
.align 2, 0
_0805AEA0: .4byte gUnknown_2037078
_0805AEA0: .4byte gPlayerAvatar
_0805AEA4: .4byte gUnknown_3000E9C
_0805AEA8:
ldr r1, _0805AED0 @ =gUnknown_3000E9C
asm/field_control_avatar.s
+43 -43
View File
@@ -34,8 +34,8 @@ sub_806C888: @ 806C888
bx r0
thumb_func_end sub_806C888
thumb_func_start sub_806C8BC
sub_806C8BC: @ 806C8BC
thumb_func_start FieldGetPlayerInput
FieldGetPlayerInput: @ 806C8BC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -46,14 +46,14 @@ sub_806C8BC: @ 806C8BC
mov r4, sp
adds r4, 0x2
strh r2, [r4]
ldr r0, _0806CA14 @ =gUnknown_2037078
ldr r0, _0806CA14 @ =gPlayerAvatar
ldrb r1, [r0, 0x2]
mov r8, r1
ldrb r6, [r0, 0x3]
bl cur_mapdata_block_role_at_player_pos
lsls r0, 24
lsrs r0, 24
bl sub_8059D70
bl MetatileBehavior_IsMoveTile
lsls r0, 24
lsrs r7, r0, 24
bl ScriptContext1_IsScriptSetUp
@@ -89,7 +89,7 @@ _0806C914:
ands r0, r1
cmp r0, 0
beq _0806C940
ldr r0, _0806CA14 @ =gUnknown_2037078
ldr r0, _0806CA14 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -107,7 +107,7 @@ _0806C940:
lsrs r0, 24
cmp r0, 0x1
bls _0806C9D0
ldr r0, _0806CA14 @ =gUnknown_2037078
ldr r0, _0806CA14 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -213,7 +213,7 @@ _0806C9F6:
movs r0, 0x2
b _0806CA3E
.align 2, 0
_0806CA14: .4byte gUnknown_2037078
_0806CA14: .4byte gPlayerAvatar
_0806CA18: .4byte gUnknown_203ADFA
_0806CA1C:
movs r0, 0x80
@@ -244,7 +244,7 @@ _0806CA40:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_806C8BC
thumb_func_end FieldGetPlayerInput
thumb_func_start sub_806CA4C
sub_806CA4C: @ 806CA4C
@@ -339,7 +339,7 @@ sub_806CAC8: @ 806CAC8
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
ldr r7, _0806CB70 @ =gUnknown_3005078
@@ -347,7 +347,7 @@ sub_806CAC8: @ 806CAC8
bl sub_806C888
ldrb r0, [r5, 0x2]
strb r0, [r7, 0x2]
bl sub_8081B30
bl CheckForTrainersWantingBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -406,7 +406,7 @@ _0806CB88:
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r7, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
mov r0, sp
@@ -431,7 +431,7 @@ _0806CBC0:
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r7, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
_0806CBD8:
@@ -441,7 +441,7 @@ _0806CBD8:
cmp r0, 0
beq _0806CBFC
mov r0, r8
bl sub_806D7F4
bl is_it_battle_time_3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -464,7 +464,7 @@ _0806CBFC:
mov r0, sp
adds r1, r4, 0
adds r2, r6, 0
bl sub_806D964
bl mapheader_run_first_tag2_script_list_match_conditionally
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -484,7 +484,7 @@ _0806CC2C:
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
ldrb r1, [r5]
@@ -541,7 +541,7 @@ _0806CC9C:
mov r0, sp
adds r1, r4, 0
adds r2, r6, 0
bl sub_806DCD0
bl map_warp_consider_2_to_inside
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -567,7 +567,7 @@ _0806CCCC:
bl FlagSet
movs r0, 0x6
bl PlaySE
bl sub_806F258
bl ShowStartMenu
b _0806CB6C
.align 2, 0
_0806CCF4: .4byte gUnknown_3005078
@@ -577,7 +577,7 @@ _0806CCFC:
ands r0, r1
cmp r0, 0
beq _0806CD20
bl sub_810AD10
bl UseRegisteredKeyItemOnField
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -708,7 +708,7 @@ sub_806CDF8: @ 806CDF8
bne _0806CE18
movs r0, 0x6
bl PlaySE
bl sub_806F258
bl ShowStartMenu
adds r0, r4, 0
bl DestroyTask
_0806CE18:
@@ -775,7 +775,7 @@ cur_mapdata_block_role_at_player_pos: @ 806CE74
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r0, 16
add sp, 0x4
@@ -873,7 +873,7 @@ sub_806CF38: @ 806CF38
ldrsh r0, [r4, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsCounter
@@ -1713,7 +1713,7 @@ sub_806D5E8: @ 806D5E8
lsrs r0, 24
cmp r0, 0x1
beq _0806D650
ldr r0, _0806D654 @ =gUnknown_2037078
ldr r0, _0806D654 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -1721,7 +1721,7 @@ sub_806D5E8: @ 806D5E8
bne _0806D658
lsls r0, r6, 24
lsrs r0, 24
bl sub_8059D70
bl MetatileBehavior_IsMoveTile
lsls r0, 24
cmp r0, 0
bne _0806D658
@@ -1734,7 +1734,7 @@ _0806D650:
movs r0, 0x1
b _0806D65A
.align 2, 0
_0806D654: .4byte gUnknown_2037078
_0806D654: .4byte gPlayerAvatar
_0806D658:
movs r0, 0
_0806D65A:
@@ -1792,7 +1792,7 @@ sub_806D698: @ 806D698
cmp r0, 0x2
beq _0806D72C
bl AdjustFriendship_step
ldr r0, _0806D6E4 @ =gUnknown_2037078
ldr r0, _0806D6E4 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -1800,7 +1800,7 @@ sub_806D698: @ 806D698
bne _0806D720
lsls r0, r4, 24
lsrs r0, 24
bl sub_8059D70
bl MetatileBehavior_IsMoveTile
lsls r0, 24
cmp r0, 0
bne _0806D720
@@ -1814,7 +1814,7 @@ sub_806D698: @ 806D698
b _0806D730
.align 2, 0
_0806D6E0: .4byte gUnknown_203ADFA
_0806D6E4: .4byte gUnknown_2037078
_0806D6E4: .4byte gPlayerAvatar
_0806D6E8: .4byte gUnknown_81A8CED
_0806D6EC:
bl overworld_poison_step
@@ -1961,15 +1961,15 @@ sub_806D7E8: @ 806D7E8
bx r0
thumb_func_end sub_806D7E8
thumb_func_start sub_806D7F4
sub_806D7F4: @ 806D7F4
thumb_func_start is_it_battle_time_3
is_it_battle_time_3: @ 806D7F4
push {lr}
bl sub_80833B0
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_806D7F4
thumb_func_end is_it_battle_time_3
thumb_func_start sub_806D804
sub_806D804: @ 806D804
@@ -2159,8 +2159,8 @@ _0806D958:
_0806D960: .4byte gUnknown_81C555B
thumb_func_end sub_806D928
thumb_func_start sub_806D964
sub_806D964: @ 806D964
thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally
mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2209,7 +2209,7 @@ _0806D9BC:
cmp r0, 0x1
bne _0806DA00
movs r4, 0
ldr r0, _0806D9FC @ =gUnknown_2037078
ldr r0, _0806D9FC @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -2230,7 +2230,7 @@ _0806D9E2:
movs r0, 0x1
b _0806DA02
.align 2, 0
_0806D9FC: .4byte gUnknown_2037078
_0806D9FC: .4byte gPlayerAvatar
_0806DA00:
movs r0, 0
_0806DA02:
@@ -2241,7 +2241,7 @@ _0806DA02:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_806D964
thumb_func_end mapheader_run_first_tag2_script_list_match_conditionally
thumb_func_start sub_806DA10
sub_806DA10: @ 806DA10
@@ -2600,8 +2600,8 @@ _0806DCC4:
_0806DCCC: .4byte gSaveBlock1Ptr
thumb_func_end sub_806DC54
thumb_func_start sub_806DCD0
sub_806DCD0: @ 806DCD0
thumb_func_start map_warp_consider_2_to_inside
map_warp_consider_2_to_inside: @ 806DCD0
push {r4-r7,lr}
adds r6, r0, 0
lsls r1, 16
@@ -2649,7 +2649,7 @@ _0806DD32:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_806DCD0
thumb_func_end map_warp_consider_2_to_inside
thumb_func_start map_warp_check
map_warp_check: @ 806DD38
@@ -2799,7 +2799,7 @@ sub_806DE28: @ 806DE28
ldrsh r0, [r5, r1]
movs r2, 0x12
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r0, 0x66
bne _0806DE64
movs r0, 0x25
@@ -2839,7 +2839,7 @@ sub_806DE70: @ 806DE70
asrs r0, 16
lsrs r6, r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r0, 0x20
bne _0806DEB8
cmp r5, 0
@@ -3017,7 +3017,7 @@ sub_806DFB8: @ 806DFB8
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0806E010 @ =gMapHeader
@@ -3095,7 +3095,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3121,7 +3121,7 @@ SetCableClubWarp: @ 806E08C
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
ldr r4, _0806E0CC @ =gMapHeader
adds r0, r4, 0
mov r1, sp
asm/field_door.s
+4 -4
View File
@@ -487,7 +487,7 @@ sub_805B268: @ 805B268
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059BDC
@@ -515,7 +515,7 @@ sub_805B29C: @ 805B29C
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059BDC
@@ -543,7 +543,7 @@ sub_805B2D0: @ 805B2D0
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059BDC
@@ -577,7 +577,7 @@ sub_805B310: @ 805B310
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059BDC
asm/field_effect.s
+116 -116
View File
@@ -2068,7 +2068,7 @@ mapldr_08084390: @ 8084390
movs r1, 0
bl CreateTask
ldr r4, _080843EC @ =gMapObjects
ldr r3, _080843F0 @ =gUnknown_2037078
ldr r3, _080843F0 @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2102,7 +2102,7 @@ _080843D2:
.align 2, 0
_080843E8: .4byte c3_080843F8
_080843EC: .4byte gMapObjects
_080843F0: .4byte gUnknown_2037078
_080843F0: .4byte gPlayerAvatar
_080843F4: .4byte gUnknown_3005020
thumb_func_end mapldr_08084390
@@ -2209,7 +2209,7 @@ sub_80844BC: @ 80844BC
mov r5, r8
push {r5,r6}
mov r9, r0
ldr r6, _08084558 @ =gUnknown_2037078
ldr r6, _08084558 @ =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r5, r0, 3
adds r5, r0
@@ -2278,7 +2278,7 @@ sub_80844BC: @ 80844BC
pop {r1}
bx r1
.align 2, 0
_08084558: .4byte gUnknown_2037078
_08084558: .4byte gPlayerAvatar
_0808455C: .4byte gMapObjects
_08084560: .4byte gSprites
thumb_func_end sub_80844BC
@@ -2305,7 +2305,7 @@ _08084578:
sub_8084580: @ 8084580
push {r4-r6,lr}
adds r5, r0, 0
ldr r6, _080845E4 @ =gUnknown_2037078
ldr r6, _080845E4 @ =gPlayerAvatar
ldrb r0, [r6, 0x4]
lsls r2, r0, 4
adds r2, r0
@@ -2352,7 +2352,7 @@ sub_8084580: @ 8084580
pop {r1}
bx r1
.align 2, 0
_080845E4: .4byte gUnknown_2037078
_080845E4: .4byte gPlayerAvatar
_080845E8: .4byte gSprites
_080845EC: .4byte gSpriteCoordOffsetY
_080845F0: .4byte gMapObjects
@@ -2362,7 +2362,7 @@ _080845F0: .4byte gMapObjects
sub_80845F4: @ 80845F4
push {r4-r6,lr}
adds r4, r0, 0
ldr r2, _080846A0 @ =gUnknown_2037078
ldr r2, _080846A0 @ =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2449,7 +2449,7 @@ _08084698:
pop {r1}
bx r1
.align 2, 0
_080846A0: .4byte gUnknown_2037078
_080846A0: .4byte gPlayerAvatar
_080846A4: .4byte gMapObjects
_080846A8: .4byte gSprites
thumb_func_end sub_80845F4
@@ -2511,7 +2511,7 @@ _080846FE:
sub_8084708: @ 8084708
push {r4,lr}
sub sp, 0x4
ldr r1, _08084778 @ =gUnknown_2037078
ldr r1, _08084778 @ =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
@@ -2528,7 +2528,7 @@ sub_8084708: @ 8084708
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r0, 16
bl sub_8055B38
@@ -2555,7 +2555,7 @@ _08084760:
pop {r1}
bx r1
.align 2, 0
_08084778: .4byte gUnknown_2037078
_08084778: .4byte gPlayerAvatar
_0808477C: .4byte 0x00004001
_08084780: .4byte sub_8084484
thumb_func_end sub_8084708
@@ -2645,7 +2645,7 @@ sub_80847F8: @ 80847F8
sub_8084820: @ 8084820
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _08084888 @ =gUnknown_2037078
ldr r0, _08084888 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2692,7 +2692,7 @@ _0808487E:
pop {r1}
bx r1
.align 2, 0
_08084888: .4byte gUnknown_2037078
_08084888: .4byte gPlayerAvatar
_0808488C: .4byte gMapObjects
thumb_func_end sub_8084820
@@ -2760,7 +2760,7 @@ sub_80848E8: @ 80848E8
sub_80848F8: @ 80848F8
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _0808493C @ =gUnknown_2037078
ldr r0, _0808493C @ =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -2792,7 +2792,7 @@ _08084936:
pop {r0}
bx r0
.align 2, 0
_0808493C: .4byte gUnknown_2037078
_0808493C: .4byte gPlayerAvatar
_08084940: .4byte gSprites
thumb_func_end sub_80848F8
@@ -2800,7 +2800,7 @@ _08084940: .4byte gSprites
sub_8084944: @ 8084944
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _08084988 @ =gUnknown_2037078
ldr r0, _08084988 @ =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -2832,7 +2832,7 @@ _08084982:
pop {r0}
bx r0
.align 2, 0
_08084988: .4byte gUnknown_2037078
_08084988: .4byte gPlayerAvatar
_0808498C: .4byte gSprites
thumb_func_end sub_8084944
@@ -2939,7 +2939,7 @@ sub_8084A5C: @ 8084A5C
sub sp, 0x4
adds r5, r0, 0
bl CameraObjectReset2
ldr r0, _08084ABC @ =gUnknown_2037078
ldr r0, _08084ABC @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -2963,7 +2963,7 @@ sub_8084A5C: @ 8084A5C
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r1, r0, 24
ldrh r0, [r5, 0x8]
@@ -2978,7 +2978,7 @@ sub_8084A5C: @ 8084A5C
strh r0, [r5, 0x8]
b _08084AC6
.align 2, 0
_08084ABC: .4byte gUnknown_2037078
_08084ABC: .4byte gPlayerAvatar
_08084AC0: .4byte gMapObjects
_08084AC4:
movs r1, 0
@@ -2996,7 +2996,7 @@ _08084AC6:
sub_8084AD8: @ 8084AD8
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _08084B10 @ =gUnknown_2037078
ldr r0, _08084B10 @ =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -3021,7 +3021,7 @@ sub_8084AD8: @ 8084AD8
pop {r1}
bx r1
.align 2, 0
_08084B10: .4byte gUnknown_2037078
_08084B10: .4byte gPlayerAvatar
_08084B14: .4byte gSprites
thumb_func_end sub_8084AD8
@@ -3029,7 +3029,7 @@ _08084B14: .4byte gSprites
sub_8084B18: @ 8084B18
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, _08084B70 @ =gUnknown_2037078
ldr r0, _08084B70 @ =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3071,7 +3071,7 @@ _08084B66:
pop {r1}
bx r1
.align 2, 0
_08084B70: .4byte gUnknown_2037078
_08084B70: .4byte gPlayerAvatar
_08084B74: .4byte gSprites
thumb_func_end sub_8084B18
@@ -3079,7 +3079,7 @@ _08084B74: .4byte gSprites
sub_8084B78: @ 8084B78
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _08084BB0 @ =gUnknown_2037078
ldr r0, _08084BB0 @ =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -3104,7 +3104,7 @@ sub_8084B78: @ 8084B78
pop {r1}
bx r1
.align 2, 0
_08084BB0: .4byte gUnknown_2037078
_08084BB0: .4byte gPlayerAvatar
_08084BB4: .4byte gSprites
thumb_func_end sub_8084B78
@@ -3112,7 +3112,7 @@ _08084BB4: .4byte gSprites
sub_8084BB8: @ 8084BB8
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, _08084C10 @ =gUnknown_2037078
ldr r0, _08084C10 @ =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3155,7 +3155,7 @@ _08084C08:
pop {r1}
bx r1
.align 2, 0
_08084C10: .4byte gUnknown_2037078
_08084C10: .4byte gPlayerAvatar
_08084C14: .4byte gSprites
thumb_func_end sub_8084BB8
@@ -3184,7 +3184,7 @@ _08084C36:
thumb_func_start sub_8084C3C
sub_8084C3C: @ 8084C3C
push {r4,lr}
ldr r0, _08084C94 @ =gUnknown_2037078
ldr r0, _08084C94 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -3219,7 +3219,7 @@ _08084C8A:
pop {r1}
bx r1
.align 2, 0
_08084C94: .4byte gUnknown_2037078
_08084C94: .4byte gPlayerAvatar
_08084C98: .4byte gMapObjects
_08084C9C: .4byte sub_8084A24
thumb_func_end sub_8084C3C
@@ -3268,7 +3268,7 @@ _08084CEA:
ldrsh r2, [r4, r0]
lsls r2, 2
adds r2, r5
ldr r0, _08084D1C @ =gUnknown_2037078
ldr r0, _08084D1C @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -3287,7 +3287,7 @@ _08084CEA:
.align 2, 0
_08084D14: .4byte gUnknown_83CC084
_08084D18: .4byte gTasks
_08084D1C: .4byte gUnknown_2037078
_08084D1C: .4byte gPlayerAvatar
_08084D20: .4byte gMapObjects
thumb_func_end sub_8084CD8
@@ -3296,7 +3296,7 @@ sub_8084D24: @ 8084D24
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
ldr r1, _08084D40 @ =gUnknown_2037078
ldr r1, _08084D40 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrh r0, [r4, 0x8]
@@ -3307,7 +3307,7 @@ sub_8084D24: @ 8084D24
pop {r1}
bx r1
.align 2, 0
_08084D40: .4byte gUnknown_2037078
_08084D40: .4byte gPlayerAvatar
thumb_func_end sub_8084D24
thumb_func_start waterfall_1_do_anim_probably
@@ -3404,7 +3404,7 @@ _08084DE2:
cmp r4, 0
bne _08084E18
bl ScriptContext2_Disable
ldr r0, _08084E10 @ =gUnknown_2037078
ldr r0, _08084E10 @ =gPlayerAvatar
strb r4, [r0, 0x6]
ldr r0, _08084E14 @ =sub_8084CD8
bl FindTaskIdByFunc
@@ -3416,7 +3416,7 @@ _08084DE2:
movs r0, 0
b _08084E1E
.align 2, 0
_08084E10: .4byte gUnknown_2037078
_08084E10: .4byte gPlayerAvatar
_08084E14: .4byte sub_8084CD8
_08084E18:
movs r0, 0x3
@@ -3490,7 +3490,7 @@ _08084E94: .4byte gTasks
thumb_func_start dive_1_lock
dive_1_lock: @ 8084E98
ldr r2, _08084EA8 @ =gUnknown_2037078
ldr r2, _08084EA8 @ =gPlayerAvatar
movs r1, 0x1
strb r1, [r2, 0x6]
ldrh r1, [r0, 0x8]
@@ -3499,7 +3499,7 @@ dive_1_lock: @ 8084E98
movs r0, 0
bx lr
.align 2, 0
_08084EA8: .4byte gUnknown_2037078
_08084EA8: .4byte gPlayerAvatar
thumb_func_end dive_1_lock
thumb_func_start dive_2_unknown
@@ -3538,7 +3538,7 @@ dive_3_unknown: @ 8084ED4
cmp r0, 0
bne _08084F18
ldr r2, _08084F20 @ =gMapObjects
ldr r0, _08084F24 @ =gUnknown_2037078
ldr r0, _08084F24 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -3561,7 +3561,7 @@ _08084F18:
bx r1
.align 2, 0
_08084F20: .4byte gMapObjects
_08084F24: .4byte gUnknown_2037078
_08084F24: .4byte gPlayerAvatar
_08084F28: .4byte sub_8084E60
thumb_func_end dive_3_unknown
@@ -3586,7 +3586,7 @@ sub_8084F44: @ 8084F44
lsrs r0, 24
ldr r6, _08084F8C @ =gUnknown_83CC0A4
ldr r2, _08084F90 @ =gTasks
ldr r5, _08084F94 @ =gUnknown_2037078
ldr r5, _08084F94 @ =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3620,7 +3620,7 @@ _08084F58:
.align 2, 0
_08084F8C: .4byte gUnknown_83CC0A4
_08084F90: .4byte gTasks
_08084F94: .4byte gUnknown_2037078
_08084F94: .4byte gPlayerAvatar
_08084F98: .4byte gMapObjects
_08084F9C: .4byte gSprites
thumb_func_end sub_8084F44
@@ -3634,7 +3634,7 @@ sub_8084FA0: @ 8084FA0
bl CameraObjectReset2
movs r0, 0
bl SetCameraPanningCallback
ldr r0, _08084FD4 @ =gUnknown_2037078
ldr r0, _08084FD4 @ =gPlayerAvatar
movs r2, 0x1
strb r2, [r0, 0x6]
ldrb r0, [r5, 0x3]
@@ -3650,7 +3650,7 @@ sub_8084FA0: @ 8084FA0
pop {r1}
bx r1
.align 2, 0
_08084FD4: .4byte gUnknown_2037078
_08084FD4: .4byte gPlayerAvatar
thumb_func_end sub_8084FA0
thumb_func_start sub_8084FD8
@@ -3932,7 +3932,7 @@ sub_80851E8: @ 80851E8
lsrs r0, 24
ldr r6, _08085230 @ =gUnknown_83CC0BC
ldr r2, _08085234 @ =gTasks
ldr r5, _08085238 @ =gUnknown_2037078
ldr r5, _08085238 @ =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3966,7 +3966,7 @@ _080851FC:
.align 2, 0
_08085230: .4byte gUnknown_83CC0BC
_08085234: .4byte gTasks
_08085238: .4byte gUnknown_2037078
_08085238: .4byte gPlayerAvatar
_0808523C: .4byte gMapObjects
_08085240: .4byte gSprites
thumb_func_end sub_80851E8
@@ -3978,7 +3978,7 @@ sub_8085244: @ 8085244
adds r4, r1, 0
bl CameraObjectReset2
bl player_bitmagic
ldr r1, _08085270 @ =gUnknown_2037078
ldr r1, _08085270 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r0, [r4, 0x1]
@@ -3993,7 +3993,7 @@ sub_8085244: @ 8085244
pop {r1}
bx r1
.align 2, 0
_08085270: .4byte gUnknown_2037078
_08085270: .4byte gPlayerAvatar
thumb_func_end sub_8085244
thumb_func_start sub_8085274
@@ -4088,7 +4088,7 @@ sub_8085314: @ 8085314
lsls r0, 24
cmp r0, 0
beq _0808533E
ldr r1, _08085344 @ =gUnknown_2037078
ldr r1, _08085344 @ =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
@@ -4103,7 +4103,7 @@ _0808533E:
pop {r1}
bx r1
.align 2, 0
_08085344: .4byte gUnknown_2037078
_08085344: .4byte gPlayerAvatar
_08085348: .4byte sub_80851E8
thumb_func_end sub_8085314
@@ -4195,7 +4195,7 @@ sub_80853E4: @ 80853E4
lsrs r0, 24
ldr r6, _0808542C @ =gUnknown_83CC0CC
ldr r2, _08085430 @ =gTasks
ldr r5, _08085434 @ =gUnknown_2037078
ldr r5, _08085434 @ =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -4229,7 +4229,7 @@ _080853F8:
.align 2, 0
_0808542C: .4byte gUnknown_83CC0CC
_08085430: .4byte gTasks
_08085434: .4byte gUnknown_2037078
_08085434: .4byte gPlayerAvatar
_08085438: .4byte gMapObjects
_0808543C: .4byte gSprites
thumb_func_end sub_80853E4
@@ -4241,7 +4241,7 @@ sub_8085440: @ 8085440
adds r4, r1, 0
bl player_bitmagic
bl CameraObjectReset2
ldr r1, _0808546C @ =gUnknown_2037078
ldr r1, _0808546C @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r0, [r4, 0x3]
@@ -4256,7 +4256,7 @@ sub_8085440: @ 8085440
pop {r1}
bx r1
.align 2, 0
_0808546C: .4byte gUnknown_2037078
_0808546C: .4byte gPlayerAvatar
thumb_func_end sub_8085440
thumb_func_start sub_8085470
@@ -4541,7 +4541,7 @@ sub_808566C: @ 808566C
sub_8085690: @ 8085690
push {r4-r6,lr}
adds r5, r0, 0
ldr r0, _080856D4 @ =gUnknown_2037078
ldr r0, _080856D4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4571,7 +4571,7 @@ sub_8085690: @ 8085690
bl PlaySE
b _08085702
.align 2, 0
_080856D4: .4byte gUnknown_2037078
_080856D4: .4byte gPlayerAvatar
_080856D8: .4byte gMapObjects
_080856DC:
movs r1, 0x8
@@ -4974,7 +4974,7 @@ sub_80859D4: @ 80859D4
movs r0, 0
str r0, [r1]
ldr r2, _08085A18 @ =gMapObjects
ldr r0, _08085A1C @ =gUnknown_2037078
ldr r0, _08085A1C @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4992,7 +4992,7 @@ sub_80859D4: @ 80859D4
.align 2, 0
_08085A14: .4byte gUnknown_3005020
_08085A18: .4byte gMapObjects
_08085A1C: .4byte gUnknown_2037078
_08085A1C: .4byte gPlayerAvatar
_08085A20: .4byte sub_8085A24
thumb_func_end sub_80859D4
@@ -5051,7 +5051,7 @@ sub_8085A80: @ 8085A80
adds r4, r0, 0
adds r5, r4, 0
adds r5, 0x8
ldr r0, _08085AD4 @ =gUnknown_2037078
ldr r0, _08085AD4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5087,7 +5087,7 @@ sub_8085A80: @ 8085A80
strh r0, [r5, 0xC]
b _08085B10
.align 2, 0
_08085AD4: .4byte gUnknown_2037078
_08085AD4: .4byte gPlayerAvatar
_08085AD8: .4byte gMapObjects
_08085ADC:
movs r2, 0xE
@@ -5221,7 +5221,7 @@ sub_8085BD0: @ 8085BD0
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r0, _08085C58 @ =gUnknown_2037078
ldr r0, _08085C58 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5281,7 +5281,7 @@ _08085C4A:
bx r0
.align 2, 0
_08085C54: .4byte gUnknown_83CC108
_08085C58: .4byte gUnknown_2037078
_08085C58: .4byte gPlayerAvatar
_08085C5C: .4byte gMapObjects
thumb_func_end sub_8085BD0
@@ -5294,7 +5294,7 @@ sub_8085C60: @ 8085C60
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r2, _08085D28 @ =gUnknown_2037078
ldr r2, _08085D28 @ =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5386,7 +5386,7 @@ _08085D1A:
bx r0
.align 2, 0
_08085D24: .4byte gUnknown_83CC108
_08085D28: .4byte gUnknown_2037078
_08085D28: .4byte gPlayerAvatar
_08085D2C: .4byte gMapObjects
_08085D30: .4byte gSprites
thumb_func_end sub_8085C60
@@ -5440,7 +5440,7 @@ mapldr_08085D88: @ 8085D88
movs r0, 0
str r0, [r1]
ldr r2, _08085DD0 @ =gMapObjects
ldr r0, _08085DD4 @ =gUnknown_2037078
ldr r0, _08085DD4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5459,7 +5459,7 @@ mapldr_08085D88: @ 8085D88
.align 2, 0
_08085DCC: .4byte gUnknown_3005020
_08085DD0: .4byte gMapObjects
_08085DD4: .4byte gUnknown_2037078
_08085DD4: .4byte gPlayerAvatar
_08085DD8: .4byte sub_8085DDC
thumb_func_end mapldr_08085D88
@@ -5496,7 +5496,7 @@ sub_8085E0C: @ 8085E0C
lsls r0, 24
cmp r0, 0
beq _08085E82
ldr r5, _08085E88 @ =gUnknown_2037078
ldr r5, _08085E88 @ =gPlayerAvatar
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
adds r2, r0
@@ -5551,7 +5551,7 @@ _08085E82:
pop {r0}
bx r0
.align 2, 0
_08085E88: .4byte gUnknown_2037078
_08085E88: .4byte gPlayerAvatar
_08085E8C: .4byte gSprites
_08085E90: .4byte gSpriteCoordOffsetY
_08085E94: .4byte gMapObjects
@@ -5566,7 +5566,7 @@ sub_8085E98: @ 8085E98
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r2, _08085F04 @ =gUnknown_2037078
ldr r2, _08085F04 @ =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5612,7 +5612,7 @@ sub_8085E98: @ 8085E98
b _08085F36
.align 2, 0
_08085F00: .4byte gUnknown_83CC108
_08085F04: .4byte gUnknown_2037078
_08085F04: .4byte gPlayerAvatar
_08085F08: .4byte gMapObjects
_08085F0C: .4byte gSprites
_08085F10:
@@ -5699,7 +5699,7 @@ sub_8085F9C: @ 8085F9C
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r0, _0808601C @ =gUnknown_2037078
ldr r0, _0808601C @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5750,7 +5750,7 @@ _08086010:
bx r0
.align 2, 0
_08086018: .4byte gUnknown_83CC108
_0808601C: .4byte gUnknown_2037078
_0808601C: .4byte gPlayerAvatar
_08086020: .4byte gMapObjects
_08086024: .4byte sub_8085DDC
thumb_func_end sub_8085F9C
@@ -7001,7 +7001,7 @@ sub_80869C0: @ 80869C0
adds r4, r0, 0
bl ScriptContext2_Enable
bl player_bitmagic
ldr r5, _08086A18 @ =gUnknown_2037078
ldr r5, _08086A18 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
movs r0, 0x8
@@ -7034,7 +7034,7 @@ sub_80869C0: @ 80869C0
pop {r0}
bx r0
.align 2, 0
_08086A18: .4byte gUnknown_2037078
_08086A18: .4byte gPlayerAvatar
_08086A1C: .4byte gMapObjects
thumb_func_end sub_80869C0
@@ -7042,7 +7042,7 @@ _08086A1C: .4byte gMapObjects
sub_8086A20: @ 8086A20
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _08086A64 @ =gUnknown_2037078
ldr r0, _08086A64 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7072,7 +7072,7 @@ _08086A5C:
pop {r0}
bx r0
.align 2, 0
_08086A64: .4byte gUnknown_2037078
_08086A64: .4byte gPlayerAvatar
_08086A68: .4byte gMapObjects
thumb_func_end sub_8086A20
@@ -7080,7 +7080,7 @@ _08086A68: .4byte gMapObjects
sub_8086A6C: @ 8086A6C
push {r4,lr}
adds r4, r0, 0
ldr r0, _08086AA8 @ =gUnknown_2037078
ldr r0, _08086AA8 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7108,7 +7108,7 @@ _08086AA2:
pop {r0}
bx r0
.align 2, 0
_08086AA8: .4byte gUnknown_2037078
_08086AA8: .4byte gPlayerAvatar
_08086AAC: .4byte gMapObjects
_08086AB0: .4byte gUnknown_20386E0
thumb_func_end sub_8086A6C
@@ -7122,7 +7122,7 @@ sub_8086AB4: @ 8086AB4
lsls r0, 24
cmp r0, 0
bne _08086B1E
ldr r5, _08086B24 @ =gUnknown_2037078
ldr r5, _08086B24 @ =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -7166,7 +7166,7 @@ _08086B1E:
pop {r0}
bx r0
.align 2, 0
_08086B24: .4byte gUnknown_2037078
_08086B24: .4byte gPlayerAvatar
_08086B28: .4byte gMapObjects
_08086B2C: .4byte gUnknown_20386E0
thumb_func_end sub_8086AB4
@@ -7174,7 +7174,7 @@ _08086B2C: .4byte gUnknown_20386E0
thumb_func_start sub_8086B30
sub_8086B30: @ 8086B30
push {r4,r5,lr}
ldr r5, _08086B9C @ =gUnknown_2037078
ldr r5, _08086B9C @ =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7219,7 +7219,7 @@ _08086B96:
pop {r0}
bx r0
.align 2, 0
_08086B9C: .4byte gUnknown_2037078
_08086B9C: .4byte gPlayerAvatar
_08086BA0: .4byte gMapObjects
_08086BA4: .4byte sub_8086990
thumb_func_end sub_8086B30
@@ -7277,7 +7277,7 @@ sub_8086C00: @ 8086C00
adds r4, r0, 0
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _08086C20 @ =gUnknown_2037078
ldr r1, _08086C20 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrh r0, [r4, 0x8]
@@ -7287,14 +7287,14 @@ sub_8086C00: @ 8086C00
pop {r0}
bx r0
.align 2, 0
_08086C20: .4byte gUnknown_2037078
_08086C20: .4byte gPlayerAvatar
thumb_func_end sub_8086C00
thumb_func_start sub_8086C24
sub_8086C24: @ 8086C24
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _08086C68 @ =gUnknown_2037078
ldr r0, _08086C68 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7324,7 +7324,7 @@ _08086C60:
pop {r0}
bx r0
.align 2, 0
_08086C68: .4byte gUnknown_2037078
_08086C68: .4byte gPlayerAvatar
_08086C6C: .4byte gMapObjects
thumb_func_end sub_8086C24
@@ -7332,7 +7332,7 @@ _08086C6C: .4byte gMapObjects
sub_8086C70: @ 8086C70
push {r4-r6,lr}
adds r6, r0, 0
ldr r5, _08086C9C @ =gUnknown_2037078
ldr r5, _08086C9C @ =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7352,7 +7352,7 @@ sub_8086C70: @ 8086C70
movs r0, 0x1
b _08086CAE
.align 2, 0
_08086C9C: .4byte gUnknown_2037078
_08086C9C: .4byte gPlayerAvatar
_08086CA0: .4byte gMapObjects
_08086CA4:
movs r0, 0x8
@@ -7398,7 +7398,7 @@ _08086CEE:
thumb_func_start sub_8086CF4
sub_8086CF4: @ 8086CF4
push {r4,lr}
ldr r4, _08086D2C @ =gUnknown_2037078
ldr r4, _08086D2C @ =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7423,7 +7423,7 @@ _08086D26:
pop {r0}
bx r0
.align 2, 0
_08086D2C: .4byte gUnknown_2037078
_08086D2C: .4byte gPlayerAvatar
_08086D30: .4byte gMapObjects
_08086D34: .4byte sub_8086BD0
thumb_func_end sub_8086CF4
@@ -7591,7 +7591,7 @@ _08086E6C: .4byte gTasks
sub_8086E70: @ 8086E70
push {r4-r6,lr}
adds r5, r0, 0
ldr r6, _08086EC0 @ =gUnknown_2037078
ldr r6, _08086EC0 @ =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7626,7 +7626,7 @@ _08086EB8:
pop {r0}
bx r0
.align 2, 0
_08086EC0: .4byte gUnknown_2037078
_08086EC0: .4byte gPlayerAvatar
_08086EC4: .4byte gMapObjects
thumb_func_end sub_8086E70
@@ -7634,7 +7634,7 @@ _08086EC4: .4byte gMapObjects
sub_8086EC8: @ 8086EC8
push {r4,lr}
adds r4, r0, 0
ldr r0, _08086F00 @ =gUnknown_2037078
ldr r0, _08086F00 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7659,7 +7659,7 @@ _08086EF8:
pop {r0}
bx r0
.align 2, 0
_08086F00: .4byte gUnknown_2037078
_08086F00: .4byte gPlayerAvatar
_08086F04: .4byte gMapObjects
_08086F08: .4byte gUnknown_20386E0
thumb_func_end sub_8086EC8
@@ -7673,7 +7673,7 @@ sub_8086F0C: @ 8086F0C
lsls r0, 24
cmp r0, 0
bne _08086F54
ldr r0, _08086F5C @ =gUnknown_2037078
ldr r0, _08086F5C @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7704,7 +7704,7 @@ _08086F54:
pop {r0}
bx r0
.align 2, 0
_08086F5C: .4byte gUnknown_2037078
_08086F5C: .4byte gPlayerAvatar
_08086F60: .4byte gMapObjects
thumb_func_end sub_8086F0C
@@ -7724,7 +7724,7 @@ sub_8086F64: @ 8086F64
strh r0, [r4, 0xC]
movs r0, 0x1
bl SetPlayerAvatarTransitionFlags
ldr r0, _08086FA0 @ =gUnknown_2037078
ldr r0, _08086FA0 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7738,7 +7738,7 @@ _08086F98:
pop {r0}
bx r0
.align 2, 0
_08086FA0: .4byte gUnknown_2037078
_08086FA0: .4byte gPlayerAvatar
_08086FA4: .4byte gMapObjects
thumb_func_end sub_8086F64
@@ -7746,7 +7746,7 @@ _08086FA4: .4byte gMapObjects
sub_8086FA8: @ 8086FA8
push {r4,lr}
adds r4, r0, 0
ldr r0, _08086FF4 @ =gUnknown_2037078
ldr r0, _08086FF4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7781,7 +7781,7 @@ _08086FEC:
pop {r0}
bx r0
.align 2, 0
_08086FF4: .4byte gUnknown_2037078
_08086FF4: .4byte gPlayerAvatar
_08086FF8: .4byte gMapObjects
thumb_func_end sub_8086FA8
@@ -7796,7 +7796,7 @@ sub_8086FFC: @ 8086FFC
asrs r0, 16
cmp r0, 0x7
ble _0808705A
ldr r0, _08087060 @ =gUnknown_2037078
ldr r0, _08087060 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -7835,7 +7835,7 @@ _0808705A:
pop {r0}
bx r0
.align 2, 0
_08087060: .4byte gUnknown_2037078
_08087060: .4byte gPlayerAvatar
_08087064: .4byte gMapObjects
_08087068: .4byte gSprites
thumb_func_end sub_8086FFC
@@ -7851,7 +7851,7 @@ sub_808706C: @ 808706C
asrs r0, 16
cmp r0, 0x9
ble _080870FC
ldr r0, _08087104 @ =gUnknown_2037078
ldr r0, _08087104 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -7914,7 +7914,7 @@ _080870FC:
pop {r0}
bx r0
.align 2, 0
_08087104: .4byte gUnknown_2037078
_08087104: .4byte gPlayerAvatar
_08087108: .4byte gMapObjects
_0808710C: .4byte gSprites
_08087110: .4byte gSaveBlock2Ptr
@@ -8425,7 +8425,7 @@ _080874C4: .4byte gTasks
sub_80874C8: @ 80874C8
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, _080875B4 @ =gUnknown_2037078
ldr r4, _080875B4 @ =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -8531,7 +8531,7 @@ _080875AE:
pop {r0}
bx r0
.align 2, 0
_080875B4: .4byte gUnknown_2037078
_080875B4: .4byte gPlayerAvatar
_080875B8: .4byte gMapObjects
_080875BC: .4byte gSprites
_080875C0: .4byte gSaveBlock2Ptr
@@ -8561,7 +8561,7 @@ sub_80875C8: @ 80875C8
cmp r0, 0
bne _08087630
_080875F2:
ldr r0, _0808763C @ =gUnknown_2037078
ldr r0, _0808763C @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -8597,7 +8597,7 @@ _08087630:
bx r0
.align 2, 0
_08087638: .4byte gSprites
_0808763C: .4byte gUnknown_2037078
_0808763C: .4byte gPlayerAvatar
_08087640: .4byte gMapObjects
thumb_func_end sub_80875C8
@@ -8610,7 +8610,7 @@ sub_8087644: @ 8087644
mov r0, sp
movs r2, 0x24
bl memcpy
ldr r0, _08087690 @ =gUnknown_2037078
ldr r0, _08087690 @ =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r1, r0, 4
adds r1, r0
@@ -8640,7 +8640,7 @@ _08087682:
bx r0
.align 2, 0
_0808768C: .4byte gUnknown_83CC1F0
_08087690: .4byte gUnknown_2037078
_08087690: .4byte gPlayerAvatar
_08087694: .4byte gSprites
thumb_func_end sub_8087644
@@ -8653,7 +8653,7 @@ sub_8087698: @ 8087698
lsls r0, 24
cmp r0, 0
beq _080876FC
ldr r0, _08087704 @ =gUnknown_2037078
ldr r0, _08087704 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r5, r0, 3
adds r5, r0
@@ -8697,7 +8697,7 @@ _080876FC:
pop {r0}
bx r0
.align 2, 0
_08087704: .4byte gUnknown_2037078
_08087704: .4byte gPlayerAvatar
_08087708: .4byte gMapObjects
_0808770C: .4byte gSprites
thumb_func_end sub_8087698
@@ -8706,7 +8706,7 @@ _0808770C: .4byte gSprites
sub_8087710: @ 8087710
push {r4,lr}
adds r4, r0, 0
ldr r0, _08087740 @ =gUnknown_2037078
ldr r0, _08087740 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -8727,7 +8727,7 @@ _08087738:
pop {r0}
bx r0
.align 2, 0
_08087740: .4byte gUnknown_2037078
_08087740: .4byte gPlayerAvatar
_08087744: .4byte gMapObjects
thumb_func_end sub_8087710
@@ -8771,7 +8771,7 @@ fishE: @ 8087780
lsls r0, 16
cmp r0, 0
bne _080877EA
ldr r6, _080877F0 @ =gUnknown_2037078
ldr r6, _080877F0 @ =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -8815,7 +8815,7 @@ _080877EA:
pop {r0}
bx r0
.align 2, 0
_080877F0: .4byte gUnknown_2037078
_080877F0: .4byte gPlayerAvatar
_080877F4: .4byte gMapObjects
_080877F8: .4byte sub_8087498
thumb_func_end fishE
asm/field_effect_helpers.s
+4 -4
View File
@@ -888,7 +888,7 @@ _080DB438:
ldrsh r0, [r5, r2]
movs r2, 0x32
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r6, r0, 24
mov r0, r8
@@ -1239,7 +1239,7 @@ _080DB6E8:
ldrsh r0, [r5, r2]
movs r2, 0x32
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r4, r0, 24
mov r0, r8
@@ -2864,7 +2864,7 @@ sub_80DC348: @ 80DC348
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, _080DC3A0 @ =gMapObjects
ldr r0, _080DC3A4 @ =gUnknown_2037078
ldr r0, _080DC3A4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2881,7 +2881,7 @@ sub_80DC348: @ 80DC348
bx r0
.align 2, 0
_080DC3A0: .4byte gMapObjects
_080DC3A4: .4byte gUnknown_2037078
_080DC3A4: .4byte gPlayerAvatar
thumb_func_end sub_80DC348
thumb_func_start sub_80DC3A8
asm/field_fadetransition.s
+12 -12
View File
@@ -461,7 +461,7 @@ sub_807DE78: @ 807DE78
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -1831,7 +1831,7 @@ sub_807E980: @ 807E980
lsls r0, 3
ldr r1, _0807E9C0 @ =gTasks+0x8
adds r5, r0, r1
ldr r2, _0807E9C4 @ =gUnknown_2037078
ldr r2, _0807E9C4 @ =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1855,7 +1855,7 @@ sub_807E980: @ 807E980
b _0807EA9A
.align 2, 0
_0807E9C0: .4byte gTasks+0x8
_0807E9C4: .4byte gUnknown_2037078
_0807E9C4: .4byte gPlayerAvatar
_0807E9C8: .4byte gMapObjects
_0807E9CC: .4byte gSprites
_0807E9D0:
@@ -1984,7 +1984,7 @@ sub_807EAC4: @ 807EAC4
lsls r0, 16
lsrs r0, 16
mov r12, r0
ldr r3, _0807EB58 @ =gUnknown_2037078
ldr r3, _0807EB58 @ =gPlayerAvatar
ldrb r2, [r3, 0x4]
lsls r0, r2, 4
adds r0, r2
@@ -2049,7 +2049,7 @@ _0807EB4C:
pop {r0}
bx r0
.align 2, 0
_0807EB58: .4byte gUnknown_2037078
_0807EB58: .4byte gPlayerAvatar
_0807EB5C: .4byte gSprites
_0807EB60: .4byte gMapObjects
thumb_func_end sub_807EAC4
@@ -2064,7 +2064,7 @@ sub_807EB64: @ 807EB64
mov r8, r2
lsls r5, 16
lsrs r5, 16
ldr r0, _0807EBB4 @ =gUnknown_2037078
ldr r0, _0807EBB4 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -2092,7 +2092,7 @@ sub_807EB64: @ 807EB64
pop {r0}
bx r0
.align 2, 0
_0807EBB4: .4byte gUnknown_2037078
_0807EBB4: .4byte gPlayerAvatar
_0807EBB8: .4byte gMapObjects
thumb_func_end sub_807EB64
@@ -2247,7 +2247,7 @@ sub_807ECBC: @ 807ECBC
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
@@ -2266,7 +2266,7 @@ _0807ED06:
_0807ED0A:
movs r1, 0x4
_0807ED0C:
ldr r0, _0807ED94 @ =gUnknown_2037078
ldr r0, _0807ED94 @ =gPlayerAvatar
mov r8, r0
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
@@ -2332,7 +2332,7 @@ _0807ED0C:
pop {r0}
bx r0
.align 2, 0
_0807ED94: .4byte gUnknown_2037078
_0807ED94: .4byte gPlayerAvatar
_0807ED98: .4byte gMapObjects
_0807ED9C: .4byte gSprites
thumb_func_end sub_807ECBC
@@ -2343,7 +2343,7 @@ sub_807EDA0: @ 807EDA0
adds r5, r0, 0
adds r6, r1, 0
ldr r4, [sp, 0x14]
ldr r0, _0807EDC8 @ =gUnknown_2037078
ldr r0, _0807EDC8 @ =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -2359,7 +2359,7 @@ sub_807EDA0: @ 807EDA0
movs r0, 0
b _0807EDF8
.align 2, 0
_0807EDC8: .4byte gUnknown_2037078
_0807EDC8: .4byte gPlayerAvatar
_0807EDCC: .4byte gSprites
_0807EDD0:
ldrh r0, [r5]
asm/field_ground_effect.s
+9 -9
View File
@@ -118,13 +118,13 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24
ldrsh r0, [r4, r1]
movs r2, 0x16
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
strb r0, [r4, 0x1F]
movs r1, 0x10
ldrsh r0, [r4, r1]
movs r2, 0x12
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
strb r0, [r4, 0x1E]
pop {r4}
pop {r0}
@@ -616,7 +616,7 @@ _08067FA0:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -632,7 +632,7 @@ _08067FA0:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -661,7 +661,7 @@ _08067FFC:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -678,7 +678,7 @@ _08067FFC:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -695,7 +695,7 @@ _08067FFC:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -712,7 +712,7 @@ _08067FFC:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -801,7 +801,7 @@ _08068114:
asrs r0, 16
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
ldr r2, _08068144 @ =gUnknown_83A705C
asm/field_map_obj.s
+15 -15
View File
@@ -1012,7 +1012,7 @@ unref_sub_808D958: @ 805E55C
push {r4,lr}
movs r4, 0
_0805E560:
ldr r0, _0805E588 @ =gUnknown_2037078
ldr r0, _0805E588 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _0805E576
@@ -1032,7 +1032,7 @@ _0805E576:
pop {r0}
bx r0
.align 2, 0
_0805E588: .4byte gUnknown_2037078
_0805E588: .4byte gPlayerAvatar
_0805E58C: .4byte gMapObjects
thumb_func_end unref_sub_808D958
@@ -2418,7 +2418,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, _0805F058 @ =gUnknown_2037078
ldr r5, _0805F058 @ =gPlayerAvatar
strb r0, [r5, 0x5]
strb r1, [r5, 0x4]
ldr r1, _0805F05C @ =gMapObjects
@@ -2436,7 +2436,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
pop {r0}
bx r0
.align 2, 0
_0805F058: .4byte gUnknown_2037078
_0805F058: .4byte gPlayerAvatar
_0805F05C: .4byte gMapObjects
thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId
@@ -10369,7 +10369,7 @@ sub_80628E4: @ 80628E4
adds r6, r0, 0
adds r7, r1, 0
ldr r2, _08062908 @ =gMapObjects
ldr r3, _0806290C @ =gUnknown_2037078
ldr r3, _0806290C @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -10386,7 +10386,7 @@ _08062904:
b _08062938
.align 2, 0
_08062908: .4byte gMapObjects
_0806290C: .4byte gUnknown_2037078
_0806290C: .4byte gPlayerAvatar
_08062910:
ldr r5, _08062940 @ =gUnknown_83A6390
bl player_get_x22
@@ -10533,7 +10533,7 @@ sub_80629B8: @ 80629B8
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -10622,7 +10622,7 @@ sub_8062A70: @ 8062A70
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -10711,7 +10711,7 @@ sub_8062B28: @ 8062B28
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -10800,7 +10800,7 @@ sub_8062BE0: @ 8062BE0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -10925,7 +10925,7 @@ sub_8062CE0: @ 8062CE0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -11021,7 +11021,7 @@ oac_hopping: @ 8062D98
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -11100,7 +11100,7 @@ mss_08062EA4: @ 8062EA4
adds r6, r0, 0
adds r7, r1, 0
ldr r2, _08062EC8 @ =gMapObjects
ldr r3, _08062ECC @ =gUnknown_2037078
ldr r3, _08062ECC @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -11117,7 +11117,7 @@ _08062EC4:
b _08062EF8
.align 2, 0
_08062EC8: .4byte gMapObjects
_08062ECC: .4byte gUnknown_2037078
_08062ECC: .4byte gPlayerAvatar
_08062ED0:
ldr r5, _08062F00 @ =gUnknown_83A6390
bl player_get_x22
@@ -12593,7 +12593,7 @@ IsMetatileDirectionallyImpassable: @ 80638AC
asrs r0, 16
lsls r1, r7, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
asm/field_player_avatar.s
+181 -181
View File
File diff suppressed because it is too large Load Diff
asm/field_screen_effect.s
+2 -2
View File
@@ -937,7 +937,7 @@ _0807F542:
lsls r0, 24
cmp r0, 0
beq _0807F5E4
ldr r0, _0807F57C @ =gUnknown_2037078
ldr r0, _0807F57C @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -957,7 +957,7 @@ _0807F542:
b _0807F5E4
.align 2, 0
_0807F578: .4byte gUnknown_841B5B6
_0807F57C: .4byte gUnknown_2037078
_0807F57C: .4byte gPlayerAvatar
_0807F580: .4byte gMapObjects
_0807F584: .4byte gTasks
_0807F588:
asm/field_specials.s
+2 -2
View File
@@ -21,7 +21,7 @@ _080CA62C: .4byte sub_80F4C10
thumb_func_start sub_80CA630
sub_80CA630: @ 80CA630
push {r4,lr}
ldr r0, _080CA65C @ =gUnknown_2037078
ldr r0, _080CA65C @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -40,7 +40,7 @@ _080CA644:
pop {r0}
bx r0
.align 2, 0
_080CA65C: .4byte gUnknown_2037078
_080CA65C: .4byte gPlayerAvatar
thumb_func_end sub_80CA630
thumb_func_start nullsub_74
asm/field_tasks.s
+3 -3
View File
@@ -322,7 +322,7 @@ _0806EA52:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
@@ -478,7 +478,7 @@ _0806EB8E:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059F50
@@ -576,7 +576,7 @@ sub_806EC40: @ 806EC40
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r7, r0, 16
ldrh r1, [r5, 0x8]
asm/fieldmap.s
+3 -3
View File
@@ -789,8 +789,8 @@ sub_8058F48: @ 8058F48
_08058F74: .4byte gMapHeader
thumb_func_end sub_8058F48
thumb_func_start sub_8058F78
sub_8058F78: @ 8058F78
thumb_func_start MapGridGetMetatileBehaviorAt
MapGridGetMetatileBehaviorAt: @ 8058F78
push {lr}
lsls r0, 16
asrs r0, 16
@@ -800,7 +800,7 @@ sub_8058F78: @ 8058F78
bl sub_8058F48
pop {r1}
bx r1
thumb_func_end sub_8058F78
thumb_func_end MapGridGetMetatileBehaviorAt
thumb_func_start sub_8058F8C
sub_8058F8C: @ 8058F8C
asm/fldeff_cut.s
+2 -2
View File
@@ -319,7 +319,7 @@ _08097ABC:
movs r7, 0
ldr r5, _08097B44 @ =gSprites
_08097AE2:
ldr r0, _08097B48 @ =gUnknown_2037078
ldr r0, _08097B48 @ =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -366,7 +366,7 @@ _08097B38: .4byte gUnknown_2039A04
_08097B3C: .4byte 0x0000ffff
_08097B40: .4byte gUnknown_2039870
_08097B44: .4byte gSprites
_08097B48: .4byte gUnknown_2037078
_08097B48: .4byte gPlayerAvatar
_08097B4C: .4byte gUnknown_83D414C
thumb_func_end sub_8097A48
asm/item_menu.s
+3 -3
View File
@@ -5817,8 +5817,8 @@ _0810AD08: .4byte gUnknown_84163BB
_0810AD0C: .4byte sub_810A1D0
thumb_func_end sub_810AC40
thumb_func_start sub_810AD10
sub_810AD10: @ 810AD10
thumb_func_start UseRegisteredKeyItemOnField
UseRegisteredKeyItemOnField: @ 810AD10
push {r4-r6,lr}
bl InUnionRoom
cmp r0, 0x1
@@ -5887,7 +5887,7 @@ _0810ADA0:
bx r1
.align 2, 0
_0810ADA8: .4byte gUnknown_81A77A0
thumb_func_end sub_810AD10
thumb_func_end UseRegisteredKeyItemOnField
thumb_func_start sub_810ADAC
sub_810ADAC: @ 810ADAC
asm/item_use.s
+2 -2
View File
@@ -348,7 +348,7 @@ sub_80A122C: @ 80A122C
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x83
@@ -506,7 +506,7 @@ sub_80A137C: @ 80A137C
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r6, r0, 16
lsls r0, r6, 24
asm/link_rfu_3.s
+4 -4
View File
@@ -9685,7 +9685,7 @@ sub_811A9B8: @ 811A9B8
ldrsh r0, [r4, r1]
cmp r0, 0x8
bne _0811A9F0
ldr r0, _0811A9EC @ =gUnknown_2037078
ldr r0, _0811A9EC @ =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x2
beq _0811A9E6
@@ -9695,7 +9695,7 @@ _0811A9E6:
movs r0, 0x1
b _0811A9F2
.align 2, 0
_0811A9EC: .4byte gUnknown_2037078
_0811A9EC: .4byte gPlayerAvatar
_0811A9F0:
movs r0, 0
_0811A9F2:
@@ -11147,7 +11147,7 @@ _0811B500: .4byte gUnknown_8459580
thumb_func_start is_walking_or_running
is_walking_or_running: @ 811B504
push {lr}
ldr r0, _0811B518 @ =gUnknown_2037078
ldr r0, _0811B518 @ =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x2
beq _0811B512
@@ -11157,7 +11157,7 @@ _0811B512:
movs r0, 0x1
b _0811B51E
.align 2, 0
_0811B518: .4byte gUnknown_2037078
_0811B518: .4byte gPlayerAvatar
_0811B51C:
movs r0, 0
_0811B51E:
asm/map_obj_80688E4.s
+4 -4
View File
@@ -96,7 +96,7 @@ _0806897A:
lsls r0, 31
cmp r0, 0
beq _08068998
ldr r0, _080689AC @ =gUnknown_2037078
ldr r0, _080689AC @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _08068998
@@ -113,7 +113,7 @@ _08068998:
bx r0
.align 2, 0
_080689A8: .4byte gMapObjects
_080689AC: .4byte gUnknown_2037078
_080689AC: .4byte gPlayerAvatar
thumb_func_end player_bitmagic
thumb_func_start FreezeMapObjectsExceptOne
@@ -134,7 +134,7 @@ _080689BA:
lsls r0, 31
cmp r0, 0
beq _080689DC
ldr r0, _080689F0 @ =gUnknown_2037078
ldr r0, _080689F0 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080689DC
@@ -151,7 +151,7 @@ _080689DC:
bx r0
.align 2, 0
_080689EC: .4byte gMapObjects
_080689F0: .4byte gUnknown_2037078
_080689F0: .4byte gPlayerAvatar
thumb_func_end FreezeMapObjectsExceptOne
thumb_func_start npc_sync_anim_pause_bits
asm/map_obj_lock.s
+2 -2
View File
@@ -8,14 +8,14 @@
thumb_func_start walkrun_is_standing_still
walkrun_is_standing_still: @ 8069554
push {lr}
ldr r0, _08069564 @ =gUnknown_2037078
ldr r0, _08069564 @ =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x1
beq _08069568
movs r0, 0x1
b _0806956A
.align 2, 0
_08069564: .4byte gUnknown_2037078
_08069564: .4byte gPlayerAvatar
_08069568:
movs r0, 0
_0806956A:
asm/metatile_behavior.s
+3 -3
View File
@@ -484,8 +484,8 @@ _08059D66:
bx r1
thumb_func_end sub_8059D2C
thumb_func_start sub_8059D70
sub_8059D70: @ 8059D70
thumb_func_start MetatileBehavior_IsMoveTile
MetatileBehavior_IsMoveTile: @ 8059D70
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -519,7 +519,7 @@ _08059DA6:
_08059DA8:
pop {r1}
bx r1
thumb_func_end sub_8059D70
thumb_func_end MetatileBehavior_IsMoveTile
thumb_func_start sub_8059DAC
sub_8059DAC: @ 8059DAC
asm/overworld.s
+7 -7
View File
@@ -2190,7 +2190,7 @@ sub_8055C74: @ 8055C74
adds r1, 0x7
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -2677,7 +2677,7 @@ sub_8055FE0: @ 8055FE0
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059CA4
@@ -3263,7 +3263,7 @@ sub_805644C: @ 805644C
mov r0, sp
adds r1, r5, 0
adds r2, r4, 0
bl sub_806C8BC
bl FieldGetPlayerInput
mov r0, sp
bl sub_806CD30
bl ScriptContext2_IsEnabled
@@ -4735,7 +4735,7 @@ sub_8057100: @ 8057100
sub_8057114: @ 8057114
push {lr}
ldr r2, _08057138 @ =gMapObjects
ldr r3, _0805713C @ =gUnknown_2037078
ldr r3, _0805713C @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4751,7 +4751,7 @@ sub_8057114: @ 8057114
bx r0
.align 2, 0
_08057138: .4byte gMapObjects
_0805713C: .4byte gUnknown_2037078
_0805713C: .4byte gPlayerAvatar
thumb_func_end sub_8057114
thumb_func_start sub_8057140
@@ -6640,7 +6640,7 @@ _08057F96:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
strh r0, [r6, 0xC]
add sp, 0x4
pop {r4-r6}
@@ -6913,7 +6913,7 @@ sub_80581C8: @ 80581C8
push {lr}
movs r0, 0x6
bl PlaySE
bl sub_806F258
bl ShowStartMenu
bl ScriptContext2_Enable
pop {r0}
bx r0
asm/party_menu.s
+3 -3
View File
@@ -12100,7 +12100,7 @@ sub_8124998: @ 8124998
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059CC8
@@ -12163,7 +12163,7 @@ _08124A24:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059CC8
@@ -12276,7 +12276,7 @@ hm_prepare_waterfall: @ 8124AF8
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsWaterfall
asm/quest_log.s
-183
View File
@@ -5,189 +5,6 @@
.text
thumb_func_start sub_8112720
sub_8112720: @ 8112720
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 24
lsrs r0, 24
mov r8, r0
bl sub_8112D1C
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0
bne _08112774
ldr r2, _08112780 @ =gUnknown_203AF98
ldrh r0, [r2]
ldr r3, _08112784 @ =gUnknown_3005E94
ldr r4, [r3]
lsls r0, 3
adds r0, r4
ldr r6, _08112788 @ =gUnknown_203B01A
ldrh r1, [r6]
movs r5, 0
strh r1, [r0, 0x4]
ldrh r0, [r2]
lsls r0, 3
adds r0, r4
movs r1, 0x1
strb r1, [r0, 0x6]
ldrh r0, [r2]
ldr r1, [r3]
lsls r0, 3
adds r0, r1
strb r5, [r0]
ldrh r0, [r2]
ldr r1, [r3]
lsls r0, 3
adds r0, r1
mov r1, r8
strb r1, [r0, 0x3]
ldrh r0, [r2]
adds r0, 0x1
strh r0, [r2]
strh r7, [r6]
_08112774:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08112780: .4byte gUnknown_203AF98
_08112784: .4byte gUnknown_3005E94
_08112788: .4byte gUnknown_203B01A
thumb_func_end sub_8112720
thumb_func_start sub_811278C
sub_811278C: @ 811278C
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 24
lsrs r7, r0, 24
lsls r1, 24
lsrs r1, 24
mov r8, r1
bl sub_8112D1C
lsls r0, 24
cmp r0, 0
bne _081127E2
ldr r2, _081127EC @ =gUnknown_203AF98
ldrh r0, [r2]
ldr r3, _081127F0 @ =gUnknown_3005E94
ldr r4, [r3]
lsls r0, 3
adds r0, r4
ldr r6, _081127F4 @ =gUnknown_203B01A
ldrh r1, [r6]
movs r5, 0
strh r1, [r0, 0x4]
ldrh r0, [r2]
lsls r0, 3
adds r0, r4
movs r1, 0x1
strb r1, [r0, 0x6]
ldrh r0, [r2]
ldr r1, [r3]
lsls r0, 3
adds r0, r1
strb r5, [r0]
ldrh r0, [r2]
ldr r1, [r3]
lsls r0, 3
adds r0, r1
strb r7, [r0, 0x3]
ldrh r0, [r2]
adds r0, 0x1
strh r0, [r2]
mov r0, r8
strh r0, [r6]
_081127E2:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_081127EC: .4byte gUnknown_203AF98
_081127F0: .4byte gUnknown_3005E94
_081127F4: .4byte gUnknown_203B01A
thumb_func_end sub_811278C
thumb_func_start sub_81127F8
sub_81127F8: @ 81127F8
push {r4-r6,lr}
adds r2, r0, 0
ldr r5, _08112874 @ =gUnknown_203AF98
ldr r1, _08112878 @ =gUnknown_3005E8C
ldrh r0, [r5]
ldrh r1, [r1]
cmp r0, r1
bcs _0811286C
ldr r2, [r2]
ldr r0, _0811287C @ =0x00ff00f3
ands r2, r0
ldrh r1, [r5]
ldr r3, _08112880 @ =gUnknown_3005E94
ldr r4, [r3]
lsls r1, 3
adds r1, r4
ldr r6, _08112884 @ =gUnknown_203B01A
ldrh r0, [r6]
strh r0, [r1, 0x4]
ldrh r0, [r5]
lsls r0, 3
adds r0, r4
movs r1, 0x2
strb r1, [r0, 0x6]
ldrh r0, [r5]
ldr r1, [r3]
lsls r0, 3
adds r0, r1
strb r2, [r0]
ldrh r0, [r5]
ldr r1, [r3]
lsls r0, 3
adds r0, r1
lsrs r1, r2, 8
strb r1, [r0, 0x1]
ldrh r0, [r5]
ldr r1, [r3]
lsls r0, 3
adds r0, r1
lsrs r1, r2, 16
strb r1, [r0, 0x2]
ldrh r0, [r5]
ldr r1, [r3]
lsls r0, 3
adds r0, r1
lsrs r2, 24
strb r2, [r0, 0x3]
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
cmp r0, 0
beq _0811286A
movs r0, 0x1
_0811286A:
strh r0, [r6]
_0811286C:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08112874: .4byte gUnknown_203AF98
_08112878: .4byte gUnknown_3005E8C
_0811287C: .4byte 0x00ff00f3
_08112880: .4byte gUnknown_3005E94
_08112884: .4byte gUnknown_203B01A
thumb_func_end sub_81127F8
thumb_func_start sub_8112888
sub_8112888: @ 8112888
push {lr}
asm/quest_log_8150454.s
+10 -10
View File
@@ -59,7 +59,7 @@ sub_8150498: @ 8150498
thumb_func_start sub_81504A8
sub_81504A8: @ 81504A8
push {r4,lr}
ldr r0, _081504E0 @ =gUnknown_2037078
ldr r0, _081504E0 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -83,14 +83,14 @@ sub_81504A8: @ 81504A8
pop {r0}
bx r0
.align 2, 0
_081504E0: .4byte gUnknown_2037078
_081504E0: .4byte gPlayerAvatar
_081504E4: .4byte gMapObjects
thumb_func_end sub_81504A8
thumb_func_start sub_81504E8
sub_81504E8: @ 81504E8
push {r4,lr}
ldr r0, _08150528 @ =gUnknown_2037078
ldr r0, _08150528 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -117,14 +117,14 @@ sub_81504E8: @ 81504E8
pop {r0}
bx r0
.align 2, 0
_08150528: .4byte gUnknown_2037078
_08150528: .4byte gPlayerAvatar
_0815052C: .4byte gMapObjects
thumb_func_end sub_81504E8
thumb_func_start sub_8150530
sub_8150530: @ 8150530
push {r4-r6,lr}
ldr r6, _0815057C @ =gUnknown_2037078
ldr r6, _0815057C @ =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -161,7 +161,7 @@ _08150558:
strh r4, [r1, 0x8]
b _081505BC
.align 2, 0
_0815057C: .4byte gUnknown_2037078
_0815057C: .4byte gPlayerAvatar
_08150580: .4byte gMapObjects
_08150584: .4byte gSprites
_08150588: .4byte gUnknown_3005E88
@@ -199,7 +199,7 @@ sub_81505C4: @ 81505C4
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _0815060C @ =gUnknown_2037078
ldr r0, _0815060C @ =gPlayerAvatar
mov r9, r0
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -229,7 +229,7 @@ sub_81505C4: @ 81505C4
beq _08150626
b _081506FC
.align 2, 0
_0815060C: .4byte gUnknown_2037078
_0815060C: .4byte gPlayerAvatar
_08150610: .4byte gMapObjects
_08150614: .4byte gSprites
_08150618: .4byte gTasks
@@ -348,7 +348,7 @@ _081506FC:
thumb_func_start sub_8150708
sub_8150708: @ 8150708
push {r4,r5,lr}
ldr r5, _08150770 @ =gUnknown_2037078
ldr r5, _08150770 @ =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -394,7 +394,7 @@ _08150768:
pop {r0}
bx r0
.align 2, 0
_08150770: .4byte gUnknown_2037078
_08150770: .4byte gPlayerAvatar
_08150774: .4byte gMapObjects
_08150778: .4byte gUnknown_20386E0
thumb_func_end sub_8150708
asm/rom6.s
+8 -8
View File
@@ -73,7 +73,7 @@ task08_080C9820: @ 80C9820
lsrs r5, r0, 24
adds r6, r5, 0
bl ScriptContext2_Enable
ldr r1, _080C9874 @ =gUnknown_2037078
ldr r1, _080C9874 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r1, [r1, 0x5]
@@ -107,7 +107,7 @@ _080C9856:
ldr r0, _080C9884 @ =sub_80C98FC
b _080C98A0
.align 2, 0
_080C9874: .4byte gUnknown_2037078
_080C9874: .4byte gPlayerAvatar
_080C9878: .4byte gMapObjects
_080C987C: .4byte gMapHeader
_080C9880: .4byte gTasks
@@ -139,7 +139,7 @@ sub_80C98B0: @ 80C98B0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080C98EC @ =gUnknown_2037078
ldr r0, _080C98EC @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -165,7 +165,7 @@ _080C98E4:
pop {r0}
bx r0
.align 2, 0
_080C98EC: .4byte gUnknown_2037078
_080C98EC: .4byte gPlayerAvatar
_080C98F0: .4byte gMapObjects
_080C98F4: .4byte gTasks
_080C98F8: .4byte sub_80C98FC
@@ -207,7 +207,7 @@ _080C9934:
movs r0, 0x3
str r0, [r6, 0x8]
_080C993C:
ldr r5, _080C998C @ =gUnknown_2037078
ldr r5, _080C998C @ =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -243,7 +243,7 @@ _080C9980:
bx r0
.align 2, 0
_080C9988: .4byte gUnknown_20386E0
_080C998C: .4byte gUnknown_2037078
_080C998C: .4byte gPlayerAvatar
_080C9990: .4byte gMapObjects
_080C9994: .4byte gSprites
_080C9998: .4byte gTasks
@@ -266,7 +266,7 @@ sub_80C99A0: @ 80C99A0
ldrh r0, [r0, 0x1A]
orrs r1, r0
bl _call_via_r1
ldr r1, _080C99D4 @ =gUnknown_2037078
ldr r1, _080C99D4 @ =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
adds r0, r4, 0
@@ -276,7 +276,7 @@ sub_80C99A0: @ 80C99A0
bx r0
.align 2, 0
_080C99D0: .4byte gTasks
_080C99D4: .4byte gUnknown_2037078
_080C99D4: .4byte gPlayerAvatar
thumb_func_end sub_80C99A0
thumb_func_start SetUpFieldMove_RockSmash
asm/start_menu.s
+3 -3
View File
@@ -631,8 +631,8 @@ _0806F24E:
_0806F254: .4byte gUnknown_20370F0
thumb_func_end sub_806F1F0
thumb_func_start sub_806F258
sub_806F258: @ 806F258
thumb_func_start ShowStartMenu
ShowStartMenu: @ 806F258
push {lr}
bl sub_805642C
cmp r0, 0
@@ -648,7 +648,7 @@ _0806F26E:
bx r0
.align 2, 0
_0806F27C: .4byte sub_806F1F0
thumb_func_end sub_806F258
thumb_func_end ShowStartMenu
thumb_func_start sub_806F280
sub_806F280: @ 806F280
asm/trainer_see.s
+7 -7
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8081B30
sub_8081B30: @ 8081B30
thumb_func_start CheckForTrainersWantingBattle
CheckForTrainersWantingBattle: @ 8081B30
push {r4,r5,lr}
bl sub_8111C2C
lsls r0, 24
@@ -54,7 +54,7 @@ _08081B7A:
bx r1
.align 2, 0
_08081B80: .4byte gMapObjects
thumb_func_end sub_8081B30
thumb_func_end CheckForTrainersWantingBattle
thumb_func_start sub_8081B84
sub_8081B84: @ 8081B84
@@ -735,7 +735,7 @@ _0808204A:
bl sub_805FE7C
adds r0, r4, 0
bl sub_805FE5C
ldr r0, _080820B4 @ =gUnknown_2037078
ldr r0, _080820B4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -763,7 +763,7 @@ _080820AC:
pop {r1}
bx r1
.align 2, 0
_080820B4: .4byte gUnknown_2037078
_080820B4: .4byte gPlayerAvatar
_080820B8: .4byte gMapObjects
thumb_func_end sub_808202C
@@ -772,7 +772,7 @@ sub_80820BC: @ 80820BC
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080820F8 @ =gUnknown_2037078
ldr r0, _080820F8 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -798,7 +798,7 @@ _080820EE:
pop {r1}
bx r1
.align 2, 0
_080820F8: .4byte gUnknown_2037078
_080820F8: .4byte gPlayerAvatar
_080820FC: .4byte gMapObjects
thumb_func_end sub_80820BC
asm/unk_8159F40.s
+9 -9
View File
@@ -669,14 +669,14 @@ _0815A444:
ldrsh r0, [r6, r2]
movs r2, 0x12
ldrsh r1, [r6, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
strb r0, [r6, 0x1E]
ldrb r4, [r6, 0x1F]
movs r1, 0x10
ldrsh r0, [r6, r1]
movs r2, 0x12
ldrsh r1, [r6, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r4, r0
bne _0815A488
ldrh r0, [r6, 0x10]
@@ -694,7 +694,7 @@ _0815A488:
asrs r0, 16
movs r2, 0x12
ldrsh r1, [r6, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r4, r0
bne _0815A4A8
ldrh r0, [r6, 0x10]
@@ -710,7 +710,7 @@ _0815A4A8:
asrs r0, 16
movs r2, 0x12
ldrsh r1, [r6, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r4, r0
bne _0815A4C8
ldrh r0, [r6, 0x10]
@@ -726,7 +726,7 @@ _0815A4C8:
subs r1, 0x1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r4, r0
bne _0815A4E8
ldrh r0, [r6, 0x10]
@@ -742,7 +742,7 @@ _0815A4E8:
adds r1, 0x1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r4, r0
bne _0815A508
ldrh r0, [r6, 0x10]
@@ -798,7 +798,7 @@ sub_815A540: @ 815A540
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059CA4
@@ -810,7 +810,7 @@ sub_815A540: @ 815A540
lsls r0, 24
cmp r0, 0
beq _0815A5A4
ldr r0, _0815A5B0 @ =gUnknown_2037078
ldr r0, _0815A5B0 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -833,7 +833,7 @@ _0815A5A4:
bx r0
.align 2, 0
_0815A5AC: .4byte gUnknown_203ADFA
_0815A5B0: .4byte gUnknown_2037078
_0815A5B0: .4byte gPlayerAvatar
_0815A5B4: .4byte gMapObjects
_0815A5B8: .4byte gSprites
thumb_func_end sub_815A540
include/field_control_avatar.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_FIELD_CONTROL_AVATAR_H
#define GUARD_FIELD_CONTROL_AVATAR_H
extern u32 gUnknown_3005078;
#endif //GUARD_FIELD_CONTROL_AVATAR_H
include/quest_log.h
+2
View File
@@ -2,5 +2,7 @@
#define GUARD_QUEST_LOG_H
extern u8 gUnknown_3005E88;
extern u16 gUnknown_3005E8C;
extern struct UnkStruct_203AE98 * gUnknown_3005E94;
#endif //GUARD_QUEST_LOG_H
src/quest_log.c
+49 -1
View File
@@ -18,6 +18,7 @@
#include "map_obj_80688E4.h"
#include "map_obj_lock.h"
#include "field_player_avatar.h"
#include "field_control_avatar.h"
#include "item.h"
#include "region_map.h"
#include "map_name_popup.h"
@@ -51,7 +52,9 @@ struct UnkStruct_203AE98
u8 unk_6;
};
IWRAM_DATA struct UnkStruct_203AE98 * gUnknown_3005E94;
u8 gUnknown_3005E88;
u16 gUnknown_3005E8C;
struct UnkStruct_203AE98 * gUnknown_3005E94;
EWRAM_DATA u8 gUnknown_203ADF8 = 0;
EWRAM_DATA u8 gUnknown_203ADF9 = 0;
@@ -1516,3 +1519,48 @@ void sub_81126AC(u8 a0, u8 a1)
gUnknown_203B01A = a1;
}
}
void sub_8112720(u8 a0)
{
if (!sub_8112D1C())
{
gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A;
gUnknown_3005E94[gUnknown_203AF98].unk_6 = 1;
gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0;
gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0;
gUnknown_203AF98++;
gUnknown_203B01A = 0;
}
}
void sub_811278C(u8 a0, u8 a1)
{
if (!sub_8112D1C())
{
gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A;
gUnknown_3005E94[gUnknown_203AF98].unk_6 = 1;
gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0;
gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0;
gUnknown_203AF98++;
gUnknown_203B01A = a1;
}
}
void sub_81127F8(u32 * a0)
{
if (gUnknown_203AF98 < gUnknown_3005E8C)
{
u32 r2 = *a0 & 0x00FF00F3;
gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A;
gUnknown_3005E94[gUnknown_203AF98].unk_6 = 2;
gUnknown_3005E94[gUnknown_203AF98].unk_0 = r2;
gUnknown_3005E94[gUnknown_203AF98].unk_1 = r2 >> 8;
gUnknown_3005E94[gUnknown_203AF98].unk_2 = r2 >> 16;
gUnknown_3005E94[gUnknown_203AF98].unk_3 = r2 >> 24;
gUnknown_203AF98++;
if (ScriptContext2_IsEnabled())
gUnknown_203B01A = TRUE;
else
gUnknown_203B01A = FALSE;
}
}
sym_ewram.txt
+1 -1
View File
@@ -632,7 +632,7 @@ gUnknown_2036E34: @ 2036E34
gMapObjects: @ 2036E38
.space 0x240
gUnknown_2037078: @ 2037078
gPlayerAvatar: @ 2037078
.space 0x20
gUnknown_2037098: @ 2037098