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/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