mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-13 15:13:42 +01:00
clean a bit more ewram.txt
This commit is contained in:
parent
cdd36116f2
commit
d41cc4c8d0
@ -3635,7 +3635,7 @@ sub_8041A6C: @ 8041A6C
|
|||||||
sub sp, 0x10
|
sub sp, 0x10
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
mov r9, r0
|
mov r9, r0
|
||||||
ldr r1, =gUnknown_02024478
|
ldr r1, =gBattleScripting + 4
|
||||||
mov r10, r1
|
mov r10, r1
|
||||||
ldr r2, =gBattleStruct
|
ldr r2, =gBattleStruct
|
||||||
mov r8, r2
|
mov r8, r2
|
||||||
|
@ -2132,7 +2132,7 @@ _080B1800:
|
|||||||
bne _080B1864
|
bne _080B1864
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
bl sub_816306C
|
bl sub_816306C
|
||||||
ldr r4, =gUnknown_020247A8
|
ldr r4, =gEnemyParty + 100
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
bl ZeroMonData
|
bl ZeroMonData
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
@ -2151,7 +2151,7 @@ _080B1800:
|
|||||||
_080B1864:
|
_080B1864:
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
bl sub_8163048
|
bl sub_8163048
|
||||||
ldr r4, =gUnknown_020247A8
|
ldr r4, =gEnemyParty + 100
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
bl ZeroMonData
|
bl ZeroMonData
|
||||||
adds r4, 0x64
|
adds r4, 0x64
|
||||||
|
@ -751,7 +751,7 @@ _080B2994:
|
|||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
movs r6, 0x64
|
movs r6, 0x64
|
||||||
muls r0, r6
|
muls r0, r6
|
||||||
ldr r5, =gUnknown_02024488
|
ldr r5, =gBattleScripting + 0x14
|
||||||
adds r0, r5
|
adds r0, r5
|
||||||
movs r1, 0xB
|
movs r1, 0xB
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
@ -841,7 +841,7 @@ _080B2A6C:
|
|||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
movs r6, 0x64
|
movs r6, 0x64
|
||||||
muls r0, r6
|
muls r0, r6
|
||||||
ldr r5, =gUnknown_02024488
|
ldr r5, =gBattleScripting + 0x14
|
||||||
adds r0, r5
|
adds r0, r5
|
||||||
movs r1, 0xB
|
movs r1, 0xB
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
|
@ -21645,7 +21645,7 @@ _08014854:
|
|||||||
ldrb r0, [r6]
|
ldrb r0, [r6]
|
||||||
movs r5, 0x64
|
movs r5, 0x64
|
||||||
muls r0, r5
|
muls r0, r5
|
||||||
ldr r4, =gUnknown_02024488
|
ldr r4, =gBattleScripting + 0x14
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
movs r1, 0xB
|
movs r1, 0xB
|
||||||
bl GetMonData
|
bl GetMonData
|
||||||
|
@ -691,7 +691,7 @@ _08153D22:
|
|||||||
b _08153DB6
|
b _08153DB6
|
||||||
.pool
|
.pool
|
||||||
_08153D4C:
|
_08153D4C:
|
||||||
ldr r7, =gUnknown_020246E0
|
ldr r7, =gPlayerParty + 500
|
||||||
adds r0, r7, 0
|
adds r0, r7, 0
|
||||||
adds r1, r5, 0
|
adds r1, r5, 0
|
||||||
movs r2, 0x64
|
movs r2, 0x64
|
||||||
|
@ -4283,7 +4283,7 @@ _0803723C:
|
|||||||
bl bitmask_all_link_players_but_self
|
bl bitmask_all_link_players_but_self
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, =gUnknown_020245B4
|
ldr r1, =gPlayerParty + 200
|
||||||
movs r2, 0xC8
|
movs r2, 0xC8
|
||||||
bl link_0800A448
|
bl link_0800A448
|
||||||
ldr r1, =gBattleCommunication
|
ldr r1, =gBattleCommunication
|
||||||
@ -4298,7 +4298,7 @@ _08037258:
|
|||||||
b _0803744C
|
b _0803744C
|
||||||
_08037266:
|
_08037266:
|
||||||
bl sub_800A5B4
|
bl sub_800A5B4
|
||||||
ldr r0, =gUnknown_0202480C
|
ldr r0, =gEnemyParty + 200
|
||||||
lsls r1, r5, 8
|
lsls r1, r5, 8
|
||||||
ldr r2, =gUnknown_020223C4
|
ldr r2, =gUnknown_020223C4
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
@ -4317,7 +4317,7 @@ _08037294:
|
|||||||
bl bitmask_all_link_players_but_self
|
bl bitmask_all_link_players_but_self
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, =gUnknown_0202467C
|
ldr r1, =gPlayerParty + 400
|
||||||
movs r2, 0xC8
|
movs r2, 0xC8
|
||||||
bl link_0800A448
|
bl link_0800A448
|
||||||
ldr r1, =gBattleCommunication
|
ldr r1, =gBattleCommunication
|
||||||
@ -4332,7 +4332,7 @@ _080372B0:
|
|||||||
b _0803744C
|
b _0803744C
|
||||||
_080372BE:
|
_080372BE:
|
||||||
bl sub_800A5B4
|
bl sub_800A5B4
|
||||||
ldr r4, =gUnknown_020248D4
|
ldr r4, =gEnemyParty + 400
|
||||||
lsls r1, r5, 8
|
lsls r1, r5, 8
|
||||||
ldr r0, =gUnknown_020223C4
|
ldr r0, =gUnknown_020223C4
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
@ -4783,7 +4783,7 @@ _0803771C:
|
|||||||
bl bitmask_all_link_players_but_self
|
bl bitmask_all_link_players_but_self
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, =gUnknown_020245B4
|
ldr r1, =gPlayerParty + 200
|
||||||
movs r2, 0x64
|
movs r2, 0x64
|
||||||
bl link_0800A448
|
bl link_0800A448
|
||||||
b _08037986
|
b _08037986
|
||||||
@ -4805,7 +4805,7 @@ _08037742:
|
|||||||
ldrh r0, [r1, 0x18]
|
ldrh r0, [r1, 0x18]
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _08037788
|
beq _08037788
|
||||||
ldr r4, =gUnknown_020245B4
|
ldr r4, =gPlayerParty + 200
|
||||||
lsls r1, r7, 8
|
lsls r1, r7, 8
|
||||||
ldr r5, =gUnknown_020223C4
|
ldr r5, =gUnknown_020223C4
|
||||||
adds r1, r5
|
adds r1, r5
|
||||||
@ -4823,7 +4823,7 @@ _08037742:
|
|||||||
b _08037986
|
b _08037986
|
||||||
.pool
|
.pool
|
||||||
_08037788:
|
_08037788:
|
||||||
ldr r4, =gUnknown_020245B4
|
ldr r4, =gPlayerParty + 200
|
||||||
lsls r1, r6, 8
|
lsls r1, r6, 8
|
||||||
ldr r5, =gUnknown_020223C4
|
ldr r5, =gUnknown_020223C4
|
||||||
adds r1, r5
|
adds r1, r5
|
||||||
@ -4882,7 +4882,7 @@ _08037808:
|
|||||||
bl bitmask_all_link_players_but_self
|
bl bitmask_all_link_players_but_self
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, =gUnknown_0202480C
|
ldr r1, =gEnemyParty + 200
|
||||||
b _08037686
|
b _08037686
|
||||||
.pool
|
.pool
|
||||||
_08037818:
|
_08037818:
|
||||||
@ -4900,7 +4900,7 @@ _08037826:
|
|||||||
bne _08037836
|
bne _08037836
|
||||||
b _08037986
|
b _08037986
|
||||||
_08037836:
|
_08037836:
|
||||||
ldr r0, =gUnknown_0202480C
|
ldr r0, =gEnemyParty + 200
|
||||||
ldr r1, =gUnknown_020223C4
|
ldr r1, =gUnknown_020223C4
|
||||||
movs r2, 0xC8
|
movs r2, 0xC8
|
||||||
b _08037982
|
b _08037982
|
||||||
@ -4915,7 +4915,7 @@ _08037854:
|
|||||||
bl bitmask_all_link_players_but_self
|
bl bitmask_all_link_players_but_self
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, =gUnknown_020248D4
|
ldr r1, =gEnemyParty + 400
|
||||||
b _08037686
|
b _08037686
|
||||||
.pool
|
.pool
|
||||||
_08037864:
|
_08037864:
|
||||||
@ -4931,7 +4931,7 @@ _08037872:
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _0803788A
|
beq _0803788A
|
||||||
ldr r0, =gUnknown_020248D4
|
ldr r0, =gEnemyParty + 400
|
||||||
ldr r1, =gUnknown_020223C4
|
ldr r1, =gUnknown_020223C4
|
||||||
movs r2, 0xC8
|
movs r2, 0xC8
|
||||||
bl memcpy
|
bl memcpy
|
||||||
@ -5800,7 +5800,7 @@ _08038090:
|
|||||||
b _08038110
|
b _08038110
|
||||||
.pool
|
.pool
|
||||||
_08038098:
|
_08038098:
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
b _08038110
|
b _08038110
|
||||||
.pool
|
.pool
|
||||||
_080380A0:
|
_080380A0:
|
||||||
@ -5847,7 +5847,7 @@ _080380E8:
|
|||||||
b _08038110
|
b _08038110
|
||||||
.pool
|
.pool
|
||||||
_080380F0:
|
_080380F0:
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
b _08038110
|
b _08038110
|
||||||
.pool
|
.pool
|
||||||
_080380F8:
|
_080380F8:
|
||||||
@ -5872,7 +5872,7 @@ _08038110:
|
|||||||
b _0803812A
|
b _0803812A
|
||||||
.pool
|
.pool
|
||||||
_08038120:
|
_08038120:
|
||||||
ldr r0, =gUnknown_02024870
|
ldr r0, =gEnemyParty + 300
|
||||||
adds r1, r4, 0
|
adds r1, r4, 0
|
||||||
movs r2, 0xC8
|
movs r2, 0xC8
|
||||||
bl memcpy
|
bl memcpy
|
||||||
@ -5896,7 +5896,7 @@ _0803814C:
|
|||||||
bl bitmask_all_link_players_but_self
|
bl bitmask_all_link_players_but_self
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, =gUnknown_020245B4
|
ldr r1, =gPlayerParty + 200
|
||||||
movs r2, 0x64
|
movs r2, 0x64
|
||||||
bl link_0800A448
|
bl link_0800A448
|
||||||
b _080383A6
|
b _080383A6
|
||||||
@ -5935,11 +5935,11 @@ _080381A4:
|
|||||||
cmp r0, 0x3
|
cmp r0, 0x3
|
||||||
bne _08038242
|
bne _08038242
|
||||||
_080381A8:
|
_080381A8:
|
||||||
ldr r0, =gUnknown_020245B4
|
ldr r0, =gPlayerParty + 200
|
||||||
b _08038228
|
b _08038228
|
||||||
.pool
|
.pool
|
||||||
_080381B0:
|
_080381B0:
|
||||||
ldr r0, =gUnknown_020246E0
|
ldr r0, =gPlayerParty + 500
|
||||||
b _08038228
|
b _08038228
|
||||||
.pool
|
.pool
|
||||||
_080381B8:
|
_080381B8:
|
||||||
@ -5982,11 +5982,11 @@ _080381FC:
|
|||||||
cmp r0, 0x3
|
cmp r0, 0x3
|
||||||
bne _08038242
|
bne _08038242
|
||||||
_08038200:
|
_08038200:
|
||||||
ldr r0, =gUnknown_020245B4
|
ldr r0, =gPlayerParty + 200
|
||||||
b _08038228
|
b _08038228
|
||||||
.pool
|
.pool
|
||||||
_08038208:
|
_08038208:
|
||||||
ldr r0, =gUnknown_020246E0
|
ldr r0, =gPlayerParty + 500
|
||||||
b _08038228
|
b _08038228
|
||||||
.pool
|
.pool
|
||||||
_08038210:
|
_08038210:
|
||||||
@ -6003,7 +6003,7 @@ _08038222:
|
|||||||
cmp r0, 0x3
|
cmp r0, 0x3
|
||||||
bne _08038242
|
bne _08038242
|
||||||
_08038226:
|
_08038226:
|
||||||
ldr r0, =gUnknown_0202480C
|
ldr r0, =gEnemyParty + 200
|
||||||
_08038228:
|
_08038228:
|
||||||
adds r1, r4, 0
|
adds r1, r4, 0
|
||||||
movs r2, 0x64
|
movs r2, 0x64
|
||||||
@ -6011,7 +6011,7 @@ _08038228:
|
|||||||
b _08038242
|
b _08038242
|
||||||
.pool
|
.pool
|
||||||
_08038238:
|
_08038238:
|
||||||
ldr r0, =gUnknown_02024938
|
ldr r0, =gEnemyParty + 500
|
||||||
adds r1, r4, 0
|
adds r1, r4, 0
|
||||||
movs r2, 0x64
|
movs r2, 0x64
|
||||||
bl memcpy
|
bl memcpy
|
||||||
|
@ -3728,7 +3728,7 @@ _08163FCC:
|
|||||||
adds r1, r0, 0
|
adds r1, r0, 0
|
||||||
movs r0, 0x64
|
movs r0, 0x64
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r1, =gUnknown_02024488
|
ldr r1, =gBattleScripting + 0x14
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
movs r1, 0x2C
|
movs r1, 0x2C
|
||||||
muls r1, r4
|
muls r1, r4
|
||||||
@ -6122,7 +6122,7 @@ _08165440:
|
|||||||
movs r0, 0x64
|
movs r0, 0x64
|
||||||
mov r6, r10
|
mov r6, r10
|
||||||
muls r6, r0
|
muls r6, r0
|
||||||
ldr r1, =gUnknown_02024618
|
ldr r1, =gPlayerParty + 300
|
||||||
mov r8, r1
|
mov r8, r1
|
||||||
adds r0, r6, r1
|
adds r0, r6, r1
|
||||||
mov r5, r9
|
mov r5, r9
|
||||||
@ -6167,7 +6167,7 @@ _081654B0:
|
|||||||
mov r4, r10
|
mov r4, r10
|
||||||
muls r4, r6
|
muls r4, r6
|
||||||
ldr r7, =gUnknown_085DD6DC
|
ldr r7, =gUnknown_085DD6DC
|
||||||
ldr r6, =gUnknown_02024618
|
ldr r6, =gPlayerParty + 300
|
||||||
mov r0, r9
|
mov r0, r9
|
||||||
add r0, r10
|
add r0, r10
|
||||||
lsls r5, r0, 2
|
lsls r5, r0, 2
|
||||||
@ -6189,7 +6189,7 @@ _081654DE:
|
|||||||
movs r1, 0x64
|
movs r1, 0x64
|
||||||
mov r4, r10
|
mov r4, r10
|
||||||
muls r4, r1
|
muls r4, r1
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r1, 0x7
|
movs r1, 0x7
|
||||||
@ -6268,7 +6268,7 @@ _081655A6:
|
|||||||
mov r3, r10
|
mov r3, r10
|
||||||
muls r3, r6
|
muls r3, r6
|
||||||
mov r8, r3
|
mov r8, r3
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
mov r9, r0
|
mov r9, r0
|
||||||
mov r0, r8
|
mov r0, r8
|
||||||
add r0, r9
|
add r0, r9
|
||||||
@ -6333,7 +6333,7 @@ _08165634:
|
|||||||
movs r1, 0x64
|
movs r1, 0x64
|
||||||
mov r4, r10
|
mov r4, r10
|
||||||
muls r4, r1
|
muls r4, r1
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r1, 0x20
|
movs r1, 0x20
|
||||||
@ -6376,7 +6376,7 @@ _0816567E:
|
|||||||
movs r3, 0x64
|
movs r3, 0x64
|
||||||
mov r4, r10
|
mov r4, r10
|
||||||
muls r4, r3
|
muls r4, r3
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r1, 0x7
|
movs r1, 0x7
|
||||||
@ -6483,7 +6483,7 @@ _0816579C:
|
|||||||
movs r0, 0x64
|
movs r0, 0x64
|
||||||
mov r4, r10
|
mov r4, r10
|
||||||
muls r4, r0
|
muls r4, r0
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
adds r1, r5, 0
|
adds r1, r5, 0
|
||||||
@ -6538,7 +6538,7 @@ _08165812:
|
|||||||
movs r0, 0x64
|
movs r0, 0x64
|
||||||
mov r4, r10
|
mov r4, r10
|
||||||
muls r4, r0
|
muls r4, r0
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
mov r1, r8
|
mov r1, r8
|
||||||
ldr r0, [r1]
|
ldr r0, [r1]
|
||||||
|
@ -3911,7 +3911,7 @@ sub_818F02C: @ 818F02C
|
|||||||
movs r7, 0
|
movs r7, 0
|
||||||
mov r10, r7
|
mov r10, r7
|
||||||
mov r8, r4
|
mov r8, r4
|
||||||
ldr r0, =gUnknown_02024488
|
ldr r0, =gBattleScripting + 0x14
|
||||||
mov r9, r0
|
mov r9, r0
|
||||||
movs r4, 0
|
movs r4, 0
|
||||||
_0818F0BA:
|
_0818F0BA:
|
||||||
@ -52837,7 +52837,7 @@ _081A87EC:
|
|||||||
ldrh r1, [r0]
|
ldrh r1, [r0]
|
||||||
movs r0, 0x64
|
movs r0, 0x64
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r1, =gUnknown_02024488
|
ldr r1, =gBattleScripting + 0x14
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldr r1, =0x00000e12
|
ldr r1, =0x00000e12
|
||||||
adds r3, r1
|
adds r3, r1
|
||||||
@ -70442,7 +70442,7 @@ _081B1A24:
|
|||||||
lsrs r6, r0, 29
|
lsrs r6, r0, 29
|
||||||
cmp r6, 0x3
|
cmp r6, 0x3
|
||||||
bne _081B1A54
|
bne _081B1A54
|
||||||
ldr r0, =gUnknown_02024618
|
ldr r0, =gPlayerParty + 300
|
||||||
movs r1, 0xB
|
movs r1, 0xB
|
||||||
bl GetMonData
|
bl GetMonData
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
@ -70451,7 +70451,7 @@ _081B1A24:
|
|||||||
b _081B1AF4
|
b _081B1AF4
|
||||||
.pool
|
.pool
|
||||||
_081B1A54:
|
_081B1A54:
|
||||||
ldr r0, =gUnknown_020245B4
|
ldr r0, =gPlayerParty + 200
|
||||||
b _081B1A70
|
b _081B1A70
|
||||||
.pool
|
.pool
|
||||||
_081B1A5C:
|
_081B1A5C:
|
||||||
@ -70464,7 +70464,7 @@ _081B1A5C:
|
|||||||
lsrs r5, r0, 29
|
lsrs r5, r0, 29
|
||||||
cmp r5, 0x5
|
cmp r5, 0x5
|
||||||
bne _081B1A88
|
bne _081B1A88
|
||||||
ldr r0, =gUnknown_020246E0
|
ldr r0, =gPlayerParty + 500
|
||||||
_081B1A70:
|
_081B1A70:
|
||||||
movs r1, 0xB
|
movs r1, 0xB
|
||||||
bl GetMonData
|
bl GetMonData
|
||||||
@ -70474,7 +70474,7 @@ _081B1A70:
|
|||||||
b _081B1AF4
|
b _081B1AF4
|
||||||
.pool
|
.pool
|
||||||
_081B1A88:
|
_081B1A88:
|
||||||
ldr r0, =gUnknown_0202467C
|
ldr r0, =gPlayerParty + 400
|
||||||
movs r1, 0xB
|
movs r1, 0xB
|
||||||
bl GetMonData
|
bl GetMonData
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
@ -83409,7 +83409,7 @@ sub_81B89F0: @ 81B89F0
|
|||||||
sub_81B8A2C: @ 81B8A2C
|
sub_81B8A2C: @ 81B8A2C
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
ldr r0, =gUnknown_02024550
|
ldr r0, =gPlayerParty + 0x64
|
||||||
movs r1, 0xB
|
movs r1, 0xB
|
||||||
bl GetMonData
|
bl GetMonData
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
|
@ -2209,7 +2209,7 @@ _08078552:
|
|||||||
.pool
|
.pool
|
||||||
_0807857C:
|
_0807857C:
|
||||||
ldr r0, =gUnknown_020228C4
|
ldr r0, =gUnknown_020228C4
|
||||||
ldr r1, =gUnknown_020245B4
|
ldr r1, =gPlayerParty + 200
|
||||||
movs r2, 0xC8
|
movs r2, 0xC8
|
||||||
bl sub_8078438
|
bl sub_8078438
|
||||||
ldr r0, =gUnknown_0203229C
|
ldr r0, =gUnknown_0203229C
|
||||||
@ -2232,7 +2232,7 @@ _080785AC:
|
|||||||
beq _080785B6
|
beq _080785B6
|
||||||
b _080787AA
|
b _080787AA
|
||||||
_080785B6:
|
_080785B6:
|
||||||
ldr r0, =gUnknown_0202480C
|
ldr r0, =gEnemyParty + 200
|
||||||
movs r2, 0x1
|
movs r2, 0x1
|
||||||
adds r1, r5, 0
|
adds r1, r5, 0
|
||||||
eors r1, r2
|
eors r1, r2
|
||||||
@ -2248,7 +2248,7 @@ _080785B6:
|
|||||||
.pool
|
.pool
|
||||||
_080785E0:
|
_080785E0:
|
||||||
ldr r0, =gUnknown_020228C4
|
ldr r0, =gUnknown_020228C4
|
||||||
ldr r1, =gUnknown_0202467C
|
ldr r1, =gPlayerParty + 400
|
||||||
movs r2, 0xC8
|
movs r2, 0xC8
|
||||||
bl sub_8078438
|
bl sub_8078438
|
||||||
ldr r0, =gUnknown_0203229C
|
ldr r0, =gUnknown_0203229C
|
||||||
@ -2271,7 +2271,7 @@ _08078610:
|
|||||||
beq _0807861A
|
beq _0807861A
|
||||||
b _080787AA
|
b _080787AA
|
||||||
_0807861A:
|
_0807861A:
|
||||||
ldr r0, =gUnknown_020248D4
|
ldr r0, =gEnemyParty + 400
|
||||||
movs r2, 0x1
|
movs r2, 0x1
|
||||||
adds r1, r5, 0
|
adds r1, r5, 0
|
||||||
eors r1, r2
|
eors r1, r2
|
||||||
|
@ -488,13 +488,7 @@ gEnigmaBerries: @ 2024404
|
|||||||
.space 0x70
|
.space 0x70
|
||||||
|
|
||||||
gBattleScripting: @ 2024474
|
gBattleScripting: @ 2024474
|
||||||
.space 0x4
|
.space 0x28
|
||||||
|
|
||||||
gUnknown_02024478: @ 2024478
|
|
||||||
.space 0x10
|
|
||||||
|
|
||||||
gUnknown_02024488: @ 2024488
|
|
||||||
.space 0x14
|
|
||||||
|
|
||||||
gBattleStruct: @ 202449C
|
gBattleStruct: @ 202449C
|
||||||
.space 0x4
|
.space 0x4
|
||||||
@ -560,40 +554,10 @@ gUnknown_020244EA: @ 20244EA
|
|||||||
.space 0x2
|
.space 0x2
|
||||||
|
|
||||||
gPlayerParty: @ 20244EC
|
gPlayerParty: @ 20244EC
|
||||||
.space 0x64
|
.space 600
|
||||||
|
|
||||||
gUnknown_02024550: @ 2024550
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_020245B4: @ 20245B4
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_02024618: @ 2024618
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_0202467C: @ 202467C
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_020246E0: @ 20246E0
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gEnemyParty: @ 2024744
|
gEnemyParty: @ 2024744
|
||||||
.space 0x64
|
.space 600
|
||||||
|
|
||||||
gUnknown_020247A8: @ 20247A8
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_0202480C: @ 202480C
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_02024870: @ 2024870
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_020248D4: @ 20248D4
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_02024938: @ 2024938
|
|
||||||
.space 0x64
|
|
||||||
|
|
||||||
gUnknown_0202499C: @ 202499C
|
gUnknown_0202499C: @ 202499C
|
||||||
.space 0x18
|
.space 0x18
|
||||||
|
Loading…
x
Reference in New Issue
Block a user