dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

begin working on pokeemerald

Browse Source
This commit is contained in:
DizzyEggg
2017-08-31 16:48:24 +02:00
parent cbe13acff1
commit 6f03356237
103 changed files with 15767 additions and 15344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_3.s
+653 -653
View File
File diff suppressed because it is too large Load Diff
asm/battle_814AEAC.s
+316 -316
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim.s
+54 -54
View File
@@ -93,11 +93,11 @@ move_anim_start_t1: @ 80A3A10
lsls r1, 16
lsrs r1, 16
ldr r2, =gUnknown_02038436
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
strb r0, [r2]
ldr r2, =gUnknown_02038437
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
strb r0, [r2]
ldr r0, =gUnknown_082C8D6C
@@ -134,13 +134,13 @@ move_something: @ 80A3A48
mov r0, r8
lsls r0, 2
mov r10, r0
ldr r6, =gUnknown_0202406E
ldr r6, =gBattlePartyID
movs r7, 0x64
ldr r5, =gUnknown_02038438
_080A3A84:
lsls r0, r4, 24
lsrs r0, 24
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A3AA8
@@ -900,12 +900,12 @@ sub_80A40F4: @ 80A40F4
ldr r1, =gTasks + 0x8
mov r8, r1
adds r6, r0, r1
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
movs r2, 0
ldrsh r0, [r6, r2]
adds r0, r1
ldrb r5, [r0]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
@@ -1013,7 +1013,7 @@ _080A41FA:
cmp r0, 0
beq _080A4266
adds r0, r4, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1065,7 +1065,7 @@ _080A4266:
cmp r0, 0
beq _080A42D8
adds r0, r4, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1160,8 +1160,8 @@ _080A4330:
ands r0, r1
cmp r0, 0
beq _080A4374
ldr r2, =gUnknown_02020630
ldr r0, =gUnknown_020241E4
ldr r2, =gSprites
ldr r0, =gBankSpriteIds
adds r0, r5, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1263,11 +1263,11 @@ _080A43F8:
movs r1, 0x1
movs r2, 0
bl lcd_bg_operations
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
adds r0, r6, r0
ldrb r4, [r0]
ldr r5, =gUnknown_02022E18
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -1295,7 +1295,7 @@ _080A43F8:
strh r0, [r5]
_080A447A:
ldr r5, =gUnknown_02022E1A
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -1309,7 +1309,7 @@ _080A447A:
mov r0, r9
cmp r0, 0
beq _080A44B0
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
adds r0, r6, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1356,7 +1356,7 @@ _080A44B0:
.pool
_080A4524:
adds r0, r6, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r3, r0, 24
_080A452E:
@@ -1428,11 +1428,11 @@ _080A455E:
movs r1, 0x1
movs r2, 0
bl lcd_bg_operations
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
adds r2, r5, r0
ldrb r4, [r2]
ldr r5, =gUnknown_02022E1C
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -1482,7 +1482,7 @@ _080A460E:
adds r0, r4, 0
bl CpuSet
adds r0, r6, 0
bl battle_get_per_side_status
bl GetBankIdentity
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -1691,7 +1691,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8
ldrb r6, [r5, 0x14]
mov r0, sp
bl sub_80A6B30
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -1801,8 +1801,8 @@ _080A48E2:
ldrb r0, [r3]
cmp r0, 0xFF
beq _080A4908
ldr r2, =gUnknown_02020630
ldr r0, =gUnknown_020241E4
ldr r2, =gSprites
ldr r0, =gBankSpriteIds
adds r0, r5, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1821,8 +1821,8 @@ _080A4908:
ldrb r0, [r3, 0x1]
cmp r0, 0xFF
beq _080A4948
ldr r3, =gUnknown_02020630
ldr r2, =gUnknown_020241E4
ldr r3, =gSprites
ldr r2, =gBankSpriteIds
movs r1, 0x2
adds r0, r5, 0
eors r0, r1
@@ -1883,7 +1883,7 @@ sub_80A4980: @ 80A4980
cmp r0, 0x1
beq _080A4A0A
ldrb r0, [r1, 0xC]
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1977,7 +1977,7 @@ _080A4A4A:
cmp r0, 0
beq _080A4A8A
adds r0, r4, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -2010,7 +2010,7 @@ _080A4A8A:
cmp r0, 0
beq _080A4ACA
adds r0, r4, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -2078,8 +2078,8 @@ _080A4B0E:
lsls r0, 24
cmp r0, 0
beq _080A4B38
ldr r2, =gUnknown_02020630
ldr r0, =gUnknown_020241E4
ldr r2, =gSprites
ldr r0, =gBankSpriteIds
adds r0, r6, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2103,8 +2103,8 @@ _080A4B38:
lsls r0, 24
cmp r0, 0
beq _080A4B78
ldr r2, =gUnknown_02020630
ldr r0, =gUnknown_020241E4
ldr r2, =gSprites
ldr r0, =gBankSpriteIds
adds r0, r4, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2163,7 +2163,7 @@ sub_80A4BB0: @ 80A4BB0
beq _080A4C3E
ldrb r4, [r1, 0xC]
adds r0, r4, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -2528,7 +2528,7 @@ sub_80A4E5C: @ 80A4E5C
_080A4EA8:
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A4ECC
@@ -2879,7 +2879,7 @@ sub_80A5178: @ 80A5178
cmp r0, 0
beq _080A51C0
adds r0, r2, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
movs r4, 0xC0
cmp r0, 0
@@ -2907,13 +2907,13 @@ _080A51C0:
_080A51E8:
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A5226
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A5252
@@ -2935,7 +2935,7 @@ _080A5218:
_080A5226:
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3001,7 +3001,7 @@ sub_80A5278: @ 80A5278
cmp r0, 0
beq _080A52C0
adds r0, r2, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
movs r4, 0xC0
cmp r0, 0
@@ -3012,7 +3012,7 @@ sub_80A5278: @ 80A5278
_080A52C0:
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A52D8
@@ -3867,7 +3867,7 @@ _080A59A0:
ldr r0, =gUnknown_02038436
_080A59A2:
ldrb r0, [r0]
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
@@ -3929,11 +3929,11 @@ sub_80A5A0C: @ 80A5A0C
str r0, [r1]
ldr r7, =gUnknown_02038436
ldrb r0, [r7]
bl battle_side_get_owner
bl GetBankSide
adds r4, r0, 0
ldr r5, =gUnknown_02038437
ldrb r0, [r5]
bl battle_side_get_owner
bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -3946,7 +3946,7 @@ sub_80A5A0C: @ 80A5A0C
_080A5A48:
ldrb r0, [r7]
_080A5A4A:
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
@@ -3983,7 +3983,7 @@ ma2B_make_side_invisible: @ 80A5A80
lsrs r2, r0, 24
cmp r2, 0xFF
beq _080A5AA8
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -4014,7 +4014,7 @@ ma2C_make_side_visible: @ 80A5ABC
lsrs r2, r0, 24
cmp r2, 0xFF
beq _080A5AE6
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -4053,11 +4053,11 @@ sub_80A5AFC: @ 80A5AFC
beq _080A5BA6
ldr r6, =gUnknown_02038436
ldrb r0, [r6]
bl battle_side_get_owner
bl GetBankSide
adds r4, r0, 0
ldr r5, =gUnknown_02038437
ldrb r0, [r5]
bl battle_side_get_owner
bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -4065,7 +4065,7 @@ sub_80A5AFC: @ 80A5AFC
cmp r7, 0
bne _080A5B54
ldrb r0, [r6]
bl battle_get_per_side_status_permutated
bl GetBankIdentity_permutated
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0
@@ -4073,7 +4073,7 @@ sub_80A5AFC: @ 80A5AFC
.pool
_080A5B54:
ldrb r0, [r5]
bl battle_get_per_side_status_permutated
bl GetBankIdentity_permutated
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x1
@@ -4083,7 +4083,7 @@ _080A5B60:
lsrs r2, r0, 24
cmp r2, 0xFF
beq _080A5BA6
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -4135,11 +4135,11 @@ sub_80A5BAC: @ 80A5BAC
beq _080A5C38
ldr r6, =gUnknown_02038436
ldrb r0, [r6]
bl battle_side_get_owner
bl GetBankSide
adds r4, r0, 0
ldr r5, =gUnknown_02038437
ldrb r0, [r5]
bl battle_side_get_owner
bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -4147,7 +4147,7 @@ sub_80A5BAC: @ 80A5BAC
cmp r7, 0
bne _080A5C04
ldrb r0, [r6]
bl battle_get_per_side_status_permutated
bl GetBankIdentity_permutated
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0
@@ -4155,7 +4155,7 @@ sub_80A5BAC: @ 80A5BAC
.pool
_080A5C04:
ldrb r0, [r5]
bl battle_get_per_side_status_permutated
bl GetBankIdentity_permutated
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x1
@@ -4167,7 +4167,7 @@ _080A5C10:
beq _080A5C38
cmp r4, 0x2
bne _080A5C38
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
asm/battle_anim_80FE840.s
+439 -439
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_8170478.s
+93 -93
View File
@@ -59,7 +59,7 @@ sub_8170478: @ 8170478
ldr r0, =gUnknown_03005D70
adds r4, r0
ldrb r0, [r4]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r9, r1
lsls r4, r0, 4
adds r4, r0
@@ -359,7 +359,7 @@ _0817076C:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
adds r0, r6
bl RemoveObjectAndFreeTiles
movs r0, 0xC
@@ -440,7 +440,7 @@ sub_8170834: @ 8170834
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r5, r0
ldrb r1, [r5, 0x6]
mov r10, r1
@@ -464,7 +464,7 @@ sub_8170834: @ 8170834
lsls r6, r4, 4
adds r6, r4
lsls r6, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r6, r2
ldrb r4, [r6, 0x5]
lsrs r4, 4
@@ -504,7 +504,7 @@ sub_8170834: @ 8170834
lsls r1, r2, 4
add r1, r10
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
mov r0, r9
ldrb r2, [r0]
@@ -564,7 +564,7 @@ sub_817094C: @ 817094C
ldr r1, =gUnknown_03005D70
adds r0, r1
ldrb r0, [r0]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r8, r1
lsls r5, r0, 4
adds r5, r0
@@ -765,7 +765,7 @@ sub_8170B04: @ 8170B04
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
adds r0, r1
@@ -823,7 +823,7 @@ _08170B76:
_08170B84:
adds r0, r5, 0
bl sub_80A7344
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
@@ -851,17 +851,17 @@ sub_8170BB0: @ 8170BB0
sub sp, 0xC
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r4, =gUnknown_02038436
ldrb r0, [r4]
adds r1, r0, r1
ldrb r1, [r1]
mov r9, r1
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08170BF8
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldrb r0, [r4]
lsls r0, 1
adds r0, r1
@@ -872,7 +872,7 @@ sub_8170BB0: @ 8170BB0
b _08170C08
.pool
_08170BF8:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldrb r0, [r4]
lsls r0, 1
adds r0, r1
@@ -916,7 +916,7 @@ _08170C44:
bl sub_80A5C6C
adds r1, r0, 0
lsls r1, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r3, r9
lsls r0, r3, 4
add r0, r9
@@ -1154,7 +1154,7 @@ sub_8170E04: @ 8170E04
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r9, r1
lsls r4, r5, 4
adds r4, r5
@@ -1186,7 +1186,7 @@ sub_8170E04: @ 8170E04
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r3, [r0, 0x8]
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
mov r2, r8
ldrb r0, [r2]
adds r0, r1
@@ -1236,7 +1236,7 @@ sub_8170EF0: @ 8170EF0
lsls r0, 3
adds r0, r1
ldrb r1, [r0, 0x8]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -1283,7 +1283,7 @@ _08170F54:
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
bl sub_80A82E4
@@ -1305,7 +1305,7 @@ _08170F54:
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r9, r0
lsls r4, r5, 4
adds r4, r5
@@ -1335,8 +1335,8 @@ _08170F54:
ldr r0, =DummyObjectCallback
str r0, [r4]
movs r0, 0
bl battle_get_side_with_given_state
ldr r1, =gUnknown_020241E4
bl GetBankByPlayerAI
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1369,10 +1369,10 @@ sub_8171030: @ 8171030
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r0, 0
bl battle_get_side_with_given_state
ldr r1, =gUnknown_020241E4
bl GetBankByPlayerAI
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1420,10 +1420,10 @@ sub_81710A8: @ 81710A8
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r0, 0
bl battle_get_side_with_given_state
ldr r4, =gUnknown_020241E4
bl GetBankByPlayerAI
ldr r4, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1438,7 +1438,7 @@ sub_81710A8: @ 81710A8
cmp r0, 0
bge _081710F4
movs r0, 0
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1583,8 +1583,8 @@ sub_81711E8: @ 81711E8
strh r0, [r4, 0x38]
ldr r0, =sub_8171240
str r0, [r4, 0x1C]
ldr r2, =gUnknown_02020630
ldr r1, =gUnknown_020241E4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
adds r0, r1
@@ -1606,7 +1606,7 @@ _08171224:
sub_8171240: @ 8171240
push {r4-r7,lr}
adds r7, r0, 0
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
adds r0, r1
@@ -1654,7 +1654,7 @@ _08171296:
movs r0, 0x1C
str r0, [r1]
ldr r2, =gUnknown_030062E4
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -1690,7 +1690,7 @@ _081712E8:
ldrh r1, [r5, 0xE]
adds r0, r1
strh r0, [r5, 0xE]
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -1710,7 +1710,7 @@ _081712E8:
_0817132C:
adds r0, r4, 0
bl sub_80A7344
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -2375,7 +2375,7 @@ _0817183C:
_0817185A:
cmp r1, 0x5F
bne _08171880
ldr r0, =gUnknown_020244B9
ldr r0, =gDoingBattleAnim
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -2389,8 +2389,8 @@ _08171880:
ldr r0, =0x0000013b
cmp r1, r0
bne _081718BC
ldr r5, =gUnknown_02020630
ldr r4, =gUnknown_020241E4
ldr r5, =gSprites
ldr r4, =gBankSpriteIds
ldrb r0, [r7]
adds r0, r4
ldrb r1, [r0]
@@ -2590,7 +2590,7 @@ _08171A14:
movs r0, 0x4
bl sub_8171D60
movs r7, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r9, r2
movs r0, 0x1C
add r0, r9
@@ -2722,8 +2722,8 @@ sub_8171AE4: @ 8171AE4
adds r3, r5, 0
bl sub_81729E8
_08171B36:
ldr r6, =gUnknown_02020630
ldr r5, =gUnknown_020241E4
ldr r6, =gSprites
ldr r5, =gBankSpriteIds
ldr r4, =gUnknown_02038437
ldrb r0, [r4]
adds r0, r5
@@ -2790,8 +2790,8 @@ sub_8171BAC: @ 8171BAC
orrs r0, r1
strb r0, [r2]
_08171BCA:
ldr r4, =gUnknown_02020630
ldr r3, =gUnknown_020241E4
ldr r4, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gUnknown_02038437
ldrb r0, [r2]
adds r0, r3
@@ -2839,8 +2839,8 @@ _08171C24:
beq _08171C8A
cmp r5, 0
beq _08171C8A
ldr r4, =gUnknown_02020630
ldr r3, =gUnknown_020241E4
ldr r4, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gUnknown_02038437
ldrb r0, [r2]
adds r0, r3
@@ -2876,7 +2876,7 @@ _08171C24:
strh r5, [r7, 0x2E]
ldr r0, =sub_81719C0
str r0, [r7, 0x1C]
ldr r0, =gUnknown_020244B9
ldr r0, =gDoingBattleAnim
strb r6, [r0]
movs r0, 0x1
bl sub_8072A88
@@ -2970,7 +2970,7 @@ _08171D3E:
strh r0, [r4, 0x2E]
ldr r0, =sub_81719C0
str r0, [r4, 0x1C]
ldr r1, =gUnknown_020244B9
ldr r1, =gDoingBattleAnim
movs r0, 0
strb r0, [r1]
movs r0, 0x1
@@ -3142,7 +3142,7 @@ sub_8171E50: @ 8171E50
lsls r4, r0, 4
add r4, r10
lsls r4, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r7, r4, r5
ldr r0, =gUnknown_085E51B4
ldr r1, [sp]
@@ -3193,7 +3193,7 @@ _08171EEC:
ands r0, r1
cmp r0, 0
bne _08171F22
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r2, r10
lsls r1, r2, 4
add r1, r10
@@ -3308,7 +3308,7 @@ sub_8171FC4: @ 8171FC4
ldrb r1, [r1, 0x10]
str r1, [sp, 0xC]
movs r7, 0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
mov r10, r3
mov r1, r8
lsls r0, r1, 1
@@ -3375,7 +3375,7 @@ _0817206A:
ands r0, r1
cmp r0, 0
bne _08172092
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -3426,7 +3426,7 @@ sub_81720C8: @ 81720C8
ldrb r1, [r1, 0x10]
str r1, [sp, 0xC]
movs r7, 0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
mov r10, r3
mov r1, r8
lsls r0, r1, 1
@@ -3493,7 +3493,7 @@ _0817216E:
ands r0, r1
cmp r0, 0
bne _08172196
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -3546,7 +3546,7 @@ sub_81721CC: @ 81721CC
adds r0, r1
lsls r0, 3
str r0, [sp, 0x10]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
mov r8, r3
ldr r0, =gUnknown_085E51B4
adds r1, r0
@@ -3609,7 +3609,7 @@ _0817226E:
ands r0, r1
cmp r0, 0
bne _08172296
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -3660,7 +3660,7 @@ sub_81722CC: @ 81722CC
ldrb r1, [r1, 0x10]
str r1, [sp, 0xC]
movs r7, 0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
mov r10, r3
mov r1, r8
lsls r0, r1, 1
@@ -3729,7 +3729,7 @@ _08172376:
ands r0, r1
cmp r0, 0
bne _0817239E
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -3793,7 +3793,7 @@ _08172404:
adds r1, r0
lsls r1, 3
str r1, [sp, 0x10]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
mov r9, r3
ldr r1, =gUnknown_085E51B4
adds r0, r1
@@ -3870,7 +3870,7 @@ _0817248C:
ands r0, r1
cmp r0, 0
bne _081724D0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -3969,7 +3969,7 @@ sub_8172560: @ 8172560
adds r0, r1
lsls r0, 3
str r0, [sp, 0x10]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
mov r8, r3
ldr r0, =gUnknown_085E51B4
adds r1, r0
@@ -4030,7 +4030,7 @@ _081725FE:
ands r0, r1
cmp r0, 0
bne _08172626
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -4156,7 +4156,7 @@ _08172708:
lsls r4, r6, 4
adds r4, r6
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r5, r4, r0
ldr r0, =gUnknown_085E51B4
add r0, r9
@@ -4216,7 +4216,7 @@ _08172790:
ands r0, r1
cmp r0, 0
bne _081727C4
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -4269,7 +4269,7 @@ sub_81727E8: @ 81727E8
adds r0, r1
lsls r0, 3
str r0, [sp, 0x10]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
mov r8, r3
ldr r0, =gUnknown_085E51B4
adds r1, r0
@@ -4327,7 +4327,7 @@ _08172880:
ands r0, r1
cmp r0, 0
bne _081728A8
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -4729,7 +4729,7 @@ sub_8172BF0: @ 8172BF0
lsrs r7, r0, 24
movs r0, 0
mov r8, r0
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
ldr r3, =gUnknown_02038436
ldrb r2, [r3]
adds r0, r2, r0
@@ -4764,11 +4764,11 @@ _08172C36:
adds r0, r4
strh r0, [r5, 0x8]
ldrb r0, [r3]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08172C78
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r3, r6, 4
adds r1, r3, r6
lsls r1, 2
@@ -4783,7 +4783,7 @@ _08172C36:
b _08172C90
.pool
_08172C78:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r4, r6, 4
adds r2, r4, r6
lsls r2, 2
@@ -4838,11 +4838,11 @@ _08172CDA:
adds r0, r2
strh r0, [r5, 0x8]
ldrb r0, [r3]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08172D10
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r3, r6, 4
adds r2, r3, r6
lsls r2, 2
@@ -4857,7 +4857,7 @@ _08172CDA:
b _08172D28
.pool
_08172D10:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r2, r6, 4
adds r1, r2, r6
lsls r1, 2
@@ -4879,12 +4879,12 @@ _08172D28:
strh r1, [r0, 0x8]
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
beq _08172D68
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r4, r6
lsls r1, 2
adds r1, r0
@@ -4897,7 +4897,7 @@ _08172D28:
b _08172D84
.pool
_08172D68:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r4, r6
lsls r1, 2
adds r1, r0
@@ -4951,7 +4951,7 @@ _08172DC0:
_08172DC6:
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
bl GetBankIdentity_permutated
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5009,12 +5009,12 @@ _08172E14:
strh r0, [r4, 0x26]
b _08172E84
_08172E4E:
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r4, =gUnknown_02038436
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -5265,7 +5265,7 @@ _08173074:
bl AddObjectToFront
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r2, r5, 4
adds r2, r5
lsls r2, 2
@@ -5283,7 +5283,7 @@ _081730A8:
bl AddObjectToFront
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r2, r5, 4
adds r2, r5
lsls r2, 2
@@ -5311,7 +5311,7 @@ _081730D6:
mov r9, r1
cmp r0, 0
bne _08173118
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r5, 4
adds r0, r2, r5
lsls r0, 2
@@ -5323,7 +5323,7 @@ _081730D6:
b _08173160
.pool
_08173118:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -5347,7 +5347,7 @@ _08173118:
cmp r0, 0
bne _08173160
mov r0, r8
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
movs r1, 0x3F
cmp r0, 0
@@ -5359,7 +5359,7 @@ _08173156:
movs r0, 0x66
bl audio_play_and_stuff
_08173160:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r4, r5
lsls r0, 2
adds r0, r1
@@ -5575,7 +5575,7 @@ sub_817330C: @ 817330C
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -5587,7 +5587,7 @@ sub_817330C: @ 817330C
adds r0, r1
strh r0, [r4, 0x32]
movs r0, 0x1
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -5601,8 +5601,8 @@ sub_817330C: @ 817330C
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
ldr r2, =gUnknown_02020630
ldr r1, =gUnknown_020241E4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
adds r0, r1
@@ -5626,8 +5626,8 @@ sub_817330C: @ 817330C
sub_817339C: @ 817339C
push {lr}
adds r3, r0, 0
ldr r2, =gUnknown_02020630
ldr r1, =gUnknown_020241E4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
adds r0, r1
@@ -5677,8 +5677,8 @@ _081733F6:
sub_8173400: @ 8173400
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gUnknown_02020630
ldr r3, =gUnknown_020241E4
ldr r5, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gUnknown_02038436
ldrb r0, [r2]
adds r0, r3
@@ -5732,7 +5732,7 @@ sub_817345C: @ 817345C
.pool
_08173478:
movs r0, 0
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
ldr r1, =gUnknown_02038436
strb r0, [r1]
movs r0, 0x1
@@ -5740,12 +5740,12 @@ _08173478:
.pool
_0817348C:
movs r0, 0x1
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
ldr r1, =gUnknown_02038436
strb r0, [r1]
movs r0, 0
_08173498:
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
ldr r1, =gUnknown_02038437
strb r0, [r1]
_081734A0:
asm/battle_message.s
+103 -103
View File
@@ -16,7 +16,7 @@ battle_pick_message: @ 814E0C4
lsrs r6, r0, 16
movs r7, 0
ldr r4, =gUnknown_0203ABA8
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
mov r8, r0
ldrb r1, [r0]
lsls r1, 9
@@ -26,13 +26,13 @@ battle_pick_message: @ 814E0C4
ldr r2, =gUnknown_02024208
ldrh r0, [r1, 0x4]
strh r0, [r2]
ldr r2, =gUnknown_0202420A
ldr r2, =gLastUsedAbility
ldrb r0, [r1, 0x6]
strb r0, [r2]
ldr r5, =gUnknown_02024474
ldr r5, =gBattleScripting
ldrb r0, [r1, 0x7]
strb r0, [r5, 0x17]
ldr r3, =gUnknown_0202449C
ldr r3, =gBattleStruct
ldr r0, [r3]
adds r0, 0x52
ldrb r1, [r1, 0x8]
@@ -53,7 +53,7 @@ battle_pick_message: @ 814E0C4
movs r2, 0
mov r12, r8
mov r9, r5
ldr r1, =gUnknown_02022F58
ldr r1, =gBattleTextBuff1
mov r10, r1
ldr r3, =gUnknown_0203ABA4
_0814E126:
@@ -67,10 +67,10 @@ _0814E126:
cmp r2, 0x3
ble _0814E126
movs r2, 0
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
mov r8, r0
ldr r3, =gUnknown_0203ABA8
ldr r5, =gUnknown_02022F68
ldr r5, =gBattleTextBuff2
ldr r4, =gUnknown_02022F78
_0814E144:
mov r0, r8
@@ -215,7 +215,7 @@ _0814E29E:
_0814E2AC:
mov r1, r12
ldrb r0, [r1]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814E310
@@ -317,11 +317,11 @@ _0814E380:
_0814E394:
mov r1, r12
ldrb r0, [r1]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814E3EC
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r0, 0xB1
ldrb r2, [r0]
@@ -385,11 +385,11 @@ _0814E428:
_0814E430:
mov r4, r9
ldrb r0, [r4, 0x17]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814E488
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r0, 0xB1
ldrb r2, [r0]
@@ -482,8 +482,8 @@ _0814E4F8:
lsls r0, 1
cmp r1, r0
bls _0814E534
ldr r0, =gUnknown_02022F68
ldr r1, =gUnknown_0202449C
ldr r0, =gBattleTextBuff2
ldr r1, =gBattleStruct
ldr r1, [r1]
adds r1, 0x8E
ldrb r2, [r1]
@@ -495,7 +495,7 @@ _0814E4F8:
b _0814E544
.pool
_0814E534:
ldr r0, =gUnknown_02022F68
ldr r0, =gBattleTextBuff2
ldrh r2, [r2]
movs r1, 0xD
muls r1, r2
@@ -503,13 +503,13 @@ _0814E534:
adds r1, r2
bl StringCopy
_0814E544:
ldr r0, =gUnknown_02022F68
ldr r0, =gBattleTextBuff2
bl sub_814F950
ldr r7, =gUnknown_085CBDAC
b _0814E6D8
.pool
_0814E55C:
ldr r4, =gUnknown_02022F58
ldr r4, =gBattleTextBuff1
ldrb r1, [r4]
movs r0, 0x80
ands r0, r1
@@ -520,7 +520,7 @@ _0814E55C:
strb r0, [r4]
mov r1, r12
ldrb r0, [r1]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -532,7 +532,7 @@ _0814E55C:
eors r0, r1
strb r0, [r4]
_0814E58A:
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -558,7 +558,7 @@ _0814E5B4:
_0814E5C4:
mov r1, r12
ldrb r0, [r1]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -576,7 +576,7 @@ _0814E5E0:
ands r0, r1
cmp r0, 0
beq _0814E638
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _0814E628
@@ -615,7 +615,7 @@ _0814E638:
lsls r0, 4
cmp r1, r0
bne _0814E680
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _0814E670
@@ -642,7 +642,7 @@ _0814E678:
b _0814E6D8
.pool
_0814E680:
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _0814E6A8
@@ -868,7 +868,7 @@ _0814E7CC:
.4byte _0814F5B4
.4byte _0814E8E4
_0814E8A0:
ldr r5, =gUnknown_02022F58
ldr r5, =gBattleTextBuff1
ldrb r0, [r5]
cmp r0, 0xFD
bne _0814E8B8
@@ -887,7 +887,7 @@ _0814E8C8:
adds r4, r5, 0
bl _0814F5C0
_0814E8CE:
ldr r1, =gUnknown_02022F68
ldr r1, =gBattleTextBuff2
ldrb r0, [r1]
cmp r0, 0xFD
bne _0814E904
@@ -924,8 +924,8 @@ _0814E920:
.pool
_0814E92C:
movs r0, 0
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202406E
bl GetBankByPlayerAI
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
adds r0, r1
@@ -943,8 +943,8 @@ _0814E92C:
.pool
_0814E960:
movs r0, 0x1
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202406E
bl GetBankByPlayerAI
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
adds r0, r1
@@ -962,8 +962,8 @@ _0814E960:
.pool
_0814E994:
movs r0, 0x2
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202406E
bl GetBankByPlayerAI
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
adds r0, r1
@@ -981,8 +981,8 @@ _0814E994:
.pool
_0814E9C8:
movs r0, 0x3
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202406E
bl GetBankByPlayerAI
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
adds r0, r1
@@ -999,7 +999,7 @@ _0814E9C8:
bl _0814F5BE
.pool
_0814E9FC:
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
ldr r1, =gUnknown_020229E8
lsls r0, r7, 3
subs r0, r7
@@ -1021,7 +1021,7 @@ _0814E9FC:
bl _0814F5BE
.pool
_0814EA38:
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
ldr r1, =gUnknown_020229E8
lsls r0, r7, 3
subs r0, r7
@@ -1045,7 +1045,7 @@ _0814EA38:
bl _0814F5BE
.pool
_0814EA78:
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
ldr r1, =gUnknown_020229E8
lsls r0, r7, 3
subs r0, r7
@@ -1069,7 +1069,7 @@ _0814EA78:
bl _0814F5BE
.pool
_0814EAB8:
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
ldr r1, =gUnknown_020229E8
lsls r0, r7, 3
subs r0, r7
@@ -1093,9 +1093,9 @@ _0814EAB8:
bl _0814F5BE
.pool
_0814EAF8:
ldr r4, =gUnknown_0202420B
ldr r4, =gBankAttacker
ldrb r0, [r4]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
adds r2, r4, 0
cmp r0, 0
@@ -1122,12 +1122,12 @@ _0814EB36:
cmp r0, 0xFF
bne _0814EB2C
ldrb r0, [r2]
bl battle_get_per_side_status
bl GetBankIdentity
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202406E
bl GetBankByPlayerAI
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
adds r0, r1
@@ -1143,12 +1143,12 @@ _0814EB36:
.pool
_0814EB74:
ldrb r0, [r2]
bl battle_get_per_side_status
bl GetBankIdentity
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202406E
bl GetBankByPlayerAI
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
adds r0, r1
@@ -1166,19 +1166,19 @@ _0814EB9E:
bl _0814F5BE
.pool
_0814EBB0:
ldr r4, =gUnknown_0202420B
ldr r4, =gBankAttacker
ldrb r0, [r4]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814EBF8
ldrb r0, [r4]
bl battle_get_per_side_status
bl GetBankIdentity
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202406E
bl GetBankByPlayerAI
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
adds r0, 0x4
@@ -1195,12 +1195,12 @@ _0814EBB0:
.pool
_0814EBF8:
ldrb r0, [r4]
bl battle_get_per_side_status
bl GetBankIdentity
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202406E
bl GetBankByPlayerAI
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
adds r0, 0x4
@@ -1219,9 +1219,9 @@ _0814EC24:
bl _0814F5BE
.pool
_0814EC38:
ldr r5, =gUnknown_0202420B
ldr r5, =gBankAttacker
ldrb r0, [r5]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0814ECA8
@@ -1236,7 +1236,7 @@ _0814EC38:
_0814EC56:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r3, =gBattlePartyID
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
@@ -1266,7 +1266,7 @@ _0814EC78:
b _0814ECC2
.pool
_0814ECA8:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldrb r0, [r5]
lsls r0, 1
adds r0, r1
@@ -1284,9 +1284,9 @@ _0814ECC2:
bl _0814F5BE
.pool
_0814ECD4:
ldr r5, =gEnemyMonIndex
ldr r5, =gBankTarget
ldrb r0, [r5]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0814ED44
@@ -1301,7 +1301,7 @@ _0814ECD4:
_0814ECF2:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r3, =gBattlePartyID
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
@@ -1331,7 +1331,7 @@ _0814ED14:
b _0814ED5E
.pool
_0814ED44:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldrb r0, [r5]
lsls r0, 1
adds r0, r1
@@ -1351,7 +1351,7 @@ _0814ED5E:
_0814ED70:
ldr r5, =gUnknown_0202420E
ldrb r0, [r5]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0814EDE0
@@ -1366,7 +1366,7 @@ _0814ED70:
_0814ED8E:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r3, =gBattlePartyID
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
@@ -1396,7 +1396,7 @@ _0814EDB0:
b _0814EDFA
.pool
_0814EDE0:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldrb r0, [r5]
lsls r0, 1
adds r0, r1
@@ -1414,9 +1414,9 @@ _0814EDFA:
bl _0814F5BE
.pool
_0814EE0C:
ldr r5, =gUnknown_02024064
ldr r5, =gActiveBank
ldrb r0, [r5]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0814EE7C
@@ -1431,7 +1431,7 @@ _0814EE0C:
_0814EE2A:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r3, =gBattlePartyID
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
@@ -1461,7 +1461,7 @@ _0814EE4C:
b _0814EE96
.pool
_0814EE7C:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldrb r0, [r5]
lsls r0, 1
adds r0, r1
@@ -1479,9 +1479,9 @@ _0814EE96:
b _0814F5BE
.pool
_0814EEA8:
ldr r5, =gUnknown_02024474
ldr r5, =gBattleScripting
ldrb r0, [r5, 0x17]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0814EF18
@@ -1496,7 +1496,7 @@ _0814EEA8:
_0814EEC6:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r3, =gBattlePartyID
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
@@ -1526,7 +1526,7 @@ _0814EEE8:
b _0814EF32
.pool
_0814EF18:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldrb r0, [r5, 0x17]
lsls r0, 1
adds r0, r1
@@ -1563,7 +1563,7 @@ _0814EF5C:
cmp r1, r0
bls _0814EF88
_0814EF6A:
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r0, 0x8E
ldrb r1, [r0]
@@ -1597,7 +1597,7 @@ _0814EF98:
ands r1, r0
cmp r1, 0
bne _0814F014
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x25
ldrb r0, [r0]
cmp r0, 0
@@ -1622,7 +1622,7 @@ _0814EFEC:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, =gUnknown_02024404
ldr r0, =gEnigmaBerries
adds r1, r0
mov r0, sp
bl StringCopy
@@ -1633,7 +1633,7 @@ _0814EFEC:
.pool
_0814F014:
ldr r2, =gUnknown_020229E8
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x25
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1648,7 +1648,7 @@ _0814F014:
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
ldr r0, =gUnknown_02024404
ldr r0, =gEnigmaBerries
adds r1, r0
mov r0, sp
bl StringCopy
@@ -1674,22 +1674,22 @@ _0814F06E:
b _0814F5BE
.pool
_0814F080:
ldr r0, =gUnknown_0202420A
ldr r0, =gLastUsedAbility
b _0814F0C0
.pool
_0814F088:
ldr r1, =gUnknown_0203ABA4
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
b _0814F0BC
.pool
_0814F098:
ldr r1, =gUnknown_0203ABA4
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
b _0814F0BC
.pool
_0814F0A8:
ldr r1, =gUnknown_0203ABA4
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
ldrb r0, [r0, 0x17]
b _0814F0BE
.pool
@@ -1783,7 +1783,7 @@ _0814F164:
cmp r0, 0
beq _0814F1AC
movs r2, 0
ldr r4, =gUnknown_020244A8
ldr r4, =gBattleResources
ldr r3, [r4]
_0814F178:
mov r1, sp
@@ -1910,7 +1910,7 @@ _0814F266:
b _0814F5C0
.pool
_0814F27C:
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
ldrb r0, [r0, 0x17]
bl sub_806D864
_0814F284:
@@ -1986,9 +1986,9 @@ _0814F328:
b _0814F580
.pool
_0814F330:
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
ldrb r0, [r0, 0x17]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0814F39C
@@ -2005,7 +2005,7 @@ _0814F34E:
adds r0, r1, 0
ldr r5, =gEnemyParty
mov r12, r5
ldr r2, =gUnknown_0202449C
ldr r2, =gBattleStruct
cmp r0, 0xFF
beq _0814F36E
_0814F35C:
@@ -2031,7 +2031,7 @@ _0814F36E:
b _0814F3B4
.pool
_0814F39C:
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r0, 0x52
ldrb r1, [r0]
@@ -2060,14 +2060,14 @@ _0814F3D4:
b _0814F5C0
.pool
_0814F3E4:
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
b _0814F3EE
.pool
_0814F3EC:
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
_0814F3EE:
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
ldr r4, =gUnknown_085CBD9A
cmp r0, 0
@@ -2078,14 +2078,14 @@ _0814F3FE:
b _0814F5C0
.pool
_0814F410:
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
b _0814F41A
.pool
_0814F418:
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
_0814F41A:
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
ldr r4, =gUnknown_085CBD91
cmp r0, 0
@@ -2096,14 +2096,14 @@ _0814F42A:
b _0814F5C0
.pool
_0814F43C:
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
b _0814F446
.pool
_0814F444:
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
_0814F446:
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
ldr r4, =gUnknown_085CBDA3
cmp r0, 0
@@ -2464,7 +2464,7 @@ _0814F734:
.pool
_0814F744:
ldrb r0, [r4, 0x1]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814F768
@@ -2533,7 +2533,7 @@ _0814F7D0:
_0814F7E2:
adds r4, r5, r7
ldrb r0, [r4, 0x1]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814F808
@@ -2599,7 +2599,7 @@ _0814F858:
cmp r2, 0xAF
bne _0814F8CC
ldr r2, =gUnknown_020229E8
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x25
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2614,7 +2614,7 @@ _0814F858:
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
ldr r0, =gUnknown_02024404
ldr r0, =gEnigmaBerries
adds r1, r0
adds r0, r6, 0
bl StringCopy
@@ -2784,7 +2784,7 @@ battle_show_message_maybe: @ 814F9EC
lsls r1, 24
lsrs r7, r1, 24
ldr r1, =gUnknown_085CD660
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x24
ldrb r0, [r0]
lsls r0, 2
@@ -2864,7 +2864,7 @@ _0814FA36:
ldrb r0, [r0, 0x6]
cmp r0, 0xFF
bne _0814FAC6
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x24
ldrb r0, [r0]
adds r1, r7, 0
@@ -2992,7 +2992,7 @@ _0814FB9C:
thumb_func_start sub_814FBAC
sub_814FBAC: @ 814FBAC
push {r4,r5,lr}
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
ldrb r2, [r0]
lsls r1, r2, 9
ldr r0, =gUnknown_02023068
asm/battle_records.s
+2 -2
View File
@@ -397,7 +397,7 @@ _0813C258:
sub_813C264: @ 813C264
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _0813C27C
@@ -445,7 +445,7 @@ sub_813C2A0: @ 813C2A0
subs r2, 0x30
adds r3, r2
ldrh r2, [r3, 0xE]
ldr r3, =gUnknown_0202433A
ldr r3, =gBattleOutcome
ldrb r3, [r3]
lsls r4, 24
lsrs r4, 24
asm/battle_setup.s
+4 -4
View File
@@ -565,7 +565,7 @@ sub_80B0AF8: @ 80B0AF8
movs r0, 0
movs r1, 0x80
bl ResetSpriteRange
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -610,7 +610,7 @@ sub_80B0B6C: @ 80B0B6C
movs r0, 0
movs r1, 0x80
bl ResetSpriteRange
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -2228,7 +2228,7 @@ sub_80B1918: @ 80B1918
lsls r0, 3
cmp r1, r0
beq _080B1946
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -2284,7 +2284,7 @@ sub_80B1994: @ 80B1994
b _080B19E2
.pool
_080B19B4:
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
asm/battle_transition.s
+6 -6
View File
@@ -2178,7 +2178,7 @@ sub_81470D0: @ 81470D0
bl AddObjectToBack
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
@@ -4313,7 +4313,7 @@ sub_8148218: @ 8148218
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r1
movs r2, 0x24
ldrsh r0, [r4, r2]
@@ -4569,7 +4569,7 @@ _0814847C:
thumb_func_start sub_8148484
sub_8148484: @ 8148484
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, 16
asrs r0, 16
lsls r2, r0, 4
@@ -4583,7 +4583,7 @@ sub_8148484: @ 8148484
thumb_func_start sub_814849C
sub_814849C: @ 814849C
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, 16
asrs r0, 16
lsls r1, r0, 4
@@ -4599,7 +4599,7 @@ sub_814849C: @ 814849C
thumb_func_start sub_81484B8
sub_81484B8: @ 81484B8
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, 16
asrs r0, 16
lsls r1, r0, 4
@@ -6742,7 +6742,7 @@ _0814963C:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r1, r0
movs r0, 0xF0
strh r0, [r2, 0x20]
asm/berry_blender.s
+13 -13
View File
@@ -501,7 +501,7 @@ _0807FBBE:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r1, r4, 0
adds r1, 0x8
@@ -718,7 +718,7 @@ sub_807FD90: @ 807FD90
mov r3, r8
lsls r3, 2
mov r8, r3
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
add r8, r0
ldr r5, =gUnknown_08339C78
lsls r4, r6, 2
@@ -1105,7 +1105,7 @@ _08080126:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r1, r5, 0
adds r1, 0x8
@@ -1919,7 +1919,7 @@ _080807E4:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
mov r1, r8
lsrs r4, r1, 24
@@ -2140,7 +2140,7 @@ _08080A0A:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r1, r4, 0
adds r1, 0x8
@@ -3130,7 +3130,7 @@ sub_8081288: @ 8081288
lsls r4, r1, 4
adds r4, r1
lsls r4, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r0, r4, r5
movs r1, 0x2
bl StartObjectImageAnim
@@ -3149,7 +3149,7 @@ _08081314:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
@@ -3164,7 +3164,7 @@ _0808133C:
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
@@ -3696,7 +3696,7 @@ _080817BA:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r1, r5, 0x4
lsls r1, 24
@@ -6423,9 +6423,9 @@ sub_8082E84: @ 8082E84
adds r0, r1, 0x1
cmp r0, 0
beq _08082F40
ldr r0, =gUnknown_08329F40
ldr r0, =gSineTable
mov r9, r0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r10, r2
adds r6, r1, 0x1
movs r3, 0x1F
@@ -7259,7 +7259,7 @@ _080834DE:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r6, 0x1
@@ -8074,7 +8074,7 @@ _08083B9A:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
adds r0, r6
movs r1, 0x3
bl StartObjectImageAnim
asm/berry_tag_screen.s
+5 -5
View File
@@ -830,7 +830,7 @@ sub_817836C: @ 817836C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
bl sub_80D510C
@@ -893,7 +893,7 @@ sub_8178404: @ 8178404
ldrb r0, [r5, 0x15]
cmp r0, 0
beq _08178448
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r4]
ldr r1, =0x00001803
adds r0, r1
@@ -910,7 +910,7 @@ sub_8178404: @ 8178404
b _08178462
.pool
_08178448:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r4]
ldr r1, =0x00001803
adds r0, r1
@@ -1080,7 +1080,7 @@ _08178598:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -1475,7 +1475,7 @@ _081788A6:
_081788B8:
ldrh r5, [r6]
_081788BA:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r3, =gUnknown_0203BCF4
ldr r0, [r3]
ldr r1, =0x00001802
asm/big_shroomish_barboach.s
+1 -1
View File
@@ -466,7 +466,7 @@ _080F9B6A:
ldrb r1, [r0]
adds r0, r4, 0
mov r2, r8
bl pokemon_setattr
bl SetMonData
movs r7, 0x1
_080F9B9C:
adds r5, 0x1
asm/cable_car.s
+7 -7
View File
@@ -1961,7 +1961,7 @@ _08150D86:
lsrs r6, r0, 24
cmp r6, 0x40
beq _08150DD0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -1990,7 +1990,7 @@ _08150DD0:
bl AddObjectToFront
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -2067,7 +2067,7 @@ _08150E68:
lsrs r6, r0, 24
cmp r6, 0x40
beq _08150ED4
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -2096,7 +2096,7 @@ _08150ED4:
bl AddObjectToFront
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -2138,7 +2138,7 @@ _08150ED4:
bl sub_80AB130
_08150F3A:
movs r4, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
_08150F3E:
lsls r1, r4, 20
movs r2, 0xC0
@@ -2200,7 +2200,7 @@ _08150F3E:
lsrs r6, r0, 24
cmp r6, 0x40
beq _08151074
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r6, 4
adds r0, r2, r6
lsls r0, 2
@@ -2265,7 +2265,7 @@ _08151056:
bl StartObjectImageAnim
strh r5, [r4, 0x30]
_0815105C:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r2, r8
adds r1, r2, r6
lsls r1, 2
asm/cable_club.s
+1 -1
View File
@@ -2176,7 +2176,7 @@ sub_80B360C: @ 80B360C
ldrb r0, [r0]
cmp r0, 0
beq _080B36B2
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _080B3670
asm/calculate_base_damage.s
+26 -26
View File
@@ -36,7 +36,7 @@ sub_806957C: @ 806957C
movs r5, 0
cmp r3, 0
bne _080695D4
ldr r2, =gUnknown_020244E0
ldr r2, =gBattleMovePower
ldr r1, =gBattleMoves
ldr r3, [sp, 0x8]
lsls r0, r3, 1
@@ -48,7 +48,7 @@ sub_806957C: @ 806957C
b _080695D8
.pool
_080695D4:
ldr r0, =gUnknown_020244E0
ldr r0, =gBattleMovePower
strh r3, [r0]
_080695D8:
cmp r7, 0
@@ -82,7 +82,7 @@ _08069602:
ldrh r0, [r6, 0x2E]
cmp r0, 0xAF
bne _08069634
ldr r1, =gUnknown_02024404
ldr r1, =gEnigmaBerries
ldr r2, [sp, 0x10]
lsls r0, r2, 3
subs r0, r2
@@ -95,12 +95,12 @@ _08069602:
.pool
_08069634:
ldrh r0, [r6, 0x2E]
bl itemid_get_x12
bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrh r0, [r6, 0x2E]
bl itemid_get_quality
bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r0, 24
_0806964A:
@@ -109,7 +109,7 @@ _0806964A:
ldrh r0, [r1, 0x2E]
cmp r0, 0xAF
bne _0806967E
ldr r1, =gUnknown_02024404
ldr r1, =gEnigmaBerries
ldr r2, [sp, 0x14]
lsls r0, r2, 3
subs r0, r2
@@ -131,13 +131,13 @@ _0806966C:
_0806967E:
ldr r3, [sp, 0x4]
ldrh r0, [r3, 0x2E]
bl itemid_get_x12
bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x20]
ldr r1, [sp, 0x4]
ldrh r0, [r1, 0x2E]
bl itemid_get_quality
bl ItemId_GetHoldEffectParam
_08069694:
adds r0, r6, 0
adds r0, 0x20
@@ -212,7 +212,7 @@ _08069708:
str r0, [sp, 0x1C]
_08069728:
movs r2, 0
ldr r4, =gUnknown_08329D74
ldr r4, =gHoldEffectToType
ldr r3, [sp, 0x4]
adds r3, 0x20
str r3, [sp, 0x2C]
@@ -405,7 +405,7 @@ _08069898:
movs r1, 0
movs r2, 0x3A
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _080698C6
@@ -429,7 +429,7 @@ _080698C6:
movs r1, 0
movs r2, 0x39
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _080698F8
@@ -483,11 +483,11 @@ _08069936:
movs r1, 0
movs r2, 0
movs r3, 0xFD
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _0806995A
ldr r1, =gUnknown_020244E0
ldr r1, =gBattleMovePower
ldrh r0, [r1]
lsrs r0, 1
strh r0, [r1]
@@ -501,11 +501,11 @@ _0806995A:
movs r1, 0
movs r2, 0
movs r3, 0xFE
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _0806997E
ldr r1, =gUnknown_020244E0
ldr r1, =gBattleMovePower
ldrh r0, [r1]
lsrs r0, 1
strh r0, [r1]
@@ -525,7 +525,7 @@ _0806997E:
lsrs r0, 16
cmp r1, r0
bhi _080699AE
ldr r4, =gUnknown_020244E0
ldr r4, =gBattleMovePower
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -548,7 +548,7 @@ _080699AE:
lsrs r0, 16
cmp r1, r0
bhi _080699DE
ldr r4, =gUnknown_020244E0
ldr r4, =gBattleMovePower
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -571,7 +571,7 @@ _080699DE:
lsrs r0, 16
cmp r1, r0
bhi _08069A0E
ldr r4, =gUnknown_020244E0
ldr r4, =gBattleMovePower
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -594,7 +594,7 @@ _08069A0E:
lsrs r0, 16
cmp r1, r0
bhi _08069A3E
ldr r4, =gUnknown_020244E0
ldr r4, =gBattleMovePower
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -603,7 +603,7 @@ _08069A0E:
strh r0, [r4]
_08069A3E:
ldr r2, =gBattleMoves
ldr r0, =gUnknown_020241EA
ldr r0, =gCurrentMove
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -653,7 +653,7 @@ _08069AA6:
bl __divsi3
adds r5, r0, 0
_08069ABE:
ldr r0, =gUnknown_020244E0
ldr r0, =gBattleMovePower
ldrh r0, [r0]
muls r5, r0
adds r0, r6, 0
@@ -821,7 +821,7 @@ _08069C02:
bl __divsi3
adds r5, r0, 0
_08069C1A:
ldr r0, =gUnknown_020244E0
ldr r0, =gBattleMovePower
ldrh r0, [r0]
muls r5, r0
adds r0, r6, 0
@@ -933,7 +933,7 @@ _08069CFC:
movs r1, 0
movs r2, 0xD
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -943,7 +943,7 @@ _08069CFC:
movs r1, 0
movs r2, 0x4D
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
bne _08069DAC
@@ -978,7 +978,7 @@ _08069D64:
ands r0, r1
cmp r0, 0
beq _08069D7C
ldr r0, =gUnknown_020241EA
ldr r0, =gCurrentMove
ldrh r0, [r0]
cmp r0, 0x4C
bne _08069D7C
@@ -1010,7 +1010,7 @@ _08069DA6:
adds r0, r5, r0
asrs r5, r0, 1
_08069DAC:
ldr r0, =gUnknown_020244A8
ldr r0, =gBattleResources
ldr r0, [r0]
ldr r0, [r0, 0x4]
ldr r7, [sp, 0x10]
asm/contest.s
+53 -53
View File
@@ -1048,7 +1048,7 @@ _080D8004:
bl sub_80DC594
bl sub_80DC5E8
bl sub_80DC7EC
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
strb r4, [r1]
movs r0, 0x1
strb r0, [r1, 0x1]
@@ -1058,12 +1058,12 @@ _080D8004:
strb r2, [r1, 0x3]
ldr r0, =gBattleTypeFlags
str r4, [r0]
ldr r4, =gUnknown_0202420B
ldr r4, =gBankAttacker
strb r2, [r4]
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
strb r3, [r0]
bl sub_80DB0C4
ldr r2, =gUnknown_020241E4
ldr r2, =gBankSpriteIds
ldrb r1, [r4]
adds r1, r2
strb r0, [r1]
@@ -2530,7 +2530,7 @@ _080D8DD0:
bl sub_80DB174
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
@@ -2547,8 +2547,8 @@ _080D8DD0:
lsls r4, 3
adds r4, r0
strh r5, [r4, 0xC]
ldr r1, =gUnknown_020241E4
ldr r0, =gUnknown_0202420B
ldr r1, =gBankSpriteIds
ldr r0, =gBankAttacker
ldrb r0, [r0]
adds r0, r1
strb r5, [r0]
@@ -2571,7 +2571,7 @@ _080D8E7C:
lsls r0, 3
adds r2, r0, r4
ldrb r5, [r2, 0xC]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
@@ -4573,7 +4573,7 @@ _080D9FC0:
lsls r2, 3
adds r2, r4
ldrb r5, [r2, 0xC]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
@@ -4592,7 +4592,7 @@ _080D9FEC:
lsls r0, 3
adds r4, r0, r4
ldrb r5, [r4, 0xC]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
@@ -6664,7 +6664,7 @@ sub_80DB0C4: @ 80DB0C4
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -6699,7 +6699,7 @@ sub_80DB120: @ 80DB120
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -6785,7 +6785,7 @@ _080DB1CC:
bl AddObjectToFront
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
lsls r0, r7, 4
adds r0, r7
@@ -6838,7 +6838,7 @@ _080DB280:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectRotScalAnim
@@ -9005,7 +9005,7 @@ _080DC350:
bge _080DC356
movs r5, 0
_080DC356:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r3, r7, 4
adds r0, r3, r7
lsls r0, 2
@@ -9144,7 +9144,7 @@ _080DC446:
sub_80DC44C: @ 80DC44C
push {r4-r6,lr}
movs r2, 0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r5, =gUnknown_02039F34
ldr r4, =gUnknown_08587A6C
ldr r3, =gUnknown_02039F26
@@ -9179,7 +9179,7 @@ sub_80DC490: @ 80DC490
lsrs r6, r0, 24
movs r3, 0
ldr r7, =gUnknown_02039F26
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r4, =gUnknown_02039F34
movs r2, 0
_080DC4A0:
@@ -9232,7 +9232,7 @@ sub_80DC4F0: @ 80DC4F0
bl LoadTaggedObjectPalette
movs r5, 0
ldr r7, =gUnknown_02039F34
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
movs r6, 0
_080DC506:
@@ -9305,7 +9305,7 @@ sub_80DC594: @ 80DC594
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -9902,7 +9902,7 @@ sub_80DC9EC: @ 80DC9EC
lsls r5, r0, 4
add r5, r8
lsls r5, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r1
ldrh r2, [r5, 0x4]
lsls r1, r2, 22
@@ -9968,7 +9968,7 @@ sub_80DC9EC: @ 80DC9EC
lsls r4, r3, 4
add r4, r9
lsls r4, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r1
ldrh r1, [r4, 0x4]
lsls r1, 22
@@ -10016,7 +10016,7 @@ sub_80DCB78: @ 80DCB78
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
@@ -10085,7 +10085,7 @@ sub_80DCBE8: @ 80DCBE8
bl sub_80DCBB4
ldr r0, =gUnknown_02039F34
ldr r1, [r0]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r8, r2
lsls r6, r4, 4
adds r6, r4
@@ -10153,7 +10153,7 @@ sub_80DCC84: @ 80DCC84
ldrh r1, [r0, 0x2E]
lsls r1, 24
lsrs r1, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -11528,7 +11528,7 @@ _080DD748:
.4byte _080DD8D4
.4byte _080DD8A0
_080DD76C:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11546,7 +11546,7 @@ _080DD76C:
b _080DD8F8
.pool
_080DD79C:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11566,7 +11566,7 @@ _080DD79C:
b _080DD8F8
.pool
_080DD7D0:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11586,7 +11586,7 @@ _080DD7D0:
b _080DD8F8
.pool
_080DD804:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11606,7 +11606,7 @@ _080DD804:
b _080DD8F8
.pool
_080DD838:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11626,7 +11626,7 @@ _080DD838:
b _080DD8F8
.pool
_080DD86C:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11646,7 +11646,7 @@ _080DD86C:
b _080DD8F8
.pool
_080DD8A0:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11666,7 +11666,7 @@ _080DD8A0:
b _080DD8F8
.pool
_080DD8D4:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11685,7 +11685,7 @@ _080DD8D4:
bl audio_play
_080DD8F8:
adds r2, r4, 0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r2, r5
lsls r2, 2
adds r1, r2, r4
@@ -11721,7 +11721,7 @@ sub_80DD940: @ 80DD940
push {r6,r7}
movs r5, 0
ldr r6, =gUnknown_02039F34
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r9, r0
ldr r0, =0x06010000
mov r8, r0
@@ -11938,7 +11938,7 @@ sub_80DDB0C: @ 80DDB0C
ldr r0, =sub_80DDB6C
movs r1, 0xA
bl CreateTask
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r4, =gUnknown_02039F34
ldr r2, [r4]
ldr r0, [r2]
@@ -11989,7 +11989,7 @@ sub_80DDB6C: @ 80DDB6C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r0, r1
ldr r0, =gTasks
lsls r1, r3, 2
@@ -12039,7 +12039,7 @@ _080DDBD4:
thumb_func_start sub_80DDBE8
sub_80DDBE8: @ 80DDBE8
push {r4,r5,lr}
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r4, =gUnknown_02039F34
ldr r0, [r4]
ldr r2, [r0]
@@ -12101,7 +12101,7 @@ task08_080CD1CC: @ 80DDC4C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r0, r1
ldr r0, =gTasks
lsls r2, r4, 2
@@ -12260,7 +12260,7 @@ _080DDD9C:
thumb_func_start sub_80DDDA8
sub_80DDDA8: @ 80DDDA8
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, =gUnknown_02039F34
ldr r2, [r0]
ldr r0, [r2]
@@ -12291,7 +12291,7 @@ sub_80DDDA8: @ 80DDDA8
thumb_func_start sub_80DDDE4
sub_80DDDE4: @ 80DDDE4
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0]
@@ -12565,7 +12565,7 @@ sub_80DE008: @ 80DE008
ldr r0, =gUnknown_02039F34
mov r9, r0
mov r8, r9
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r4, 0
movs r7, 0
_080DE026:
@@ -12909,7 +12909,7 @@ sub_80DE224: @ 80DE224
movs r0, 0x1
bl sub_80DED60
movs r5, 0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
movs r6, 0x4
_080DE2F0:
ldr r0, [r4]
@@ -13008,7 +13008,7 @@ sub_80DE350: @ 80DE350
strh r5, [r0]
ldr r0, =gUnknown_02022E1A
strh r5, [r0]
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
_080DE3CA:
ldr r0, [r6]
ldr r0, [r0, 0x14]
@@ -13355,7 +13355,7 @@ sub_80DE69C: @ 80DE69C
lsrs r0, 24
mov r8, r0
movs r7, 0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r5, =gUnknown_02039F34
_080DE6AE:
bl rotscale_alloc_entry
@@ -13470,7 +13470,7 @@ sub_80DE794: @ 80DE794
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r3, =gUnknown_02039F34
ldr r0, [r3]
ldr r0, [r0, 0x14]
@@ -13524,7 +13524,7 @@ _080DE7EE:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl obj_free_rotscale_entry
adds r4, 0x1
@@ -13796,16 +13796,16 @@ sub_80DEA20: @ 80DEA20
push {lr}
ldr r0, =DummyObjectCallback
bl CreateInvisibleSpriteWithCallback
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
strb r0, [r1, 0x3]
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl obj_alloc_rotscale_entry
bl sub_80DEA5C
@@ -13817,12 +13817,12 @@ sub_80DEA20: @ 80DEA20
thumb_func_start sub_80DEA5C
sub_80DEA5C: @ 80DEA5C
push {r4,lr}
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
ldrb r0, [r0, 0x3]
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
movs r0, 0
strh r0, [r4, 0x24]
@@ -13905,12 +13905,12 @@ _080DEAD0:
.4byte _080DEB60
.4byte _080DEB60
_080DEB54:
ldr r1, =gEnemyMonIndex
ldr r1, =gBankTarget
movs r0, 0x2
b _080DEB64
.pool
_080DEB60:
ldr r1, =gEnemyMonIndex
ldr r1, =gBankTarget
movs r0, 0x3
_080DEB64:
strb r0, [r1]
asm/contest_link_80F57C4.s
+17 -17
View File
@@ -1431,7 +1431,7 @@ _080F64F2:
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -1532,7 +1532,7 @@ _080F65F0:
bne _080F669C
movs r0, 0
strh r0, [r3, 0xA]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203A034
ldr r0, [r0]
ldr r0, [r0]
@@ -2129,7 +2129,7 @@ sub_80F6AE8: @ 80F6AE8
movs r0, 0x8
movs r1, 0x8
bl sub_800DFB4
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r0, =gUnknown_02022B10
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2247,7 +2247,7 @@ _080F6BD0:
lsls r1, r7, 4
adds r1, r7
lsls r1, 2
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
adds r1, r3
ldrh r0, [r1, 0x4]
lsls r0, 22
@@ -2488,7 +2488,7 @@ _080F6DEE:
adds r4, 0x1
cmp r4, 0x7
ble _080F6DEE
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r5]
lsls r0, r1, 4
adds r0, r1
@@ -2565,7 +2565,7 @@ sub_80F6E9C: @ 80F6E9C
lsls r4, r5, 4
adds r4, r5
lsls r4, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r4, r5
movs r6, 0
movs r5, 0x88
@@ -2605,7 +2605,7 @@ sub_80F6EF4: @ 80F6EF4
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r1, r2
ldrh r2, [r1, 0x24]
ldrh r3, [r1, 0x20]
@@ -2677,7 +2677,7 @@ sub_80F6F68: @ 80F6F68
strh r2, [r3, 0x20]
_080F6F92:
movs r4, 0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r5, 0x40
adds r2, r3, 0
adds r2, 0x2E
@@ -2758,7 +2758,7 @@ sub_80F7014: @ 80F7014
ands r2, r0
strh r2, [r3, 0x3C]
movs r4, 0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r5, 0x40
adds r2, r3, 0
adds r2, 0x2E
@@ -2813,7 +2813,7 @@ sub_80F707C: @ 80F707C
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
adds r4, r1, r3
adds r0, 0x20
strh r0, [r4, 0x20]
@@ -2900,7 +2900,7 @@ sub_80F7144: @ 80F7144
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
adds r2, r3
movs r0, 0x3E
adds r0, r2
@@ -3582,7 +3582,7 @@ sub_80F7670: @ 80F7670
lsls r4, 24
lsrs r4, 24
bl Random
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r5, r4, 4
adds r5, r4
lsls r5, 2
@@ -4781,7 +4781,7 @@ _080F8074:
adds r0, r4
movs r1, 0x32
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
@@ -4830,7 +4830,7 @@ _080F80E2:
adds r0, r5
movs r1, 0x33
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r7]
muls r0, r6
adds r0, r5
@@ -4879,7 +4879,7 @@ _080F814E:
adds r0, r5
movs r1, 0x34
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r7]
muls r0, r6
adds r0, r5
@@ -4922,7 +4922,7 @@ _080F8190:
adds r0, r5
movs r1, 0x35
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r7]
muls r0, r6
adds r0, r5
@@ -4965,7 +4965,7 @@ _080F81F8:
adds r0, r5
movs r1, 0x36
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r7]
muls r0, r6
adds r0, r5
asm/credits.s
+17 -17
View File
@@ -1516,7 +1516,7 @@ _08176158:
bge _081761D8
adds r0, r3, 0x1
strh r0, [r1]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -1527,7 +1527,7 @@ _08176158:
_081761D8:
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -1702,7 +1702,7 @@ _08176390:
b _08176514
.pool
_0817639C:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -1732,7 +1732,7 @@ _081763C0:
strh r0, [r1, 0x12]
b _0817644E
_081763D8:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r2, r5, 2
adds r2, r5
lsls r2, 3
@@ -1803,7 +1803,7 @@ _0817644E:
b _08176514
.pool
_08176464:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r3, 0xC
ldrsh r1, [r4, r3]
lsls r0, r1, 4
@@ -1825,7 +1825,7 @@ _08176484:
movs r1, 0x32
b _08176512
_08176490:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -1840,7 +1840,7 @@ _08176490:
b _081764C8
.pool
_081764B0:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -1859,7 +1859,7 @@ _081764C8:
b _08176514
.pool
_081764D4:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r2, r5, 2
adds r2, r5
lsls r2, 3
@@ -2077,7 +2077,7 @@ _08176670:
.4byte _08176884
.4byte _08176934
_08176684:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, =gTasks
lsls r4, r7, 2
adds r4, r7
@@ -2159,7 +2159,7 @@ _08176684:
b _081769D4
.pool
_0817672C:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, =gTasks
lsls r4, r7, 2
adds r4, r7
@@ -2242,7 +2242,7 @@ _0817672C:
b _081769D4
.pool
_081767D8:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, =gTasks
lsls r4, r7, 2
adds r4, r7
@@ -2326,7 +2326,7 @@ _081767D8:
b _081769D4
.pool
_08176884:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, =gTasks
lsls r4, r7, 2
adds r4, r7
@@ -2409,7 +2409,7 @@ _08176884:
b _081769D4
.pool
_08176934:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, =gTasks
lsls r4, r7, 2
adds r4, r7
@@ -2687,7 +2687,7 @@ _08176B54:
lsls r4, 3
adds r4, r0
strh r2, [r4, 0x12]
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -2726,7 +2726,7 @@ _08176BD8:
lsls r4, 3
adds r4, r0
strh r2, [r4, 0x12]
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -3505,7 +3505,7 @@ sub_8177224: @ 8177224
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -3562,7 +3562,7 @@ sub_8177224: @ 8177224
sub_81772B8: @ 81772B8
push {r4,lr}
adds r3, r0, 0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r1, 0x2E
ldrsh r0, [r3, r1]
lsls r1, r0, 4
asm/daycare.s
+19 -19
View File
@@ -401,7 +401,7 @@ sub_806FCF8: @ 806FCF8
add r2, sp, 0x64
mov r0, sp
movs r1, 0x19
bl pokemon_setattr
bl SetMonData
mov r0, sp
bl sub_806FCA4
_0806FD46:
@@ -498,7 +498,7 @@ sub_806FDEC: @ 806FDEC
add r2, sp, 0x50
mov r0, sp
movs r1, 0x19
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
mov r0, sp
bl sub_80690C0
lsls r0, 24
@@ -1150,7 +1150,7 @@ _08070304:
strb r0, [r2]
mov r0, r9
movs r1, 0x27
bl pokemon_setattr
bl SetMonData
b _080703AE
_08070322:
add r4, sp, 0x10
@@ -1205,7 +1205,7 @@ _08070370:
movs r1, 0x2B
_08070388:
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
b _080703AE
_08070390:
add r4, sp, 0x10
@@ -1220,7 +1220,7 @@ _08070390:
mov r0, r9
movs r1, 0x2C
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
_080703AE:
adds r0, r5, 0x1
lsls r0, 24
@@ -1919,7 +1919,7 @@ _08070918:
strb r0, [r2]
mov r0, sp
movs r1, 0x2D
bl pokemon_setattr
bl SetMonData
ldr r0, =gPlayerParty
movs r1, 0xFA
lsls r1, 1
@@ -1977,11 +1977,11 @@ sub_8070954: @ 8070954
adds r0, r7, 0
movs r1, 0x26
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
ldr r2, =gEggName
adds r0, r7, 0
movs r1, 0x2
bl pokemon_setattr
bl SetMonData
lsls r2, r5, 3
subs r2, r5
lsls r2, 2
@@ -1989,15 +1989,15 @@ sub_8070954: @ 8070954
adds r2, r0
adds r0, r7, 0
movs r1, 0x20
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x24
mov r2, r8
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x3
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
cmp r6, 0
beq _080709E6
add r2, sp, 0x14
@@ -2005,7 +2005,7 @@ sub_8070954: @ 8070954
strb r0, [r2]
adds r0, r7, 0
movs r1, 0x23
bl pokemon_setattr
bl SetMonData
_080709E6:
mov r2, sp
adds r2, 0x15
@@ -2013,7 +2013,7 @@ _080709E6:
strb r0, [r2]
adds r0, r7, 0
movs r1, 0x2D
bl pokemon_setattr
bl SetMonData
add sp, 0x18
pop {r3,r4}
mov r8, r3
@@ -2065,11 +2065,11 @@ sub_8070A0C: @ 8070A0C
adds r0, r6, 0
movs r1, 0x26
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
ldr r2, =gEggName
adds r0, r6, 0
movs r1, 0x2
bl pokemon_setattr
bl SetMonData
lsls r2, r5, 3
subs r2, r5
lsls r2, 2
@@ -2077,15 +2077,15 @@ sub_8070A0C: @ 8070A0C
adds r2, r0
adds r0, r6, 0
movs r1, 0x20
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
movs r1, 0x24
mov r2, r9
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
movs r1, 0x3
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
add sp, 0x14
pop {r3,r4}
mov r8, r3
@@ -2214,7 +2214,7 @@ _08070B9A:
adds r0, r4, 0
movs r1, 0x20
mov r2, sp
bl pokemon_setattr
bl SetMonData
b _08070BB4
_08070BA8:
ldr r0, =gUnknown_020375E0
asm/decoration.s
+18 -18
View File
@@ -2802,7 +2802,7 @@ ConfigureCameraObjectForPlacingDecoration: @ 8128118
lsls r1, 24
lsrs r1, 24
ldr r3, =gUnknown_0203AA38
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r5, =gUnknown_03005DD0
ldr r2, [r5, 0x4]
lsls r0, r2, 4
@@ -2918,7 +2918,7 @@ _08128214:
bl AddPseudoFieldObject
ldr r1, =gUnknown_0203AA39
strb r0, [r1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, =gUnknown_0203AA39
ldrb r1, [r0]
lsls r0, r1, 4
@@ -3113,7 +3113,7 @@ sub_81283BC: @ 81283BC
adds r0, r1
movs r1, 0
strh r1, [r0, 0x1C]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, =gUnknown_0203AA38
ldrb r1, [r0]
lsls r0, r1, 4
@@ -3151,7 +3151,7 @@ sub_8128414: @ 8128414
adds r0, r1
movs r1, 0
strh r1, [r0, 0x1C]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, =gUnknown_0203AA38
ldrb r1, [r0]
lsls r0, r1, 4
@@ -3928,7 +3928,7 @@ _08128A44:
ldr r0, =gUnknown_08275D1F
bl script_env_1_execute_new_script
_08128A64:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AA38
ldrb r1, [r0]
lsls r0, r1, 4
@@ -4367,7 +4367,7 @@ sub_8128DE0: @ 8128DE0
ldr r1, =gUnknown_0203AA3A
movs r0, 0
strb r0, [r1]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r3, =gUnknown_0203AA38
ldrb r1, [r3]
lsls r0, r1, 4
@@ -4401,7 +4401,7 @@ sub_8128E18: @ 8128E18
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r3, =gUnknown_0203AA38
ldrb r1, [r3]
lsls r0, r1, 4
@@ -4558,7 +4558,7 @@ _08128F66:
ldrb r0, [r0]
cmp r0, 0
beq _08128F94
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_0203AA38
ldrb r1, [r2]
lsls r0, r1, 4
@@ -4616,7 +4616,7 @@ sub_8128FD8: @ 8128FD8
movs r0, 0
movs r1, 0x1
bl sub_8197434
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AA38
ldrb r1, [r0]
lsls r0, r1, 4
@@ -5390,7 +5390,7 @@ AddDecorationIconObject: @ 81295CC
lsrs r4, r0, 24
cmp r4, 0x40
beq _08129696
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r3, r4, 4
adds r1, r3, r4
lsls r1, 2
@@ -5418,7 +5418,7 @@ _08129634:
lsrs r4, r0, 24
cmp r4, 0x40
beq _08129696
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r4, 4
adds r0, r2, r4
lsls r0, 2
@@ -5453,7 +5453,7 @@ _08129696:
movs r0, 0x40
b _081296D8
_0812969A:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r3, r4, 4
adds r1, r3, r4
lsls r1, 2
@@ -5867,7 +5867,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 81299DC
sub sp, 0x4
bl player_get_direction_lower_nybble
ldr r3, =gUnknown_0203AA38
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r4, =gUnknown_03005DD0
ldr r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5906,7 +5906,7 @@ _08129A44:
bl AddPseudoFieldObject
ldr r1, =gUnknown_0203AA39
strb r0, [r1]
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r0, =gUnknown_0203AA39
ldrb r0, [r0]
lsls r1, r0, 4
@@ -6021,7 +6021,7 @@ sub_8129B34: @ 8129B34
movs r0, 0
movs r1, 0x1
bl sub_8197434
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r3, =gUnknown_0203AA38
ldrb r1, [r3]
lsls r0, r1, 4
@@ -6115,7 +6115,7 @@ sub_8129BF8: @ 8129BF8
movs r1, 0
strh r1, [r0, 0x1C]
bl sub_8128DE0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r5, =gUnknown_0203AA38
ldrb r1, [r5]
lsls r0, r1, 4
@@ -6194,7 +6194,7 @@ _08129CA8:
cmp r0, 0x1
bne _08129D3C
_08129CDE:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r4, =gUnknown_0203AA38
ldrb r1, [r4]
lsls r0, r1, 4
@@ -6350,7 +6350,7 @@ sub_8129E0C: @ 8129E0C
push {r4-r6,lr}
lsls r0, 24
lsls r1, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r6, =gUnknown_0203AA38
ldrb r3, [r6]
lsls r2, r3, 4
asm/easy_chat.s
+10 -10
View File
@@ -7766,7 +7766,7 @@ sub_811DEC4: @ 811DEC4
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
movs r0, 0x1
@@ -7888,7 +7888,7 @@ sub_811DFC8: @ 811DFC8
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r1, r4
str r1, [r2]
movs r0, 0x20
@@ -8228,7 +8228,7 @@ sub_811E288: @ 811E288
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
ldr r0, =sub_811E2DC
@@ -8379,7 +8379,7 @@ sub_811E3AC: @ 811E3AC
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r1, r4
str r1, [r2]
movs r6, 0
@@ -8665,7 +8665,7 @@ sub_811E5D4: @ 811E5D4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
_0811E602:
@@ -8686,7 +8686,7 @@ _0811E602:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
adds r0, 0x3F
@@ -8836,7 +8836,7 @@ sub_811E720: @ 811E720
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
_0811E74E:
@@ -8857,7 +8857,7 @@ _0811E74E:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
movs r1, 0x1
@@ -8993,7 +8993,7 @@ _0811E852:
lsrs r2, r0, 24
cmp r2, 0x40
beq _0811E892
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -9024,7 +9024,7 @@ _0811E8A0:
lsrs r2, r0, 24
cmp r2, 0x40
beq _0811E8D0
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
asm/egg_hatch.s
+22 -22
View File
@@ -114,7 +114,7 @@ _0807141E:
adds r2, r0
adds r2, 0x10
adds r0, r6, 0
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -127,7 +127,7 @@ _0807143C:
lsls r2, r4, 2
adds r2, r7, r2
adds r0, r6, 0
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -139,30 +139,30 @@ _0807143C:
adds r0, r6, 0
movs r1, 0x3
mov r2, r8
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
movs r1, 0x25
mov r2, r10
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
movs r1, 0x8
ldr r2, [sp, 0x40]
bl pokemon_setattr
bl SetMonData
movs r0, 0x78
ldr r1, [sp, 0x44]
strb r0, [r1]
adds r0, r6, 0
movs r1, 0x20
ldr r2, [sp, 0x44]
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
movs r1, 0x22
ldr r2, [sp, 0x4C]
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
movs r1, 0x50
ldr r2, [sp, 0x48]
bl pokemon_setattr
bl SetMonData
adds r0, r5, 0
adds r1, r6, 0
movs r2, 0x64
@@ -197,7 +197,7 @@ sub_80714B8: @ 80714B8
adds r0, r5, 0
movs r1, 0x2D
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
adds r0, r5, 0
movs r1, 0xB
bl GetMonData
@@ -210,7 +210,7 @@ sub_80714B8: @ 80714B8
adds r0, r5, 0
movs r1, 0x2
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
adds r4, r0, 0
@@ -231,20 +231,20 @@ sub_80714B8: @ 80714B8
strh r0, [r2]
adds r0, r5, 0
movs r1, 0x26
bl pokemon_setattr
bl SetMonData
add r2, sp, 0x10
movs r0, 0
strh r0, [r2]
adds r0, r5, 0
movs r1, 0x24
bl pokemon_setattr
bl SetMonData
bl sav1_map_get_name
mov r2, sp
adds r2, 0x12
strb r0, [r2]
adds r0, r5, 0
movs r1, 0x23
bl pokemon_setattr
bl SetMonData
adds r0, r5, 0
bl sub_806E924
adds r0, r5, 0
@@ -430,7 +430,7 @@ _080716D8:
bl AddObjectToFront
lsls r0, 24
lsrs r7, r0, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r1, r7, 4
adds r1, r7
lsls r1, 2
@@ -736,7 +736,7 @@ sub_80719FC: @ 80719FC
adds r0, r1
ldr r2, =gStringVar3
movs r1, 0x2
bl pokemon_setattr
bl SetMonData
bl sub_805F094
ldr r0, =gUnknown_03000DE0
ldr r0, [r0]
@@ -891,7 +891,7 @@ _08071B7A:
ldrb r0, [r1, 0x2]
adds r0, 0x1
strb r0, [r1, 0x2]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r5]
ldrb r1, [r0]
lsls r0, r1, 4
@@ -904,7 +904,7 @@ _08071B7A:
b _08071E06
.pool
_08071BA0:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r5]
ldrb r1, [r2]
lsls r0, r1, 4
@@ -942,7 +942,7 @@ _08071BBC:
b _08071DC8
.pool
_08071BF8:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r3, [r5]
ldrb r1, [r3, 0x1]
lsls r0, r1, 4
@@ -1305,7 +1305,7 @@ sub_8071EF0: @ 8071EF0
adds r0, r1
movs r1, 0xB
bl GetMonData
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, [r4]
ldrb r1, [r2, 0x1]
lsls r0, r1, 4
@@ -1449,7 +1449,7 @@ sub_8072048: @ 8072048
ldrsh r0, [r5, r1]
cmp r0, 0
bne _08072084
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r3, =gUnknown_03000DE0
ldr r0, [r3]
ldrb r1, [r0, 0x1]
@@ -1489,7 +1489,7 @@ _0807209E:
ldrsh r0, [r5, r1]
cmp r0, 0x9
bgt _080720BC
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_03000DE0
ldr r0, [r0]
ldrb r1, [r0, 0x1]
@@ -1650,7 +1650,7 @@ sub_8072194: @ 8072194
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
asm/evolution_graphics.s
+7 -7
View File
@@ -155,7 +155,7 @@ sub_817BB38: @ 817BB38
lsrs r0, 24
cmp r0, 0x40
beq _0817BB82
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
@@ -259,7 +259,7 @@ sub_817BC08: @ 817BC08
lsrs r0, 24
cmp r0, 0x40
beq _0817BC5E
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
@@ -351,7 +351,7 @@ sub_817BCB8: @ 817BCB8
lsrs r0, 24
cmp r0, 0x40
beq _0817BD0E
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
@@ -513,7 +513,7 @@ sub_817BDF0: @ 817BDF0
cmp r4, 0x40
beq _0817BE60
bl Random
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r5, r4, 4
adds r5, r4
lsls r5, 2
@@ -1273,7 +1273,7 @@ _0817C3BA:
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r9, r1
lsls r2, r5, 4
adds r2, r5
@@ -1579,7 +1579,7 @@ sub_817C67C: @ 817C67C
push {r6}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r8, r1
ldr r1, =gTasks
lsls r4, r0, 2
@@ -1667,7 +1667,7 @@ sub_817C72C: @ 817C72C
push {r6}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r8, r1
ldr r1, =gTasks
lsls r4, r0, 2
asm/evolution_scene.s
+49 -49
View File
@@ -265,7 +265,7 @@ evolution_cutscene: @ 813DA8C
lsls r1, r0, 24
lsrs r3, r1, 24
strb r0, [r2]
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
lsls r1, r3, 4
adds r1, r3
lsls r1, 2
@@ -521,7 +521,7 @@ sub_813DD7C: @ 813DD7C
lsls r2, r0, 24
lsrs r2, 24
strb r0, [r1, 0x1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -729,7 +729,7 @@ _0813E0F0:
lsls r2, r0, 24
lsrs r2, 24
strb r0, [r1, 0x1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -896,7 +896,7 @@ sub_813E1D4: @ 813E1D4
lsls r1, r0, 24
lsrs r6, r1, 24
strb r0, [r2, 0x1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -1052,7 +1052,7 @@ _0813E416:
adds r2, r1, r7
adds r2, 0xC
movs r1, 0xB
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
@@ -1063,25 +1063,25 @@ _0813E416:
ldr r1, =gSpeciesNames
adds r2, r1
movs r1, 0x2
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0x8
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0xA
mov r2, sp
bl pokemon_setattr
bl SetMonData
movs r4, 0x32
ldr r0, [sp, 0x8]
mov r8, r0
@@ -1094,7 +1094,7 @@ _0813E484:
adds r0, r1
adds r1, r4, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r4, 0x1
cmp r4, 0x36
ble _0813E484
@@ -1108,7 +1108,7 @@ _0813E4A0:
adds r0, r5
adds r1, r4, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r4, 0x1
cmp r4, 0x4F
ble _0813E4A0
@@ -1118,7 +1118,7 @@ _0813E4A0:
adds r0, r5
movs r1, 0x37
mov r2, sp
bl pokemon_setattr
bl SetMonData
movs r0, 0xFF
str r0, [sp]
ldrb r0, [r4]
@@ -1126,7 +1126,7 @@ _0813E4A0:
adds r0, r5
movs r1, 0x40
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r4]
muls r0, r6
adds r0, r5
@@ -1170,7 +1170,7 @@ _0813E4A0:
ldr r2, =gUnknown_085B58C4
mov r0, r9
movs r1, 0x2
bl pokemon_setattr
bl SetMonData
_0813E546:
add sp, 0xC
pop {r3-r5}
@@ -1214,7 +1214,7 @@ evovle_mon_maybe: @ 813E570
ldrsh r0, [r3, r1]
cmp r0, 0x8
bne _0813E5F0
ldr r4, =gUnknown_02024332
ldr r4, =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -1291,7 +1291,7 @@ _0813E670:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB80
ldr r0, [r0]
ldrb r1, [r0]
@@ -1422,7 +1422,7 @@ _0813E7C0:
bl sub_8140000
movs r0, 0x11
bl sub_817BE94
ldr r1, =gUnknown_02024332
ldr r1, =gBattleCommunication
strb r0, [r1, 0x2]
ldr r0, =gTasks
mov r2, r8
@@ -1432,7 +1432,7 @@ _0813E7C0:
b _0813EC52
.pool
_0813E7E8:
ldr r4, =gUnknown_02024332
ldr r4, =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -1459,7 +1459,7 @@ _0813E7FE:
bl _0813F1A4
.pool
_0813E828:
ldr r4, =gUnknown_02024332
ldr r4, =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -1496,7 +1496,7 @@ _0813E874:
ldr r1, [r2]
movs r0, 0x3
strb r0, [r1, 0x3]
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -1515,7 +1515,7 @@ _0813E890:
.pool
_0813E8A4:
bl sub_817C068
ldr r1, =gUnknown_02024332
ldr r1, =gBattleCommunication
strb r0, [r1, 0x2]
ldr r0, =gTasks
mov r3, r8
@@ -1525,7 +1525,7 @@ _0813E8A4:
b _0813EC52
.pool
_0813E8C0:
ldr r6, =gUnknown_02024332
ldr r6, =gBattleCommunication
ldrb r0, [r6, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -1546,7 +1546,7 @@ _0813E8D6:
b _0813EB96
.pool
_0813E8EC:
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -1641,7 +1641,7 @@ _0813E99E:
adds r2, 0xC
mov r0, r9
movs r1, 0xB
bl pokemon_setattr
bl SetMonData
mov r0, r9
bl pokemon_calc_effective_stats
ldrh r1, [r4, 0xA]
@@ -1706,7 +1706,7 @@ _0813EA5E:
movs r1, 0x2
add r2, sp, 0x4
bl GetMonData
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
add r1, sp, 0x4
bl StringCopy10
ldr r0, =0x0000ffff
@@ -1787,7 +1787,7 @@ _0813EB06:
b _0813F1A4
.pool
_0813EB34:
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -2097,7 +2097,7 @@ _0813EDEA:
adds r0, 0x1
movs r2, 0
strh r0, [r1, 0x14]
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
strb r2, [r0, 0x1]
movs r0, 0
bl sub_8056B74
@@ -2110,7 +2110,7 @@ _0813EE34:
ands r0, r1
cmp r0, 0
beq _0813EE5C
ldr r4, =gUnknown_02024332
ldr r4, =gBattleCommunication
ldrb r0, [r4, 0x1]
cmp r0, 0
beq _0813EE5C
@@ -2128,7 +2128,7 @@ _0813EE5C:
ands r0, r1
cmp r0, 0
beq _0813EE84
ldr r4, =gUnknown_02024332
ldr r4, =gBattleCommunication
ldrb r0, [r4, 0x1]
cmp r0, 0
bne _0813EE84
@@ -2155,7 +2155,7 @@ _0813EE84:
bl sub_8056A3C
movs r0, 0x5
bl audio_play
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
ldrb r2, [r0, 0x1]
cmp r2, 0
beq _0813EECC
@@ -2303,7 +2303,7 @@ _0813EFC8:
b _0813F1A4
.pool
_0813F014:
ldr r1, =gUnknown_02022F68
ldr r1, =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -2618,7 +2618,7 @@ _0813F314:
_0813F324:
movs r0, 0x1
bl sub_8140000
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB80
ldr r0, [r0]
ldrb r1, [r0]
@@ -2632,7 +2632,7 @@ _0813F324:
adds r6, 0x10
adds r0, r6, 0
bl sub_817BE94
ldr r1, =gUnknown_02024332
ldr r1, =gBattleCommunication
strb r0, [r1, 0x2]
ldr r1, =gTasks
lsls r0, r7, 2
@@ -2648,7 +2648,7 @@ _0813F324:
bl _0813FCC4
.pool
_0813F380:
ldr r4, =gUnknown_02024332
ldr r4, =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -2675,7 +2675,7 @@ _0813F396:
bl _0813FCC4
.pool
_0813F3C0:
ldr r4, =gUnknown_02024332
ldr r4, =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -2708,7 +2708,7 @@ _0813F404:
ldr r1, [r2]
movs r0, 0x3
strb r0, [r1, 0x3]
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -2723,7 +2723,7 @@ _0813F420:
.pool
_0813F42C:
bl sub_817C068
ldr r1, =gUnknown_02024332
ldr r1, =gBattleCommunication
strb r0, [r1, 0x2]
ldr r1, =gTasks
lsls r0, r7, 2
@@ -2733,7 +2733,7 @@ _0813F42C:
b _0813F6B4
.pool
_0813F448:
ldr r6, =gUnknown_02024332
ldr r6, =gBattleCommunication
ldrb r0, [r6, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -2754,7 +2754,7 @@ _0813F45E:
b _0813F6F2
.pool
_0813F474:
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -2825,7 +2825,7 @@ _0813F4F2:
adds r2, 0xC
mov r0, r9
movs r1, 0xB
bl pokemon_setattr
bl SetMonData
mov r0, r9
bl pokemon_calc_effective_stats
ldrh r1, [r4, 0xA]
@@ -2890,7 +2890,7 @@ _0813F58C:
movs r1, 0x2
add r2, sp, 0x4
bl GetMonData
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
add r1, sp, 0x4
bl StringCopy10
ldr r0, =0x0000ffff
@@ -2951,7 +2951,7 @@ _0813F634:
b _0813FCC4
.pool
_0813F668:
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -2963,7 +2963,7 @@ _0813F668:
b _0813FCC4
_0813F67C:
bl m4aMPlayAllStop
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB80
ldr r0, [r0]
ldrb r1, [r0]
@@ -3260,7 +3260,7 @@ _0813F928:
movs r2, 0xE
movs r3, 0
bl CreateYesNoMenu
ldr r3, =gUnknown_02024332
ldr r3, =gBattleCommunication
strb r4, [r3, 0x1]
ldr r0, =gTasks
mov r2, r8
@@ -3292,7 +3292,7 @@ _0813F986:
beq _0813F9E4
b _0813FCC4
_0813F98C:
ldr r0, =gUnknown_02024332
ldr r0, =gBattleCommunication
strb r6, [r0, 0x1]
ldr r0, =gUnknown_085CC270
movs r1, 0x92
@@ -3328,7 +3328,7 @@ _0813F9C8:
b _0813FCC4
.pool
_0813F9E4:
ldr r1, =gUnknown_02024332
ldr r1, =gBattleCommunication
movs r0, 0x1
strb r0, [r1, 0x1]
ldr r0, =gUnknown_085CC270
@@ -3456,7 +3456,7 @@ _0813FAEC:
b _0813FCC4
.pool
_0813FB3C:
ldr r1, =gUnknown_02022F68
ldr r1, =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -4178,7 +4178,7 @@ sub_81401E0: @ 81401E0
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r2
movs r2, 0
movs r3, 0
@@ -4193,7 +4193,7 @@ sub_8140208: @ 8140208
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
asm/field_camera.s
+2 -2
View File
@@ -772,7 +772,7 @@ CameraUpdateCallback: @ 808A0F4
ldr r2, [r3, 0x4]
cmp r2, 0
beq _0808A114
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -817,7 +817,7 @@ InitCameraUpdateCallback: @ 808A134
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
_0808A150:
asm/field_effect.s
+59 -59
View File
@@ -305,7 +305,7 @@ FieldEffectFreeTilesIfUnused: @ 80B5D04
cmp r3, r0
beq _080B5D58
movs r2, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
_080B5D1E:
lsls r0, r2, 4
adds r0, r2
@@ -357,7 +357,7 @@ FieldEffectFreePaletteIfUnused: @ 80B5D68
cmp r5, r0
beq _080B5DB0
movs r2, 0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
adds r3, r4, 0
_080B5D84:
lsls r0, r2, 4
@@ -985,7 +985,7 @@ sub_80B6214: @ 80B6214
sub_80B6250: @ 80B6250
push {r4,lr}
adds r2, r0, 0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r1, 0x14
ldrsh r0, [r2, r1]
lsls r1, r0, 4
@@ -1019,7 +1019,7 @@ _080B6282:
sub_80B628C: @ 80B628C
push {lr}
adds r3, r0, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x14
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -1042,7 +1042,7 @@ _080B62AC:
thumb_func_start sub_80B62B4
sub_80B62B4: @ 80B62B4
push {lr}
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r3, 0x14
ldrsh r1, [r0, r3]
lsls r0, r1, 4
@@ -1178,7 +1178,7 @@ sub_80B6360: @ 80B6360
sub_80B63D4: @ 80B63D4
push {lr}
adds r3, r0, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x14
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -1205,7 +1205,7 @@ _080B63FA:
sub_80B6404: @ 80B6404
push {lr}
adds r3, r0, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x14
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -1228,7 +1228,7 @@ _080B6424:
thumb_func_start sub_80B642C
sub_80B642C: @ 80B642C
push {lr}
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r3, 0x14
ldrsh r1, [r0, r3]
lsls r0, r1, 4
@@ -1279,7 +1279,7 @@ sub_80B646C: @ 80B646C
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r1, r2
strh r4, [r1, 0x24]
strh r5, [r1, 0x26]
@@ -1347,7 +1347,7 @@ _080B64F4:
bl AddObjectToBack
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -1724,7 +1724,7 @@ nullsub_97: @ 80B6824
sub_80B6828: @ 80B6828
push {lr}
adds r3, r0, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x2E
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -1762,7 +1762,7 @@ sub_80B6850: @ 80B6850
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrb r2, [r0, 0x5]
movs r1, 0xD
@@ -1845,7 +1845,7 @@ sub_80B68EC: @ 80B68EC
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldr r1, =gUnknown_0855C2C4
bl SetSpriteOamTables_NoPriorityFromTable
@@ -1862,7 +1862,7 @@ _080B6934:
lsls r0, 24
lsrs r4, r0, 24
_080B6948:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -2175,7 +2175,7 @@ sub_80B6BCC: @ 80B6BCC
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
bl CameraObjectReset2
ldrb r1, [r6, 0x5]
@@ -2261,7 +2261,7 @@ sub_80B6C90: @ 80B6C90
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r0, r2, 0
adds r0, 0x29
@@ -2320,7 +2320,7 @@ sub_80B6D04: @ 80B6D04
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r0, r1
ldrh r0, [r4, 0xA]
ldrh r1, [r5, 0x26]
@@ -2669,7 +2669,7 @@ sub_80B6FB8: @ 80B6FB8
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
movs r0, 0xC
ldrsh r1, [r5, r0]
@@ -2707,7 +2707,7 @@ sub_80B7004: @ 80B7004
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
movs r0, 0xC
ldrsh r1, [r5, r0]
@@ -2888,7 +2888,7 @@ sub_80B7190: @ 80B7190
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
movs r0, 0xA
ldrsh r1, [r5, r0]
@@ -2919,7 +2919,7 @@ sub_80B71D0: @ 80B71D0
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r0, r1
movs r0, 0xA
ldrsh r1, [r4, r0]
@@ -2967,7 +2967,7 @@ sub_80B7230: @ 80B7230
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
movs r0, 0xA
ldrsh r1, [r5, r0]
@@ -2998,7 +2998,7 @@ sub_80B7270: @ 80B7270
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r0, r1
movs r0, 0xA
ldrsh r1, [r4, r0]
@@ -3457,7 +3457,7 @@ _080B7604:
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
ldr r3, [r3]
adds r0, r4, 0
@@ -3787,7 +3787,7 @@ _080B78A4:
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
ldr r3, [r3]
adds r0, r4, 0
@@ -3875,7 +3875,7 @@ sub_80B7968: @ 80B7968
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r0, 0x2B
ldrb r0, [r0]
@@ -3952,7 +3952,7 @@ sub_80B79F4: @ 80B79F4
bl AddObjectToBack
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -4036,7 +4036,7 @@ _080B7AA0:
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
ldr r3, [r3]
adds r0, r4, 0
@@ -4140,7 +4140,7 @@ sub_80B7B94: @ 80B7B94
push {r4,lr}
adds r3, r0, 0
adds r4, r1, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0xA
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -4239,7 +4239,7 @@ sub_80B7C48: @ 80B7C48
bl AddObjectToBack
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -4776,7 +4776,7 @@ sub_80B80C4: @ 80B80C4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r0, r1
ldrh r0, [r4, 0xA]
subs r0, 0x1
@@ -4966,7 +4966,7 @@ sub_80B8280: @ 80B8280
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r0, r2, 0
adds r0, 0x29
@@ -5038,7 +5038,7 @@ sub_80B830C: @ 80B830C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r0, r1
ldrh r0, [r4, 0xA]
ldrh r1, [r5, 0x26]
@@ -5456,7 +5456,7 @@ _080B869C:
bne _080B86DC
cmp r1, 0x78
bne _080B86DC
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x26
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -5483,7 +5483,7 @@ sub_80B86EC: @ 80B86EC
ldrh r0, [r3, 0x12]
subs r0, 0x10
strh r0, [r3, 0x12]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x26
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -5604,7 +5604,7 @@ overworld_bg_setup_2: @ 80B87B8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrh r1, [r4, 0x26]
lsls r1, 24
@@ -5810,7 +5810,7 @@ sub_80B898C: @ 80B898C
ldr r1, =0x00002878
movs r0, 0x46
bl SetGpuReg
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -5837,7 +5837,7 @@ sub_80B89DC: @ 80B89DC
push {r4,lr}
adds r4, r0, 0
bl sub_80B8B28
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -5934,7 +5934,7 @@ sub_80B8A64: @ 80B8A64
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrh r1, [r4, 0x26]
lsls r1, 24
@@ -6183,7 +6183,7 @@ sub_80B8C60: @ 80B8C60
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r1
ldr r1, =DummyObjectCallback
str r1, [r2, 0x1C]
@@ -6562,7 +6562,7 @@ sub_80B8F98: @ 80B8F98
lsls r1, r0, 4
add r1, r8
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
ldrb r2, [r1, 0x5]
movs r0, 0xD
@@ -6691,7 +6691,7 @@ sub_80B90CC: @ 80B90CC
lsls r2, r4, 4
adds r2, r4
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
ldrb r1, [r2, 0x5]
movs r0, 0xF
@@ -6745,7 +6745,7 @@ sub_80B9128: @ 80B9128
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
adds r3, r1, 0
adds r3, 0x3E
@@ -7041,7 +7041,7 @@ sub_80B9390: @ 80B9390
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
adds r0, r6
movs r1, 0x16
bl StartObjectImageAnim
@@ -7175,7 +7175,7 @@ sub_80B94C4: @ 80B94C4
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r1
ldrb r3, [r2, 0x5]
movs r1, 0xF
@@ -7197,7 +7197,7 @@ sub_80B94C4: @ 80B94C4
sub_80B9508: @ 80B9508
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -7217,7 +7217,7 @@ sub_80B9524: @ 80B9524
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
ldr r0, =sub_80B963C
str r0, [r4, 0x1C]
@@ -7245,7 +7245,7 @@ sub_80B9560: @ 80B9560
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -7373,7 +7373,7 @@ sub_80B963C: @ 80B963C
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
adds r3, r1, 0
adds r3, 0x3E
@@ -7529,7 +7529,7 @@ sub_80B9794: @ 80B9794
lsrs r4, 24
adds r0, r4, 0
bl sub_80B9524
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -7634,7 +7634,7 @@ _080B9856:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x16
bl StartObjectImageAnim
@@ -7684,7 +7684,7 @@ _080B98D0:
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
ldrb r0, [r5, 0xA]
movs r1, 0x40
@@ -7725,7 +7725,7 @@ sub_80B9924: @ 80B9924
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
movs r2, 0xC
ldrsh r0, [r4, r2]
@@ -7771,7 +7771,7 @@ sub_80B9978: @ 80B9978
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
ldrb r1, [r5, 0x1]
movs r0, 0x11
@@ -7847,7 +7847,7 @@ sub_80B9A28: @ 80B9A28
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
ldrh r0, [r4, 0x8]
@@ -8130,7 +8130,7 @@ sub_80B9C54: @ 80B9C54
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
ldrb r0, [r1, 0x1]
movs r2, 0x20
@@ -8243,7 +8243,7 @@ _080B9D5A:
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
lsls r1, r5, 24
lsrs r1, 24
@@ -8391,7 +8391,7 @@ sub_80B9E28: @ 80B9E28
adds r2, r1
ldrb r0, [r4, 0x4]
strh r0, [r2, 0xA]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -8437,7 +8437,7 @@ sub_80B9EDC: @ 80B9EDC
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r6, r0, r1
movs r1, 0
ldrsh r0, [r5, r1]
asm/field_effect_helpers.s
+52 -52
View File
@@ -26,7 +26,7 @@ SetUpReflection: @ 8153ED4
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r7, r1, r0
ldr r0, =objc_reflection_maybe
str r0, [r7, 0x1C]
@@ -254,7 +254,7 @@ objc_reflection_maybe: @ 81540A8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r0, r1
ldr r0, [r7]
ldr r1, =0x00020001
@@ -444,7 +444,7 @@ sub_8154228: @ 8154228
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
ldrb r2, [r1, 0x5]
movs r0, 0xD
@@ -471,7 +471,7 @@ _08154266:
objid_set_invisible: @ 8154278
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -503,7 +503,7 @@ sub_8154298: @ 8154298
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r0, r1
adds r0, r2, 0
adds r0, 0x3E
@@ -537,7 +537,7 @@ _081542E2:
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r0, r1
mov r0, sp
ldrh r0, [r0]
@@ -607,7 +607,7 @@ oei_shadow: @ 8154340
lsrs r1, r0, 24
cmp r1, 0x40
beq _081543C4
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r2, r1, 4
adds r2, r1
lsls r2, 2
@@ -679,7 +679,7 @@ _08154412:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
ldrb r0, [r1, 0x5]
movs r2, 0xC
@@ -771,7 +771,7 @@ oei_grass_normal: @ 81544AC
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r0, r1
adds r2, r3, 0
adds r2, 0x3E
@@ -972,7 +972,7 @@ sub_8154658: @ 8154658
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -1016,7 +1016,7 @@ sub_81546C8: @ 81546C8
lsls r2, 24
lsrs r6, r2, 24
movs r5, 0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
lsls r3, 16
asrs r3, 16
@@ -1109,7 +1109,7 @@ sub_8154758: @ 8154758
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
adds r2, r4, 0
adds r2, 0x3E
@@ -1303,7 +1303,7 @@ sub_81548FC: @ 81548FC
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -1361,7 +1361,7 @@ sub_815496C: @ 815496C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r2, r4
adds r3, r2, 0
adds r3, 0x3E
@@ -1463,7 +1463,7 @@ _08154A5C:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r6, r0, r1
ldrh r5, [r6, 0x22]
ldrh r7, [r6, 0x20]
@@ -1558,7 +1558,7 @@ sub_8154B04: @ 8154B04
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r3, r0, 0
adds r3, 0x3E
@@ -1613,7 +1613,7 @@ sub_8154B78: @ 8154B78
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r3, r0, 0
adds r3, 0x3E
@@ -1668,7 +1668,7 @@ sub_8154BEC: @ 8154BEC
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r3, r0, 0
adds r3, 0x3E
@@ -1804,7 +1804,7 @@ sub_8154CEC: @ 8154CEC
lsls r3, r4, 4
adds r3, r4
lsls r3, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r3, r4
movs r1, 0x3E
adds r1, r3
@@ -1880,7 +1880,7 @@ _08154DC0:
bl FieldEffectStop
b _08154E0A
_08154DCA:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
@@ -1943,7 +1943,7 @@ sub_8154E1C: @ 8154E1C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -1997,7 +1997,7 @@ oei_water_drop_tall: @ 8154E8C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2058,7 +2058,7 @@ sub_8154EFC: @ 8154EFC
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
adds r0, r3
ldr r1, =sub_8154FB4
str r1, [r0, 0x1C]
@@ -2149,7 +2149,7 @@ _08154FFC:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrh r1, [r0, 0x20]
strh r1, [r4, 0x20]
@@ -2207,7 +2207,7 @@ oei_ripples: @ 8155054
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2263,7 +2263,7 @@ sub_81550B4: @ 81550B4
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r2, r4
adds r3, r2, 0
adds r3, 0x3E
@@ -2362,7 +2362,7 @@ _081551A0:
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r1, r2
ldrh r2, [r1, 0x20]
strh r2, [r4, 0x20]
@@ -2414,7 +2414,7 @@ sub_81551F0: @ 81551F0
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2466,7 +2466,7 @@ sub_815525C: @ 815525C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2518,7 +2518,7 @@ sub_81552C8: @ 81552C8
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2570,7 +2570,7 @@ sub_8155334: @ 8155334
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2659,7 +2659,7 @@ oei_ash: @ 81553D4
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2831,7 +2831,7 @@ sub_8155534: @ 8155534
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
adds r3, r1, 0
adds r3, 0x3E
@@ -2866,7 +2866,7 @@ sub_81555AC: @ 81555AC
lsls r0, 24
lsrs r0, 24
lsls r1, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -2890,7 +2890,7 @@ sub_81555D8: @ 81555D8
lsls r0, 24
lsrs r0, 24
lsls r1, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -2915,7 +2915,7 @@ sub_8155604: @ 8155604
lsls r0, 24
lsrs r0, 24
lsls r1, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
@@ -2978,7 +2978,7 @@ sub_8155658: @ 8155658
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r5, r0
adds r0, r4, 0
adds r1, r6, 0
@@ -3200,7 +3200,7 @@ sub_8155800: @ 8155800
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r1
ldr r1, =sub_8155850
str r1, [r2, 0x1C]
@@ -3230,7 +3230,7 @@ sub_8155850: @ 8155850
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r0, r1
ldrh r1, [r2, 0x32]
adds r0, r1, 0x1
@@ -3282,7 +3282,7 @@ sub_8155890: @ 8155890
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -3343,7 +3343,7 @@ sub_8155900: @ 8155900
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
adds r3, r0, 0
adds r3, 0x3E
@@ -3437,7 +3437,7 @@ _081559F6:
b _08155A76
.pool
_08155A04:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r1, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3473,7 +3473,7 @@ _08155A2C:
_08155A46:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
@@ -3527,7 +3527,7 @@ sub_8155A88: @ 8155A88
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
adds r3, r1, 0
adds r3, 0x3E
@@ -3607,7 +3607,7 @@ sub_8155B2C: @ 8155B2C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -3723,7 +3723,7 @@ _08155C08:
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
movs r0, 0x3E
adds r0, r2
@@ -3812,7 +3812,7 @@ _08155CB8:
lsls r2, r1, 4
adds r2, r1
lsls r2, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r1
adds r1, r2, 0
adds r1, 0x3E
@@ -3896,7 +3896,7 @@ sub_8155D78: @ 8155D78
ldrb r0, [r0]
cmp r0, 0x1
bne _08155D96
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r1, 0x1A]
lsls r0, r1, 4
adds r0, r1
@@ -3925,7 +3925,7 @@ sub_8155DA0: @ 8155DA0
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r1, r0, r1
movs r3, 0x3C
ldrsh r0, [r1, r3]
@@ -3975,7 +3975,7 @@ sub_8155DDC: @ 8155DDC
lsrs r2, r0, 24
cmp r2, 0x40
beq _08155E3C
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -4254,7 +4254,7 @@ _08156022:
b _0815611A
.pool
_08156034:
ldr r4, =gUnknown_08329F40
ldr r4, =gSineTable
movs r3, 0x2E
ldrsh r0, [r5, r3]
movs r1, 0x3
@@ -4526,7 +4526,7 @@ _08156212:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r0, r1
adds r0, r6, 0
adds r0, 0x28
asm/field_map_obj.s
+24 -24
View File
@@ -73,7 +73,7 @@ sub_808D450: @ 808D450
bl AddObjectToBack
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r10, r1
lsls r4, r0, 4
adds r4, r0
@@ -725,7 +725,7 @@ RemoveFieldObjectInternal: @ 808D90C
ands r0, r1
orrs r0, r2
str r0, [sp, 0x4]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -885,7 +885,7 @@ _0808DA64:
lsls r0, r1, 4
add r0, r8
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
mov r2, r10
lsls r0, r2, 16
@@ -1050,7 +1050,7 @@ SpawnFieldObject: @ 808DB40
b _0808DBF2
.pool
_0808DBBC:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r1, =gUnknown_02037350
lsls r0, r2, 3
adds r0, r2
@@ -1337,7 +1337,7 @@ _0808DDAE:
lsls r4, r5, 4
adds r4, r5
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r4, 0
bl SetSpriteOamTables_NoPriorityFromTable
@@ -1428,7 +1428,7 @@ sprite_new: @ 808DE0C
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r0, r1
ldrh r0, [r4, 0x8]
lsls r0, 16
@@ -1943,7 +1943,7 @@ _0808E27E:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
mov r1, r10
lsls r0, r1, 16
@@ -2131,7 +2131,7 @@ FieldObjectSetGraphicsId: @ 808E3F8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
ldrb r0, [r6, 0xC]
lsls r1, r0, 28
@@ -2298,7 +2298,7 @@ FieldObjectTurn: @ 808E544
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r4, r5
ldrb r0, [r6, 0x18]
lsls r0, 28
@@ -2623,7 +2623,7 @@ sub_808E78C: @ 808E78C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrb r1, [r2, 0x3]
movs r3, 0x4
@@ -2708,7 +2708,7 @@ sub_808E82C: @ 808E82C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
strh r5, [r0, 0x24]
strh r4, [r0, 0x26]
@@ -3086,7 +3086,7 @@ sub_808EB08: @ 808EB08
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r7, r0, r1
ldrb r0, [r6, 0x5]
bl GetFieldObjectGraphicsInfo
@@ -3383,7 +3383,7 @@ AddCameraObject: @ 808ED34
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -3429,7 +3429,7 @@ ObjectCB_CameraObject: @ 808ED78
@ void CameraObject_0(struct obj *object)
CameraObject_0: @ 808EDA0
push {lr}
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r1, 0x2E
ldrsh r2, [r0, r1]
lsls r1, r2, 4
@@ -3462,7 +3462,7 @@ CameraObject_0: @ 808EDA0
@ void CameraObject_1(struct obj *object)
CameraObject_1: @ 808EDDC
push {r4,r5,lr}
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r1, 0x2E
ldrsh r2, [r0, r1]
lsls r1, r2, 4
@@ -3493,7 +3493,7 @@ CameraObject_1: @ 808EDDC
@ void CameraObject_2(struct obj *object)
CameraObject_2: @ 808EE14
push {r4,lr}
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r1, 0x2E
ldrsh r2, [r0, r1]
lsls r1, r2, 4
@@ -3522,7 +3522,7 @@ CameraObject_2: @ 808EE14
FindCameraObject: @ 808EE44
push {r4,r5,lr}
movs r3, 0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r5, r4, 0
adds r5, 0x1C
_0808EE4E:
@@ -3635,7 +3635,7 @@ sub_808EEEC: @ 808EEEC
lsls r3, 24
lsrs r7, r3, 24
movs r5, 0
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
_0808EF06:
lsls r0, r5, 4
adds r0, r5
@@ -3688,7 +3688,7 @@ obj_unfreeze: @ 808EF50
lsls r3, 24
lsrs r7, r3, 24
movs r5, 0x3F
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r2, 0x1
negs r2, r2
_0808EF6E:
@@ -11833,7 +11833,7 @@ npc_set_running_behaviour_etc: @ 8092B2C
strb r3, [r0]
adds r0, 0x1
strb r3, [r0]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
mov r0, r12
ldrb r2, [r0, 0x4]
lsls r0, r2, 4
@@ -12303,7 +12303,7 @@ sub_8092E9C: @ 8092E9C
lsls r0, 24
cmp r0, 0
bne _08092EE8
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
@@ -12347,7 +12347,7 @@ sub_8092EF0: @ 8092EF0
lsls r0, 24
cmp r0, 0
bne _08092F2E
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
@@ -12749,7 +12749,7 @@ FieldObjectSetSpecialAnim: @ 80931C0
movs r1, 0x7F
ands r0, r1
strb r0, [r4]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -12811,7 +12811,7 @@ FieldObjectClearAnim: @ 809323C
movs r2, 0x7F
ands r1, r2
strb r1, [r0]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldrb r2, [r0, 0x4]
lsls r1, r2, 4
adds r1, r2
asm/field_player_avatar.s
+16 -16
View File
@@ -2348,7 +2348,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC
beq _0808BAFC
b _0808BC24
_0808BAFC:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r3, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3118,7 +3118,7 @@ sub_808C0A8: @ 808C0A8
lsls r0, 24
cmp r0, 0
beq _0808C100
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -3165,7 +3165,7 @@ sub_808C114: @ 808C114
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
@@ -3199,7 +3199,7 @@ sub_808C15C: @ 808C15C
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r5, 0
bl sub_8092A0C
@@ -3240,7 +3240,7 @@ sub_808C1B4: @ 808C1B4
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
add r4, r8
adds r0, r5, 0
@@ -3289,7 +3289,7 @@ sub_808C228: @ 808C228
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r5, 0
bl FieldObjectDirectionToImageAnimId
@@ -3527,7 +3527,7 @@ _0808C3F0:
ldrb r0, [r4, 0xB]
lsrs r0, 4
str r0, [r2, 0x8]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -4013,7 +4013,7 @@ sub_808C814: @ 808C814
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r5, 0
@@ -4371,7 +4371,7 @@ _0808CB32:
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -4606,7 +4606,7 @@ _0808CCBC:
movs r2, 0
bl sub_8155604
_0808CD1A:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -4669,7 +4669,7 @@ fishB: @ 808CD94
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -4717,7 +4717,7 @@ fishC: @ 808CE04
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -4776,7 +4776,7 @@ fishE: @ 808CE8C
push {r7}
adds r6, r0, 0
bl sub_808CF78
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
ldr r5, =gUnknown_02037590
ldrb r0, [r5, 0x4]
lsls r1, r0, 4
@@ -4884,7 +4884,7 @@ sub_808CF78: @ 808CF78
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
adds r0, r4, 0
bl AnimateObject
@@ -5043,7 +5043,7 @@ sub_808D094: @ 808D094
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r7, r0, r1
lsls r0, r2, 2
adds r0, r2
@@ -5223,7 +5223,7 @@ sub_808D1FC: @ 808D1FC
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r7, r0, r1
mov r1, r8
lsls r0, r1, 2
asm/field_poison.s
+2 -2
View File
@@ -77,7 +77,7 @@ sub_80F95C0: @ 80F95C0
adds r0, r4, 0
movs r1, 0x37
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldr r5, =gStringVar1
adds r0, r4, 0
movs r1, 0x2
@@ -287,7 +287,7 @@ _080F9788:
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r7, 0x1
_080F9794:
adds r4, 0x64
asm/fldeff_80F9BCC.s
+10 -10
View File
@@ -691,7 +691,7 @@ sub_80FA13C: @ 80FA13C
push {r4,lr}
bl sub_80F9F78
ldr r0, =gUnknown_0858E600
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
@@ -848,7 +848,7 @@ _080FA26A:
_080FA274:
bl sub_80F9F78
ldr r0, =gUnknown_0858E618
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
@@ -999,7 +999,7 @@ sub_80FA3AC: @ 80FA3AC
push {r4,lr}
bl sub_80F9F78
ldr r0, =gUnknown_0858E630
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
@@ -1759,7 +1759,7 @@ sub_80FA9D0: @ 80FA9D0
lsrs r0, 24
cmp r0, 0x40
beq _080FAA5E
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -1834,7 +1834,7 @@ _080FAABC:
b _080FAB8C
_080FAAC6:
ldr r0, =gUnknown_0858E68C
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
@@ -1856,7 +1856,7 @@ _080FAAC6:
.pool
_080FAAFC:
ldr r0, =gUnknown_0858E68C
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
@@ -1875,7 +1875,7 @@ _080FAAFC:
.pool
_080FAB2C:
ldr r0, =gUnknown_0858E68C
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
@@ -1897,7 +1897,7 @@ _080FAB4C:
.pool
_080FAB64:
ldr r0, =gUnknown_0858E68C
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
@@ -2448,7 +2448,7 @@ sub_80FB00C: @ 80FB00C
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
adds r2, r4, 0
adds r2, 0x20
@@ -2483,7 +2483,7 @@ _080FB06E:
thumb_func_start sub_80FB074
sub_80FB074: @ 80FB074
push {r4-r7,lr}
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r7, r4, 0
movs r6, 0
movs r5, 0x3F
asm/fldeff_emotion.s
+4 -4
View File
@@ -20,7 +20,7 @@ oei_exclamation_mark: @ 80B4620
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0
movs r2, 0
@@ -47,7 +47,7 @@ sub_80B4658: @ 80B4658
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x21
movs r2, 0x1
@@ -74,7 +74,7 @@ sub_80B4690: @ 80B4690
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r4, 0
movs r1, 0x2E
@@ -178,7 +178,7 @@ _080B4764:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
ldrh r3, [r4, 0x34]
ldrh r0, [r4, 0x36]
asm/front_pic_anim.s
+1 -1
View File
@@ -151,7 +151,7 @@ sub_817F594: @ 817F594
strh r5, [r4, 0xC]
ldrh r0, [r5, 0x2E]
lsls r0, 24
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsrs r0, 23
adds r0, r1
ldrh r1, [r0]
asm/hall_of_fame.s
+13 -13
View File
@@ -697,7 +697,7 @@ _08173B20:
bl sub_818D3E4
lsls r0, 24
lsrs r0, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -772,7 +772,7 @@ sub_8173BC0: @ 8173BC0
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r0, r1
ldr r1, [r3, 0x1C]
ldr r0, =DummyObjectCallback
@@ -832,7 +832,7 @@ sub_8173C34: @ 8173C34
.pool
_08173C78:
ldr r2, =gUnknown_0203BCD4
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
adds r0, r3, 0x5
lsls r0, 1
@@ -930,7 +930,7 @@ sub_8173D24: @ 8173D24
ldr r0, =gTasks + 0x8
mov r12, r0
mov r8, r1
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r7, 0xD
negs r7, r7
_08173D52:
@@ -1022,7 +1022,7 @@ _08173E04:
adds r4, r5, 0
adds r7, 0x8
mov r8, r7
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
movs r1, 0xD
negs r1, r1
mov r12, r1
@@ -1204,7 +1204,7 @@ sub_8173F84: @ 8173F84
b _08174018
.pool
_08173FAC:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r3, 0x10
ldrsh r1, [r4, r3]
lsls r0, r1, 4
@@ -1342,7 +1342,7 @@ sub_81740B0: @ 81740B0
lsls r0, 3
adds r1, 0x12
adds r5, r0, r1
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r9, r2
movs r6, 0x5
_081740DC:
@@ -1806,7 +1806,7 @@ _081744DE:
bl sub_818D7D8
lsls r0, 16
lsrs r0, 16
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -1937,7 +1937,7 @@ _08174630:
lsls r6, r0, 3
ldr r0, =gTasks + 0x8
mov r10, r0
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r8, r1
movs r2, 0xD
negs r2, r2
@@ -1984,7 +1984,7 @@ _0817466C:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrb r2, [r0, 0x5]
movs r1, 0xD
@@ -3254,7 +3254,7 @@ _081751BA:
movs r1, 0x3
ands r0, r1
adds r0, 0x8
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
lsls r4, 1
adds r4, r1
movs r2, 0
@@ -3307,7 +3307,7 @@ sub_81751FC: @ 81751FC
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r1, r0
bl Random
lsls r0, 16
@@ -3424,7 +3424,7 @@ _08175324:
movs r1, 0x3
ands r0, r1
adds r0, 0x8
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
lsls r4, 1
adds r4, r1
movs r2, 0
asm/intro.s
+26 -26
View File
@@ -581,7 +581,7 @@ task_intro_3: @ 816D190
ldr r0, [r5]
cmp r0, 0x4C
bne _0816D1BE
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -606,7 +606,7 @@ _0816D1CC:
ldr r0, [r5]
cmp r0, 0xFB
bne _0816D1EE
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -863,7 +863,7 @@ task_intro_4: @ 816D354
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -1025,7 +1025,7 @@ _0816D590:
_0816D598:
lsls r0, 24
lsrs r6, r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -1143,7 +1143,7 @@ _0816D6A4:
ldr r3, =gTasks
cmp r1, r0
bne _0816D6C8
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1161,7 +1161,7 @@ _0816D6C8:
ldr r0, =0x000004be
cmp r1, r0
bne _0816D6EA
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1179,7 +1179,7 @@ _0816D6EA:
ldr r0, =0x00000572
cmp r1, r0
bne _0816D70C
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1197,7 +1197,7 @@ _0816D70C:
ldr r0, =0x00000576
cmp r1, r0
bne _0816D72E
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1216,7 +1216,7 @@ _0816D72E:
lsls r0, 3
cmp r1, r0
bne _0816D752
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1234,7 +1234,7 @@ _0816D752:
ldr r0, =0x000006bf
cmp r1, r0
bne _0816D774
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -2428,7 +2428,7 @@ sub_816E190: @ 816E190
lsls r0, 24
lsrs r7, r0, 24
movs r4, 0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r5, =gUnknown_085E4C64
_0816E19C:
movs r0, 0
@@ -3060,7 +3060,7 @@ sub_816E6D4: @ 816E6D4
mov r8, r0
movs r5, 0
ldr r7, =gUnknown_085E4CA8
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r9, r0
adds r4, r7, 0
movs r6, 0
@@ -3116,7 +3116,7 @@ sub_816E74C: @ 816E74C
ldr r7, =gUnknown_085E4CA8
adds r4, r7, 0x4
movs r6, 0x24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
_0816E75E:
movs r3, 0x20
@@ -3595,7 +3595,7 @@ _0816EB72:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
@@ -3642,7 +3642,7 @@ _0816EBE0:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
@@ -4105,7 +4105,7 @@ _0816EFB6:
lsrs r4, 24
movs r0, 0x67
bl audio_play
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -4566,7 +4566,7 @@ _0816F39A:
sub_816F3A4: @ 816F3A4
push {r4,lr}
adds r4, r0, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r1, 0x3C
ldrsh r0, [r4, r1]
lsls r1, r0, 4
@@ -4698,7 +4698,7 @@ sub_816F46C: @ 816F46C
.pool
_0816F4AC:
ldrh r1, [r7, 0x36]
ldr r5, =gUnknown_08329F40
ldr r5, =gSineTable
lsls r0, r1, 24
lsrs r0, 23
adds r0, r5
@@ -4884,7 +4884,7 @@ sub_816F5B4: @ 816F5B4
strh r0, [r4, 0x36]
ldrh r0, [r4, 0x36]
adds r1, r0, 0
ldr r2, =gUnknown_08329F40
ldr r2, =gSineTable
adds r0, 0x40
lsls r0, 24
lsrs r0, 23
@@ -4934,7 +4934,7 @@ sub_816F660: @ 816F660
ldrh r0, [r1, 0x36]
adds r0, 0x8
strh r0, [r1, 0x36]
ldr r3, =gUnknown_08329F40
ldr r3, =gSineTable
lsls r0, 24
lsrs r0, 23
adds r0, r3
@@ -5156,7 +5156,7 @@ sub_816F7D0: @ 816F7D0
bl AddObjectToFront
lsls r0, 24
lsrs r7, r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r9, r2
lsls r0, r7, 4
adds r0, r7
@@ -5232,7 +5232,7 @@ _0816F8A0:
bl AddObjectToFront
lsls r0, 24
lsrs r7, r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r4, r7, 4
adds r4, r7
lsls r4, 2
@@ -5896,7 +5896,7 @@ _0816FDD2:
lsls r4, r6, 4
adds r4, r6
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
movs r1, 0
strh r1, [r4, 0x2E]
@@ -5954,7 +5954,7 @@ _0816FDD2:
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r2, 0
strh r2, [r0, 0x2E]
@@ -6000,7 +6000,7 @@ sub_816FEDC: @ 816FEDC
ldrsh r0, [r4, r1]
cmp r0, 0
beq _0816FF48
ldr r2, =gUnknown_08329F40
ldr r2, =gSineTable
ldrh r1, [r4, 0x32]
lsls r0, r1, 24
lsrs r0, 23
@@ -6239,7 +6239,7 @@ _081700A6:
adds r0, r1, 0x1
strh r0, [r5, 0x30]
_081700BE:
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
ldrh r0, [r5, 0x30]
lsls r0, 24
lsrs r0, 23
asm/intro_credits_graphics.s
+7 -7
View File
@@ -642,7 +642,7 @@ sub_817B698: @ 817B698
movs r7, 0
cmp r7, r8
bcs _0817B74E
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r10, r0
movs r2, 0x3F
mov r9, r2
@@ -773,7 +773,7 @@ nullsub_65: @ 817B7C0
thumb_func_start sub_817B7C4
sub_817B7C4: @ 817B7C4
push {r4,lr}
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r1, 0x2E
ldrsh r2, [r0, r1]
lsls r1, r2, 4
@@ -855,7 +855,7 @@ sub_817B834: @ 817B834
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -895,7 +895,7 @@ sub_817B88C: @ 817B88C
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -916,7 +916,7 @@ nullsub_66: @ 817B8E4
thumb_func_start sub_817B8E8
sub_817B8E8: @ 817B8E8
push {r4,lr}
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r1, 0x2E
ldrsh r2, [r0, r1]
lsls r1, r2, 4
@@ -998,7 +998,7 @@ sub_817B948: @ 817B948
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
@@ -1053,7 +1053,7 @@ sub_817B9C4: @ 817B9C4
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
asm/item.s
+68 -68
View File
@@ -55,7 +55,7 @@ encrypt_decrypt_all_item_quantities: @ 80D658C
sub sp, 0x4
mov r8, r0
movs r1, 0
ldr r0, =gUnknown_02039DD8
ldr r0, =gBagItems
mov r9, r0
_080D659E:
movs r6, 0
@@ -66,7 +66,7 @@ _080D659E:
ldrb r0, [r0, 0x4]
cmp r6, r0
bcs _080D65CC
ldr r2, =gUnknown_02039DD8
ldr r2, =gBagItems
_080D65B0:
adds r4, r5, r2
lsls r1, r6, 2
@@ -107,7 +107,7 @@ call_encrypt_decrypt_all_item_quantities: @ 80D65E4
@ void init_bag_pockets()
init_bag_pockets: @ 80D65F0
push {r4,lr}
ldr r1, =gUnknown_02039DD8
ldr r1, =gBagItems
ldr r0, =gSaveBlock1Ptr
ldr r2, [r0]
movs r3, 0xAC
@@ -239,7 +239,7 @@ IsBagPocketNonEmpty: @ 80D66EC
push {lr}
lsls r0, 24
movs r2, 0
ldr r1, =gUnknown_02039DD8
ldr r1, =gBagItems
lsrs r0, 21
subs r0, 0x8
adds r0, r1
@@ -277,7 +277,7 @@ sub_80D6724: @ 80D6724
lsls r1, 16
lsrs r5, r1, 16
adds r0, r7, 0
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
cmp r0, 0
beq _080D67B6
@@ -304,11 +304,11 @@ _080D6764:
b _080D67B8
_080D6768:
adds r0, r7, 0
bl itemid_get_pocket_number
bl ItemId_GetPocket
subs r0, 0x1
lsls r0, 24
movs r6, 0
ldr r1, =gUnknown_02039DD8
ldr r1, =gBagItems
lsrs r4, r0, 21
b _080D67AE
.pool
@@ -335,7 +335,7 @@ _080D67A6:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =gUnknown_02039DD8
ldr r1, =gBagItems
_080D67AE:
adds r0, r4, r1
ldrb r0, [r0, 0x4]
@@ -397,7 +397,7 @@ sub_80D6800: @ 80D6800
mov r8, r0
lsls r1, 16
lsrs r5, r1, 16
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
cmp r0, 0
beq _080D6906
@@ -421,7 +421,7 @@ _080D6838:
.pool
_080D684C:
mov r0, r8
bl itemid_get_pocket_number
bl ItemId_GetPocket
subs r0, 0x1
lsls r0, 24
lsrs r2, r0, 24
@@ -431,7 +431,7 @@ _080D684C:
movs r7, 0x63
_080D6860:
movs r6, 0
ldr r1, =gUnknown_02039DD8
ldr r1, =gBagItems
lsls r4, r2, 3
adds r0, r4, r1
mov r9, r4
@@ -472,7 +472,7 @@ _080D68AC:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =gUnknown_02039DD8
ldr r1, =gBagItems
adds r0, r4, r1
ldrb r0, [r0, 0x4]
cmp r6, r0
@@ -481,7 +481,7 @@ _080D68BC:
cmp r5, 0
beq _080D6914
movs r6, 0
ldr r3, =gUnknown_02039DD8
ldr r3, =gBagItems
mov r1, r9
adds r0, r1, r3
ldrb r0, [r0, 0x4]
@@ -549,7 +549,7 @@ bag_add_item: @ 80D6928
mov r9, r0
lsls r1, 16
lsrs r5, r1, 16
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
cmp r0, 0
bne _080D694C
@@ -576,13 +576,13 @@ _080D6964:
.pool
_080D6978:
mov r0, r9
bl itemid_get_pocket_number
bl ItemId_GetPocket
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
mov r10, r0
lsls r1, r0, 3
ldr r0, =gUnknown_02039DD8
ldr r0, =gBagItems
adds r7, r1, r0
ldrb r0, [r7, 0x4]
lsls r0, 2
@@ -736,7 +736,7 @@ remove_item: @ 80D6AA4
lsls r1, 16
lsrs r7, r1, 16
movs r4, 0
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
cmp r0, 0
beq _080D6B38
@@ -763,13 +763,13 @@ _080D6AE0:
.pool
_080D6AF4:
mov r0, r8
bl itemid_get_pocket_number
bl ItemId_GetPocket
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
mov r9, r0
lsls r1, r0, 3
ldr r0, =gUnknown_02039DD8
ldr r0, =gBagItems
adds r5, r1, r0
movs r6, 0
ldrb r2, [r5, 0x4]
@@ -952,7 +952,7 @@ sub_80D6C68: @ 80D6C68
push {lr}
lsls r0, 16
lsrs r0, 16
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1314,7 +1314,7 @@ _080D6F0E:
bag_pocket_get_itemid: @ 80D6F14
lsls r0, 24
lsls r1, 16
ldr r2, =gUnknown_02039DD8
ldr r2, =gBagItems
lsrs r0, 21
subs r0, 0x8
adds r0, r2
@@ -1332,7 +1332,7 @@ bag_pocket_get_item_quantity: @ 80D6F30
push {lr}
lsls r0, 24
lsls r1, 16
ldr r2, =gUnknown_02039DD8
ldr r2, =gBagItems
lsrs r0, 21
subs r0, 0x8
adds r0, r2
@@ -1535,7 +1535,7 @@ _080D708C:
sub_80D7094: @ 80D7094
push {r4,r5,lr}
movs r4, 0
ldr r5, =gUnknown_02039DD8
ldr r5, =gBagItems
_080D709A:
lsls r1, r4, 3
adds r1, r5
@@ -1561,7 +1561,7 @@ CountTotalItemQuantityInBag: @ 80D70BC
lsrs r6, r0, 16
movs r7, 0
adds r0, r6, 0
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 21
ldr r1, =gUnknown_02039DD0
@@ -2008,8 +2008,8 @@ _080D744E:
bx r1
thumb_func_end sub_80D7334
thumb_func_start itemid_sanitize
itemid_sanitize: @ 80D745C
thumb_func_start SanitizeItemId
SanitizeItemId: @ 80D745C
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -2024,7 +2024,7 @@ _080D746E:
_080D7470:
pop {r1}
bx r1
thumb_func_end itemid_sanitize
thumb_func_end SanitizeItemId
thumb_func_start itemid_get_item
@ item *itemid_get_item(s16 itemId)
@@ -2032,7 +2032,7 @@ itemid_get_item: @ 80D7474
push {lr}
lsls r0, 16
lsrs r0, 16
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2050,7 +2050,7 @@ itemid_get_number: @ 80D7494
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2069,7 +2069,7 @@ itemid_get_market_price: @ 80D74B8
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2082,13 +2082,13 @@ itemid_get_market_price: @ 80D74B8
.pool
thumb_func_end itemid_get_market_price
thumb_func_start itemid_get_x12
itemid_get_x12: @ 80D74DC
thumb_func_start ItemId_GetHoldEffect
ItemId_GetHoldEffect: @ 80D74DC
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2099,15 +2099,15 @@ itemid_get_x12: @ 80D74DC
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_x12
thumb_func_end ItemId_GetHoldEffect
thumb_func_start itemid_get_quality
itemid_get_quality: @ 80D7500
thumb_func_start ItemId_GetHoldEffectParam
ItemId_GetHoldEffectParam: @ 80D7500
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2118,15 +2118,15 @@ itemid_get_quality: @ 80D7500
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_quality
thumb_func_end ItemId_GetHoldEffectParam
thumb_func_start itemid_get_description
itemid_get_description: @ 80D7524
thumb_func_start ItemId_GetDescription
ItemId_GetDescription: @ 80D7524
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2138,7 +2138,7 @@ itemid_get_description: @ 80D7524
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_description
thumb_func_end ItemId_GetDescription
thumb_func_start itemid_is_unique
itemid_is_unique: @ 80D7548
@@ -2146,7 +2146,7 @@ itemid_is_unique: @ 80D7548
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2165,7 +2165,7 @@ itemid_get_x19: @ 80D756C
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2178,13 +2178,13 @@ itemid_get_x19: @ 80D756C
.pool
thumb_func_end itemid_get_x19
thumb_func_start itemid_get_pocket_number
itemid_get_pocket_number: @ 80D7590
thumb_func_start ItemId_GetPocket
ItemId_GetPocket: @ 80D7590
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2195,15 +2195,15 @@ itemid_get_pocket_number: @ 80D7590
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_pocket_number
thumb_func_end ItemId_GetPocket
thumb_func_start itemid_get_type
itemid_get_type: @ 80D75B4
thumb_func_start ItemId_GetType
ItemId_GetType: @ 80D75B4
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2214,15 +2214,15 @@ itemid_get_type: @ 80D75B4
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_type
thumb_func_end ItemId_GetType
thumb_func_start itemid_get_overworld_function
itemid_get_overworld_function: @ 80D75D8
thumb_func_start ItemId_GetFieldFunc
ItemId_GetFieldFunc: @ 80D75D8
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2234,15 +2234,15 @@ itemid_get_overworld_function: @ 80D75D8
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_overworld_function
thumb_func_end ItemId_GetFieldFunc
thumb_func_start itemid_get_usage
itemid_get_usage: @ 80D75FC
thumb_func_start ItemId_GetBattleUsage
ItemId_GetBattleUsage: @ 80D75FC
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2254,15 +2254,15 @@ itemid_get_usage: @ 80D75FC
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_usage
thumb_func_end ItemId_GetBattleUsage
thumb_func_start itemid_get_battle_function
itemid_get_battle_function: @ 80D7620
thumb_func_start ItemId_GetBattleFunc
ItemId_GetBattleFunc: @ 80D7620
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2274,15 +2274,15 @@ itemid_get_battle_function: @ 80D7620
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_battle_function
thumb_func_end ItemId_GetBattleFunc
thumb_func_start itemid_get_x28
itemid_get_x28: @ 80D7644
thumb_func_start ItemId_GetSecondaryId
ItemId_GetSecondaryId: @ 80D7644
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gItems
bl itemid_sanitize
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -2294,6 +2294,6 @@ itemid_get_x28: @ 80D7644
pop {r1}
bx r1
.pool
thumb_func_end itemid_get_x28
thumb_func_end ItemId_GetSecondaryId
.align 2, 0 @ Don't pad with nop.
asm/item_use.s
+10 -10
View File
@@ -25,7 +25,7 @@ SetUpItemUseCallback: @ 80FD060
.pool
_080FD084:
ldrh r0, [r1]
bl itemid_get_type
bl ItemId_GetType
_080FD08A:
subs r0, 0x1
lsls r0, 24
@@ -231,7 +231,7 @@ CheckIfItemIsTMHMOrEvolutionStone: @ 80FD21C
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl itemid_get_overworld_function
bl ItemId_GetFieldFunc
ldr r1, =ItemUseOutOfBattle_TMHM
cmp r0, r1
bne _080FD238
@@ -240,7 +240,7 @@ CheckIfItemIsTMHMOrEvolutionStone: @ 80FD21C
.pool
_080FD238:
adds r0, r4, 0
bl itemid_get_overworld_function
bl ItemId_GetFieldFunc
ldr r1, =ItemUseOutOfBattle_EvolutionStone
cmp r0, r1
beq _080FD24C
@@ -383,7 +383,7 @@ ItemUseOnFieldCB_Bike: @ 80FD358
lsrs r4, r0, 24
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl itemid_get_x28
bl ItemId_GetSecondaryId
lsls r0, 24
cmp r0, 0
bne _080FD378
@@ -517,7 +517,7 @@ ItemUseOnFieldCB_Rod: @ 80FD468
lsrs r4, 24
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl itemid_get_x28
bl ItemId_GetSecondaryId
lsls r0, 24
lsrs r0, 24
bl StartFishing
@@ -1644,7 +1644,7 @@ sub_80FDD10: @ 80FDD10
_080FDD58:
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl itemid_get_overworld_function
bl ItemId_GetFieldFunc
adds r1, r0, 0
adds r0, r4, 0
bl _call_via_r1
@@ -2017,12 +2017,12 @@ sub_80FE058: @ 80FE058
cmp r0, 0
bne _080FE0AC
ldrh r0, [r4]
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
bl sub_81AB9A8
ldrh r0, [r4]
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
bl sub_81ABA88
@@ -2127,7 +2127,7 @@ sub_80FE164: @ 80FE164
ldr r4, =0x00004021
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl itemid_get_quality
bl ItemId_GetHoldEffectParam
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2486,7 +2486,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldr r0, =gUnknown_020244B8
ldrb r0, [r0]
lsls r0, 1
asm/link.s
+60 -60
View File
@@ -9440,7 +9440,7 @@ _0800DFCA:
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r4, r5
lsls r4, 2
@@ -9467,7 +9467,7 @@ _0800E024:
bl AddObjectToFront
ldr r4, =gUnknown_02022B10
strb r0, [r4]
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@@ -9504,7 +9504,7 @@ _0800E06A:
thumb_func_start sub_800E084
sub_800E084: @ 800E084
push {r4,lr}
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r3, =gUnknown_02022B10
ldrb r1, [r3]
lsls r0, r1, 4
@@ -9628,7 +9628,7 @@ sub_800E174: @ 800E174
bne _0800E184
b _0800E346
_0800E184:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r1, r0, 0
lsls r0, r1, 4
adds r0, r1
@@ -31899,7 +31899,7 @@ sub_8019F04: @ 8019F04
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
_08019F0C:
adds r0, r5, r4
ldrb r1, [r0]
@@ -36542,7 +36542,7 @@ sub_801C4C0: @ 801C4C0
lsls r2, 1
adds r1, r2
strb r0, [r1]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r4]
movs r1, 0xBE
lsls r1, 1
@@ -36682,7 +36682,7 @@ sub_801C61C: @ 801C61C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl sub_80D2EF8
_0801C640:
@@ -36698,7 +36698,7 @@ _0801C640:
cmp r5, r2
bcs _0801C6A4
adds r6, r4, 0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
_0801C65A:
ldr r0, [r6]
lsls r4, r5, 1
@@ -45042,7 +45042,7 @@ sub_80208E8: @ 80208E8
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
pop {r0}
@@ -45237,7 +45237,7 @@ sub_8020A68: @ 8020A68
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r1, r4
str r1, [r2, 0x8]
ldr r0, =gUnknown_082F31D4
@@ -45332,7 +45332,7 @@ sub_8020B20: @ 8020B20
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r1, r4
str r1, [r2, 0xC]
ldr r0, =gUnknown_082F3244
@@ -46473,7 +46473,7 @@ _080214C6:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r6]
ldrb r0, [r1, 0x5]
@@ -48685,7 +48685,7 @@ _08022746:
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r3]
ldrb r1, [r0, 0x5]
@@ -48736,7 +48736,7 @@ _080227AA:
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r3]
ldrb r0, [r1, 0x5]
@@ -48797,7 +48797,7 @@ _08022828:
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r3]
ldrb r1, [r0, 0x5]
@@ -48846,7 +48846,7 @@ _0802288E:
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r3]
ldrb r1, [r0, 0x5]
@@ -60519,7 +60519,7 @@ sub_80284CC: @ 80284CC
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r2, 0
movs r1, 0x1
@@ -60546,7 +60546,7 @@ sub_8028504: @ 8028504
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r2, 0
movs r1, 0x2
@@ -60693,7 +60693,7 @@ _08028622:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
cmp r0, 0
beq _0802863C
@@ -60716,7 +60716,7 @@ sub_8028654: @ 8028654
lsls r0, 24
lsrs r0, 24
lsls r1, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_02022C9C
lsrs r1, 22
adds r1, r2
@@ -60779,7 +60779,7 @@ sub_80286B4: @ 80286B4
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r2
bl StartObjectImageAnim
pop {r0}
@@ -60796,7 +60796,7 @@ nullsub_15: @ 80286E0
sub_80286E4: @ 80286E4
push {r4-r7,lr}
movs r4, 0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r12, r0
movs r6, 0
ldr r5, =gUnknown_02022CF4
@@ -60927,7 +60927,7 @@ _080287E8:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
cmp r0, 0
beq _08028806
@@ -60970,7 +60970,7 @@ _0802883A:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
adds r0, r2, 0
adds r0, 0x16
@@ -61056,7 +61056,7 @@ _080288E0:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
@@ -61073,7 +61073,7 @@ _08028910:
subs r0, r5
cmp r4, r0
bge _080289D6
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
_0802891C:
cmp r5, 0x6
bls _08028984
@@ -61154,7 +61154,7 @@ _080289B4:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
@@ -61177,7 +61177,7 @@ sub_80289E8: @ 80289E8
lsls r0, 24
lsrs r0, 24
movs r3, 0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
movs r1, 0x1
ands r0, r1
lsls r4, r0, 2
@@ -61340,7 +61340,7 @@ _08028B40:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r1, r5, 0
bl StartObjectImageAnim
@@ -61374,7 +61374,7 @@ _08028B86:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
cmp r0, 0
beq _08028BA0
@@ -61399,7 +61399,7 @@ _08028BB8:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
cmp r0, 0
beq _08028BD2
@@ -61425,7 +61425,7 @@ sub_8028BF8: @ 8028BF8
lsls r0, 24
lsls r1, 24
lsrs r1, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_02022CB8
lsrs r0, 22
adds r0, r2
@@ -61455,7 +61455,7 @@ sub_8028C30: @ 8028C30
lsls r0, 24
lsrs r0, 24
movs r3, 0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
ldr r6, =gUnknown_02022CE4
movs r1, 0x1
ands r0, r1
@@ -61492,7 +61492,7 @@ _08028C46:
sub_8028C7C: @ 8028C7C
lsls r0, 24
lsls r1, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_02022CB8
lsrs r0, 22
adds r0, r2
@@ -61522,7 +61522,7 @@ sub_8028CA4: @ 8028CA4
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r2
bl StartObjectImageAnim
pop {r0}
@@ -61534,7 +61534,7 @@ sub_8028CA4: @ 8028CA4
sub_8028CD0: @ 8028CD0
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -61683,7 +61683,7 @@ sub_8028DFC: @ 8028DFC
mov r12, r0
ldr r4, =gUnknown_082FB356
adds r7, r4, 0x2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r5, 0x1
_08028E0C:
lsls r2, r3, 2
@@ -61720,7 +61720,7 @@ sub_8028E4C: @ 8028E4C
push {r4,r5,lr}
movs r2, 0
ldr r5, =gUnknown_02022CB0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r3, 0
_08028E56:
lsls r0, r2, 2
@@ -61757,7 +61757,7 @@ _08028E8A:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
cmp r0, 0
beq _08028EA4
@@ -61784,7 +61784,7 @@ sub_8028EC8: @ 8028EC8
lsls r0, 24
lsrs r0, 24
movs r3, 0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
ldr r6, =gUnknown_02022CB0
movs r1, 0x1
ands r0, r1
@@ -69045,7 +69045,7 @@ _0802CA32:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
ldr r0, =0x000081fc
@@ -69090,7 +69090,7 @@ sub_802CB14: @ 802CB14
adds r4, r0
adds r4, r6
ldr r1, [r4]
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
subs r1, r0
lsls r0, r1, 4
subs r0, r1
@@ -69474,7 +69474,7 @@ _0802CDF4:
movs r0, 0
strh r0, [r5, 0x30]
_0802CE06:
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
movs r2, 0x30
ldrsh r0, [r5, r2]
lsls r0, 1
@@ -69525,7 +69525,7 @@ sub_802CE48: @ 802CE48
lsrs r2, r0, 24
cmp r2, 0x40
beq _0802CE88
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -69578,7 +69578,7 @@ _0802CEA6:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
adds r5, 0x1
@@ -69613,7 +69613,7 @@ _0802CEE8:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
adds r0, 0x3F
@@ -72725,7 +72725,7 @@ _0802E7C4:
movs r3, 0xD
negs r3, r3
mov r12, r3
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
_0802E7D8:
lsls r0, r5, 1
adds r0, r4
@@ -72803,7 +72803,7 @@ sub_802E83C: @ 802E83C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r0, r5
movs r1, 0x4
bl StartObjectImageAnim
@@ -72858,7 +72858,7 @@ _0802E8E0:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r5, 0x1
@@ -72957,7 +72957,7 @@ _0802E9BA:
lsrs r1, 24
adds r0, r6, 0
bl StartObjectImageAnim
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r2, 0x1C
ldrsh r0, [r5, r2]
lsls r1, r0, 4
@@ -72990,7 +72990,7 @@ _0802EA04:
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r0, 0x1C
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -73037,7 +73037,7 @@ sub_802EA50: @ 802EA50
adds r6, r4, r5
movs r0, 0x38
bl audio_play
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x1A
ldrsh r1, [r6, r0]
lsls r0, r1, 4
@@ -73254,7 +73254,7 @@ _0802EC08:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
bl obj_free_rotscale_entry
movs r3, 0xE
@@ -73280,7 +73280,7 @@ _0802EC4C:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
bl RemoveObjectAndFreeTiles
movs r0, 0x12
@@ -73312,7 +73312,7 @@ sub_802EC98: @ 802EC98
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r1, r0
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -73473,7 +73473,7 @@ sub_802EDCC: @ 802EDCC
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
lsls r4, r1, 4
adds r4, r1
@@ -73519,7 +73519,7 @@ sub_802EE30: @ 802EE30
lsls r0, 24
lsrs r0, 24
movs r3, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -73605,7 +73605,7 @@ _0802EEC8:
adds r0, 0x1
strh r0, [r4]
_0802EEE6:
ldr r0, =gUnknown_08329F40
ldr r0, =gSineTable
movs r2, 0x2
ldrsh r1, [r4, r2]
lsls r1, 1
@@ -73631,7 +73631,7 @@ _0802EEFC:
adds r0, 0x1
strh r0, [r4]
_0802EF1A:
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
movs r2, 0x2
ldrsh r0, [r4, r2]
lsls r0, 1
@@ -73802,7 +73802,7 @@ sub_802EFFC: @ 802EFFC
lsrs r0, 24
mov r4, r8
strh r0, [r4]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r5, r9
movs r6, 0
ldrsh r1, [r5, r6]
asm/mail.s
+1 -1
View File
@@ -1004,7 +1004,7 @@ sub_8121D00: @ 8121D00
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl sub_80D2EF8
_08121D58:
asm/main_menu.s
+20 -20
View File
@@ -1991,7 +1991,7 @@ task_new_game_prof_birch_speech_2: @ 80308B0
.pool
_080308D4:
ldrb r0, [r4, 0x18]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -2045,7 +2045,7 @@ task_new_game_prof_birch_speech_3: @ 8030928
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080309B6
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r1, 0x18
ldrsh r0, [r4, r1]
lsls r1, r0, 4
@@ -2183,7 +2183,7 @@ sub_8030A70: @ 8030A70
lsls r0, 3
adds r0, r6
ldrb r0, [r0, 0x1A]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -2264,7 +2264,7 @@ sub_8030B14: @ 8030B14
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r0, r1
movs r1, 0
ldrsh r0, [r5, r1]
@@ -2369,7 +2369,7 @@ task_new_game_prof_birch_speech_7: @ 8030C18
lsls r0, 16
cmp r0, 0
bne _08030C7C
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, =gTasks
lsls r4, r6, 2
adds r4, r6
@@ -2466,7 +2466,7 @@ task_new_game_prof_birch_speech_9: @ 8030CD4
ldrsh r0, [r4, r1]
cmp r0, 0
beq _08030D7A
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x18
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -2552,7 +2552,7 @@ task_new_game_prof_birch_speech_10: @ 8030D84
ldrsh r0, [r3, r1]
cmp r0, 0
beq _08030DB8
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r1, 0xC
ldrsh r0, [r3, r1]
lsls r1, r0, 4
@@ -2666,7 +2666,7 @@ _08030E76:
cmp r3, r0
beq _08030EB8
strh r3, [r4, 0x14]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0xC
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -2708,7 +2708,7 @@ sub_8030ED4: @ 8030ED4
adds r7, r1, 0
cmp r0, 0
bne _08030F0C
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r5, 4
adds r1, r5
lsls r1, 2
@@ -2719,7 +2719,7 @@ sub_8030ED4: @ 8030ED4
b _08030F72
.pool
_08030F0C:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
@@ -2788,7 +2788,7 @@ sub_8030F7C: @ 8030F7C
lsls r1, 3
adds r3, r1, r2
ldrb r1, [r3, 0xC]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -3044,7 +3044,7 @@ _080311A8:
_080311AE:
movs r0, 0x5
bl audio_play
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -3135,7 +3135,7 @@ task_new_game_prof_birch_speech_part2_6: @ 8031258
ldrsh r0, [r7, r1]
cmp r0, 0
beq _08031320
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
movs r2, 0x1C
ldrsh r1, [r7, r2]
lsls r0, r1, 4
@@ -3239,7 +3239,7 @@ task_new_game_prof_birch_speech_part2_7: @ 803133C
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080313D2
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
movs r1, 0x18
ldrsh r0, [r4, r1]
lsls r1, r0, 4
@@ -3321,7 +3321,7 @@ task_new_game_prof_birch_speech_part2_8: @ 80313E4
adds r7, r1, 0
cmp r0, 0
beq _080314B0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r3, 0x18
ldrsh r1, [r4, r3]
lsls r0, r1, 4
@@ -3427,7 +3427,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4
ldrsh r0, [r6, r1]
cmp r0, 0
beq _0803155C
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
movs r1, 0xC
ldrsh r0, [r6, r1]
lsls r1, r0, 4
@@ -3504,7 +3504,7 @@ task_new_game_prof_birch_speech_part2_10: @ 8031580
lsls r1, 3
adds r3, r1, r2
ldrb r1, [r3, 0xC]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -3540,7 +3540,7 @@ task_new_game_prof_birch_speech_part2_11: @ 80315BC
lsls r4, 3
adds r4, r0
ldrb r2, [r4, 0xC]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -3728,7 +3728,7 @@ _080317DC:
strh r0, [r4, 0x14]
ldrb r3, [r4, 0x1C]
_080317E0:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r3, 4
adds r1, r3
lsls r1, 2
@@ -3886,7 +3886,7 @@ AddBirchSpeechObjects: @ 803192C
bl AddNewGameBirchObject
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r9, r1
lsls r2, r0, 4
adds r2, r0
asm/map_obj_8097404.s
+12 -12
View File
@@ -20,7 +20,7 @@ sub_8097404: @ 8097404
movs r4, 0x1
orrs r0, r4
strb r0, [r5, 0x1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -167,7 +167,7 @@ npc_sync_anim_pause_bits: @ 8097514
negs r0, r0
ands r0, r1
strb r0, [r5, 0x1]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldrb r0, [r5, 0x4]
lsls r1, r0, 4
adds r1, r0
@@ -991,7 +991,7 @@ sub_8097AF0: @ 8097AF0
movs r5, 0
movs r4, 0x3F
_08097AF6:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r5, r0
adds r0, r2, 0
adds r0, 0x3E
@@ -1023,7 +1023,7 @@ sub_8097B2C: @ 8097B2C
lsls r0, 24
lsrs r5, r0, 24
movs r3, 0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r4, 0
_08097B38:
adds r2, r4, r6
@@ -1073,7 +1073,7 @@ sub_8097B78: @ 8097B78
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r5, 0
bl FieldObjectDirectionToImageAnimId
@@ -1103,7 +1103,7 @@ sub_8097BB4: @ 8097BB4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
adds r0, r5, 0
bl GetFieldObjectGraphicsInfo
@@ -1174,7 +1174,7 @@ sub_8097C44: @ 8097C44
beq _08097C80
cmp r4, 0
beq _08097C74
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -1184,7 +1184,7 @@ sub_8097C44: @ 8097C44
b _08097C80
.pool
_08097C74:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r3, 4
adds r0, r3
lsls r0, 2
@@ -1211,7 +1211,7 @@ sub_8097C8C: @ 8097C8C
b _08097CBA
_08097CA2:
movs r3, 0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -1241,7 +1241,7 @@ sub_8097CC4: @ 8097CC4
lsrs r2, r0, 24
cmp r2, 0x40
beq _08097CEA
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -1369,7 +1369,7 @@ sub_8097D9C: @ 8097D9C
lsrs r2, r0, 24
cmp r2, 0x40
beq _08097DC0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -1695,7 +1695,7 @@ sub_8097FE4: @ 8097FE4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r0, r1
ldrh r1, [r4, 0xC]
movs r0, 0x3
asm/menu_helpers.s
+4 -4
View File
@@ -775,7 +775,7 @@ sub_8122344: @ 8122344
movs r5, 0
cmp r5, r6
bcs _0812239C
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
_08122358:
lsls r1, r5, 4
ldr r0, =gUnknown_0859F524
@@ -828,7 +828,7 @@ sub_81223B0: @ 81223B0
movs r4, 0
cmp r4, r5
bcs _081223F6
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
_081223C0:
subs r0, r5, 0x1
cmp r4, r0
@@ -873,7 +873,7 @@ sub_81223FC: @ 81223FC
movs r3, 0
cmp r3, r4
bcs _0812243E
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r12, r1
movs r1, 0x1
ands r0, r1
@@ -930,7 +930,7 @@ sub_8122448: @ 8122448
movs r3, 0
cmp r3, r4
bcs _081224C8
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r0, r7, 16
asrs r0, 16
subs r0, 0x8
asm/mon_markings.s
+4 -4
View File
@@ -570,7 +570,7 @@ _0811FD70:
lsls r0, r3, 4
adds r0, r3
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
lsls r1, r5, 24
@@ -633,7 +633,7 @@ _0811FDEE:
lsls r0, r3, 4
adds r0, r3
lsls r0, 2
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
adds r0, r7
str r0, [r1]
strh r5, [r0, 0x2E]
@@ -717,7 +717,7 @@ _0811FEAE:
lsls r1, r3, 4
adds r1, r3
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2, 0x24]
ldr r3, [sp, 0x4C]
@@ -916,7 +916,7 @@ _08120068:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
_08120072:
add sp, 0x28
asm/money.s
+1 -1
View File
@@ -391,7 +391,7 @@ RemoveMoneyLabelObject: @ 80E53F4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeResources
pop {r0}
asm/naming_screen.s
+19 -19
View File
@@ -247,7 +247,7 @@ _080E2F64:
sub_80E2FA4: @ 80E2FA4
push {r4,r5,lr}
movs r3, 0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r5, 0x5
negs r5, r5
_080E2FAE:
@@ -1820,7 +1820,7 @@ sub_80E3CE4: @ 80E3CE4
strb r0, [r1]
movs r0, 0x1
bl sub_80E3E3C
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -1888,7 +1888,7 @@ sub_80E3D78: @ 80E3D78
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r5, r1, r2
lsrs r1, r0, 16
mov r8, r1
@@ -1943,7 +1943,7 @@ sub_80E3DFC: @ 80E3DFC
lsls r2, r3, 4
adds r2, r3
lsls r2, 2
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
adds r2, r3
ldrh r3, [r2, 0x2E]
strh r3, [r0]
@@ -1970,7 +1970,7 @@ sub_80E3E3C: @ 80E3E3C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r1, =gUnknown_02039F94
ldr r4, [r1]
ldr r1, =0x00001e23
@@ -2009,7 +2009,7 @@ sub_80E3E3C: @ 80E3E3C
sub_80E3E94: @ 80E3E94
push {r4,r5,lr}
lsls r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r1, =gUnknown_02039F94
ldr r4, [r1]
ldr r1, =0x00001e23
@@ -2049,7 +2049,7 @@ sub_80E3ED8: @ 80E3ED8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
@@ -2060,7 +2060,7 @@ sub_80E3ED8: @ 80E3ED8
thumb_func_start sub_80E3F04
sub_80E3F04: @ 80E3F04
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e23
@@ -2146,7 +2146,7 @@ sub_80E3F8C: @ 80E3F8C
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
add r5, r8
ldr r1, =gUnknown_0858C050
@@ -2217,7 +2217,7 @@ sub_80E4050: @ 80E4050
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x2
strh r1, [r0, 0x2E]
@@ -2260,7 +2260,7 @@ sub_80E40AC: @ 80E40AC
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r5, r1
movs r2, 0x3C
ldrsh r0, [r6, r2]
@@ -2304,7 +2304,7 @@ sub_80E4104: @ 80E4104
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r4, r0, r2
movs r0, 0x3C
ldrsh r1, [r3, r0]
@@ -2361,7 +2361,7 @@ sub_80E4178: @ 80E4178
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r0, r1
adds r3, r2, 0
adds r3, 0x3E
@@ -2450,7 +2450,7 @@ sub_80E4218: @ 80E4218
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
adds r4, r6
ldr r0, =gUnknown_0858C070
mov r8, r0
@@ -2505,7 +2505,7 @@ sub_80E4290: @ 80E4290
bl AddObjectToFront
lsls r0, 24
lsrs r1, r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -2624,7 +2624,7 @@ sub_80E4384: @ 80E4384
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -2654,7 +2654,7 @@ sub_80E43E0: @ 80E43E0
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
ldr r1, =gUnknown_0858C078
adds r0, r4, 0
@@ -2693,7 +2693,7 @@ sub_80E4420: @ 80E4420
bl sub_80D2CC4
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -2722,7 +2722,7 @@ sub_80E447C: @ 80E447C
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
asm/new_game.s
+1 -1
View File
@@ -278,7 +278,7 @@ _080844B2:
adds r0, 0xA8
str r5, [r0]
bl set_player_trainer_id
bl reset_playtime
bl PlayTimeCounter_Reset
bl sub_8084390
bl sub_809D300
bl sub_80EBEE0
asm/play_time.s
-125
View File
@@ -1,125 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start reset_playtime
reset_playtime: @ 80841E4
ldr r1, =gUnknown_03000E08
movs r0, 0
strb r0, [r1]
ldr r2, =gSaveBlock2Ptr
ldr r3, [r2]
movs r1, 0
movs r0, 0
strh r0, [r3, 0xE]
strb r1, [r3, 0x10]
ldr r0, [r2]
strb r1, [r0, 0x11]
ldr r0, [r2]
strb r1, [r0, 0x12]
bx lr
.pool
thumb_func_end reset_playtime
thumb_func_start set_max_playtime_if_appropriate
set_max_playtime_if_appropriate: @ 8084208
push {lr}
ldr r1, =gUnknown_03000E08
movs r0, 0x1
strb r0, [r1]
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrh r1, [r0, 0xE]
ldr r0, =0x000003e7
cmp r1, r0
bls _08084220
bl set_max_playtime
_08084220:
pop {r0}
bx r0
.pool
thumb_func_end set_max_playtime_if_appropriate
thumb_func_start sub_8084230
sub_8084230: @ 8084230
ldr r1, =gUnknown_03000E08
movs r0, 0
strb r0, [r1]
bx lr
.pool
thumb_func_end sub_8084230
thumb_func_start PlayTimeCounter_Update
PlayTimeCounter_Update: @ 808423C
push {lr}
ldr r0, =gUnknown_03000E08
ldrb r0, [r0]
cmp r0, 0x1
bne _08084294
ldr r2, =gSaveBlock2Ptr
ldr r0, [r2]
ldrb r1, [r0, 0x12]
adds r1, 0x1
movs r3, 0
strb r1, [r0, 0x12]
ldr r1, [r2]
ldrb r0, [r1, 0x12]
cmp r0, 0x3B
bls _08084294
strb r3, [r1, 0x12]
ldr r0, [r2]
ldrb r1, [r0, 0x11]
adds r1, 0x1
strb r1, [r0, 0x11]
ldr r1, [r2]
ldrb r0, [r1, 0x11]
cmp r0, 0x3B
bls _08084294
strb r3, [r1, 0x11]
ldr r0, [r2]
ldrb r1, [r0, 0x10]
adds r1, 0x1
strb r1, [r0, 0x10]
ldr r1, [r2]
ldrb r0, [r1, 0x10]
cmp r0, 0x3B
bls _08084294
strb r3, [r1, 0x10]
ldr r0, [r2]
ldrh r1, [r0, 0xE]
adds r1, 0x1
strh r1, [r0, 0xE]
lsls r1, 16
ldr r0, =0x03e70000
cmp r1, r0
bls _08084294
bl set_max_playtime
_08084294:
pop {r0}
bx r0
.pool
thumb_func_end PlayTimeCounter_Update
thumb_func_start set_max_playtime
set_max_playtime: @ 80842A4
ldr r1, =gUnknown_03000E08
movs r0, 0x2
strb r0, [r1]
ldr r2, =gSaveBlock2Ptr
ldr r3, [r2]
ldr r0, =0x000003e7
strh r0, [r3, 0xE]
movs r1, 0x3B
strb r1, [r3, 0x10]
ldr r0, [r2]
strb r1, [r0, 0x11]
ldr r0, [r2]
strb r1, [r0, 0x12]
bx lr
.pool
thumb_func_end set_max_playtime
.align 2, 0 @ Don't pad with nop.
asm/player_pc.s
+4 -4
View File
@@ -1999,7 +1999,7 @@ sub_816BEF0: @ 816BEF0
lsls r1, 3
adds r0, r1
ldrh r0, [r0]
bl itemid_get_description
bl ItemId_GetDescription
b _0816BF32
.pool
_0816BF2C:
@@ -2185,7 +2185,7 @@ sub_816C060: @ 816C060
cmp r2, 0x40
beq _0816C0B2
strb r2, [r5]
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -2225,7 +2225,7 @@ sub_816C0C8: @ 816C0C8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
movs r0, 0xFF
@@ -2416,7 +2416,7 @@ _0816C2AC:
.pool
_0816C2B4:
adds r0, r1, 0
bl itemid_get_description
bl ItemId_GetDescription
_0816C2BA:
pop {r1}
bx r1
asm/pokeblock_feed.s
+7 -7
View File
@@ -870,7 +870,7 @@ sub_817A358: @ 817A358
ldr r2, =0x0000105a
adds r1, r2
strb r0, [r1]
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
mov r1, r8
lsls r0, r1, 4
add r0, r8
@@ -930,7 +930,7 @@ _0817A402:
sub_817A434: @ 817A434
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -995,7 +995,7 @@ sub_817A4A4: @ 817A4A4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r3, r4, 4
adds r3, r4
lsls r3, 2
@@ -1034,7 +1034,7 @@ sub_817A4F8: @ 817A4F8
lsrs r7, r0, 24
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
lsls r0, r7, 4
adds r0, r7
@@ -1067,7 +1067,7 @@ _0817A548:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl obj_alloc_rotscale_entry
pop {r3}
@@ -1088,7 +1088,7 @@ sub_817A56C: @ 817A56C
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -1304,7 +1304,7 @@ _0817A7C8:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
adds r0, r4, 0
stm r0!, {r1}
asm/pokedex.s
+47 -47
View File
@@ -601,7 +601,7 @@ _080BB810:
cmp r0, 0
beq _080BB8A4
bl sub_80BD8D0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r0, [r7]
ldr r5, =0x00000626
adds r0, r5
@@ -1006,7 +1006,7 @@ sub_80BBBF4: @ 80BBBF4
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r5, =gUnknown_02039B4C
ldr r3, [r5]
ldr r6, =0x00000626
@@ -1334,7 +1334,7 @@ _080BBEEC:
cmp r0, 0
beq _080BBF70
bl sub_80BD8D0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r5]
ldr r2, =0x00000626
adds r0, r2
@@ -1734,7 +1734,7 @@ sub_80BC2D4: @ 80BC2D4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r5, =gUnknown_02039B4C
ldr r3, [r5]
ldr r4, =0x00000626
@@ -3611,7 +3611,7 @@ _080BD2DA:
bl sub_80BDACC
lsls r0, 24
lsrs r1, r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -3635,7 +3635,7 @@ _080BD334:
bl sub_80BDACC
lsls r0, 24
lsrs r1, r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -3661,7 +3661,7 @@ _080BD366:
bl sub_80BDACC
lsls r0, 24
lsrs r1, r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -3739,7 +3739,7 @@ _080BD440:
movs r3, 0
ldr r4, =0x0000ffff
mov r12, r4
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
adds r2, r7, 0
_080BD44C:
@@ -3804,7 +3804,7 @@ _080BD4DC:
movs r3, 0
ldr r2, =0x0000ffff
mov r12, r2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
mov r8, r4
adds r2, r7, 0
_080BD4E8:
@@ -3930,7 +3930,7 @@ _080BD5D8:
bl sub_80BDACC
lsls r0, 24
lsrs r1, r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -3972,7 +3972,7 @@ _080BD638:
bl sub_80BDACC
lsls r0, 24
lsrs r1, r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -4258,7 +4258,7 @@ sub_80BD8D0: @ 80BD8D0
movs r4, 0
ldr r0, =gUnknown_02039B4C
mov r12, r0
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r5, =0x0000ffff
_080BD8DC:
mov r1, r12
@@ -4535,7 +4535,7 @@ _080BDAE8:
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r4, r5
lsls r4, 2
@@ -4603,7 +4603,7 @@ sub_80BDB7C: @ 80BDB7C
bl AddObjectToFront
lsls r0, 24
lsrs r7, r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r10, r1
lsls r0, r7, 4
adds r0, r7
@@ -4837,7 +4837,7 @@ _080BDDB0:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
@@ -4845,7 +4845,7 @@ _080BDDB0:
b _080BDDE8
.pool
_080BDDD4:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
@@ -4879,7 +4879,7 @@ _080BDDE8:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
lsls r1, 24
lsrs r1, 24
@@ -4952,7 +4952,7 @@ _080BDEC4:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
@@ -4960,7 +4960,7 @@ _080BDEC4:
b _080BDEFC
.pool
_080BDEE8:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
@@ -4993,7 +4993,7 @@ _080BDEFC:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r2
lsls r1, 24
lsrs r1, 24
@@ -5123,7 +5123,7 @@ _080BE060:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
@@ -5131,7 +5131,7 @@ _080BE060:
b _080BE090
.pool
_080BE07C:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
@@ -5161,7 +5161,7 @@ _080BE090:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
lsls r1, 24
lsrs r1, 24
@@ -5235,7 +5235,7 @@ _080BE160:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
@@ -5243,7 +5243,7 @@ _080BE160:
b _080BE198
.pool
_080BE184:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
@@ -5277,7 +5277,7 @@ _080BE198:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
lsls r1, 24
lsrs r1, 24
@@ -5347,7 +5347,7 @@ _080BE26C:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
@@ -5355,7 +5355,7 @@ _080BE26C:
b _080BE29C
.pool
_080BE288:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
@@ -5385,7 +5385,7 @@ _080BE29C:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
lsls r1, 24
lsrs r1, 24
@@ -5459,7 +5459,7 @@ _080BE36C:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
@@ -5467,7 +5467,7 @@ _080BE36C:
b _080BE3A4
.pool
_080BE390:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
@@ -5500,7 +5500,7 @@ _080BE3A4:
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r2
lsls r1, 24
lsrs r1, 24
@@ -5513,7 +5513,7 @@ _080BE3E2:
bl AddObjectToFront
lsls r0, 24
lsrs r7, r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
@@ -5664,7 +5664,7 @@ sub_80BE4E0: @ 80BE4E0
b _080BE5EC
.pool
_080BE520:
ldr r2, =gUnknown_08329F40
ldr r2, =gSineTable
ldrh r0, [r4, 0x38]
lsls r0, 24
lsrs r0, 23
@@ -5896,7 +5896,7 @@ _080BE6EC:
_080BE6F8:
lsrs r0, 24
adds r4, r1, 0
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
lsls r0, 1
adds r0, r1
movs r1, 0
@@ -5993,7 +5993,7 @@ _080BE7AC:
adds r1, r0
lsls r1, 24
lsrs r1, 24
ldr r4, =gUnknown_08329F40
ldr r4, =gSineTable
lsls r0, r1, 1
adds r0, r4
ldrh r3, [r0]
@@ -6105,7 +6105,7 @@ _080BE86C:
ldrh r0, [r0]
lsls r0, 4
strh r0, [r3, 0x26]
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
ldrh r2, [r3, 0x32]
lsls r0, r2, 24
lsrs r0, 23
@@ -6492,7 +6492,7 @@ _080BEC08:
movs r3, 0
bl sub_80C0E9C
strh r0, [r4, 0x10]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r3, 0x10
ldrsh r0, [r4, r3]
lsls r1, r0, 4
@@ -6528,7 +6528,7 @@ _080BEC76:
ldrsh r0, [r1, r2]
cmp r0, 0
beq _080BEC98
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x10
ldrsh r1, [r1, r0]
lsls r0, r1, 4
@@ -7342,7 +7342,7 @@ _080BF3D0:
adds r1, r2
movs r3, 0
strh r0, [r1, 0x10]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r4, 0x10
ldrsh r0, [r1, r4]
lsls r1, r0, 4
@@ -7932,7 +7932,7 @@ _080BF982:
bl sub_80C0EF8
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r6, 4
adds r4, r6
lsls r4, 2
@@ -8002,7 +8002,7 @@ _080BFA34:
bl sub_80C0E9C
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r6, 4
adds r4, r6
lsls r4, 2
@@ -8612,7 +8612,7 @@ _080BFFA8:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -8719,7 +8719,7 @@ sub_80C0088: @ 80C0088
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
@@ -8815,7 +8815,7 @@ _080C0168:
lsls r2, 16
ldrh r3, [r4, 0x24]
orrs r2, r3
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
movs r3, 0xE
ldrsh r4, [r4, r3]
lsls r3, r4, 4
@@ -13206,7 +13206,7 @@ _080C2550:
lsls r0, 7
adds r0, r2, r0
lsls r0, 24
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
lsrs r0, 23
adds r0, r1
movs r1, 0
@@ -13252,7 +13252,7 @@ sub_80C2594: @ 80C2594
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
asm/pokedex_area_screen.s
+3 -3
View File
@@ -1070,7 +1070,7 @@ _0813D2A8:
movs r2, 0x7F
ands r1, r2
strh r1, [r0]
ldr r3, =gUnknown_08329F40
ldr r3, =gSineTable
ldr r1, [r7]
ldr r2, =0x0000061a
adds r0, r1, r2
@@ -1647,7 +1647,7 @@ _0813D710:
lsrs r1, r0, 24
cmp r1, 0x40
beq _0813D7BE
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r2, r1, 4
adds r2, r1
lsls r2, 2
@@ -1824,7 +1824,7 @@ _0813D904:
.pool
_0813D920:
movs r4, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
_0813D924:
lsls r1, r4, 21
movs r6, 0xA0
asm/pokedex_cry_screen.s
+3 -3
View File
@@ -721,7 +721,7 @@ _081458F8:
thumb_func_start sub_8145914
sub_8145914: @ 8145914
push {r4-r6,lr}
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r6, =gUnknown_0203AB98
ldr r0, [r6]
ldrh r1, [r0, 0x4]
@@ -761,7 +761,7 @@ sub_814596C: @ 814596C
push {r4-r7,lr}
sub sp, 0x14
adds r7, r0, 0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r4, =gUnknown_0203AB98
ldr r0, [r4]
ldrh r1, [r0, 0x4]
@@ -936,7 +936,7 @@ _08145A82:
str r0, [sp]
movs r0, 0
bl SetSpriteTransformationMatrix
ldr r2, =gUnknown_08329F40
ldr r2, =gSineTable
ldr r0, [r6]
ldrb r0, [r0]
lsls r0, 24
asm/pokemon_1.s
+119 -119
View File
@@ -34,45 +34,45 @@ zero_pokemon_struct: @ 8067A8C
adds r0, r4, 0
movs r1, 0x37
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x38
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3A
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3B
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3C
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3D
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3E
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3F
mov r2, sp
bl pokemon_setattr
bl SetMonData
movs r0, 0xFF
str r0, [sp]
adds r0, r4, 0
movs r1, 0x40
mov r2, sp
bl pokemon_setattr
bl SetMonData
add sp, 0x4
pop {r4}
pop {r0}
@@ -157,13 +157,13 @@ create_pokemon_set_level: @ 8067B4C
mov r0, r8
movs r1, 0x38
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
movs r0, 0xFF
str r0, [sp, 0x14]
add r2, sp, 0x14
mov r0, r8
movs r1, 0x40
bl pokemon_setattr
bl SetMonData
mov r0, r8
bl pokemon_calc_effective_stats
add sp, 0x1C
@@ -219,7 +219,7 @@ _08067C0C:
add r2, sp, 0x14
adds r0, r7, 0
movs r1, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
add r0, sp, 0x18
mov r9, r0
add r5, sp, 0xC
@@ -280,14 +280,14 @@ _08067C8A:
adds r0, r7, 0
movs r1, 0x1
mov r2, r9
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
bl pokemon_calc_checksum
strh r0, [r5]
adds r0, r7, 0
movs r1, 0x9
adds r2, r5, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
bl pokemon_encrypt
mov r0, sp
@@ -296,21 +296,21 @@ _08067C8A:
adds r0, r7, 0
movs r1, 0x2
mov r2, sp
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r2, =gGameLanguage
adds r0, r7, 0
movs r1, 0x3
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r5, =gSaveBlock2Ptr
ldr r2, [r5]
adds r0, r7, 0
movs r1, 0x7
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
movs r1, 0xB
mov r2, sp
adds r2, 0xE
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r4, =gBaseStats
mov r2, sp
ldrh r1, [r2, 0xE]
@@ -331,7 +331,7 @@ _08067C8A:
adds r2, r0
adds r0, r7, 0
movs r1, 0x19
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
mov r1, sp
ldrh r0, [r1, 0xE]
lsls r2, r0, 3
@@ -341,7 +341,7 @@ _08067C8A:
adds r2, r4
adds r0, r7, 0
movs r1, 0x20
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
bl sav1_map_get_name
lsls r0, 24
lsrs r0, 24
@@ -349,26 +349,26 @@ _08067C8A:
adds r0, r7, 0
movs r1, 0x23
mov r2, r9
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
movs r1, 0x24
add r2, sp, 0x10
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r2, =gGameVersion
adds r0, r7, 0
movs r1, 0x25
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
movs r0, 0x4
str r0, [sp, 0x18]
adds r0, r7, 0
movs r1, 0x26
mov r2, r9
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r2, [r5]
adds r2, 0x8
adds r0, r7, 0
movs r1, 0x31
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
mov r2, sp
ldrb r0, [r2, 0x11]
cmp r0, 0x1F
@@ -376,32 +376,32 @@ _08067C8A:
adds r0, r7, 0
movs r1, 0x27
adds r2, 0x11
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
movs r1, 0x28
mov r2, sp
adds r2, 0x11
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
movs r1, 0x29
mov r2, sp
adds r2, 0x11
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
movs r1, 0x2A
mov r2, sp
adds r2, 0x11
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
movs r1, 0x2B
mov r2, sp
adds r2, 0x11
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r0, r7, 0
movs r1, 0x2C
mov r2, sp
adds r2, 0x11
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
b _08067E50
.pool
_08067DC8:
@@ -417,7 +417,7 @@ _08067DC8:
adds r0, r7, 0
movs r1, 0x27
adds r2, r4, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r0, [sp, 0x18]
movs r6, 0xF8
lsls r6, 2
@@ -427,7 +427,7 @@ _08067DC8:
adds r0, r7, 0
movs r1, 0x28
adds r2, r4, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r0, [sp, 0x18]
movs r5, 0xF8
lsls r5, 7
@@ -437,7 +437,7 @@ _08067DC8:
adds r0, r7, 0
movs r1, 0x29
adds r2, r4, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
bl Random
lsls r0, 16
lsrs r0, 16
@@ -448,7 +448,7 @@ _08067DC8:
adds r0, r7, 0
movs r1, 0x2A
adds r2, r4, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r0, [sp, 0x18]
ands r0, r6
lsrs r0, 5
@@ -456,7 +456,7 @@ _08067DC8:
adds r0, r7, 0
movs r1, 0x2B
adds r2, r4, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldr r0, [sp, 0x18]
ands r0, r5
lsrs r0, 10
@@ -464,7 +464,7 @@ _08067DC8:
adds r0, r7, 0
movs r1, 0x2C
adds r2, r4, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
_08067E50:
ldr r2, =gBaseStats
mov r3, sp
@@ -483,7 +483,7 @@ _08067E50:
adds r0, r7, 0
movs r1, 0x2E
mov r2, r9
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
_08067E76:
adds r0, r7, 0
bl sub_8069270
@@ -747,7 +747,7 @@ sub_8068060: @ 8068060
adds r0, r4, 0
movs r1, 0x42
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
bl pokemon_calc_effective_stats
add sp, 0x14
@@ -779,28 +779,28 @@ sub_80680A0: @ 80680A0
adds r0, r5, 0
movs r1, 0x27
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
adds r2, r4, 0x1
adds r0, r5, 0
movs r1, 0x28
bl pokemon_setattr
bl SetMonData
adds r2, r4, 0x2
adds r0, r5, 0
movs r1, 0x29
bl pokemon_setattr
bl SetMonData
adds r2, r4, 0x3
adds r0, r5, 0
movs r1, 0x2A
bl pokemon_setattr
bl SetMonData
adds r2, r4, 0x4
adds r0, r5, 0
movs r1, 0x2B
bl pokemon_setattr
bl SetMonData
adds r4, 0x5
adds r0, r5, 0
movs r1, 0x2C
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
adds r0, r5, 0
bl pokemon_calc_effective_stats
add sp, 0x10
@@ -864,7 +864,7 @@ _0806816C:
adds r1, 0x1A
adds r0, r7, 0
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
_08068180:
lsls r0, r4, 25
lsrs r4, r0, 24
@@ -923,16 +923,16 @@ _080681D2:
adds r2, 0xD
adds r0, r7, 0
movs r1, 0x15
bl pokemon_setattr
bl SetMonData
adds r2, r6, 0x2
adds r0, r7, 0
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
adds r2, r6, 0
adds r2, 0x2B
adds r0, r7, 0
movs r1, 0x20
bl pokemon_setattr
bl SetMonData
adds r1, r6, 0
adds r1, 0x20
add r0, sp, 0x10
@@ -959,41 +959,41 @@ _08068236:
adds r0, r7, 0
movs r1, 0x3
mov r2, r9
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x2
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
adds r2, r6, 0
adds r2, 0xE
adds r0, r7, 0
movs r1, 0x1A
bl pokemon_setattr
bl SetMonData
adds r2, r6, 0
adds r2, 0xF
adds r0, r7, 0
movs r1, 0x1B
bl pokemon_setattr
bl SetMonData
adds r2, r6, 0
adds r2, 0x10
adds r0, r7, 0
movs r1, 0x1C
bl pokemon_setattr
bl SetMonData
adds r2, r6, 0
adds r2, 0x11
adds r0, r7, 0
movs r1, 0x1D
bl pokemon_setattr
bl SetMonData
adds r2, r6, 0
adds r2, 0x12
adds r0, r7, 0
movs r1, 0x1E
bl pokemon_setattr
bl SetMonData
adds r2, r6, 0
adds r2, 0x13
adds r0, r7, 0
movs r1, 0x1F
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x1B]
lsrs r0, 7
mov r1, r8
@@ -1001,7 +1001,7 @@ _08068236:
adds r0, r7, 0
movs r1, 0x2E
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x18]
lsls r0, 27
lsrs r0, 27
@@ -1010,7 +1010,7 @@ _08068236:
adds r0, r7, 0
movs r1, 0x27
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrh r0, [r6, 0x18]
lsls r0, 22
lsrs r0, 27
@@ -1019,7 +1019,7 @@ _08068236:
adds r0, r7, 0
movs r1, 0x28
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x19]
lsls r0, 25
lsrs r0, 27
@@ -1028,7 +1028,7 @@ _08068236:
adds r0, r7, 0
movs r1, 0x29
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldr r0, [r6, 0x18]
lsls r0, 12
lsrs r0, 27
@@ -1037,7 +1037,7 @@ _08068236:
adds r0, r7, 0
movs r1, 0x2A
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrh r0, [r6, 0x1A]
lsls r0, 23
lsrs r0, 27
@@ -1046,7 +1046,7 @@ _08068236:
adds r0, r7, 0
movs r1, 0x2B
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x1B]
lsls r0, 26
lsrs r0, 27
@@ -1055,7 +1055,7 @@ _08068236:
adds r0, r7, 0
movs r1, 0x2C
mov r2, r8
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
bl sub_806E924
adds r0, r7, 0
@@ -1158,15 +1158,15 @@ _080683D2:
adds r0, r7, 0
movs r1, 0x15
mov r2, r10
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0xC
ldr r2, [sp, 0x38]
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x20
ldr r2, [sp, 0x34]
bl pokemon_setattr
bl SetMonData
add r0, sp, 0x10
ldr r1, [sp, 0x54]
bl StringCopy
@@ -1192,35 +1192,35 @@ _08068430:
adds r0, r7, 0
movs r1, 0x3
mov r2, r9
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x2
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x1A
ldr r2, [sp, 0x3C]
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x1B
ldr r2, [sp, 0x40]
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x1C
ldr r2, [sp, 0x44]
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x1D
ldr r2, [sp, 0x48]
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x1E
ldr r2, [sp, 0x4C]
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x1F
ldr r2, [sp, 0x50]
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x1B]
lsrs r0, 7
mov r1, r8
@@ -1228,7 +1228,7 @@ _08068430:
adds r0, r7, 0
movs r1, 0x2E
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x18]
lsls r0, 27
lsrs r0, 27
@@ -1237,7 +1237,7 @@ _08068430:
adds r0, r7, 0
movs r1, 0x27
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrh r0, [r6, 0x18]
lsls r0, 22
lsrs r0, 27
@@ -1246,7 +1246,7 @@ _08068430:
adds r0, r7, 0
movs r1, 0x28
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x19]
lsls r0, 25
lsrs r0, 27
@@ -1255,7 +1255,7 @@ _08068430:
adds r0, r7, 0
movs r1, 0x29
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldr r0, [r6, 0x18]
lsls r0, 12
lsrs r0, 27
@@ -1264,7 +1264,7 @@ _08068430:
adds r0, r7, 0
movs r1, 0x2A
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrh r0, [r6, 0x1A]
lsls r0, 23
lsrs r0, 27
@@ -1273,7 +1273,7 @@ _08068430:
adds r0, r7, 0
movs r1, 0x2B
mov r2, r8
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x1B]
lsls r0, 26
lsrs r0, 27
@@ -1282,7 +1282,7 @@ _08068430:
adds r0, r7, 0
movs r1, 0x2C
mov r2, r8
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
bl sub_806E924
adds r0, r7, 0
@@ -1364,7 +1364,7 @@ sub_8068528: @ 8068528
adds r2, 0xE
adds r0, r7, 0
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
movs r4, 0
movs r2, 0x12
add r2, sp
@@ -1393,7 +1393,7 @@ _080685E0:
adds r1, 0x1A
adds r0, r7, 0
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
adds r4, 0x1
cmp r4, 0x5
ble _080685E0
@@ -1403,7 +1403,7 @@ _080685E0:
adds r0, r7, 0
movs r1, 0x3
mov r2, r8
bl pokemon_setattr
bl SetMonData
mov r2, r9
ldrb r0, [r2]
lsls r0, 27
@@ -1414,7 +1414,7 @@ _080685E0:
adds r2, r0, 0
adds r0, r7, 0
movs r1, 0x7
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
bl pokemon_calc_effective_stats
add sp, 0x14
@@ -1509,7 +1509,7 @@ _080686C6:
adds r1, 0x1A
adds r0, r7, 0
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
_080686DA:
lsls r0, r5, 25
lsrs r5, r0, 24
@@ -1752,7 +1752,7 @@ sub_80688A8: @ 80688A8
mov r0, r8
movs r1, 0x50
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
add sp, 0x14
pop {r3}
mov r8, r3
@@ -1871,7 +1871,7 @@ _080689E4:
beq _080689CE
_080689F4:
adds r0, r5, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080689CE
@@ -1985,7 +1985,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3B
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3C
movs r2, 0
@@ -1994,7 +1994,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3C
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3D
movs r2, 0
@@ -2003,7 +2003,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3D
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3E
movs r2, 0
@@ -2012,7 +2012,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3E
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3F
movs r2, 0
@@ -2021,7 +2021,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3F
mov r2, sp
bl pokemon_setattr
bl SetMonData
_08068B34:
adds r5, 0x1
cmp r5, 0x5
@@ -2163,7 +2163,7 @@ DoScriptedWildBattle: @ 8068C18
adds r0, r7, 0
movs r1, 0xC
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
_08068C60:
add sp, 0x14
pop {r4-r7}
@@ -2342,7 +2342,7 @@ pokemon_calc_effective_stats: @ 8068D0C
adds r0, r5, 0
movs r1, 0x38
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldr r0, =0x0000012f
cmp r7, r0
bne _08068DF8
@@ -2376,7 +2376,7 @@ _08068E12:
adds r0, 0xA
str r0, [sp, 0x4]
_08068E26:
ldr r1, =gUnknown_02024474
ldr r1, =gBattleScripting
add r2, sp, 0x4
ldrb r0, [r2]
mov r3, r8
@@ -2391,7 +2391,7 @@ _08068E26:
_08068E3E:
adds r0, r5, 0
movs r1, 0x3A
bl pokemon_setattr
bl SetMonData
ldr r0, =gBaseStats
subs r1, r6, r7
lsls r1, 2
@@ -2427,7 +2427,7 @@ _08068E5E:
adds r0, r5, 0
movs r1, 0x3B
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x2]
lsls r0, 1
ldr r3, [sp, 0x20]
@@ -2459,7 +2459,7 @@ _08068EA4:
adds r0, r5, 0
movs r1, 0x3C
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x3]
lsls r0, 1
ldr r2, [sp, 0x28]
@@ -2491,7 +2491,7 @@ _08068EEA:
adds r0, r5, 0
movs r1, 0x3D
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x4]
lsls r0, 1
ldr r3, [sp, 0x30]
@@ -2523,7 +2523,7 @@ _08068F30:
adds r0, r5, 0
movs r1, 0x3E
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6, 0x5]
lsls r0, 1
ldr r2, [sp, 0x38]
@@ -2555,7 +2555,7 @@ _08068F76:
adds r0, r5, 0
movs r1, 0x3F
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
ldr r0, =0x0000012f
cmp r7, r0
bne _08068FD0
@@ -2588,7 +2588,7 @@ _08068FE8:
add r2, sp, 0x1C
adds r0, r5, 0
movs r1, 0x39
bl pokemon_setattr
bl SetMonData
_08068FF4:
add sp, 0x40
pop {r3-r5}
@@ -2615,21 +2615,21 @@ sub_8069004: @ 8069004
adds r0, r4, 0
movs r1, 0x37
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x3A
mov r2, sp
bl pokemon_setattr
bl SetMonData
movs r0, 0xFF
str r0, [sp]
adds r0, r4, 0
movs r1, 0x40
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
bl pokemon_calc_effective_stats
add sp, 0x4
@@ -2781,7 +2781,7 @@ _0806914E:
adds r0, r7, 0
adds r1, r4, 0
mov r2, sp
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r1, r5, 0
adds r1, 0x11
ldrh r0, [r6]
@@ -2791,7 +2791,7 @@ _0806914E:
ldr r0, =gBattleMoves + 0x4 @ PP offset
adds r2, r0
adds r0, r7, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
ldrh r0, [r6]
b _080691A4
.pool
@@ -2868,7 +2868,7 @@ sub_80691F4: @ 80691F4
adds r1, 0xD
adds r0, r5, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r4, 0x11
mov r0, sp
ldrh r0, [r0]
@@ -2879,7 +2879,7 @@ sub_80691F4: @ 80691F4
adds r2, r0
adds r0, r5, 0
adds r1, r4, 0
bl pokemon_setattr
bl SetMonData
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -3194,12 +3194,12 @@ _08069494:
adds r1, 0xD
adds r0, r6, 0
adds r2, r5, 0
bl pokemon_setattr
bl SetMonData
adds r1, r4, 0
adds r1, 0x11
adds r2, r7, r4
adds r0, r6, 0
bl pokemon_setattr
bl SetMonData
adds r5, 0x2
adds r4, 0x1
cmp r4, 0x3
@@ -3207,7 +3207,7 @@ _08069494:
adds r0, r6, 0
movs r1, 0x15
mov r2, r9
bl pokemon_setattr
bl SetMonData
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -3279,12 +3279,12 @@ _08069540:
adds r1, 0xD
adds r0, r6, 0
adds r2, r5, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r1, r4, 0
adds r1, 0x11
adds r2, r7, r4
adds r0, r6, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
adds r5, 0x2
adds r4, 0x1
cmp r4, 0x3
@@ -3292,7 +3292,7 @@ _08069540:
adds r0, r6, 0
movs r1, 0x15
mov r2, r9
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
add sp, 0x10
pop {r3,r4}
mov r8, r3
asm/pokemon_2.s
+43 -43
View File
@@ -25,9 +25,9 @@ _08069E04:
b _08069EC2
_08069E0A:
movs r5, 0
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
ldrb r3, [r0]
ldr r4, =gUnknown_02024210
ldr r4, =gAbsentBankFlags
ldr r2, =gBitTable
_08069E14:
cmp r5, r3
@@ -52,16 +52,16 @@ _08069E40:
_08069E42:
lsls r0, r5, 24
lsrs r0, 24
bl battle_side_get_owner
bl GetBankSide
adds r4, r0, 0
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _08069E74
ldr r0, =gUnknown_02024210
ldr r0, =gAbsentBankFlags
ldrb r1, [r0]
ldr r2, =gBitTable
lsls r0, r5, 2
@@ -84,16 +84,16 @@ _08069E88:
_08069E8A:
lsls r0, r5, 24
lsrs r0, 24
bl battle_side_get_owner
bl GetBankSide
adds r4, r0, 0
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _08069EBC
ldr r0, =gUnknown_02024210
ldr r0, =gAbsentBankFlags
ldrb r1, [r0]
ldr r2, =gBitTable
lsls r0, r5, 2
@@ -131,7 +131,7 @@ sub_8069ED8: @ 8069ED8
cmp r0, 0
bne _08069F1C
adds r0, r2, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08069F1C
@@ -169,7 +169,7 @@ sub_8069F34: @ 8069F34
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
bl battle_get_per_side_status
bl GetBankIdentity
movs r1, 0x1
movs r6, 0x1
adds r4, r6, 0
@@ -203,7 +203,7 @@ _08069F7C:
adds r0, r4, 0
b _08069FA6
_08069F80:
ldr r0, =gUnknown_02024210
ldr r0, =gAbsentBankFlags
ldrb r1, [r0]
ldr r2, =gBitTable
lsls r0, r4, 2
@@ -220,7 +220,7 @@ _08069FA0:
eors r5, r0
adds r0, r5, 0
_08069FA6:
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
pop {r4-r6}
@@ -1938,9 +1938,9 @@ _0806AC98:
bx r1
thumb_func_end pokemon_getattr_encrypted
thumb_func_start pokemon_setattr
@ int pokemon_setattr(pokemon *mon, enum pokemon_data_request req, void *data)
pokemon_setattr: @ 806ACAC
thumb_func_start SetMonData
@ int SetMonData(pokemon *mon, enum pokemon_data_request req, void *data)
SetMonData: @ 806ACAC
push {lr}
adds r3, r0, 0
adds r0, r1, 0
@@ -2056,15 +2056,15 @@ _0806AD86:
b _0806AD96
_0806AD90:
adds r0, r3, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
_0806AD96:
pop {r0}
bx r0
thumb_func_end pokemon_setattr
thumb_func_end SetMonData
thumb_func_start pokemon_setattr_encrypted
@ int pokemon_setattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
pokemon_setattr_encrypted: @ 806AD9C
thumb_func_start SetMonData_encrypted
@ int SetMonData_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
SetMonData_encrypted: @ 806AD9C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2863,7 +2863,7 @@ _0806B3EC:
pop {r0}
bx r0
.pool
thumb_func_end pokemon_setattr_encrypted
thumb_func_end SetMonData_encrypted
thumb_func_start memcpy_pokemon
@ void *memcpy_pokemon(void *dest, void *src, unsigned int size)
@@ -2882,17 +2882,17 @@ pokemon_catch: @ 806B414
ldr r4, =gSaveBlock2Ptr
ldr r2, [r4]
movs r1, 0x7
bl pokemon_setattr
bl SetMonData
ldr r2, [r4]
adds r2, 0x8
adds r0, r6, 0
movs r1, 0x31
bl pokemon_setattr
bl SetMonData
ldr r2, [r4]
adds r2, 0xA
adds r0, r6, 0
movs r1, 0x1
bl pokemon_setattr
bl SetMonData
movs r5, 0
b _0806B446
.pool
@@ -3201,7 +3201,7 @@ sub_806B694: @ 806B694
lsls r1, 24
cmp r1, 0
beq _0806B6B8
ldr r2, =gUnknown_0202420A
ldr r2, =gLastUsedAbility
ldr r1, =gBaseStats
lsls r0, r3, 3
subs r0, r3
@@ -3211,7 +3211,7 @@ sub_806B694: @ 806B694
b _0806B6C6
.pool
_0806B6B8:
ldr r2, =gUnknown_0202420A
ldr r2, =gLastUsedAbility
ldr r1, =gBaseStats
lsls r0, r3, 3
subs r0, r3
@@ -3263,7 +3263,7 @@ create_enemy_party: @ 806B70C
sub sp, 0x14
adds r5, r0, 0
bl zero_enemy_party_data
ldr r4, =gUnknown_020244A8
ldr r4, =gBattleResources
ldr r0, [r4]
ldr r0, [r0]
adds r1, r5, 0
@@ -3272,7 +3272,7 @@ create_enemy_party: @ 806B70C
movs r0, 0
mov r9, r0
_0806B730:
ldr r1, =gUnknown_020244A8
ldr r1, =gBattleResources
ldr r3, [r1]
ldr r2, [r3]
mov r4, r9
@@ -3312,7 +3312,7 @@ _0806B730:
adds r0, r5, 0
movs r3, 0xF
bl create_pokemon_set_level
ldr r1, =gUnknown_020244A8
ldr r1, =gBattleResources
ldr r0, [r1]
adds r1, r7, 0
adds r1, 0x88
@@ -3320,7 +3320,7 @@ _0806B730:
adds r2, r1
adds r0, r5, 0
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
movs r5, 0
mov r10, r4
mov r7, r9
@@ -3329,12 +3329,12 @@ _0806B730:
_0806B7A0:
adds r1, r5, 0
adds r1, 0x1A
ldr r2, =gUnknown_020244A8
ldr r2, =gBattleResources
ldr r0, [r2]
ldr r2, [r0]
adds r2, r7
adds r0, r6, r4
bl pokemon_setattr
bl SetMonData
adds r5, 0x1
cmp r5, 0x5
ble _0806B7A0
@@ -3352,15 +3352,15 @@ _0806B7A0:
_0806B7CE:
adds r1, r5, 0
adds r1, 0xD
ldr r2, =gUnknown_020244A8
ldr r2, =gBattleResources
ldr r0, [r2]
ldr r2, [r0]
adds r2, r6
adds r0, r7, 0
bl pokemon_setattr
bl SetMonData
adds r1, r5, 0
adds r1, 0x11
ldr r3, =gUnknown_020244A8
ldr r3, =gBattleResources
ldr r0, [r3]
ldr r0, [r0]
adds r0, 0x4C
@@ -3372,7 +3372,7 @@ _0806B7CE:
ldr r0, =gBattleMoves + 0x4 @ PP offset
adds r2, r0
adds r0, r7, 0
bl pokemon_setattr
bl SetMonData
adds r6, 0x2
adds r4, 0x2
adds r5, 0x1
@@ -3398,7 +3398,7 @@ _0806B80A:
sub_806B830: @ 806B830
push {r4,r5,lr}
ldr r5, =gUnknown_08329EB8
ldr r0, =gUnknown_020244A8
ldr r0, =gBattleResources
ldr r0, [r0]
ldr r4, [r0]
ldrb r0, [r4, 0x9]
@@ -3427,7 +3427,7 @@ sub_806B830: @ 806B830
sub_806B870: @ 806B870
push {r4,r5,lr}
ldr r5, =gUnknown_08329EB8
ldr r0, =gUnknown_020244A8
ldr r0, =gBattleResources
ldr r0, [r0]
ldr r4, [r0]
ldrb r0, [r4, 0x9]
@@ -3618,7 +3618,7 @@ sub_806B9A8: @ 806B9A8
adds r0, r5, 0
movs r1, 0x15
mov r2, sp
bl pokemon_setattr
bl SetMonData
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -3945,8 +3945,8 @@ _0806BA4E:
movs r1, 0x7
bl GetMonData
ldr r0, [sp, 0x14]
bl battle_side_get_owner
ldr r1, =gUnknown_0202449C
bl GetBankSide
ldr r1, =gBattleStruct
lsls r0, 24
lsrs r0, 23
adds r0, 0xA8
asm/pokemon_3.s
+76 -76
View File
@@ -75,7 +75,7 @@ ExecuteTableBasedItemEffect: @ 806BD28
ands r0, r1
cmp r0, 0
beq _0806BDA8
ldr r2, =gUnknown_02024404
ldr r2, =gEnigmaBerries
ldr r0, =gUnknown_020244B8
ldrb r1, [r0]
lsls r0, r1, 3
@@ -94,7 +94,7 @@ _0806BDA8:
b _0806BDC4
.pool
_0806BDBC:
bl itemid_get_x12
bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
_0806BDC4:
@@ -113,23 +113,23 @@ _0806BDC4:
lsrs r1, r0, 24
cmp r1, 0
beq _0806BE64
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
strb r2, [r0]
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
negs r1, r0
orrs r1, r0
lsrs r1, 31
str r1, [sp, 0x1C]
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldr r4, [sp, 0xC]
subs r4, 0xD
ldrb r0, [r0]
cmp r1, r0
bge _0806BE70
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
lsls r0, r1, 1
adds r0, r2
ldrh r3, [r0]
@@ -147,7 +147,7 @@ _0806BE3C:
ldr r1, [sp, 0x1C]
adds r1, 0x2
str r1, [sp, 0x1C]
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r0, [r0]
cmp r1, r0
bge _0806BE70
@@ -164,7 +164,7 @@ _0806BE3C:
b _0806BE70
.pool
_0806BE64:
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
strb r1, [r0]
movs r3, 0x4
str r3, [sp, 0x38]
@@ -199,7 +199,7 @@ _0806BE9A:
ands r0, r1
cmp r0, 0
beq _0806BECC
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
ldrb r1, [r0]
lsls r0, r1, 3
subs r0, r1
@@ -296,7 +296,7 @@ _0806BF76:
cmp r0, 0
beq _0806BFA4
ldr r1, =gBattleMons
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
ldrb r2, [r0]
movs r0, 0x58
muls r0, r2
@@ -322,7 +322,7 @@ _0806BFA4:
bl _0806CD4C
_0806BFB2:
ldr r6, =gBattleMons
ldr r5, =gUnknown_02024064
ldr r5, =gActiveBank
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -361,7 +361,7 @@ _0806BFFC:
cmp r3, 0
beq _0806C042
ldr r7, =gBattleMons
ldr r5, =gUnknown_02024064
ldr r5, =gActiveBank
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -395,7 +395,7 @@ _0806C042:
bl _0806CD4C
_0806C050:
ldr r6, =gBattleMons
ldr r5, =gUnknown_02024064
ldr r5, =gActiveBank
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -432,7 +432,7 @@ _0806C08C:
cmp r3, 0
beq _0806C0D2
ldr r7, =gBattleMons
ldr r5, =gUnknown_02024064
ldr r5, =gActiveBank
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -466,7 +466,7 @@ _0806C0D2:
bl _0806CD4C
_0806C0E0:
ldr r6, =gBattleMons
ldr r5, =gUnknown_02024064
ldr r5, =gActiveBank
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -504,10 +504,10 @@ _0806C120:
adds r6, r2, 0
cmp r0, 0
beq _0806C168
ldr r5, =gUnknown_02024294
ldr r4, =gUnknown_02024064
ldr r5, =gSideTimers
ldr r4, =gActiveBank
ldrb r0, [r4]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -518,7 +518,7 @@ _0806C120:
cmp r0, 0
bne _0806C168
ldrb r0, [r4]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -569,7 +569,7 @@ _0806C168:
mov r0, r8
movs r1, 0x19
mov r2, sp
bl pokemon_setattr
bl SetMonData
mov r0, r8
bl pokemon_calc_effective_stats
movs r0, 0
@@ -780,7 +780,7 @@ _0806C300:
mov r0, r8
movs r1, 0x15
mov r2, sp
bl pokemon_setattr
bl SetMonData
mov r0, r8
adds r1, r5, 0
movs r2, 0
@@ -809,7 +809,7 @@ _0806C300:
mov r0, r8
adds r1, r4, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
movs r5, 0
str r5, [sp, 0x20]
_0806C3D8:
@@ -925,7 +925,7 @@ _0806C4B4:
ldrb r1, [r0]
add r2, sp, 0x4
mov r0, r8
bl pokemon_setattr
bl SetMonData
mov r0, r8
bl pokemon_calc_effective_stats
ldr r0, [sp, 0x28]
@@ -964,7 +964,7 @@ _0806C4FC:
ldr r3, [sp, 0x38]
cmp r3, 0x4
beq _0806C55C
ldr r2, =gUnknown_02024210
ldr r2, =gAbsentBankFlags
ldr r1, =gBitTable
lsls r0, r3, 2
adds r0, r1
@@ -972,7 +972,7 @@ _0806C4FC:
ldrb r0, [r2]
bics r0, r1
strb r0, [r2]
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r3, 1
adds r0, r1
ldrb r0, [r0]
@@ -982,14 +982,14 @@ _0806C4FC:
lsrs r1, 24
ldr r0, [sp, 0x38]
bl battle_data_fill
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
ldrb r0, [r0]
b _0806C574
.pool
_0806C55C:
ldr r3, =gUnknown_02024210
ldr r3, =gAbsentBankFlags
ldr r1, =gBitTable
ldr r2, =gUnknown_02024064
ldr r2, =gActiveBank
ldrb r0, [r2]
eors r0, r4
lsls r0, 2
@@ -1000,7 +1000,7 @@ _0806C55C:
strb r0, [r3]
ldrb r0, [r2]
_0806C574:
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0806C5B2
@@ -1068,7 +1068,7 @@ _0806C5F4:
movs r0, 0x1
b _0806C610
_0806C60A:
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x23
ldrb r0, [r0]
_0806C610:
@@ -1111,7 +1111,7 @@ _0806C65E:
mov r0, r8
movs r1, 0x39
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldr r0, =gMain
ldr r1, =0x00000439
adds r0, r1
@@ -1134,9 +1134,9 @@ _0806C65E:
ands r0, r3
cmp r0, 0
bne _0806C6EC
ldr r4, =gUnknown_02024064
ldr r4, =gActiveBank
ldrb r0, [r4]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0806C6EC
@@ -1274,7 +1274,7 @@ _0806C7CC:
mov r0, r8
mov r1, r9
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldr r0, =gMain
ldr r1, =0x00000439
adds r0, r1
@@ -1299,7 +1299,7 @@ _0806C7CC:
ands r1, r0
cmp r1, 0
bne _0806C82E
ldr r1, =gUnknown_020242BC
ldr r1, =gDisableStructs
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
@@ -1425,7 +1425,7 @@ _0806C914:
mov r0, r8
adds r1, r6, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldr r0, =gMain
ldr r1, =0x00000439
adds r0, r1
@@ -1450,7 +1450,7 @@ _0806C914:
ands r0, r1
cmp r0, 0
bne _0806C978
ldr r1, =gUnknown_020242BC
ldr r1, =gDisableStructs
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
@@ -1613,7 +1613,7 @@ _0806CA9A:
ldrb r1, [r0]
add r2, sp, 0x4
mov r0, r8
bl pokemon_setattr
bl SetMonData
mov r0, r8
bl pokemon_calc_effective_stats
movs r3, 0
@@ -1685,7 +1685,7 @@ _0806CB10:
mov r0, r8
movs r1, 0x15
mov r2, sp
bl pokemon_setattr
bl SetMonData
mov r0, r8
adds r1, r6, 0
movs r2, 0
@@ -1713,7 +1713,7 @@ _0806CB10:
mov r0, r8
adds r1, r4, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
movs r5, 0
str r5, [sp, 0x20]
b _0806CD3A
@@ -1923,7 +1923,7 @@ _0806CD22:
add r2, sp, 0x8
mov r0, r8
movs r1, 0x20
bl pokemon_setattr
bl SetMonData
movs r5, 0
str r5, [sp, 0x20]
_0806CD30:
@@ -1985,7 +1985,7 @@ HealStatusConditions: @ 806CD6C
adds r0, r5, 0
movs r1, 0x37
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldr r0, =gMain
ldr r1, =0x00000439
adds r0, r1
@@ -2045,7 +2045,7 @@ _0806CE08:
cmp r3, 0xAF
bne _0806CE1A
_0806CE0C:
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
ldrb r1, [r0]
lsls r0, r1, 3
subs r0, r1
@@ -2199,11 +2199,11 @@ _0806CF1C:
thumb_func_start sub_806CF24
sub_806CF24: @ 806CF24
push {lr}
ldr r2, =gEnemyMonIndex
ldr r2, =gBankTarget
ldr r1, =gUnknown_020244B8
ldrb r1, [r1]
strb r1, [r2]
ldr r3, =gUnknown_02022F58
ldr r3, =gBattleTextBuff1
ldr r2, =gUnknown_085CBE00
ldr r1, =gUnknown_08329EC8
adds r0, r1
@@ -2213,7 +2213,7 @@ sub_806CF24: @ 806CF24
ldr r1, [r0]
adds r0, r3, 0
bl StringCopy
ldr r0, =gUnknown_02022F68
ldr r0, =gBattleTextBuff2
ldr r1, =gUnknown_085CB38A
bl StringCopy
ldr r0, =gUnknown_085CB3AA
@@ -2269,7 +2269,7 @@ _0806CFD8:
ldrb r0, [r2]
strb r0, [r1]
movs r5, 0
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
mov r8, r0
movs r6, 0
_0806CFE6:
@@ -2310,7 +2310,7 @@ _0806D02E:
ands r0, r1
cmp r0, 0
beq _0806D04E
ldr r1, =gUnknown_0202420B
ldr r1, =gBankAttacker
ldr r0, =gUnknown_020244B8
ldrb r0, [r0]
strb r0, [r1]
@@ -2407,7 +2407,7 @@ GetEvolutionTargetSpecies: @ 806D098
b _0806D114
.pool
_0806D10C:
bl itemid_get_x12
bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
_0806D114:
@@ -2708,7 +2708,7 @@ _0806D350:
mov r0, r8
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
_0806D370:
ldrh r2, [r4, 0x4]
mov r10, r2
@@ -3312,7 +3312,7 @@ sub_806D778: @ 806D778
adds r2, r4
adds r0, r5, 0
movs r1, 0x2
bl pokemon_setattr
bl SetMonData
_0806D7D4:
add sp, 0x4
pop {r3,r4}
@@ -3549,7 +3549,7 @@ _0806D94A:
ands r0, r1
cmp r0, 0
beq _0806D98C
ldr r0, =gUnknown_02024404
ldr r0, =gEnigmaBerries
ldrb r4, [r0, 0x7]
b _0806D9A8
.pool
@@ -3562,7 +3562,7 @@ _0806D98C:
b _0806D9A8
.pool
_0806D9A0:
bl itemid_get_x12
bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r4, r0, 24
_0806D9A8:
@@ -3710,7 +3710,7 @@ _0806DAB8:
adds r0, r7, 0
movs r1, 0x20
mov r2, sp
bl pokemon_setattr
bl SetMonData
_0806DAC2:
add sp, 0x4
pop {r4-r7}
@@ -3855,7 +3855,7 @@ _0806DBC8:
ands r0, r1
cmp r0, 0
beq _0806DC00
ldr r0, =gUnknown_02024404
ldr r0, =gEnigmaBerries
ldrb r0, [r0, 0x7]
b _0806DC1C
.pool
@@ -3868,7 +3868,7 @@ _0806DC00:
b _0806DC1C
.pool
_0806DC14:
bl itemid_get_x12
bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
_0806DC1C:
@@ -3913,7 +3913,7 @@ _0806DC58:
adds r1, r6, 0
adds r1, 0x1A
mov r0, r8
bl pokemon_setattr
bl SetMonData
adds r6, 0x1
cmp r6, 0x5
bgt _0806DC7A
@@ -4046,7 +4046,7 @@ _0806DD46:
adds r0, r6, r0
movs r1, 0x22
mov r2, sp
bl pokemon_setattr
bl SetMonData
_0806DD70:
add sp, 0x4
pop {r4-r6}
@@ -4222,7 +4222,7 @@ _0806DEA2:
adds r0, r1
movs r1, 0x22
mov r2, sp
bl pokemon_setattr
bl SetMonData
_0806DEB2:
adds r6, 0x1
cmp r6, 0x5
@@ -4289,7 +4289,7 @@ _0806DEE0:
adds r0, r4, 0
movs r1, 0x22
mov r2, sp
bl pokemon_setattr
bl SetMonData
_0806DF3A:
cmp r5, 0x5
beq _0806DF64
@@ -4308,7 +4308,7 @@ _0806DF3A:
adds r0, r4, 0
movs r1, 0x22
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r5, 0x1
_0806DF64:
adds r5, 0x1
@@ -4366,7 +4366,7 @@ sub_806DF74: @ 806DF74
add r2, sp, 0x4
adds r0, r5, 0
movs r1, 0x19
bl pokemon_setattr
bl SetMonData
_0806DFD4:
mov r0, sp
ldrb r0, [r0]
@@ -4387,7 +4387,7 @@ _0806DFF8:
adds r0, r5, 0
movs r1, 0x38
mov r2, sp
bl pokemon_setattr
bl SetMonData
movs r0, 0x1
_0806E004:
add sp, 0x8
@@ -5580,7 +5580,7 @@ _0806E938:
adds r1, 0x11
adds r0, r5, 0
mov r2, sp
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
_0806E984:
adds r6, 0x1
cmp r6, 0x3
@@ -5594,14 +5594,14 @@ _0806E984:
thumb_func_start sub_806E994
sub_806E994: @ 806E994
push {r4,r5,lr}
ldr r2, =gUnknown_0202420A
ldr r5, =gUnknown_0202449C
ldr r2, =gLastUsedAbility
ldr r5, =gBattleStruct
ldr r1, [r5]
adds r0, r1, 0
adds r0, 0xB0
ldrb r0, [r0]
strb r0, [r2]
ldr r4, =gUnknown_02022F58
ldr r4, =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r4]
movs r0, 0x4
@@ -5612,11 +5612,11 @@ sub_806E994: @ 806E994
movs r0, 0xFF
strb r0, [r4, 0x4]
ldrb r0, [r1]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0806E9E8
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldr r0, [r5]
adds r0, 0x49
ldrb r0, [r0]
@@ -5627,7 +5627,7 @@ sub_806E994: @ 806E994
b _0806E9F6
.pool
_0806E9E8:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
ldr r0, [r5]
adds r0, 0x49
ldrb r0, [r0]
@@ -5636,7 +5636,7 @@ _0806E9E8:
ldrh r0, [r0]
_0806E9F6:
strb r0, [r4, 0x3]
ldr r4, =gUnknown_02022F68
ldr r4, =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r4]
movs r0, 0x4
@@ -5644,7 +5644,7 @@ _0806E9F6:
ldr r1, =gUnknown_020244B8
ldrb r0, [r1]
strb r0, [r4, 0x2]
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
ldrb r0, [r1]
lsls r0, 1
adds r0, r2
@@ -5803,7 +5803,7 @@ _0806EB6C:
adds r2, r1
_0806EB6E:
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
b _0806EB90
.pool
_0806EB80:
@@ -5813,7 +5813,7 @@ _0806EB80:
ldr r1, =gBaseStats + 0xe @ item 2 offset
adds r2, r1
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
_0806EB90:
pop {r3}
mov r8, r3
@@ -5994,7 +5994,7 @@ sub_806ECEC: @ 806ECEC
lsrs r2, 24
lsls r3, 24
lsrs r3, 24
ldr r0, =gUnknown_02024280
ldr r0, =gHitMarker
ldr r0, [r0]
movs r1, 0x80
ands r0, r1
@@ -6203,7 +6203,7 @@ sub_806EEB4: @ 806EEB4
adds r4, r0, 0
lsls r1, 16
lsrs r2, r1, 16
ldr r0, =gUnknown_02024280
ldr r0, =gHitMarker
ldr r0, [r0]
movs r1, 0x80
ands r0, r1
asm/porthole.s
+1 -1
View File
@@ -185,7 +185,7 @@ sub_80FB6EC: @ 80FB6EC
bl AddPseudoFieldObject
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
asm/region_map.s
+6 -6
View File
@@ -1287,7 +1287,7 @@ sub_81236C4: @ 81236C4
lsrs r5, 24
ldr r4, =gUnknown_0203A144
ldr r6, [r4]
ldr r7, =gUnknown_08329F40
ldr r7, =gSineTable
mov r12, r7
adds r4, r5, 0
adds r4, 0x40
@@ -2656,7 +2656,7 @@ _0812416E:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r0, r1
str r3, [r2, 0x1C]
adds r2, 0x78
@@ -2848,7 +2848,7 @@ _08124316:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2, 0x20]
adds r0, r2, 0
@@ -3823,7 +3823,7 @@ _08124B44:
lsrs r5, r0, 24
cmp r5, 0x40
beq _08124BB8
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r8, r1
lsls r4, r5, 4
adds r0, r4, r5
@@ -3854,7 +3854,7 @@ _08124B9C:
_08124BA2:
adds r4, r5
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
lsls r1, r7, 24
lsrs r1, 24
@@ -3903,7 +3903,7 @@ sub_8124BE4: @ 8124BE4
mov r5, sp
adds r5, 0x6
add r7, sp, 0x4
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r9, r1
movs r0, 0x1C
add r0, r9
asm/reset_rtc_screen.s
+1 -1
View File
@@ -299,7 +299,7 @@ sub_809EB04: @ 809EB04
bl AddObjectToBack
lsls r0, 24
lsrs r1, r0, 24
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
asm/rom3.s
+98 -98
View File
@@ -46,12 +46,12 @@ sub_803269C: @ 803269C
movs r0, 0
str r0, [sp, 0x10]
movs r1, 0
ldr r7, =gUnknown_03005D60
ldr r7, =gBattleBankFunc
ldr r6, =gUnknown_020244AC
movs r2, 0
ldr r5, =gUnknown_020244B0
ldr r4, =nullsub_21
ldr r3, =gUnknown_02024076
ldr r3, =gBanksBySide
_080326B8:
lsls r0, r1, 2
adds r0, r7
@@ -72,7 +72,7 @@ _080326B8:
cmp r1, 0x3
ble _080326B8
bl battle_wireless_setup_if_required_maybe
ldr r0, =gUnknown_02024068
ldr r0, =gBattleExecBuffer
movs r5, 0
str r5, [r0]
bl sub_80A3934
@@ -101,7 +101,7 @@ _080326B8:
adds r0, r4, 0
movs r1, 0xC
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
_08032728:
ldr r0, =gUnknown_02022FF4
str r5, [r0]
@@ -160,7 +160,7 @@ _080327B4:
cmp r0, 0
bne _080327E2
movs r4, 0
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r1, [r0]
cmp r4, r1
bge _080327E2
@@ -176,7 +176,7 @@ _080327D0:
blt _080327D0
_080327E2:
movs r4, 0
ldr r3, =gUnknown_0202449C
ldr r3, =gBattleStruct
movs r2, 0xD2
lsls r2, 1
movs r1, 0
@@ -189,7 +189,7 @@ _080327EC:
cmp r4, 0x5F
bls _080327EC
movs r4, 0
ldr r3, =gUnknown_0202449C
ldr r3, =gBattleStruct
movs r2, 0x81
lsls r2, 2
movs r1, 0
@@ -229,19 +229,19 @@ b_setup_bx: @ 8032824
ands r4, r3
cmp r4, 0
beq _08032874
ldr r2, =gUnknown_03005D60
ldr r2, =gBattleBankFunc
ldr r0, =sub_818994C
str r0, [r2]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
movs r0, 0
strb r0, [r1]
b _0803287E
.pool
_08032874:
ldr r2, =gUnknown_03005D60
ldr r0, =sub_805745C
ldr r2, =gBattleBankFunc
ldr r0, =SetBankFuncToPlayerBufferRunCommand
str r0, [r2]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
strb r4, [r1]
_0803287E:
ldr r3, =sub_805F164
@@ -255,7 +255,7 @@ _0803287E:
str r3, [r2, 0xC]
movs r0, 0x3
strb r0, [r1, 0x3]
ldr r1, =gUnknown_0202406C
ldr r1, =gNoOfAllBanks
movs r0, 0x4
strb r0, [r1]
movs r0, 0
@@ -270,7 +270,7 @@ _0803287E:
movs r0, 0x3
movs r1, 0x1
bl sub_81B8D64
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
movs r1, 0
strh r1, [r0]
strh r1, [r0, 0x2]
@@ -293,7 +293,7 @@ _080328F0:
mov r12, r2
cmp r1, 0
beq _08032918
ldr r1, =gUnknown_03005D60
ldr r1, =gBattleBankFunc
ldr r0, =sub_815936C
b _08032934
.pool
@@ -303,17 +303,17 @@ _08032918:
ands r3, r0
cmp r3, 0
beq _08032930
ldr r1, =gUnknown_03005D60
ldr r1, =gBattleBankFunc
ldr r0, =bx_goto_buffer_A_ch0_tbl3
b _08032934
.pool
_08032930:
ldr r1, =gUnknown_03005D60
ldr r0, =sub_805745C
ldr r1, =gBattleBankFunc
ldr r0, =SetBankFuncToPlayerBufferRunCommand
_08032934:
str r0, [r1]
mov r10, r1
ldr r4, =gUnknown_02024076
ldr r4, =gBanksBySide
movs r0, 0
mov r9, r0
mov r1, r9
@@ -324,7 +324,7 @@ _08032934:
str r2, [r5, 0x4]
movs r6, 0x1
strb r6, [r4, 0x1]
ldr r2, =gUnknown_0202406C
ldr r2, =gNoOfAllBanks
movs r7, 0x2
strb r7, [r2]
ldr r0, =gBattleTypeFlags
@@ -383,10 +383,10 @@ _080329E0:
ldr r1, =sub_8039ECC
ldr r2, =gUnknown_03005D04
str r1, [r2]
ldr r2, =gUnknown_03005D60
ldr r0, =sub_805745C
ldr r2, =gBattleBankFunc
ldr r0, =SetBankFuncToPlayerBufferRunCommand
str r0, [r2]
ldr r4, =gUnknown_02024076
ldr r4, =gBanksBySide
strb r5, [r4]
ldr r6, =sub_805F164
str r6, [r2, 0x4]
@@ -401,7 +401,7 @@ _080329E0:
mov r8, r0
mov r1, r8
strb r1, [r4, 0x3]
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
mov r10, r0
movs r1, 0x4
mov r9, r1
@@ -448,7 +448,7 @@ _08032A20:
movs r0, 0x3
movs r1, 0x1
bl sub_81B8D64
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
strh r5, [r0]
strh r5, [r0, 0x2]
mov r1, r8
@@ -472,7 +472,7 @@ _08032AAA:
mov r12, r1
adds r7, r4, 0
mov r8, r0
ldr r6, =gUnknown_0202406E
ldr r6, =gBattlePartyID
movs r4, 0
movs r2, 0x3
mov r9, r2
@@ -511,7 +511,7 @@ _08032B06:
adds r3, r4, r0
ldrh r1, [r3, 0x18]
lsls r1, 2
ldr r2, =gUnknown_03005D60
ldr r2, =gBattleBankFunc
adds r1, r2
ldr r2, =sub_818994C
str r2, [r1]
@@ -579,7 +579,7 @@ _08032B92:
adds r2, r4, r0
ldrh r0, [r2, 0x18]
lsls r0, 2
ldr r1, =gUnknown_03005D60
ldr r1, =gBattleBankFunc
adds r0, r1
ldr r1, =sub_818994C
str r1, [r0]
@@ -614,7 +614,7 @@ _08032BD8:
adds r2, r4, r0
ldrh r0, [r2, 0x18]
lsls r0, 2
ldr r1, =gUnknown_03005D60
ldr r1, =gBattleBankFunc
adds r0, r1
ldr r1, =sub_81864EC
str r1, [r0]
@@ -753,28 +753,28 @@ b_setup_bx_link: @ 8032CC0
ldr r1, =gUnknown_03005D04
ldr r0, =sub_8039ECC
str r0, [r1]
ldr r2, =gUnknown_03005D60
ldr r0, =sub_805745C
ldr r2, =gBattleBankFunc
ldr r0, =SetBankFuncToPlayerBufferRunCommand
str r0, [r2]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
strb r3, [r1]
ldr r0, =sub_8064394
str r0, [r2, 0x4]
strb r5, [r1, 0x1]
ldr r1, =gUnknown_0202406C
ldr r1, =gNoOfAllBanks
movs r0, 0x2
b _0803303A
.pool
_08032D1C:
ldr r2, =gUnknown_03005D60
ldr r0, =sub_805745C
ldr r2, =gBattleBankFunc
ldr r0, =SetBankFuncToPlayerBufferRunCommand
str r0, [r2, 0x4]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
strb r4, [r1, 0x1]
ldr r0, =sub_8064394
str r0, [r2]
strb r5, [r1]
ldr r1, =gUnknown_0202406C
ldr r1, =gNoOfAllBanks
movs r0, 0x2
b _0803303A
.pool
@@ -791,10 +791,10 @@ _08032D48:
ldr r1, =gUnknown_03005D04
ldr r0, =sub_8039ECC
str r0, [r1]
ldr r2, =gUnknown_03005D60
ldr r4, =sub_805745C
ldr r2, =gBattleBankFunc
ldr r4, =SetBankFuncToPlayerBufferRunCommand
str r4, [r2]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
movs r0, 0
strb r0, [r1]
ldr r3, =sub_8064394
@@ -809,10 +809,10 @@ _08032D48:
b _08032DB4
.pool
_08032D98:
ldr r2, =gUnknown_03005D60
ldr r0, =sub_805745C
ldr r2, =gBattleBankFunc
ldr r0, =SetBankFuncToPlayerBufferRunCommand
str r0, [r2, 0x4]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
strb r3, [r1, 0x1]
ldr r3, =sub_8064394
str r3, [r2]
@@ -824,7 +824,7 @@ _08032D98:
movs r0, 0x3
strb r0, [r1, 0x2]
_08032DB4:
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
strb r6, [r0]
b _0803303C
.pool
@@ -842,10 +842,10 @@ _08032DD0:
ldr r1, =gUnknown_03005D04
ldr r0, =sub_8039ECC
str r0, [r1]
ldr r2, =gUnknown_03005D60
ldr r0, =sub_805745C
ldr r2, =gBattleBankFunc
ldr r0, =SetBankFuncToPlayerBufferRunCommand
str r0, [r2]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
movs r0, 0
strb r0, [r1]
ldr r3, =sub_805F164
@@ -855,15 +855,15 @@ _08032DD0:
b _08032E2E
.pool
_08032E1C:
ldr r2, =gUnknown_03005D60
ldr r2, =gBattleBankFunc
ldr r0, =sub_814AEB0
str r0, [r2]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
strb r3, [r1]
ldr r3, =sub_8064394
str r3, [r2, 0x4]
strb r5, [r1, 0x1]
ldr r0, =sub_805745C
ldr r0, =SetBankFuncToPlayerBufferRunCommand
_08032E2E:
str r0, [r2, 0x8]
movs r0, 0x2
@@ -871,7 +871,7 @@ _08032E2E:
str r3, [r2, 0xC]
movs r0, 0x3
strb r0, [r1, 0x3]
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
strb r4, [r0]
movs r0, 0
movs r1, 0
@@ -885,7 +885,7 @@ _08032E2E:
movs r0, 0x3
movs r1, 0x1
bl sub_81B8D64
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
movs r1, 0
strh r1, [r0]
strh r1, [r0, 0x2]
@@ -911,9 +911,9 @@ _08032EA4:
mov r10, r0
ldr r1, =gUnknown_020229E8
mov r12, r1
ldr r7, =gUnknown_02024076
ldr r7, =gBanksBySide
mov r8, r0
ldr r6, =gUnknown_0202406E
ldr r6, =gBattlePartyID
movs r4, 0
movs r2, 0x3
mov r9, r2
@@ -952,9 +952,9 @@ _08032F02:
adds r3, r4, r0
ldrh r1, [r3, 0x18]
lsls r1, 2
ldr r2, =gUnknown_03005D60
ldr r2, =gBattleBankFunc
adds r1, r2
ldr r2, =sub_805745C
ldr r2, =SetBankFuncToPlayerBufferRunCommand
str r2, [r1]
ldrh r1, [r3, 0x18]
mov r12, r0
@@ -1020,7 +1020,7 @@ _08032F8E:
adds r2, r4, r0
ldrh r0, [r2, 0x18]
lsls r0, 2
ldr r1, =gUnknown_03005D60
ldr r1, =gBattleBankFunc
adds r0, r1
ldr r1, =sub_814AEB0
str r1, [r0]
@@ -1055,7 +1055,7 @@ _08032FD4:
adds r2, r4, r0
ldrh r0, [r2, 0x18]
lsls r0, 2
ldr r1, =gUnknown_03005D60
ldr r1, =gBattleBankFunc
adds r0, r1
ldr r1, =sub_8064394
str r1, [r0]
@@ -1105,7 +1105,7 @@ _08033028:
bgt _08033036
b _08032EB8
_08033036:
ldr r1, =gUnknown_0202406C
ldr r1, =gNoOfAllBanks
movs r0, 0x4
_0803303A:
strb r0, [r1]
@@ -1144,7 +1144,7 @@ _08033074:
movs r0, 0x1
add r0, r8
mov r10, r0
ldr r0, =gUnknown_02024076
ldr r0, =gBanksBySide
add r0, r8
mov r9, r0
mov r0, r8
@@ -1189,7 +1189,7 @@ _080330AA:
bl GetMonData
cmp r0, 0
bne _08033170
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
adds r0, r6, r0
strh r5, [r0]
b _08033178
@@ -1238,7 +1238,7 @@ _0803312C:
bl GetMonData
cmp r0, 0
bne _08033170
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
mov r0, r8
subs r0, 0x2
lsls r0, 1
@@ -1258,7 +1258,7 @@ _08033170:
_08033178:
mov r8, r10
_0803317A:
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r0, [r0]
cmp r8, r0
bge _08033184
@@ -1271,7 +1271,7 @@ _08033184:
ands r0, r1
cmp r0, 0
beq _0803319C
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
movs r1, 0
strh r1, [r0, 0x2]
movs r1, 0x3
@@ -1305,7 +1305,7 @@ dp01_prepare_buffer: @ 80331B8
adds r0, r3, 0
adds r1, r2, 0
adds r2, r4, 0
bl dp01_prepare_buffer_wireless_probably
bl PrepareBufferDataTransferLink
b _08033236
.pool
_080331E4:
@@ -1318,8 +1318,8 @@ _080331EE:
movs r3, 0
cmp r3, r2
bge _08033236
ldr r6, =gUnknown_02023064
ldr r5, =gUnknown_02024064
ldr r6, =gBattleBufferA
ldr r5, =gActiveBank
_080331F8:
ldrb r0, [r5]
lsls r0, 9
@@ -1337,8 +1337,8 @@ _08033218:
movs r3, 0
cmp r3, r2
bge _08033236
ldr r6, =gUnknown_02023864
ldr r5, =gUnknown_02024064
ldr r6, =gBattleBufferB
ldr r5, =gActiveBank
_08033222:
ldrb r0, [r5]
lsls r0, 9
@@ -1435,8 +1435,8 @@ sub_8033244: @ 8033244
.pool
thumb_func_end sub_8033244
thumb_func_start dp01_prepare_buffer_wireless_probably
dp01_prepare_buffer_wireless_probably: @ 80332F4
thumb_func_start PrepareBufferDataTransferLink
PrepareBufferDataTransferLink: @ 80332F4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1499,7 +1499,7 @@ _08033346:
ldrsh r1, [r0, r7]
ldr r0, [r4]
adds r1, r0
ldr r0, =gUnknown_02024064
ldr r0, =gActiveBank
ldrb r0, [r0]
strb r0, [r1, 0x1]
ldrb r1, [r3]
@@ -1511,7 +1511,7 @@ _08033346:
ldrsh r1, [r0, r2]
ldr r0, [r4]
adds r1, r0
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
strb r0, [r1, 0x2]
ldrb r1, [r3]
@@ -1523,7 +1523,7 @@ _08033346:
ldrsh r1, [r0, r7]
ldr r0, [r4]
adds r1, r0
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
strb r0, [r1, 0x3]
ldrb r1, [r3]
@@ -1561,7 +1561,7 @@ _08033346:
ldrsh r1, [r0, r7]
ldr r0, [r4]
adds r1, r0
ldr r0, =gUnknown_02024210
ldr r0, =gAbsentBankFlags
ldrb r0, [r0]
strb r0, [r1, 0x6]
ldrb r1, [r3]
@@ -1617,7 +1617,7 @@ _08033434:
pop {r0}
bx r0
.pool
thumb_func_end dp01_prepare_buffer_wireless_probably
thumb_func_end PrepareBufferDataTransferLink
thumb_func_start task00_wireless_something
task00_wireless_something: @ 8033474
@@ -2040,7 +2040,7 @@ _080337CC:
beq _08033874
b _0803388A
_080337D2:
ldr r2, =gUnknown_02024068
ldr r2, =gBattleExecBuffer
ldr r1, =gBitTable
lsls r0, r4, 2
adds r0, r1
@@ -2050,7 +2050,7 @@ _080337D2:
cmp r1, 0
bne _0803389C
lsls r0, r4, 9
ldr r1, =gUnknown_02023064
ldr r1, =gBattleBufferA
adds r0, r1
adds r1, r3, 0
adds r1, 0x8
@@ -2064,7 +2064,7 @@ _080337D2:
ands r0, r1
cmp r0, 0
bne _0803388A
ldr r2, =gUnknown_0202420B
ldr r2, =gBankAttacker
movs r4, 0x26
ldrsh r0, [r5, r4]
mov r3, r8
@@ -2072,13 +2072,13 @@ _080337D2:
adds r0, r1
ldrb r0, [r0, 0x2]
strb r0, [r2]
ldr r2, =gEnemyMonIndex
ldr r2, =gBankTarget
movs r4, 0x26
ldrsh r0, [r5, r4]
adds r0, r1
ldrb r0, [r0, 0x3]
strb r0, [r2]
ldr r2, =gUnknown_02024210
ldr r2, =gAbsentBankFlags
movs r3, 0x26
ldrsh r0, [r5, r3]
adds r0, r1
@@ -2094,7 +2094,7 @@ _080337D2:
.pool
_0803385C:
lsls r0, r4, 9
ldr r1, =gUnknown_02023864
ldr r1, =gBattleBufferB
adds r0, r1
adds r1, r3, 0
adds r1, 0x8
@@ -2104,7 +2104,7 @@ _0803385C:
.pool
_08033874:
ldrb r2, [r3, 0x8]
ldr r3, =gUnknown_02024068
ldr r3, =gBattleExecBuffer
ldr r1, =gBitTable
lsls r0, r4, 2
adds r0, r1
@@ -2518,7 +2518,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C
movs r1, 0
movs r2, 0xD
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2528,7 +2528,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C
movs r1, 0
movs r2, 0x4D
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
bne _08033BAC
@@ -2585,7 +2585,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4
ldr r2, =gUnknown_02022D10
movs r0, 0x10
strb r0, [r2]
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
strb r0, [r2, 0x1]
strb r1, [r2, 0x2]
@@ -2593,7 +2593,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4
strb r1, [r2, 0x3]
adds r0, r2, 0x4
mov r12, r0
ldr r4, =gUnknown_020241EA
ldr r4, =gCurrentMove
ldrh r0, [r4]
strh r0, [r2, 0x4]
ldr r0, =gUnknown_020241EC
@@ -2603,13 +2603,13 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4
ldr r0, =gUnknown_02024208
ldrh r0, [r0]
strh r0, [r1, 0x4]
ldr r0, =gUnknown_0202420A
ldr r0, =gLastUsedAbility
ldrb r0, [r0]
strb r0, [r1, 0x6]
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
ldrb r0, [r0, 0x17]
strb r0, [r1, 0x7]
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r1, r0, 0
adds r1, 0x52
@@ -2652,12 +2652,12 @@ _08033C6A:
adds r5, 0x10
mov r4, r12
adds r4, 0x20
ldr r6, =gUnknown_02022F68
ldr r6, =gBattleTextBuff2
mov r2, r12
adds r2, 0x30
_08033C88:
adds r1, r5, r3
ldr r7, =gUnknown_02022F58
ldr r7, =gBattleTextBuff1
adds r0, r3, r7
ldrb r0, [r0]
strb r0, [r1]
@@ -2708,7 +2708,7 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC
strb r1, [r2, 0x3]
adds r0, r2, 0x4
mov r12, r0
ldr r0, =gUnknown_020241EA
ldr r0, =gCurrentMove
ldrh r0, [r0]
strh r0, [r2, 0x4]
ldr r0, =gUnknown_020241EC
@@ -2718,13 +2718,13 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC
ldr r0, =gUnknown_02024208
ldrh r0, [r0]
strh r0, [r1, 0x4]
ldr r0, =gUnknown_0202420A
ldr r0, =gLastUsedAbility
ldrb r0, [r0]
strb r0, [r1, 0x6]
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
ldrb r0, [r0, 0x17]
strb r0, [r1, 0x7]
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r0, 0x52
ldrb r0, [r0]
@@ -2751,12 +2751,12 @@ _08033D5E:
adds r5, 0x10
mov r4, r12
adds r4, 0x20
ldr r6, =gUnknown_02022F68
ldr r6, =gBattleTextBuff2
mov r2, r12
adds r2, 0x30
_08033D7C:
adds r1, r5, r3
ldr r7, =gUnknown_02022F58
ldr r7, =gBattleTextBuff1
adds r0, r3, r7
ldrb r0, [r0]
strb r0, [r1]
asm/rom4.s
+4 -4
View File
@@ -3171,7 +3171,7 @@ CB2_NewGame: @ 8085EF8
bl ResetSafariZoneFlag_
bl NewGameInitData
bl player_avatar_init_params_reset
bl set_max_playtime_if_appropriate
bl PlayTimeCounter_Start
bl script_env_1_init
bl script_env_2_disable
ldr r1, =gUnknown_03005DAC
@@ -3545,7 +3545,7 @@ _080862B0:
_080862BA:
bl sub_8087D74
_080862BE:
bl set_max_playtime_if_appropriate
bl PlayTimeCounter_Start
bl script_env_1_init
bl script_env_2_disable
bl sub_8195E10
@@ -6157,7 +6157,7 @@ sub_808780C: @ 808780C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
_08087838:
@@ -6713,7 +6713,7 @@ _08087C56:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r3, r0, 0
adds r3, 0x3E
asm/rom5.s
+46 -46
View File
@@ -25,7 +25,7 @@ sub_80A92F8: @ 80A92F8
movs r0, 0x4C
movs r1, 0
bl SetGpuReg
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r2, r0, 0
adds r2, 0x21
movs r1, 0
@@ -43,7 +43,7 @@ sub_80A92F8: @ 80A92F8
c2_80777E8: @ 80A933C
push {r4-r7,lr}
sub sp, 0x8
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x21
ldrb r0, [r0]
cmp r0, 0x13
@@ -144,7 +144,7 @@ _080A9460:
bl sub_805E350
b _080A95D2
_080A9466:
ldr r5, =gUnknown_02024474
ldr r5, =gBattleScripting
adds r4, r5, 0
adds r4, 0x22
ldrb r0, [r4]
@@ -180,7 +180,7 @@ _080A949C:
beq _080A94A8
b _080A95D2
_080A94A8:
ldr r1, =gUnknown_02024474
ldr r1, =gBattleScripting
_080A94AA:
adds r1, 0x21
ldrb r0, [r1]
@@ -223,11 +223,11 @@ _080A94F0:
_080A94F8:
bl sub_805EC84
movs r0, 0x1
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r7, =gUnknown_0202406E
ldr r7, =gBattlePartyID
lsls r0, r4, 1
adds r0, r7
ldrh r0, [r0]
@@ -247,7 +247,7 @@ _080A94F8:
cmp r0, 0
beq _080A955C
movs r0, 0x3
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -305,7 +305,7 @@ _080A95A4:
bl SetMainCallback2
bl sub_805EF14
_080A95D2:
ldr r1, =gUnknown_02024474
ldr r1, =gBattleScripting
adds r1, 0x21
ldrb r0, [r1]
adds r0, 0x1
@@ -339,12 +339,12 @@ sub_80A9614: @ 80A9614
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r0, [r0]
cmp r4, r0
bcs _080A96FC
adds r0, r4, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A9676
@@ -358,7 +358,7 @@ sub_80A9614: @ 80A9614
ands r0, r1
cmp r0, 0
bne _080A966C
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -414,7 +414,7 @@ _080A96B2:
ands r0, r1
cmp r0, 0
bne _080A96EC
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -431,7 +431,7 @@ _080A96EC:
movs r1, 0
bl sub_805E7DC
_080A96F4:
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x22
movs r1, 0
strb r1, [r0]
@@ -453,7 +453,7 @@ sub_80A9708: @ 80A9708
sub sp, 0x4
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r0, [r0]
cmp r7, r0
bcc _080A9722
@@ -482,13 +482,13 @@ _080A974E:
lsrs r0, 24
mov r8, r0
adds r0, r7, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A9762
b _080A986C
_080A9762:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r7, 1
adds r6, r0, r1
ldrh r0, [r6]
@@ -517,7 +517,7 @@ _080A9786:
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
bl battle_get_per_side_status
bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -539,10 +539,10 @@ _080A9786:
adds r1, r4, 0
mov r2, r8
bl AddObjectToFront
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
adds r4, r7, r1
strb r0, [r4]
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldrb r0, [r4]
lsls r1, r0, 4
adds r1, r0
@@ -611,7 +611,7 @@ _080A986C:
ldr r0, [r5]
ldrb r4, [r0, 0x8]
movs r0, 0
bl battle_get_per_side_status
bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -649,7 +649,7 @@ _080A98D0:
cmp r7, 0
bne _080A9968
movs r0, 0
bl battle_get_per_side_status
bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -675,9 +675,9 @@ _080A9914:
movs r1, 0x50
adds r2, r4, 0
bl AddObjectToFront
ldr r3, =gUnknown_020241E4
ldr r3, =gBankSpriteIds
strb r0, [r3]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldrb r0, [r3]
lsls r1, r0, 4
adds r1, r0
@@ -705,7 +705,7 @@ _080A9914:
b _080A9A70
.pool
_080A9968:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r7, 1
adds r6, r0, r1
ldrh r0, [r6]
@@ -734,7 +734,7 @@ _080A998C:
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
bl battle_get_per_side_status
bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -756,10 +756,10 @@ _080A998C:
adds r1, r4, 0
mov r2, r8
bl AddObjectToFront
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
adds r4, r7, r1
strb r0, [r4]
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldrb r0, [r4]
lsls r1, r0, 4
adds r1, r0
@@ -831,8 +831,8 @@ _080A9A50:
ldr r0, [r0]
str r0, [r1]
_080A9A70:
ldr r1, =gUnknown_02020630
ldr r0, =gUnknown_020241E4
ldr r1, =gSprites
ldr r0, =gBankSpriteIds
adds r0, r7, r0
ldrb r0, [r0]
lsls r2, r0, 4
@@ -872,7 +872,7 @@ sub_80A9ADC: @ 80A9ADC
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r0, [r0]
cmp r5, r0
bcc _080A9AEC
@@ -913,12 +913,12 @@ _080A9B24:
adds r0, r6, 0
bl sub_80729D0
adds r0, r5, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A9B6C
ldrb r0, [r4]
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r4, r5, 1
adds r1, r4, r1
ldrh r2, [r1]
@@ -938,7 +938,7 @@ _080A9B6C:
cmp r0, 0
beq _080A9BA0
ldrb r0, [r4]
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r4, r5, 1
adds r1, r4, r1
ldrh r2, [r1]
@@ -952,7 +952,7 @@ _080A9B6C:
.pool
_080A9BA0:
ldrb r0, [r4]
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r4, r5, 1
adds r1, r4, r1
ldrh r2, [r1]
@@ -964,13 +964,13 @@ _080A9BA0:
bl healthbar_draw_field_maybe
_080A9BB8:
adds r0, r5, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _080A9BD4
adds r0, r5, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -991,11 +991,11 @@ _080A9BF0:
bl nullsub_30
_080A9BFC:
adds r0, r5, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A9C34
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
adds r0, r4, r0
ldrh r1, [r0]
movs r0, 0x64
@@ -1017,7 +1017,7 @@ _080A9C34:
ands r0, r1
cmp r0, 0
bne _080A9C5E
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
adds r0, r4, r0
ldrh r1, [r0]
movs r0, 0x64
@@ -1048,7 +1048,7 @@ sub_80A9C70: @ 80A9C70
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
adds r0, r4, r0
ldrb r6, [r0]
ldr r0, =sub_80A9DB4
@@ -1074,7 +1074,7 @@ sub_80A9C70: @ 80A9C70
strh r0, [r1, 0xA]
movs r5, 0
lsls r0, r6, 4
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
adds r0, r6
lsls r0, 2
adds r6, r0, r7
@@ -1126,7 +1126,7 @@ _080A9D30:
strh r0, [r1, 0xA]
movs r5, 0
lsls r0, r6, 4
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
adds r0, r6
lsls r0, 2
adds r6, r0, r7
@@ -1171,7 +1171,7 @@ _080A9D86:
cmp r5, 0x9
bls _080A9D42
_080A9D90:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -1411,7 +1411,7 @@ _080A9F32:
ldr r1, =0xffff0000
cmp r0, r1
bne _080A9F7C
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -1425,7 +1425,7 @@ _080A9F7C:
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldr r1, =gUnknown_0853EF40
bl SetSpriteOamTables_NoPriorityFromTable
@@ -1629,7 +1629,7 @@ sub_80AA124: @ 80AA124
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r4, 0
bl obj_free_rotscale_entry
asm/rom6.s
+15 -15
View File
@@ -208,7 +208,7 @@ _081355B8:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrb r1, [r6, 0x8]
bl StartObjectImageAnim
@@ -1250,7 +1250,7 @@ sub_8135F70: @ 8135F70
beq _08135F9C
movs r0, 0x5
bl audio_play
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB50
ldr r0, [r0]
ldr r1, =0x00000e74
@@ -2783,7 +2783,7 @@ sub_8136C8C: @ 8136C8C
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldr r3, =gUnknown_085B262C
ldr r2, [r5]
ldrh r1, [r7]
@@ -4119,7 +4119,7 @@ _081377BC:
adds r0, r4, 0
movs r1, 0x43
add r2, sp, 0x18
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
bl sub_80EE5A4
strb r0, [r5, 0x1]
@@ -5682,7 +5682,7 @@ _08138454:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
lsls r3, r5, 4
ldrb r2, [r1, 0x5]
@@ -6464,7 +6464,7 @@ _08138B74:
thumb_func_start sub_8138B80
sub_8138B80: @ 8138B80
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
bx lr
.pool
@@ -7517,7 +7517,7 @@ sub_8139370: @ 8139370
adds r0, r4, 0
movs r1, 0x47
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
bl sub_80EE5A4
lsls r0, 24
@@ -7637,28 +7637,28 @@ sub_813946C: @ 813946C
adds r0, r5, 0
movs r1, 0x2E
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
add r1, sp, 0x10
movs r0, 0x21
strh r0, [r1]
adds r0, r5, 0
movs r1, 0xD
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
add r0, sp, 0x10
strh r4, [r0]
adds r0, r5, 0
movs r1, 0xE
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
adds r0, r5, 0
movs r1, 0xF
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
adds r0, r5, 0
movs r1, 0x10
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
add sp, 0x14
pop {r4,r5}
pop {r0}
@@ -10468,7 +10468,7 @@ sub_813ABD4: @ 813ABD4
lsrs r0, 24
cmp r0, 0x40
beq _0813AC32
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldrb r0, [r4]
lsls r1, r0, 4
adds r1, r0
@@ -10517,7 +10517,7 @@ sub_813AC44: @ 813AC44
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeResources
_0813AC6A:
@@ -12714,7 +12714,7 @@ sub_813BF10: @ 813BF10
cmp r0, 0x2
bne _0813BF40
bl sub_813BA30
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
bne _0813BF3C
asm/rom_8034C54.s
+873 -873
View File
File diff suppressed because it is too large Load Diff
asm/rom_8045FFC.s
+3511 -3511
View File
File diff suppressed because it is too large Load Diff
asm/rom_8072304.s
+158 -158
View File
File diff suppressed because it is too large Load Diff
asm/rom_80A5C6C.s
+104 -104
View File
@@ -40,7 +40,7 @@ _080A5C9C:
_080A5CB0:
ldr r4, =gUnknown_08525F58
adds r0, r5, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 22
ldr r1, =gBattleTypeFlags
@@ -56,7 +56,7 @@ _080A5CB0:
_080A5CD8:
ldr r4, =gUnknown_08525F58
adds r0, r5, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 22
ldr r1, =gBattleTypeFlags
@@ -90,7 +90,7 @@ _080A5D24:
b _080A5D9A
_080A5D28:
adds r0, r5, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A5D60
@@ -102,7 +102,7 @@ _080A5D28:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A5D98
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -120,7 +120,7 @@ _080A5D60:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A5D98
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -164,7 +164,7 @@ sub_80A5DB8: @ 80A5DB8
lsls r1, 16
lsrs r5, r1, 16
adds r0, r4, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A5DDA
@@ -203,7 +203,7 @@ _080A5E04:
ldrh r0, [r0, 0x2]
cmp r0, 0
bne _080A5E3C
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -293,7 +293,7 @@ _080A5EC8:
ldrh r0, [r0, 0x2]
cmp r0, 0
bne _080A5F04
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -394,7 +394,7 @@ sub_80A5FA0: @ 80A5FA0
adds r7, r4, 0
movs r5, 0
adds r0, r6, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -445,7 +445,7 @@ sub_80A600C: @ 80A600C
lsls r2, 24
lsrs r7, r2, 24
adds r0, r6, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A6030
@@ -476,7 +476,7 @@ _080A603E:
lsrs r4, r0, 16
_080A605C:
adds r0, r6, 0
bl battle_get_per_side_status
bl GetBankIdentity
ldr r3, =gUnknown_08525F58
lsls r0, 24
lsrs r0, 22
@@ -494,7 +494,7 @@ _080A605C:
cmp r7, 0
beq _080A609C
adds r0, r6, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A6096
@@ -605,7 +605,7 @@ sub_80A614C: @ 80A614C
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A6170
@@ -650,7 +650,7 @@ sub_80A6190: @ 80A6190
cmp r0, 0
bne _080A6238
adds r0, r5, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A61E4
@@ -662,7 +662,7 @@ sub_80A6190: @ 80A6190
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A621C
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -680,7 +680,7 @@ _080A61E4:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A621C
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -699,7 +699,7 @@ _080A621C:
ldrh r4, [r1, 0x2]
_080A621E:
adds r0, r5, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A6238
@@ -730,7 +730,7 @@ obj_id_for_side_relative_to_move: @ 80A6240
lsls r0, 24
cmp r0, 0
beq _080A62B6
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldrb r0, [r4]
b _080A62C6
.pool
@@ -743,7 +743,7 @@ _080A6268:
lsls r0, 24
cmp r0, 0
beq _080A62B6
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldrb r0, [r4]
b _080A62C6
.pool
@@ -774,7 +774,7 @@ _080A62B6:
b _080A62CA
.pool
_080A62C0:
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldrb r0, [r5]
eors r0, r4
_080A62C6:
@@ -1274,7 +1274,7 @@ sub_80A6630: @ 80A6630
ble _080A6674
subs r0, r1, 0x1
strh r0, [r3, 0x2E]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r4, 0x34
ldrsh r1, [r3, r4]
lsls r0, r1, 4
@@ -1325,7 +1325,7 @@ sub_80A6680: @ 80A6680
ldrh r2, [r4, 0x36]
adds r0, r2
strh r0, [r4, 0x36]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r0, 0x38
ldrsh r2, [r4, r0]
lsls r0, r2, 4
@@ -1596,7 +1596,7 @@ sub_80A6864: @ 80A6864
.pool
_080A68A4:
ldrb r0, [r7]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A68BC
@@ -1806,41 +1806,41 @@ _080A6A04:
.pool
thumb_func_end sub_80A69CC
thumb_func_start battle_side_get_owner
battle_side_get_owner: @ 80A6A30
thumb_func_start GetBankSide
GetBankSide: @ 80A6A30
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
adds r0, r1
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
bx lr
.pool
thumb_func_end battle_side_get_owner
thumb_func_end GetBankSide
thumb_func_start battle_get_per_side_status
battle_get_per_side_status: @ 80A6A44
thumb_func_start GetBankIdentity
GetBankIdentity: @ 80A6A44
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
adds r0, r1
ldrb r0, [r0]
bx lr
.pool
thumb_func_end battle_get_per_side_status
thumb_func_end GetBankIdentity
thumb_func_start battle_get_side_with_given_state
battle_get_side_with_given_state: @ 80A6A54
thumb_func_start GetBankByPlayerAI
GetBankByPlayerAI: @ 80A6A54
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
movs r1, 0
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r2, [r0]
cmp r1, r2
bcs _080A6A7E
ldr r4, =gUnknown_02024076
ldr r4, =gBanksBySide
ldrb r0, [r4]
cmp r0, r3
beq _080A6A7E
@@ -1860,7 +1860,7 @@ _080A6A7E:
pop {r1}
bx r1
.pool
thumb_func_end battle_get_side_with_given_state
thumb_func_end GetBankByPlayerAI
thumb_func_start sub_80A6A90
sub_80A6A90: @ 80A6A90
@@ -1883,17 +1883,17 @@ sub_80A6A90: @ 80A6A90
b _080A6B18
.pool
_080A6ABC:
ldr r0, =gUnknown_02024076
ldr r0, =gBanksBySide
adds r0, r4, r0
ldrb r0, [r0]
cmp r0, 0xFF
beq _080A6B18
adds r0, r4, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A6AF0
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -1903,7 +1903,7 @@ _080A6ABC:
b _080A6AFE
.pool
_080A6AF0:
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -2063,7 +2063,7 @@ sub_80A6BFC: @ 80A6BFC
_080A6C30:
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
bl GetBankIdentity_permutated
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -2848,7 +2848,7 @@ obj_id_set_rotscale: @ 80A71B4
orrs r1, r0
str r1, [sp]
_080A71F0:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -2887,7 +2887,7 @@ sub_80A7238: @ 80A7238
lsls r0, 24
cmp r0, 0
beq _080A7268
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r0, 0
bl obj_id_for_side_relative_to_move
lsls r0, 24
@@ -2921,7 +2921,7 @@ sub_80A7270: @ 80A7270
lsls r1, 24
lsrs r1, 24
mov r8, r1
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -2947,7 +2947,7 @@ _080A72A6:
ands r0, r1
strb r0, [r2]
_080A72B4:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r4, r6, 4
adds r0, r4, r6
lsls r0, 2
@@ -2994,7 +2994,7 @@ _080A72B4:
orrs r0, r1
strb r0, [r5, 0x3]
_080A7312:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r4, r6
lsls r0, 2
adds r0, r1
@@ -3028,7 +3028,7 @@ sub_80A7344: @ 80A7344
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -3067,7 +3067,7 @@ sub_80A73A0: @ 80A73A0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -3496,7 +3496,7 @@ _080A76F2:
cmp r5, 0
beq _080A771A
movs r0, 0
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@@ -3504,7 +3504,7 @@ _080A76F2:
cmp r0, 0
beq _080A771A
movs r0, 0
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -3514,7 +3514,7 @@ _080A771A:
cmp r6, 0
beq _080A7746
movs r0, 0x2
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@@ -3522,7 +3522,7 @@ _080A771A:
cmp r0, 0
beq _080A7746
movs r0, 0x2
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3534,7 +3534,7 @@ _080A7746:
cmp r7, 0
beq _080A7772
movs r0, 0x1
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@@ -3542,7 +3542,7 @@ _080A7746:
cmp r0, 0
beq _080A7772
movs r0, 0x1
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3555,7 +3555,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@@ -3563,7 +3563,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3592,7 +3592,7 @@ sub_80A77B4: @ 80A77B4
push {lr}
lsls r0, 24
lsrs r0, 24
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -3672,7 +3672,7 @@ _080A7842:
bl sub_80A69CC
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A785C
@@ -3718,7 +3718,7 @@ sub_80A78AC: @ 80A78AC
bl sub_80A69CC
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A78CC
@@ -3811,7 +3811,7 @@ _080A7976:
ldrb r6, [r0]
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A798E
@@ -3864,7 +3864,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8
cmp r1, 0xFF
beq _080A7A52
movs r6, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r1, r0, 2
@@ -4099,7 +4099,7 @@ _080A7BBC:
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r3, 4
adds r1, r3
lsls r1, 2
@@ -4413,7 +4413,7 @@ _080A7E34:
strh r0, [r4, 0x16]
b _080A7E62
_080A7E3C:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -4451,7 +4451,7 @@ sub_80A7E6C: @ 80A7E6C
lsrs r0, 15
movs r1, 0x40
subs r5, r1, r0
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -4495,7 +4495,7 @@ sub_80A7EC0: @ 80A7EC0
lsrs r0, 15
movs r1, 0x40
subs r5, r1, r0
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -4530,7 +4530,7 @@ sub_80A7F18: @ 80A7F18
push {r4-r7,lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -4539,7 +4539,7 @@ sub_80A7F18: @ 80A7F18
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r7, =0x00000181
ldr r0, =gUnknown_020244E4
adds r6, r5, r0
@@ -4567,7 +4567,7 @@ _080A7F42:
_080A7F78:
lsls r0, r4, 24
lsrs r0, 24
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A7FD8
@@ -4579,7 +4579,7 @@ _080A7F78:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A7FC0
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -4614,7 +4614,7 @@ _080A7FD8:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A8010
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -4785,7 +4785,7 @@ _080A80FA:
bl sub_80A7E6C
b _080A8134
_080A8124:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -4843,8 +4843,8 @@ sub_80A8174: @ 80A8174
lsls r0, 24
cmp r0, 0
beq _080A81B4
ldr r2, =gUnknown_02020630
ldr r1, =gUnknown_020241E4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -4870,8 +4870,8 @@ _080A81B4:
lsls r0, 24
cmp r0, 0
beq _080A81EC
ldr r2, =gUnknown_02020630
ldr r1, =gUnknown_020241E4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
mov r3, r8
ldrb r0, [r3]
adds r0, r1
@@ -4898,8 +4898,8 @@ _080A81EC:
lsls r0, 24
cmp r0, 0
beq _080A8224
ldr r2, =gUnknown_02020630
ldr r1, =gUnknown_020241E4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldrb r0, [r6]
eors r0, r5
adds r0, r1
@@ -4926,8 +4926,8 @@ _080A8224:
lsls r0, 24
cmp r0, 0
beq _080A825C
ldr r2, =gUnknown_02020630
ldr r1, =gUnknown_020241E4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
mov r3, r8
ldrb r0, [r3]
eors r0, r5
@@ -4959,11 +4959,11 @@ _080A825C:
sub_80A8278: @ 80A8278
push {r4-r6,lr}
movs r5, 0
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r0, [r0]
cmp r5, r0
bge _080A82D2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
_080A8286:
lsls r0, r5, 24
lsrs r4, r0, 24
@@ -4974,7 +4974,7 @@ _080A8286:
beq _080A82C8
adds r0, r4, 0
bl sub_80A82E4
ldr r3, =gUnknown_020241E4
ldr r3, =gBankSpriteIds
adds r3, r5, r3
ldrb r2, [r3]
lsls r1, r2, 4
@@ -4998,7 +4998,7 @@ _080A8286:
strb r2, [r0, 0x5]
_080A82C8:
adds r5, 0x1
ldr r0, =gUnknown_0202406C
ldr r0, =gNoOfAllBanks
ldrb r0, [r0]
cmp r5, r0
blt _080A8286
@@ -5027,7 +5027,7 @@ _080A82FC:
b _080A8320
_080A8300:
adds r0, r4, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x1E
@@ -5053,7 +5053,7 @@ sub_80A8328: @ 80A8328
push {r4,lr}
lsls r0, 24
lsrs r0, 24
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
@@ -5083,8 +5083,8 @@ _080A835C:
bx r1
thumb_func_end sub_80A8328
thumb_func_start battle_get_per_side_status_permutated
battle_get_per_side_status_permutated: @ 80A8364
thumb_func_start GetBankIdentity_permutated
GetBankIdentity_permutated: @ 80A8364
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -5093,7 +5093,7 @@ battle_get_per_side_status_permutated: @ 80A8364
cmp r0, 0
bne _080A838A
adds r0, r4, 0
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -5109,7 +5109,7 @@ _080A838C:
pop {r4}
pop {r1}
bx r1
thumb_func_end battle_get_per_side_status_permutated
thumb_func_end GetBankIdentity_permutated
thumb_func_start sub_80A8394
sub_80A8394: @ 80A8394
@@ -5367,7 +5367,7 @@ _080A85B2:
lsls r0, 24
cmp r0, 0
beq _080A85EE
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -5486,7 +5486,7 @@ _080A86AC:
.pool
_080A86C4:
mov r0, r8
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A8790
@@ -5499,7 +5499,7 @@ _080A86C4:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A871C
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
mov r1, r8
lsls r4, r1, 1
adds r4, r0
@@ -5589,7 +5589,7 @@ _080A8790:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A87DC
ldr r0, =gUnknown_0202406E
ldr r0, =gBattlePartyID
mov r1, r8
lsls r4, r1, 1
adds r4, r0
@@ -5876,7 +5876,7 @@ sub_80A89C8: @ 80A89C8
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r9, r0
mov r0, r8
lsls r3, r0, 4
@@ -5943,7 +5943,7 @@ sub_80A8A6C: @ 80A8A6C
bl sub_80A6838
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A8AAC
@@ -6000,7 +6000,7 @@ sub_80A8AEC: @ 80A8AEC
adds r4, r0, 0
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A8B1C
@@ -6056,7 +6056,7 @@ sub_80A8B64: @ 80A8B64
bl sub_80A6838
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A8B90
@@ -6108,7 +6108,7 @@ sub_80A8BC4: @ 80A8BC4
strh r0, [r5, 0x8]
ldr r7, =gUnknown_02038436
ldrb r0, [r7]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
movs r1, 0x8
cmp r0, 0
@@ -6120,7 +6120,7 @@ _080A8BF8:
strh r1, [r5, 0xA]
strh r6, [r5, 0xC]
strh r6, [r5, 0xE]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r0, 0x8
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -6219,7 +6219,7 @@ _080A8CDA:
adds r0, r4, 0
adds r1, r5, 0
bl sub_80A8D78
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x8
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -6244,7 +6244,7 @@ _080A8D10:
adds r0, r4, 0
adds r1, r5, 0
bl sub_80A8D78
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r0, 0x8
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -6307,7 +6307,7 @@ sub_80A8D78: @ 80A8D78
asrs r0, 16
cmp r0, 0
blt _080A8DE8
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
@@ -6403,7 +6403,7 @@ sub_80A8E30: @ 80A8E30
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A8E68
@@ -6489,7 +6489,7 @@ sub_80A8EE4: @ 80A8EE4
strh r0, [r4, 0x36]
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A8F24
asm/rom_80C6FA0.s
+90 -90
View File
@@ -1302,7 +1302,7 @@ sub_80C7958: @ 80C7958
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r3]
ldrb r2, [r4, 0x1]
@@ -1343,7 +1343,7 @@ _080C7A10:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r1, r0, r1
str r1, [r2]
movs r5, 0
@@ -5477,7 +5477,7 @@ sub_80C9F6C: @ 80C9F6C
adds r0, r1
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
b _080C9FB6
.pool
_080C9FAC:
@@ -5743,7 +5743,7 @@ _080CA1DA:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
adds r0, r4, 0x1
@@ -5964,7 +5964,7 @@ _080CA3C4:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r3]
lsls r0, r4, 4
@@ -9147,7 +9147,7 @@ _080CBE18:
ldr r0, [r4]
ldr r0, [r0]
mov r8, r0
ldr r5, =gUnknown_08329F40
ldr r5, =gSineTable
mov r0, r9
adds r1, r3, r0
ldrb r0, [r1]
@@ -9722,7 +9722,7 @@ sub_80CC230: @ 80CC230
lsrs r2, r0, 24
cmp r2, 0x40
beq _080CC2FC
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -10879,7 +10879,7 @@ _080CCC70:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
str r0, [r2]
lsls r1, r4, 24
@@ -11071,7 +11071,7 @@ _080CCE2E:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
mov r0, r8
@@ -11318,7 +11318,7 @@ _080CD036:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
lsls r1, r5, 24
lsrs r1, 24
@@ -11682,7 +11682,7 @@ sub_80CD2E8: @ 80CD2E8
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r6, r4, r5
adds r0, r6, 0
bl StartObjectImageAnim
@@ -14295,7 +14295,7 @@ sub_80CE9A8: @ 80CE9A8
adds r0, r1
movs r1, 0x8
mov r2, sp
bl pokemon_setattr
bl SetMonData
b _080CEA1C
.pool
_080CE9E8:
@@ -14313,7 +14313,7 @@ _080CE9E8:
adds r0, r1
movs r1, 0x8
mov r2, sp
bl pokemon_setattr
bl SetMonData
_080CEA08:
movs r0, 0
ldrsb r0, [r4, r0]
@@ -16512,7 +16512,7 @@ sub_80CFC14: @ 80CFC14
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r3]
ldr r0, =gUnknown_02039D7D
@@ -16584,7 +16584,7 @@ _080CFD40:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
lsls r3, r4, 2
@@ -18609,7 +18609,7 @@ _080D0CA0:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
adds r1, 0x3E
@@ -18821,7 +18821,7 @@ _080D0EF8:
adds r0, r1
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x1
bl sub_80CBBDC
@@ -18959,7 +18959,7 @@ _080D101C:
adds r2, r5
adds r0, r4, 0
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
mov r1, r8
ldr r0, [r1]
adds r0, r5
@@ -19041,7 +19041,7 @@ _080D10E0:
ldr r1, =0x00002234
adds r2, r1
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
mov r0, r8
movs r1, 0
bl sub_80CBBDC
@@ -19103,7 +19103,7 @@ _080D1170:
adds r0, r1
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
movs r1, 0x1
bl sub_80CBBDC
@@ -19894,7 +19894,7 @@ _080D17D4:
_080D17DA:
adds r0, r1
ldrh r0, [r0]
bl itemid_get_description
bl ItemId_GetDescription
adds r4, r0, 0
movs r0, 0x2
movs r1, 0x11
@@ -20401,7 +20401,7 @@ _080D1BC2:
lsls r0, 16
asrs r0, 20
strh r0, [r4, 0x22]
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
movs r2, 0x38
ldrsh r0, [r4, r2]
lsls r0, 4
@@ -20480,7 +20480,7 @@ _080D1C5E:
lsls r1, 16
asrs r1, 20
strh r1, [r4, 0x22]
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
movs r2, 0x38
ldrsh r0, [r4, r2]
lsls r0, 4
@@ -20650,7 +20650,7 @@ set_pokemon_data_from_any_box: @ 80D1D74
adds r0, r1
adds r1, r5, 0
adds r2, r6, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
_080D1DAC:
pop {r4-r6}
pop {r0}
@@ -20801,7 +20801,7 @@ sub_80D1E90: @ 80D1E90
adds r0, r1
movs r1, 0x2
adds r2, r5, 0
bl pokemon_setattr_encrypted
bl SetMonData_encrypted
_080D1EC6:
pop {r4,r5}
pop {r0}
@@ -22748,7 +22748,7 @@ _080D2D2A:
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl sub_80D30DC
adds r0, r4, 0
@@ -22812,7 +22812,7 @@ sub_80D2D78: @ 80D2D78
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl sub_80D30DC
adds r0, r4, 0
@@ -23414,7 +23414,7 @@ sub_80D31B4: @ 80D31B4
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
@@ -24599,7 +24599,7 @@ _080D3B64:
bl AllocZeroed
str r0, [r4]
movs r6, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
_080D3BA0:
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x4]
@@ -25355,7 +25355,7 @@ _080D41D4:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r0, r5
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -25816,11 +25816,11 @@ _080D4500:
mov r0, r8
movs r1, 0x40
mov r2, r9
bl pokemon_setattr
bl SetMonData
mov r0, r8
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
mov r1, r9
ldrb r0, [r1]
b _080D45B6
@@ -25918,7 +25918,7 @@ sub_80D460C: @ 80D460C
adds r0, r6, 0
movs r1, 0x40
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
mov r0, sp
strb r5, [r0]
mov r1, sp
@@ -25927,7 +25927,7 @@ sub_80D460C: @ 80D460C
adds r0, r6, 0
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r4]
b _080D4672
.pool
@@ -25980,11 +25980,11 @@ sub_80D4680: @ 80D4680
strb r1, [r0, 0x1]
adds r0, r4, 0
movs r1, 0x40
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
_080D46D2:
add sp, 0x8
pop {r4}
@@ -26080,11 +26080,11 @@ _080D4724:
adds r0, r5, 0
movs r1, 0x40
mov r2, r9
bl pokemon_setattr
bl SetMonData
adds r0, r5, 0
movs r1, 0xC
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r7, 0
b _080D47AC
.pool
@@ -26708,7 +26708,7 @@ RemoveBagObject: @ 80D4CA8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
bl obj_free_rotscale_entry
ldrb r1, [r5]
@@ -26767,7 +26767,7 @@ SetBagVisualPocketId: @ 80D4D38
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r2, r0, r2
cmp r1, 0
beq _080D4D84
@@ -26833,7 +26833,7 @@ ShakeBagVisual: @ 80D4DC4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
adds r0, r4, 0
adds r0, 0x3F
@@ -26898,7 +26898,7 @@ AddSwitchPocketRotatingBallObject: @ 80D4E34
movs r3, 0
bl AddObjectToFront
strb r0, [r4]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@@ -27034,7 +27034,7 @@ AddBagItemIconObject: @ 80D4F38
cmp r2, 0x40
beq _080D4F86
strb r2, [r5]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -27283,7 +27283,7 @@ sub_80D511C: @ 80D511C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectRotScalAnim
@@ -27331,7 +27331,7 @@ sub_80D51AC: @ 80D51AC
b _080D520C
.pool
_080D51D0:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -27383,7 +27383,7 @@ sub_80D5220: @ 80D5220
adds r7, r1, 0
cmp r5, 0
bne _080D52C6
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r6, 0x8
ldrsh r1, [r3, r6]
lsls r0, r1, 4
@@ -27509,7 +27509,7 @@ _080D5320:
_080D5324:
movs r0, 0x3
_080D5326:
bl battle_get_side_with_given_state
bl GetBankByPlayerAI
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -27519,12 +27519,12 @@ _080D5326:
bne _080D533C
movs r6, 0x1
_080D533C:
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
adds r0, r4, r0
b _080D5350
.pool
_080D5348:
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
adds r0, r1
@@ -27539,7 +27539,7 @@ _080D5356:
b _080D53A6
.pool
_080D5368:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r3, 4
adds r0, r3
lsls r0, 2
@@ -27594,7 +27594,7 @@ sub_80D53BC: @ 80D53BC
mov r12, r1
cmp r0, 0
bne _080D5474
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r7, 0x8
ldrsh r1, [r3, r7]
lsls r0, r1, 4
@@ -27698,7 +27698,7 @@ sub_80D5484: @ 80D5484
b _080D54F6
.pool
_080D54A8:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r3, 4
adds r1, r3
lsls r1, 2
@@ -27766,7 +27766,7 @@ _080D5526:
ands r0, r1
cmp r0, 0
beq _080D5568
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x8
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -27791,7 +27791,7 @@ _080D5526:
b _080D5592
.pool
_080D5568:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r0, 0x8
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -27915,7 +27915,7 @@ sub_80D5644: @ 80D5644
bl obj_id_for_side_relative_to_move
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -27966,7 +27966,7 @@ sub_80D56A4: @ 80D56A4
lsls r1, 16
asrs r1, 16
mov r12, r2
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
cmp r0, r1
bne _080D56F6
movs r0, 0
@@ -28103,7 +28103,7 @@ sub_80D57B8: @ 80D57B8
movs r2, 0xA
ldrsh r1, [r5, r2]
bl Sin
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -28153,7 +28153,7 @@ sub_80D5830: @ 80D5830
lsrs r4, r0, 24
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D584C
@@ -28182,7 +28182,7 @@ sub_80D5860: @ 80D5860
strb r0, [r2]
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D5890
@@ -28200,7 +28200,7 @@ _080D5894:
movs r0, 0
strh r2, [r4, 0x2E]
strh r0, [r4, 0x32]
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
adds r0, r1
@@ -28296,12 +28296,12 @@ sub_80D5968: @ 80D5968
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D598C
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038436
b _080D5990
.pool
_080D598C:
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldr r0, =gUnknown_02038437
_080D5990:
ldrb r0, [r0]
@@ -28311,7 +28311,7 @@ _080D5990:
ldrh r0, [r5, 0x4]
movs r3, 0
strh r0, [r6, 0x2E]
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r7, 4
adds r4, r7
lsls r4, 2
@@ -28383,7 +28383,7 @@ sub_80D5A24: @ 80D5A24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r3, r1, r0
ldrh r0, [r2, 0x2E]
movs r6, 0x2E
@@ -28449,11 +28449,11 @@ _080D5AB0:
ldr r0, =gUnknown_02038437
_080D5AB2:
ldrb r2, [r0]
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
adds r0, r2, r0
ldrb r6, [r0]
adds r0, r2, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D5ADC
@@ -28473,7 +28473,7 @@ _080D5ADC:
ldrh r0, [r2, 0x8]
movs r4, 0
strh r0, [r5, 0x2E]
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -28534,11 +28534,11 @@ _080D5B70:
ldr r0, =gUnknown_02038437
_080D5B72:
ldrb r1, [r0]
ldr r0, =gUnknown_020241E4
ldr r0, =gBankSpriteIds
adds r0, r1, r0
ldrb r7, [r0]
adds r0, r1, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D5B9C
@@ -28557,7 +28557,7 @@ _080D5B9C:
ldr r5, =gUnknown_0203841E
ldrh r0, [r5, 0x8]
strh r0, [r6, 0x2E]
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r7, 4
adds r4, r7
lsls r4, 2
@@ -28611,7 +28611,7 @@ _080D5C0C:
thumb_func_start sub_80D5C20
sub_80D5C20: @ 80D5C20
push {r4,lr}
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r1, 0x38
ldrsh r2, [r0, r1]
lsls r1, r2, 4
@@ -28649,7 +28649,7 @@ sub_80D5C50: @ 80D5C50
lsrs r7, r0, 16
ldr r0, =gUnknown_02038436
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D5C82
@@ -28716,7 +28716,7 @@ sub_80D5CE4: @ 80D5CE4
ldrh r2, [r5, 0x1E]
adds r0, r2
strh r0, [r5, 0x1E]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r4, r1, 4
adds r4, r1
lsls r4, 2
@@ -28775,7 +28775,7 @@ _080D5D70:
ldrh r1, [r4, 0x20]
adds r2, r1
strh r2, [r4, 0x20]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -28840,7 +28840,7 @@ _080D5DEA:
lsls r0, 24
cmp r0, 0
beq _080D5E10
ldr r1, =gUnknown_020241E4
ldr r1, =gBankSpriteIds
ldrb r0, [r5]
eors r0, r4
adds r0, r1
@@ -28860,7 +28860,7 @@ _080D5E18:
strh r2, [r5, 0x8]
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D5E44
@@ -28898,7 +28898,7 @@ sub_80D5E6C: @ 80D5E6C
lsls r1, 3
adds r1, r0
ldrb r2, [r1, 0x8]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -28933,7 +28933,7 @@ sub_80D5EB8: @ 80D5EB8
lsrs r5, r0, 24
ldr r6, =gUnknown_02038436
ldrb r0, [r6]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D5ED4
@@ -29019,7 +29019,7 @@ sub_80D5F3C: @ 80D5F3C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080D5F94
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r2, r7, 4
adds r1, r2, r7
lsls r1, 2
@@ -29031,11 +29031,11 @@ sub_80D5F3C: @ 80D5F3C
.pool
_080D5F94:
ldrb r0, [r4, 0x12]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080D5FBC
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r7, 4
adds r0, r2, r7
lsls r0, 2
@@ -29049,7 +29049,7 @@ _080D5F94:
b _080D5FD6
.pool
_080D5FBC:
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r7, 4
adds r0, r2, r7
lsls r0, 2
@@ -29311,7 +29311,7 @@ _080D61C8:
ldr r0, =gUnknown_02038437
_080D61CA:
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -29392,7 +29392,7 @@ _080D6274:
ldr r0, =gUnknown_02038437
_080D6276:
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D6288
@@ -29603,7 +29603,7 @@ _080D63EE:
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x16]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x16
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -29666,7 +29666,7 @@ sub_80D646C: @ 80D646C
beq _080D64DE
cmp r1, 0
beq _080D64C8
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x16
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -29679,7 +29679,7 @@ sub_80D646C: @ 80D646C
b _080D64DC
.pool
_080D64C8:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x16
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -29700,7 +29700,7 @@ _080D64DE:
ldrsh r4, [r3, r2]
cmp r4, 0
beq _080D6508
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x16
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -29712,7 +29712,7 @@ _080D64DE:
b _080D6518
.pool
_080D6508:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x16
ldrsh r1, [r3, r0]
lsls r0, r1, 4
@@ -29728,7 +29728,7 @@ _080D6518:
asrs r4, r0, 16
cmp r4, 0
bne _080D654A
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x16
ldrsh r1, [r3, r0]
lsls r0, r1, 4
asm/rom_8158B30.s
+538 -538
View File
File diff suppressed because it is too large Load Diff
asm/rom_817C95C.s
+150 -150
View File
@@ -29,37 +29,37 @@ sub_817C95C: @ 817C95C
beq _0817C988
bl _0817E0A6
_0817C988:
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
movs r1, 0x81
lsls r1, 2
adds r7, r0, r1
ldr r5, =gUnknown_0202420B
ldr r5, =gBankAttacker
ldrb r0, [r5]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_0202420E
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gUnknown_0203ABA8
ldr r0, [r0]
ldrb r0, [r0, 0x7]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
cmp r4, 0
bne _0817CA00
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
ldrb r0, [r5]
lsls r0, 1
adds r0, r2
@@ -70,7 +70,7 @@ _0817C988:
b _0817CA10
.pool
_0817CA00:
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
ldrb r0, [r5]
lsls r0, 1
adds r0, r2
@@ -83,7 +83,7 @@ _0817CA10:
str r1, [sp, 0x8]
cmp r6, 0
bne _0817CA3C
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -94,7 +94,7 @@ _0817CA10:
b _0817CA4C
.pool
_0817CA3C:
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -105,7 +105,7 @@ _0817CA3C:
_0817CA4C:
adds r1, r0
str r1, [sp, 0xC]
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
ldr r1, =gUnknown_0203ABA8
ldr r1, [r1]
@@ -134,20 +134,20 @@ _0817CA4C:
bl _0817E0A2
.pool
_0817CA9C:
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
mov r8, r0
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r5, r0, 25
ldr r0, =gUnknown_0202420E
ldrb r0, [r0]
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r3, r0, 25
ldr r1, [sp]
@@ -571,8 +571,8 @@ _0817D0DC:
adds r3, r4
lsls r3, 2
adds r3, r7, r3
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -601,8 +601,8 @@ _0817D124:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -634,8 +634,8 @@ _0817D16C:
adds r0, r4
lsls r0, 2
adds r5, r7, r0
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -715,8 +715,8 @@ _0817D216:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -775,8 +775,8 @@ _0817D296:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -833,8 +833,8 @@ _0817D314:
lsls r0, r4, 4
adds r3, r0
adds r3, r7, r3
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -899,7 +899,7 @@ _0817D38C:
bl sub_817E684
bl _0817E0A6
_0817D3A6:
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r0, 0xB3
movs r1, 0x1
@@ -911,7 +911,7 @@ _0817D3B8:
movs r2, 0
b _0817D48E
_0817D3C0:
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldrb r2, [r0, 0x2]
cmp r2, 0
bne _0817D3CC
@@ -934,14 +934,14 @@ _0817D3E8:
movs r0, 0x16
b _0817D48C
_0817D3F2:
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldrb r2, [r0, 0x2]
cmp r2, 0
bne _0817D3FE
bl _0817E0A6
_0817D3FE:
ldr r0, =gUnknown_0202420B
ldr r1, =gEnemyMonIndex
ldr r0, =gBankAttacker
ldr r1, =gBankTarget
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
@@ -969,7 +969,7 @@ _0817D436:
movs r0, 0x1B
b _0817D48C
_0817D440:
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldrb r2, [r0, 0x2]
cmp r2, 0
bne _0817D44C
@@ -982,7 +982,7 @@ _0817D44C:
b _0817D48C
.pool
_0817D45C:
ldr r0, =gUnknown_02022F58
ldr r0, =gBattleTextBuff1
ldrb r2, [r0, 0x2]
cmp r2, 0
bne _0817D468
@@ -1014,8 +1014,8 @@ _0817D498:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1091,8 +1091,8 @@ _0817D53C:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1161,8 +1161,8 @@ _0817D5CE:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1226,8 +1226,8 @@ _0817D65E:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1301,7 +1301,7 @@ _0817D6F2:
strb r0, [r1]
bl _0817E0A6
_0817D704:
ldr r5, =gUnknown_0202406E
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldrb r0, [r6]
lsls r0, 1
@@ -1314,7 +1314,7 @@ _0817D704:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1353,8 +1353,8 @@ _0817D76C:
bne _0817D77E
bl _0817E0A6
_0817D77E:
ldr r6, =gUnknown_0202406E
ldr r5, =gUnknown_0202420B
ldr r6, =gBattlePartyID
ldr r5, =gBankAttacker
ldrb r0, [r5]
lsls r0, 1
adds r0, r6
@@ -1395,7 +1395,7 @@ _0817D7B2:
b _0817D934
.pool
_0817D7D8:
ldr r5, =gUnknown_0202406E
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldrb r0, [r6]
lsls r0, 1
@@ -1408,7 +1408,7 @@ _0817D7D8:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1439,7 +1439,7 @@ _0817D7D8:
b _0817D88C
.pool
_0817D838:
ldr r5, =gUnknown_0202406E
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldrb r0, [r6]
lsls r0, 1
@@ -1452,7 +1452,7 @@ _0817D838:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1496,9 +1496,9 @@ _0817D8A4:
bne _0817D8B6
bl _0817E0A6
_0817D8B6:
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
mov r8, r2
ldr r6, =gUnknown_0202420B
ldr r6, =gBankAttacker
ldrb r0, [r6]
lsls r0, 1
add r0, r8
@@ -1573,8 +1573,8 @@ _0817D94C:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1627,7 +1627,7 @@ _0817D9AE:
movs r0, 0x9
b _0817E086
_0817D9C2:
ldr r5, =gUnknown_0202406E
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldrb r0, [r6]
lsls r0, 1
@@ -1640,7 +1640,7 @@ _0817D9C2:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1671,8 +1671,8 @@ _0817D9C2:
b _0817DB76
.pool
_0817DA24:
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1702,7 +1702,7 @@ _0817DA48:
b _0817E0A6
.pool
_0817DA68:
ldr r5, =gUnknown_0202406E
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldrb r0, [r6]
lsls r0, 1
@@ -1715,7 +1715,7 @@ _0817DA68:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1747,8 +1747,8 @@ _0817DA68:
b _0817DB76
.pool
_0817DACC:
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1790,7 +1790,7 @@ _0817DB10:
b _0817E0A6
.pool
_0817DB24:
ldr r5, =gUnknown_0202406E
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldrb r0, [r6]
lsls r0, 1
@@ -1803,7 +1803,7 @@ _0817DB24:
lsls r4, 3
adds r3, r4
adds r3, r7, r3
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1838,8 +1838,8 @@ _0817DB76:
b _0817E0A6
.pool
_0817DB90:
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1875,8 +1875,8 @@ _0817DBD4:
lsls r0, r1, 4
adds r3, r0
adds r3, r7, r3
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1943,8 +1943,8 @@ _0817DC62:
adds r2, r6
lsls r2, 2
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2021,8 +2021,8 @@ _0817DCFC:
lsls r0, r4, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2049,8 +2049,8 @@ _0817DD38:
lsls r0, r4, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2121,8 +2121,8 @@ _0817DDC8:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2154,8 +2154,8 @@ _0817DE10:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2253,8 +2253,8 @@ _0817DEDC:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2331,8 +2331,8 @@ _0817DF70:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2413,8 +2413,8 @@ _0817DFE6:
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2551,22 +2551,22 @@ sub_817E0FC: @ 817E0FC
bne _0817E122
b _0817E310
_0817E122:
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
movs r1, 0x81
lsls r1, 2
adds r1, r0, r1
str r1, [sp, 0x8]
ldr r2, =gUnknown_0202420B
ldr r2, =gBankAttacker
mov r10, r2
ldrb r0, [r2]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
mov r1, r10
@@ -2593,7 +2593,7 @@ _0817E122:
_0817E184:
mov r2, r10
ldrb r0, [r2]
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2604,7 +2604,7 @@ _0817E184:
mov r2, r10
ldrb r1, [r2]
lsls r1, 1
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
adds r1, r2
ldrh r2, [r1]
adds r2, 0x1
@@ -2617,7 +2617,7 @@ _0817E184:
strb r1, [r0]
mov r1, r10
ldrb r0, [r1]
bl battle_get_per_side_status
bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2685,7 +2685,7 @@ _0817E23C:
mov r1, r10
ldrb r0, [r1]
lsls r0, 1
ldr r2, =gUnknown_0202406E
ldr r2, =gBattlePartyID
adds r0, r2
ldrh r1, [r0]
adds r1, 0x1
@@ -2723,7 +2723,7 @@ _0817E27A:
mov r1, r10
ldrb r0, [r1]
lsls r0, 1
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
adds r0, r1
ldrh r1, [r0]
adds r1, 0x1
@@ -2807,14 +2807,14 @@ sub_817E32C: @ 817E32C
ands r0, r1
cmp r0, 0
beq _0817E3EE
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
movs r1, 0x81
lsls r1, 2
adds r4, r0, r1
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
cmp r5, 0x12
@@ -2916,7 +2916,7 @@ sub_817E3F4: @ 817E3F4
movs r7, 0
str r7, [sp, 0x14]
mov r8, r0
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0xB3
@@ -3158,7 +3158,7 @@ _0817E5C8:
ldr r3, [sp, 0x10]
cmp r3, 0x2
bhi _0817E620
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x25
ldrb r0, [r0]
bl sub_806D82C
@@ -3168,7 +3168,7 @@ _0817E5C8:
b _0817E670
.pool
_0817E620:
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x25
ldrb r0, [r0]
bl sub_806D82C
@@ -3184,7 +3184,7 @@ _0817E630:
_0817E63A:
lsls r0, r3, 24
lsrs r0, 24
ldr r1, =gUnknown_02024474
ldr r1, =gBattleScripting
adds r1, 0x25
ldrb r1, [r1]
bl sub_806EF84
@@ -3197,7 +3197,7 @@ _0817E63A:
b _0817E670
.pool
_0817E65C:
ldr r0, =gUnknown_02024474
ldr r0, =gBattleScripting
adds r0, 0x25
ldrb r1, [r0]
movs r0, 0x1
@@ -3235,7 +3235,7 @@ sub_817E684: @ 817E684
lsls r3, 24
lsrs r3, 24
mov r9, r3
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
movs r1, 0xD2
lsls r1, 1
@@ -3244,14 +3244,14 @@ sub_817E684: @ 817E684
movs r2, 0x81
lsls r2, 2
adds r7, r0, r2
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r3, r0, 24
mov r0, r10
@@ -3297,8 +3297,8 @@ _0817E6F0:
.4byte _0817E760
.4byte _0817E760
_0817E760:
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -3324,13 +3324,13 @@ _0817E760:
_0817E79C:
ldr r1, =gUnknown_0860A834
add r1, r12
ldr r7, =gUnknown_0202406E
ldr r7, =gBattlePartyID
lsls r0, r4, 1
adds r0, r4
lsls r2, r0, 4
ldr r4, =0x0000ffff
ldr r1, [r1]
ldr r3, =gUnknown_0202420B
ldr r3, =gBankAttacker
ldrh r0, [r1]
cmp r6, r0
bne _0817E7E0
@@ -3703,20 +3703,20 @@ sub_817EA80: @ 817EA80
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r0, [r0]
movs r1, 0x81
lsls r1, 2
adds r5, r0, r1
ldr r3, =gUnknown_0202420B
ldr r3, =gBankAttacker
mov r8, r3
ldrb r0, [r3]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r4, 1
@@ -4005,8 +4005,8 @@ _0817ECCC:
ldrb r0, [r0]
lsrs r0, 5
subs r6, r0, 0x1
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4164,8 +4164,8 @@ _0817EE1C:
cmp r7, 0x1
bne _0817EEBC
adds r2, r4, 0
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_0202420B
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4227,7 +4227,7 @@ _0817EE8E:
b _0817EEBC
_0817EE96:
adds r2, r4, 0
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
mov r3, r8
ldrb r0, [r3]
lsls r0, 1
@@ -4269,9 +4269,9 @@ sub_817EECC: @ 817EECC
beq _0817EEE6
b _0817F1FA
_0817EEE6:
ldr r4, =gUnknown_0202420B
ldr r4, =gBankAttacker
ldrb r0, [r4]
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4291,7 +4291,7 @@ _0817EEF8:
bgt _0817EF10
b _0817F1FA
_0817EF10:
ldr r0, =gEnemyMonIndex
ldr r0, =gBankTarget
ldrb r0, [r0]
muls r0, r1
adds r0, r5
@@ -4302,7 +4302,7 @@ _0817EF10:
ble _0817EF24
b _0817F1FA
_0817EF24:
ldr r0, =gUnknown_020241EA
ldr r0, =gCurrentMove
ldrh r1, [r0]
cmp r1, 0xED
bne _0817EF2E
@@ -4367,7 +4367,7 @@ _0817EF8A:
beq _0817EF98
b _0817F1FA
_0817EF98:
ldr r2, =gUnknown_0202420B
ldr r2, =gBankAttacker
ldrb r0, [r2]
adds r0, r6
ldrb r0, [r0]
@@ -4378,7 +4378,7 @@ _0817EF98:
ldr r0, =gBattleMoveDamage
ldr r0, [r0]
str r0, [r1]
ldr r0, =gUnknown_020241EA
ldr r0, =gCurrentMove
ldrh r1, [r0]
str r1, [sp, 0x24]
movs r5, 0
@@ -4386,11 +4386,11 @@ _0817EF98:
mov r10, r3
mov r8, r0
add r7, sp, 0x10
ldr r4, =gEnemyMonIndex
ldr r4, =gBankTarget
mov r9, r4
_0817EFC2:
lsls r1, r5, 1
ldr r6, =gUnknown_0202420B
ldr r6, =gBankAttacker
ldrb r0, [r6]
movs r2, 0x58
muls r0, r2
@@ -4414,13 +4414,13 @@ _0817EFC2:
ldr r4, =gUnknown_0202428E
mov r1, r9
ldrb r0, [r1]
bl battle_get_per_side_status
bl GetBankIdentity
movs r1, 0x1
ands r1, r0
lsls r1, 1
adds r1, r4
ldrh r3, [r1]
ldr r2, =gUnknown_0202420B
ldr r2, =gBankAttacker
ldrb r0, [r2]
movs r4, 0x58
muls r0, r4
@@ -4437,7 +4437,7 @@ _0817EFC2:
str r4, [sp]
movs r4, 0
str r4, [sp, 0x4]
ldr r6, =gUnknown_0202420B
ldr r6, =gBankAttacker
ldrb r4, [r6]
str r4, [sp, 0x8]
mov r6, r9
@@ -4447,8 +4447,8 @@ _0817EFC2:
adds r3, r0, 0
ldr r4, =gBattleMoveDamage
str r3, [r4]
ldr r1, =gUnknown_020242AC
ldr r2, =gUnknown_0202420B
ldr r1, =gStatuses3
ldr r2, =gBankAttacker
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -4471,8 +4471,8 @@ _0817EFC2:
lsls r0, r3, 1
str r0, [r4]
_0817F06A:
ldr r0, =gUnknown_0202433C
ldr r6, =gUnknown_0202420B
ldr r0, =gProtectStructs
ldr r6, =gBankAttacker
ldrb r1, [r6]
lsls r1, 4
adds r1, r0
@@ -4513,9 +4513,9 @@ _0817F0B4:
cmp r5, 0x3
ble _0817EFC2
movs r5, 0
ldr r3, =gUnknown_0202420B
ldr r3, =gBankAttacker
ldr r6, =gUnknown_020244B0
ldr r4, =gUnknown_0202406E
ldr r4, =gBattlePartyID
mov r8, r4
movs r7, 0x64
mov r9, r7
@@ -4545,9 +4545,9 @@ _0817F0D8:
movs r7, 0
_0817F0F6:
movs r5, 0
ldr r4, =gEnemyMonIndex
ldr r4, =gBankTarget
ldr r6, =gEnemyParty
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
add r0, r10
ldrb r3, [r0]
@@ -4582,7 +4582,7 @@ _0817F11A:
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
ldr r2, =gUnknown_0202420B
ldr r2, =gBankAttacker
ldrb r0, [r2]
lsls r0, 1
add r0, r8
@@ -4598,7 +4598,7 @@ _0817F11A:
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r4, =gUnknown_0202420B
ldr r4, =gBankAttacker
ldrb r3, [r4]
mov r2, r10
adds r0, r3, r2
@@ -4625,7 +4625,7 @@ _0817F1D4:
_0817F1DC:
ldr r2, =gBattleMoveDamage
ldr r1, =gUnknown_020244B0
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -4634,7 +4634,7 @@ _0817F1DC:
adds r0, 0x10
ldr r0, [r0]
str r0, [r2]
ldr r0, =gUnknown_020241EA
ldr r0, =gCurrentMove
mov r3, sp
ldrh r3, [r3, 0x24]
strh r3, [r0]
@@ -4695,7 +4695,7 @@ _0817F270:
cmp r2, 0x95
bne _0817F294
ldr r2, =gBattleMons
ldr r0, =gUnknown_0202420B
ldr r0, =gBankAttacker
ldrb r1, [r0]
movs r0, 0x58
muls r0, r1
@@ -4731,7 +4731,7 @@ sub_817F2A8: @ 817F2A8
ands r0, r1
cmp r0, 0
beq _0817F324
ldr r0, =gUnknown_0202449C
ldr r0, =gBattleStruct
ldr r3, [r0]
ldr r0, =0x0000025b
adds r4, r3, r0
@@ -4801,7 +4801,7 @@ sub_817F33C: @ 817F33C
lsls r1, 16
lsrs r7, r1, 16
adds r0, r5, 0
bl battle_side_get_owner
bl GetBankSide
lsls r0, 24
ldr r6, =gEnemyParty
cmp r0, 0
@@ -4809,7 +4809,7 @@ sub_817F33C: @ 817F33C
ldr r6, =gPlayerParty
_0817F356:
movs r4, 0
ldr r1, =gUnknown_0202406E
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r5, r0, r1
b _0817F36E
asm/rom_8184DA4.s
+888 -888
View File
File diff suppressed because it is too large Load Diff
asm/rom_81BAD84.s
+474 -474
View File
File diff suppressed because it is too large Load Diff
asm/rotating_gate.s
+3 -3
View File
@@ -338,7 +338,7 @@ _080FBA38:
lsls r4, r5, 4
adds r4, r5
lsls r4, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r4, r2
strh r6, [r4, 0x2E]
movs r2, 0x3E
@@ -625,7 +625,7 @@ _080FBC94:
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r4, 0
bl obj_free_rotscale_entry
@@ -818,7 +818,7 @@ sub_80FBE08: @ 80FBE08
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
strh r1, [r4, 0x30]
adds r0, r3, 0
asm/roulette.s
+55 -55
View File
@@ -1384,7 +1384,7 @@ _08140E20:
bl sub_8142284
movs r4, 0
mov r9, r6
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r12, r1
movs r2, 0x8
add r2, r12
@@ -1459,7 +1459,7 @@ _08140E8C:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r0, r1
adds r2, r3, 0
adds r2, 0x40
@@ -1717,7 +1717,7 @@ _08141128:
asrs r0, 16
cmp r0, 0x68
bne _08141180
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r1, 0
adds r0, 0x55
ldrb r1, [r0]
@@ -2238,7 +2238,7 @@ sub_814155C: @ 814155C
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r1, r2
str r1, [r3, 0x38]
ldr r2, =sub_81446AC
@@ -2427,7 +2427,7 @@ _08141700:
asrs r0, 16
cmp r0, 0x68
bne _08141768
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r1, 0
adds r0, 0x55
ldrb r1, [r0]
@@ -2873,7 +2873,7 @@ sub_8141AC0: @ 8141AC0
ldrb r0, [r2]
ands r1, r0
strb r1, [r2]
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r2, [r5]
ldr r5, =gUnknown_085B6154
ldr r0, =gTasks
@@ -2934,7 +2934,7 @@ sub_8141B58: @ 8141B58
strb r2, [r1]
movs r0, 0
bl sub_81424FC
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r4]
adds r0, 0x6C
ldrb r1, [r0]
@@ -3111,7 +3111,7 @@ dp01t_12_3_battle_menu: @ 8141D0C
bl sub_81424FC
movs r0, 0x6
bl sub_814372C
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
ldr r3, =gUnknown_0203AB88
movs r6, 0x5
negs r6, r6
@@ -3861,28 +3861,28 @@ _08142368:
b _081423D4
.pool
_0814237C:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_0203AB88
ldr r0, [r2]
adds r0, 0x43
b _081423C0
.pool
_08142390:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_0203AB88
ldr r0, [r2]
adds r0, 0x44
b _081423C0
.pool
_081423A4:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_0203AB88
ldr r0, [r2]
adds r0, 0x45
b _081423C0
.pool
_081423B8:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gUnknown_0203AB88
ldr r0, [r2]
adds r0, 0x46
@@ -4900,7 +4900,7 @@ sub_8142C60: @ 8142C60
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r5, 4
adds r1, r5
lsls r1, 2
@@ -4972,7 +4972,7 @@ sub_8142CD0: @ 8142CD0
mov r0, sp
bl LoadObjectPic
movs r6, 0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
_08142D18:
lsls r0, r6, 1
@@ -5030,7 +5030,7 @@ _08142D6E:
cmp r6, 0x2
bls _08142D18
movs r6, 0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
_08142D86:
lsls r1, r6, 1
adds r1, r6
@@ -5065,7 +5065,7 @@ _08142D86:
cmp r6, 0x3
bls _08142D86
movs r6, 0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
_08142DCC:
lsls r2, r6, 1
adds r2, r6
@@ -5121,7 +5121,7 @@ _08142E40:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -5151,7 +5151,7 @@ sub_8142E70: @ 8142E70
cmp r0, 0x1
bne _08142F66
movs r4, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r3, =gUnknown_0203AB88
movs r2, 0x4
_08142E92:
@@ -5181,7 +5181,7 @@ _08142EC0:
ldr r7, =gUnknown_085B62E4
adds r1, r7, 0x4
mov r8, r1
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
movs r6, 0x5
negs r6, r6
_08142ED2:
@@ -5234,7 +5234,7 @@ _08142F2C:
bls _08142ED2
cmp r4, 0x12
bhi _08142F66
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r3, =gUnknown_0203AB88
movs r5, 0x5
negs r5, r5
@@ -5274,7 +5274,7 @@ sub_8142F7C: @ 8142F7C
push {r7}
movs r5, 0
ldr r6, =gUnknown_0203AB88
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
movs r0, 0x4
mov r8, r0
_08142F8C:
@@ -5371,7 +5371,7 @@ sub_8143038: @ 8143038
movs r6, 0
cmp r0, 0
beq _08143084
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r3, =gUnknown_0203AB88
movs r2, 0x4
_08143056:
@@ -5397,7 +5397,7 @@ _08143056:
_08143084:
ldr r0, =gUnknown_0203AB88
mov r8, r0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
ldr r0, =gUnknown_085B6154
mov r12, r0
movs r0, 0x5
@@ -5505,7 +5505,7 @@ sub_8143150: @ 8143150
lsrs r5, r0, 24
cmp r5, 0
bne _08143180
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB88
ldr r0, [r0]
adds r0, 0x6C
@@ -5522,7 +5522,7 @@ sub_8143150: @ 8143150
b _081431D0
.pool
_08143180:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r3, =gUnknown_0203AB88
ldr r0, [r3]
adds r0, 0x6C
@@ -5590,7 +5590,7 @@ sub_81431E4: @ 81431E4
mov r0, sp
strh r1, [r0]
movs r0, 0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
_08143210:
movs r4, 0
adds r6, r0, 0x1
@@ -5758,7 +5758,7 @@ _08143322:
ldr r1, [r3]
adds r1, 0x50
strb r0, [r1]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r0, [r3]
adds r0, 0x50
ldrb r1, [r0]
@@ -5829,7 +5829,7 @@ _0814338C:
ldr r1, [r2]
adds r1, 0x55
strb r0, [r1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r2]
adds r0, 0x55
ldrb r1, [r0]
@@ -5902,7 +5902,7 @@ _0814341C:
ldr r1, [r3]
adds r1, 0x6C
strb r0, [r1]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r0, [r3]
adds r0, 0x6C
ldrb r0, [r0]
@@ -5962,7 +5962,7 @@ sub_8143514: @ 8143514
mov r8, r0
movs r4, 0
movs r6, 0
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r9, r1
ldr r0, =gUnknown_0203AB88
mov r10, r0
@@ -5982,7 +5982,7 @@ _08143534:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r0, 0x3E
ldrb r1, [r0]
@@ -6176,7 +6176,7 @@ sub_81436D0: @ 81436D0
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r4, r1, r2
bl sub_8143614
adds r3, r4, 0
@@ -6243,7 +6243,7 @@ _08143760:
.4byte _0814377C
_0814377C:
movs r4, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r6, =gUnknown_0203AB88
movs r0, 0x5
negs r0, r0
@@ -6300,13 +6300,13 @@ _08143790:
b _081438F4
.pool
_081437FC:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r5]
adds r0, 0x58
b _0814386A
.pool
_08143808:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r5]
adds r0, 0x58
ldrb r1, [r0]
@@ -6326,13 +6326,13 @@ _08143808:
b _08143886
.pool
_08143830:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r5]
adds r0, 0x57
b _0814386A
.pool
_0814383C:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r5]
adds r0, 0x57
ldrb r1, [r0]
@@ -6352,7 +6352,7 @@ _0814383C:
b _08143886
.pool
_08143864:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r5]
adds r0, 0x56
_0814386A:
@@ -6386,7 +6386,7 @@ _08143886:
_081438A8:
movs r4, 0
lsls r7, r6, 2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
movs r0, 0x8
adds r0, r6
mov r12, r0
@@ -6466,7 +6466,7 @@ sub_814391C: @ 814391C
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -6524,7 +6524,7 @@ sub_81439C8: @ 81439C8
push {r4-r6,lr}
movs r4, 0
ldr r5, =gUnknown_0203AB88
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
_081439D0:
movs r3, 0x39
subs r3, r4
@@ -6591,7 +6591,7 @@ sub_8143A40: @ 8143A40
adds r0, 0x3C
ldrb r5, [r0]
movs r6, 0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
movs r0, 0x1C
adds r0, r7
mov r10, r0
@@ -7337,7 +7337,7 @@ sub_8144050: @ 8144050
asrs r0, 16
cmp r0, 0x2D
bne _0814411E
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB88
ldr r0, [r0]
adds r0, 0x73
@@ -7360,7 +7360,7 @@ _08144098:
ldrsh r1, [r3, r2]
cmp r0, r1
bge _081440E4
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB88
ldr r0, [r0]
adds r0, 0x73
@@ -8166,7 +8166,7 @@ sub_81446DC: @ 81446DC
ldr r1, [r5]
adds r1, 0x75
strb r0, [r1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r5]
adds r0, 0x75
ldrb r1, [r0]
@@ -8304,7 +8304,7 @@ _0814477C:
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
cmp r7, 0x2
bls _0814477C
mov r3, r10
@@ -8378,7 +8378,7 @@ sub_81448B8: @ 81448B8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
adds r0, r6
ldrh r1, [r7, 0x2E]
lsls r1, 24
@@ -8919,7 +8919,7 @@ _08144D54:
ldr r1, =gUnknown_02021BBE
movs r0, 0
strh r0, [r1]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB88
ldr r0, [r0]
adds r0, 0x73
@@ -8987,7 +8987,7 @@ _08144DDC:
strh r0, [r5, 0x30]
ldr r3, =sub_8144C70
str r3, [r5, 0x1C]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x3A
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -9142,7 +9142,7 @@ _08144F30:
_08144F42:
cmp r2, r0
bne _08144F7C
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x36
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -9225,7 +9225,7 @@ _08144FC8:
bl m4aSongNumStop
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r4, =gUnknown_0203AB88
ldr r0, [r4]
adds r0, 0x74
@@ -9320,7 +9320,7 @@ _08145090:
bl StartObjectImageAnim
ldr r0, =sub_8144FB0
str r0, [r4, 0x1C]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x3A
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -9510,7 +9510,7 @@ sub_8145218: @ 8145218
ldrh r2, [r4, 0x20]
adds r0, r2
strh r0, [r4, 0x20]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
movs r2, 0x3A
ldrsh r0, [r4, r2]
lsls r2, r0, 4
@@ -9564,7 +9564,7 @@ sub_8145294: @ 8145294
adds r0, 0x5A
cmp r2, r0
bne _0814533E
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x3A
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -9588,7 +9588,7 @@ _081452DC:
adds r0, r1
cmp r2, r0
bne _0814533E
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0x3A
ldrsh r1, [r4, r0]
lsls r0, r1, 4
asm/safari_zone.s
+1 -1
View File
@@ -130,7 +130,7 @@ sub_80FC190: @ 80FC190
ldrb r2, [r1]
adds r0, r2
strb r0, [r1]
ldr r2, =gUnknown_0202433A
ldr r2, =gBattleOutcome
ldrb r0, [r2]
cmp r0, 0x7
bne _080FC1AE
asm/scrcmd.s
+2 -2
View File
@@ -5440,7 +5440,7 @@ sCD_set_obedient_bit: @ 809BC44
adds r0, r1
movs r1, 0x50
mov r2, sp
bl pokemon_setattr
bl SetMonData
movs r0, 0
add sp, 0x4
pop {r1}
@@ -5588,7 +5588,7 @@ sub_809BD70: @ 809BD70
adds r0, r1
movs r1, 0x23
mov r2, sp
bl pokemon_setattr
bl SetMonData
_0809BDA6:
movs r0, 0
add sp, 0x4
asm/script_menu.s
+2 -2
View File
@@ -1313,7 +1313,7 @@ _080E28CA:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrb r1, [r4, 0xC]
bl sub_80B6070
@@ -1391,7 +1391,7 @@ sub_80E2900: @ 80E2900
mov r0, r8
strh r0, [r3, 0xA]
strh r5, [r3, 0xC]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r1, r5, 4
adds r1, r5
lsls r1, 2
asm/script_pokemon_util_80F87D8.s
+12 -12
View File
@@ -517,7 +517,7 @@ _080F8BBA:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
ldrb r2, [r1, 0x5]
movs r0, 0xF
@@ -621,7 +621,7 @@ sub_80F8C7C: @ 80F8C7C
adds r0, r4
movs r1, 0x46
mov r2, sp
bl pokemon_setattr
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
@@ -771,7 +771,7 @@ _080F8DD8:
bne _080F8E6C
adds r0, r4, r5
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r1, r6, 0
movs r2, 0
@@ -783,7 +783,7 @@ _080F8E58:
lsls r4, r5, 4
adds r0, r4, r5
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r1, r6, 0
movs r2, 0
@@ -800,7 +800,7 @@ _080F8E6C:
strh r1, [r0, 0xE]
mov r2, r10
strh r2, [r0, 0x10]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
adds r1, r4, r5
lsls r1, 2
adds r0, r3, 0
@@ -895,7 +895,7 @@ _080F8F42:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
ldrb r0, [r4, 0x5]
lsrs r0, 4
@@ -1206,7 +1206,7 @@ _080F919E:
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r4, 0
movs r1, 0x15
bl GetMonData
@@ -1231,7 +1231,7 @@ _080F91D4:
adds r1, 0x11
adds r0, r4, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -1248,7 +1248,7 @@ _080F91D4:
add r0, r10
movs r1, 0x37
mov r2, sp
bl pokemon_setattr
bl SetMonData
mov r1, r9
lsls r0, r1, 24
lsrs r0, 24
@@ -1305,7 +1305,7 @@ sub_80F9244: @ 80F9244
adds r0, r6, 0
movs r1, 0xC
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
bl pokemon_catch
lsls r0, 24
@@ -1349,7 +1349,7 @@ sub_80F92C8: @ 80F92C8
strb r0, [r2]
mov r0, sp
movs r1, 0x2D
bl pokemon_setattr
bl SetMonData
mov r0, sp
bl pokemon_catch
lsls r0, 24
@@ -1487,7 +1487,7 @@ sub_80F93A0: @ 80F93A0
mov r0, r8
movs r1, 0xC
add r2, sp, 0x10
bl pokemon_setattr
bl SetMonData
_080F93EE:
add sp, 0x14
pop {r3}
asm/shop.s
+5 -5
View File
@@ -735,7 +735,7 @@ _080E008A:
cmp r0, 0
bne _080E00D8
mov r0, r8
bl itemid_get_description
bl ItemId_GetDescription
adds r4, r0, 0
b _080E00EA
.pool
@@ -975,7 +975,7 @@ _080E02AE:
cmp r2, 0x40
beq _080E0310
strb r2, [r4]
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -1034,7 +1034,7 @@ BuyMenuRemoveItemIcon: @ 80E031C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
movs r0, 0xFF
@@ -1732,7 +1732,7 @@ BuyMenuDrawFieldObjects: @ 80E08F0
mov r8, r0
ldr r1, =gUnknown_02037350
mov r10, r1
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r9, r2
_080E090A:
mov r3, r8
@@ -2075,7 +2075,7 @@ _080E0BD0:
adds r0, r5, 0
bl itemid_get_name
adds r0, r5, 0
bl itemid_get_pocket_number
bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
asm/slot_machine.s
+44 -44
View File
@@ -5356,7 +5356,7 @@ _0812CEE4:
sub_812CEF4: @ 812CEF4
push {r4,r5,lr}
movs r4, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
_0812CEFA:
ldr r0, =sub_812D024
bl obj_add_empty_with_callback
@@ -5395,7 +5395,7 @@ sub_812CF34: @ 812CF34
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r2, 0
movs r1, 0x1
@@ -5419,7 +5419,7 @@ sub_812CF6C: @ 812CF6C
ldr r0, [r0]
adds r3, r0, 0
adds r3, 0x44
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
_0812CF7A:
adds r0, r3, r2
ldrb r1, [r0]
@@ -5489,7 +5489,7 @@ sub_812CFEC: @ 812CFEC
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
movs r2, 0x30
ldrsh r0, [r1, r2]
@@ -5835,7 +5835,7 @@ sub_812D264: @ 812D264
sub_812D28C: @ 812D28C
push {r4,r5,lr}
adds r4, r0, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r0, 0xC
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -6350,7 +6350,7 @@ sub_812D63C: @ 812D63C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
mov r2, sp
adds r1, r2, r5
@@ -6407,7 +6407,7 @@ sub_812D6EC: @ 812D6EC
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x3
bl StartObjectImageAnimIfDifferent
@@ -6608,7 +6608,7 @@ sub_812D870: @ 812D870
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x5
bl StartObjectImageAnimIfDifferent
@@ -6625,7 +6625,7 @@ _0812D8D0:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
movs r1, 0x4
bl StartObjectImageAnimIfDifferent
@@ -6848,7 +6848,7 @@ sub_812DA90: @ 812DA90
bl sub_812EA7C
bl sub_812EBCC
bl sub_812EC20
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r3, =gUnknown_0203AB34
ldr r0, [r3]
adds r0, 0x4E
@@ -6928,7 +6928,7 @@ _0812DB3C:
bl sub_812EC94
bl sub_812E5A8
bl sub_812EDC0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB34
ldr r0, [r0]
adds r0, 0x4E
@@ -7543,7 +7543,7 @@ _0812E00E:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
movs r0, 0x40
@@ -7575,7 +7575,7 @@ sub_812E054: @ 812E054
movs r2, 0x4
adds r3, r0, 0
adds r3, 0x8
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
_0812E070:
lsls r0, r2, 1
adds r1, r3, r0
@@ -7655,7 +7655,7 @@ _0812E0F0:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
ldrb r0, [r1, 0x5]
movs r2, 0xC
@@ -7830,7 +7830,7 @@ sub_812E230: @ 812E230
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
ldrb r1, [r2, 0x5]
movs r0, 0xD
@@ -7914,7 +7914,7 @@ sub_812E300: @ 812E300
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -7982,7 +7982,7 @@ _0812E350:
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -8020,7 +8020,7 @@ sub_812E3E8: @ 812E3E8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
ldr r4, =gUnknown_0203AAE4
@@ -8127,7 +8127,7 @@ _0812E490:
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
mov r9, r5
adds r2, r0, r5
ldrb r1, [r2, 0x5]
@@ -8263,7 +8263,7 @@ _0812E5BC:
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrb r2, [r0, 0x5]
movs r1, 0xD
@@ -8308,7 +8308,7 @@ _0812E656:
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r1
ldrb r2, [r3, 0x5]
movs r6, 0xD
@@ -8401,7 +8401,7 @@ sub_812E70C: @ 812E70C
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
adds r2, r0, r7
adds r1, r2, 0
adds r1, 0x3E
@@ -8485,7 +8485,7 @@ sub_812E7CC: @ 812E7CC
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r3, r0, 0
adds r3, 0x3E
@@ -8522,7 +8522,7 @@ sub_812E82C: @ 812E82C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
movs r4, 0
@@ -8535,7 +8535,7 @@ _0812E846:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -8569,7 +8569,7 @@ _0812E88A:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -8596,7 +8596,7 @@ _0812E8C8:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -8620,7 +8620,7 @@ sub_812E8F8: @ 812E8F8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
ldr r4, =gUnknown_0203AAF0
@@ -8655,7 +8655,7 @@ sub_812E934: @ 812E934
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r9, r2
adds r3, r1, r2
ldrb r2, [r3, 0x5]
@@ -8779,7 +8779,7 @@ sub_812EA44: @ 812EA44
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r1, =gUnknown_0203AB34
ldr r3, [r1]
adds r1, r3, 0
@@ -8816,7 +8816,7 @@ _0812EA80:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -8844,7 +8844,7 @@ sub_812EAB0: @ 812EAB0
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r9, r1
lsls r2, r0, 4
adds r2, r0
@@ -8952,7 +8952,7 @@ _0812EB9A:
thumb_func_start sub_812EBAC
sub_812EBAC: @ 812EBAC
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r1, =gUnknown_0203AB34
ldr r1, [r1]
adds r1, 0x52
@@ -8990,7 +8990,7 @@ _0812EBEA:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -9014,7 +9014,7 @@ sub_812EC20: @ 812EC20
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -9054,7 +9054,7 @@ sub_812EC70: @ 812EC70
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
pop {r0}
@@ -9087,7 +9087,7 @@ _0812ECA4:
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r3, r1
ldrb r2, [r3, 0x5]
movs r5, 0xD
@@ -9196,7 +9196,7 @@ _0812ED90:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -9224,7 +9224,7 @@ sub_812EDC0: @ 812EDC0
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrb r2, [r0, 0x5]
movs r1, 0xD
@@ -9330,7 +9330,7 @@ _0812EE90:
thumb_func_start sub_812EEA8
sub_812EEA8: @ 812EEA8
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203AB34
ldr r0, [r0]
adds r0, 0x43
@@ -9356,7 +9356,7 @@ sub_812EECC: @ 812EECC
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
ldrb r0, [r4, 0x3]
lsls r0, 26
@@ -9389,7 +9389,7 @@ sub_812EF00: @ 812EF00
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
ldrb r2, [r0, 0x5]
movs r1, 0xD
@@ -9435,7 +9435,7 @@ sub_812EF6C: @ 812EF6C
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
ldrb r0, [r4, 0x3]
lsls r0, 26
@@ -9525,7 +9525,7 @@ sub_812EFDC: @ 812EFDC
lsls r0, r7, 4
adds r0, r7
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r0, r1
ldrb r0, [r2, 0x5]
movs r1, 0xC
asm/sprite.s
+14 -14
View File
@@ -44,7 +44,7 @@ _080069C6:
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r4, r0, r1
adds r5, r4, 0
adds r5, 0x3E
@@ -113,7 +113,7 @@ PrepareSpritesForOamLoad: @ 8006A0C
UpdateObjectOamCoords: @ 8006A58
push {r4-r7,lr}
movs r4, 0
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
ldr r0, =0x000001ff
adds r5, r0, 0
ldr r6, =0xfffffe00
@@ -209,7 +209,7 @@ _08006B0A:
BuildObjectPriorityList: @ 8006B1C
push {r4,lr}
movs r2, 0
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r3, =gUnknown_02021774
_08006B24:
lsls r0, r2, 4
@@ -264,7 +264,7 @@ _08006B78:
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r7, =gUnknown_02020630
ldr r7, =gSprites
adds r3, r0, r7
mov r0, r12
add r0, r10
@@ -366,7 +366,7 @@ _08006C38:
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
adds r3, r0, r6
mov r7, r10
adds r0, r5, r7
@@ -528,7 +528,7 @@ _08006D72:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r2, r0, r1
adds r0, r2, 0
adds r0, 0x3E
@@ -591,7 +591,7 @@ AddObjectToFront: @ 8006DF4
lsls r3, 24
lsrs r4, r3, 24
movs r3, 0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r12, r0
lsls r5, r1, 16
lsls r6, r2, 16
@@ -640,7 +640,7 @@ AddObjectToBack: @ 8006E48
lsls r3, 24
lsrs r6, r3, 24
movs r3, 0x3F
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
movs r0, 0x1
negs r0, r0
@@ -701,7 +701,7 @@ obj_add_empty_with_callback: @ 8006EB4
lsrs r5, r0, 24
cmp r5, 0x40
beq _08006EF4
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r1, r5, 4
adds r1, r5
lsls r1, 2
@@ -749,7 +749,7 @@ AddObject: @ 8006EFC
lsls r0, 4
add r0, r10
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r7, r0, r1
adds r0, r7, 0
bl RemoveObject
@@ -906,7 +906,7 @@ AddObjectAndAnimateForOneFrame: @ 8007054
lsrs r3, 24
mov r9, r3
movs r3, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r1, 16
mov r12, r1
lsls r2, 16
@@ -1572,7 +1572,7 @@ _0800752C:
Unused_CopyFromObjects: @ 800753C
push {r4,lr}
adds r1, r0, 0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r2, 0
ldr r4, =0x000010ff
_08007546:
@@ -1594,7 +1594,7 @@ _08007546:
Unused_CopyToObjects: @ 8007564
push {r4,lr}
adds r1, r0, 0
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
movs r2, 0
ldr r4, =0x000010ff
_0800756E:
@@ -1620,7 +1620,7 @@ _08007590:
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r0, r5
bl RemoveObject
ldr r0, =gUnknown_020217F4
asm/starter_choose.s
+5 -5
View File
@@ -232,7 +232,7 @@ set_256color_bg_bg0: @ 8133F0C
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
mov r8, r3
lsls r1, r0, 4
adds r1, r0
@@ -393,7 +393,7 @@ sub_813425C: @ 813425C
bl sub_8134690
lsls r0, 24
lsrs r0, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -453,7 +453,7 @@ sub_8134340: @ 8134340
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -578,7 +578,7 @@ _08134450:
lsls r5, 3
adds r5, r0
ldrb r4, [r5, 0xA]
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -848,7 +848,7 @@ sub_8134690: @ 8134690
bl sub_818D3E4
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
asm/title_screen.s
+5 -5
View File
@@ -153,7 +153,7 @@ _080AA4FA:
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r4, 0
adds r1, r6, 0
@@ -196,7 +196,7 @@ _080AA556:
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
adds r1, r5, 0x5
lsls r1, 24
@@ -361,7 +361,7 @@ _080AA69C:
bl AddObjectToFront
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -385,7 +385,7 @@ _080AA6D0:
bl AddObjectToFront
lsls r0, 24
lsrs r2, r0, 24
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -890,7 +890,7 @@ _080AABC0:
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
asm/trade.s
+86 -86
View File
@@ -1990,7 +1990,7 @@ sub_8078388: @ 8078388
movs r3, 0
ldr r5, =gUnknown_0203229C
mov r8, r5
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r12, r0
movs r1, 0x5
negs r1, r1
@@ -2399,7 +2399,7 @@ _08078726:
adds r0, r4, 0
movs r1, 0x2
ldr r2, =gSpeciesNames + SPECIES_SHEDINJA * POKEMON_NAME_LENGTH
bl pokemon_setattr
bl SetMonData
_08078766:
adds r4, 0x64
subs r5, 0x1
@@ -3064,7 +3064,7 @@ sub_8078CB8: @ 8078CB8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
@@ -3094,7 +3094,7 @@ _08078D10:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
adds r0, r5
movs r1, 0
bl StartObjectImageAnim
@@ -3315,7 +3315,7 @@ sub_8078EF8: @ 8078EF8
adds r0, 0x6F
movs r1, 0
strb r1, [r0]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r3]
adds r0, 0x34
ldrb r1, [r0]
@@ -3407,7 +3407,7 @@ _08078FCC:
.4byte _08079018
_08078FE4:
bl sub_8078D78
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, =gUnknown_0203229C
ldr r0, [r0]
adds r0, 0x34
@@ -3818,7 +3818,7 @@ _08079306:
ldr r0, =0x0000eeaa
movs r1, 0
bl sub_8078C10
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r3, =gUnknown_0203229C
ldr r0, [r3]
adds r0, 0x34
@@ -3974,7 +3974,7 @@ _0807942E:
adds r0, 0x6F
movs r1, 0
strb r1, [r0]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r2]
adds r0, 0x34
ldrb r1, [r0]
@@ -4305,7 +4305,7 @@ _08079716:
ldrb r0, [r0]
cmp r8, r0
bcs _0807976A
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
ldr r4, =gUnknown_0203229C
ldr r0, [sp, 0x60]
@@ -4352,7 +4352,7 @@ _08079772:
lsrs r5, r0, 24
cmp r5, 0x5
bls _08079772
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r8, r1
ldr r2, =gUnknown_0203229C
ldr r0, [r2]
@@ -4463,7 +4463,7 @@ _08079868:
b _08079A24
.pool
_08079884:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r1, [sp, 0x60]
lsls r0, r1, 1
adds r0, r1
@@ -4506,7 +4506,7 @@ _080798BC:
bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x1
bl CopyBgTilemapBufferToVram
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
ldr r1, =gUnknown_0203229C
ldr r4, [r1]
ldr r2, [sp, 0x60]
@@ -5221,7 +5221,7 @@ sub_8079EA8: @ 8079EA8
ldrb r0, [r0]
cmp r7, r0
bge _08079F5A
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
mov r9, r3
mov r1, r12
lsls r0, r1, 1
@@ -6048,7 +6048,7 @@ _0807A560:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
adds r2, 0x5D
adds r2, r3
@@ -7184,7 +7184,7 @@ _0807ADE0:
adds r1, 0x8E
adds r1, r6
strb r0, [r1]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r4]
adds r0, 0x8E
adds r0, r6
@@ -7974,7 +7974,7 @@ _0807B52A:
adds r0, r7, 0
movs r1, 0x20
mov r2, sp
bl pokemon_setattr
bl SetMonData
_0807B566:
mov r0, r8
cmp r0, 0xFF
@@ -8910,7 +8910,7 @@ _0807BC1C:
.4byte _0807CFB4
.4byte _0807CE38
_0807C04C:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r7]
adds r0, 0x8E
ldrb r1, [r0]
@@ -8968,7 +8968,7 @@ _0807C0C4:
ldrsh r0, [r6, r1]
cmp r0, 0
ble _0807C0F8
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r5, 0
adds r0, 0x8E
ldrb r1, [r0]
@@ -8985,7 +8985,7 @@ _0807C0C4:
bl _0807CFB4
.pool
_0807C0F8:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r5, 0
adds r0, 0x8E
ldrb r1, [r0]
@@ -9043,7 +9043,7 @@ _0807C178:
adds r0, r1, 0
adds r0, 0x8E
ldrb r0, [r0]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -9080,7 +9080,7 @@ _0807C178:
bl _0807CFB4
.pool
_0807C1DC:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, [r7]
adds r0, 0xD2
ldrb r1, [r0]
@@ -9238,7 +9238,7 @@ _0807C328:
bl _0807CF4C
.pool
_0807C348:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -9328,7 +9328,7 @@ _0807C3E0:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
@@ -9356,7 +9356,7 @@ _0807C44E:
bl _0807CFB4
.pool
_0807C460:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r4, [r7]
adds r3, r4, 0
adds r3, 0x90
@@ -9428,7 +9428,7 @@ _0807C4EC:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
bl RemoveObjectAndFreeTiles
ldr r0, [r7]
@@ -9491,7 +9491,7 @@ _0807C574:
adds r0, 0x1
strh r0, [r1]
_0807C592:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, =gUnknown_020322A0
ldr r2, [r0]
adds r0, r2, 0
@@ -9516,7 +9516,7 @@ _0807C592:
bl _0807CFB4
.pool
_0807C5D0:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r4, [r7]
adds r2, r4, 0
adds r2, 0x90
@@ -9592,7 +9592,7 @@ _0807C66C:
lsls r0, 24
cmp r0, 0
bne _0807C6E4
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r5]
adds r2, 0x8E
ldrb r1, [r2]
@@ -9642,7 +9642,7 @@ _0807C6E4:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectRotScalAnim
@@ -9654,7 +9654,7 @@ _0807C6FA:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
movs r1, 0
bl StartObjectRotScalAnim
@@ -9717,7 +9717,7 @@ _0807C6FA:
bl _0807CF4C
.pool
_0807C794:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r7]
adds r3, r2, 0
adds r3, 0x8E
@@ -9818,7 +9818,7 @@ _0807C7FC:
b _0807CFB4
.pool
_0807C864:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r7]
adds r3, r2, 0
adds r3, 0x90
@@ -9927,7 +9927,7 @@ _0807C8FA:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
@@ -9958,7 +9958,7 @@ _0807C98C:
b _0807CF48
.pool
_0807C994:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r4, [r7]
adds r3, r4, 0
adds r3, 0x90
@@ -10021,7 +10021,7 @@ _0807CA02:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
bl RemoveObjectAndFreeTiles
ldr r0, [r7]
@@ -10097,7 +10097,7 @@ _0807CA92:
ldr r1, [r7]
adds r1, 0x92
strb r0, [r1]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r7]
adds r0, 0x92
ldrb r1, [r0]
@@ -10127,7 +10127,7 @@ _0807CAC8:
b _0807CFB4
.pool
_0807CAF0:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -10264,7 +10264,7 @@ _0807CBF4:
adds r1, 0xD3
movs r6, 0
strb r0, [r1]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r5]
adds r2, 0xD3
ldrb r1, [r2]
@@ -10324,7 +10324,7 @@ _0807CBF4:
b _0807CFB4
.pool
_0807CC9C:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r7]
adds r0, 0xD3
ldrb r1, [r0]
@@ -10347,7 +10347,7 @@ _0807CC9C:
b _0807CF4C
.pool
_0807CCD0:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r3, [r7]
adds r0, r3, 0
adds r0, 0xD3
@@ -10378,7 +10378,7 @@ _0807CCEE:
b _0807CF4C
.pool
_0807CD1C:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r7]
adds r6, r2, 0
adds r6, 0x8F
@@ -10972,7 +10972,7 @@ _0807CFF8:
.4byte _0807E400
.4byte _0807E284
_0807D428:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, [r7]
adds r0, 0x8E
ldrb r1, [r0]
@@ -11030,7 +11030,7 @@ _0807D4A0:
ldrsh r0, [r6, r1]
cmp r0, 0
ble _0807D4D4
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r5, 0
adds r0, 0x8E
ldrb r1, [r0]
@@ -11047,7 +11047,7 @@ _0807D4A0:
bl _0807E400
.pool
_0807D4D4:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
adds r0, r5, 0
adds r0, 0x8E
ldrb r1, [r0]
@@ -11105,7 +11105,7 @@ _0807D554:
adds r0, r1, 0
adds r0, 0x8E
ldrb r0, [r0]
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -11142,7 +11142,7 @@ _0807D554:
bl _0807E400
.pool
_0807D5B8:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, [r7]
adds r0, 0xD2
ldrb r1, [r0]
@@ -11300,7 +11300,7 @@ _0807D704:
bl _0807E398
.pool
_0807D728:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -11372,7 +11372,7 @@ _0807D7C4:
ldr r1, [r4]
adds r1, 0x90
strb r0, [r1]
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, [r4]
adds r0, 0x90
ldrb r1, [r0]
@@ -11425,7 +11425,7 @@ _0807D84A:
bl _0807E400
.pool
_0807D85C:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r4, [r7]
adds r3, r4, 0
adds r3, 0x90
@@ -11497,7 +11497,7 @@ _0807D8E8:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
bl RemoveObjectAndFreeTiles
ldr r0, [r7]
@@ -11560,7 +11560,7 @@ _0807D970:
adds r0, 0x1
strh r0, [r1]
_0807D98E:
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldr r0, =gUnknown_020322A0
ldr r2, [r0]
adds r0, r2, 0
@@ -11585,7 +11585,7 @@ _0807D98E:
bl _0807E400
.pool
_0807D9CC:
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r4, [r7]
adds r2, r4, 0
adds r2, 0x90
@@ -11666,7 +11666,7 @@ _0807DA74:
lsls r0, 24
cmp r0, 0
bne _0807DAEC
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r5]
adds r2, 0x8E
ldrb r1, [r2]
@@ -11716,7 +11716,7 @@ _0807DAEC:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectRotScalAnim
@@ -11728,7 +11728,7 @@ _0807DB02:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
movs r1, 0
bl StartObjectRotScalAnim
@@ -11791,7 +11791,7 @@ _0807DB02:
bl _0807E398
.pool
_0807DB9C:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r7]
adds r3, r2, 0
adds r3, 0x8E
@@ -11892,7 +11892,7 @@ _0807DC5A:
b _0807E400
.pool
_0807DC6C:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r7]
adds r3, r2, 0
adds r3, 0x90
@@ -11994,7 +11994,7 @@ _0807DD02:
ldr r1, [r7]
adds r1, 0x90
strb r0, [r1]
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
ldr r0, [r7]
adds r0, 0x90
ldrb r1, [r0]
@@ -12050,7 +12050,7 @@ _0807DDBC:
b _0807E394
.pool
_0807DDC4:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r4, [r7]
adds r3, r4, 0
adds r3, 0x90
@@ -12149,7 +12149,7 @@ _0807DE84:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
bl RemoveObjectAndFreeTiles
ldr r0, [r7]
@@ -12232,7 +12232,7 @@ _0807DF16:
b _0807E400
.pool
_0807DF3C:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -12369,7 +12369,7 @@ _0807E040:
adds r1, 0xD3
movs r6, 0
strb r0, [r1]
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r5]
adds r2, 0xD3
ldrb r1, [r2]
@@ -12429,7 +12429,7 @@ _0807E040:
b _0807E400
.pool
_0807E0E8:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r0, [r7]
adds r0, 0xD3
ldrb r1, [r0]
@@ -12452,7 +12452,7 @@ _0807E0E8:
b _0807E398
.pool
_0807E11C:
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
ldr r3, [r7]
adds r0, r3, 0
adds r0, 0xD3
@@ -12483,7 +12483,7 @@ _0807E13A:
b _0807E398
.pool
_0807E168:
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
ldr r2, [r7]
adds r6, r2, 0
adds r6, 0x8F
@@ -13281,85 +13281,85 @@ sub_807E7E8: @ 807E7E8
adds r2, 0xE
adds r0, r6, 0
movs r1, 0x27
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0xF
adds r0, r6, 0
movs r1, 0x28
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x10
adds r0, r6, 0
movs r1, 0x29
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x11
adds r0, r6, 0
movs r1, 0x2A
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x12
adds r0, r6, 0
movs r1, 0x2B
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x13
adds r0, r6, 0
movs r1, 0x2C
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
movs r1, 0x2
adds r2, r5, 0
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x2B
adds r0, r6, 0
movs r1, 0x7
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x36
adds r0, r6, 0
movs r1, 0x31
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x14
adds r0, r6, 0
movs r1, 0x2E
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x1D
adds r0, r6, 0
movs r1, 0x17
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x1E
adds r0, r6, 0
movs r1, 0x18
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x1C
adds r0, r6, 0
movs r1, 0x16
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x1F
adds r0, r6, 0
movs r1, 0x21
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x20
adds r0, r6, 0
movs r1, 0x2F
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x37
adds r0, r6, 0
movs r1, 0x30
bl pokemon_setattr
bl SetMonData
adds r0, r6, 0
movs r1, 0x23
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
mov r4, sp
adds r4, 0x35
movs r0, 0
@@ -13385,12 +13385,12 @@ sub_807E7E8: @ 807E7E8
adds r0, r6, 0
movs r1, 0x40
adds r2, r4, 0
bl pokemon_setattr
bl SetMonData
adds r2, r5, 0
adds r2, 0x28
adds r0, r6, 0
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
b _0807E960
.pool
_0807E954:
@@ -13398,7 +13398,7 @@ _0807E954:
adds r2, 0x28
adds r0, r6, 0
movs r1, 0xC
bl pokemon_setattr
bl SetMonData
_0807E960:
ldr r0, =gEnemyParty
bl pokemon_calc_effective_stats
@@ -13517,7 +13517,7 @@ sub_807EA2C: @ 807EA2C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
adds r0, r4
bl RemoveObjectAndFreeTiles
ldr r0, [r5]
asm/trainer_card.s
+4 -4
View File
@@ -6972,7 +6972,7 @@ sub_80C62DC: @ 80C62DC
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
ldrb r2, [r1, 0x5]
@@ -7030,7 +7030,7 @@ _080C633C:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2]
ldrb r2, [r1, 0x5]
@@ -7724,7 +7724,7 @@ sub_80C6974: @ 80C6974
lsls r1, r3, 4
adds r1, r3
lsls r1, 2
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r9, r2
add r1, r9
str r1, [r0, 0x4]
@@ -7917,7 +7917,7 @@ _080C6B3E:
lsls r1, r3, 4
adds r1, r3
lsls r1, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r1, r0
str r1, [r2, 0x8]
ldrb r2, [r1, 0x5]
asm/trainer_see.s
+2 -2
View File
@@ -1057,7 +1057,7 @@ sub_80B43E0: @ 80B43E0
movs r1, 0x12
ldrsh r0, [r4, r1]
str r0, [r2, 0x4]
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -1088,7 +1088,7 @@ sub_80B4438: @ 80B4438
push {r4,r5,lr}
adds r5, r1, 0
adds r4, r2, 0
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
movs r1, 0x10
ldrsh r0, [r5, r1]
lsls r1, r0, 4
asm/trig.s
-98
View File
@@ -1,98 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Sin
@ s16 sine(s16 t, s16 amplitude)
Sin: @ 806F534
lsls r1, 16
asrs r1, 16
ldr r2, =gUnknown_08329F40
lsls r0, 16
asrs r0, 15
adds r0, r2
movs r2, 0
ldrsh r0, [r0, r2]
muls r0, r1
lsls r0, 8
asrs r0, 16
bx lr
.pool
thumb_func_end Sin
thumb_func_start Cos
@ s16 cosine(s16 t, s16 amplitude)
Cos: @ 806F550
lsls r1, 16
asrs r1, 16
ldr r2, =gUnknown_08329F40
lsls r0, 16
asrs r0, 15
adds r0, 0x80
adds r0, r2
movs r2, 0
ldrsh r0, [r0, r2]
muls r0, r1
lsls r0, 8
asrs r0, 16
bx lr
.pool
thumb_func_end Cos
thumb_func_start Sin2
@ s16 sine2(u16 angle)
Sin2: @ 806F570
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r5, 0
movs r1, 0xB4
bl __umodsi3
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0xB4
bl __udivsi3
movs r1, 0x1
ands r0, r1
ldr r1, =gUnknown_0832A1C0
lsls r4, 1
adds r4, r1
ldrh r1, [r4]
cmp r0, 0
bne _0806F5A8
lsls r0, r1, 16
b _0806F5AC
.pool
_0806F5A8:
lsls r0, r1, 16
negs r0, r0
_0806F5AC:
asrs r0, 16
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end Sin2
thumb_func_start Cos2
@ s16 cosine2(u16 angle)
Cos2: @ 806F5B4
push {lr}
lsls r0, 16
movs r1, 0xB4
lsls r1, 15
adds r0, r1
lsrs r0, 16
bl Sin2
lsls r0, 16
asrs r0, 16
pop {r1}
bx r1
thumb_func_end Cos2
.align 2, 0 @ Don't pad with nop.
asm/tv.s
+3 -3
View File
@@ -1260,7 +1260,7 @@ _080EC914:
_080EC92E:
cmp r5, 0x2
bls _080EC9B4
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
mov r8, r0
ldrb r0, [r0]
cmp r0, 0x6
@@ -4081,7 +4081,7 @@ _080EE1FE:
bl StringCopy
ldrh r0, [r6, 0x6]
strh r0, [r4, 0xA]
ldr r0, =gUnknown_0202433A
ldr r0, =gBattleOutcome
ldrb r0, [r0]
subs r0, 0x1
cmp r0, 0x9
@@ -7553,7 +7553,7 @@ c2_080CC144: @ 80EFE98
adds r0, r1
ldr r2, =gStringVar2
movs r1, 0x2
bl pokemon_setattr
bl SetMonData
bl c2_exit_to_overworld_1_continue_scripts_restart_music
pop {r0}
bx r0
asm/unknown_task.s
+1 -1
View File
@@ -424,7 +424,7 @@ sub_80BA33C: @ 80BA33C
lsrs r4, r2, 24
movs r1, 0
movs r2, 0
ldr r0, =gUnknown_08329F40
ldr r0, =gSineTable
mov r12, r0
_080BA350:
lsls r0, r1, 1
asm/util.s
+1 -1
View File
@@ -16,7 +16,7 @@ CreateInvisibleSpriteWithCallback: @ 806F640
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
asm/wallclock.s
+2 -2
View File
@@ -279,7 +279,7 @@ Cb2_StartWallClock: @ 81349F4
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r9, r1
lsls r1, r0, 4
adds r1, r0
@@ -424,7 +424,7 @@ _08134BA4:
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
asm/weather.s
+15 -15
View File
@@ -2092,7 +2092,7 @@ _080AC090:
movs r1, 0x7F
ands r0, r1
strh r0, [r2]
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
movs r3, 0
ldrsh r0, [r2, r3]
lsls r0, 1
@@ -2750,7 +2750,7 @@ _080AC5B2:
lsls r4, r3, 4
adds r4, r3
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
str r4, [r1]
ldr r0, =gUnknown_0854FB50
@@ -3690,7 +3690,7 @@ _080ACD92:
lsrs r5, r0, 24
cmp r5, 0x40
beq _080ACE40
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -3715,7 +3715,7 @@ _080ACD92:
_080ACDDE:
adds r0, r4, r5
lsls r0, 2
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
adds r0, r6
ldr r3, =0xfffffda8
ldrh r6, [r0, 0x30]
@@ -4151,7 +4151,7 @@ snowflake_add: @ 80AD164
lsrs r1, r0, 24
cmp r1, 0x40
beq _080AD1C8
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r1, 4
adds r4, r1
lsls r4, 2
@@ -4361,7 +4361,7 @@ sub_80AD30C: @ 80AD30C
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x34]
ldr r1, =gUnknown_08329F40
ldr r1, =gSineTable
movs r3, 0x34
ldrsh r0, [r4, r3]
lsls r0, 1
@@ -5473,7 +5473,7 @@ _080ADCD0:
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r5, 0
movs r1, 0x5
@@ -5804,7 +5804,7 @@ _080ADF80:
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
movs r0, 0
strh r0, [r4, 0x30]
@@ -6251,7 +6251,7 @@ _080AE314:
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
adds r0, r6, 0
movs r1, 0x5
@@ -6609,7 +6609,7 @@ sub_80AE624: @ 80AE624
ldr r2, [r0]
ldr r0, =0x00000704
adds r4, r2, r0
ldr r6, =gUnknown_08329F40
ldr r6, =gSineTable
ldr r1, =0x00000712
adds r5, r2, r1
ldrh r0, [r5]
@@ -6771,7 +6771,7 @@ _080AE758:
lsls r4, r1, 4
adds r4, r1
lsls r4, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r4, r0
str r4, [r5]
adds r0, r7, 0
@@ -6858,7 +6858,7 @@ _080AE818:
lsls r2, r1, 4
adds r2, r1
lsls r2, 2
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
adds r2, r0
str r2, [r4]
ldrb r1, [r2, 0x3]
@@ -7016,7 +7016,7 @@ sub_80AE97C: @ 80AE97C
_080AE99A:
movs r0, 0x2E
ldrsh r4, [r5, r0]
ldr r3, =gUnknown_08329F40
ldr r3, =gSineTable
movs r2, 0x30
ldrsh r1, [r5, r2]
lsls r0, r1, 1
@@ -7250,7 +7250,7 @@ sub_80AEB48: @ 80AEB48
lsrs r2, r0, 24
cmp r2, 0x40
beq _080AEBB0
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -7297,7 +7297,7 @@ sub_80AEBD0: @ 80AEBD0
cmp r0, 0
beq _080AEC1A
movs r4, 0
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
_080AEBE4:
lsls r0, r4, 4
adds r0, r4