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

sub_811246C

Browse Source
This commit is contained in:
PikalaxALT
2018-10-12 21:56:35 -04:00
parent ef81b5a237
commit 65bce70419
30 changed files with 653 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_setup.s
+4 -4
View File
@@ -1650,7 +1650,7 @@ TrainerWantsBattle: @ 8080334
ldr r2, _08080368 @ =gUnknown_3005074
strb r0, [r2]
ldr r4, _0808036C @ =gUnknown_20370D2
ldr r3, _08080370 @ =gUnknown_2036E38
ldr r3, _08080370 @ =gMapObjects
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@@ -1669,7 +1669,7 @@ TrainerWantsBattle: @ 8080334
.align 2, 0
_08080368: .4byte gUnknown_3005074
_0808036C: .4byte gUnknown_20370D2
_08080370: .4byte gUnknown_2036E38
_08080370: .4byte gMapObjects
_08080374: .4byte gUnknown_81A4EB4
thumb_func_end TrainerWantsBattle
@@ -1698,7 +1698,7 @@ sub_8080398: @ 8080398
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080803C8 @ =gUnknown_2036E38
ldr r0, _080803C8 @ =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x18]
lsls r0, 28
@@ -1714,7 +1714,7 @@ sub_8080398: @ 8080398
bx r0
.align 2, 0
_080803C4: .4byte gUnknown_3005074
_080803C8: .4byte gUnknown_2036E38
_080803C8: .4byte gMapObjects
thumb_func_end sub_8080398
thumb_func_start sub_80803CC
asm/bike.s
+12 -12
View File
@@ -77,7 +77,7 @@ sub_80BD100: @ 80BD100
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080BD160 @ =gUnknown_2036E38
ldr r0, _080BD160 @ =gMapObjects
adds r4, r0
bl player_get_direction_upper_nybble
lsls r0, 24
@@ -106,7 +106,7 @@ sub_80BD100: @ 80BD100
b _080BD1B6
.align 2, 0
_080BD15C: .4byte gUnknown_2037078
_080BD160: .4byte gUnknown_2036E38
_080BD160: .4byte gMapObjects
_080BD164: .4byte gMain
_080BD168:
ldrb r0, [r6]
@@ -204,7 +204,7 @@ sub_80BD1E8: @ 80BD1E8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080BD244 @ =gUnknown_2036E38
ldr r1, _080BD244 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x1E]
bl sub_805A1DC
@@ -227,7 +227,7 @@ sub_80BD1E8: @ 80BD1E8
b _080BD270
.align 2, 0
_080BD240: .4byte gUnknown_2037078
_080BD244: .4byte gUnknown_2036E38
_080BD244: .4byte gMapObjects
_080BD248:
movs r0, 0x2
strb r0, [r4, 0x2]
@@ -281,7 +281,7 @@ sub_80BD28C: @ 80BD28C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080BD2C4 @ =gUnknown_2036E38
ldr r1, _080BD2C4 @ =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -299,7 +299,7 @@ _080BD2B2:
bx r0
.align 2, 0
_080BD2C0: .4byte gUnknown_2037078
_080BD2C4: .4byte gUnknown_2036E38
_080BD2C4: .4byte gMapObjects
thumb_func_end sub_80BD28C
thumb_func_start sub_80BD2C8
@@ -313,7 +313,7 @@ sub_80BD2C8: @ 80BD2C8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080BD2FC @ =gUnknown_2036E38
ldr r1, _080BD2FC @ =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -327,7 +327,7 @@ sub_80BD2C8: @ 80BD2C8
b _080BD350
.align 2, 0
_080BD2F8: .4byte gUnknown_2037078
_080BD2FC: .4byte gUnknown_2036E38
_080BD2FC: .4byte gMapObjects
_080BD300:
adds r0, r4, 0
bl sub_80BD3A0
@@ -425,7 +425,7 @@ sub_80BD3A0: @ 80BD3A0
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080BD408 @ =gUnknown_2036E38
ldr r0, _080BD408 @ =gMapObjects
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@@ -463,7 +463,7 @@ sub_80BD3A0: @ 80BD3A0
bx r1
.align 2, 0
_080BD404: .4byte gUnknown_2037078
_080BD408: .4byte gUnknown_2036E38
_080BD408: .4byte gMapObjects
thumb_func_end sub_80BD3A0
thumb_func_start sub_80BD40C
@@ -689,7 +689,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
lsls r0, 24
cmp r0, 0
beq _080BD5C0
ldr r2, _080BD5B8 @ =gUnknown_2036E38
ldr r2, _080BD5B8 @ =gMapObjects
ldr r0, _080BD5BC @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -704,7 +704,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
movs r0, 0
b _080BD5C2
.align 2, 0
_080BD5B8: .4byte gUnknown_2036E38
_080BD5B8: .4byte gMapObjects
_080BD5BC: .4byte gUnknown_2037078
_080BD5C0:
movs r0, 0x1
asm/field_control_avatar.s
+8 -8
View File
@@ -906,7 +906,7 @@ _0806CF7E:
lsrs r3, r0, 24
cmp r3, 0x10
beq _0806CF9E
ldr r1, _0806CFA8 @ =gUnknown_2036E38
ldr r1, _0806CFA8 @ =gMapObjects
lsls r2, r3, 3
adds r0, r2, r3
lsls r0, 2
@@ -920,7 +920,7 @@ _0806CF9E:
b _0806CFDE
.align 2, 0
_0806CFA4: .4byte gUnknown_826D2D8
_0806CFA8: .4byte gUnknown_2036E38
_0806CFA8: .4byte gMapObjects
_0806CFAC:
movs r4, 0
ldr r1, _0806CFE4 @ =gUnknown_2031DEC
@@ -978,7 +978,7 @@ sub_806CFF4: @ 806CFF4
lsrs r5, r0, 24
cmp r5, 0x10
beq _0806D02A
ldr r2, _0806D098 @ =gUnknown_2036E38
ldr r2, _0806D098 @ =gMapObjects
lsls r1, r5, 3
adds r0, r1, r5
lsls r0, 2
@@ -1016,7 +1016,7 @@ _0806D02A:
lsrs r5, r0, 24
cmp r5, 0x10
beq _0806D092
ldr r2, _0806D098 @ =gUnknown_2036E38
ldr r2, _0806D098 @ =gMapObjects
lsls r1, r5, 3
adds r0, r1, r5
lsls r0, 2
@@ -1031,7 +1031,7 @@ _0806D078:
bne _0806D0A0
adds r0, r6, r5
lsls r0, 2
ldr r1, _0806D098 @ =gUnknown_2036E38
ldr r1, _0806D098 @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -1041,13 +1041,13 @@ _0806D092:
movs r0, 0
b _0806D0C8
.align 2, 0
_0806D098: .4byte gUnknown_2036E38
_0806D098: .4byte gMapObjects
_0806D09C: .4byte gUnknown_826D2D8
_0806D0A0:
ldr r0, _0806D0D4 @ =gUnknown_3005074
strb r5, [r0]
ldr r4, _0806D0D8 @ =gUnknown_20370D2
ldr r1, _0806D0DC @ =gUnknown_2036E38
ldr r1, _0806D0DC @ =gMapObjects
adds r0, r6, r5
lsls r0, 2
adds r0, r1
@@ -1071,7 +1071,7 @@ _0806D0C8:
.align 2, 0
_0806D0D4: .4byte gUnknown_3005074
_0806D0D8: .4byte gUnknown_20370D2
_0806D0DC: .4byte gUnknown_2036E38
_0806D0DC: .4byte gMapObjects
_0806D0E0: .4byte gUnknown_20370D4
thumb_func_end sub_806CFF4
asm/field_effect.s
+88 -88
View File
@@ -2067,7 +2067,7 @@ mapldr_08084390: @ 8084390
ldr r0, _080843E8 @ =c3_080843F8
movs r1, 0
bl CreateTask
ldr r4, _080843EC @ =gUnknown_2036E38
ldr r4, _080843EC @ =gMapObjects
ldr r3, _080843F0 @ =gUnknown_2037078
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@@ -2101,7 +2101,7 @@ _080843D2:
bx r0
.align 2, 0
_080843E8: .4byte c3_080843F8
_080843EC: .4byte gUnknown_2036E38
_080843EC: .4byte gMapObjects
_080843F0: .4byte gUnknown_2037078
_080843F4: .4byte gUnknown_3005020
thumb_func_end mapldr_08084390
@@ -2214,7 +2214,7 @@ sub_80844BC: @ 80844BC
lsls r5, r0, 3
adds r5, r0
lsls r5, 2
ldr r0, _0808455C @ =gUnknown_2036E38
ldr r0, _0808455C @ =gMapObjects
mov r8, r0
add r5, r8
ldrb r0, [r6, 0x4]
@@ -2279,7 +2279,7 @@ sub_80844BC: @ 80844BC
bx r1
.align 2, 0
_08084558: .4byte gUnknown_2037078
_0808455C: .4byte gUnknown_2036E38
_0808455C: .4byte gMapObjects
_08084560: .4byte gSprites
thumb_func_end sub_80844BC
@@ -2331,7 +2331,7 @@ sub_8084580: @ 8084580
movs r0, 0x1
strh r0, [r5, 0xA]
strh r1, [r5, 0xC]
ldr r2, _080845F0 @ =gUnknown_2036E38
ldr r2, _080845F0 @ =gMapObjects
ldrb r0, [r6, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -2355,7 +2355,7 @@ sub_8084580: @ 8084580
_080845E4: .4byte gUnknown_2037078
_080845E8: .4byte gSprites
_080845EC: .4byte gSpriteCoordOffsetY
_080845F0: .4byte gUnknown_2036E38
_080845F0: .4byte gMapObjects
thumb_func_end sub_8084580
thumb_func_start sub_80845F4
@@ -2367,7 +2367,7 @@ sub_80845F4: @ 80845F4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080846A4 @ =gUnknown_2036E38
ldr r1, _080846A4 @ =gMapObjects
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -2450,7 +2450,7 @@ _08084698:
bx r1
.align 2, 0
_080846A0: .4byte gUnknown_2037078
_080846A4: .4byte gUnknown_2036E38
_080846A4: .4byte gMapObjects
_080846A8: .4byte gSprites
thumb_func_end sub_80845F4
@@ -2650,7 +2650,7 @@ sub_8084820: @ 8084820
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0808488C @ =gUnknown_2036E38
ldr r1, _0808488C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -2693,7 +2693,7 @@ _0808487E:
bx r1
.align 2, 0
_08084888: .4byte gUnknown_2037078
_0808488C: .4byte gUnknown_2036E38
_0808488C: .4byte gMapObjects
thumb_func_end sub_8084820
thumb_func_start sub_8084890
@@ -2944,7 +2944,7 @@ sub_8084A5C: @ 8084A5C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08084AC0 @ =gUnknown_2036E38
ldr r0, _08084AC0 @ =gMapObjects
adds r4, r0
movs r0, 0x4
bl sub_8063EB8
@@ -2979,7 +2979,7 @@ sub_8084A5C: @ 8084A5C
b _08084AC6
.align 2, 0
_08084ABC: .4byte gUnknown_2037078
_08084AC0: .4byte gUnknown_2036E38
_08084AC0: .4byte gMapObjects
_08084AC4:
movs r1, 0
_08084AC6:
@@ -3189,7 +3189,7 @@ sub_8084C3C: @ 8084C3C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08084C98 @ =gUnknown_2036E38
ldr r1, _08084C98 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -3220,7 +3220,7 @@ _08084C8A:
bx r1
.align 2, 0
_08084C94: .4byte gUnknown_2037078
_08084C98: .4byte gUnknown_2036E38
_08084C98: .4byte gMapObjects
_08084C9C: .4byte sub_8084A24
thumb_func_end sub_8084C3C
@@ -3273,7 +3273,7 @@ _08084CEA:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _08084D20 @ =gUnknown_2036E38
ldr r0, _08084D20 @ =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3288,7 +3288,7 @@ _08084CEA:
_08084D14: .4byte gUnknown_83CC084
_08084D18: .4byte gTasks
_08084D1C: .4byte gUnknown_2037078
_08084D20: .4byte gUnknown_2036E38
_08084D20: .4byte gMapObjects
thumb_func_end sub_8084CD8
thumb_func_start sub_8084D24
@@ -3537,7 +3537,7 @@ dive_3_unknown: @ 8084ED4
lsls r0, 24
cmp r0, 0
bne _08084F18
ldr r2, _08084F20 @ =gUnknown_2036E38
ldr r2, _08084F20 @ =gMapObjects
ldr r0, _08084F24 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -3560,7 +3560,7 @@ _08084F18:
pop {r1}
bx r1
.align 2, 0
_08084F20: .4byte gUnknown_2036E38
_08084F20: .4byte gMapObjects
_08084F24: .4byte gUnknown_2037078
_08084F28: .4byte sub_8084E60
thumb_func_end dive_3_unknown
@@ -3600,7 +3600,7 @@ _08084F58:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _08084F98 @ =gUnknown_2036E38
ldr r0, _08084F98 @ =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -3621,7 +3621,7 @@ _08084F58:
_08084F8C: .4byte gUnknown_83CC0A4
_08084F90: .4byte gTasks
_08084F94: .4byte gUnknown_2037078
_08084F98: .4byte gUnknown_2036E38
_08084F98: .4byte gMapObjects
_08084F9C: .4byte gSprites
thumb_func_end sub_8084F44
@@ -3946,7 +3946,7 @@ _080851FC:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _0808523C @ =gUnknown_2036E38
ldr r0, _0808523C @ =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -3967,7 +3967,7 @@ _080851FC:
_08085230: .4byte gUnknown_83CC0BC
_08085234: .4byte gTasks
_08085238: .4byte gUnknown_2037078
_0808523C: .4byte gUnknown_2036E38
_0808523C: .4byte gMapObjects
_08085240: .4byte gSprites
thumb_func_end sub_80851E8
@@ -4209,7 +4209,7 @@ _080853F8:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _08085438 @ =gUnknown_2036E38
ldr r0, _08085438 @ =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -4230,7 +4230,7 @@ _080853F8:
_0808542C: .4byte gUnknown_83CC0CC
_08085430: .4byte gTasks
_08085434: .4byte gUnknown_2037078
_08085438: .4byte gUnknown_2036E38
_08085438: .4byte gMapObjects
_0808543C: .4byte gSprites
thumb_func_end sub_80853E4
@@ -4546,7 +4546,7 @@ sub_8085690: @ 8085690
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080856D8 @ =gUnknown_2036E38
ldr r1, _080856D8 @ =gMapObjects
adds r6, r0, r1
adds r4, r5, 0
adds r4, 0x8
@@ -4572,7 +4572,7 @@ sub_8085690: @ 8085690
b _08085702
.align 2, 0
_080856D4: .4byte gUnknown_2037078
_080856D8: .4byte gUnknown_2036E38
_080856D8: .4byte gMapObjects
_080856DC:
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -4973,7 +4973,7 @@ sub_80859D4: @ 80859D4
ldr r1, _08085A14 @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
ldr r2, _08085A18 @ =gUnknown_2036E38
ldr r2, _08085A18 @ =gMapObjects
ldr r0, _08085A1C @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -4991,7 +4991,7 @@ sub_80859D4: @ 80859D4
bx r0
.align 2, 0
_08085A14: .4byte gUnknown_3005020
_08085A18: .4byte gUnknown_2036E38
_08085A18: .4byte gMapObjects
_08085A1C: .4byte gUnknown_2037078
_08085A20: .4byte sub_8085A24
thumb_func_end sub_80859D4
@@ -5056,7 +5056,7 @@ sub_8085A80: @ 8085A80
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08085AD8 @ =gUnknown_2036E38
ldr r1, _08085AD8 @ =gMapObjects
adds r6, r0, r1
adds r1, r4, 0
adds r1, 0xA
@@ -5088,7 +5088,7 @@ sub_8085A80: @ 8085A80
b _08085B10
.align 2, 0
_08085AD4: .4byte gUnknown_2037078
_08085AD8: .4byte gUnknown_2036E38
_08085AD8: .4byte gMapObjects
_08085ADC:
movs r2, 0xE
ldrsh r0, [r5, r2]
@@ -5226,7 +5226,7 @@ sub_8085BD0: @ 8085BD0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08085C5C @ =gUnknown_2036E38
ldr r1, _08085C5C @ =gMapObjects
adds r5, r0, r1
ldrh r1, [r4, 0xA]
movs r2, 0xA
@@ -5282,7 +5282,7 @@ _08085C4A:
.align 2, 0
_08085C54: .4byte gUnknown_83CC108
_08085C58: .4byte gUnknown_2037078
_08085C5C: .4byte gUnknown_2036E38
_08085C5C: .4byte gMapObjects
thumb_func_end sub_8085BD0
thumb_func_start sub_8085C60
@@ -5299,7 +5299,7 @@ sub_8085C60: @ 8085C60
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08085D2C @ =gUnknown_2036E38
ldr r1, _08085D2C @ =gMapObjects
adds r3, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -5387,7 +5387,7 @@ _08085D1A:
.align 2, 0
_08085D24: .4byte gUnknown_83CC108
_08085D28: .4byte gUnknown_2037078
_08085D2C: .4byte gUnknown_2036E38
_08085D2C: .4byte gMapObjects
_08085D30: .4byte gSprites
thumb_func_end sub_8085C60
@@ -5439,7 +5439,7 @@ mapldr_08085D88: @ 8085D88
ldr r1, _08085DCC @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
ldr r2, _08085DD0 @ =gUnknown_2036E38
ldr r2, _08085DD0 @ =gMapObjects
ldr r0, _08085DD4 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -5458,7 +5458,7 @@ mapldr_08085D88: @ 8085D88
bx r0
.align 2, 0
_08085DCC: .4byte gUnknown_3005020
_08085DD0: .4byte gUnknown_2036E38
_08085DD0: .4byte gMapObjects
_08085DD4: .4byte gUnknown_2037078
_08085DD8: .4byte sub_8085DDC
thumb_func_end mapldr_08085D88
@@ -5518,7 +5518,7 @@ sub_8085E0C: @ 8085E0C
adds r0, r1
negs r0, r0
strh r0, [r2, 0x26]
ldr r3, _08085E94 @ =gUnknown_2036E38
ldr r3, _08085E94 @ =gMapObjects
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -5554,7 +5554,7 @@ _08085E82:
_08085E88: .4byte gUnknown_2037078
_08085E8C: .4byte gSprites
_08085E90: .4byte gSpriteCoordOffsetY
_08085E94: .4byte gUnknown_2036E38
_08085E94: .4byte gMapObjects
thumb_func_end sub_8085E0C
thumb_func_start sub_8085E98
@@ -5571,7 +5571,7 @@ sub_8085E98: @ 8085E98
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08085F08 @ =gUnknown_2036E38
ldr r1, _08085F08 @ =gMapObjects
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -5613,7 +5613,7 @@ sub_8085E98: @ 8085E98
.align 2, 0
_08085F00: .4byte gUnknown_83CC108
_08085F04: .4byte gUnknown_2037078
_08085F08: .4byte gUnknown_2036E38
_08085F08: .4byte gMapObjects
_08085F0C: .4byte gSprites
_08085F10:
ldrb r1, [r5, 0x5]
@@ -5704,7 +5704,7 @@ sub_8085F9C: @ 8085F9C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086020 @ =gUnknown_2036E38
ldr r1, _08086020 @ =gMapObjects
adds r5, r0, r1
ldrh r0, [r4, 0xA]
subs r0, 0x1
@@ -5751,7 +5751,7 @@ _08086010:
.align 2, 0
_08086018: .4byte gUnknown_83CC108
_0808601C: .4byte gUnknown_2037078
_08086020: .4byte gUnknown_2036E38
_08086020: .4byte gMapObjects
_08086024: .4byte sub_8085DDC
thumb_func_end sub_8085F9C
@@ -7014,7 +7014,7 @@ sub_80869C0: @ 80869C0
adds r0, r6, 0
mov r1, r8
bl PlayerGetDestCoords
ldr r2, _08086A1C @ =gUnknown_2036E38
ldr r2, _08086A1C @ =gMapObjects
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7035,7 +7035,7 @@ sub_80869C0: @ 80869C0
bx r0
.align 2, 0
_08086A18: .4byte gUnknown_2037078
_08086A1C: .4byte gUnknown_2036E38
_08086A1C: .4byte gMapObjects
thumb_func_end sub_80869C0
thumb_func_start sub_8086A20
@@ -7047,7 +7047,7 @@ sub_8086A20: @ 8086A20
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086A68 @ =gUnknown_2036E38
ldr r1, _08086A68 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -7073,7 +7073,7 @@ _08086A5C:
bx r0
.align 2, 0
_08086A64: .4byte gUnknown_2037078
_08086A68: .4byte gUnknown_2036E38
_08086A68: .4byte gMapObjects
thumb_func_end sub_8086A20
thumb_func_start sub_8086A6C
@@ -7085,7 +7085,7 @@ sub_8086A6C: @ 8086A6C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086AAC @ =gUnknown_2036E38
ldr r1, _08086AAC @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -7109,7 +7109,7 @@ _08086AA2:
bx r0
.align 2, 0
_08086AA8: .4byte gUnknown_2037078
_08086AAC: .4byte gUnknown_2036E38
_08086AAC: .4byte gMapObjects
_08086AB0: .4byte gUnknown_20386E0
thumb_func_end sub_8086A6C
@@ -7127,7 +7127,7 @@ sub_8086AB4: @ 8086AB4
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08086B28 @ =gUnknown_2036E38
ldr r0, _08086B28 @ =gMapObjects
adds r4, r0
movs r0, 0x2
bl sub_805C808
@@ -7167,7 +7167,7 @@ _08086B1E:
bx r0
.align 2, 0
_08086B24: .4byte gUnknown_2037078
_08086B28: .4byte gUnknown_2036E38
_08086B28: .4byte gMapObjects
_08086B2C: .4byte gUnknown_20386E0
thumb_func_end sub_8086AB4
@@ -7179,7 +7179,7 @@ sub_8086B30: @ 8086B30
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086BA0 @ =gUnknown_2036E38
ldr r1, _08086BA0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -7220,7 +7220,7 @@ _08086B96:
bx r0
.align 2, 0
_08086B9C: .4byte gUnknown_2037078
_08086BA0: .4byte gUnknown_2036E38
_08086BA0: .4byte gMapObjects
_08086BA4: .4byte sub_8086990
thumb_func_end sub_8086B30
@@ -7299,7 +7299,7 @@ sub_8086C24: @ 8086C24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086C6C @ =gUnknown_2036E38
ldr r1, _08086C6C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -7325,7 +7325,7 @@ _08086C60:
bx r0
.align 2, 0
_08086C68: .4byte gUnknown_2037078
_08086C6C: .4byte gUnknown_2036E38
_08086C6C: .4byte gMapObjects
thumb_func_end sub_8086C24
thumb_func_start sub_8086C70
@@ -7337,7 +7337,7 @@ sub_8086C70: @ 8086C70
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086CA0 @ =gUnknown_2036E38
ldr r1, _08086CA0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -7353,7 +7353,7 @@ sub_8086C70: @ 8086C70
b _08086CAE
.align 2, 0
_08086C9C: .4byte gUnknown_2037078
_08086CA0: .4byte gUnknown_2036E38
_08086CA0: .4byte gMapObjects
_08086CA4:
movs r0, 0x8
ands r0, r1
@@ -7403,7 +7403,7 @@ sub_8086CF4: @ 8086CF4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086D30 @ =gUnknown_2036E38
ldr r1, _08086D30 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
@@ -7424,7 +7424,7 @@ _08086D26:
bx r0
.align 2, 0
_08086D2C: .4byte gUnknown_2037078
_08086D30: .4byte gUnknown_2036E38
_08086D30: .4byte gMapObjects
_08086D34: .4byte sub_8086BD0
thumb_func_end sub_8086CF4
@@ -7596,7 +7596,7 @@ sub_8086E70: @ 8086E70
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086EC4 @ =gUnknown_2036E38
ldr r1, _08086EC4 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -7627,7 +7627,7 @@ _08086EB8:
bx r0
.align 2, 0
_08086EC0: .4byte gUnknown_2037078
_08086EC4: .4byte gUnknown_2036E38
_08086EC4: .4byte gMapObjects
thumb_func_end sub_8086E70
thumb_func_start sub_8086EC8
@@ -7639,7 +7639,7 @@ sub_8086EC8: @ 8086EC8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086F04 @ =gUnknown_2036E38
ldr r1, _08086F04 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
@@ -7660,7 +7660,7 @@ _08086EF8:
bx r0
.align 2, 0
_08086F00: .4byte gUnknown_2037078
_08086F04: .4byte gUnknown_2036E38
_08086F04: .4byte gMapObjects
_08086F08: .4byte gUnknown_20386E0
thumb_func_end sub_8086EC8
@@ -7678,7 +7678,7 @@ sub_8086F0C: @ 8086F0C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086F60 @ =gUnknown_2036E38
ldr r1, _08086F60 @ =gMapObjects
adds r5, r0, r1
ldrh r1, [r4, 0x26]
movs r0, 0x8
@@ -7705,7 +7705,7 @@ _08086F54:
bx r0
.align 2, 0
_08086F5C: .4byte gUnknown_2037078
_08086F60: .4byte gUnknown_2036E38
_08086F60: .4byte gMapObjects
thumb_func_end sub_8086F0C
thumb_func_start sub_8086F64
@@ -7729,7 +7729,7 @@ sub_8086F64: @ 8086F64
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086FA4 @ =gUnknown_2036E38
ldr r1, _08086FA4 @ =gMapObjects
adds r0, r1
movs r1, 0x2
bl sub_8063CA4
@@ -7739,7 +7739,7 @@ _08086F98:
bx r0
.align 2, 0
_08086FA0: .4byte gUnknown_2037078
_08086FA4: .4byte gUnknown_2036E38
_08086FA4: .4byte gMapObjects
thumb_func_end sub_8086F64
thumb_func_start sub_8086FA8
@@ -7751,7 +7751,7 @@ sub_8086FA8: @ 8086FA8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086FF8 @ =gUnknown_2036E38
ldr r1, _08086FF8 @ =gMapObjects
adds r2, r0, r1
ldrh r1, [r4, 0xC]
movs r3, 0xC
@@ -7782,7 +7782,7 @@ _08086FEC:
bx r0
.align 2, 0
_08086FF4: .4byte gUnknown_2037078
_08086FF8: .4byte gUnknown_2036E38
_08086FF8: .4byte gMapObjects
thumb_func_end sub_8086FA8
thumb_func_start sub_8086FFC
@@ -7801,7 +7801,7 @@ sub_8086FFC: @ 8086FFC
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08087064 @ =gUnknown_2036E38
ldr r0, _08087064 @ =gMapObjects
adds r4, r0
movs r0, 0x2
bl sub_805C808
@@ -7836,7 +7836,7 @@ _0808705A:
bx r0
.align 2, 0
_08087060: .4byte gUnknown_2037078
_08087064: .4byte gUnknown_2036E38
_08087064: .4byte gMapObjects
_08087068: .4byte gSprites
thumb_func_end sub_8086FFC
@@ -7856,7 +7856,7 @@ sub_808706C: @ 808706C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08087108 @ =gUnknown_2036E38
ldr r0, _08087108 @ =gMapObjects
adds r4, r0
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimActive
@@ -7915,7 +7915,7 @@ _080870FC:
bx r0
.align 2, 0
_08087104: .4byte gUnknown_2037078
_08087108: .4byte gUnknown_2036E38
_08087108: .4byte gMapObjects
_0808710C: .4byte gSprites
_08087110: .4byte gSaveBlock2Ptr
_08087114: .4byte sub_8087828
@@ -8430,7 +8430,7 @@ sub_80874C8: @ 80874C8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080875B8 @ =gUnknown_2036E38
ldr r1, _080875B8 @ =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -8532,7 +8532,7 @@ _080875AE:
bx r0
.align 2, 0
_080875B4: .4byte gUnknown_2037078
_080875B8: .4byte gUnknown_2036E38
_080875B8: .4byte gMapObjects
_080875BC: .4byte gSprites
_080875C0: .4byte gSaveBlock2Ptr
_080875C4: .4byte sub_8087828
@@ -8566,7 +8566,7 @@ _080875F2:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08087640 @ =gUnknown_2036E38
ldr r1, _08087640 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
@@ -8598,7 +8598,7 @@ _08087630:
.align 2, 0
_08087638: .4byte gSprites
_0808763C: .4byte gUnknown_2037078
_08087640: .4byte gUnknown_2036E38
_08087640: .4byte gMapObjects
thumb_func_end sub_80875C8
thumb_func_start sub_8087644
@@ -8658,7 +8658,7 @@ sub_8087698: @ 8087698
lsls r5, r0, 3
adds r5, r0
lsls r5, 2
ldr r0, _08087708 @ =gUnknown_2036E38
ldr r0, _08087708 @ =gMapObjects
adds r5, r0
ldrb r0, [r5, 0x4]
lsls r4, r0, 4
@@ -8698,7 +8698,7 @@ _080876FC:
bx r0
.align 2, 0
_08087704: .4byte gUnknown_2037078
_08087708: .4byte gUnknown_2036E38
_08087708: .4byte gMapObjects
_0808770C: .4byte gSprites
thumb_func_end sub_8087698
@@ -8711,7 +8711,7 @@ sub_8087710: @ 8087710
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08087744 @ =gUnknown_2036E38
ldr r1, _08087744 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
@@ -8728,7 +8728,7 @@ _08087738:
bx r0
.align 2, 0
_08087740: .4byte gUnknown_2037078
_08087744: .4byte gUnknown_2036E38
_08087744: .4byte gMapObjects
thumb_func_end sub_8087710
thumb_func_start sub_8087748
@@ -8776,7 +8776,7 @@ fishE: @ 8087780
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080877F4 @ =gUnknown_2036E38
ldr r1, _080877F4 @ =gMapObjects
adds r4, r0, r1
movs r7, 0
ldrh r1, [r5, 0x26]
@@ -8816,7 +8816,7 @@ _080877EA:
bx r0
.align 2, 0
_080877F0: .4byte gUnknown_2037078
_080877F4: .4byte gUnknown_2036E38
_080877F4: .4byte gMapObjects
_080877F8: .4byte sub_8087498
thumb_func_end fishE
@@ -8991,7 +8991,7 @@ sub_8087924: @ 8087924
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080879C8 @ =gUnknown_2036E38
ldr r0, _080879C8 @ =gMapObjects
adds r4, r0
movs r0, 0x10
ldrsh r5, [r4, r0]
@@ -9055,7 +9055,7 @@ _080879BA:
bx r1
.align 2, 0
_080879C4: .4byte gUnknown_20386E0
_080879C8: .4byte gUnknown_2036E38
_080879C8: .4byte gMapObjects
_080879CC: .4byte sub_80879D8
_080879D0: .4byte gTasks
_080879D4: .4byte gSprites
@@ -9148,7 +9148,7 @@ _08087A78:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08087AB0 @ =gUnknown_2036E38
ldr r0, _08087AB0 @ =gMapObjects
adds r4, r0
ldrh r0, [r5, 0x4]
strh r0, [r6, 0x20]
@@ -9169,7 +9169,7 @@ _08087AA8:
pop {r0}
bx r0
.align 2, 0
_08087AB0: .4byte gUnknown_2036E38
_08087AB0: .4byte gMapObjects
thumb_func_end sub_80879D8
thumb_func_start sub_8087AB4
@@ -9381,7 +9381,7 @@ sub_8087C2C: @ 8087C2C
asrs r0, 16
cmp r0, 0x78
ble _08087C9A
ldr r2, _08087CA4 @ =gUnknown_2036E38
ldr r2, _08087CA4 @ =gMapObjects
movs r1, 0x4
ldrsh r0, [r7, r1]
lsls r1, r0, 3
@@ -9427,7 +9427,7 @@ _08087C9A:
pop {r0}
bx r0
.align 2, 0
_08087CA4: .4byte gUnknown_2036E38
_08087CA4: .4byte gMapObjects
_08087CA8: .4byte gSprites
_08087CAC: .4byte 0x0000ffff
_08087CB0: .4byte 0x00007fff
asm/field_effect_helpers.s
+40 -40
View File
@@ -253,7 +253,7 @@ sub_80DAF50: @ 80DAF50
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080DAF98 @ =gUnknown_2036E38
ldr r1, _080DAF98 @ =gMapObjects
adds r7, r0, r1
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
@@ -281,7 +281,7 @@ _080DAF88:
strb r0, [r2]
b _080DB0AE
.align 2, 0
_080DAF98: .4byte gUnknown_2036E38
_080DAF98: .4byte gMapObjects
_080DAF9C: .4byte gSprites
_080DAFA0: .4byte 0x00020001
_080DAFA4:
@@ -587,7 +587,7 @@ oei_shadow: @ 80DB1DC
bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, _080DB26C @ =gUnknown_2036E38
ldr r2, _080DB26C @ =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -649,7 +649,7 @@ _080DB260:
bx r1
.align 2, 0
_080DB268: .4byte gUnknown_20386E0
_080DB26C: .4byte gUnknown_2036E38
_080DB26C: .4byte gMapObjects
_080DB270: .4byte gUnknown_83A0010
_080DB274: .4byte gUnknown_83FECD2
_080DB278: .4byte gSprites
@@ -685,7 +685,7 @@ _080DB2AE:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080DB33C @ =gUnknown_2036E38
ldr r1, _080DB33C @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
lsls r1, r0, 4
@@ -748,7 +748,7 @@ _080DB334:
pop {r0}
bx r0
.align 2, 0
_080DB33C: .4byte gUnknown_2036E38
_080DB33C: .4byte gMapObjects
_080DB340: .4byte gSprites
_080DB344: .4byte 0x00400001
thumb_func_end oamc_shadow
@@ -929,7 +929,7 @@ _080DB4A0:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080DB4F0 @ =gUnknown_2036E38
ldr r1, _080DB4F0 @ =gMapObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -966,7 +966,7 @@ _080DB4E4:
pop {r0}
bx r0
.align 2, 0
_080DB4F0: .4byte gUnknown_2036E38
_080DB4F0: .4byte gMapObjects
thumb_func_end unc_grass_normal
thumb_func_start FldEff_JumpTallGrass
@@ -1280,7 +1280,7 @@ _080DB750:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080DB794 @ =gUnknown_2036E38
ldr r1, _080DB794 @ =gMapObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -1309,7 +1309,7 @@ _080DB786:
pop {r0}
bx r0
.align 2, 0
_080DB794: .4byte gUnknown_2036E38
_080DB794: .4byte gMapObjects
thumb_func_end unc_grass_tall
thumb_func_start FldEff_JumpLongGrass
@@ -1382,7 +1382,7 @@ sub_80DB808: @ 80DB808
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DB8A0 @ =gUnknown_2036E38
ldr r0, _080DB8A0 @ =gMapObjects
adds r5, r1, r0
ldr r0, _080DB8A4 @ =gUnknown_83A0010
ldr r0, [r0, 0x78]
@@ -1446,7 +1446,7 @@ _080DB894:
bx r1
.align 2, 0
_080DB89C: .4byte gUnknown_20386E0
_080DB8A0: .4byte gUnknown_2036E38
_080DB8A0: .4byte gMapObjects
_080DB8A4: .4byte gUnknown_83A0010
_080DB8A8: .4byte gSprites
thumb_func_end sub_80DB808
@@ -1472,7 +1472,7 @@ sub_80DB8AC: @ 80DB8AC
lsls r0, 24
cmp r0, 0
bne _080DB8EA
ldr r5, _080DB8F4 @ =gUnknown_2036E38
ldr r5, _080DB8F4 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1489,7 +1489,7 @@ _080DB8EA:
bl FieldEffectStop
b _080DB98E
.align 2, 0
_080DB8F4: .4byte gUnknown_2036E38
_080DB8F4: .4byte gMapObjects
_080DB8F8:
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
@@ -1839,7 +1839,7 @@ FldEff_Splash: @ 80DBB88
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DBC20 @ =gUnknown_2036E38
ldr r0, _080DBC20 @ =gMapObjects
adds r5, r1, r0
ldr r0, _080DBC24 @ =gUnknown_83A0010
ldr r0, [r0, 0x34]
@@ -1900,7 +1900,7 @@ _080DBC12:
bx r1
.align 2, 0
_080DBC1C: .4byte gUnknown_20386E0
_080DBC20: .4byte gUnknown_2036E38
_080DBC20: .4byte gMapObjects
_080DBC24: .4byte gUnknown_83A0010
_080DBC28: .4byte gSprites
thumb_func_end FldEff_Splash
@@ -1937,7 +1937,7 @@ _080DBC5C:
b _080DBCA6
_080DBC66:
ldr r3, _080DBCB0 @ =gSprites
ldr r2, _080DBCB4 @ =gUnknown_2036E38
ldr r2, _080DBCB4 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1974,7 +1974,7 @@ _080DBCA6:
bx r0
.align 2, 0
_080DBCB0: .4byte gSprites
_080DBCB4: .4byte gUnknown_2036E38
_080DBCB4: .4byte gMapObjects
thumb_func_end sub_80DBC2C
thumb_func_start FldEff_JumpSmallSplash
@@ -2104,7 +2104,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DBE3C @ =gUnknown_2036E38
ldr r0, _080DBE3C @ =gMapObjects
adds r6, r1, r0
ldr r0, _080DBE40 @ =gUnknown_83A0010
ldr r0, [r0, 0x34]
@@ -2171,7 +2171,7 @@ _080DBE2E:
bx r1
.align 2, 0
_080DBE38: .4byte gUnknown_20386E0
_080DBE3C: .4byte gUnknown_2036E38
_080DBE3C: .4byte gMapObjects
_080DBE40: .4byte gUnknown_83A0010
_080DBE44: .4byte gSprites
_080DBE48: .4byte sub_80DBE50
@@ -2197,7 +2197,7 @@ sub_80DBE50: @ 80DBE50
lsls r0, 24
cmp r0, 0
bne _080DBE8A
ldr r2, _080DBE94 @ =gUnknown_2036E38
ldr r2, _080DBE94 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2214,7 +2214,7 @@ _080DBE8A:
bl FieldEffectStop
b _080DBEE2
.align 2, 0
_080DBE94: .4byte gUnknown_2036E38
_080DBE94: .4byte gMapObjects
_080DBE98:
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
@@ -2323,7 +2323,7 @@ sub_80DBF50: @ 80DBF50
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DBFE8 @ =gUnknown_2036E38
ldr r0, _080DBFE8 @ =gMapObjects
adds r5, r1, r0
ldr r0, _080DBFEC @ =gUnknown_83A0010
ldr r0, [r0, 0x7C]
@@ -2387,7 +2387,7 @@ _080DBFDC:
bx r1
.align 2, 0
_080DBFE4: .4byte gUnknown_20386E0
_080DBFE8: .4byte gUnknown_2036E38
_080DBFE8: .4byte gMapObjects
_080DBFEC: .4byte gUnknown_83A0010
_080DBFF0: .4byte gSprites
thumb_func_end sub_80DBF50
@@ -2411,7 +2411,7 @@ sub_80DBFF4: @ 80DBFF4
lsls r0, 24
cmp r0, 0
bne _080DC02E
ldr r5, _080DC038 @ =gUnknown_2036E38
ldr r5, _080DC038 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2428,7 +2428,7 @@ _080DC02E:
bl FieldEffectStop
b _080DC080
.align 2, 0
_080DC038: .4byte gUnknown_2036E38
_080DC038: .4byte gMapObjects
_080DC03C:
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
@@ -2863,7 +2863,7 @@ sub_80DC348: @ 80DC348
movs r2, 0x32
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, _080DC3A0 @ =gUnknown_2036E38
ldr r2, _080DC3A0 @ =gMapObjects
ldr r0, _080DC3A4 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2880,7 +2880,7 @@ sub_80DC348: @ 80DC348
pop {r0}
bx r0
.align 2, 0
_080DC3A0: .4byte gUnknown_2036E38
_080DC3A0: .4byte gMapObjects
_080DC3A4: .4byte gUnknown_2037078
thumb_func_end sub_80DC348
@@ -3081,7 +3081,7 @@ sub_80DC4F8: @ 80DC4F8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080DC548 @ =gUnknown_2036E38
ldr r0, _080DC548 @ =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x4]
lsls r5, r0, 4
@@ -3112,7 +3112,7 @@ sub_80DC4F8: @ 80DC4F8
pop {r0}
bx r0
.align 2, 0
_080DC548: .4byte gUnknown_2036E38
_080DC548: .4byte gMapObjects
_080DC54C: .4byte gSprites
thumb_func_end sub_80DC4F8
@@ -3454,7 +3454,7 @@ FldEff_SandPile: @ 80DC7B0
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DC860 @ =gUnknown_2036E38
ldr r0, _080DC860 @ =gMapObjects
adds r6, r1, r0
ldr r0, _080DC864 @ =gUnknown_83A0010
ldr r0, [r0, 0x74]
@@ -3528,7 +3528,7 @@ _080DC854:
bx r1
.align 2, 0
_080DC85C: .4byte gUnknown_20386E0
_080DC860: .4byte gUnknown_2036E38
_080DC860: .4byte gMapObjects
_080DC864: .4byte gUnknown_83A0010
_080DC868: .4byte gSprites
thumb_func_end FldEff_SandPile
@@ -3552,7 +3552,7 @@ sub_80DC86C: @ 80DC86C
lsls r0, 24
cmp r0, 0
bne _080DC8A6
ldr r2, _080DC8B0 @ =gUnknown_2036E38
ldr r2, _080DC8B0 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3569,7 +3569,7 @@ _080DC8A6:
bl FieldEffectStop
b _080DC926
.align 2, 0
_080DC8B0: .4byte gUnknown_2036E38
_080DC8B0: .4byte gMapObjects
_080DC8B4:
ldr r2, _080DC930 @ =gSprites
ldrb r1, [r1, 0x4]
@@ -3608,7 +3608,7 @@ _080DC8F6:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
ldr r3, _080DC930 @ =gSprites
ldr r2, _080DC934 @ =gUnknown_2036E38
ldr r2, _080DC934 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3635,7 +3635,7 @@ _080DC926:
bx r0
.align 2, 0
_080DC930: .4byte gSprites
_080DC934: .4byte gUnknown_2036E38
_080DC934: .4byte gMapObjects
thumb_func_end sub_80DC86C
thumb_func_start FldEff_Bubbles
@@ -3882,7 +3882,7 @@ sub_80DCAC8: @ 80DCAC8
adds r0, r5, 0
bl FieldEffectStop
_080DCAF8:
ldr r4, _080DCBB0 @ =gUnknown_2036E38
ldr r4, _080DCBB0 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3975,7 +3975,7 @@ _080DCBA8:
pop {r0}
bx r0
.align 2, 0
_080DCBB0: .4byte gUnknown_2036E38
_080DCBB0: .4byte gMapObjects
_080DCBB4: .4byte gSprites
thumb_func_end sub_80DCAC8
@@ -4217,7 +4217,7 @@ _080DCD5E:
lsls r0, r7, 3
adds r0, r7
lsls r0, 2
ldr r1, _080DCDF8 @ =gUnknown_2036E38
ldr r1, _080DCDF8 @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r4]
lsls r0, 31
@@ -4291,7 +4291,7 @@ _080DCDD8:
strb r0, [r2]
b _080DCE0A
.align 2, 0
_080DCDF8: .4byte gUnknown_2036E38
_080DCDF8: .4byte gMapObjects
_080DCDFC: .4byte gSprites
_080DCE00:
adds r0, r7, 0x1
asm/field_fadetransition.s
+22 -22
View File
@@ -727,7 +727,7 @@ _0807E0AE:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E0E8 @ =gUnknown_2036E38
ldr r1, _0807E0E8 @ =gMapObjects
adds r0, r1
movs r1, 0x10
bl sub_8063CA4
@@ -735,7 +735,7 @@ _0807E0AE:
strh r0, [r4, 0x8]
b _0807E206
.align 2, 0
_0807E0E8: .4byte gUnknown_2036E38
_0807E0E8: .4byte gMapObjects
_0807E0EC:
ldrh r0, [r4, 0x24]
adds r0, 0x1
@@ -781,13 +781,13 @@ _0807E10E:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E15C @ =gUnknown_2036E38
ldr r1, _0807E15C @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
b _0807E1F2
.align 2, 0
_0807E158: .4byte sub_807F204
_0807E15C: .4byte gUnknown_2036E38
_0807E15C: .4byte gMapObjects
_0807E160:
bl sub_807E418
cmp r0, 0
@@ -804,7 +804,7 @@ _0807E160:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E194 @ =gUnknown_2036E38
ldr r1, _0807E194 @ =gMapObjects
adds r0, r1
movs r1, 0x10
bl sub_8063CA4
@@ -812,7 +812,7 @@ _0807E160:
strh r0, [r4, 0x8]
b _0807E206
.align 2, 0
_0807E194: .4byte gUnknown_2036E38
_0807E194: .4byte gMapObjects
_0807E198:
bl walkrun_is_standing_still
lsls r0, 24
@@ -836,14 +836,14 @@ _0807E198:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E1D8 @ =gUnknown_2036E38
ldr r1, _0807E1D8 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0x3
strh r0, [r4, 0x8]
b _0807E206
.align 2, 0
_0807E1D8: .4byte gUnknown_2036E38
_0807E1D8: .4byte gMapObjects
_0807E1DC:
movs r1, 0xA
ldrsh r0, [r4, r1]
@@ -927,7 +927,7 @@ _0807E25E:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0807E2A4 @ =gUnknown_2036E38
ldr r0, _0807E2A4 @ =gMapObjects
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -942,7 +942,7 @@ _0807E25E:
strh r0, [r5, 0x8]
b _0807E2C6
.align 2, 0
_0807E2A4: .4byte gUnknown_2036E38
_0807E2A4: .4byte gMapObjects
_0807E2A8:
bl walkrun_is_standing_still
lsls r0, 24
@@ -1729,7 +1729,7 @@ _0807E8AE:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, _0807E8F0 @ =gUnknown_2036E38
ldr r4, _0807E8F0 @ =gMapObjects
adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimActive
movs r0, 0xFF
@@ -1749,7 +1749,7 @@ _0807E8AE:
strh r0, [r5, 0x8]
b _0807E976
.align 2, 0
_0807E8F0: .4byte gUnknown_2036E38
_0807E8F0: .4byte gMapObjects
_0807E8F4:
bl walkrun_is_standing_still
lsls r0, 24
@@ -1774,7 +1774,7 @@ _0807E8F4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E93C @ =gUnknown_2036E38
ldr r1, _0807E93C @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0
@@ -1783,7 +1783,7 @@ _0807E8F4:
strh r0, [r5, 0x8]
b _0807E976
.align 2, 0
_0807E93C: .4byte gUnknown_2036E38
_0807E93C: .4byte gMapObjects
_0807E940:
movs r1, 0xA
ldrsh r0, [r5, r1]
@@ -1836,7 +1836,7 @@ sub_807E980: @ 807E980
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E9C8 @ =gUnknown_2036E38
ldr r1, _0807E9C8 @ =gMapObjects
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -1856,7 +1856,7 @@ sub_807E980: @ 807E980
.align 2, 0
_0807E9C0: .4byte gTasks+0x8
_0807E9C4: .4byte gUnknown_2037078
_0807E9C8: .4byte gUnknown_2036E38
_0807E9C8: .4byte gMapObjects
_0807E9CC: .4byte gSprites
_0807E9D0:
cmp r0, 0x2
@@ -1995,7 +1995,7 @@ sub_807EAC4: @ 807EAC4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0807EB60 @ =gUnknown_2036E38
ldr r2, _0807EB60 @ =gMapObjects
adds r0, r2
mov r8, r0
lsls r1, 16
@@ -2051,7 +2051,7 @@ _0807EB4C:
.align 2, 0
_0807EB58: .4byte gUnknown_2037078
_0807EB5C: .4byte gSprites
_0807EB60: .4byte gUnknown_2036E38
_0807EB60: .4byte gMapObjects
thumb_func_end sub_807EAC4
thumb_func_start sub_807EB64
@@ -2069,7 +2069,7 @@ sub_807EB64: @ 807EB64
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0807EBB8 @ =gUnknown_2036E38
ldr r0, _0807EBB8 @ =gMapObjects
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -2093,7 +2093,7 @@ sub_807EB64: @ 807EB64
bx r0
.align 2, 0
_0807EBB4: .4byte gUnknown_2037078
_0807EBB8: .4byte gUnknown_2036E38
_0807EBB8: .4byte gMapObjects
thumb_func_end sub_807EB64
thumb_func_start sub_807EBBC
@@ -2272,7 +2272,7 @@ _0807ED0C:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0807ED98 @ =gUnknown_2036E38
ldr r0, _0807ED98 @ =gMapObjects
adds r4, r0
adds r0, r1, 0
bl sub_8064270
@@ -2333,7 +2333,7 @@ _0807ED0C:
bx r0
.align 2, 0
_0807ED94: .4byte gUnknown_2037078
_0807ED98: .4byte gUnknown_2036E38
_0807ED98: .4byte gMapObjects
_0807ED9C: .4byte gSprites
thumb_func_end sub_807ECBC
asm/field_map_obj.s
+198 -198
View File
File diff suppressed because it is too large Load Diff
asm/field_player_avatar.s
+92 -92
View File
@@ -14,14 +14,14 @@ sub_805B3B8: @ 805B3B8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0805B3D4 @ =gUnknown_2036E38
ldr r2, _0805B3D4 @ =gMapObjects
adds r0, r2
ldr r2, _0805B3D8 @ =sub_805B3DC
bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
_0805B3D4: .4byte gUnknown_2036E38
_0805B3D4: .4byte gMapObjects
_0805B3D8: .4byte sub_805B3DC
thumb_func_end sub_805B3B8
@@ -48,7 +48,7 @@ sub_805B3E0: @ 805B3E0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805B458 @ =gUnknown_2036E38
ldr r1, _0805B458 @ =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl sub_805CC40
@@ -85,7 +85,7 @@ _0805B448:
bx r0
.align 2, 0
_0805B454: .4byte gUnknown_2037078
_0805B458: .4byte gUnknown_2036E38
_0805B458: .4byte gMapObjects
thumb_func_end sub_805B3E0
thumb_func_start sub_805B45C
@@ -222,7 +222,7 @@ sub_805B528: @ 805B528
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805B594 @ =gUnknown_2036E38
ldr r1, _0805B594 @ =gMapObjects
adds r1, r0, r1
str r1, [r4]
ldrb r0, [r1]
@@ -254,7 +254,7 @@ _0805B586:
.align 2, 0
_0805B58C: .4byte gUnknown_2037078
_0805B590: .4byte gUnknown_2036E30
_0805B594: .4byte gUnknown_2036E38
_0805B594: .4byte gMapObjects
_0805B598:
movs r0, 0
_0805B59A:
@@ -273,7 +273,7 @@ sub_805B5A0: @ 805B5A0
ands r0, r1
cmp r0, 0
bne _0805B610
ldr r2, _0805B5F8 @ =gUnknown_2036E38
ldr r2, _0805B5F8 @ =gMapObjects
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -308,7 +308,7 @@ _0805B5CC:
b _0805B628
.align 2, 0
_0805B5F4: .4byte gUnknown_2037078
_0805B5F8: .4byte gUnknown_2036E38
_0805B5F8: .4byte gMapObjects
_0805B5FC: .4byte gUnknown_835B764
_0805B600:
ldr r0, _0805B60C @ =gUnknown_2037078
@@ -362,7 +362,7 @@ ForcedMovement_None: @ 805B644
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805B68C @ =gUnknown_2036E38
ldr r1, _0805B68C @ =gMapObjects
adds r0, r1
ldrb r2, [r0, 0x1]
movs r1, 0x3
@@ -386,7 +386,7 @@ _0805B67E:
bx r1
.align 2, 0
_0805B688: .4byte gUnknown_2037078
_0805B68C: .4byte gUnknown_2036E38
_0805B68C: .4byte gMapObjects
thumb_func_end ForcedMovement_None
thumb_func_start DoForcedMovement
@@ -461,7 +461,7 @@ DoForcedMovementInCurrentDirection: @ 805B708
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0805B738 @ =gUnknown_2036E38
ldr r2, _0805B738 @ =gMapObjects
adds r0, r2
ldrb r2, [r0, 0x1]
movs r3, 0x4
@@ -476,7 +476,7 @@ DoForcedMovementInCurrentDirection: @ 805B708
bx r1
.align 2, 0
_0805B734: .4byte gUnknown_2037078
_0805B738: .4byte gUnknown_2036E38
_0805B738: .4byte gMapObjects
thumb_func_end DoForcedMovementInCurrentDirection
thumb_func_start ForcedMovement_Slip
@@ -683,7 +683,7 @@ ForcedMovement_Slide: @ 805B88C
lsls r2, r3, 3
adds r2, r3
lsls r2, 2
ldr r3, _0805B8C0 @ =gUnknown_2036E38
ldr r3, _0805B8C0 @ =gMapObjects
adds r2, r3
ldrb r3, [r2, 0x1]
movs r4, 0x4
@@ -699,7 +699,7 @@ ForcedMovement_Slide: @ 805B88C
bx r1
.align 2, 0
_0805B8BC: .4byte gUnknown_2037078
_0805B8C0: .4byte gUnknown_2036E38
_0805B8C0: .4byte gMapObjects
thumb_func_end ForcedMovement_Slide
thumb_func_start ForcedMovement_SlideSouth
@@ -919,7 +919,7 @@ _0805BA30:
lsls r0, 24
cmp r0, 0
beq _0805BA8C
ldr r2, _0805BA70 @ =gUnknown_2036E38
ldr r2, _0805BA70 @ =gMapObjects
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -938,7 +938,7 @@ _0805BA30:
b _0805BA7A
.align 2, 0
_0805BA6C: .4byte 0x0000082f
_0805BA70: .4byte gUnknown_2036E38
_0805BA70: .4byte gMapObjects
_0805BA74:
adds r0, r4, 0
bl sub_805C17C
@@ -979,7 +979,7 @@ sub_805BAAC: @ 805BAAC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BAE8 @ =gUnknown_2036E38
ldr r1, _0805BAE8 @ =gMapObjects
adds r0, r1
ldrh r2, [r0, 0x10]
mov r1, sp
@@ -1000,7 +1000,7 @@ sub_805BAAC: @ 805BAAC
b _0805BB00
.align 2, 0
_0805BAE4: .4byte gUnknown_2037078
_0805BAE8: .4byte gUnknown_2036E38
_0805BAE8: .4byte gMapObjects
_0805BAEC:
movs r0, 0x1
mov r1, sp
@@ -1039,7 +1039,7 @@ sub_805BB1C: @ 805BB1C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BB98 @ =gUnknown_2036E38
ldr r1, _0805BB98 @ =gMapObjects
adds r5, r0, r1
ldrh r1, [r5, 0x10]
add r0, sp, 0x4
@@ -1086,7 +1086,7 @@ sub_805BB1C: @ 805BB1C
b _0805BB9E
.align 2, 0
_0805BB94: .4byte gUnknown_2037078
_0805BB98: .4byte gUnknown_2036E38
_0805BB98: .4byte gMapObjects
_0805BB9C:
movs r0, 0x8
_0805BB9E:
@@ -1291,7 +1291,7 @@ sub_805BCEC: @ 805BCEC
lsrs r6, r0, 24
cmp r6, 0x10
beq _0805BDA0
ldr r0, _0805BD9C @ =gUnknown_2036E38
ldr r0, _0805BD9C @ =gMapObjects
lsls r1, r6, 3
adds r1, r6
lsls r1, 2
@@ -1347,7 +1347,7 @@ _0805BD8A:
b _0805BDA2
.align 2, 0
_0805BD98: .4byte 0x00000805
_0805BD9C: .4byte gUnknown_2036E38
_0805BD9C: .4byte gMapObjects
_0805BDA0:
movs r0, 0
_0805BDA2:
@@ -1431,7 +1431,7 @@ _0805BE14:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BE58 @ =gUnknown_2036E38
ldr r1, _0805BE58 @ =gMapObjects
adds r0, r1
ldr r1, [r2]
bl _call_via_r1
@@ -1452,7 +1452,7 @@ _0805BE48:
.align 2, 0
_0805BE50: .4byte gUnknown_2037078
_0805BE54: .4byte gUnknown_835B844
_0805BE58: .4byte gUnknown_2036E38
_0805BE58: .4byte gMapObjects
thumb_func_end DoPlayerAvatarTransition
thumb_func_start nullsub_22
@@ -1552,7 +1552,7 @@ _0805BEF6:
thumb_func_start player_is_anim_in_certain_ranges
player_is_anim_in_certain_ranges: @ 805BEFC
push {lr}
ldr r2, _0805BF48 @ =gUnknown_2036E38
ldr r2, _0805BF48 @ =gMapObjects
ldr r0, _0805BF4C @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1590,7 +1590,7 @@ _0805BF42:
movs r0, 0x1
b _0805BF52
.align 2, 0
_0805BF48: .4byte gUnknown_2036E38
_0805BF48: .4byte gMapObjects
_0805BF4C: .4byte gUnknown_2037078
_0805BF50:
movs r0, 0
@@ -1629,7 +1629,7 @@ PlayerIsAnimActive: @ 805BF7C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BF9C @ =gUnknown_2036E38
ldr r1, _0805BF9C @ =gMapObjects
adds r0, r1
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
@@ -1638,7 +1638,7 @@ PlayerIsAnimActive: @ 805BF7C
bx r1
.align 2, 0
_0805BF98: .4byte gUnknown_2037078
_0805BF9C: .4byte gUnknown_2036E38
_0805BF9C: .4byte gMapObjects
thumb_func_end PlayerIsAnimActive
thumb_func_start PlayerCheckIfAnimFinishedOrInactive
@@ -1649,7 +1649,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BFC0 @ =gUnknown_2036E38
ldr r1, _0805BFC0 @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -1658,12 +1658,12 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
bx r1
.align 2, 0
_0805BFBC: .4byte gUnknown_2037078
_0805BFC0: .4byte gUnknown_2036E38
_0805BFC0: .4byte gMapObjects
thumb_func_end PlayerCheckIfAnimFinishedOrInactive
thumb_func_start player_set_x22
player_set_x22: @ 805BFC4
ldr r3, _0805BFD8 @ =gUnknown_2036E38
ldr r3, _0805BFD8 @ =gMapObjects
ldr r1, _0805BFDC @ =gUnknown_2037078
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@@ -1674,13 +1674,13 @@ player_set_x22: @ 805BFC4
strb r0, [r1]
bx lr
.align 2, 0
_0805BFD8: .4byte gUnknown_2036E38
_0805BFD8: .4byte gMapObjects
_0805BFDC: .4byte gUnknown_2037078
thumb_func_end player_set_x22
thumb_func_start player_get_x22
player_get_x22: @ 805BFE0
ldr r2, _0805BFF4 @ =gUnknown_2036E38
ldr r2, _0805BFF4 @ =gMapObjects
ldr r0, _0805BFF8 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1691,7 +1691,7 @@ player_get_x22: @ 805BFE0
ldrb r0, [r0]
bx lr
.align 2, 0
_0805BFF4: .4byte gUnknown_2036E38
_0805BFF4: .4byte gMapObjects
_0805BFF8: .4byte gUnknown_2037078
thumb_func_end player_get_x22
@@ -1706,14 +1706,14 @@ sub_805BFFC: @ 805BFFC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0805C020 @ =gUnknown_2036E38
ldr r2, _0805C020 @ =gMapObjects
adds r0, r2
bl FieldObjectForceSetSpecialAnim
pop {r0}
bx r0
.align 2, 0
_0805C01C: .4byte gUnknown_2037078
_0805C020: .4byte gUnknown_2036E38
_0805C020: .4byte gMapObjects
thumb_func_end sub_805BFFC
thumb_func_start sub_805C024
@@ -1734,7 +1734,7 @@ sub_805C024: @ 805C024
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805C068 @ =gUnknown_2036E38
ldr r1, _0805C068 @ =gMapObjects
adds r0, r1
adds r1, r5, 0
bl sub_8063CA4
@@ -1749,7 +1749,7 @@ _0805C05E:
bx r0
.align 2, 0
_0805C064: .4byte gUnknown_2037078
_0805C068: .4byte gUnknown_2036E38
_0805C068: .4byte gMapObjects
thumb_func_end sub_805C024
thumb_func_start sub_805C06C
@@ -1762,7 +1762,7 @@ sub_805C06C: @ 805C06C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805C0A0 @ =gUnknown_2036E38
ldr r1, _0805C0A0 @ =gMapObjects
adds r0, r1
adds r1, r4, 0
bl sub_8063CA4
@@ -1778,7 +1778,7 @@ _0805C094:
bx r0
.align 2, 0
_0805C09C: .4byte gUnknown_2037078
_0805C0A0: .4byte gUnknown_2036E38
_0805C0A0: .4byte gMapObjects
thumb_func_end sub_805C06C
thumb_func_start sub_805C0A4
@@ -2056,7 +2056,7 @@ _0805C27E:
lsls r0, 24
cmp r0, 0
beq _0805C2A6
ldr r2, _0805C2B0 @ =gUnknown_2036E38
ldr r2, _0805C2B0 @ =gMapObjects
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2075,7 +2075,7 @@ _0805C2A6:
bx r0
.align 2, 0
_0805C2AC: .4byte gUnknown_2037078
_0805C2B0: .4byte gUnknown_2036E38
_0805C2B0: .4byte gMapObjects
thumb_func_end sub_805C270
thumb_func_start sub_805C2B4
@@ -2301,7 +2301,7 @@ sub_805C438: @ 805C438
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
ldr r2, _0805C4E8 @ =gUnknown_2036E38
ldr r2, _0805C4E8 @ =gMapObjects
ldr r0, _0805C4EC @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2378,7 +2378,7 @@ _0805C4DE:
pop {r0}
bx r0
.align 2, 0
_0805C4E8: .4byte gUnknown_2036E38
_0805C4E8: .4byte gMapObjects
_0805C4EC: .4byte gUnknown_2037078
_0805C4F0: .4byte gUnknown_835B864
thumb_func_end sub_805C438
@@ -2388,7 +2388,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r3, _0805C530 @ =gUnknown_2036E38
ldr r3, _0805C530 @ =gMapObjects
ldr r2, _0805C534 @ =gUnknown_2037078
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -2414,14 +2414,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
pop {r0}
bx r0
.align 2, 0
_0805C530: .4byte gUnknown_2036E38
_0805C530: .4byte gMapObjects
_0805C534: .4byte gUnknown_2037078
thumb_func_end GetXYCoordsOneStepInFrontOfPlayer
thumb_func_start PlayerGetDestCoords
PlayerGetDestCoords: @ 805C538
push {r4,r5,lr}
ldr r5, _0805C560 @ =gUnknown_2036E38
ldr r5, _0805C560 @ =gMapObjects
ldr r4, _0805C564 @ =gUnknown_2037078
ldrb r3, [r4, 0x5]
lsls r2, r3, 3
@@ -2441,7 +2441,7 @@ PlayerGetDestCoords: @ 805C538
pop {r0}
bx r0
.align 2, 0
_0805C560: .4byte gUnknown_2036E38
_0805C560: .4byte gMapObjects
_0805C564: .4byte gUnknown_2037078
thumb_func_end PlayerGetDestCoords
@@ -2455,7 +2455,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805C5C0 @ =gUnknown_2036E38
ldr r1, _0805C5C0 @ =gMapObjects
adds r3, r0, r1
ldrb r1, [r3]
movs r0, 0xC0
@@ -2493,7 +2493,7 @@ _0805C5B0:
mov pc, r0
.align 2, 0
_0805C5BC: .4byte gUnknown_2037078
_0805C5C0: .4byte gUnknown_2036E38
_0805C5C0: .4byte gMapObjects
_0805C5C4: .4byte gSprites
_0805C5C8: .4byte _0805C5CC
.align 2, 0
@@ -2584,7 +2584,7 @@ _0805C6BC:
thumb_func_start player_get_direction_lower_nybble
player_get_direction_lower_nybble: @ 805C6C4
ldr r2, _0805C6DC @ =gUnknown_2036E38
ldr r2, _0805C6DC @ =gMapObjects
ldr r0, _0805C6E0 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2596,13 +2596,13 @@ player_get_direction_lower_nybble: @ 805C6C4
lsrs r0, 28
bx lr
.align 2, 0
_0805C6DC: .4byte gUnknown_2036E38
_0805C6DC: .4byte gMapObjects
_0805C6E0: .4byte gUnknown_2037078
thumb_func_end player_get_direction_lower_nybble
thumb_func_start player_get_direction_upper_nybble
player_get_direction_upper_nybble: @ 805C6E4
ldr r2, _0805C6F8 @ =gUnknown_2036E38
ldr r2, _0805C6F8 @ =gMapObjects
ldr r0, _0805C6FC @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2613,13 +2613,13 @@ player_get_direction_upper_nybble: @ 805C6E4
lsrs r0, 4
bx lr
.align 2, 0
_0805C6F8: .4byte gUnknown_2036E38
_0805C6F8: .4byte gMapObjects
_0805C6FC: .4byte gUnknown_2037078
thumb_func_end player_get_direction_upper_nybble
thumb_func_start PlayerGetZCoord
PlayerGetZCoord: @ 805C700
ldr r2, _0805C714 @ =gUnknown_2036E38
ldr r2, _0805C714 @ =gMapObjects
ldr r0, _0805C718 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2630,7 +2630,7 @@ PlayerGetZCoord: @ 805C700
lsrs r0, 4
bx lr
.align 2, 0
_0805C714: .4byte gUnknown_2036E38
_0805C714: .4byte gMapObjects
_0805C718: .4byte gUnknown_2037078
thumb_func_end PlayerGetZCoord
@@ -2644,7 +2644,7 @@ sub_805C71C: @ 805C71C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805C748 @ =gUnknown_2036E38
ldr r1, _0805C748 @ =gMapObjects
adds r0, r1
lsls r3, 16
asrs r3, 16
@@ -2656,7 +2656,7 @@ sub_805C71C: @ 805C71C
bx r0
.align 2, 0
_0805C744: .4byte gUnknown_2037078
_0805C748: .4byte gUnknown_2036E38
_0805C748: .4byte gMapObjects
thumb_func_end sub_805C71C
thumb_func_start TestPlayerAvatarFlags
@@ -2704,7 +2704,7 @@ sub_805C780: @ 805C780
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805C7C4 @ =gUnknown_2036E38
ldr r0, _0805C7C4 @ =gMapObjects
adds r4, r0
adds r0, r4, 0
bl npc_clear_strange_bits
@@ -2727,7 +2727,7 @@ _0805C7B8:
bx r0
.align 2, 0
_0805C7C0: .4byte gUnknown_2037078
_0805C7C4: .4byte gUnknown_2036E38
_0805C7C4: .4byte gMapObjects
thumb_func_end sub_805C780
thumb_func_start sub_805C7C8
@@ -2882,7 +2882,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805C928 @ =gUnknown_2036E38
ldr r0, _0805C928 @ =gMapObjects
adds r4, r0
ldrh r1, [r4, 0x10]
mov r0, sp
@@ -2930,7 +2930,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
b _0805C92E
.align 2, 0
_0805C924: .4byte gUnknown_2037078
_0805C928: .4byte gUnknown_2036E38
_0805C928: .4byte gMapObjects
_0805C92C:
movs r0, 0
_0805C92E:
@@ -3152,7 +3152,7 @@ InitPlayerAvatar: @ 805CA3C
lsls r4, r5, 3
adds r4, r5
lsls r4, 2
ldr r0, _0805CAFC @ =gUnknown_2036E38
ldr r0, _0805CAFC @ =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x2]
movs r1, 0x1
@@ -3182,7 +3182,7 @@ InitPlayerAvatar: @ 805CA3C
pop {r0}
bx r0
.align 2, 0
_0805CAFC: .4byte gUnknown_2036E38
_0805CAFC: .4byte gMapObjects
_0805CB00: .4byte gUnknown_2037078
thumb_func_end InitPlayerAvatar
@@ -3191,7 +3191,7 @@ sub_805CB04: @ 805CB04
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r6, _0805CB64 @ =gUnknown_2036E38
ldr r6, _0805CB64 @ =gMapObjects
ldr r5, _0805CB68 @ =gUnknown_2037078
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
@@ -3236,7 +3236,7 @@ _0805CB5C:
pop {r0}
bx r0
.align 2, 0
_0805CB64: .4byte gUnknown_2036E38
_0805CB64: .4byte gMapObjects
_0805CB68: .4byte gUnknown_2037078
_0805CB6C: .4byte gSprites
thumb_func_end sub_805CB04
@@ -3249,7 +3249,7 @@ sub_805CB70: @ 805CB70
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805CBB0 @ =gUnknown_2036E38
ldr r0, _0805CBB0 @ =gMapObjects
adds r4, r0
movs r0, 0x3
bl sub_805C808
@@ -3271,7 +3271,7 @@ sub_805CB70: @ 805CB70
bx r0
.align 2, 0
_0805CBAC: .4byte gUnknown_2037078
_0805CBB0: .4byte gUnknown_2036E38
_0805CBB0: .4byte gMapObjects
_0805CBB4: .4byte gSprites
thumb_func_end sub_805CB70
@@ -3311,7 +3311,7 @@ sub_805CBE8: @ 805CBE8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805CC24 @ =gUnknown_2036E38
ldr r0, _0805CC24 @ =gMapObjects
adds r4, r0
bl sub_805CBB8
adds r1, r0, 0
@@ -3332,7 +3332,7 @@ sub_805CBE8: @ 805CBE8
bx r0
.align 2, 0
_0805CC20: .4byte gUnknown_2037078
_0805CC24: .4byte gUnknown_2036E38
_0805CC24: .4byte gMapObjects
_0805CC28: .4byte gSprites
thumb_func_end sub_805CBE8
@@ -3468,7 +3468,7 @@ taskFF_bump_boulder: @ 805CD0C
lsrs r0, 24
ldr r6, _0805CD54 @ =gUnknown_835B8A0
ldr r2, _0805CD58 @ =gTasks
ldr r5, _0805CD5C @ =gUnknown_2036E38
ldr r5, _0805CD5C @ =gMapObjects
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3502,7 +3502,7 @@ _0805CD20:
.align 2, 0
_0805CD54: .4byte gUnknown_835B8A0
_0805CD58: .4byte gTasks
_0805CD5C: .4byte gUnknown_2036E38
_0805CD5C: .4byte gMapObjects
_0805CD60: .4byte gUnknown_2037078
thumb_func_end taskFF_bump_boulder
@@ -3677,7 +3677,7 @@ _0805CEB2:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _0805CEE8 @ =gUnknown_2036E38
ldr r0, _0805CEE8 @ =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3692,7 +3692,7 @@ _0805CEB2:
_0805CEDC: .4byte gUnknown_835B8AC
_0805CEE0: .4byte gTasks
_0805CEE4: .4byte gUnknown_2037078
_0805CEE8: .4byte gUnknown_2036E38
_0805CEE8: .4byte gMapObjects
thumb_func_end sub_805CEA0
thumb_func_start PlayerAvatar_DoSecretBaseMatJump
@@ -3785,7 +3785,7 @@ _0805CF8A:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _0805CFC0 @ =gUnknown_2036E38
ldr r0, _0805CFC0 @ =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3800,7 +3800,7 @@ _0805CF8A:
_0805CFB4: .4byte gUnknown_835B8B0
_0805CFB8: .4byte gTasks
_0805CFBC: .4byte gUnknown_2037078
_0805CFC0: .4byte gUnknown_2036E38
_0805CFC0: .4byte gMapObjects
thumb_func_end sub_805CF78
thumb_func_start sub_805CFC4
@@ -4070,7 +4070,7 @@ taskFF_0805D1D4: @ 805D1D4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805D234 @ =gUnknown_2036E38
ldr r1, _0805D234 @ =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -4106,7 +4106,7 @@ _0805D228:
bx r0
.align 2, 0
_0805D230: .4byte gUnknown_2037078
_0805D234: .4byte gUnknown_2036E38
_0805D234: .4byte gMapObjects
_0805D238: .4byte gTasks
_0805D23C: .4byte sub_805D240
thumb_func_end taskFF_0805D1D4
@@ -4121,7 +4121,7 @@ sub_805D240: @ 805D240
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805D2B8 @ =gUnknown_2036E38
ldr r1, _0805D2B8 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -4164,7 +4164,7 @@ _0805D2AE:
bx r0
.align 2, 0
_0805D2B4: .4byte gUnknown_2037078
_0805D2B8: .4byte gUnknown_2036E38
_0805D2B8: .4byte gMapObjects
_0805D2BC: .4byte gSprites
thumb_func_end sub_805D240
@@ -4281,7 +4281,7 @@ fish1: @ 805D35C
ldrh r1, [r6]
adds r1, r0
strh r1, [r5, 0x22]
ldr r3, _0805D3EC @ =gUnknown_2036E38
ldr r3, _0805D3EC @ =gMapObjects
ldr r2, _0805D3F0 @ =gUnknown_2037078
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -4316,7 +4316,7 @@ fish1: @ 805D35C
.align 2, 0
_0805D3E4: .4byte gUnknown_835B90C
_0805D3E8: .4byte gUnknown_835B912
_0805D3EC: .4byte gUnknown_2036E38
_0805D3EC: .4byte gMapObjects
_0805D3F0: .4byte gUnknown_2037078
thumb_func_end fish1
@@ -4727,7 +4727,7 @@ _0805D6EA:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805D77C @ =gUnknown_2036E38
ldr r0, _0805D77C @ =gMapObjects
mov r8, r0
add r4, r8
ldrh r1, [r5, 0x24]
@@ -4777,7 +4777,7 @@ _0805D748:
.align 2, 0
_0805D774: .4byte gUnknown_2037078
_0805D778: .4byte gSprites
_0805D77C: .4byte gUnknown_2036E38
_0805D77C: .4byte gMapObjects
_0805D780:
movs r1, 0xA
ldrsh r0, [r5, r1]
@@ -4971,7 +4971,7 @@ sub_805D8D8: @ 805D8D8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805D97C @ =gUnknown_2036E38
ldr r0, _0805D97C @ =gMapObjects
mov r8, r0
add r4, r8
ldrh r1, [r6, 0x24]
@@ -5024,7 +5024,7 @@ _0805D968:
.align 2, 0
_0805D974: .4byte gUnknown_2037078
_0805D978: .4byte gSprites
_0805D97C: .4byte gUnknown_2036E38
_0805D97C: .4byte gMapObjects
thumb_func_end sub_805D8D8
thumb_func_start sub_805D980
@@ -5159,7 +5159,7 @@ _0805DA78:
ands r0, r1
cmp r0, 0
beq _0805DA9C
ldr r2, _0805DAAC @ =gUnknown_2036E38
ldr r2, _0805DAAC @ =gMapObjects
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5177,7 +5177,7 @@ _0805DA9C:
.align 2, 0
_0805DAA4: .4byte 0x0000fff8
_0805DAA8: .4byte gUnknown_2037078
_0805DAAC: .4byte gUnknown_2036E38
_0805DAAC: .4byte gMapObjects
thumb_func_end sub_805D9C4
thumb_func_start sub_805DAB0
@@ -5247,7 +5247,7 @@ sub_805DB04: @ 805DB04
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805DB4C @ =gUnknown_2036E38
ldr r1, _0805DB4C @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5271,7 +5271,7 @@ sub_805DB04: @ 805DB04
b _0805DBFA
.align 2, 0
_0805DB48: .4byte gUnknown_2037078
_0805DB4C: .4byte gUnknown_2036E38
_0805DB4C: .4byte gMapObjects
_0805DB50: .4byte gSprites
_0805DB54: .4byte gTasks+0x8
_0805DB58:
@@ -5406,7 +5406,7 @@ sub_805DC38: @ 805DC38
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805DC84 @ =gUnknown_2036E38
ldr r1, _0805DC84 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5431,7 +5431,7 @@ sub_805DC38: @ 805DC38
b _0805DDBA
.align 2, 0
_0805DC80: .4byte gUnknown_2037078
_0805DC84: .4byte gUnknown_2036E38
_0805DC84: .4byte gMapObjects
_0805DC88: .4byte gSprites
_0805DC8C: .4byte gTasks+0x8
_0805DC90:
asm/field_screen_effect.s
+2 -2
View File
@@ -942,7 +942,7 @@ _0807F542:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807F580 @ =gUnknown_2036E38
ldr r1, _0807F580 @ =gMapObjects
adds r0, r1
movs r1, 0x2
bl FieldObjectTurn
@@ -958,7 +958,7 @@ _0807F542:
.align 2, 0
_0807F578: .4byte gUnknown_841B5B6
_0807F57C: .4byte gUnknown_2037078
_0807F580: .4byte gUnknown_2036E38
_0807F580: .4byte gMapObjects
_0807F584: .4byte gTasks
_0807F588:
lsls r4, r6, 2
asm/field_specials.s
+4 -4
View File
@@ -604,7 +604,7 @@ SpawnScriptFieldObject: @ 80CAA34
bl SpawnSpecialFieldObjectParametrized
lsls r0, 24
lsrs r0, 24
ldr r2, _080CAA84 @ =gUnknown_2036E38
ldr r2, _080CAA84 @ =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -620,7 +620,7 @@ SpawnScriptFieldObject: @ 80CAA34
bx r0
.align 2, 0
_080CAA80: .4byte gSaveBlock1Ptr
_080CAA84: .4byte gUnknown_2036E38
_080CAA84: .4byte gMapObjects
thumb_func_end SpawnScriptFieldObject
thumb_func_start RemoveScriptFieldObject
@@ -3167,7 +3167,7 @@ sub_80CBE00: @ 80CBE00
_080CBE18: .4byte gUnknown_20370DA
_080CBE1C: .4byte gUnknown_3005074
_080CBE20:
ldr r2, _080CBE4C @ =gUnknown_2036E38
ldr r2, _080CBE4C @ =gMapObjects
ldrb r1, [r1]
lsls r0, r1, 3
adds r0, r1
@@ -3191,7 +3191,7 @@ _080CBE48:
pop {r1}
bx r1
.align 2, 0
_080CBE4C: .4byte gUnknown_2036E38
_080CBE4C: .4byte gMapObjects
thumb_func_end sub_80CBE00
thumb_func_start sub_80CBE50
asm/link_rfu_3.s
+4 -4
View File
@@ -11378,7 +11378,7 @@ sub_811B66C: @ 811B66C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0811B6C0 @ =gUnknown_2036E38
ldr r1, _0811B6C0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C
.align 2, 0
_0811B6B8: .4byte gUnknown_8457120
_0811B6BC: .4byte gSaveBlock1Ptr
_0811B6C0: .4byte gUnknown_2036E38
_0811B6C0: .4byte gMapObjects
_0811B6C4:
ldr r0, _0811B6DC @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
ldr r1, _0811B6E0 @ =0x00000183
@@ -11437,7 +11437,7 @@ sub_811B6E8: @ 811B6E8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0811B72C @ =gUnknown_2036E38
ldr r1, _0811B72C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8
.align 2, 0
_0811B724: .4byte gUnknown_8457120
_0811B728: .4byte gSaveBlock1Ptr
_0811B72C: .4byte gUnknown_2036E38
_0811B72C: .4byte gMapObjects
_0811B730:
bl ScriptContext2_IsEnabled
lsls r0, 24
asm/load_save.s
+4 -4
View File
@@ -345,7 +345,7 @@ save_serialize_npcs: @ 804C270
movs r5, 0xD4
lsls r5, 3
mov r8, r5
ldr r4, _0804C2B4 @ =gUnknown_2036E38
ldr r4, _0804C2B4 @ =gMapObjects
movs r3, 0
movs r2, 0xF
_0804C286:
@@ -372,7 +372,7 @@ _0804C286:
bx r0
.align 2, 0
_0804C2B0: .4byte gSaveBlock1Ptr
_0804C2B4: .4byte gUnknown_2036E38
_0804C2B4: .4byte gMapObjects
thumb_func_end save_serialize_npcs
thumb_func_start sub_804C2B8
@@ -385,7 +385,7 @@ sub_804C2B8: @ 804C2B8
movs r5, 0xD4
lsls r5, 3
mov r8, r5
ldr r4, _0804C2FC @ =gUnknown_2036E38
ldr r4, _0804C2FC @ =gMapObjects
movs r3, 0
movs r2, 0xF
_0804C2CE:
@@ -412,7 +412,7 @@ _0804C2CE:
bx r0
.align 2, 0
_0804C2F8: .4byte gSaveBlock1Ptr
_0804C2FC: .4byte gUnknown_2036E38
_0804C2FC: .4byte gMapObjects
thumb_func_end sub_804C2B8
thumb_func_start SaveSerializedGame
asm/map_obj_80688E4.s
+6 -6
View File
@@ -86,7 +86,7 @@ _0806896E:
player_bitmagic: @ 8068974
push {r4,r5,lr}
movs r4, 0
ldr r5, _080689A8 @ =gUnknown_2036E38
ldr r5, _080689A8 @ =gMapObjects
_0806897A:
lsls r0, r4, 3
adds r0, r4
@@ -112,7 +112,7 @@ _08068998:
pop {r0}
bx r0
.align 2, 0
_080689A8: .4byte gUnknown_2036E38
_080689A8: .4byte gMapObjects
_080689AC: .4byte gUnknown_2037078
thumb_func_end player_bitmagic
@@ -122,7 +122,7 @@ FreezeMapObjectsExceptOne: @ 80689B0
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r6, _080689EC @ =gUnknown_2036E38
ldr r6, _080689EC @ =gMapObjects
_080689BA:
cmp r4, r5
beq _080689DC
@@ -150,7 +150,7 @@ _080689DC:
pop {r0}
bx r0
.align 2, 0
_080689EC: .4byte gUnknown_2036E38
_080689EC: .4byte gMapObjects
_080689F0: .4byte gUnknown_2037078
thumb_func_end FreezeMapObjectsExceptOne
@@ -213,7 +213,7 @@ _08068A58: .4byte gSprites
UnfreezeMapObjects: @ 8068A5C
push {r4,r5,lr}
movs r4, 0
ldr r5, _08068A88 @ =gUnknown_2036E38
ldr r5, _08068A88 @ =gMapObjects
_08068A62:
lsls r0, r4, 3
adds r0, r4
@@ -235,7 +235,7 @@ _08068A78:
pop {r0}
bx r0
.align 2, 0
_08068A88: .4byte gUnknown_2036E38
_08068A88: .4byte gMapObjects
thumb_func_end UnfreezeMapObjects
thumb_func_start little_step
asm/map_obj_lock.s
+12 -12
View File
@@ -100,7 +100,7 @@ _080695F6:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0806961E
ldr r2, _08069640 @ =gUnknown_2036E38
ldr r2, _08069640 @ =gMapObjects
ldr r0, _08069644 @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -132,7 +132,7 @@ _08069634:
bx r0
.align 2, 0
_0806963C: .4byte gTasks
_08069640: .4byte gUnknown_2036E38
_08069640: .4byte gMapObjects
_08069644: .4byte gUnknown_3005074
thumb_func_end sub_80695CC
@@ -167,7 +167,7 @@ LockSelectedMapObject: @ 806966C
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r2, _080696B8 @ =gUnknown_2036E38
ldr r2, _080696B8 @ =gMapObjects
ldrb r1, [r4]
lsls r0, r1, 3
adds r0, r1
@@ -193,7 +193,7 @@ _080696AA:
.align 2, 0
_080696B0: .4byte gUnknown_3005074
_080696B4: .4byte sub_80695CC
_080696B8: .4byte gUnknown_2036E38
_080696B8: .4byte gMapObjects
_080696BC: .4byte gTasks
thumb_func_end LockSelectedMapObject
@@ -210,7 +210,7 @@ sub_80696C0: @ 80696C0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080696EC @ =gUnknown_2036E38
ldr r1, _080696EC @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80974D8
@@ -218,13 +218,13 @@ sub_80696C0: @ 80696C0
pop {r0}
bx r0
.align 2, 0
_080696EC: .4byte gUnknown_2036E38
_080696EC: .4byte gMapObjects
thumb_func_end sub_80696C0
thumb_func_start sub_80696F0
sub_80696F0: @ 80696F0
push {r4,lr}
ldr r4, _08069738 @ =gUnknown_2036E38
ldr r4, _08069738 @ =gMapObjects
ldr r0, _0806973C @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -256,7 +256,7 @@ _0806970E:
pop {r0}
bx r0
.align 2, 0
_08069738: .4byte gUnknown_2036E38
_08069738: .4byte gMapObjects
_0806973C: .4byte gUnknown_3005074
thumb_func_end sub_80696F0
@@ -268,7 +268,7 @@ sub_8069740: @ 8069740
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08069760 @ =gUnknown_2036E38
ldr r1, _08069760 @ =gMapObjects
adds r0, r1
ldr r1, _08069764 @ =gUnknown_20370D4
ldrb r1, [r1]
@@ -277,7 +277,7 @@ sub_8069740: @ 8069740
bx r0
.align 2, 0
_0806975C: .4byte gUnknown_3005074
_08069760: .4byte gUnknown_2036E38
_08069760: .4byte gMapObjects
_08069764: .4byte gUnknown_20370D4
thumb_func_end sub_8069740
@@ -289,14 +289,14 @@ sub_8069768: @ 8069768
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08069784 @ =gUnknown_2036E38
ldr r1, _08069784 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimActive
pop {r0}
bx r0
.align 2, 0
_08069780: .4byte gUnknown_3005074
_08069784: .4byte gUnknown_2036E38
_08069784: .4byte gMapObjects
thumb_func_end sub_8069768
.align 2, 0 @ Don't pad with nop.
asm/overworld.s
+28 -28
View File
@@ -4734,7 +4734,7 @@ sub_8057100: @ 8057100
thumb_func_start sub_8057114
sub_8057114: @ 8057114
push {lr}
ldr r2, _08057138 @ =gUnknown_2036E38
ldr r2, _08057138 @ =gMapObjects
ldr r3, _0805713C @ =gUnknown_2037078
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@@ -4750,7 +4750,7 @@ sub_8057114: @ 8057114
pop {r0}
bx r0
.align 2, 0
_08057138: .4byte gUnknown_2036E38
_08057138: .4byte gMapObjects
_0805713C: .4byte gUnknown_2037078
thumb_func_end sub_8057114
@@ -7200,7 +7200,7 @@ SpawnLinkPlayerMapObject: @ 805839C
lsls r5, r6, 3
adds r5, r6
lsls r5, 2
ldr r0, _08058444 @ =gUnknown_2036E38
ldr r0, _08058444 @ =gMapObjects
adds r5, r0
adds r0, r4, 0
bl ZeroLinkPlayerMapObject
@@ -7248,7 +7248,7 @@ SpawnLinkPlayerMapObject: @ 805839C
bx r0
.align 2, 0
_08058440: .4byte gUnknown_2031DEC
_08058444: .4byte gUnknown_2036E38
_08058444: .4byte gMapObjects
thumb_func_end SpawnLinkPlayerMapObject
thumb_func_start InitLinkPlayerMapObjectPos
@@ -7300,7 +7300,7 @@ sub_8058488: @ 8058488
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080584B4 @ =gUnknown_2036E38
ldr r0, _080584B4 @ =gMapObjects
adds r1, r0
strb r2, [r1, 0x19]
_080584AA:
@@ -7308,7 +7308,7 @@ _080584AA:
bx r0
.align 2, 0
_080584B0: .4byte gUnknown_2031DEC
_080584B4: .4byte gUnknown_2036E38
_080584B4: .4byte gMapObjects
thumb_func_end sub_8058488
thumb_func_start sub_80584B8
@@ -7322,7 +7322,7 @@ sub_80584B8: @ 80584B8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080584FC @ =gUnknown_2036E38
ldr r1, _080584FC @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
cmp r0, 0x40
@@ -7346,7 +7346,7 @@ _080584E4:
bx r0
.align 2, 0
_080584F8: .4byte gUnknown_2031DEC
_080584FC: .4byte gUnknown_2036E38
_080584FC: .4byte gMapObjects
_08058500: .4byte gSprites
thumb_func_end sub_80584B8
@@ -7360,13 +7360,13 @@ sub_8058504: @ 8058504
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08058520 @ =gUnknown_2036E38
ldr r1, _08058520 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x4]
bx lr
.align 2, 0
_0805851C: .4byte gUnknown_2031DEC
_08058520: .4byte gUnknown_2036E38
_08058520: .4byte gMapObjects
thumb_func_end sub_8058504
thumb_func_start sub_8058524
@@ -7379,7 +7379,7 @@ sub_8058524: @ 8058524
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
ldr r3, _08058548 @ =gUnknown_2036E38
ldr r3, _08058548 @ =gMapObjects
adds r0, r3
ldrh r3, [r0, 0x10]
strh r3, [r1]
@@ -7388,7 +7388,7 @@ sub_8058524: @ 8058524
bx lr
.align 2, 0
_08058544: .4byte gUnknown_2031DEC
_08058548: .4byte gUnknown_2036E38
_08058548: .4byte gMapObjects
thumb_func_end sub_8058524
thumb_func_start sub_805854C
@@ -7401,13 +7401,13 @@ sub_805854C: @ 805854C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08058568 @ =gUnknown_2036E38
ldr r1, _08058568 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x19]
bx lr
.align 2, 0
_08058564: .4byte gUnknown_2031DEC
_08058568: .4byte gUnknown_2036E38
_08058568: .4byte gMapObjects
thumb_func_end sub_805854C
thumb_func_start sub_805856C
@@ -7420,7 +7420,7 @@ sub_805856C: @ 805856C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805858C @ =gUnknown_2036E38
ldr r1, _0805858C @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0xB]
lsls r0, 28
@@ -7428,7 +7428,7 @@ sub_805856C: @ 805856C
bx lr
.align 2, 0
_08058588: .4byte gUnknown_2031DEC
_0805858C: .4byte gUnknown_2036E38
_0805858C: .4byte gMapObjects
thumb_func_end sub_805856C
thumb_func_start sub_8058590
@@ -7441,7 +7441,7 @@ sub_8058590: @ 8058590
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080585B4 @ =gUnknown_2036E38
ldr r1, _080585B4 @ =gMapObjects
adds r0, r1
adds r0, 0x21
movs r1, 0
@@ -7451,7 +7451,7 @@ sub_8058590: @ 8058590
bx lr
.align 2, 0
_080585B0: .4byte gUnknown_2031DEC
_080585B4: .4byte gUnknown_2036E38
_080585B4: .4byte gMapObjects
thumb_func_end sub_8058590
thumb_func_start GetLinkPlayerIdAt
@@ -7479,7 +7479,7 @@ _080585DA:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08058600 @ =gUnknown_2036E38
ldr r1, _08058600 @ =gMapObjects
adds r1, r0, r1
movs r6, 0x10
ldrsh r0, [r1, r6]
@@ -7493,7 +7493,7 @@ _080585DA:
b _08058610
.align 2, 0
_080585FC: .4byte gUnknown_2031DEC
_08058600: .4byte gUnknown_2036E38
_08058600: .4byte gMapObjects
_08058604:
adds r0, r2, 0x1
lsls r0, 24
@@ -7521,7 +7521,7 @@ sub_8058618: @ 8058618
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805864C @ =gUnknown_2036E38
ldr r1, _0805864C @ =gMapObjects
adds r6, r0, r1
ldrb r0, [r5]
cmp r0, 0
@@ -7535,7 +7535,7 @@ sub_8058618: @ 8058618
b _08058674
.align 2, 0
_08058648: .4byte gUnknown_2031DEC
_0805864C: .4byte gUnknown_2036E38
_0805864C: .4byte gMapObjects
_08058650:
ldr r4, _0805867C @ =gUnknown_826D374
ldr r1, _08058680 @ =gUnknown_826D33C
@@ -7780,7 +7780,7 @@ npc_080587EC: @ 80587EC
mov r12, r2
lsls r3, 16
movs r4, 0
ldr r0, _08058850 @ =gUnknown_2036E38
ldr r0, _08058850 @ =gMapObjects
mov r9, r0
lsrs r2, r3, 16
mov r10, r2
@@ -7820,7 +7820,7 @@ _0805884A:
movs r0, 0x1
b _0805886A
.align 2, 0
_08058850: .4byte gUnknown_2036E38
_08058850: .4byte gMapObjects
_08058854:
adds r0, r4, 0x1
lsls r0, 24
@@ -7857,7 +7857,7 @@ sub_8058878: @ 8058878
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080588B8 @ =gUnknown_2036E38
ldr r1, _080588B8 @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r2]
cmp r0, 0
@@ -7875,7 +7875,7 @@ sub_8058878: @ 8058878
b _080588C6
.align 2, 0
_080588B4: .4byte gUnknown_2031DEC
_080588B8: .4byte gUnknown_2036E38
_080588B8: .4byte gMapObjects
_080588BC:
ldrb r0, [r4]
lsls r0, 30
@@ -7931,7 +7931,7 @@ SpriteCB_LinkPlayer: @ 805890C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08058974 @ =gUnknown_2036E38
ldr r1, _08058974 @ =gMapObjects
adds r6, r0, r1
ldrh r0, [r6, 0xC]
strh r0, [r5, 0x20]
@@ -7967,7 +7967,7 @@ SpriteCB_LinkPlayer: @ 805890C
b _0805898A
.align 2, 0
_08058970: .4byte gUnknown_2031DEC
_08058974: .4byte gUnknown_2036E38
_08058974: .4byte gMapObjects
_08058978:
ldrb r0, [r6, 0x19]
bl get_go_image_anim_num
asm/quest_log.s
-66
View File
@@ -5,72 +5,6 @@
.text
thumb_func_start sub_811246C
sub_811246C: @ 811246C
push {r4-r6,lr}
adds r6, r0, 0
movs r0, 0x2E
ldrsh r1, [r6, r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _081124B0 @ =gUnknown_2036E38
adds r4, r0, r1
ldrb r0, [r4, 0x8]
cmp r0, 0xFF
bne _081124B8
ldr r5, _081124B4 @ =gUnknown_203AF9A
ldrb r0, [r5]
cmp r0, 0xFF
beq _08112498
adds r1, r0, 0
adds r0, r4, 0
bl sub_8063CA4
movs r0, 0xFF
strb r0, [r5]
_08112498:
ldrb r0, [r5, 0x1]
cmp r0, 0xFF
beq _081124A6
bl sub_8150454
movs r0, 0xFF
strb r0, [r5, 0x1]
_081124A6:
adds r0, r4, 0
adds r1, r6, 0
bl sub_8063E28
b _081124E0
.align 2, 0
_081124B0: .4byte gUnknown_2036E38
_081124B4: .4byte gUnknown_203AF9A
_081124B8:
ldr r5, _081124E8 @ =gUnknown_203AF9A
ldrb r0, [r4, 0x8]
lsls r0, 1
adds r1, r0, r5
ldrb r0, [r1]
cmp r0, 0xFF
beq _081124D8
adds r1, r0, 0
adds r0, r4, 0
bl sub_8063CA4
ldrb r0, [r4, 0x8]
lsls r0, 1
adds r0, r5
movs r1, 0xFF
strb r1, [r0]
_081124D8:
adds r0, r4, 0
adds r1, r6, 0
bl sub_8063E28
_081124E0:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_081124E8: .4byte gUnknown_203AF9A
thumb_func_end sub_811246C
thumb_func_start sub_81124EC
sub_81124EC: @ 81124EC
push {r4-r7,lr}
asm/quest_log_8150454.s
+10 -10
View File
@@ -64,7 +64,7 @@ sub_81504A8: @ 81504A8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _081504E4 @ =gUnknown_2036E38
ldr r0, _081504E4 @ =gMapObjects
adds r4, r0
movs r0, 0
bl sub_805C808
@@ -84,7 +84,7 @@ sub_81504A8: @ 81504A8
bx r0
.align 2, 0
_081504E0: .4byte gUnknown_2037078
_081504E4: .4byte gUnknown_2036E38
_081504E4: .4byte gMapObjects
thumb_func_end sub_81504A8
thumb_func_start sub_81504E8
@@ -95,7 +95,7 @@ sub_81504E8: @ 81504E8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0815052C @ =gUnknown_2036E38
ldr r0, _0815052C @ =gMapObjects
adds r4, r0
movs r0, 0x1
bl sub_805C808
@@ -118,7 +118,7 @@ sub_81504E8: @ 81504E8
bx r0
.align 2, 0
_08150528: .4byte gUnknown_2037078
_0815052C: .4byte gUnknown_2036E38
_0815052C: .4byte gMapObjects
thumb_func_end sub_81504E8
thumb_func_start sub_8150530
@@ -129,7 +129,7 @@ sub_8150530: @ 8150530
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150580 @ =gUnknown_2036E38
ldr r1, _08150580 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -162,7 +162,7 @@ _08150558:
b _081505BC
.align 2, 0
_0815057C: .4byte gUnknown_2037078
_08150580: .4byte gUnknown_2036E38
_08150580: .4byte gMapObjects
_08150584: .4byte gSprites
_08150588: .4byte gUnknown_3005E88
_0815058C: .4byte sub_81505C4
@@ -205,7 +205,7 @@ sub_81505C4: @ 81505C4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150610 @ =gUnknown_2036E38
ldr r1, _08150610 @ =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
@@ -230,7 +230,7 @@ sub_81505C4: @ 81505C4
b _081506FC
.align 2, 0
_0815060C: .4byte gUnknown_2037078
_08150610: .4byte gUnknown_2036E38
_08150610: .4byte gMapObjects
_08150614: .4byte gSprites
_08150618: .4byte gTasks
_0815061C:
@@ -353,7 +353,7 @@ sub_8150708: @ 8150708
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150774 @ =gUnknown_2036E38
ldr r1, _08150774 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r5]
movs r0, 0x8
@@ -395,7 +395,7 @@ _08150768:
bx r0
.align 2, 0
_08150770: .4byte gUnknown_2037078
_08150774: .4byte gUnknown_2036E38
_08150774: .4byte gMapObjects
_08150778: .4byte gUnknown_20386E0
thumb_func_end sub_8150708
asm/rom6.s
+8 -8
View File
@@ -23,7 +23,7 @@ npc_before_player_of_type: @ 80C97A8
bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r0, 24
ldr r2, _080C97EC @ =gUnknown_2036E38
ldr r2, _080C97EC @ =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -38,7 +38,7 @@ npc_before_player_of_type: @ 80C97A8
b _080C97F6
.align 2, 0
_080C97E8: .4byte gUnknown_2039A04
_080C97EC: .4byte gUnknown_2036E38
_080C97EC: .4byte gMapObjects
_080C97F0: .4byte gUnknown_20370D2
_080C97F4:
movs r0, 0
@@ -80,7 +80,7 @@ task08_080C9820: @ 80C9820
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080C9878 @ =gUnknown_2036E38
ldr r1, _080C9878 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -108,7 +108,7 @@ _080C9856:
b _080C98A0
.align 2, 0
_080C9874: .4byte gUnknown_2037078
_080C9878: .4byte gUnknown_2036E38
_080C9878: .4byte gMapObjects
_080C987C: .4byte gMapHeader
_080C9880: .4byte gTasks
_080C9884: .4byte sub_80C98FC
@@ -144,7 +144,7 @@ sub_80C98B0: @ 80C98B0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080C98F0 @ =gUnknown_2036E38
ldr r1, _080C98F0 @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -166,7 +166,7 @@ _080C98E4:
bx r0
.align 2, 0
_080C98EC: .4byte gUnknown_2037078
_080C98F0: .4byte gUnknown_2036E38
_080C98F0: .4byte gMapObjects
_080C98F4: .4byte gTasks
_080C98F8: .4byte sub_80C98FC
thumb_func_end sub_80C98B0
@@ -212,7 +212,7 @@ _080C993C:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080C9990 @ =gUnknown_2036E38
ldr r0, _080C9990 @ =gMapObjects
adds r4, r0
bl GetPlayerAvatarGraphicsIdByCurrentState
adds r1, r0, 0
@@ -244,7 +244,7 @@ _080C9980:
.align 2, 0
_080C9988: .4byte gUnknown_20386E0
_080C998C: .4byte gUnknown_2037078
_080C9990: .4byte gUnknown_2036E38
_080C9990: .4byte gMapObjects
_080C9994: .4byte gSprites
_080C9998: .4byte gTasks
_080C999C: .4byte sub_80C99A0
asm/scrcmd.s
+8 -8
View File
@@ -3065,7 +3065,7 @@ ScrCmd_resetobjectpriority: @ 806B58C
thumb_func_start ScrCmd_faceplayer
ScrCmd_faceplayer: @ 806B5BC
push {r4,lr}
ldr r2, _0806B5EC @ =gUnknown_2036E38
ldr r2, _0806B5EC @ =gMapObjects
ldr r0, _0806B5F0 @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3088,7 +3088,7 @@ _0806B5E4:
pop {r1}
bx r1
.align 2, 0
_0806B5EC: .4byte gUnknown_2036E38
_0806B5EC: .4byte gMapObjects
_0806B5F0: .4byte gUnknown_3005074
thumb_func_end ScrCmd_faceplayer
@@ -3245,7 +3245,7 @@ ScrCmd_lock: @ 806B704
movs r0, 0
b _0806B752
_0806B714:
ldr r2, _0806B738 @ =gUnknown_2036E38
ldr r2, _0806B738 @ =gMapObjects
ldr r0, _0806B73C @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3262,7 +3262,7 @@ _0806B714:
bl SetupNativeScript
b _0806B750
.align 2, 0
_0806B738: .4byte gUnknown_2036E38
_0806B738: .4byte gMapObjects
_0806B73C: .4byte gUnknown_3005074
_0806B740: .4byte sub_8069648
_0806B744:
@@ -3294,7 +3294,7 @@ ScrCmd_releaseall: @ 806B75C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0806B790 @ =gUnknown_2036E38
ldr r1, _0806B790 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80974D8
@@ -3303,14 +3303,14 @@ ScrCmd_releaseall: @ 806B75C
pop {r1}
bx r1
.align 2, 0
_0806B790: .4byte gUnknown_2036E38
_0806B790: .4byte gMapObjects
thumb_func_end ScrCmd_releaseall
thumb_func_start ScrCmd_release
ScrCmd_release: @ 806B794
push {r4,lr}
bl HideFieldMessageBox
ldr r4, _0806B7E4 @ =gUnknown_2036E38
ldr r4, _0806B7E4 @ =gMapObjects
ldr r0, _0806B7E8 @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3343,7 +3343,7 @@ _0806B7B6:
pop {r1}
bx r1
.align 2, 0
_0806B7E4: .4byte gUnknown_2036E38
_0806B7E4: .4byte gMapObjects
_0806B7E8: .4byte gUnknown_3005074
thumb_func_end ScrCmd_release
asm/script_movement.s
+4 -4
View File
@@ -480,7 +480,7 @@ _0809777C:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080977A8 @ =gUnknown_2036E38
ldr r1, _080977A8 @ =gMapObjects
adds r0, r1
bl npc_sync_anim_pause_bits
_08097792:
@@ -495,7 +495,7 @@ _08097792:
bx r0
.align 2, 0
_080977A4: .4byte gTasks+0x8
_080977A8: .4byte gUnknown_2036E38
_080977A8: .4byte gMapObjects
thumb_func_end UnfreezeObjects
thumb_func_start Task_80A244C
@@ -557,7 +557,7 @@ sub_80977F0: @ 80977F0
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
ldr r1, _08097850 @ =gUnknown_2036E38
ldr r1, _08097850 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimActive
@@ -580,7 +580,7 @@ _08097838:
bl FreezeMapObject
b _0809786A
.align 2, 0
_08097850: .4byte gUnknown_2036E38
_08097850: .4byte gMapObjects
_08097854:
adds r0, r4, 0
bl sub_8063CA4
asm/shop.s
+4 -4
View File
@@ -1889,7 +1889,7 @@ _0809B976:
ldr r1, _0809B9EC @ =gUnknown_20398B8
adds r0, r2, r1
strh r5, [r0]
ldr r1, _0809B9F0 @ =gUnknown_2036E38
ldr r1, _0809B9F0 @ =gMapObjects
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
@@ -1910,7 +1910,7 @@ _0809B9E0: .4byte gUnknown_20398BA
_0809B9E4: .4byte 0x0000fffd
_0809B9E8: .4byte 0x0000fffe
_0809B9EC: .4byte gUnknown_20398B8
_0809B9F0: .4byte gUnknown_2036E38
_0809B9F0: .4byte gMapObjects
_0809B9F4:
cmp r0, 0x3
beq _0809BA06
@@ -1968,7 +1968,7 @@ sub_809BA40: @ 809BA40
sub sp, 0x4
movs r6, 0
ldr r7, _0809BAE8 @ =gUnknown_20398B4
ldr r0, _0809BAEC @ =gUnknown_2036E38
ldr r0, _0809BAEC @ =gMapObjects
mov r8, r0
adds r1, r7, 0x6
mov r9, r1
@@ -2045,7 +2045,7 @@ _0809BACE:
bx r0
.align 2, 0
_0809BAE8: .4byte gUnknown_20398B4
_0809BAEC: .4byte gUnknown_2036E38
_0809BAEC: .4byte gMapObjects
_0809BAF0: .4byte 0xfff80000
_0809BAF4: .4byte SpriteCallbackDummy
_0809BAF8: .4byte gSprites
asm/ss_anne.s
+8 -8
View File
@@ -100,7 +100,7 @@ _0815D3D6:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0815D42C @ =gUnknown_2036E38
ldr r1, _0815D42C @ =gMapObjects
adds r0, r1
ldr r2, _0815D430 @ =gSprites
ldrb r1, [r0, 0x4]
@@ -128,7 +128,7 @@ _0815D3D6:
.align 2, 0
_0815D424: .4byte gTasks+0x8
_0815D428: .4byte gSaveBlock1Ptr
_0815D42C: .4byte gUnknown_2036E38
_0815D42C: .4byte gMapObjects
_0815D430: .4byte gSprites
_0815D434: .4byte sub_815D454
_0815D438:
@@ -197,7 +197,7 @@ sub_815D498: @ 815D498
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0815D50C @ =gUnknown_2036E38
ldr r1, _0815D50C @ =gMapObjects
adds r0, r1
ldr r4, _0815D510 @ =gSprites
ldrb r1, [r0, 0x4]
@@ -238,7 +238,7 @@ sub_815D498: @ 815D498
bx r0
.align 2, 0
_0815D508: .4byte gSaveBlock1Ptr
_0815D50C: .4byte gUnknown_2036E38
_0815D50C: .4byte gMapObjects
_0815D510: .4byte gSprites
_0815D514: .4byte gUnknown_8479C88
thumb_func_end sub_815D498
@@ -260,7 +260,7 @@ sub_815D518: @ 815D518
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0815D59C @ =gUnknown_2036E38
ldr r1, _0815D59C @ =gMapObjects
adds r0, r1
ldr r2, _0815D5A0 @ =gSprites
ldrb r1, [r0, 0x4]
@@ -308,7 +308,7 @@ _0815D58E:
bx r0
.align 2, 0
_0815D598: .4byte gSaveBlock1Ptr
_0815D59C: .4byte gUnknown_2036E38
_0815D59C: .4byte gMapObjects
_0815D5A0: .4byte gSprites
thumb_func_end sub_815D518
@@ -328,7 +328,7 @@ sub_815D5A4: @ 815D5A4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0815D618 @ =gUnknown_2036E38
ldr r1, _0815D618 @ =gMapObjects
adds r0, r1
ldr r4, _0815D61C @ =gSprites
ldrb r0, [r0, 0x4]
@@ -371,7 +371,7 @@ _0815D60C:
bx r0
.align 2, 0
_0815D614: .4byte gSaveBlock1Ptr
_0815D618: .4byte gUnknown_2036E38
_0815D618: .4byte gMapObjects
_0815D61C: .4byte gSprites
_0815D620: .4byte gUnknown_8479CC0
thumb_func_end sub_815D5A4
asm/trainer_see.s
+19 -19
View File
@@ -19,7 +19,7 @@ _08081B40:
b _08081B7A
_08081B44:
movs r4, 0
ldr r5, _08081B80 @ =gUnknown_2036E38
ldr r5, _08081B80 @ =gMapObjects
_08081B48:
lsls r0, r4, 3
adds r0, r4
@@ -53,7 +53,7 @@ _08081B7A:
pop {r1}
bx r1
.align 2, 0
_08081B80: .4byte gUnknown_2036E38
_08081B80: .4byte gMapObjects
thumb_func_end sub_8081B30
thumb_func_start sub_8081B84
@@ -70,7 +70,7 @@ sub_8081B84: @ 8081B84
lsls r4, r5, 3
adds r0, r4, r5
lsls r0, 2
ldr r1, _08081BE0 @ =gUnknown_2036E38
ldr r1, _08081BE0 @ =gMapObjects
adds r0, r1
bl sub_8081BEC
lsls r0, 24
@@ -90,7 +90,7 @@ _08081BC0:
bl TrainerWantsBattle
adds r0, r4, r5
lsls r0, 2
ldr r1, _08081BE0 @ =gUnknown_2036E38
ldr r1, _08081BE0 @ =gMapObjects
adds r0, r1
subs r1, r7, 0x1
lsls r1, 24
@@ -99,7 +99,7 @@ _08081BC0:
movs r0, 0x1
b _08081BE6
.align 2, 0
_08081BE0: .4byte gUnknown_2036E38
_08081BE0: .4byte gMapObjects
_08081BE4:
movs r0, 0
_08081BE6:
@@ -740,7 +740,7 @@ _0808204A:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080820B8 @ =gUnknown_2036E38
ldr r1, _080820B8 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -764,7 +764,7 @@ _080820AC:
bx r1
.align 2, 0
_080820B4: .4byte gUnknown_2037078
_080820B8: .4byte gUnknown_2036E38
_080820B8: .4byte gMapObjects
thumb_func_end sub_808202C
thumb_func_start sub_80820BC
@@ -777,7 +777,7 @@ sub_80820BC: @ 80820BC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080820FC @ =gUnknown_2036E38
ldr r1, _080820FC @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -799,7 +799,7 @@ _080820EE:
bx r1
.align 2, 0
_080820F8: .4byte gUnknown_2037078
_080820FC: .4byte gUnknown_2036E38
_080820FC: .4byte gMapObjects
thumb_func_end sub_80820BC
thumb_func_start sub_8082100
@@ -1025,7 +1025,7 @@ sub_808226C: @ 808226C
movs r1, 0x7
movs r2, 0x7F
bl SpawnSpecialFieldObjectParametrized
ldr r2, _080822C8 @ =gUnknown_2036E38
ldr r2, _080822C8 @ =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -1046,7 +1046,7 @@ sub_808226C: @ 808226C
bx r1
.align 2, 0
_080822C4: .4byte gSaveBlock1Ptr
_080822C8: .4byte gUnknown_2036E38
_080822C8: .4byte gMapObjects
thumb_func_end sub_808226C
thumb_func_start sub_80822CC
@@ -1067,7 +1067,7 @@ sub_80822CC: @ 80822CC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, _0808234C @ =gUnknown_2036E38
ldr r4, _0808234C @ =gMapObjects
adds r0, r4
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
@@ -1096,7 +1096,7 @@ _08082312:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0808234C @ =gUnknown_2036E38
ldr r0, _0808234C @ =gMapObjects
adds r4, r0
movs r0, 0x2
bl sub_8063FB0
@@ -1111,7 +1111,7 @@ _08082312:
b _0808236E
.align 2, 0
_08082348: .4byte gSaveBlock1Ptr
_0808234C: .4byte gUnknown_2036E38
_0808234C: .4byte gMapObjects
_08082350:
ldr r1, _08082378 @ =gUnknown_20386E0
adds r2, r1, 0x4
@@ -1158,7 +1158,7 @@ sub_808237C: @ 808237C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, _08082408 @ =gUnknown_2036E38
ldr r4, _08082408 @ =gMapObjects
adds r0, r4
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
@@ -1187,7 +1187,7 @@ _080823CC:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08082408 @ =gUnknown_2036E38
ldr r0, _08082408 @ =gMapObjects
adds r4, r0
movs r0, 0x1
bl sub_8063FB0
@@ -1202,7 +1202,7 @@ _080823CC:
b _0808242E
.align 2, 0
_08082404: .4byte gSaveBlock1Ptr
_08082408: .4byte gUnknown_2036E38
_08082408: .4byte gMapObjects
_0808240C:
bl GetPlayerAvatarObjectId
lsls r0, 24
@@ -1579,7 +1579,7 @@ _080826DA:
bl FieldEffectStop
b _08082736
_080826E8:
ldr r2, _0808272C @ =gUnknown_2036E38
ldr r2, _0808272C @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1614,7 +1614,7 @@ _080826E8:
strh r0, [r4, 0x34]
b _08082736
.align 2, 0
_0808272C: .4byte gUnknown_2036E38
_0808272C: .4byte gMapObjects
_08082730: .4byte gSprites
_08082734:
strh r2, [r4, 0x34]
asm/unk_810C3A4.s
+6 -6
View File
@@ -44,7 +44,7 @@ _0810C3E2:
cmp r0, 0
bne _0810C41C
movs r4, 0
ldr r7, _0810C440 @ =gUnknown_2036E38
ldr r7, _0810C440 @ =gMapObjects
_0810C3EE:
adds r0, r4, 0
bl sub_810CF04
@@ -85,7 +85,7 @@ _0810C436:
bx r0
.align 2, 0
_0810C43C: .4byte gTasks
_0810C440: .4byte gUnknown_2036E38
_0810C440: .4byte gMapObjects
thumb_func_end sub_810C3B8
thumb_func_start sub_810C444
@@ -140,7 +140,7 @@ _0810C47A:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r2, _0810C4E8 @ =gUnknown_2036E38
ldr r2, _0810C4E8 @ =gMapObjects
adds r4, r1, r2
bl sub_810CF04
lsls r0, 24
@@ -171,7 +171,7 @@ _0810C4D2:
.align 2, 0
_0810C4E0: .4byte gSaveBlock1Ptr
_0810C4E4: .4byte gMapHeader
_0810C4E8: .4byte gUnknown_2036E38
_0810C4E8: .4byte gMapObjects
thumb_func_end sub_810C444
thumb_func_start sub_810C4EC
@@ -269,7 +269,7 @@ _0810C59A:
lsls r0, r5, 3
adds r0, r5
lsls r0, 2
ldr r1, _0810C5FC @ =gUnknown_2036E38
ldr r1, _0810C5FC @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r4, 0x6]
subs r0, 0x4D
@@ -314,7 +314,7 @@ _0810C5EA:
pop {r0}
bx r0
.align 2, 0
_0810C5FC: .4byte gUnknown_2036E38
_0810C5FC: .4byte gMapObjects
_0810C600: .4byte gSprites
thumb_func_end sub_810C594
asm/unk_8159F40.s
+10 -10
View File
@@ -127,7 +127,7 @@ sub_815A008: @ 815A008
movs r1, 0x7F
mov r9, r1
_0815A02E:
ldr r2, _0815A1F4 @ =gUnknown_2036E38
ldr r2, _0815A1F4 @ =gMapObjects
adds r3, r7, r2
ldrb r0, [r3]
lsls r0, 31
@@ -355,7 +355,7 @@ _0815A1E4:
pop {r0}
bx r0
.align 2, 0
_0815A1F4: .4byte gUnknown_2036E38
_0815A1F4: .4byte gMapObjects
thumb_func_end sub_815A008
thumb_func_start sub_815A1F8
@@ -372,7 +372,7 @@ sub_815A1F8: @ 815A1F8
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r4, _0815A480 @ =gUnknown_2036E38
ldr r4, _0815A480 @ =gMapObjects
ldr r2, _0815A484 @ =0x01000120
mov r0, sp
adds r1, r4, 0
@@ -386,7 +386,7 @@ _0815A224:
lsls r7, r2, 3
adds r5, r7, r2
lsls r5, 2
ldr r0, _0815A480 @ =gUnknown_2036E38
ldr r0, _0815A480 @ =gMapObjects
adds r5, r0
lsls r6, r2, 2
add r6, r12
@@ -663,7 +663,7 @@ _0815A444:
mov r0, r8
add r0, r12
lsls r0, 2
ldr r1, _0815A480 @ =gUnknown_2036E38
ldr r1, _0815A480 @ =gMapObjects
adds r6, r0, r1
movs r2, 0x10
ldrsh r0, [r6, r2]
@@ -684,7 +684,7 @@ _0815A444:
ldrh r0, [r6, 0x12]
b _0815A506
.align 2, 0
_0815A480: .4byte gUnknown_2036E38
_0815A480: .4byte gMapObjects
_0815A484: .4byte 0x01000120
_0815A488:
ldrb r4, [r6, 0x1F]
@@ -758,7 +758,7 @@ _0815A508:
bhi _0815A512
b _0815A224
_0815A512:
ldr r0, _0815A538 @ =gUnknown_2036E38
ldr r0, _0815A538 @ =gMapObjects
ldr r1, _0815A53C @ =gSaveBlock1Ptr
ldr r1, [r1]
movs r2, 0xD4
@@ -776,7 +776,7 @@ _0815A512:
pop {r0}
bx r0
.align 2, 0
_0815A538: .4byte gUnknown_2036E38
_0815A538: .4byte gMapObjects
_0815A53C: .4byte gSaveBlock1Ptr
thumb_func_end sub_815A1F8
@@ -815,7 +815,7 @@ sub_815A540: @ 815A540
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0815A5B4 @ =gUnknown_2036E38
ldr r0, _0815A5B4 @ =gMapObjects
adds r4, r0
movs r0, 0x1
bl SetPlayerAvatarTransitionFlags
@@ -834,7 +834,7 @@ _0815A5A4:
.align 2, 0
_0815A5AC: .4byte gUnknown_203ADFA
_0815A5B0: .4byte gUnknown_2037078
_0815A5B4: .4byte gUnknown_2036E38
_0815A5B4: .4byte gMapObjects
_0815A5B8: .4byte gSprites
thumb_func_end sub_815A540
asm/vs_seeker.s
+12 -12
View File
@@ -224,7 +224,7 @@ sub_810C808: @ 810C808
bge _0810C8BC
ldr r7, _0810C8E4 @ =gUnknown_203ADB8
mov r6, sp
ldr r0, _0810C8E8 @ =gUnknown_2036E38
ldr r0, _0810C8E8 @ =gMapObjects
mov r10, r0
adds r5, r2, 0
_0810C83C:
@@ -312,7 +312,7 @@ _0810C8BC:
_0810C8DC: .4byte gSaveBlock1Ptr
_0810C8E0: .4byte gMapHeader
_0810C8E4: .4byte gUnknown_203ADB8
_0810C8E8: .4byte gUnknown_2036E38
_0810C8E8: .4byte gMapObjects
thumb_func_end sub_810C808
thumb_func_start sub_810C8EC
@@ -544,7 +544,7 @@ _0810CAA0:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0810CB5C @ =gUnknown_2036E38
ldr r1, _0810CB5C @ =gMapObjects
adds r0, r1
bl npc_coords_shift_still
ldr r0, [r6]
@@ -618,7 +618,7 @@ _0810CB2C:
.align 2, 0
_0810CB54: .4byte gSaveBlock1Ptr
_0810CB58: .4byte 0x0000063a
_0810CB5C: .4byte gUnknown_2036E38
_0810CB5C: .4byte gMapObjects
_0810CB60: .4byte gUnknown_8453F64
_0810CB64: .4byte 0x00000431
_0810CB68: .4byte gUnknown_203ADB8
@@ -706,7 +706,7 @@ _0810CBDE:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0810CC64 @ =gUnknown_2036E38
ldr r1, _0810CC64 @ =gMapObjects
adds r4, r0, r1
adds r0, r6, 0
bl sub_810CF54
@@ -743,7 +743,7 @@ _0810CC54: .4byte gSaveBlock1Ptr
_0810CC58: .4byte gUnknown_845318C
_0810CC5C: .4byte gTrainerBattleOpponent_A
_0810CC60: .4byte gMapHeader
_0810CC64: .4byte gUnknown_2036E38
_0810CC64: .4byte gMapObjects
_0810CC68: .4byte gUnknown_8453F67
_0810CC6C: .4byte 0x0000063a
_0810CC70: .4byte gUnknown_3005074
@@ -1123,7 +1123,7 @@ sub_810CF04: @ 810CF04
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
ldr r1, _0810CF40 @ =gUnknown_2036E38
ldr r1, _0810CF40 @ =gMapObjects
adds r1, r0, r1
ldrb r0, [r1]
lsls r0, 31
@@ -1148,7 +1148,7 @@ sub_810CF04: @ 810CF04
movs r0, 0x1
b _0810CF4E
.align 2, 0
_0810CF40: .4byte gUnknown_2036E38
_0810CF40: .4byte gMapObjects
_0810CF44: .4byte gMapHeader
_0810CF48: .4byte gSprites
_0810CF4C:
@@ -1550,7 +1550,7 @@ sub_810D24C: @ 810D24C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0810D278 @ =gUnknown_2036E38
ldr r1, _0810D278 @ =gMapObjects
adds r0, r1
bl npc_sync_anim_pause_bits
ldrb r0, [r4, 0x6]
@@ -1564,7 +1564,7 @@ sub_810D24C: @ 810D24C
pop {r0}
bx r0
.align 2, 0
_0810D278: .4byte gUnknown_2036E38
_0810D278: .4byte gMapObjects
_0810D27C: .4byte gSaveBlock1Ptr
thumb_func_end sub_810D24C
@@ -1691,7 +1691,7 @@ _0810D340:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r2, _0810D3E4 @ =gUnknown_2036E38
ldr r2, _0810D3E4 @ =gMapObjects
adds r4, r1, r2
bl sub_810CF04
lsls r0, 24
@@ -1758,7 +1758,7 @@ _0810D3CC:
pop {r0}
bx r0
.align 2, 0
_0810D3E4: .4byte gUnknown_2036E38
_0810D3E4: .4byte gMapObjects
_0810D3E8: .4byte gUnknown_845318C
_0810D3EC: .4byte gSaveBlock1Ptr
_0810D3F0: .4byte 0x0000063a
include/field_map_obj.h
+2
View File
@@ -76,6 +76,8 @@ void MoveCoords(u8, s16 *, s16 *);
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
void sub_8063E28(struct MapObject *, struct Sprite *);
void sub_8063CA4(struct MapObject *, u8);
// Exported data declarations
include/quest_log_8150454.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_QUEST_LOG_8150454_H
#define GUARD_QUEST_LOG_8150454_H
void sub_8150454(void);
#endif //GUARD_QUEST_LOG_8150454_H
src/quest_log.c
+31
View File
@@ -14,6 +14,7 @@
#include "overworld.h"
#include "field_fadetransition.h"
#include "field_weather.h"
#include "field_map_obj.h"
#include "map_obj_80688E4.h"
#include "map_obj_lock.h"
#include "field_player_avatar.h"
@@ -25,6 +26,7 @@
#include "unk_8159F40.h"
#include "pokemon_storage_system.h"
#include "save.h"
#include "quest_log_8150454.h"
#include "quest_log.h"
u8 gUnknown_3005E88;
@@ -58,6 +60,7 @@ EWRAM_DATA u16 *gUnknown_203AE90 = NULL;
EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0};
EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0};
EWRAM_DATA u16 gUnknown_203AF98 = 0;
EWRAM_DATA u8 gUnknown_203AF9A[128];
EWRAM_DATA u16 gUnknown_203B044[2] = {0};
@@ -1414,3 +1417,31 @@ void sub_8112450(void)
sub_81123BC();
}
}
void sub_811246C(struct Sprite *sprite)
{
struct MapObject *mapObject = &gMapObjects[sprite->data[0]];
if (mapObject->localId == 0xFF)
{
if (gUnknown_203AF9A[0] != 0xFF)
{
sub_8063CA4(mapObject, gUnknown_203AF9A[0]);
gUnknown_203AF9A[0] = 0xFF;
}
if (gUnknown_203AF9A[1] != 0xFF)
{
sub_8150454();
gUnknown_203AF9A[1] = 0xFF;
}
sub_8063E28(mapObject, sprite);
}
else
{
if (gUnknown_203AF9A[2 * mapObject->localId] != 0xFF)
{
sub_8063CA4(mapObject, gUnknown_203AF9A[2 * mapObject->localId]);
gUnknown_203AF9A[2 * mapObject->localId] = 0xFF;
}
sub_8063E28(mapObject, sprite);
}
}
sym_ewram.txt
+1 -1
View File
@@ -629,7 +629,7 @@ gUnknown_2036E30: @ 2036E30
gUnknown_2036E34: @ 2036E34
.space 0x4
gUnknown_2036E38: @ 2036E38
gMapObjects: @ 2036E38
.space 0x240
gUnknown_2037078: @ 2037078