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

Merge pull request #22 from DizzyEggg/clean_up

Browse Source 
bring pokeemerald to usable state
This commit is contained in:
yenatch
2017-09-03 18:11:57 -04:00
committed by GitHub
parent cbe13acff1 5afd2d5bfb
commit 7ea0d462c4
211 changed files with 256726 additions and 260721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_3.s
+657 -657
View File
File diff suppressed because it is too large Load Diff
asm/battle_4.s
+31160
View File
File diff suppressed because it is too large Load Diff
asm/battle_5.s
+582
View File
@@ -0,0 +1,582 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8056F28
sub_8056F28: @ 8056F28
push {r4-r6,lr}
ldr r5, =gBattleResources
ldr r6, =gBattleTypeFlags
ldr r0, [r6]
movs r1, 0x80
lsls r1, 19
ands r0, r1
cmp r0, 0
beq _08056F3E
bl sub_81D55D0
_08056F3E:
ldr r4, =gBattleStruct
movs r0, 0xA9
lsls r0, 2
bl AllocZeroed
str r0, [r4]
movs r0, 0x20
bl AllocZeroed
str r0, [r5]
movs r0, 0xA0
bl AllocZeroed
ldr r1, [r5]
str r0, [r1]
movs r0, 0x10
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x4]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x8]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0xC]
movs r0, 0xC
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x10]
movs r0, 0x1C
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x14]
movs r0, 0x54
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x18]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x1C]
ldr r4, =gUnknown_020244A0
movs r5, 0x80
lsls r5, 5
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_020244A4
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_0202305C
movs r0, 0x80
lsls r0, 6
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_02023060
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r0, [r6]
movs r1, 0x80
lsls r1, 20
ands r0, r1
cmp r0, 0
beq _08056FFA
ldr r0, =0x00004054
bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r2, =gSaveBlock1Ptr
lsls r1, r0, 2
adds r1, r0
lsls r1, 5
ldr r0, =0x00001a9c
adds r1, r0
ldr r0, [r2]
adds r0, r1
bl create_enemy_party
_08056FFA:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8056F28
thumb_func_start sub_8057028
sub_8057028: @ 8057028
push {r4-r6,lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x80
lsls r1, 19
ands r0, r1
cmp r0, 0
beq _0805703C
bl sub_81D5694
_0805703C:
ldr r6, =gBattleResources
ldr r0, [r6]
cmp r0, 0
beq _080570D0
ldr r4, =gBattleStruct
ldr r0, [r4]
bl Free
movs r5, 0
str r5, [r4]
ldr r0, [r6]
ldr r0, [r0]
bl Free
ldr r0, [r6]
str r5, [r0]
ldr r0, [r0, 0x4]
bl Free
ldr r0, [r6]
str r5, [r0, 0x4]
ldr r0, [r0, 0x8]
bl Free
ldr r0, [r6]
str r5, [r0, 0x8]
ldr r0, [r0, 0xC]
bl Free
ldr r0, [r6]
str r5, [r0, 0xC]
ldr r0, [r0, 0x10]
bl Free
ldr r0, [r6]
str r5, [r0, 0x10]
ldr r0, [r0, 0x14]
bl Free
ldr r0, [r6]
str r5, [r0, 0x14]
ldr r0, [r0, 0x18]
bl Free
ldr r0, [r6]
str r5, [r0, 0x18]
ldr r0, [r0, 0x1C]
bl Free
ldr r0, [r6]
str r5, [r0, 0x1C]
bl Free
str r5, [r6]
ldr r4, =gUnknown_020244A0
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_020244A4
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_0202305C
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_02023060
ldr r0, [r4]
bl Free
str r5, [r4]
_080570D0:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8057028
thumb_func_start sub_80570F4
sub_80570F4: @ 80570F4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _08057140
movs r0, 0x1
bl GetBankByPlayerAI
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
bl GetBankByPlayerAI
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gBattleMons
movs r0, 0x58
adds r1, r3, 0
muls r1, r0
adds r1, r2
adds r1, 0x2A
muls r0, r4
adds r0, r2
adds r0, 0x2A
ldrb r1, [r1]
ldrb r0, [r0]
cmp r1, r0
bls _0805714A
adds r4, r3, 0
b _0805714A
.pool
_08057140:
movs r0, 0x1
bl GetBankByPlayerAI
lsls r0, 24
lsrs r4, r0, 24
_0805714A:
ldr r2, =gBattleMons
movs r1, 0x58
adds r0, r4, 0
muls r0, r1
adds r0, r2
adds r3, r0, 0
adds r3, 0x2A
adds r0, r5, 0
muls r0, r1
adds r0, r2
adds r1, r0, 0
adds r1, 0x2A
ldrb r0, [r3]
ldrb r2, [r1]
cmp r0, r2
bls _080571B8
ldrb r1, [r1]
subs r0, r1
cmp r0, 0x1D
ble _08057198
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x8
bl happiness_algorithm
b _080571CE
.pool
_08057198:
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl happiness_algorithm
b _080571CE
.pool
_080571B8:
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl happiness_algorithm
_080571CE:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_80570F4
thumb_func_start sub_80571DC
sub_80571DC: @ 80571DC
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
lsls r1, 24
lsrs r7, r1, 24
adds r0, r4, 0
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08057248
movs r2, 0
ldr r6, =gBattlePartyID
lsls r3, r4, 1
ldr r5, =gUnknown_0203CF00
ldr r4, =gBattleStruct
_080571FE:
adds r0, r2, r5
ldr r1, [r4]
adds r1, r2, r1
adds r1, 0x60
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x2
ble _080571FE
adds r0, r3, r6
ldrb r0, [r0]
bl pokemon_order_func
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r7, 0
bl pokemon_order_func
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81B8FB0
movs r2, 0
ldr r4, =gBattleStruct
ldr r3, =gUnknown_0203CF00
_08057236:
ldr r0, [r4]
adds r0, r2, r0
adds r0, 0x60
adds r1, r2, r3
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x2
ble _08057236
_08057248:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80571DC
thumb_func_start sub_805725C
sub_805725C: @ 805725C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
mov r9, r0
movs r0, 0
mov r8, r0
ldr r1, =gBattleCommunication
mov r10, r1
b _08057284
.pool
_0805727C:
mov r2, r8
cmp r2, 0
beq _08057284
b _08057406
_08057284:
mov r1, r10
ldrb r0, [r1]
cmp r0, 0x1
bne _0805728E
b _08057390
_0805728E:
cmp r0, 0x1
ble _08057294
b _080573FC
_08057294:
cmp r0, 0
beq _0805729A
b _080573FC
_0805729A:
ldr r6, =gBattleMons
movs r0, 0x58
mov r5, r9
muls r5, r0
adds r0, r6, 0
adds r0, 0x4C
adds r4, r5, r0
ldr r0, [r4]
movs r7, 0x7
ands r0, r7
cmp r0, 0
beq _08057372
mov r0, r9
bl sub_8050650
lsls r0, 24
cmp r0, 0
beq _080572FC
ldr r0, [r4]
movs r1, 0x8
negs r1, r1
ands r0, r1
str r0, [r4]
adds r2, r6, 0
adds r2, 0x50
adds r2, r5, r2
ldr r0, [r2]
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl b_movescr_stack_push_cursor
movs r0, 0x1
mov r2, r10
strb r0, [r2, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB220
str r0, [r1]
movs r0, 0x2
mov r8, r0
b _08057372
.pool
_080572FC:
adds r0, r5, r6
adds r0, 0x20
ldrb r0, [r0]
movs r2, 0x1
cmp r0, 0x30
bne _0805730A
movs r2, 0x2
_0805730A:
ldr r1, [r4]
adds r0, r1, 0
ands r0, r7
cmp r0, r2
bcs _0805731E
movs r0, 0x8
negs r0, r0
ands r1, r0
str r1, [r4]
b _08057322
_0805731E:
subs r0, r1, r2
str r0, [r4]
_08057322:
ldr r2, =gBattleMons
movs r0, 0x58
mov r1, r9
muls r1, r0
adds r0, r2, 0
adds r0, 0x4C
adds r0, r1, r0
ldr r4, [r0]
movs r0, 0x7
ands r4, r0
cmp r4, 0
beq _08057354
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB213
str r0, [r1]
movs r1, 0x2
mov r8, r1
b _08057372
.pool
_08057354:
adds r2, 0x50
adds r2, r1, r2
ldr r0, [r2]
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl b_movescr_stack_push_cursor
ldr r0, =gBattleCommunication
strb r4, [r0, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB220
str r0, [r1]
movs r2, 0x2
mov r8, r2
_08057372:
ldr r1, =gBattleCommunication
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
mov r10, r1
b _080573FC
.pool
_08057390:
ldr r1, =gBattleMons
movs r0, 0x58
mov r2, r9
muls r2, r0
adds r0, r2, 0
adds r1, 0x4C
adds r4, r0, r1
ldr r0, [r4]
movs r1, 0x20
ands r0, r1
cmp r0, 0
beq _080573F4
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
bl __umodsi3
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _080573D4
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB26A
str r0, [r1]
b _080573EC
.pool
_080573D4:
ldr r0, [r4]
movs r1, 0x21
negs r1, r1
ands r0, r1
str r0, [r4]
bl b_movescr_stack_push_cursor
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB277
str r0, [r1]
mov r0, r10
strb r5, [r0, 0x5]
_080573EC:
movs r1, 0x2
mov r8, r1
ldr r2, =gBattleCommunication
mov r10, r2
_080573F4:
mov r1, r10
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
_080573FC:
mov r2, r10
ldrb r0, [r2]
cmp r0, 0x2
beq _08057406
b _0805727C
_08057406:
mov r0, r8
cmp r0, 0x2
bne _08057430
ldr r4, =gActiveBank
mov r1, r9
strb r1, [r4]
ldrb r1, [r4]
movs r0, 0x58
muls r0, r1
ldr r1, =gUnknown_020240D0
adds r0, r1
str r0, [sp]
movs r0, 0
movs r1, 0x28
movs r2, 0
movs r3, 0x4
bl dp01_build_cmdbuf_x02_a_b_varargs
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
_08057430:
mov r0, r8
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_805725C
.align 2, 0 @ Don't pad with nop.
asm/battle_7.s
+3815
View File
File diff suppressed because it is too large Load Diff
asm/battle_9.s
+2847
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim.s
+232 -232
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80FE840.s
+1585 -1585
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_8170478.s
+231 -231
View File
File diff suppressed because it is too large Load Diff
asm/battle_anin_80A9C70.s
+930
View File
@@ -0,0 +1,930 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80A9C70
sub_80A9C70: @ 80A9C70
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r4, r0, 0
adds r5, r1, 0
lsls r4, 24
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, =gBankSpriteIds
adds r0, r4, r0
ldrb r6, [r0]
ldr r0, =sub_80A9DB4
movs r1, 0xA
bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, =gUnknown_08524F84
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_0852588C
bl LoadCompressedObjectPaletteUsingHeap
ldr r1, =gTasks
mov r2, r8
lsls r0, r2, 2
add r0, r8
lsls r0, 3
adds r1, r0, r1
strh r4, [r1, 0x8]
cmp r5, 0
beq _080A9D30
movs r0, 0x1F
strh r0, [r1, 0xA]
movs r5, 0
lsls r0, r6, 4
ldr r7, =gSprites
adds r0, r6
lsls r0, 2
adds r6, r0, r7
_080A9CC4:
movs r0, 0x20
ldrsh r1, [r6, r0]
ldrh r2, [r6, 0x22]
adds r2, 0x20
lsls r2, 16
asrs r2, 16
ldr r0, =gUnknown_0853EF60
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
adds r3, r0, r7
lsls r0, r5, 1
adds r0, r5
lsls r1, r0, 4
adds r0, r1
strh r0, [r3, 0x2E]
movs r0, 0xFF
lsls r0, 8
strh r0, [r3, 0x30]
adds r2, r3, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
cmp r5, 0x4
bls _080A9D08
movs r0, 0x15
strh r0, [r3, 0x3A]
_080A9D08:
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x9
bls _080A9CC4
b _080A9D90
.pool
_080A9D30:
movs r0, 0xF8
lsls r0, 7
strh r0, [r1, 0xA]
movs r5, 0
lsls r0, r6, 4
ldr r7, =gSprites
adds r0, r6
lsls r0, 2
adds r6, r0, r7
_080A9D42:
movs r2, 0x20
ldrsh r1, [r6, r2]
ldrh r2, [r6, 0x22]
subs r2, 0x20
lsls r2, 16
asrs r2, 16
ldr r0, =gUnknown_0853EF60
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
adds r3, r0, r7
lsls r0, r5, 1
adds r0, r5
lsls r1, r0, 4
adds r0, r1
strh r0, [r3, 0x2E]
movs r0, 0x80
lsls r0, 1
strh r0, [r3, 0x30]
adds r2, r3, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
cmp r5, 0x4
bls _080A9D86
movs r0, 0x15
strh r0, [r3, 0x3A]
_080A9D86:
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x9
bls _080A9D42
_080A9D90:
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
adds r1, r0
movs r0, 0x1
strh r0, [r1, 0x3C]
mov r0, r8
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_80A9C70
thumb_func_start sub_80A9DB4
sub_80A9DB4: @ 80A9DB4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r4, r0, r1
ldrh r1, [r4, 0xC]
movs r2, 0xC
ldrsh r0, [r4, r2]
cmp r0, 0x2
bne _080A9E3A
movs r0, 0
strh r0, [r4, 0xC]
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 20
movs r2, 0x80
lsls r2, 17
adds r0, r2
lsrs r0, 16
ldrb r2, [r4, 0x10]
ldrh r3, [r4, 0xA]
movs r1, 0x10
bl BlendPalette
ldrh r2, [r4, 0x12]
movs r1, 0x12
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080A9E10
ldrh r0, [r4, 0x10]
adds r0, 0x1
strh r0, [r4, 0x10]
lsls r0, 16
asrs r0, 16
cmp r0, 0x8
ble _080A9E3E
movs r0, 0x1
eors r0, r2
strh r0, [r4, 0x12]
b _080A9E3E
.pool
_080A9E10:
ldrh r1, [r4, 0x10]
subs r0, r1, 0x1
strh r0, [r4, 0x10]
lsls r0, 16
cmp r0, 0
bge _080A9E3E
strh r1, [r4, 0x10]
movs r0, 0x1
eors r0, r2
strh r0, [r4, 0x12]
ldrh r0, [r4, 0xE]
adds r0, 0x1
strh r0, [r4, 0xE]
lsls r0, 16
asrs r0, 16
cmp r0, 0x2
bne _080A9E3E
adds r0, r5, 0
bl DestroyTask
b _080A9E3E
_080A9E3A:
adds r0, r1, 0x1
strh r0, [r4, 0xC]
_080A9E3E:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80A9DB4
thumb_func_start sub_80A9E44
sub_80A9E44: @ 80A9E44
push {lr}
adds r2, r0, 0
ldrh r1, [r2, 0x3A]
movs r3, 0x3A
ldrsh r0, [r2, r3]
cmp r0, 0
bne _080A9E70
adds r3, r2, 0
adds r3, 0x3E
ldrb r0, [r3]
movs r1, 0x5
negs r1, r1
ands r1, r0
strb r1, [r3]
ldr r1, =sub_80A9E78
str r1, [r2, 0x1C]
adds r0, r2, 0
bl _call_via_r1
b _080A9E74
.pool
_080A9E70:
subs r0, r1, 0x1
strh r0, [r2, 0x3A]
_080A9E74:
pop {r0}
bx r0
thumb_func_end sub_80A9E44
thumb_func_start sub_80A9E78
sub_80A9E78: @ 80A9E78
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x20
bl Cos
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x8
bl Sin
strh r0, [r4, 0x26]
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0x7F
bgt _080A9EA4
adds r1, r4, 0
adds r1, 0x43
movs r0, 0x1D
b _080A9EAA
_080A9EA4:
adds r1, r4, 0
adds r1, 0x43
movs r0, 0x1F
_080A9EAA:
strb r0, [r1]
ldrh r0, [r4, 0x2E]
adds r0, 0x8
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x30]
ldrh r1, [r4, 0x38]
adds r0, r1
strh r0, [r4, 0x38]
lsls r0, 16
asrs r0, 24
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
adds r0, 0x1
strh r0, [r4, 0x32]
lsls r0, 16
asrs r0, 16
cmp r0, 0x34
bne _080A9EEC
movs r1, 0x3C
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080A9EE6
adds r0, r4, 0
bl DestroySpriteAndFreeResources
b _080A9EEC
_080A9EE6:
adds r0, r4, 0
bl DestroySprite
_080A9EEC:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80A9E78
thumb_func_start sub_80A9EF4
sub_80A9EF4: @ 80A9EF4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r4, =gAnimationBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_80A5C6C
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffe00000
adds r0, r1
lsrs r5, r0, 16
ldrb r0, [r4]
movs r1, 0x3
bl sub_80A5C6C
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffdc0000
adds r0, r1
lsrs r4, r0, 16
bl sub_80A4DF0
lsls r0, 24
cmp r0, 0
beq _080A9F32
lsls r0, r5, 16
ldr r1, =0xfffa0000
adds r0, r1
lsrs r5, r0, 16
_080A9F32:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
bl SetGpuReg
ldr r0, =gUnknown_0853EF48
lsls r1, r5, 16
asrs r1, 16
lsls r2, r4, 16
asrs r2, 16
movs r3, 0x4
bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0000271a
bl GetSpriteTileStartByTag
lsls r0, 16
ldr r1, =0xffff0000
cmp r0, r1
bne _080A9F7C
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
adds r0, r1
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
_080A9F7C:
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
ldr r1, =gUnknown_0853EF40
bl SetSubspriteTables
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
adds r0, r1
strh r4, [r0, 0x26]
ldr r1, =sub_80A9FD0
str r1, [r0]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_80A9EF4
thumb_func_start sub_80A9FD0
sub_80A9FD0: @ 80A9FD0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldrh r0, [r1, 0xA]
adds r0, 0x1
adds r2, r0, 0
strh r0, [r1, 0xA]
lsls r0, 16
asrs r0, 16
cmp r0, 0xA
bne _080AA004
ldr r0, =sub_80AA020
str r0, [r1]
movs r0, 0
strh r0, [r1, 0xA]
b _080AA01A
.pool
_080AA004:
lsls r0, r2, 24
lsrs r0, 24
movs r1, 0x10
subs r1, r0
lsls r1, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
_080AA01A:
pop {r0}
bx r0
thumb_func_end sub_80A9FD0
thumb_func_start sub_80AA020
sub_80AA020: @ 80AA020
push {r4-r6,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =0x0000271a
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r5, r0, r1
ldrh r0, [r5, 0xA]
adds r1, r0, 0x1
strh r1, [r5, 0xA]
lsls r0, 16
asrs r0, 16
cmp r0, 0xD
ble _080AA0B0
ldrh r0, [r5, 0xC]
adds r0, 0x1
movs r6, 0
strh r0, [r5, 0xC]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bne _080AA0B0
ldr r3, =gPlttBufferFaded
lsls r2, 4
mov r12, r2
ldr r1, =0x0000010d
add r1, r12
lsls r1, 1
adds r1, r3
ldrh r4, [r1]
movs r2, 0x87
lsls r2, 1
add r2, r12
lsls r2, 1
adds r2, r3
ldrh r0, [r2]
strh r0, [r1]
ldr r0, =0x0000010f
add r0, r12
lsls r0, 1
adds r0, r3
ldrh r1, [r0]
strh r1, [r2]
strh r4, [r0]
strh r6, [r5, 0xC]
ldrh r0, [r5, 0xE]
adds r0, 0x1
strh r0, [r5, 0xE]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bne _080AA0B0
strh r6, [r5, 0xE]
strh r6, [r5, 0xA]
ldrh r0, [r5, 0x10]
adds r0, 0x1
strh r0, [r5, 0x10]
lsls r0, 16
asrs r0, 16
cmp r0, 0x2
bne _080AA0B0
movs r0, 0x9
strh r0, [r5, 0xA]
ldr r0, =sub_80AA0D0
str r0, [r5]
_080AA0B0:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_80AA020
thumb_func_start sub_80AA0D0
sub_80AA0D0: @ 80AA0D0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r2, r1, r2
ldrh r0, [r2, 0xA]
subs r0, 0x1
adds r3, r0, 0
strh r0, [r2, 0xA]
lsls r0, 16
asrs r0, 16
movs r1, 0x1
negs r1, r1
cmp r0, r1
bne _080AA108
ldr r0, =sub_80AA124
str r0, [r2]
movs r0, 0
strh r0, [r2, 0xA]
b _080AA11E
.pool
_080AA108:
lsls r0, r3, 24
lsrs r0, 24
movs r1, 0x10
subs r1, r0
lsls r1, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
_080AA11E:
pop {r0}
bx r0
thumb_func_end sub_80AA0D0
thumb_func_start sub_80AA124
sub_80AA124: @ 80AA124
push {r4,lr}
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r1, r0, r1
ldrh r0, [r1, 0xA]
adds r0, 0x1
strh r0, [r1, 0xA]
lsls r0, 16
asrs r0, 16
cmp r0, 0x25
bne _080AA16C
ldrh r0, [r1, 0x26]
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gSprites
adds r4, r0
adds r0, r4, 0
bl FreeSpriteOamMatrix
adds r0, r4, 0
bl DestroySprite
b _080AA186
.pool
_080AA16C:
cmp r0, 0x27
bne _080AA186
movs r0, 0x50
movs r1, 0
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
adds r0, r4, 0
bl move_anim_task_del
_080AA186:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80AA124
thumb_func_start sub_80AA18C
sub_80AA18C: @ 80AA18C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
movs r3, 0
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrh r0, [r0]
subs r0, 0xF
cmp r0, 0x2B
bls _080AA1A4
b _080AA328
_080AA1A4:
lsls r0, 2
ldr r1, =_080AA1B8
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_080AA1B8:
.4byte _080AA268
.4byte _080AA26E
.4byte _080AA274
.4byte _080AA27A
.4byte _080AA280
.4byte _080AA286
.4byte _080AA28C
.4byte _080AA292
.4byte _080AA298
.4byte _080AA29E
.4byte _080AA2A4
.4byte _080AA2AA
.4byte _080AA2B0
.4byte _080AA2B6
.4byte _080AA328
.4byte _080AA328
.4byte _080AA328
.4byte _080AA328
.4byte _080AA328
.4byte _080AA328
.4byte _080AA328
.4byte _080AA328
.4byte _080AA328
.4byte _080AA328
.4byte _080AA2BC
.4byte _080AA2C0
.4byte _080AA2C4
.4byte _080AA2C8
.4byte _080AA2CC
.4byte _080AA2D0
.4byte _080AA2D4
.4byte _080AA2D8
.4byte _080AA2E0
.4byte _080AA2E8
.4byte _080AA2F0
.4byte _080AA2F8
.4byte _080AA300
.4byte _080AA308
.4byte _080AA328
.4byte _080AA328
.4byte _080AA310
.4byte _080AA314
.4byte _080AA318
.4byte _080AA320
_080AA268:
movs r5, 0
movs r2, 0
b _080AA330
_080AA26E:
movs r5, 0
movs r2, 0x1
b _080AA330
_080AA274:
movs r5, 0
movs r2, 0x3
b _080AA330
_080AA27A:
movs r5, 0
movs r2, 0x5
b _080AA330
_080AA280:
movs r5, 0
movs r2, 0x6
b _080AA330
_080AA286:
movs r5, 0
movs r2, 0x2
b _080AA330
_080AA28C:
movs r5, 0
movs r2, 0x4
b _080AA330
_080AA292:
movs r5, 0x1
movs r2, 0
b _080AA330
_080AA298:
movs r5, 0x1
movs r2, 0x1
b _080AA330
_080AA29E:
movs r5, 0x1
movs r2, 0x3
b _080AA330
_080AA2A4:
movs r5, 0x1
movs r2, 0x5
b _080AA330
_080AA2AA:
movs r5, 0x1
movs r2, 0x6
b _080AA330
_080AA2B0:
movs r5, 0x1
movs r2, 0x2
b _080AA330
_080AA2B6:
movs r5, 0x1
movs r2, 0x4
b _080AA330
_080AA2BC:
movs r5, 0
b _080AA2DA
_080AA2C0:
movs r5, 0
b _080AA2E2
_080AA2C4:
movs r5, 0
b _080AA2EA
_080AA2C8:
movs r5, 0
b _080AA2F2
_080AA2CC:
movs r5, 0
b _080AA2FA
_080AA2D0:
movs r5, 0
b _080AA302
_080AA2D4:
movs r5, 0
b _080AA30A
_080AA2D8:
movs r5, 0x1
_080AA2DA:
movs r2, 0
movs r3, 0x1
b _080AA330
_080AA2E0:
movs r5, 0x1
_080AA2E2:
movs r2, 0x1
movs r3, 0x1
b _080AA330
_080AA2E8:
movs r5, 0x1
_080AA2EA:
movs r2, 0x3
movs r3, 0x1
b _080AA330
_080AA2F0:
movs r5, 0x1
_080AA2F2:
movs r2, 0x5
movs r3, 0x1
b _080AA330
_080AA2F8:
movs r5, 0x1
_080AA2FA:
movs r2, 0x6
movs r3, 0x1
b _080AA330
_080AA300:
movs r5, 0x1
_080AA302:
movs r2, 0x2
movs r3, 0x1
b _080AA330
_080AA308:
movs r5, 0x1
_080AA30A:
movs r2, 0x4
movs r3, 0x1
b _080AA330
_080AA310:
movs r5, 0
b _080AA31A
_080AA314:
movs r5, 0
b _080AA322
_080AA318:
movs r5, 0x1
_080AA31A:
movs r2, 0xFF
movs r3, 0
b _080AA330
_080AA320:
movs r5, 0x1
_080AA322:
movs r2, 0xFF
movs r3, 0x1
b _080AA330
_080AA328:
adds r0, r4, 0
bl move_anim_task_del
b _080AA352
_080AA330:
ldr r0, =gBattleAnimArgs
movs r1, 0
strh r5, [r0]
strh r2, [r0, 0x2]
strh r1, [r0, 0x4]
strh r1, [r0, 0x6]
strh r3, [r0, 0x8]
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_8116EB4
str r1, [r0]
adds r0, r4, 0
bl _call_via_r1
_080AA352:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_80AA18C
thumb_func_start move_anim_start_t2
move_anim_start_t2: @ 80AA364
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r1, 24
lsrs r1, 24
ldr r0, =gAnimationBankAttacker
strb r4, [r0]
ldr r0, =gAnimationBankTarget
strb r4, [r0]
ldr r0, =gUnknown_082C92FC
movs r2, 0
bl move_something
ldr r0, =task0A_80788BC
movs r1, 0xA
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
strh r4, [r1, 0x8]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end move_anim_start_t2
thumb_func_start task0A_80788BC
task0A_80788BC: @ 80AA3B4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
ldr r0, =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _080AA3F6
ldr r0, =gUnknown_020244D0
ldr r2, [r0]
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
movs r1, 0x8
ldrsh r0, [r0, r1]
ldr r2, [r2, 0x4]
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r2, [r1]
movs r0, 0x11
negs r0, r0
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
bl DestroyTask
_080AA3F6:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end task0A_80788BC
.align 2, 0 @ Don't pad with nop.
asm/battle_controller_linkopponent.s
+6266
View File
File diff suppressed because it is too large Load Diff
asm/battle_814AEAC.s → asm/battle_controller_linkpartner.s
+434 -434
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_opponent.s
+6676
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_player.s
+10419
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_player_partner.s
+6347
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_recorded_opponent.s
+5969
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_recorded_player.s
+6144
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_wally.s
+4787
View File
File diff suppressed because it is too large Load Diff
asm/battle_message.s
+107 -107
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
@@ -1664,32 +1664,32 @@ _0814F05C:
_0814F064:
ldrh r0, [r2]
mov r1, sp
bl itemid_get_name
bl CopyItemName
b _0814F5BE
_0814F06E:
ldr r0, =gUnknown_02024208
ldrh r0, [r0]
mov r1, sp
bl itemid_get_name
bl CopyItemName
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
@@ -2631,12 +2631,12 @@ _0814F8BE:
_0814F8CC:
adds r0, r2, 0
adds r1, r6, 0
bl itemid_get_name
bl CopyItemName
b _0814F8DE
_0814F8D6:
adds r0, r2, 0
adds r1, r6, 0
bl itemid_get_name
bl CopyItemName
_0814F8DE:
adds r5, 0x3
_0814F8E0:
@@ -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
+10 -10
View File
@@ -259,12 +259,12 @@ _0813C152:
movs r4, 0x19
_0813C154:
adds r0, r4, 0
bl sub_80847F8
bl GetGameStat
ldr r1, =0x0000270e
cmp r0, r1
bhi _0813C166
adds r0, r4, 0
bl sav12_xor_increment
bl IncrementGameStat
_0813C166:
pop {r4}
pop {r0}
@@ -336,8 +336,8 @@ _0813C1D4:
.pool
thumb_func_end sub_813C170
thumb_func_start sub_813C1F8
sub_813C1F8: @ 813C1F8
thumb_func_start InitLinkBattleRecords
InitLinkBattleRecords: @ 813C1F8
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
@@ -347,7 +347,7 @@ sub_813C1F8: @ 813C1F8
pop {r0}
bx r0
.pool
thumb_func_end sub_813C1F8
thumb_func_end InitLinkBattleRecords
thumb_func_start sub_813C214
sub_813C214: @ 813C214
@@ -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
@@ -465,7 +465,7 @@ sub_813C2F4: @ 813C2F4
sub sp, 0xC
ldr r4, =gStringVar1
movs r0, 0x17
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -473,7 +473,7 @@ sub_813C2F4: @ 813C2F4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar2
movs r0, 0x18
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -481,7 +481,7 @@ sub_813C2F4: @ 813C2F4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar3
movs r0, 0x19
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
asm/battle_setup.s
+44 -44
View File
@@ -75,7 +75,7 @@ task_add_01_battle_start: @ 80B065C
adds r1, r2
strh r4, [r1, 0xA]
adds r0, r5, 0
bl current_map_music_set__default_for_battle
bl PlayNewMapMusic__default_for_battle
pop {r4,r5}
pop {r0}
bx r0
@@ -136,9 +136,9 @@ _080B06F2:
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r4}
@@ -166,9 +166,9 @@ sub_80B072C: @ 80B072C
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -217,9 +217,9 @@ sub_80B07B4: @ 80B07B4
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -236,9 +236,9 @@ task_add_01_battle_start_with_music_and_stats: @ 80B0804
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x9
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80B1234
pop {r0}
bx r0
@@ -267,9 +267,9 @@ _080B0846:
bl task_add_01_battle_start
_080B0856:
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x9
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80B1234
pop {r0}
bx r0
@@ -315,9 +315,9 @@ sub_80B08A8: @ 80B08A8
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -342,9 +342,9 @@ sub_80B08EC: @ 80B08EC
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -444,9 +444,9 @@ _080B09F4:
bl task_add_01_battle_start
_080B09FE:
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r4}
@@ -482,9 +482,9 @@ _080B0A50:
bl task_add_01_battle_start
_080B0A5A:
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -540,9 +540,9 @@ _080B0AD6:
ldr r1, =0x000001df
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -564,8 +564,8 @@ sub_80B0AF8: @ 80B0AF8
bl CpuSet
movs r0, 0
movs r1, 0x80
bl ResetSpriteRange
ldr r0, =gUnknown_0202433A
bl ResetOamRange
ldr r0, =gBattleOutcome
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -609,8 +609,8 @@ sub_80B0B6C: @ 80B0B6C
bl CpuSet
movs r0, 0
movs r1, 0x80
bl ResetSpriteRange
ldr r0, =gUnknown_0202433A
bl ResetOamRange
ldr r0, =gBattleOutcome
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -1344,7 +1344,7 @@ sub_80B1158: @ 80B1158
sub sp, 0x8
ldr r0, =0x00004023
bl GetVarPointer
ldr r2, =gUnknown_020375F0
ldr r2, =gScriptResult
ldrh r1, [r2]
strh r1, [r0]
ldrh r0, [r2]
@@ -1392,9 +1392,9 @@ sub_80B11A8: @ 80B11A8
bl prev_quest_postbuffer_cursor_backup_reset
bl overworld_poison_timer_set
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
_080B11F0:
@@ -1418,7 +1418,7 @@ sub_80B1204: @ 80B1204
sub_80B1218: @ 80B1218
push {lr}
movs r0, 0x8
bl sub_80847F8
bl GetGameStat
movs r1, 0x3C
bl __umodsi3
cmp r0, 0
@@ -1433,7 +1433,7 @@ _080B122E:
sub_80B1234: @ 80B1234
push {lr}
movs r0, 0x9
bl sub_80847F8
bl GetGameStat
movs r1, 0x14
bl __umodsi3
cmp r0, 0
@@ -1669,7 +1669,7 @@ battle_80801F0: @ 80B13F8
ldrh r1, [r0]
cmp r1, 0
beq _080B141A
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
strh r1, [r0]
lsls r0, r1, 24
lsrs r0, 24
@@ -1793,7 +1793,7 @@ _080B153C:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl sub_81A9AA8
ldr r1, =gUnknown_02038BCA
@@ -1803,7 +1803,7 @@ _080B156C:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl sub_81A9AA8
_080B157C:
@@ -1833,7 +1833,7 @@ _080B15A8:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl battle_init
ldr r1, =gUnknown_02038BCA
@@ -1843,7 +1843,7 @@ _080B15D8:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl battle_init
b _080B157C
@@ -1882,7 +1882,7 @@ SingleTrainerWantsBattle: @ 80B162C
lsrs r0, 24
ldr r2, =gUnknown_03005DF0
strb r0, [r2]
ldr r4, =gUnknown_020375F2
ldr r4, =gScriptLastTalked
ldr r3, =gUnknown_02037350
lsls r2, r0, 3
adds r2, r0
@@ -1910,7 +1910,7 @@ TwoTrainersWantBattle: @ 80B1670
lsrs r0, 24
ldr r2, =gUnknown_03005DF0
strb r0, [r2]
ldr r4, =gUnknown_020375F2
ldr r4, =gScriptLastTalked
ldr r3, =gUnknown_02037350
lsls r2, r0, 3
adds r2, r0
@@ -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
@@ -2332,7 +2332,7 @@ sub_80B1A14: @ 80B1A14
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1A44
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl sub_81A9AA8
lsls r0, 16
@@ -2370,7 +2370,7 @@ _080B1A7C:
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1AAC
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl battle_init
adds r1, r0, 0
@@ -2577,7 +2577,7 @@ _080B1C54:
_080B1C5C:
ldr r0, =0x000001a7
_080B1C5E:
bl current_map_music_set
bl PlayNewMapMusic
_080B1C62:
pop {r0}
bx r0
@@ -3484,7 +3484,7 @@ CheckIfMultipleTrainersWantBattle: @ 80B22D8
ldr r1, =gUnknown_02038BF8
movs r0, 0x1
strb r0, [r1]
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x1
b _080B230A
.pool
@@ -3492,7 +3492,7 @@ _080B2300:
ldr r1, =gUnknown_02038BF8
movs r0, 0
strb r0, [r1]
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0
_080B230A:
strh r0, [r1]
asm/battle_transition.s
+20 -20
View File
@@ -2175,10 +2175,10 @@ sub_81470D0: @ 81470D0
movs r3, 0x4
ldrsh r2, [r5, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
@@ -2202,10 +2202,10 @@ sub_81470D0: @ 81470D0
ldr r0, =0x0000ffff
strh r0, [r4, 0x32]
adds r0, r4, 0
bl obj_alloc_rotscale_entry
bl InitSpriteAffineAnim
ldrb r1, [r5, 0x8]
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -3806,7 +3806,7 @@ _08147DE4:
ldrsh r0, [r4, r1]
bl sub_814849C
movs r0, 0x68
bl audio_play
bl PlaySE
ldr r1, [r5]
ldrb r0, [r1]
adds r0, 0x1
@@ -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]
@@ -4331,7 +4331,7 @@ sub_8148218: @ 8148218
ldrb r0, [r6, 0x1]
orrs r0, r1
strb r0, [r6, 0x1]
bl rotscale_alloc_entry
bl AllocOamMatrix
lsls r0, 24
lsrs r0, 24
movs r3, 0x1F
@@ -4346,7 +4346,7 @@ sub_8148218: @ 8148218
ands r1, r2
orrs r1, r0
strb r1, [r5, 0x3]
bl rotscale_alloc_entry
bl AllocOamMatrix
lsls r0, 24
lsrs r0, 24
mov r1, r9
@@ -4378,12 +4378,12 @@ sub_8148218: @ 8148218
movs r1, 0x1
movs r2, 0x3
movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
adds r0, r6, 0
movs r1, 0x1
movs r2, 0x3
movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
ldrb r0, [r5, 0x3]
lsls r0, 26
lsrs r0, 27
@@ -4398,7 +4398,7 @@ sub_8148218: @ 8148218
movs r4, 0
ldrsh r2, [r3, r4]
movs r3, 0
bl sub_8008478
bl SetOamMatrixRotationScaling
ldrb r0, [r6, 0x3]
lsls r0, 26
lsrs r0, 27
@@ -4406,7 +4406,7 @@ sub_8148218: @ 8148218
movs r2, 0x80
lsls r2, 2
movs r3, 0
bl sub_8008478
bl SetOamMatrixRotationScaling
add sp, 0x4
pop {r3,r4}
mov r8, r3
@@ -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
@@ -6736,13 +6736,13 @@ sub_8149628: @ 8149628
movs r4, 0
_0814963C:
ldr r0, =sub_8149864
bl obj_add_empty_with_callback
bl CreateInvisibleSprite
lsls r0, 24
lsrs r0, 24
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]
@@ -7098,7 +7098,7 @@ _0814993E:
adds r0, 0x1
strh r0, [r1, 0x20]
adds r0, r3, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0814994C:
pop {r4-r6}
pop {r0}
@@ -7843,8 +7843,8 @@ sub_8149F08: @ 8149F08
thumb_func_start sub_8149F2C
sub_8149F2C: @ 8149F2C
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
asm/berry.s
+12 -12
View File
@@ -256,9 +256,9 @@ _080E178E:
bx r1
thumb_func_end WaterBerryTree
thumb_func_start RemoveAllBerryTrees
@ void RemoveAllBerryTrees()
RemoveAllBerryTrees: @ 80E1794
thumb_func_start ClearBerryTrees
@ void ClearBerryTrees()
ClearBerryTrees: @ 80E1794
push {r4-r6,lr}
movs r2, 0
ldr r6, =gSaveBlock1Ptr
@@ -280,7 +280,7 @@ _080E17A2:
pop {r0}
bx r0
.pool
thumb_func_end RemoveAllBerryTrees
thumb_func_end ClearBerryTrees
thumb_func_start BerryTreeGrow
@ bool8 BerryTreeGrow(struct BerryTreeInfo *berryTree)
@@ -836,7 +836,7 @@ FieldObjectInteractionGetBerryTreeData: @ 80E1B94
lsrs r6, r0, 24
adds r0, r5, 0
bl ResetBerryTreeSparkleFlag
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
@@ -846,26 +846,26 @@ FieldObjectInteractionGetBerryTreeData: @ 80E1B94
lsls r0, 24
cmp r0, 0
beq _080E1BE0
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
movs r0, 0xFF
strh r0, [r1]
b _080E1BEE
.pool
_080E1BE0:
ldr r4, =gUnknown_020375E0
ldr r4, =gSpecialVar_0x8004
adds r0, r5, 0
bl GetStageByBerryTreeId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
_080E1BEE:
ldr r4, =gUnknown_020375E2
ldr r4, =gSpecialVar_0x8005
adds r0, r5, 0
bl GetNumStagesWateredByBerryTreeId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r4, =gUnknown_020375E4
ldr r4, =gSpecialVar_0x8006
adds r0, r5, 0
bl GetBerryCountByBerryTreeId
lsls r0, 24
@@ -980,7 +980,7 @@ FieldObjectInteractionPickBerryTree: @ 80E1CDC
bl GetBerryTypeByBerryTreeId
lsls r0, 24
lsrs r0, 24
ldr r6, =gUnknown_020375E0
ldr r6, =gSpecialVar_0x8004
bl BerryTypeToItemId
adds r4, r0, 0
lsls r4, 16
@@ -991,7 +991,7 @@ FieldObjectInteractionPickBerryTree: @ 80E1CDC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl bag_add_item
bl AddBagItem
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
@@ -1011,7 +1011,7 @@ FieldObjectInteractionRemoveBerryTree: @ 80E1D28
lsls r0, 24
lsrs r0, 24
bl RemoveBerryTree
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
asm/berry_blender.s
+105 -105
View File
@@ -70,8 +70,8 @@ sub_807F764: @ 807F764
str r0, [sp, 0xC]
movs r0, 0x2
bl SetBgAffine
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
add sp, 0x10
pop {r4}
@@ -224,11 +224,11 @@ _0807F940:
.pool
_0807F950:
ldr r0, =gUnknown_08339AC0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08339BD8
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08339B38
bl LoadObjectPic
bl LoadSpriteSheet
_0807F962:
ldr r0, =gUnknown_020322A4
ldr r1, [r0]
@@ -240,13 +240,13 @@ _0807F966:
.pool
_0807F980:
ldr r0, =gUnknown_08339C24
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08339C58
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08339AD0
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r0, =gUnknown_08339AC8
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r4, =gUnknown_020322A4
ldr r0, [r4]
ldr r2, =0x000011bc
@@ -370,7 +370,7 @@ _0807FA94:
ldr r0, [r4]
adds r0, 0x63
strb r1, [r0]
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrb r0, [r0]
bl sub_807FE54
ldr r0, =sub_807FAC8
@@ -412,8 +412,8 @@ _0807FB08:
movs r0, 0
movs r1, 0
bl SetGpuReg
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0
bl SetVBlankCallback
movs r0, 0
@@ -489,7 +489,7 @@ _0807FBBE:
ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
ldr r1, [r6]
adds r1, 0x50
adds r1, r4
@@ -501,13 +501,13 @@ _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
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x2
adds r4, 0x1
cmp r4, 0x3
@@ -605,8 +605,8 @@ _0807FCB0:
ldr r0, [r0]
strb r4, [r0]
_0807FCE2:
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
add sp, 0x4
@@ -651,11 +651,11 @@ sub_807FD08: @ 807FD08
cmp r0, 0x3
ble _0807FD50
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _0807FD56
_0807FD50:
movs r0, 0x74
bl audio_play
bl PlaySE
_0807FD56:
ldrh r0, [r4, 0x30]
strh r0, [r4, 0x20]
@@ -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
@@ -947,7 +947,7 @@ _0807FFC0:
adds r0, r2
str r1, [r0]
movs r2, 0
ldr r5, =gUnknown_020375E0
ldr r5, =gSpecialVar_0x8004
movs r3, 0
_0807FFD6:
ldr r0, [r4]
@@ -1093,7 +1093,7 @@ _08080126:
ldrb r2, [r4, 0x1]
ldr r0, =gUnknown_08339AD8
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
ldr r1, [r6]
adds r1, 0x54
adds r1, r5
@@ -1105,13 +1105,13 @@ _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
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r4, 0x2
adds r5, 0x1
cmp r5, 0x3
@@ -1413,7 +1413,7 @@ _080803E0:
adds r0, r2
bl sub_8082CB4
movs r0, 0x2B
bl audio_play
bl PlaySE
movs r0, 0x2
bl ShowBg
b _08080546
@@ -1477,7 +1477,7 @@ _08080408:
movs r0, 0
str r0, [r1]
movs r0, 0x34
bl audio_play
bl PlaySE
bl sub_808074C
bl sub_80807BC
_0808048C:
@@ -1515,7 +1515,7 @@ _080804D0:
negs r2, r2
movs r1, 0x78
movs r3, 0x3
bl AddObjectToFront
bl CreateSprite
b _080804F8
.pool
_080804E4:
@@ -1550,13 +1550,13 @@ _08080508:
str r2, [r0]
ldr r0, =sub_8081898
bl SetMainCallback2
bl current_map_music_get
bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
ldr r4, =0x00000193
cmp r0, r4
beq _08080540
bl current_map_music_get
bl GetCurrentMapMusic
ldr r1, [r5]
movs r2, 0xAA
lsls r2, 1
@@ -1564,7 +1564,7 @@ _08080508:
strh r0, [r1]
_08080540:
adds r0, r4, 0
bl song_play_for_text
bl PlayBGM
_08080546:
ldr r0, =gUnknown_020322A4
ldr r1, [r0]
@@ -1579,8 +1579,8 @@ _08080546:
ldrsh r1, [r1, r2]
bl nullsub_31
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
add sp, 0x4
@@ -1596,8 +1596,8 @@ sub_8080588: @ 8080588
movs r0, 0
movs r1, 0
bl SetGpuReg
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
bl ResetTasks
ldr r0, =sub_807F764
bl SetVBlankCallback
@@ -1764,7 +1764,7 @@ _080806DC:
lsls r0, 24
cmp r0, 0
bne _0808071A
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
bne _0808071A
@@ -1919,12 +1919,12 @@ _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
adds r1, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
add r1, sp, 0x8
movs r0, 0xFF
strb r0, [r1]
@@ -2128,7 +2128,7 @@ _08080A0A:
ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
ldr r1, [r6]
adds r1, 0x54
adds r1, r4
@@ -2140,13 +2140,13 @@ _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
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x2
adds r4, 0x1
cmp r4, 0x3
@@ -2325,7 +2325,7 @@ _08080BB0:
strb r0, [r1]
bl sub_808074C
movs r0, 0x2B
bl audio_play
bl PlaySE
ldr r0, [r4]
movs r5, 0xA0
lsls r5, 1
@@ -2394,7 +2394,7 @@ _08080BDC:
movs r1, 0
str r1, [r0]
movs r0, 0x34
bl audio_play
bl PlaySE
bl sub_80807BC
_08080C5C:
ldr r0, [r4]
@@ -2429,7 +2429,7 @@ _08080CA0:
negs r2, r2
movs r1, 0x78
movs r3, 0x3
bl AddObjectToFront
bl CreateSprite
_08080CAE:
ldr r0, =gUnknown_020322A4
ldr r1, [r0]
@@ -2461,7 +2461,7 @@ _08080CC4:
strb r3, [r0]
ldr r0, =sub_8081898
bl SetMainCallback2
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
bne _08080D44
@@ -2492,7 +2492,7 @@ _08080D30:
_08080D42:
strb r0, [r1]
_08080D44:
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
ldrh r0, [r1]
cmp r0, 0x1
bls _08080D80
@@ -2518,18 +2518,18 @@ _08080D5A:
lsls r3, 17
adds r5, r3
adds r4, 0x1
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r4, r0
blt _08080D5A
_08080D80:
bl current_map_music_get
bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
ldr r4, =0x00000193
cmp r0, r4
beq _08080D9E
bl current_map_music_get
bl GetCurrentMapMusic
ldr r1, =gUnknown_020322A4
ldr r1, [r1]
movs r5, 0xAA
@@ -2538,9 +2538,9 @@ _08080D80:
strh r0, [r1]
_08080D9E:
adds r0, r4, 0
bl song_play_for_text
bl PlayBGM
movs r0, 0x35
bl audio_play
bl PlaySE
bl sub_807F738
_08080DAE:
ldr r0, =gUnknown_020322A4
@@ -2557,8 +2557,8 @@ _08080DAE:
ldrsh r1, [r1, r2]
bl nullsub_31
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
add sp, 0x4
@@ -3120,7 +3120,7 @@ sub_8081288: @ 8081288
subs r2, r1
adds r1, r6, 0
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
adds r2, r1, 0
@@ -3130,16 +3130,16 @@ 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
bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_8082F9C
str r0, [r4]
movs r0, 0x28
bl audio_play
bl PlaySE
b _08081358
.pool
_08081314:
@@ -3149,12 +3149,12 @@ _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
bl StartSpriteAnim
movs r0, 0x1F
bl audio_play
bl PlaySE
b _08081358
.pool
_0808133C:
@@ -3164,12 +3164,12 @@ _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
bl StartSpriteAnim
movs r0, 0x20
bl audio_play
bl PlaySE
_08081358:
bl sub_8082E84
pop {r3}
@@ -3366,7 +3366,7 @@ sub_80814F4: @ 80814F4
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
beq _0808153C
@@ -3593,7 +3593,7 @@ _080816D2:
bge _080816F6
b _08081562
_080816F6:
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
beq _08081722
@@ -3696,12 +3696,12 @@ _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
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r4]
adds r0, 0x4A
ldrh r0, [r0]
@@ -3853,8 +3853,8 @@ _0808191A:
ldrsh r1, [r1, r2]
bl nullsub_31
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
pop {r4-r6}
@@ -4788,7 +4788,7 @@ _0808204C:
lsls r0, 24
lsrs r4, r0, 24
_08082064:
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r4, r0
bcc _0808204C
@@ -5050,12 +5050,12 @@ _08082292:
cmp r0, 0
bne _080822A8
movs r0, 0x22
bl sav12_xor_increment
bl IncrementGameStat
b _08082458
.pool
_080822A8:
movs r0, 0x21
bl sav12_xor_increment
bl IncrementGameStat
b _08082458
_080822B0:
ldr r6, =gUnknown_020322A4
@@ -5303,8 +5303,8 @@ _0808249E:
ldrsh r1, [r1, r2]
bl nullsub_31
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
pop {r3}
@@ -5664,7 +5664,7 @@ _080827FC:
cmp r0, 0
beq _080828DC
movs r0, 0x37
bl audio_play
bl PlaySE
ldr r0, =gUnknown_020322A4
ldr r1, [r0]
b _080828BC
@@ -5773,8 +5773,8 @@ _080828DC:
ldrsh r1, [r1, r2]
bl nullsub_31
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
add sp, 0x4
@@ -5953,8 +5953,8 @@ _08082A92:
ldrsh r1, [r1, r2]
bl nullsub_31
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
pop {r4-r6}
@@ -6402,7 +6402,7 @@ _08082E68:
cmp r0, 0
beq _08082E80
adds r0, r2, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_08082E80:
pop {r0}
bx r0
@@ -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
@@ -6471,7 +6471,7 @@ _08082EF4:
adds r2, 0x50
ldr r0, =gUnknown_08339BE0
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -6494,7 +6494,7 @@ _08082EF4:
ands r0, r2
subs r0, r7, r0
strh r0, [r4, 0x30]
ldr r3, =gUnknown_0202064C
ldr r3, =gSprites + 0x1C
adds r5, r3
ldr r0, =sub_8082E3C
str r0, [r5]
@@ -6533,7 +6533,7 @@ sub_8082F68: @ 8082F68
cmp r0, 0
beq _08082F94
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_08082F94:
pop {r4}
pop {r0}
@@ -6569,7 +6569,7 @@ _08082FC0:
cmp r0, 0
beq _08082FD4
adds r0, r2, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_08082FD4:
pop {r0}
bx r0
@@ -6634,7 +6634,7 @@ _0808302C:
adds r0, 0x1
strh r0, [r4, 0x2E]
movs r0, 0x38
bl audio_play
bl PlaySE
b _080830B2
_0808304C:
ldrh r0, [r4, 0x32]
@@ -6667,13 +6667,13 @@ _08083066:
cmp r0, 0x3
bne _080830A0
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, =gUnknown_08339C60
movs r2, 0x14
negs r2, r2
movs r1, 0x78
movs r3, 0x2
bl AddObjectToFront
bl CreateSprite
b _080830B2
.pool
_080830A0:
@@ -6684,7 +6684,7 @@ _080830A0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080830B2:
ldrh r0, [r4, 0x30]
strh r0, [r4, 0x26]
@@ -6725,7 +6725,7 @@ _080830DC:
adds r0, 0x1
strh r0, [r4, 0x2E]
movs r0, 0x15
bl audio_play
bl PlaySE
b _08083130
_080830FC:
ldrh r0, [r4, 0x32]
@@ -6753,7 +6753,7 @@ _08083112:
adds r0, 0x1
strb r0, [r1]
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_08083130:
ldrh r0, [r4, 0x30]
strh r0, [r4, 0x26]
@@ -7259,9 +7259,9 @@ _080834DE:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
bl DestroySprite
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
@@ -7622,7 +7622,7 @@ _080837EA:
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
movs r1, 0x1
bl remove_item
bl RemoveBagItem
adds r0, r7, 0
bl sub_8136F2C
ldr r1, [r4]
@@ -8063,7 +8063,7 @@ _08083B9A:
movs r1, 0x80
movs r2, 0x34
movs r3, 0
bl AddObjectToFront
bl CreateSprite
ldr r7, =gUnknown_020322A4
ldr r1, [r7]
adds r1, 0x46
@@ -8074,10 +8074,10 @@ _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
bl StartSpriteAnim
ldr r0, [r7]
adds r0, 0x46
ldrb r1, [r0]
@@ -8087,13 +8087,13 @@ _08083B9A:
adds r5, r6, 0
adds r5, 0x1C
adds r0, r5
ldr r4, =DummyObjectCallback
ldr r4, =SpriteCallbackDummy
str r4, [r0]
mov r0, r8
movs r1, 0xA0
movs r2, 0x34
movs r3, 0
bl AddObjectToFront
bl CreateSprite
ldr r1, [r7]
adds r1, 0x47
strb r0, [r1]
@@ -8109,7 +8109,7 @@ _08083B9A:
movs r1, 0xC0
movs r2, 0x34
movs r3, 0
bl AddObjectToFront
bl CreateSprite
ldr r1, [r7]
adds r1, 0x48
strb r0, [r1]
@@ -8121,7 +8121,7 @@ _08083B9A:
lsls r0, 2
adds r0, r6
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r7]
adds r0, 0x48
ldrb r1, [r0]
@@ -8303,7 +8303,7 @@ _08083DE2:
cmp r0, 0
beq _08083E12
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_020322A4
ldr r1, [r0]
_08083DF8:
@@ -8460,12 +8460,12 @@ sub_8083F3C: @ 8083F3C
cmp r0, 0
bne _08083F62
ldr r0, =0x0000016f
bl fanfare_play
bl PlayFanfare
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_08083F62:
bl task_is_not_running_overworld_fanfare
bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08083F82
@@ -8475,7 +8475,7 @@ _08083F62:
lsls r1, 1
adds r0, r1
ldrh r0, [r0]
bl song_play_for_text
bl PlayBGM
adds r0, r5, 0
bl DestroyTask
_08083F82:
asm/berry_tag_screen.s
+18 -18
View File
@@ -34,8 +34,8 @@ sub_8177C14: @ 8177C14
sub_8177C54: @ 8177C54
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl do_scheduled_bg_tilemap_copies_to_vram
bl UpdatePaletteFade
pop {r0}
@@ -45,8 +45,8 @@ sub_8177C54: @ 8177C54
thumb_func_start sub_8177C70
sub_8177C70: @ 8177C70
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -130,10 +130,10 @@ _08177D2C:
b _08177DDA
.pool
_08177D40:
bl ResetAllObjectData
bl ResetSpriteData
b _08177DDC
_08177D46:
bl ResetObjectPaletteAllocator
bl FreeAllSpritePalettes
b _08177DDC
_08177D4C:
bl sub_81221AC
@@ -830,9 +830,9 @@ 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 DestroySprite
bl sub_80D510C
pop {r0}
bx r0
@@ -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,9 +1080,9 @@ _08178598:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
bl DestroySprite
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -1102,7 +1102,7 @@ sub_81785D0: @ 81785D0
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
bl audio_play
bl PlaySE
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -1222,7 +1222,7 @@ sub_81786AC: @ 81786AC
lsls r1, r0, 16
lsrs r1, 16
movs r0, 0x4
bl bag_pocket_get_itemid
bl BagGetItemIdByPocketPosition
lsls r0, 16
cmp r0, 0
beq _08178718
@@ -1238,7 +1238,7 @@ _081786F6:
movs r0, 0
strh r0, [r4]
movs r0, 0x5
bl audio_play
bl PlaySE
lsls r0, r7, 24
asrs r0, 24
bl sub_8178728
@@ -1274,7 +1274,7 @@ sub_8178728: @ 8178728
lsls r1, 16
lsrs r1, 16
movs r0, 0x4
bl bag_pocket_get_itemid
bl BagGetItemIdByPocketPosition
lsls r0, 16
cmp r0, 0
bne _08178760
@@ -1308,7 +1308,7 @@ _0817877A:
lsls r1, 16
lsrs r1, 16
movs r0, 0x4
bl bag_pocket_get_itemid
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
bl ItemIdToBerryType
@@ -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
+10 -10
View File
@@ -225,7 +225,7 @@ sub_80F9984: @ 80F9984
adds r7, r1, 0
lsls r0, 16
lsrs r6, r0, 16
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
ldrh r0, [r1]
cmp r0, 0xFF
bne _080F99A0
@@ -327,8 +327,8 @@ _080F9A6E:
.pool
thumb_func_end sub_80F9A14
thumb_func_start sub_80F9A7C
sub_80F9A7C: @ 80F9A7C
thumb_func_start InitSeedotSizeRecord
InitSeedotSizeRecord: @ 80F9A7C
push {lr}
ldr r0, =0x00004047
movs r1, 0x80
@@ -337,7 +337,7 @@ sub_80F9A7C: @ 80F9A7C
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9A7C
thumb_func_end InitSeedotSizeRecord
thumb_func_start sub_80F9A90
sub_80F9A90: @ 80F9A90
@@ -359,7 +359,7 @@ sub_80F9AAC: @ 80F9AAC
ldr r0, =0x00004047
bl GetVarPointer
adds r1, r0, 0
ldr r4, =gUnknown_020375F0
ldr r4, =gScriptResult
movs r0, 0x95
lsls r0, 1
bl sub_80F9984
@@ -372,8 +372,8 @@ sub_80F9AAC: @ 80F9AAC
.pool
thumb_func_end sub_80F9AAC
thumb_func_start sub_80F9AD4
sub_80F9AD4: @ 80F9AD4
thumb_func_start InitLotadSizeRecord
InitLotadSizeRecord: @ 80F9AD4
push {lr}
ldr r0, =0x0000404f
movs r1, 0x80
@@ -382,7 +382,7 @@ sub_80F9AD4: @ 80F9AD4
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9AD4
thumb_func_end InitLotadSizeRecord
thumb_func_start sub_80F9AE8
sub_80F9AE8: @ 80F9AE8
@@ -403,7 +403,7 @@ sub_80F9B04: @ 80F9B04
ldr r0, =0x0000404f
bl GetVarPointer
adds r1, r0, 0
ldr r4, =gUnknown_020375F0
ldr r4, =gScriptResult
ldr r0, =0x00000127
bl sub_80F9984
lsls r0, 24
@@ -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/bike.s
+1 -1
View File
@@ -1164,7 +1164,7 @@ _08119A58:
ldr r0, =gUnknown_02037350
adds r4, r0
movs r0, 0x22
bl audio_play
bl PlaySE
ldrb r0, [r4, 0x1]
movs r1, 0x2
orrs r0, r1
asm/braille_puzzles.s
+4 -4
View File
@@ -70,7 +70,7 @@ sub_817963C: @ 817963C
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x14
bl audio_play
bl PlaySE
ldr r0, =0x000008af
bl FlagSet
bl script_env_2_disable
@@ -92,7 +92,7 @@ sub_81796AC: @ 81796AC
cmp r0, r1
bne _081796F4
bl calc_player_party_count
ldr r0, =gUnknown_020244E9
ldr r0, =gPlayerPartyCount
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -322,7 +322,7 @@ sub_8179860: @ 8179860
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x14
bl audio_play
bl PlaySE
movs r0, 0x8B
lsls r0, 4
bl FlagSet
@@ -418,7 +418,7 @@ sub_8179944: @ 8179944
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x14
bl audio_play
bl PlaySE
ldr r0, =0x000008b2
bl FlagSet
bl script_env_2_disable
asm/cable_car.s
+39 -39
View File
@@ -165,9 +165,9 @@ _0814FD4E:
b _08150224
.pool
_0814FDD8:
bl ResetAllObjectData
bl ResetSpriteData
bl ResetTasks
bl ResetObjectPaletteAllocator
bl FreeAllSpritePalettes
bl ResetPaletteFade
bl reset_temp_tile_data_buffers
bl sub_80AAFA4
@@ -187,7 +187,7 @@ _0814FDFC:
cmp r4, 0x13
bls _0814FDFC
bl InitMapMusic
bl map_music_set_to_zero
bl ResetMapMusic
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085CD66C
@@ -214,8 +214,8 @@ _0814FDFC:
adds r1, r2
movs r0, 0x3
bl SetBgTilemapBuffer
ldr r2, =gUnknown_02021BBC
ldr r1, =gUnknown_02021BBE
ldr r2, =gSpriteCoordOffsetX
ldr r1, =gSpriteCoordOffsetY
movs r0, 0
strh r0, [r1]
strh r0, [r2]
@@ -241,7 +241,7 @@ _0814FE96:
cmp r4, 0x2
bls _0814FE96
ldr r0, =gUnknown_085CDB74
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
ldr r0, =gUnknown_085CD67C
adds r1, r5, 0
bl malloc_and_decompress
@@ -435,7 +435,7 @@ _0814FFF8:
b _08150224
.pool
_08150090:
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrb r0, [r0]
bl sub_81514C8
ldr r1, =gUnknown_0203ABAC
@@ -558,7 +558,7 @@ _08150190:
bl BeginNormalPaletteFade
ldr r0, =0x000001a9
movs r1, 0x1
bl sub_80A3194
bl FadeInNewBGM
movs r0, 0x1
bl sub_8150B6C
ldr r1, =gMain
@@ -587,7 +587,7 @@ _081501C8:
ldr r0, =sub_81503E4
movs r1, 0
bl CreateTask
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _08150218
@@ -618,8 +618,8 @@ _08150226:
mainloop: @ 815023C
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
bl MapMusicMain
pop {r0}
@@ -643,7 +643,7 @@ c2_8011A1C: @ 8150258
bl HideBg
movs r0, 0
bl sub_8150B6C
ldr r0, =gUnknown_02021BBC
ldr r0, =gSpriteCoordOffsetX
strh r4, [r0]
movs r0, 0
bl sub_80AB130
@@ -664,7 +664,7 @@ _08150298:
cmp r4, 0x13
bls _08150298
bl ResetTasks
bl ResetAllObjectData
bl ResetSpriteData
bl ResetPaletteFade
movs r0, 0
bl UnsetBgTilemapBuffer
@@ -942,7 +942,7 @@ _081504EA:
movs r3, 0x10
bl BeginNormalPaletteFade
movs r0, 0x4
bl play_sound_effect
bl FadeOutBGM
b _08150542
.pool
_08150510:
@@ -1091,7 +1091,7 @@ _081505F4:
strb r0, [r1, 0x15]
_08150630:
bl sub_815115C
ldr r3, =gUnknown_02021BBC
ldr r3, =gSpriteCoordOffsetX
movs r0, 0
ldrsh r2, [r3, r0]
adds r1, r2, 0x1
@@ -1284,7 +1284,7 @@ _081507B6:
ldrh r1, [r1, 0x4]
cmp r0, r1
bcs _081507DC
ldr r4, =gUnknown_02021BBC
ldr r4, =gSpriteCoordOffsetX
movs r1, 0
ldrsh r0, [r4, r1]
b _081507E6
@@ -1339,8 +1339,8 @@ sub_8150800: @ 8150800
ldrb r1, [r0, 0x9]
movs r0, 0x12
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r4}
pop {r0}
@@ -1362,7 +1362,7 @@ sub_8150868: @ 8150868
ldrb r0, [r6, 0x1]
cmp r0, 0xFF
beq _08150934
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _081508E4
@@ -1455,7 +1455,7 @@ sub_8150948: @ 8150948
bne _08150958
b _08150A60
_08150958:
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _081509C8
@@ -1641,7 +1641,7 @@ _08150AE0:
cmp r0, 0xA0
ble _08150AEE
adds r0, r2, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_08150AEE:
pop {r0}
bx r0
@@ -1710,7 +1710,7 @@ _08150B5A:
cmp r0, 0x4F
bgt _08150B68
adds r0, r2, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_08150B68:
pop {r0}
bx r0
@@ -1806,7 +1806,7 @@ _08150C1C:
movs r0, 0x46
movs r1, 0
bl SetGpuReg
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r3, [r0]
cmp r3, 0
bne _08150C74
@@ -1936,7 +1936,7 @@ sub_8150D28: @ 8150D28
ldr r0, [r0]
str r0, [sp, 0x20]
str r1, [sp, 0x24]
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
mov r8, r6
mov r10, r5
@@ -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
@@ -1987,10 +1987,10 @@ _08150DD0:
movs r1, 0xB0
movs r2, 0x2B
movs r3, 0x67
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -2007,7 +2007,7 @@ _08150DD0:
movs r1, 0xC8
movs r2, 0x63
movs r3, 0x65
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
lsls r0, r6, 4
@@ -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
@@ -2093,10 +2093,10 @@ _08150ED4:
movs r1, 0x68
movs r2, 0x9
movs r3, 0x67
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -2113,7 +2113,7 @@ _08150ED4:
movs r1, 0x80
movs r2, 0x41
movs r3, 0x65
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
lsls r0, r6, 4
@@ -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
@@ -2151,7 +2151,7 @@ _08150F3E:
asrs r2, 16
ldr r0, =gUnknown_085CDBCC
movs r3, 0x68
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
lsls r0, r6, 4
@@ -2178,7 +2178,7 @@ _08150F3E:
lsrs r0, 16
add r0, r8
ldrb r0, [r0]
ldr r5, =gUnknown_020375E0
ldr r5, =gSpecialVar_0x8004
ldrh r4, [r5]
lsls r4, 2
add r1, sp, 0x20
@@ -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
@@ -2252,7 +2252,7 @@ _08151036:
adds r0, r4, 0
movs r1, 0x7
_08151044:
bl StartObjectImageAnim
bl StartSpriteAnim
strh r7, [r4, 0x30]
ldrh r0, [r4, 0x22]
adds r0, 0x2
@@ -2262,10 +2262,10 @@ _08151052:
adds r0, r4, 0
movs r1, 0x6
_08151056:
bl StartObjectImageAnim
bl StartSpriteAnim
strh r5, [r4, 0x30]
_0815105C:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r2, r8
adds r1, r2, r6
lsls r1, 2
asm/cable_car_util.s
+6 -6
View File
@@ -199,7 +199,7 @@ _08152208:
cmp r5, r4
bcs _08152242
adds r3, r6, 0
ldr r0, =gDefaultOamAttributes
ldr r0, =gDummyOamData
mov r12, r0
movs r2, 0x4
mov r8, r2
@@ -254,7 +254,7 @@ _0815226C:
bcs _08152292
ldr r0, =gUnknown_030024F8
mov r12, r0
ldr r4, =gDefaultOamAttributes
ldr r4, =gDummyOamData
adds r2, r5, 0
_0815227A:
lsls r1, r3, 3
@@ -352,7 +352,7 @@ _08152322:
lsls r0, r6, 3
ldr r1, =gUnknown_030024F8
adds r0, r1
ldr r1, =gDefaultOamAttributes
ldr r1, =gDummyOamData
ldm r1!, {r2,r3}
stm r0!, {r2,r3}
b _081523C0
@@ -448,7 +448,7 @@ sub_81523F4: @ 81523F4
cmp r4, 0
beq _08152430
ldrh r0, [r4, 0x10]
bl GetObjectTileRangeStartByTag
bl GetSpriteTileStartByTag
lsls r0, 16
lsrs r5, r0, 16
ldr r0, =0x0000ffff
@@ -656,7 +656,7 @@ _08152562:
ldrh r3, [r3, 0x8]
strh r3, [r5, 0xA]
mov r0, r8
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 4
ldrb r1, [r5, 0x5]
movs r4, 0xF
@@ -748,7 +748,7 @@ _081525FC:
lsls r1, r5, 3
ldr r0, =gUnknown_030024F8
adds r1, r0
ldr r0, =gDefaultOamAttributes
ldr r0, =gDummyOamData
ldm r0!, {r2,r3}
stm r1!, {r2,r3}
adds r0, r5, 0
asm/cable_club.s
+28 -28
View File
@@ -432,7 +432,7 @@ sub_80B2688: @ 80B2688
cmp r0, 0x1
bne _080B26EC
movs r0, 0x15
bl audio_play
bl PlaySE
ldr r0, =gUnknown_082780B3
bl box_related_two__3
ldr r0, =sub_80B270C
@@ -440,7 +440,7 @@ sub_80B2688: @ 80B2688
.pool
_080B26EC:
movs r0, 0x16
bl audio_play
bl PlaySE
ldr r0, =gUnknown_08278131
bl box_related_two__3
ldr r0, =sub_80B2918
@@ -614,7 +614,7 @@ _080B2878:
cmp r0, 0
beq _080B2898
movs r0, 0x5
bl audio_play
bl PlaySE
bl sub_800A620
ldr r0, =gTasks
lsls r1, r6, 2
@@ -663,7 +663,7 @@ sub_80B28A8: @ 80B28A8
b _080B2908
.pool
_080B28F4:
ldr r4, =gUnknown_020375F0
ldr r4, =gScriptResult
adds r0, r7, 0
adds r1, r6, 0
bl sub_80B2478
@@ -703,7 +703,7 @@ sub_80B2918: @ 80B2918
bl sub_80B24F8
cmp r0, 0x1
beq _080B29E6
ldr r4, =gUnknown_020375F0
ldr r4, =gScriptResult
adds r0, r6, 0
adds r1, r5, 0
bl sub_80B2478
@@ -791,7 +791,7 @@ sub_80B2A08: @ 80B2A08
bl sub_80B24F8
cmp r0, 0x1
beq _080B2ACE
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
ldrh r0, [r0]
cmp r0, 0x4
bne _080B2A38
@@ -941,7 +941,7 @@ _080B2B5E:
mov r1, r8
cmp r1, 0x1
ble _080B2B20
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
strh r7, [r0]
adds r0, r2, 0
add sp, 0x8
@@ -1067,7 +1067,7 @@ _080B2C7E:
movs r0, 0
bl sub_800B330
bl sub_800A5B4
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
adds r1, r5, 0
bl task_map_chg_seq_0807EC34
_080B2C9C:
@@ -1111,7 +1111,7 @@ sub_80B2CEC: @ 80B2CEC
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x5
strh r0, [r1]
ldr r0, =gTasks
@@ -1139,7 +1139,7 @@ sub_80B2D2C: @ 80B2D2C
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x6
strh r0, [r1]
ldr r0, =gTasks
@@ -1197,7 +1197,7 @@ sub_80B2DA4: @ 80B2DA4
push {r4,lr}
movs r3, 0x2
movs r2, 0x2
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x2
beq _080B2DDC
@@ -1284,7 +1284,7 @@ sub_80B2E4C: @ 80B2E4C
thumb_func_start sub_80B2E74
sub_80B2E74: @ 80B2E74
push {lr}
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_020229C6
@@ -1353,7 +1353,7 @@ sub_80B2EE4: @ 80B2EE4
b _080B2FC6
.pool
_080B2F0C:
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
ldrh r0, [r0]
cmp r0, 0x1
bne _080B2FA8
@@ -1415,7 +1415,7 @@ _080B2F74:
_080B2F82:
cmp r7, 0
beq _080B2FA8
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0xC
strh r0, [r1]
bl sub_800AD10
@@ -1517,7 +1517,7 @@ sub_80B3050: @ 80B3050
b _080B3134
.pool
_080B3068:
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
subs r0, 0x1
cmp r0, 0x8
@@ -1855,15 +1855,15 @@ _080B3354:
cmp r0, 0
beq _080B3370
ldr r0, =0x000001dd
bl current_map_music_set__default_for_battle
bl PlayNewMapMusic__default_for_battle
b _080B3378
.pool
_080B3370:
movs r0, 0xEE
lsls r0, 1
bl current_map_music_set__default_for_battle
bl PlayNewMapMusic__default_for_battle
_080B3378:
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
bl sub_80B3260
bl overworld_free_bg_tilemaps
@@ -2025,18 +2025,18 @@ _080B34DE:
cmp r0, 0
beq _080B34FC
ldr r0, =0x000001dd
bl current_map_music_set__default_for_battle
bl PlayNewMapMusic__default_for_battle
b _080B3504
.pool
_080B34FC:
movs r0, 0xEE
lsls r0, 1
bl current_map_music_set__default_for_battle
bl PlayNewMapMusic__default_for_battle
_080B3504:
ldr r1, =gUnknown_020229E8
ldr r0, =0x00002211
str r0, [r1, 0x14]
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
bl sub_80B3260
bl overworld_free_bg_tilemaps
@@ -2156,11 +2156,11 @@ sub_80B360C: @ 80B360C
negs r1, r1
ands r0, r1
str r0, [r2]
bl call_map_music_set_to_zero
bl call_ResetMapMusic
bl copy_player_party_from_sav1
bl copy_bags_and_unk_data_to_save_blocks
bl sub_813BF10
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
subs r0, 0x1
lsls r0, 16
@@ -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
@@ -2238,7 +2238,7 @@ _080B36D0:
thumb_func_start sub_80B36EC
sub_80B36EC: @ 80B36EC
push {lr}
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r1, [r0]
subs r0, r1, 0x1
lsls r0, 16
@@ -2308,7 +2308,7 @@ _080B376C:
cmp r0, 0
beq _080B37CC
bl sub_8087288
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrb r0, [r0]
bl sub_8009628
movs r0, 0x2
@@ -2584,7 +2584,7 @@ sub_80B39A4: @ 80B39A4
thumb_func_start sp02A_crash_sound
sp02A_crash_sound: @ 80B39BC
push {lr}
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrb r0, [r0]
ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music
bl sub_80C4E74
@@ -2599,7 +2599,7 @@ sub_80B39D4: @ 80B39D4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
strh r4, [r0]
ldr r0, =gStringVar1
lsls r1, r4, 3
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/clear_save_data_screen.s
+3 -3
View File
@@ -107,7 +107,7 @@ _0817AD68:
.pool
_0817ADA0:
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r5, 0
bl DestroyTask
ldr r0, =sub_817AFD4
@@ -126,7 +126,7 @@ sub_817ADC0: @ 817ADC0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl calls_flash_erase_block
bl ClearSaveData
adds r0, r4, 0
bl DestroyTask
ldr r0, =sub_817AFD4
@@ -272,7 +272,7 @@ _0817AEEC:
cmp r1, r2
bls _0817AEEC
bl ResetTasks
bl ResetAllObjectData
bl ResetSpriteData
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085F06C0
asm/clock.s
+6 -6
View File
@@ -10,11 +10,11 @@ sub_809E778: @ 809E778
push {lr}
ldr r0, =0x00000895
bl FlagSet
bl GameFreakRTC_CalcLocalDateTime
bl RtcCalcLocalTime
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
adds r2, 0xA0
ldr r3, =gUnknown_03005CF8
ldr r3, =gLocalTime
ldr r0, [r3]
ldr r1, [r3, 0x4]
str r0, [r2]
@@ -39,8 +39,8 @@ sub_809E7B0: @ 809E7B0
lsls r0, 24
cmp r0, 0
bne _0809E7DA
bl GameFreakRTC_CalcLocalDateTime
ldr r4, =gUnknown_03005CF8
bl RtcCalcLocalTime
ldr r4, =gLocalTime
adds r0, r4, 0
bl sub_809E7E8
adds r0, r4, 0
@@ -70,7 +70,7 @@ sub_809E7E8: @ 809E7E8
subs r4, r0
lsls r4, 16
lsrs r4, 16
bl sub_809D3A0
bl ClearUpperFlags
adds r0, r4, 0
bl sub_8122580
adds r0, r4, 0
@@ -111,7 +111,7 @@ sub_809E858: @ 809E858
adds r1, 0xA0
mov r0, sp
adds r2, r5, 0
bl GameFreakRTC_GetDelta
bl CalcTimeDifference
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
asm/contest.s
+139 -139
View File
@@ -10,14 +10,14 @@ TaskDummy1: @ 80D7668
bx lr
thumb_func_end TaskDummy1
thumb_func_start sub_80D766C
sub_80D766C: @ 80D766C
thumb_func_start ResetLinkContestBoolean
ResetLinkContestBoolean: @ 80D766C
ldr r1, =gUnknown_02039F2A
movs r0, 0
strb r0, [r1]
bx lr
.pool
thumb_func_end sub_80D766C
thumb_func_end ResetLinkContestBoolean
thumb_func_start sub_80D7678
sub_80D7678: @ 80D7678
@@ -570,10 +570,10 @@ _080D7B4E:
movs r1, 0x80
orrs r0, r1
strb r0, [r2, 0x8]
bl ResetAllObjectData
bl ResetSpriteData
bl ResetTasks
bl ResetObjectPaletteAllocator
ldr r1, =gUnknown_0300301C
bl FreeAllSpritePalettes
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x4
strb r0, [r1]
ldr r0, =0x02000000
@@ -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]
@@ -1184,7 +1184,7 @@ _080D814C:
strh r0, [r4, 0xA]
movs r0, 0x61
movs r1, 0
bl audio_play_and_stuff
bl PlaySE12WithPanning
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -1285,9 +1285,9 @@ _080D822C:
thumb_func_start sub_80D823C
sub_80D823C: @ 80D823C
push {r4,r5,lr}
bl CallObjectCallbacks
bl AnimateSprites
bl RunTasks
bl PrepareSpritesForOamLoad
bl BuildOamBuffer
bl UpdatePaletteFade
movs r4, 0
_080D8250:
@@ -1365,8 +1365,8 @@ vblank_cb_battle: @ 80D827C
movs r0, 0x46
bl SetGpuReg
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl sub_80BA0A8
pop {r0}
bx r0
@@ -1473,7 +1473,7 @@ sub_80D8424: @ 80D8424
bne _080D8482
_080D843C:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_02039F25
ldrb r0, [r0]
bl sub_80DBCA8
@@ -1703,7 +1703,7 @@ _080D8634:
cmp r5, 0
beq _080D8670
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gTasks
lsls r1, r7, 2
adds r1, r7
@@ -1734,7 +1734,7 @@ _080D868C:
b _080D87FA
_080D868E:
movs r0, 0x5
bl audio_play
bl PlaySE
movs r0, 0
bl sub_80DC490
ldr r0, =gStringVar1
@@ -1827,7 +1827,7 @@ _080D8756:
cmp r6, 0x1
bls _080D87FA
movs r0, 0x5
bl audio_play
bl PlaySE
b _080D87FA
.pool
_080D879C:
@@ -1874,7 +1874,7 @@ _080D87C4:
cmp r6, 0x1
bls _080D87FA
movs r0, 0x5
bl audio_play
bl PlaySE
_080D87FA:
pop {r4-r7}
pop {r0}
@@ -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,14 +2571,14 @@ _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
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _080D8EA0
bl _080DA100
@@ -2731,10 +2731,10 @@ _080D8FB8:
bl _080DA100
.pool
_080D9010:
ldr r0, =gUnknown_020383F8
ldr r0, =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
ldr r0, =gUnknown_020383FD
ldr r0, =gAnimScriptActive
ldrb r4, [r0]
cmp r4, 0
beq _080D9024
@@ -3135,7 +3135,7 @@ _080D935C:
cmp r0, 0
beq _080D936E
movs r0, 0x63
bl audio_play
bl PlaySE
_080D936E:
ldr r0, =gTasks
mov r2, r8
@@ -3481,12 +3481,12 @@ _080D961E:
cmp r0, 0
beq _080D963C
movs r0, 0x63
bl audio_play
bl PlaySE
b _080D9642
.pool
_080D963C:
movs r0, 0x64
bl audio_play
bl PlaySE
_080D9642:
ldr r5, =gUnknown_02039F34
ldr r0, [r5]
@@ -4116,7 +4116,7 @@ _080D9BD0:
movs r1, 0x1
bl sub_80DDED0
ldr r0, =0x00000187
bl fanfare_play
bl PlayFanfare
b _080D9C3E
.pool
_080D9BE8:
@@ -4235,7 +4235,7 @@ _080D9CB0:
_080D9CC2:
bl sub_80DDE0C
movs r0, 0xDF
bl audio_play
bl PlaySE
movs r0, 0x1
bl sub_80DDCDC
b _080D9D6C
@@ -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
@@ -4604,9 +4604,9 @@ _080D9FEC:
cmp r0, 0
bge _080DA100
adds r0, r6, 0
bl obj_free_rotscale_entry
bl FreeSpriteOamMatrix
adds r0, r6, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
movs r0, 0x14
strh r0, [r4, 0x8]
b _080DA100
@@ -4760,7 +4760,7 @@ _080DA148:
cmp r0, 0x1F
bne _080DA15C
strh r2, [r1, 0x2E]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1, 0x1C]
_080DA15C:
pop {r0}
@@ -4784,7 +4784,7 @@ sub_80DA164: @ 80DA164
negs r1, r1
cmp r0, r1
bge _080DA18E
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
adds r2, 0x3E
ldrb r0, [r2]
@@ -5411,7 +5411,7 @@ sub_80DA6B4: @ 80DA6B4
strh r0, [r1]
movs r0, 0x62
movs r1, 0
bl audio_play_and_stuff
bl PlaySE12WithPanning
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -6661,10 +6661,10 @@ sub_80DB0C4: @ 80DB0C4
movs r1, 0x70
movs r2, 0x24
movs r3, 0x1E
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -6677,7 +6677,7 @@ sub_80DB0C4: @ 80DB0C4
strb r1, [r5, 0x5]
adds r4, 0x1C
adds r2, r4
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r2]
pop {r4,r5}
pop {r1}
@@ -6696,10 +6696,10 @@ sub_80DB120: @ 80DB120
movs r1, 0x60
movs r2, 0xA
movs r3, 0x1D
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -6746,7 +6746,7 @@ sub_80DB174: @ 80DB174
ldr r1, [r1, 0x4]
adds r2, r5, 0
adds r3, r6, 0
bl DecompressMonPic_DetectFrontOrBack_2
bl HandleLoadSpecialPokePic_2
b _080DB1CC
.pool
_080DB1B8:
@@ -6758,7 +6758,7 @@ _080DB1B8:
ldr r1, [r1, 0x4]
adds r2, r5, 0
adds r3, r6, 0
bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack
bl HandleLoadSpecialPokePic_DontHandleDeoxys
_080DB1CC:
adds r0, r5, 0
adds r1, r7, 0
@@ -6782,10 +6782,10 @@ _080DB1CC:
adds r0, r4, 0
movs r1, 0x70
movs r3, 0x1E
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
lsls r0, r7, 4
adds r0, r7
@@ -6811,7 +6811,7 @@ _080DB1CC:
mov r0, r8
adds r0, 0x1C
adds r0, r6, r0
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldrb r0, [r4, 0x5]
lsrs r0, 4
@@ -6838,10 +6838,10 @@ _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
bl StartSpriteAffineAnim
adds r0, r7, 0
pop {r3}
mov r8, r3
@@ -7314,7 +7314,7 @@ _080DB648:
beq _080DB688
movs r0, 0x26
_080DB672:
bl audio_play
bl PlaySE
mov r1, r9
ldr r0, [r1]
ldr r1, [r0, 0x4]
@@ -8890,7 +8890,7 @@ _080DC226:
cmp r3, 0
ble _080DC284
movs r0, 0x60
bl audio_play
bl PlaySE
ldr r4, =gMPlay_SE1
adds r0, r4, 0
bl m4aMPlayImmInit
@@ -8904,7 +8904,7 @@ _080DC226:
.pool
_080DC284:
movs r0, 0x16
bl audio_play
bl PlaySE
_080DC28A:
mov r2, r10
cmp r2, 0
@@ -8937,7 +8937,7 @@ _080DC2A8:
sub_80DC2BC: @ 80DC2BC
push {r4,r5,lr}
ldr r0, =gUnknown_08587A74
bl LoadObjectPic
bl LoadSpriteSheet
movs r4, 0
ldr r5, =gUnknown_08587A6C
_080DC2C8:
@@ -8949,7 +8949,7 @@ _080DC2C8:
ldr r0, =gUnknown_08587AD0
movs r1, 0xB4
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
ldr r1, =gUnknown_02039F34
ldr r1, [r1]
ldr r2, [r1, 0x14]
@@ -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
@@ -9126,7 +9126,7 @@ sub_80DC408: @ 80DC408
negs r0, r0
ands r0, r2
strb r0, [r1, 0x2]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
b _080DC446
.pool
@@ -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:
@@ -9229,10 +9229,10 @@ sub_80DC4F0: @ 80DC4F0
mov r7, r8
push {r7}
ldr r0, =gUnknown_08587B08
bl LoadTaggedObjectPalette
bl LoadSpritePalette
movs r5, 0
ldr r7, =gUnknown_02039F34
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
mov r8, r0
movs r6, 0
_080DC506:
@@ -9250,7 +9250,7 @@ _080DC506:
ldrb r2, [r1]
movs r1, 0xCC
movs r3, 0
bl AddObjectToFront
bl CreateSprite
ldr r1, [r7]
ldr r1, [r1, 0x14]
lsls r4, r5, 2
@@ -9265,7 +9265,7 @@ _080DC506:
lsls r0, 2
add r0, r8
ldr r1, =gUnknown_08587B80
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
ldr r0, [r7]
ldr r0, [r0, 0x14]
adds r4, r0
@@ -9297,15 +9297,15 @@ sub_80DC594: @ 80DC594
ldr r0, =gUnknown_08587BB0
bl LoadCompressedObjectPic
ldr r0, =gUnknown_08587BB8
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r0, =gUnknown_08587BC8
movs r1, 0x1E
movs r2, 0x2C
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -9872,7 +9872,7 @@ sub_80DC9EC: @ 80DC9EC
ldr r0, =gUnknown_08589924
adds r4, r0
adds r0, r4, 0
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r2, [sp, 0xC]
lsls r4, r2, 1
adds r4, r2
@@ -9883,7 +9883,7 @@ sub_80DC9EC: @ 80DC9EC
movs r1, 0xB8
adds r2, r5, 0
movs r3, 0x1D
bl AddObjectToFront
bl CreateSprite
mov r9, r0
mov r3, r9
lsls r3, 24
@@ -9893,7 +9893,7 @@ sub_80DC9EC: @ 80DC9EC
movs r1, 0xF8
adds r2, r5, 0
movs r3, 0x1D
bl AddObjectToFront
bl CreateSprite
mov r8, r0
mov r0, r8
lsls r0, 24
@@ -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
@@ -10029,11 +10029,11 @@ sub_80DCB78: @ 80DCB78
lsls r4, 2
adds r4, r1
adds r0, r4, 0
bl obj_free_rotscale_entry
bl FreeSpriteOamMatrix
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
adds r0, r5, 0
bl RemoveObjectAndFreeResources
bl DestroySpriteAndFreeResources
pop {r4,r5}
pop {r0}
bx r0
@@ -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
@@ -10104,32 +10104,32 @@ sub_80DCBE8: @ 80DCBE8
lsls r5, 24
lsrs r5, 24
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
lsls r4, r5, 4
adds r4, r5
lsls r4, 2
mov r1, r8
adds r0, r4, r1
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r2, 0x1C
add r8, r2
add r6, r8
ldr r0, =sub_80DCC84
str r0, [r6]
add r4, r8
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4]
mov r3, r9
cmp r3, 0
bne _080DCC70
movs r0, 0x65
bl audio_play
bl PlaySE
b _080DCC76
.pool
_080DCC70:
movs r0, 0x2
bl audio_play
bl PlaySE
_080DCC76:
pop {r3,r4}
mov r8, r3
@@ -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
@@ -11481,7 +11481,7 @@ sub_80DD6DC: @ 80DD6DC
movs r1, 0x4
orrs r0, r1
strb r0, [r3]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
@@ -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
@@ -11542,11 +11542,11 @@ _080DD76C:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x20
bl audio_play
bl PlaySE
b _080DD8F8
.pool
_080DD79C:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11562,11 +11562,11 @@ _080DD79C:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x1F
bl audio_play
bl PlaySE
b _080DD8F8
.pool
_080DD7D0:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11582,11 +11582,11 @@ _080DD7D0:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x1F
bl audio_play
bl PlaySE
b _080DD8F8
.pool
_080DD804:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11602,11 +11602,11 @@ _080DD804:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x2D
bl audio_play
bl PlaySE
b _080DD8F8
.pool
_080DD838:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11622,11 +11622,11 @@ _080DD838:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x2D
bl audio_play
bl PlaySE
b _080DD8F8
.pool
_080DD86C:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11642,11 +11642,11 @@ _080DD86C:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x2D
bl audio_play
bl PlaySE
b _080DD8F8
.pool
_080DD8A0:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11662,11 +11662,11 @@ _080DD8A0:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0xC3
bl audio_play
bl PlaySE
b _080DD8F8
.pool
_080DD8D4:
ldr r0, =gUnknown_02020630
ldr r0, =gSprites
lsls r4, r5, 4
adds r1, r4, r5
lsls r1, 2
@@ -11682,10 +11682,10 @@ _080DD8D4:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x2D
bl audio_play
bl PlaySE
_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
@@ -11834,7 +11834,7 @@ sub_80DDA20: @ 80DDA20
movs r0, 0x1
strh r0, [r4, 0xA]
ldr r0, =0x0000abe2
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xC]
@@ -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:
@@ -12768,7 +12768,7 @@ _080DE146:
adds r3, r5, 0
bl sub_80DECB8
movs r0, 0x63
bl audio_play
bl PlaySE
_080DE1CA:
adds r7, 0x1
cmp r7, 0x3
@@ -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]
@@ -13059,7 +13059,7 @@ sub_80DE424: @ 80DE424
strh r0, [r1]
movs r0, 0x62
movs r1, 0
bl audio_play_and_stuff
bl PlaySE12WithPanning
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -13336,7 +13336,7 @@ _080DE680:
strh r0, [r4, 0xC]
movs r0, 0x61
movs r1, 0
bl audio_play_and_stuff
bl PlaySE12WithPanning
ldr r0, =sub_80DE5C0
str r0, [r4]
_080DE690:
@@ -13355,10 +13355,10 @@ 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
bl AllocOamMatrix
ldr r1, [r5]
ldr r1, [r1, 0x14]
lsls r4, r7, 2
@@ -13406,7 +13406,7 @@ _080DE6AE:
lsls r0, 2
adds r0, r6
mov r1, r8
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
mov r0, r8
cmp r0, 0x2
bne _080DE74C
@@ -13418,7 +13418,7 @@ _080DE6AE:
adds r0, r1
lsls r0, 2
adds r0, r6
bl AnimateObject
bl AnimateSprite
ldr r0, [r5]
ldr r0, [r0, 0x14]
adds r0, r4, r0
@@ -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,9 +13524,9 @@ _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
bl FreeSpriteOamMatrix
adds r4, 0x1
cmp r4, 0x3
ble _080DE7EE
@@ -13695,12 +13695,12 @@ _080DE920:
b _080DE9A2
.pool
_080DE960:
ldr r1, =gUnknown_0203841A
ldr r1, =gHappinessMoveAnim
movs r0, 0xFF
b _080DE9A0
.pool
_080DE96C:
ldr r1, =gUnknown_0203841A
ldr r1, =gHappinessMoveAnim
movs r0, 0
b _080DE9A0
.pool
@@ -13794,20 +13794,20 @@ sub_80DE9DC: @ 80DE9DC
thumb_func_start sub_80DEA20
sub_80DEA20: @ 80DEA20
push {lr}
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
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 InitSpriteAffineAnim
bl sub_80DEA5C
pop {r0}
bx r0
@@ -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]
@@ -14187,8 +14187,8 @@ sub_80DED60: @ 80DED60
.pool
thumb_func_end sub_80DED60
thumb_func_start sub_80DED74
sub_80DED74: @ 80DED74
thumb_func_start ResetContestLinkResults
ResetContestLinkResults: @ 80DED74
push {r4-r6,lr}
movs r0, 0
ldr r6, =gSaveBlock2Ptr
@@ -14214,7 +14214,7 @@ _080DED84:
pop {r0}
bx r0
.pool
thumb_func_end sub_80DED74
thumb_func_end ResetContestLinkResults
thumb_func_start sub_80DEDA8
sub_80DEDA8: @ 80DEDA8
@@ -14522,8 +14522,8 @@ _080DF03A:
bx r1
thumb_func_end sub_80DEFA8
thumb_func_start sub_80DF040
sub_80DF040: @ 80DF040
thumb_func_start ClearContestWinnerPicsInContestHall
ClearContestWinnerPicsInContestHall: @ 80DF040
push {r4-r7,lr}
movs r2, 0
ldr r0, =gSaveBlock1Ptr
@@ -14551,7 +14551,7 @@ _080DF04C:
pop {r0}
bx r0
.pool
thumb_func_end sub_80DF040
thumb_func_end ClearContestWinnerPicsInContestHall
thumb_func_start sub_80DF080
sub_80DF080: @ 80DF080
asm/contest_link_80F57C4.s
+61 -61
View File
@@ -346,9 +346,9 @@ sub_80F5B00: @ 80F5B00
bl sub_80F57C4
bl dp12_8087EA4
bl ResetPaletteFade
bl ResetAllObjectData
bl ResetSpriteData
bl ResetTasks
bl ResetObjectPaletteAllocator
bl FreeAllSpritePalettes
bl sub_80F591C
bl sub_80F6A9C
movs r0, 0
@@ -412,7 +412,7 @@ sub_80F5B00: @ 80F5B00
_080F5BE4:
movs r0, 0xDF
lsls r0, 1
bl song_play_for_text
bl PlayBGM
_080F5BEC:
ldr r0, =sub_80F5C24
bl SetVBlankCallback
@@ -426,8 +426,8 @@ _080F5BEC:
thumb_func_start sub_80F5C00
sub_80F5C00: @ 80F5C00
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTasks
bl UpdatePaletteFade
movs r0, 0x1
@@ -489,8 +489,8 @@ sub_80F5C24: @ 80F5C24
ldrh r1, [r0]
movs r0, 0x46
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@@ -543,12 +543,12 @@ _080F5D2A:
cmp r0, 0
bne _080F5D58
movs r0, 0x23
bl sav12_xor_increment
ldr r1, =gUnknown_020375E2
bl IncrementGameStat
ldr r1, =gSpecialVar_0x8005
movs r0, 0x8
strh r0, [r1]
bl InterviewBefore
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
ldrh r0, [r0]
cmp r0, 0x1
beq _080F5D58
@@ -580,7 +580,7 @@ _080F5D58:
bl VarSet
bl sub_8076D5C
movs r0, 0x1
bl save_game_when_memory_present
bl TrySavingData
bl sav2_gender2_inplace_and_xFE
adds r0, r5, 0
adds r1, r4, 0
@@ -623,7 +623,7 @@ _080F5E0A:
bne _080F5EBA
movs r0, 0xDF
lsls r0, 1
bl song_play_for_text
bl PlayBGM
ldr r2, =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -662,7 +662,7 @@ _080F5E2E:
.pool
_080F5E78:
movs r0, 0x24
bl sav12_xor_increment
bl IncrementGameStat
ldr r1, =gUnknown_02039F20
ldr r0, =gUnknown_02039F25
ldrb r0, [r0]
@@ -671,7 +671,7 @@ _080F5E78:
cmp r0, 0
bne _080F5E92
movs r0, 0x25
bl sav12_xor_increment
bl IncrementGameStat
_080F5E92:
ldr r0, =gUnknown_02039F2E
ldrb r0, [r0]
@@ -1399,7 +1399,7 @@ _080F648C:
ldr r1, [r1, 0x8]
adds r2, r6, 0
adds r3, r4, 0
bl DecompressMonPic_DetectFrontOrBack_2
bl HandleLoadSpecialPokePic_2
b _080F64F2
.pool
_080F64E0:
@@ -1410,7 +1410,7 @@ _080F64E0:
ldr r1, [r1, 0x8]
adds r2, r6, 0
adds r3, r4, 0
bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack
bl HandleLoadSpecialPokePic_DontHandleDeoxys
_080F64F2:
adds r0, r6, 0
adds r1, r5, 0
@@ -1428,10 +1428,10 @@ _080F64F2:
lsls r1, 1
movs r2, 0x50
movs r3, 0xA
bl AddObjectToFront
bl CreateSprite
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
@@ -2140,7 +2140,7 @@ sub_80F6AE8: @ 80F6AE8
movs r1, 0x1
strb r1, [r0]
ldr r0, =gUnknown_0858D8E0
bl LoadObjectPic
bl LoadSpriteSheet
adds r1, r0, 0
lsls r1, 16
movs r0, 0x1
@@ -2155,7 +2155,7 @@ sub_80F6AE8: @ 80F6AE8
movs r1, 0x8
movs r2, 0x8
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 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
@@ -2464,13 +2464,13 @@ sub_80F6DC0: @ 80F6DC0
movs r4, 0x7
_080F6DD6:
adds r0, r6, 0
bl LoadObjectPic
bl LoadSpriteSheet
adds r6, 0x8
subs r4, 0x1
cmp r4, 0
bge _080F6DD6
ldr r0, =gUnknown_0858D850
bl LoadTaggedObjectPalette
bl LoadSpritePalette
movs r4, 0
mov r6, sp
_080F6DEE:
@@ -2479,7 +2479,7 @@ _080F6DEE:
lsls r1, 1
movs r2, 0x90
movs r3, 0xA
bl AddObjectToFront
bl CreateSprite
adds r1, r5, r4
strb r0, [r1]
ldrh r0, [r6]
@@ -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]
@@ -2642,7 +2642,7 @@ sub_80F6F40: @ 80F6F40
strh r1, [r0, 0x22]
strh r2, [r0, 0x26]
strh r2, [r0, 0x24]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0, 0x1C]
ldr r0, =gUnknown_0203A034
ldr r0, [r0]
@@ -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
@@ -3303,7 +3303,7 @@ _080F741C:
mov r0, r8
bl DestroyTask
movs r0, 0x18
bl audio_play
bl PlaySE
_080F74A4:
add sp, 0x10
pop {r3,r4}
@@ -3449,7 +3449,7 @@ sub_80F75A8: @ 80F75A8
bne _080F7610
ldrh r0, [r4, 0x30]
movs r1, 0
bl cry_related
bl PlayCry1
movs r0, 0
strh r0, [r4, 0x30]
b _080F7610
@@ -3478,7 +3478,7 @@ _080F75F6:
ldrsh r0, [r4, r2]
cmp r0, 0x78
bne _080F7610
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x30]
@@ -3517,7 +3517,7 @@ sub_80F7620: @ 80F7620
negs r1, r1
cmp r0, r1
bge _080F7664
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
adds r2, r3, 0
adds r2, 0x3E
@@ -3577,12 +3577,12 @@ sub_80F7670: @ 80F7670
adds r0, r4, 0
movs r2, 0x2C
movs r3, 0x5
bl AddObjectToFront
bl CreateSprite
adds r4, r0, 0
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
@@ -3695,7 +3695,7 @@ _080F77B6:
ble _080F77D6
_080F77C6:
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r5]
ldr r1, [r0]
ldrb r0, [r1, 0x7]
@@ -4288,13 +4288,13 @@ _080F7C7E:
cmp r1, 0
beq _080F7C8A
movs r0, 0x16
bl audio_play
bl PlaySE
_080F7C8A:
ldr r3, [sp, 0x8]
cmp r3, 0
beq _080F7C96
movs r0, 0x15
bl audio_play
bl PlaySE
_080F7C96:
add sp, 0x14
pop {r3-r5}
@@ -4648,7 +4648,7 @@ sub_80F7F30: @ 80F7F30
ldrb r0, [r4]
bl sub_80DB09C
_080F7F5E:
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
strh r5, [r0]
pop {r4,r5}
pop {r0}
@@ -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
@@ -4991,7 +4991,7 @@ _080F8250:
sub_80F8264: @ 80F8264
push {r4,lr}
ldr r4, =gStringVar1
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrh r1, [r0]
lsls r1, 6
ldr r0, =gUnknown_02039E0D
@@ -5010,7 +5010,7 @@ sub_80F8264: @ 80F8264
sub_80F8290: @ 80F8290
push {lr}
ldr r0, =gStringVar3
ldr r1, =gUnknown_020375E4
ldr r1, =gSpecialVar_0x8006
ldrh r1, [r1]
lsls r1, 6
ldr r2, =gUnknown_02039E02
@@ -5026,9 +5026,9 @@ sub_80F82B4: @ 80F82B4
push {r4-r6,lr}
movs r1, 0
movs r2, 0
ldr r5, =gUnknown_020375E0
ldr r5, =gSpecialVar_0x8004
ldr r4, =gUnknown_02039F00
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 1
adds r0, r4
@@ -5059,9 +5059,9 @@ _080F82DC:
thumb_func_start sub_80F82FC
sub_80F82FC: @ 80F82FC
ldr r2, =gUnknown_020375E0
ldr r2, =gSpecialVar_0x8004
ldr r1, =gUnknown_02039F00
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 1
adds r0, r1
@@ -5077,7 +5077,7 @@ sub_80F831C: @ 80F831C
movs r1, 0
ldr r2, =gUnknown_02039F20
ldrb r0, [r2]
ldr r3, =gUnknown_020375E2
ldr r3, =gSpecialVar_0x8005
cmp r0, 0
beq _080F833C
_080F832A:
@@ -5215,9 +5215,9 @@ sub_80F840C: @ 80F840C
thumb_func_start sub_80F8438
sub_80F8438: @ 80F8438
ldr r2, =gUnknown_020375E0
ldr r2, =gSpecialVar_0x8004
ldr r1, =gUnknown_02039E00
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 6
adds r0, r1
@@ -5271,7 +5271,7 @@ sub_80F8484: @ 80F8484
thumb_func_start sub_80F84B0
sub_80F84B0: @ 80F84B0
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldr r1, =gUnknown_02039F25
ldrb r1, [r1]
strh r1, [r0]
@@ -5401,7 +5401,7 @@ sub_80F85BC: @ 80F85BC
movs r3, 0
ldr r5, =gUnknown_02039F30
mov r12, r5
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
mov r9, r0
add r1, sp, 0x4
mov r8, r1
@@ -5560,7 +5560,7 @@ sub_80F8714: @ 80F8714
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
bne _080F8748
asm/contest_painting.s
+5 -5
View File
@@ -155,7 +155,7 @@ _0812FEE2:
orrs r0, r7
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetAllObjectData
bl ResetSpriteData
b _0812FF36
.pool
_0812FF14:
@@ -552,8 +552,8 @@ _081302C0:
sub_81302D0: @ 81302D0
push {lr}
bl sub_8130280
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -587,7 +587,7 @@ sub_81302E8: @ 81302E8
ldr r2, [r6]
ldr r3, [r2]
adds r2, r5, 0
bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack
bl HandleLoadSpecialPokePic_DontHandleDeoxys
ldr r0, [r4]
ldr r0, [r0, 0x8]
ldr r1, [r7]
@@ -606,7 +606,7 @@ _08130348:
ldr r2, [r6]
ldr r3, [r2]
adds r2, r5, 0
bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack
bl HandleLoadSpecialPokePic_DontHandleDeoxys
ldr r0, [r4]
ldr r0, [r0, 0x4]
ldr r1, [r7]
asm/credits.s
+52 -52
View File
@@ -8,8 +8,8 @@
thumb_func_start sub_81754C8
sub_81754C8: @ 81754C8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -19,7 +19,7 @@ sub_81754C8: @ 81754C8
sub_81754DC: @ 81754DC
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl AnimateSprites
ldr r0, =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x2
@@ -43,12 +43,12 @@ sub_81754DC: @ 81754DC
bne _08175522
bl sub_81754C8
bl RunTasks
bl CallObjectCallbacks
bl AnimateSprites
ldr r1, =gUnknown_0203BCE5
movs r0, 0x1
strb r0, [r1]
_08175522:
bl PrepareSpritesForOamLoad
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -485,10 +485,10 @@ sub_81758E4: @ 81758E4
cmp r7, 0x1
beq _081759F0
_08175906:
bl ResetAllObjectData
bl ResetSpriteData
bl dp13_810BB8C
bl ResetObjectPaletteAllocator
ldr r1, =gUnknown_0300301C
bl FreeAllSpritePalettes
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_085B0E04
@@ -553,9 +553,9 @@ _0817596E:
adds r0, r1, 0
strh r0, [r2, 0x6]
adds r0, r6, 0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085E702C
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
@@ -719,8 +719,8 @@ sub_8175B1C: @ 8175B1C
movs r0, 0
movs r2, 0
bl sub_8176D1C
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -863,7 +863,7 @@ sub_8175C34: @ 8175C34
beq _08175C94
_08175C62:
movs r0, 0x4
bl play_sound_effect
bl FadeOutBGM
movs r0, 0x1
negs r0, r0
ldr r1, =0x0000ffff
@@ -881,7 +881,7 @@ _08175C94:
cmp r1, r0
bne _08175CA0
movs r0, 0x8
bl play_sound_effect
bl FadeOutBGM
_08175CA0:
movs r0, 0x8
ldrsh r1, [r4, r0]
@@ -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
@@ -2642,8 +2642,8 @@ _08176AD6:
movs r0, 0x52
movs r1, 0
bl SetGpuReg
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0x1
strb r0, [r6]
b _08176C96
@@ -2675,7 +2675,7 @@ _08176B54:
ldr r0, =gUnknown_085F5354
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085F5384
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
movs r0, 0x78
movs r1, 0x2E
bl sub_817B834
@@ -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
@@ -2714,7 +2714,7 @@ _08176BD8:
ldr r0, =gUnknown_085F5354
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085F5384
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
movs r0, 0x78
movs r1, 0x2E
bl sub_817B88C
@@ -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
@@ -3082,7 +3082,7 @@ sub_8176EE8: @ 8176EE8
cmp r0, 0
beq _08176F04
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _08176F88
.pool
_08176F04:
@@ -3107,7 +3107,7 @@ _08176F1C:
_08176F34:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08176F88
_08176F3E:
adds r0, r4, 0
@@ -3116,17 +3116,17 @@ _08176F3E:
_08176F44:
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08176F88
_08176F4E:
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08176F88
_08176F58:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r1, [r4, 0x20]
movs r2, 0x20
ldrsh r0, [r4, r2]
@@ -3138,7 +3138,7 @@ _08176F6E:
adds r0, r4, 0
movs r1, 0
_08176F72:
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r2, [r4, 0x20]
movs r0, 0x20
ldrsh r1, [r4, r0]
@@ -3165,7 +3165,7 @@ sub_8176F90: @ 8176F90
cmp r0, 0
beq _08176FAC
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _08177048
.pool
_08176FAC:
@@ -3188,7 +3188,7 @@ _08176FC8:
strh r0, [r4, 0x26]
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08177048
_08176FD4:
movs r1, 0x20
@@ -3197,12 +3197,12 @@ _08176FD4:
ble _08176FE6
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08176FEE
_08176FE6:
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_08176FEE:
ldrh r2, [r4, 0x20]
movs r0, 0x20
@@ -3226,7 +3226,7 @@ _08177010:
strh r0, [r4, 0x3C]
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r1, [r4, 0x3C]
movs r0, 0x3
ands r0, r1
@@ -3238,7 +3238,7 @@ _08177010:
_0817702E:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r2, [r4, 0x20]
movs r0, 0x20
ldrsh r1, [r4, r0]
@@ -3329,7 +3329,7 @@ _081770B4:
adds r0, r4, 0
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
adds r2, r5, 0
adds r2, 0x3E
ldrb r1, [r2]
@@ -3364,7 +3364,7 @@ _0817710E:
adds r0, r4, 0
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
b _0817714A
_08177144:
ldrh r0, [r5, 0x2E]
@@ -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
@@ -3538,7 +3538,7 @@ sub_8177224: @ 8177224
movs r3, 0x22
ldrsh r2, [r2, r3]
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3550,7 +3550,7 @@ sub_8177224: @ 8177224
lsls r5, 24
lsrs r5, 24
adds r1, r5, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
adds r0, r4, 0
pop {r4-r7}
pop {r1}
@@ -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
@@ -3580,7 +3580,7 @@ sub_81772B8: @ 81772B8
beq _081772EC
_081772DC:
adds r0, r3, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _08177380
.pool
_081772EC:
asm/daycare.s
+29 -29
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:
@@ -470,7 +470,7 @@ sub_806FDC4: @ 806FDC4
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
ldrb r1, [r1]
bl sub_806FD9C
lsls r0, 16
@@ -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
@@ -603,10 +603,10 @@ sub_806FED8: @ 806FED8
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
ldrb r1, [r1]
bl sub_806FEC0
ldr r1, =gUnknown_020375E2
ldr r1, =gSpecialVar_0x8005
strh r0, [r1]
pop {r0}
bx r0
@@ -637,7 +637,7 @@ sub_806FF04: @ 806FF04
sub_806FF30: @ 806FF30
push {r4-r6,lr}
ldr r6, =gSaveBlock1Ptr
ldr r5, =gUnknown_020375E0
ldr r5, =gSpecialVar_0x8004
ldrh r0, [r5]
movs r4, 0x8C
adds r1, r0, 0
@@ -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
@@ -2179,7 +2179,7 @@ _08070B34:
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
ldr r0, =gUnknown_020244E9
ldr r0, =gPlayerPartyCount
ldrb r0, [r0]
cmp r5, r0
bcs _08070BC0
@@ -2214,10 +2214,10 @@ _08070B9A:
adds r0, r4, 0
movs r1, 0x20
mov r2, sp
bl pokemon_setattr
bl SetMonData
b _08070BB4
_08070BA8:
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
strh r5, [r0]
movs r0, 0x1
b _08070BC2
@@ -2225,7 +2225,7 @@ _08070BA8:
_08070BB4:
adds r4, 0x64
adds r5, 0x1
ldr r0, =gUnknown_020244E9
ldr r0, =gPlayerPartyCount
ldrb r0, [r0]
cmp r5, r0
bcc _08070B5C
@@ -3075,12 +3075,12 @@ c3_080469FC: @ 8071204
b _0807124E
.pool
_0807123C:
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
strh r1, [r0]
b _0807124E
.pool
_08071248:
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x2
strh r0, [r1]
_0807124E:
@@ -3109,7 +3109,7 @@ _08071284:
ands r0, r2
cmp r0, 0
beq _080712B4
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
strh r1, [r0]
ldrb r0, [r4, 0x8]
movs r1, 0
asm/decompress.s
-1019
View File
File diff suppressed because it is too large Load Diff
asm/decoration.s
+60 -60
View File
@@ -260,7 +260,7 @@ sub_8126B80: @ 8126B80
cmp r1, r0
beq _08126BF4
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r1, =gUnknown_085A6B48
ldr r0, =gUnknown_0203A150
ldrb r0, [r0]
@@ -286,7 +286,7 @@ _08126BD8:
.pool
_08126BF4:
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r5, 0
bl sub_8126D6C
_08126C00:
@@ -849,13 +849,13 @@ _081270BC:
bne _081270CE
_081270C0:
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r5, 0
bl sub_812719C
b _081270DE
_081270CE:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_0203A173
strb r4, [r0]
adds r0, r5, 0
@@ -1284,7 +1284,7 @@ sub_8127480: @ 8127480
cmp r1, 0x1
beq _08127492
movs r0, 0x5
bl audio_play
bl PlaySE
_08127492:
adds r0, r4, 0
bl sub_8127744
@@ -1527,7 +1527,7 @@ sub_812764C: @ 812764C
.pool
_081276A4:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_085A6B78
movs r2, 0x16
ldrsh r1, [r5, r2]
@@ -1541,7 +1541,7 @@ _081276A4:
.pool
_081276C4:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_0203A172
strb r4, [r0]
bl sub_8127554
@@ -2473,9 +2473,9 @@ sub_8127E18: @ 8127E18
sub sp, 0x4
movs r6, 0
ldr r7, =gUnknown_02037318
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
mov r8, r0
ldr r1, =gUnknown_020375E4
ldr r1, =gSpecialVar_0x8006
mov r10, r1
ldr r2, =gSaveBlock1Ptr
mov r9, r2
@@ -2546,7 +2546,7 @@ _08127E82:
strh r1, [r2]
ldr r1, =gUnknown_0203AA36
ldrh r1, [r1]
ldr r4, =gUnknown_020375E6
ldr r4, =gSpecialVar_0x8007
strh r1, [r4]
mov r5, r9
ldr r2, [r5]
@@ -2560,7 +2560,7 @@ _08127E82:
mov r6, r10
movs r4, 0
ldrsh r3, [r6, r4]
ldr r5, =gUnknown_020375E6
ldr r5, =gSpecialVar_0x8007
movs r6, 0
ldrsh r4, [r5, r6]
str r4, [sp]
@@ -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
@@ -2903,13 +2903,13 @@ _081281EA:
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _0812820C
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r0, [sp]
movs r0, 0xC1
b _08128214
.pool
_0812820C:
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0xC2
@@ -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
@@ -2938,7 +2938,7 @@ _08128214:
adds r0, r1
lsls r0, 2
adds r0, r3
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, =gUnknown_03005DD0
ldr r0, [r0, 0x4]
strb r0, [r4]
@@ -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
@@ -3846,7 +3846,7 @@ sub_8128950: @ 8128950
.pool
_081289A4:
movs r0, 0x20
bl audio_play
bl PlaySE
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA8A6
adds r0, r4, 0
@@ -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
@@ -4148,7 +4148,7 @@ _08128C10:
_08128C30:
bl sub_812A3C8
ldr r0, =0x00000be5
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
ldr r1, =gUnknown_03005DAC
ldr r0, =sub_8128CD4
str r0, [r1]
@@ -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
@@ -5078,7 +5078,7 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334
cmp r0, 0x4
beq _081293B4
ldr r0, =0x00000be5
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
adds r0, r5, 0
bl sub_81291E8
ldr r0, [r5]
@@ -5100,18 +5100,18 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334
lsrs r1, 12
bl sub_8129068
ldr r0, =gUnknown_085A72BC
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r0, =gUnknown_085A728C
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
b _081293C6
.pool
_081293B4:
ldr r0, [r4, 0x1C]
ldrh r0, [r0]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r2, 0x1
str r2, [sp]
movs r2, 0
@@ -5166,7 +5166,7 @@ AddDecorationIconObjectFromIconTable: @ 81293D8
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r5, 0
movs r1, 0x1
bl GetDecorationIconPicOrPalette
@@ -5192,7 +5192,7 @@ AddDecorationIconObjectFromIconTable: @ 81293D8
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -5297,14 +5297,14 @@ AddDecorationIconObjectFromFieldObject: @ 81294C0
orrs r0, r1
str r0, [sp, 0x8]
add r0, sp, 0x4
bl LoadObjectPic
bl LoadSpriteSheet
str r5, [sp, 0xC]
add r0, sp, 0xC
ldr r1, [r0, 0x4]
ands r1, r4
orrs r1, r7
str r1, [r0, 0x4]
bl LoadTaggedObjectPalette
bl LoadSpritePalette
movs r0, 0x18
bl Alloc
adds r4, r0, 0
@@ -5321,7 +5321,7 @@ AddDecorationIconObjectFromFieldObject: @ 81294C0
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
@@ -5331,7 +5331,7 @@ AddDecorationIconObjectFromFieldObject: @ 81294C0
_081295A4:
ldr r0, [r4, 0x1C]
ldrh r0, [r0]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r2, 0x1
str r2, [sp]
movs r2, 0
@@ -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
@@ -5517,12 +5517,12 @@ sub_81296EC: @ 81296EC
thumb_func_start sub_8129708
sub_8129708: @ 8129708
push {r4-r6,lr}
ldr r6, =gUnknown_020375E2
ldr r6, =gSpecialVar_0x8005
movs r0, 0
strh r0, [r6]
ldr r2, =gUnknown_020375F0
ldr r2, =gScriptResult
strh r0, [r2]
ldr r4, =gUnknown_020375E0
ldr r4, =gSpecialVar_0x8004
ldr r1, =gUnknown_0203AAC4
ldrh r0, [r4]
ldrb r1, [r1]
@@ -5533,7 +5533,7 @@ sub_8129708: @ 8129708
b _08129796
.pool
_08129738:
ldr r1, =gUnknown_020375E4
ldr r1, =gSpecialVar_0x8006
ldrb r0, [r2]
strh r0, [r1]
b _08129796
@@ -5598,9 +5598,9 @@ sub_81297AC: @ 81297AC
bcs _081297F0
adds r3, r0, 0
ldr r5, [r3, 0x4]
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r4, [r0]
ldr r6, =gUnknown_020375E2
ldr r6, =gSpecialVar_0x8005
_081297C4:
lsls r0, r2, 1
adds r0, r2
@@ -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
@@ -5881,7 +5881,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 81299DC
movs r1, 0x78
movs r2, 0x50
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
str r0, [r4, 0x4]
@@ -5890,13 +5890,13 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 81299DC
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _08129A3C
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r0, [sp]
movs r0, 0xC1
b _08129A44
.pool
_08129A3C:
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0xC2
@@ -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
@@ -5929,7 +5929,7 @@ _08129A44:
adds r0, r1
lsls r0, 2
adds r0, r6
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, =gUnknown_03005DD0
ldr r0, [r0, 0x4]
strb r0, [r5]
@@ -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
@@ -6134,7 +6134,7 @@ sub_8129BF8: @ 8129BF8
lsls r0, 2
adds r3, 0x1C
adds r0, r3
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldr r5, =gStringVar4
ldr r1, =gUnknown_085EAA62
@@ -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
@@ -6213,7 +6213,7 @@ _08129CDE:
lsls r0, 2
adds r3, 0x1C
adds r0, r3
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAA62
@@ -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
@@ -6369,7 +6369,7 @@ sub_8129E0C: @ 8129E0C
adds r3, r5, 0
adds r3, 0x1C
adds r2, r3
ldr r3, =DummyObjectCallback
ldr r3, =SpriteCallbackDummy
str r3, [r2]
ldr r4, =gUnknown_0203AA39
ldrb r3, [r4]
@@ -7044,12 +7044,12 @@ sub_812A39C: @ 812A39C
cmp r0, 0
bne _0812A3B8
ldr r0, =gUnknown_085A73D8
bl LoadTaggedObjectPalette
bl LoadSpritePalette
b _0812A3BE
.pool
_0812A3B8:
ldr r0, =gUnknown_085A73E0
bl LoadTaggedObjectPalette
bl LoadSpritePalette
_0812A3BE:
pop {r0}
bx r0
@@ -7060,7 +7060,7 @@ _0812A3BE:
sub_812A3C8: @ 812A3C8
push {lr}
movs r0, 0x8
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
pop {r0}
bx r0
thumb_func_end sub_812A3C8
asm/dewford_trend.s
+6 -6
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_81224D4
sub_81224D4: @ 81224D4
thumb_func_start InitDewfordTrend
InitDewfordTrend: @ 81224D4
push {r4-r7,lr}
movs r6, 0
ldr r5, =gSaveBlock1Ptr
@@ -77,7 +77,7 @@ _08122522:
pop {r0}
bx r0
.pool
thumb_func_end sub_81224D4
thumb_func_end InitDewfordTrend
thumb_func_start sub_8122580
sub_8122580: @ 8122580
@@ -614,7 +614,7 @@ _08122980:
sub_8122998: @ 8122998
push {lr}
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r1, [r0]
lsls r1, 3
ldr r0, [r2]
@@ -667,7 +667,7 @@ sub_81229C8: @ 81229C8
negs r0, r0
lsrs r4, r0, 31
_08122A0C:
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
strh r4, [r0]
pop {r4}
pop {r0}
@@ -677,7 +677,7 @@ _08122A0C:
thumb_func_start sub_8122A30
sub_8122A30: @ 8122A30
ldr r2, =gUnknown_020375F0
ldr r2, =gScriptResult
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, =0x00002e6c
asm/diploma.s
+6 -6
View File
@@ -8,8 +8,8 @@
thumb_func_start sub_8177874
sub_8177874: @ 8177874
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -93,9 +93,9 @@ sub_8177888: @ 8177888
ldr r0, [r1, 0x8]
bl remove_some_task
bl ResetTasks
bl ResetAllObjectData
bl ResetSpriteData
bl ResetPaletteFade
bl ResetObjectPaletteAllocator
bl FreeAllSpritePalettes
ldr r0, =gUnknown_085E7088
movs r1, 0
movs r2, 0x40
@@ -159,8 +159,8 @@ _0817797C:
sub_8177A08: @ 8177A08
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
asm/easy_chat.s
+79 -79
View File
@@ -56,8 +56,8 @@ sub_811A20C: @ 811A20C
sub_811A278: @ 811A278
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -67,8 +67,8 @@ sub_811A278: @ 811A278
sub_811A290: @ 811A290
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_811A290
@@ -209,7 +209,7 @@ _0811A3B6:
cmp r6, 0
beq _0811A41C
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r6, 0
bl sub_811C158
ldrh r0, [r5]
@@ -292,8 +292,8 @@ _0811A454:
_0811A468:
movs r0, 0
bl SetVBlankCallback
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
bl ResetPaletteFade
b _0811A4C0
_0811A47C:
@@ -360,7 +360,7 @@ sub_811A4D0: @ 811A4D0
easy_chat_input_maybe: @ 811A4F0
push {r4,r5,lr}
movs r5, 0x3
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x14
bls _0811A4FE
@@ -425,7 +425,7 @@ _0811A5A0:
.pool
_0811A5B4:
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -456,7 +456,7 @@ _0811A5E6:
.pool
_0811A604:
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -465,13 +465,13 @@ _0811A604:
adds r0, r1
ldr r1, =0x000027d0
adds r4, r0, r1
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrb r5, [r0]
b _0811A7C2
.pool
_0811A630:
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -480,7 +480,7 @@ _0811A630:
adds r0, r3
ldr r1, [r2]
adds r1, r0
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 1
adds r0, 0x1C
@@ -490,7 +490,7 @@ _0811A630:
.pool
_0811A664:
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -530,7 +530,7 @@ _0811A6B4:
.pool
_0811A6D4:
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -539,7 +539,7 @@ _0811A6D4:
adds r0, r3
ldr r1, [r2]
adds r1, r0
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 1
adds r0, 0x4
@@ -549,7 +549,7 @@ _0811A6D4:
.pool
_0811A708:
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -570,7 +570,7 @@ _0811A72C:
.pool
_0811A73C:
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -621,7 +621,7 @@ _0811A7BC:
adds r4, r0, 0
_0811A7C2:
bl overworld_free_bg_tilemaps
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrb r0, [r0]
ldr r2, =sub_80861B0
adds r1, r4, 0
@@ -1659,7 +1659,7 @@ _0811AFAC:
b _0811AFE6
.pool
_0811AFC0:
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
strh r1, [r0]
ldr r0, =gUnknown_0203A118
ldr r0, [r0]
@@ -1709,7 +1709,7 @@ _0811B00C:
.pool
_0811B020:
bl sub_811BE9C
ldr r4, =gUnknown_020375F0
ldr r4, =gScriptResult
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
@@ -1860,7 +1860,7 @@ _0811B118:
b _0811B14A
.pool
_0811B134:
ldr r4, =gUnknown_020375F0
ldr r4, =gScriptResult
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
@@ -2189,7 +2189,7 @@ sub_811B368: @ 811B368
.pool
_0811B388:
movs r0, 0x20
bl audio_play
bl PlaySE
movs r0, 0
_0811B390:
pop {r1}
@@ -2211,7 +2211,7 @@ sub_811B394: @ 811B394
cmp r5, 0
beq _0811B3BC
movs r0, 0x20
bl audio_play
bl PlaySE
movs r0, 0
b _0811B3DC
_0811B3BC:
@@ -3792,18 +3792,18 @@ _0811BED0:
adds r1, r0, 0
cmp r1, 0
beq _0811BEE4
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
movs r0, 0x2
b _0811BF12
.pool
_0811BEE4:
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
strh r1, [r0]
b _0811BF14
.pool
_0811BEF0:
bl sub_811BE54
ldr r4, =gUnknown_020375E0
ldr r4, =gSpecialVar_0x8004
ldr r0, [r5]
adds r0, 0x3C
bl sub_81226D8
@@ -3814,7 +3814,7 @@ _0811BEF0:
.pool
_0811BF0C:
bl sub_811BF40
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
_0811BF12:
strh r0, [r1]
_0811BF14:
@@ -7714,9 +7714,9 @@ sub_811DE5C: @ 811DE5C
sub_811DE90: @ 811DE90
push {r4,r5,lr}
ldr r0, =gUnknown_08597CA0
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_08597CC0
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
movs r5, 0
ldr r4, =gUnknown_08597CE8
_0811DEA2:
@@ -7755,7 +7755,7 @@ sub_811DEC4: @ 811DEC4
adds r2, r3
asrs r2, 16
movs r3, 0x2
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_0203A11C
@@ -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
@@ -7876,7 +7876,7 @@ sub_811DFC8: @ 811DFC8
movs r1, 0
movs r2, 0
movs r3, 0x3
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0203A11C
@@ -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
@@ -7897,7 +7897,7 @@ sub_811DFC8: @ 811DFC8
movs r1, 0
movs r2, 0
movs r3, 0x3
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r5]
@@ -7936,7 +7936,7 @@ sub_811E050: @ 811E050
lsls r4, 2
adds r0, r4
ldr r0, [r0]
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r5]
adds r4, r0, r4
movs r6, 0
@@ -7945,7 +7945,7 @@ sub_811E050: @ 811E050
lsls r4, 2
adds r0, r4
ldr r0, [r0]
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r5]
adds r0, r4
str r6, [r0]
@@ -8026,7 +8026,7 @@ sub_811E0EC: @ 811E0EC
adds r0, r4
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
mov r2, r8
ldr r1, [r2]
adds r4, r1, r4
@@ -8045,7 +8045,7 @@ sub_811E0EC: @ 811E0EC
adds r1, r6
ldr r0, [r1]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
mov r1, r8
ldr r0, [r1]
adds r0, r6
@@ -8061,7 +8061,7 @@ _0811E150:
adds r0, r4
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r6]
adds r4, r1, r4
ldr r0, [r4]
@@ -8079,7 +8079,7 @@ _0811E150:
adds r1, r5
ldr r0, [r1]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r6]
adds r0, r5
ldr r1, [r0]
@@ -8144,7 +8144,7 @@ _0811E1EC:
adds r0, r4
ldr r0, [r0]
adds r1, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r5]
adds r4, r1, r4
ldr r0, [r4]
@@ -8157,7 +8157,7 @@ _0811E1EC:
adds r1, r4
ldr r0, [r1]
adds r1, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r5]
adds r0, r4
ldr r1, [r0]
@@ -8175,7 +8175,7 @@ _0811E234:
adds r0, r4
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r6]
adds r4, r1, r4
ldr r0, [r4]
@@ -8193,7 +8193,7 @@ _0811E234:
adds r1, r5
ldr r0, [r1]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r6]
adds r0, r5
ldr r1, [r0]
@@ -8217,7 +8217,7 @@ sub_811E288: @ 811E288
movs r1, 0
movs r2, 0
movs r3, 0x4
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_0203A11C
@@ -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
@@ -8347,7 +8347,7 @@ sub_811E380: @ 811E380
ldr r0, [r0]
cmp r0, 0
beq _0811E3A2
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r4]
movs r1, 0xB9
lsls r1, 2
@@ -8368,7 +8368,7 @@ sub_811E3AC: @ 811E3AC
movs r1, 0xD0
movs r2, 0x80
movs r3, 0x6
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0203A11C
@@ -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
@@ -8389,7 +8389,7 @@ sub_811E3AC: @ 811E3AC
movs r1, 0xD0
movs r2, 0x50
movs r3, 0x5
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r5]
@@ -8445,7 +8445,7 @@ _0811E430:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _0811E476
_0811E466:
ldr r0, [r4]
@@ -8454,7 +8454,7 @@ _0811E466:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E476:
ldr r0, =gUnknown_0203A11C
ldr r1, [r0]
@@ -8499,7 +8499,7 @@ sub_811E4AC: @ 811E4AC
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@@ -8552,13 +8552,13 @@ _0811E502:
lsls r4, 2
adds r0, r3, r4
ldr r0, [r0]
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r5]
movs r1, 0xBA
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r1, [r5]
adds r4, r1, r4
str r6, [r4]
@@ -8589,7 +8589,7 @@ sub_811E55C: @ 811E55C
adds r0, r1
ldr r0, [r0]
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@@ -8609,7 +8609,7 @@ sub_811E578: @ 811E578
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _0811E5AE
.pool
_0811E59C:
@@ -8620,7 +8620,7 @@ _0811E59C:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E5AE:
pop {r0}
bx r0
@@ -8652,7 +8652,7 @@ sub_811E5D4: @ 811E5D4
movs r1, 0x60
movs r2, 0x50
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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:
@@ -8673,7 +8673,7 @@ _0811E602:
movs r1, 0x60
movs r2, 0x9C
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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
@@ -8823,7 +8823,7 @@ sub_811E720: @ 811E720
movs r1, 0xDC
movs r2, 0x54
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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:
@@ -8844,7 +8844,7 @@ _0811E74E:
movs r1, 0xDC
movs r2, 0x9C
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -8857,11 +8857,11 @@ _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
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E77E:
bl sub_811E7F8
pop {r4}
@@ -8982,7 +8982,7 @@ _0811E852:
cmp r0, 0x4
bne _0811E8D0
adds r0, r4, 0
ldr r5, =DummyObjectCallback
ldr r5, =SpriteCallbackDummy
movs r4, 0
str r4, [sp]
adds r1, r5, 0
@@ -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
@@ -9004,7 +9004,7 @@ _0811E852:
ands r1, r2
strb r1, [r0, 0x5]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E892:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -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
@@ -9035,7 +9035,7 @@ _0811E8A0:
ands r1, r2
strb r1, [r0, 0x5]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E8D0:
add sp, 0x4
pop {r4,r5}
@@ -9851,7 +9851,7 @@ _0811EEC4:
thumb_func_start sub_811EECC
sub_811EECC: @ 811EECC
push {r4,r5,lr}
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
beq _0811EF04
@@ -10134,7 +10134,7 @@ _0811F0EC:
thumb_func_start sub_811F0F8
sub_811F0F8: @ 811F0F8
push {lr}
bl sub_809D42C
bl IsNationalPokedexEnabled
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -10202,8 +10202,8 @@ _0811F174:
.pool
thumb_func_end sub_811F108
thumb_func_start sub_811F184
sub_811F184: @ 811F184
thumb_func_start InitEasyChatPhrases
InitEasyChatPhrases: @ 811F184
push {r4-r7,lr}
movs r2, 0
ldr r5, =gSaveBlock1Ptr
@@ -10320,7 +10320,7 @@ _0811F244:
pop {r0}
bx r0
.pool
thumb_func_end sub_811F184
thumb_func_end InitEasyChatPhrases
thumb_func_start sub_811F28C
sub_811F28C: @ 811F28C
@@ -10447,7 +10447,7 @@ _0811F358:
movs r1, 0x14
strh r1, [r0]
_0811F37A:
bl sub_809D42C
bl IsNationalPokedexEnabled
cmp r0, 0
beq _0811F398
ldr r0, =gUnknown_0203A120
asm/egg_hatch.s
+64 -64
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
@@ -259,7 +259,7 @@ sub_80714B8: @ 80714B8
thumb_func_start sub_8071578
sub_8071578: @ 8071578
push {lr}
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrb r0, [r0]
bl sub_80714B8
pop {r0}
@@ -334,7 +334,7 @@ sub_8071614: @ 8071614
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
ldrb r1, [r1]
bl sub_807158C
lsls r0, 24
@@ -409,7 +409,7 @@ _08071688:
adds r2, r1
ldr r1, [r2]
adds r2, r4, 0
bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack
bl HandleLoadSpecialPokePic_DontHandleDeoxys
adds r0, r5, 0
bl sub_806E794
bl LoadCompressedObjectPalette
@@ -427,10 +427,10 @@ _080716D8:
movs r1, 0x78
movs r2, 0x4B
movs r3, 0x6
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
ldr r4, =gUnknown_02020630
ldr r4, =gSprites
lsls r1, r7, 4
adds r1, r7
lsls r1, 2
@@ -442,7 +442,7 @@ _080716D8:
strb r0, [r2]
adds r4, 0x1C
adds r1, r4
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1]
_08071712:
adds r0, r7, 0
@@ -458,8 +458,8 @@ _08071712:
thumb_func_start sub_807172C
sub_807172C: @ 807172C
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -546,7 +546,7 @@ _080717EC:
str r0, [r4]
bl init_uns_table_pokemon_copy
ldr r2, [r4]
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
movs r1, 0
strb r0, [r2, 0x4]
@@ -554,8 +554,8 @@ _080717EC:
strb r1, [r0, 0x7]
ldr r0, =sub_807172C
bl SetVBlankCallback
bl current_map_music_get
ldr r1, =gUnknown_020375E2
bl GetCurrentMapMusic
ldr r1, =gSpecialVar_0x8005
strh r0, [r1]
bl reset_temp_tile_data_buffers
movs r0, 0
@@ -598,8 +598,8 @@ _080717EC:
bl SetBgTilemapBuffer
bl DeactivateAllTextPrinters
bl ResetPaletteFade
bl ResetObjectPaletteAllocator
bl ResetAllObjectData
bl FreeAllSpritePalettes
bl ResetSpriteData
bl ResetTasks
bl remove_some_task
bl m4aSoundVSyncOn
@@ -634,11 +634,11 @@ _080718D0:
.pool
_08071904:
ldr r0, =gUnknown_0832BFE4
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_0832BFEC
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_0832BFF4
bl LoadTaggedObjectPalette
bl LoadSpritePalette
b _080719A6
.pool
_08071924:
@@ -715,8 +715,8 @@ _080719C8:
_080719D6:
bl RunTasks
bl RunTextPrinters
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
add sp, 0x4
pop {r4}
@@ -728,7 +728,7 @@ _080719D6:
thumb_func_start sub_80719FC
sub_80719FC: @ 80719FC
push {lr}
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -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]
@@ -762,7 +762,7 @@ c3_080472E4: @ 8071A3C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08071A5C
bl sub_80A2F30
bl StopMapMusic
bl play_some_sound
_08071A5C:
movs r1, 0x8
@@ -771,14 +771,14 @@ _08071A5C:
bne _08071A6C
movs r0, 0xBC
lsls r0, 1
bl song_play_for_text
bl PlayBGM
_08071A6C:
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0x3C
ble _08071A80
ldr r0, =0x00000179
bl song_play_for_text
bl PlayBGM
adds r0, r5, 0
bl DestroyTask
_08071A80:
@@ -839,7 +839,7 @@ _08071AF4:
movs r1, 0x78
movs r2, 0x4B
movs r3, 0x5
bl AddObjectToFront
bl CreateSprite
ldr r4, =gUnknown_03000DE0
ldr r1, [r4]
strb r0, [r1]
@@ -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
@@ -914,7 +914,7 @@ _08071BA0:
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _08071BBC
b _08071E06
@@ -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
@@ -951,7 +951,7 @@ _08071BF8:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _08071C12
b _08071E06
@@ -983,7 +983,7 @@ _08071C24:
movs r3, 0x3
bl sub_8072214
ldr r0, =0x00000173
bl fanfare_play
bl PlayFanfare
ldr r1, [r5]
ldrb r0, [r1, 0x2]
adds r0, 0x1
@@ -998,7 +998,7 @@ _08071C24:
b _08071E06
.pool
_08071C88:
bl task_is_not_running_overworld_fanfare
bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
bne _08071C94
@@ -1006,7 +1006,7 @@ _08071C88:
_08071C94:
b _08071DC4
_08071C96:
bl task_is_not_running_overworld_fanfare
bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
bne _08071CA2
@@ -1166,8 +1166,8 @@ _08071DD4:
_08071E06:
bl RunTasks
bl RunTextPrinters
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
add sp, 0x8
pop {r3,r4}
@@ -1212,10 +1212,10 @@ _08071E54:
cmp r0, 0xF
bne _08071E84
movs r0, 0x17
bl audio_play
bl PlaySE
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
bl sub_8072140
_08071E84:
pop {r4}
@@ -1264,10 +1264,10 @@ _08071EBC:
cmp r0, 0xF
bne _08071EE8
movs r0, 0x17
bl audio_play
bl PlaySE
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_08071EE8:
pop {r4}
pop {r0}
@@ -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
@@ -1337,10 +1337,10 @@ _08071F5C:
cmp r0, 0xF
bne _08071F90
movs r0, 0x17
bl audio_play
bl PlaySE
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
bl sub_8072140
bl sub_8072140
_08071F90:
@@ -1349,7 +1349,7 @@ _08071F90:
cmp r0, 0x1E
bne _08071F9E
movs r0, 0x17
bl audio_play
bl PlaySE
_08071F9E:
pop {r4,r5}
pop {r0}
@@ -1422,7 +1422,7 @@ _08072004:
cmp r4, 0
bne _08072032
movs r0, 0x71
bl audio_play
bl PlaySE
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]
@@ -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]
@@ -1470,7 +1470,7 @@ sub_8072048: @ 8072048
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_08072084:
movs r2, 0x2E
ldrsh r0, [r5, r2]
@@ -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]
@@ -1506,7 +1506,7 @@ _080720BC:
ldrsh r0, [r5, r2]
cmp r0, 0x28
ble _080720CA
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r5, 0x1C]
_080720CA:
adds r0, r1, 0x1
@@ -1561,7 +1561,7 @@ _08072114:
cmp r0, 0
ble _0807213A
adds r0, r2, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0807213A:
pop {r4}
pop {r0}
@@ -1646,11 +1646,11 @@ sub_8072194: @ 8072194
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x4
bl AddObjectToFront
bl CreateSprite
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
@@ -1661,7 +1661,7 @@ sub_8072194: @ 8072194
mov r1, r9
strh r1, [r0, 0x34]
mov r1, r10
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r3-r5}
mov r8, r3
mov r9, r4
asm/event_data.s
-565
View File
@@ -1,565 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_809D300
sub_809D300: @ 809D300
push {r4,lr}
ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
ldr r1, =0x00001270
adds r0, r1
movs r2, 0x96
lsls r2, 1
movs r1, 0
bl memset
ldr r0, [r4]
ldr r1, =0x0000139c
adds r0, r1
movs r2, 0x80
lsls r2, 2
movs r1, 0
bl memset
ldr r0, =gUnknown_020375FC
movs r1, 0
movs r2, 0x10
bl memset
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_809D300
thumb_func_start sub_809D344
sub_809D344: @ 809D344
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00001270
adds r2, r0, r1
movs r1, 0
str r1, [r2]
ldr r1, =0x0000139c
adds r0, r1
movs r1, 0
movs r2, 0x20
bl memset
ldr r0, =0x000008ad
bl FlagReset
ldr r0, =0x000008ae
bl FlagReset
ldr r0, =0x00000889
bl FlagReset
ldr r0, =0x000008c1
bl FlagReset
movs r0, 0x88
lsls r0, 4
bl FlagReset
pop {r0}
bx r0
.pool
thumb_func_end sub_809D344
thumb_func_start sub_809D3A0
sub_809D3A0: @ 809D3A0
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00001394
adds r0, r1
movs r1, 0
movs r2, 0x8
bl memset
pop {r0}
bx r0
.pool
thumb_func_end sub_809D3A0
thumb_func_start sub_809D3C0
sub_809D3C0: @ 809D3C0
push {lr}
ldr r0, =0x00004046
bl GetVarPointer
ldr r1, =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
strb r1, [r2, 0x1A]
strh r1, [r0]
ldr r0, =0x00000896
bl FlagReset
pop {r0}
bx r0
.pool
thumb_func_end sub_809D3C0
thumb_func_start sub_809D3E8
sub_809D3E8: @ 809D3E8
push {r4,r5,lr}
ldr r0, =0x00004046
bl GetVarPointer
ldr r4, =gSaveBlock2Ptr
ldr r2, [r4]
movs r5, 0
movs r1, 0xDA
strb r1, [r2, 0x1A]
ldr r2, =0x00000302
adds r1, r2, 0
strh r1, [r0]
ldr r0, =0x00000896
bl FlagSet
ldr r1, [r4]
movs r0, 0x1
strb r0, [r1, 0x19]
ldr r0, [r4]
strb r5, [r0, 0x18]
bl sub_80BB358
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_809D3E8
thumb_func_start sub_809D42C
sub_809D42C: @ 809D42C
push {lr}
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x1A]
cmp r0, 0xDA
bne _0809D468
ldr r0, =0x00004046
bl VarGet
lsls r0, 16
ldr r1, =0x03020000
cmp r0, r1
bne _0809D468
ldr r0, =0x00000896
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0809D468
movs r0, 0x1
b _0809D46A
.pool
_0809D468:
movs r0, 0
_0809D46A:
pop {r1}
bx r1
thumb_func_end sub_809D42C
thumb_func_start sub_809D470
sub_809D470: @ 809D470
push {lr}
ldr r0, =0x000008ac
bl FlagReset
pop {r0}
bx r0
.pool
thumb_func_end sub_809D470
thumb_func_start sub_809D480
sub_809D480: @ 809D480
push {lr}
ldr r0, =0x000008ac
bl FlagSet
pop {r0}
bx r0
.pool
thumb_func_end sub_809D480
thumb_func_start sub_809D490
sub_809D490: @ 809D490
push {lr}
ldr r0, =0x000008ac
bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.pool
thumb_func_end sub_809D490
thumb_func_start sub_809D4A4
sub_809D4A4: @ 809D4A4
push {lr}
ldr r0, =0x000008db
bl FlagReset
pop {r0}
bx r0
.pool
thumb_func_end sub_809D4A4
thumb_func_start sub_809D4B4
sub_809D4B4: @ 809D4B4
push {lr}
ldr r0, =0x000008db
bl FlagSet
pop {r0}
bx r0
.pool
thumb_func_end sub_809D4B4
thumb_func_start sub_809D4C4
sub_809D4C4: @ 809D4C4
push {lr}
ldr r0, =0x000008db
bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.pool
thumb_func_end sub_809D4C4
thumb_func_start sub_809D4D8
sub_809D4D8: @ 809D4D8
push {lr}
movs r0, 0xF2
lsls r0, 1
bl FlagReset
ldr r0, =0x000001e5
bl FlagReset
movs r0, 0xF3
lsls r0, 1
bl FlagReset
ldr r0, =0x000001e7
bl FlagReset
movs r0, 0xF4
lsls r0, 1
bl FlagReset
ldr r0, =0x000001e9
bl FlagReset
movs r0, 0xF5
lsls r0, 1
bl FlagReset
ldr r0, =0x000001eb
bl FlagReset
movs r0, 0xF6
lsls r0, 1
bl FlagReset
ldr r0, =0x000001ed
bl FlagReset
movs r0, 0xF7
lsls r0, 1
bl FlagReset
ldr r0, =0x000001ef
bl FlagReset
movs r0, 0xF8
lsls r0, 1
bl FlagReset
ldr r0, =0x000001f1
bl FlagReset
movs r0, 0xF9
lsls r0, 1
bl FlagReset
ldr r0, =0x000001f3
bl FlagReset
pop {r0}
bx r0
.pool
thumb_func_end sub_809D4D8
thumb_func_start sub_809D570
sub_809D570: @ 809D570
push {lr}
ldr r0, =0x000040dd
movs r1, 0
bl VarSet
ldr r0, =0x000040de
movs r1, 0
bl VarSet
ldr r0, =0x000040df
movs r1, 0
bl VarSet
ldr r0, =0x000040e0
movs r1, 0
bl VarSet
ldr r0, =0x000040e1
movs r1, 0
bl VarSet
ldr r0, =0x000040e2
movs r1, 0
bl VarSet
ldr r0, =0x000040e3
movs r1, 0
bl VarSet
ldr r0, =0x000040e4
movs r1, 0
bl VarSet
pop {r0}
bx r0
.pool
thumb_func_end sub_809D570
thumb_func_start sub_809D5D8
sub_809D5D8: @ 809D5D8
push {lr}
ldr r0, =0x0000402c
movs r1, 0
bl VarSet
ldr r0, =0x000008c2
bl FlagReset
pop {r0}
bx r0
.pool
thumb_func_end sub_809D5D8
thumb_func_start sub_809D5F4
sub_809D5F4: @ 809D5F4
push {lr}
ldr r0, =0x0000402c
movs r1, 0x92
lsls r1, 4
bl VarSet
ldr r0, =0x000008c2
bl FlagSet
pop {r0}
bx r0
.pool
thumb_func_end sub_809D5F4
thumb_func_start sub_809D614
sub_809D614: @ 809D614
push {lr}
ldr r0, =0x000008c2
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0809D640
ldr r0, =0x0000402c
bl VarGet
lsls r0, 16
movs r1, 0x92
lsls r1, 20
cmp r0, r1
bne _0809D640
movs r0, 0x1
b _0809D642
.pool
_0809D640:
movs r0, 0
_0809D642:
pop {r1}
bx r1
thumb_func_end sub_809D614
thumb_func_start GetVarPointer
@ u16 *GetVarPointer(u16 varId)
GetVarPointer: @ 809D648
push {lr}
lsls r0, 16
lsrs r1, r0, 16
adds r2, r1, 0
ldr r0, =0x00003fff
cmp r1, r0
bhi _0809D660
movs r0, 0
b _0809D688
.pool
_0809D660:
lsls r0, r1, 16
cmp r0, 0
bge _0809D67C
ldr r0, =gUnknown_081DBA0C
ldr r2, =0xffff8000
adds r1, r2
lsls r1, 2
adds r1, r0
ldr r0, [r1]
b _0809D688
.pool
_0809D67C:
ldr r0, =gSaveBlock1Ptr
lsls r1, r2, 1
ldr r2, =0xffff939c
adds r1, r2
ldr r0, [r0]
adds r0, r1
_0809D688:
pop {r1}
bx r1
.pool
thumb_func_end GetVarPointer
thumb_func_start VarGet
@ u16 VarGet(u16 varId)
VarGet: @ 809D694
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl GetVarPointer
cmp r0, 0
beq _0809D6A8
ldrh r0, [r0]
b _0809D6AA
_0809D6A8:
adds r0, r4, 0
_0809D6AA:
pop {r4}
pop {r1}
bx r1
thumb_func_end VarGet
thumb_func_start VarSet
@ bool8 VarSet(u16 varId, u16 value)
VarSet: @ 809D6B0
push {r4,lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r4, r1, 16
bl GetVarPointer
cmp r0, 0
beq _0809D6C8
strh r4, [r0]
movs r0, 0x1
b _0809D6CA
_0809D6C8:
movs r0, 0
_0809D6CA:
pop {r4}
pop {r1}
bx r1
thumb_func_end VarSet
thumb_func_start VarGetFieldObjectGraphicsId
@ u8 VarGetFieldObjectGraphicsId(u8 index)
VarGetFieldObjectGraphicsId: @ 809D6D0
push {lr}
lsls r0, 24
lsrs r0, 8
ldr r1, =0x40100000
adds r0, r1
lsrs r0, 16
bl VarGet
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.pool
thumb_func_end VarGetFieldObjectGraphicsId
thumb_func_start GetFlagPointer
@ u8 *GetFlagPointer(u16 flagId)
GetFlagPointer: @ 809D6EC
push {lr}
lsls r1, r0, 16
lsrs r2, r1, 16
adds r3, r2, 0
cmp r2, 0
bne _0809D6FC
movs r0, 0
b _0809D72E
_0809D6FC:
ldr r0, =0x00003fff
cmp r2, r0
bhi _0809D71C
ldr r0, =gSaveBlock1Ptr
lsrs r1, 19
ldr r2, =0x00001270
adds r1, r2
ldr r0, [r0]
b _0809D72C
.pool
_0809D71C:
ldr r1, =0xffffc000
adds r0, r3, r1
cmp r0, 0
bge _0809D728
ldr r2, =0xffffc007
adds r0, r3, r2
_0809D728:
asrs r0, 3
ldr r1, =gUnknown_020375FC
_0809D72C:
adds r0, r1
_0809D72E:
pop {r1}
bx r1
.pool
thumb_func_end GetFlagPointer
thumb_func_start FlagSet
@ bool8 FlagSet(u16 flagId)
FlagSet: @ 809D740
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl GetFlagPointer
adds r2, r0, 0
cmp r2, 0
beq _0809D760
movs r0, 0x7
ands r0, r4
movs r1, 0x1
lsls r1, r0
ldrb r0, [r2]
orrs r1, r0
strb r1, [r2]
_0809D760:
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end FlagSet
thumb_func_start FlagReset
@ bool8 FlagReset(u16 flagId)
FlagReset: @ 809D768
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl GetFlagPointer
adds r2, r0, 0
cmp r2, 0
beq _0809D788
movs r0, 0x7
ands r0, r4
movs r1, 0x1
lsls r1, r0
ldrb r0, [r2]
bics r0, r1
strb r0, [r2]
_0809D788:
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end FlagReset
thumb_func_start FlagGet
@ bool8 FlagGet(u16 flagId)
FlagGet: @ 809D790
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl GetFlagPointer
cmp r0, 0
beq _0809D7B4
ldrb r0, [r0]
movs r1, 0x7
ands r1, r4
asrs r0, r1
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _0809D7B4
movs r0, 0x1
b _0809D7B6
_0809D7B4:
movs r0, 0
_0809D7B6:
pop {r4}
pop {r1}
bx r1
thumb_func_end FlagGet
.align 2, 0 @ Don't pad with nop.
asm/evolution_graphics.s
+26 -26
View File
@@ -27,7 +27,7 @@ _0817BA4C:
str r1, [sp]
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -134,7 +134,7 @@ _0817BB16:
b _0817BB30
_0817BB2A:
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0817BB30:
pop {r4}
pop {r0}
@@ -150,12 +150,12 @@ sub_817BB38: @ 817BB38
movs r1, 0x78
movs r2, 0x58
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
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
@@ -238,7 +238,7 @@ _0817BBCC:
b _0817BC00
_0817BBFA:
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0817BC00:
pop {r4}
pop {r0}
@@ -254,12 +254,12 @@ sub_817BC08: @ 817BC08
movs r1, 0x78
movs r2, 0x8
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
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
@@ -328,7 +328,7 @@ sub_817BC70: @ 817BC70
b _0817BCB2
_0817BCAC:
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0817BCB2:
pop {r4}
pop {r0}
@@ -346,12 +346,12 @@ sub_817BCB8: @ 817BCB8
movs r1, 0x78
movs r2, 0x38
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
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
@@ -491,7 +491,7 @@ _0817BDCA:
b _0817BDEA
_0817BDE4:
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0817BDEA:
pop {r4,r5}
pop {r0}
@@ -507,13 +507,13 @@ sub_817BDF0: @ 817BDF0
movs r1, 0x78
movs r2, 0x38
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x40
beq _0817BE60
bl Random
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r5, r4, 4
adds r5, r4
lsls r5, 2
@@ -567,7 +567,7 @@ sub_817BE78: @ 817BE78
ldr r0, =gUnknown_085F540C
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_085F541C
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
pop {r0}
bx r0
.pool
@@ -624,7 +624,7 @@ sub_817BEC4: @ 817BEC4
ldr r0, =sub_817BF14
str r0, [r5]
movs r0, 0x8C
bl audio_play
bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -749,7 +749,7 @@ sub_817BFCC: @ 817BFCC
ldr r1, =sub_817C000
str r1, [r0]
movs r0, 0xB7
bl audio_play
bl PlaySE
pop {r4}
pop {r0}
bx r0
@@ -843,7 +843,7 @@ sub_817C080: @ 817C080
ldr r1, =sub_817C0B4
str r1, [r0]
movs r0, 0x66
bl audio_play
bl PlaySE
pop {r4}
pop {r0}
bx r0
@@ -980,7 +980,7 @@ sub_817C174: @ 817C174
ldr r0, =sub_817C1D4
str r0, [r5]
movs r0, 0xCA
bl audio_play
bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -1127,7 +1127,7 @@ sub_817C2B0: @ 817C2B0
ldr r0, =sub_817C310
str r0, [r5]
movs r0, 0xCA
bl audio_play
bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -1260,7 +1260,7 @@ _0817C3BA:
movs r0, 0x1E
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
movs r0, 0x10
ldrsh r1, [r6, r0]
adds r0, r4, 0
@@ -1272,8 +1272,8 @@ _0817C3BA:
movs r0, 0x1F
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
ldr r1, =gUnknown_02020630
bl SetOamMatrix
ldr r1, =gSprites
mov r9, r1
lsls r2, r5, 4
adds r2, r5
@@ -1547,7 +1547,7 @@ _0817C626:
movs r0, 0x1E
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
movs r3, 0x10
ldrsh r1, [r5, r3]
adds r0, r4, 0
@@ -1559,7 +1559,7 @@ _0817C626:
movs r0, 0x1F
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
cmp r6, 0x2
bne _0817C670
ldr r0, =sub_817C510
@@ -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
+129 -129
View File
@@ -191,11 +191,11 @@ evolution_cutscene: @ 813DA8C
strb r0, [r1]
bl c2_berry_program_update_menu
bl sub_8035AA4
bl ResetAllObjectData
bl ResetSpriteData
bl remove_some_task
bl ResetTasks
bl ResetObjectPaletteAllocator
ldr r0, =gUnknown_0300301C
bl FreeAllSpritePalettes
ldr r0, =gReservedSpritePaletteCount
movs r2, 0x4
strb r2, [r0]
movs r0, 0x64
@@ -254,18 +254,18 @@ evolution_cutscene: @ 813DA8C
bl sub_806A068
ldr r0, =gUnknown_0202499C
mov r8, r0
ldr r1, =gDummyObjectRotScalAnimTable
ldr r1, =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
bl AddObjectToFront
bl CreateSprite
ldr r1, =gUnknown_0203AB80
ldr r2, [r1]
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
@@ -308,14 +308,14 @@ evolution_cutscene: @ 813DA8C
mov r0, r10
movs r1, 0x3
bl sub_806A068
ldr r0, =gDummyObjectRotScalAnimTable
ldr r0, =gDummySpriteAffineAnimTable
mov r1, r8
str r0, [r1, 0x10]
mov r0, r8
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
bl AddObjectToFront
bl CreateSprite
ldr r1, =gUnknown_0203AB80
ldr r2, [r1]
lsls r1, r0, 24
@@ -484,9 +484,9 @@ sub_813DD7C: @ 813DD7C
strb r0, [r1]
bl c2_berry_program_update_menu
bl sub_8035AA4
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r1, =gUnknown_0300301C
bl ResetSpriteData
bl FreeAllSpritePalettes
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x4
strb r0, [r1]
lsls r0, r5, 3
@@ -510,18 +510,18 @@ sub_813DD7C: @ 813DD7C
movs r1, 0x3
bl sub_806A068
ldr r0, =gUnknown_0202499C
ldr r1, =gDummyObjectRotScalAnimTable
ldr r1, =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
bl AddObjectToFront
bl CreateSprite
mov r2, r8
ldr r1, [r2]
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
@@ -624,9 +624,9 @@ _0813DFE0:
bl SetHBlankCallback
movs r0, 0
bl SetVBlankCallback
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r1, =gUnknown_0300301C
bl ResetSpriteData
bl FreeAllSpritePalettes
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x4
strb r0, [r1]
ldr r0, =gUnknown_02022E14
@@ -718,18 +718,18 @@ _0813E0F0:
movs r1, 0x1
bl sub_806A068
ldr r0, =gUnknown_0202499C
ldr r1, =gDummyObjectRotScalAnimTable
ldr r1, =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
bl AddObjectToFront
bl CreateSprite
ldr r1, =gUnknown_0203AB80
ldr r1, [r1]
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
@@ -838,7 +838,7 @@ sub_813E1D4: @ 813E1D4
ldr r2, =gSpeciesNames
adds r1, r2
bl StringCopy
ldr r1, =gUnknown_02021CC0
ldr r1, =gAffineAnimsDisabled
movs r0, 0x1
strb r0, [r1]
adds r0, r4, 0
@@ -885,18 +885,18 @@ sub_813E1D4: @ 813E1D4
movs r1, 0x1
bl sub_806A068
ldr r0, =gUnknown_0202499C
ldr r1, =gDummyObjectRotScalAnimTable
ldr r1, =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
bl AddObjectToFront
bl CreateSprite
mov r1, r9
ldr r2, [r1]
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
@@ -983,8 +983,8 @@ sub_813E1D4: @ 813E1D4
thumb_func_start sub_813E3A4
sub_813E3A4: @ 813E3A4
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
bl RunTasks
@@ -995,8 +995,8 @@ sub_813E3A4: @ 813E3A4
thumb_func_start sub_813E3C0
sub_813E3C0: @ 813E3C0
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
bl RunTasks
@@ -1031,7 +1031,7 @@ evovle_mon_internal_maybe: @ 813E3DC
beq _0813E40C
b _0813E546
_0813E40C:
ldr r6, =gUnknown_020244E9
ldr r6, =gPlayerPartyCount
ldrb r0, [r6]
cmp r0, 0x5
bls _0813E416
@@ -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,12 +1094,12 @@ _0813E484:
adds r0, r1
adds r1, r4, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r4, 0x1
cmp r4, 0x36
ble _0813E484
movs r4, 0x43
ldr r7, =gUnknown_020244E9
ldr r7, =gPlayerPartyCount
_0813E4A0:
ldrb r0, [r7]
movs r6, 0x64
@@ -1108,17 +1108,17 @@ _0813E4A0:
adds r0, r5
adds r1, r4, 0
mov r2, sp
bl pokemon_setattr
bl SetMonData
adds r4, 0x1
cmp r4, 0x4F
ble _0813E4A0
ldr r4, =gUnknown_020244E9
ldr r4, =gPlayerPartyCount
ldrb r0, [r4]
muls r0, r6
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]
@@ -1375,7 +1375,7 @@ _0813E740:
_0813E752:
movs r0, 0xBC
lsls r0, 1
bl audio_play
bl PlaySE
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -1384,7 +1384,7 @@ _0813E752:
b _0813EC52
.pool
_0813E770:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -1392,7 +1392,7 @@ _0813E770:
bl _0813F1A4
_0813E780:
ldr r0, =0x00000179
bl current_map_music_set
bl PlayNewMapMusic
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -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
@@ -1558,7 +1558,7 @@ _0813E8EC:
bl _0813F1A4
_0813E902:
movs r0, 0x21
bl audio_play
bl PlaySE
mov r2, r8
adds r1, r2, r7
lsls r1, 3
@@ -1566,7 +1566,7 @@ _0813E902:
b _0813EC52
.pool
_0813E918:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0813E926
@@ -1614,7 +1614,7 @@ _0813E974:
b _0813EB92
.pool
_0813E990:
bl sub_80A3678
bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _0813E99E
@@ -1628,7 +1628,7 @@ _0813E99E:
movs r1, 0
bl battle_show_message_maybe
ldr r0, =0x00000173
bl song_play_for_text
bl PlayBGM
ldr r2, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -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]
@@ -1661,7 +1661,7 @@ _0813E99E:
movs r1, 0x3
bl pokedex_flag_operation
movs r0, 0xE
bl sav12_xor_increment
bl IncrementGameStat
b _0813F1A4
.pool
_0813EA1C:
@@ -1693,7 +1693,7 @@ _0813EA2A:
ands r0, r1
cmp r0, 0
bne _0813EA5E
bl sub_80A2F30
bl StopMapMusic
bl sub_8085784
_0813EA5E:
ldrh r0, [r4, 0xE]
@@ -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
@@ -1762,7 +1762,7 @@ _0813EADC:
ands r0, r1
cmp r0, 0
bne _0813EAF6
bl sub_80A2F30
bl StopMapMusic
bl sub_8085784
_0813EAF6:
movs r1, 0x1A
@@ -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
@@ -1886,7 +1886,7 @@ _0813EC10:
beq _0813EC1E
b _0813F1A4
_0813EC1E:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813EC2A
@@ -1894,7 +1894,7 @@ _0813EC1E:
_0813EC2A:
bl sub_804F574
ldr r0, =0x0000016f
bl fanfare_play
bl PlayFanfare
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0xC]
bl get_battle_strings_
@@ -1922,7 +1922,7 @@ _0813EC6C:
beq _0813EC7A
b _0813F1A4
_0813EC7A:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813EC86
@@ -1985,7 +1985,7 @@ _0813ECFC:
beq _0813ED0A
b _0813F1A4
_0813ED0A:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813ED16
@@ -2015,7 +2015,7 @@ _0813ED48:
beq _0813ED56
b _0813F1A4
_0813ED56:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813ED62
@@ -2042,7 +2042,7 @@ _0813ED90:
lsls r0, 16
cmp r0, 0
bne _0813EDCE
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0813EDCE
@@ -2072,7 +2072,7 @@ _0813EDCE:
beq _0813EDDC
b _0813F1A4
_0813EDDC:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -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,12 +2110,12 @@ _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
movs r0, 0x5
bl audio_play
bl PlaySE
ldrb r0, [r4, 0x1]
bl sub_8056BAC
movs r0, 0
@@ -2128,12 +2128,12 @@ _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
movs r0, 0x5
bl audio_play
bl PlaySE
ldrb r0, [r4, 0x1]
bl sub_8056BAC
movs r0, 0x1
@@ -2154,8 +2154,8 @@ _0813EE84:
movs r3, 0xD
bl sub_8056A3C
movs r0, 0x5
bl audio_play
ldr r0, =gUnknown_02024332
bl PlaySE
ldr r0, =gBattleCommunication
ldrb r2, [r0, 0x1]
cmp r2, 0
beq _0813EECC
@@ -2204,7 +2204,7 @@ _0813EF00:
movs r3, 0xD
bl sub_8056A3C
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2231,7 +2231,7 @@ _0813EF3E:
lsls r5, 3
adds r5, r1
ldrb r1, [r5, 0x1C]
ldr r2, =gUnknown_020244E9
ldr r2, =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
@@ -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
@@ -2359,7 +2359,7 @@ _0813F090:
beq _0813F09E
b _0813F1A4
_0813F09E:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813F0AA
@@ -2386,7 +2386,7 @@ _0813F0D8:
lsls r0, 16
cmp r0, 0
bne _0813F1A4
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0813F1A4
@@ -2451,7 +2451,7 @@ _0813F180:
lsls r0, 16
cmp r0, 0
bne _0813F1A4
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0813F1A4
@@ -2562,11 +2562,11 @@ _0813F294:
adds r4, r0
ldrh r0, [r4, 0xA]
movs r1, 0
bl cry_related
bl PlayCry1
b _0813F6F2
.pool
_0813F2AC:
bl sub_80A3678
bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _0813F2BA
@@ -2576,7 +2576,7 @@ _0813F2BA:
bl m4aSongNumStop
movs r0, 0xBC
lsls r0, 1
bl audio_play
bl PlaySE
ldr r1, =gTasks
lsls r0, r7, 2
adds r0, r7
@@ -2585,7 +2585,7 @@ _0813F2BA:
b _0813F6B4
.pool
_0813F2DC:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -2593,7 +2593,7 @@ _0813F2DC:
bl _0813FCC4
_0813F2EC:
ldr r0, =0x00000179
bl song_play_for_text
bl PlayBGM
ldr r1, =gTasks
lsls r0, r7, 2
adds r0, r7
@@ -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
@@ -2766,11 +2766,11 @@ _0813F474:
bl _0813FCC4
_0813F48A:
movs r0, 0x21
bl audio_play
bl PlaySE
b _0813F6AC
.pool
_0813F498:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0813F4A6
@@ -2797,7 +2797,7 @@ _0813F4A6:
b _0813F6F2
.pool
_0813F4E4:
bl sub_80A3678
bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _0813F4F2
@@ -2812,7 +2812,7 @@ _0813F4F2:
movs r2, 0x1
bl sub_807F1A8
ldr r0, =0x00000173
bl fanfare_play
bl PlayFanfare
ldr r2, =gTasks
lsls r1, r7, 2
adds r1, r7
@@ -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]
@@ -2845,7 +2845,7 @@ _0813F4F2:
movs r1, 0x3
bl pokedex_flag_operation
movs r0, 0xE
bl sav12_xor_increment
bl IncrementGameStat
b _0813FCC4
.pool
_0813F570:
@@ -2856,7 +2856,7 @@ _0813F570:
beq _0813F57E
b _0813FCC4
_0813F57E:
bl task_is_not_running_overworld_fanfare
bl IsFanfareTaskInactive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -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
@@ -2912,7 +2912,7 @@ _0813F5F0:
.pool
_0813F5FC:
ldr r0, =0x00000179
bl song_play_for_text
bl PlayBGM
ldr r1, =gUnknown_085EF6D2
movs r0, 0
movs r2, 0x1
@@ -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]
@@ -3053,7 +3053,7 @@ _0813F748:
beq _0813F756
b _0813FCC4
_0813F756:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813F762
@@ -3061,7 +3061,7 @@ _0813F756:
_0813F762:
bl sub_804F574
ldr r0, =0x0000016f
bl fanfare_play
bl PlayFanfare
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0xC]
bl get_battle_strings_
@@ -3090,7 +3090,7 @@ _0813F7A4:
beq _0813F7B2
b _0813FCC4
_0813F7B2:
bl task_is_not_running_overworld_fanfare
bl IsFanfareTaskInactive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3154,7 +3154,7 @@ _0813F838:
beq _0813F846
b _0813FCC4
_0813F846:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813F852
@@ -3185,7 +3185,7 @@ _0813F884:
beq _0813F892
b _0813FCC4
_0813F892:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813F89E
@@ -3213,7 +3213,7 @@ _0813F8CC:
lsls r0, 16
cmp r0, 0
bne _0813F90C
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0813F90C
@@ -3244,7 +3244,7 @@ _0813F90C:
beq _0813F91A
b _0813FCC4
_0813F91A:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -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
@@ -3382,7 +3382,7 @@ _0813FA3E:
lsls r5, 3
adds r5, r1
ldrb r1, [r5, 0x1C]
ldr r2, =gUnknown_020244E9
ldr r2, =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
@@ -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
@@ -3503,7 +3503,7 @@ _0813FBA4:
beq _0813FBB2
b _0813FCC4
_0813FBB2:
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0813FBBE
@@ -3531,7 +3531,7 @@ _0813FBEC:
lsls r0, 16
cmp r0, 0
bne _0813FCC4
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0813FCC4
@@ -3599,7 +3599,7 @@ _0813FCA0:
lsls r0, 16
cmp r0, 0
bne _0813FCC4
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0813FCC4
@@ -3662,8 +3662,8 @@ sub_813FCDC: @ 813FCDC
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@@ -3706,8 +3706,8 @@ sub_813FD64: @ 813FD64
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@@ -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,14 +4193,14 @@ 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
adds r2, 0x1C
adds r1, r2
ldr r1, [r1]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _08140230
movs r0, 0
asm/field_camera.s
+5 -5
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,9 +817,9 @@ InitCameraUpdateCallback: @ 808A134
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0808A150:
adds r0, r5, 0
bl AddCameraObject
@@ -1050,14 +1050,14 @@ UpdateCameraPanning: @ 808A314
beq _0808A322
bl _call_via_r0
_0808A322:
ldr r2, =gUnknown_02021BBC
ldr r2, =gSpriteCoordOffsetX
ldr r0, =gUnknown_03005DEC
ldr r1, =gUnknown_03000E28
ldrh r0, [r0]
ldrh r1, [r1]
subs r0, r1
strh r0, [r2]
ldr r2, =gUnknown_02021BBE
ldr r2, =gSpriteCoordOffsetY
ldr r0, =gUnknown_03005DE8
ldr r1, =gUnknown_03000E2A
ldrh r0, [r0]
asm/field_control_avatar.s
+15 -15
View File
@@ -184,7 +184,7 @@ sub_809C014: @ 809C014
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_03005DF0
@@ -228,7 +228,7 @@ _0809C070:
cmp r0, 0
beq _0809C096
movs r0, 0x5
bl sav12_xor_increment
bl IncrementGameStat
bl increment_var_x4026_on_birth_island_modulo_100
mov r0, sp
adds r1, r4, 0
@@ -325,7 +325,7 @@ _0809C13A:
cmp r0, 0
beq _0809C15C
movs r0, 0x6
bl audio_play
bl PlaySE
bl sub_809FA9C
_0809C14E:
movs r0, 0x1
@@ -453,7 +453,7 @@ _0809C214:
cmp r4, r0
beq _0809C244
movs r0, 0x5
bl audio_play
bl PlaySE
_0809C244:
adds r0, r4, 0
bl script_env_1_execute_new_script
@@ -582,13 +582,13 @@ _0809C34C:
ble _0809C340
ldr r0, =gUnknown_03005DF0
strb r3, [r0]
ldr r1, =gUnknown_020375F2
ldr r1, =gScriptLastTalked
adds r0, r2, r3
lsls r0, 2
adds r0, r5
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =gUnknown_020375F4
ldr r0, =gScriptFacing
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
@@ -668,13 +668,13 @@ _0809C400:
_0809C40C:
ldr r0, =gUnknown_03005DF0
strb r4, [r0]
ldr r1, =gUnknown_020375F2
ldr r1, =gScriptLastTalked
adds r0, r2, r4
lsls r0, 2
adds r0, r3
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =gUnknown_020375F4
ldr r0, =gScriptFacing
strh r7, [r0]
bl InTrainerHill
cmp r0, 0x1
@@ -687,7 +687,7 @@ _0809C43C:
bl GetFieldObjectScriptPointerByFieldObjectId
_0809C442:
adds r1, r0, 0
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl sub_8099188
adds r1, r0, 0
@@ -764,13 +764,13 @@ _0809C4DC:
beq _0809C530
b _0809C4CC
_0809C4E2:
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
lsrs r0, r2, 16
movs r3, 0xFA
lsls r3, 1
adds r0, r3
strh r0, [r1]
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
strh r2, [r0]
ldrh r0, [r1]
bl FlagGet
@@ -784,7 +784,7 @@ _0809C4E2:
_0809C510:
cmp r5, 0x2
bne _0809C4CC
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
strh r2, [r0]
bl sub_80E9680
lsls r0, 24
@@ -1395,7 +1395,7 @@ _0809CA48:
cmp r0, 0
beq _0809CA64
movs r0, 0xD
bl sav12_xor_increment
bl IncrementGameStat
ldr r0, =gUnknown_08291FC0
bl script_env_1_execute_new_script
b _0809CB28
@@ -2172,7 +2172,7 @@ _0809D062:
b _0809D084
_0809D07C:
adds r0, r1, 0
bl script_env_2_execute_new_script
bl ScriptContext2_RunNewScript
_0809D082:
movs r0, 0
_0809D084:
@@ -2361,7 +2361,7 @@ _0809D1C8:
bl walkrun_find_lowest_active_bit_in_bitfield
bl sp13E_warp_to_last_warp
movs r0, 0xE9
bl audio_play
bl PlaySE
movs r0, 0x1
b _0809D1E2
_0809D1E0:
asm/field_door.s
+4 -4
View File
@@ -206,10 +206,10 @@ sub_808A568: @ 808A568
lsls r0, 24
cmp r0, 0
beq _0808A5E2
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r1, [r0]
adds r1, 0x7
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r2, [r0]
adds r2, 0x7
adds r0, r4, 0
@@ -229,10 +229,10 @@ _0808A5B0:
lsls r0, 24
cmp r0, 0
beq _0808A5E2
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r1, [r0]
adds r1, 0x7
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r2, [r0]
adds r2, 0x7
ldr r3, [r4, 0x8]
asm/field_effect.s
+138 -138
View File
File diff suppressed because it is too large Load Diff
asm/field_effect_helpers.s
+99 -99
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]
@@ -51,12 +51,12 @@ SetUpReflection: @ 8153ED4
orrs r0, r1
mov r1, r8
strb r0, [r1]
ldr r0, =gDummyObjectImageAnimTable
ldr r0, =gDummySpriteAnimTable
str r0, [r7, 0x8]
adds r0, r7, 0
movs r1, 0
bl StartObjectImageAnim
ldr r0, =gDummyObjectRotScalAnimTable
bl StartSpriteAnim
ldr r0, =gDummySpriteAffineAnimTable
str r0, [r7, 0x10]
mov r1, r8
ldrb r0, [r1]
@@ -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
@@ -435,7 +435,7 @@ sub_8154228: @ 8154228
movs r1, 0
movs r2, 0
movs r3, 0x52
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@@ -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]
@@ -560,7 +560,7 @@ _081542E2:
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0815432E:
add sp, 0x4
pop {r3}
@@ -602,12 +602,12 @@ oei_shadow: @ 8154340
movs r1, 0
movs r2, 0
movs r3, 0x94
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
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
@@ -763,7 +763,7 @@ oei_grass_normal: @ 81544AC
movs r3, 0
ldrsh r2, [r4, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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
@@ -806,7 +806,7 @@ oei_grass_normal: @ 81544AC
beq _08154538
adds r0, r3, 0
movs r1, 0x4
bl SeekObjectImageAnim
bl SeekSpriteAnim
_08154538:
movs r0, 0
add sp, 0x4
@@ -964,7 +964,7 @@ sub_8154658: @ 8154658
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -1101,7 +1101,7 @@ sub_8154758: @ 8154758
movs r3, 0
ldrsh r2, [r4, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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
@@ -1145,7 +1145,7 @@ sub_8154758: @ 8154758
beq _081547E8
adds r0, r4, 0
movs r1, 0x6
bl SeekObjectImageAnim
bl SeekSpriteAnim
_081547E8:
movs r0, 0
add sp, 0x4
@@ -1295,7 +1295,7 @@ sub_81548FC: @ 81548FC
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -1353,7 +1353,7 @@ sub_815496C: @ 815496C
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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]
@@ -1491,7 +1491,7 @@ _08154A98:
beq _08154AB2
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08154AB2:
strh r7, [r4, 0x20]
strh r5, [r4, 0x22]
@@ -1550,7 +1550,7 @@ sub_8154B04: @ 8154B04
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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
@@ -1579,7 +1579,7 @@ sub_8154B04: @ 8154B04
movs r1, 0xD
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
bl StartObjectImageAnim
bl StartSpriteAnim
_08154B62:
movs r0, 0
pop {r4}
@@ -1604,7 +1604,7 @@ sub_8154B78: @ 8154B78
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
adds r5, r1, 0
@@ -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
@@ -1634,7 +1634,7 @@ sub_8154B78: @ 8154B78
movs r1, 0x18
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
bl StartObjectImageAnim
bl StartSpriteAnim
_08154BD8:
adds r0, r5, 0
pop {r4,r5}
@@ -1659,7 +1659,7 @@ sub_8154BEC: @ 8154BEC
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
adds r5, r1, 0
@@ -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
@@ -1689,7 +1689,7 @@ sub_8154BEC: @ 8154BEC
movs r1, 0x23
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
bl StartObjectImageAnim
bl StartSpriteAnim
_08154C4C:
adds r0, r5, 0
pop {r4,r5}
@@ -1794,7 +1794,7 @@ sub_8154CEC: @ 8154CEC
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x40
@@ -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
@@ -1840,7 +1840,7 @@ sub_8154CEC: @ 8154CEC
subs r0, 0x4
strh r0, [r3, 0x26]
movs r0, 0x46
bl audio_play
bl PlaySE
_08154D76:
movs r0, 0
pop {r4-r6}
@@ -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]
@@ -1935,7 +1935,7 @@ sub_8154E1C: @ 8154E1C
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -1989,7 +1989,7 @@ oei_water_drop_tall: @ 8154E8C
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -2047,7 +2047,7 @@ sub_8154EFC: @ 8154EFC
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x40
@@ -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]
@@ -2099,7 +2099,7 @@ sub_8154EFC: @ 8154EFC
subs r1, 0x4
strh r1, [r0, 0x26]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_08154F92:
movs r0, 0
pop {r4-r7}
@@ -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]
@@ -2179,7 +2179,7 @@ _08154FFC:
cmp r0, 0
bne _08155046
movs r0, 0x46
bl audio_play
bl PlaySE
_08155046:
add sp, 0x4
pop {r4,r5}
@@ -2199,7 +2199,7 @@ oei_ripples: @ 8155054
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -2255,7 +2255,7 @@ sub_81550B4: @ 81550B4
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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]
@@ -2406,7 +2406,7 @@ sub_81551F0: @ 81551F0
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -2458,7 +2458,7 @@ sub_815525C: @ 815525C
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -2510,7 +2510,7 @@ sub_81552C8: @ 81552C8
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -2562,7 +2562,7 @@ sub_8155334: @ 8155334
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -2651,7 +2651,7 @@ oei_ash: @ 81553D4
movs r3, 0
ldrsh r2, [r4, r3]
ldrb r3, [r5, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -2822,7 +2822,7 @@ sub_8155534: @ 8155534
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0x96
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
@@ -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
@@ -3025,7 +3025,7 @@ sub_81556B0: @ 81556B0
add r0, sp
ldrb r1, [r0]
adds r0, r4, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_081556DC:
add sp, 0xC
pop {r4,r5}
@@ -3190,17 +3190,17 @@ sub_8155800: @ 8155800
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_082EC6AC
ldr r0, =gDummySpriteTemplate
movs r1, 0
movs r2, 0
movs r3, 0xFF
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
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
@@ -3274,7 +3274,7 @@ sub_8155890: @ 8155890
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -3332,7 +3332,7 @@ sub_8155900: @ 8155900
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x40
@@ -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
@@ -3391,7 +3391,7 @@ sub_8155900: @ 8155900
subs r1, 0x2
strh r1, [r0, 0x26]
movs r1, 0x2
bl SeekObjectImageAnim
bl SeekSpriteAnim
_081559A4:
movs r0, 0
pop {r4-r7}
@@ -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
@@ -3469,11 +3469,11 @@ _08155A2C:
beq _08155A46
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_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]
@@ -3519,7 +3519,7 @@ sub_8155A88: @ 8155A88
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0x52
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -3599,7 +3599,7 @@ sub_8155B2C: @ 8155B2C
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -3711,7 +3711,7 @@ _08155C08:
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
mov r1, sp
strb r0, [r1]
lsls r0, 24
@@ -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
@@ -3854,7 +3854,7 @@ _08155CB8:
strh r0, [r5, 0x2E]
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_08155D38:
movs r3, 0x2E
ldrsh r0, [r5, r3]
@@ -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]
@@ -3970,12 +3970,12 @@ sub_8155DDC: @ 8155DDC
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0x52
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
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_ground_effect.s
+1 -1
View File
@@ -1095,7 +1095,7 @@ SetObjectSubpriorityByZCoord: @ 8096E0C
movs r5, 0
ldrsb r5, [r3, r5]
ldrh r4, [r1, 0x22]
ldr r3, =gUnknown_02021BBE
ldr r3, =gSpriteCoordOffsetY
subs r4, r5
ldrh r3, [r3]
adds r4, r3
asm/field_map_obj.s
+68 -68
View File
@@ -70,10 +70,10 @@ sub_808D450: @ 808D450
movs r1, 0
movs r2, 0
movs r3, 0x1F
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
mov r10, r1
lsls r4, r0, 4
adds r4, r0
@@ -90,10 +90,10 @@ sub_808D450: @ 808D450
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r4, 0
bl obj_alloc_rotscale_entry
bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r4, 0x3E
ldrb r0, [r4]
movs r6, 0x4
@@ -103,7 +103,7 @@ sub_808D450: @ 808D450
movs r1, 0
movs r2, 0
movs r3, 0x1F
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -116,10 +116,10 @@ sub_808D450: @ 808D450
orrs r5, r0
strb r5, [r4, 0x1]
adds r0, r4, 0
bl obj_alloc_rotscale_entry
bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r4, 0x3E
ldrb r0, [r4]
orrs r0, r6
@@ -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
@@ -740,7 +740,7 @@ RemoveFieldObjectInternal: @ 808D90C
adds r0, r1
lsls r0, 2
adds r0, r2
bl RemoveObjectAndFreeTiles
bl DestroySprite
add sp, 0x8
pop {r4}
pop {r0}
@@ -861,7 +861,7 @@ _0808DA24:
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -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
@@ -966,7 +966,7 @@ _0808DA64:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808DB16:
ldrb r0, [r6, 0xB]
lsrs r0, 4
@@ -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
@@ -1074,7 +1074,7 @@ _0808DBBC:
lsls r0, 2
adds r0, r4
adds r1, r2, 0
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
_0808DBF0:
adds r0, r5, 0
_0808DBF2:
@@ -1324,7 +1324,7 @@ _0808DDAE:
asrs r2, 16
adds r0, r6, 0
mov r3, r9
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
adds r0, r6, 0
@@ -1337,10 +1337,10 @@ _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
bl SetSubspriteTables
adds r4, 0x42
ldrb r1, [r4]
movs r0, 0x3F
@@ -1420,7 +1420,7 @@ sprite_new: @ 808DE0C
ldrsh r2, [r6, r0]
mov r0, sp
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -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
@@ -1502,7 +1502,7 @@ _0808DF2C:
cmp r1, 0
beq _0808DF48
adds r0, r5, 0
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
adds r2, r5, 0
adds r2, 0x42
ldrb r0, [r2]
@@ -1525,7 +1525,7 @@ _0808DF48:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808DF6C:
adds r0, r6, 0
add sp, 0x20
@@ -1935,7 +1935,7 @@ _0808E27E:
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0x40
@@ -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
@@ -2002,7 +2002,7 @@ _0808E312:
cmp r1, 0
beq _0808E31E
adds r0, r4, 0
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
_0808E31E:
mov r0, r8
lsls r2, r0, 4
@@ -2035,7 +2035,7 @@ _0808E31E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808E362:
adds r0, r6, 0
bl sub_808E38C
@@ -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
@@ -2308,14 +2308,14 @@ FieldObjectTurn: @ 808E544
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r6, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
_0808E58A:
pop {r4-r6}
pop {r0}
@@ -2444,7 +2444,7 @@ _0808E648:
strb r0, [r7, 0x5]
adds r0, r7, 0
adds r1, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808E680:
pop {r4-r7}
pop {r0}
@@ -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]
@@ -2723,8 +2723,8 @@ _0808E870:
thumb_func_start gpu_pal_allocator_reset__manage_upper_four
gpu_pal_allocator_reset__manage_upper_four: @ 808E880
push {lr}
bl ResetObjectPaletteAllocator
ldr r1, =gUnknown_0300301C
bl FreeAllSpritePalettes
ldr r1, =gReservedSpritePaletteCount
movs r0, 0xC
strb r0, [r1]
pop {r0}
@@ -2789,13 +2789,13 @@ sub_808E8F4: @ 808E8F4
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x4]
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _0808E912
adds r0, r4, 0
bl LoadTaggedObjectPalette
bl LoadSpritePalette
lsls r0, 24
lsrs r0, 24
b _0808E914
@@ -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
@@ -3380,10 +3380,10 @@ AddCameraObject: @ 808ED34
movs r1, 0
movs r2, 0
movs r3, 0x4
bl AddObjectToFront
bl CreateSprite
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:
@@ -4226,7 +4226,7 @@ npc_paltag_set_load: @ 808F2F8
movs r1, 0
movs r2, 0x6
bl pal_patch_for_npc_range
ldr r1, =gUnknown_0300301C
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
b _0808F356
@@ -11744,7 +11744,7 @@ _08092AA8:
_08092AAA:
ldrb r1, [r1]
adds r0, r4, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
_08092AB2:
pop {r4}
pop {r0}
@@ -11780,7 +11780,7 @@ obj_npc_animation_step: @ 8092AB8
ldrb r1, [r2, 0x4]
_08092AEA:
adds r0, r4, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
_08092AF0:
pop {r4}
pop {r0}
@@ -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
@@ -16779,7 +16779,7 @@ sub_8094DE4: @ 8094DE4
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -18054,7 +18054,7 @@ sub_80956C4: @ 80956C4
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r4, 0
bl obj_alloc_rotscale_entry
bl InitSpriteAffineAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r0, [r2]
@@ -18079,7 +18079,7 @@ sub_80956F4: @ 80956F4
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
bl rotscale_free_entry
bl FreeOamMatrix
ldrb r0, [r4, 0x1]
movs r1, 0x4
negs r1, r1
@@ -18090,7 +18090,7 @@ sub_80956F4: @ 80956F4
lsrs r2, 6
movs r3, 0
adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
movs r0, 0x1
pop {r4}
pop {r1}
@@ -18133,7 +18133,7 @@ sub_8095740: @ 8095740
strb r0, [r2]
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnimIfDifferent
bl StartSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_8095774
@@ -18185,7 +18185,7 @@ sub_80957A0: @ 80957A0
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
bl sub_80082F0
bl ChangeSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_80957D4
@@ -18238,7 +18238,7 @@ sub_8095800: @ 8095800
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x2
bl sub_80082F0
bl ChangeSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_8095834
@@ -18291,7 +18291,7 @@ sub_8095860: @ 8095860
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x3
bl sub_80082F0
bl ChangeSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_8095894
@@ -18751,7 +18751,7 @@ sub_8095B84: @ 8095B84
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
adds r0, r6, 0
bl DoShadowFieldEffect
add sp, 0x4
@@ -19478,10 +19478,10 @@ sub_80960C8: @ 80960C8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -19834,10 +19834,10 @@ sub_8096330: @ 8096330
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -20153,7 +20153,7 @@ sub_8096530: @ 8096530
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
ldr r2, =gUnknown_02021BBC
ldr r2, =gSpriteCoordOffsetX
adds r0, r1
ldrh r2, [r2]
adds r0, r2
@@ -20167,7 +20167,7 @@ sub_8096530: @ 8096530
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
ldr r2, =gUnknown_02021BBE
ldr r2, =gSpriteCoordOffsetY
adds r0, r1
ldrh r2, [r2]
adds r0, r2
asm/field_player_avatar.s
+37 -37
View File
@@ -993,7 +993,7 @@ _0808B0E4:
cmp r0, 0
beq _0808B108
movs r0, 0x2B
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x6
b _0808B152
_0808B108:
@@ -1987,7 +1987,7 @@ PlayerJumpLedge: @ 808B840
lsls r4, 24
lsrs r4, 24
movs r0, 0xA
bl audio_play
bl PlaySE
adds r0, r4, 0
bl GetJumpLedgeAnimId
lsls r0, 24
@@ -2082,7 +2082,7 @@ sub_808B8F0: @ 808B8F0
lsls r4, 24
lsrs r4, 24
movs r0, 0x22
bl audio_play
bl PlaySE
adds r0, r4, 0
bl sub_80936CC
lsls r0, 24
@@ -2101,7 +2101,7 @@ sub_808B914: @ 808B914
lsls r4, 24
lsrs r4, 24
movs r0, 0x22
bl audio_play
bl PlaySE
adds r0, r4, 0
bl sub_80936F8
lsls r0, 24
@@ -2120,7 +2120,7 @@ sub_808B938: @ 808B938
lsls r4, 24
lsrs r4, 24
movs r0, 0x22
bl audio_play
bl PlaySE
adds r0, r4, 0
bl sub_8093724
lsls r0, 24
@@ -2139,7 +2139,7 @@ sub_808B95C: @ 808B95C
lsls r4, 24
lsrs r4, 24
movs r0, 0x22
bl audio_play
bl PlaySE
adds r0, r4, 0
bl sub_80934E8
lsls r0, 24
@@ -2158,7 +2158,7 @@ sub_808B980: @ 808B980
lsls r4, 24
lsrs r4, 24
movs r0, 0x7
bl audio_play
bl PlaySE
adds r0, r4, 0
bl sub_8093750
lsls r0, 24
@@ -2261,7 +2261,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
bne _0808BA54
_0808BA4E:
movs r0, 0x7
bl audio_play
bl PlaySE
_0808BA54:
add sp, 0x4
pop {r4}
@@ -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,10 +3165,10 @@ 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
bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -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
@@ -3207,7 +3207,7 @@ sub_808C15C: @ 808C15C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4-r6}
pop {r0}
bx r0
@@ -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
@@ -3249,14 +3249,14 @@ sub_808C1B4: @ 808C1B4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r6, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
add r0, r8
movs r1, 0x1
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -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
@@ -3297,7 +3297,7 @@ sub_808C228: @ 808C228
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4-r6}
pop {r0}
bx r0
@@ -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
@@ -3540,7 +3540,7 @@ _0808C3F0:
movs r0, 0xA
bl FieldEffectStart
movs r0, 0xD6
bl audio_play
bl PlaySE
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -3653,7 +3653,7 @@ sub_808C544: @ 808C544
cmp r0, 0
beq _0808C5A0
movs r0, 0xA
bl audio_play
bl PlaySE
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -3754,7 +3754,7 @@ sub_808C61C: @ 808C61C
strb r0, [r1, 0x6]
bl script_env_2_enable
movs r0, 0x2D
bl audio_play
bl PlaySE
movs r0, 0x1
pop {r1}
bx r1
@@ -4013,9 +4013,9 @@ 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
bl DestroySprite
adds r0, r5, 0
bl DestroyTask
_0808C87A:
@@ -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
@@ -4381,7 +4381,7 @@ _0808CB32:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808CB5C:
movs r0, 0x1
pop {r4-r6}
@@ -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
@@ -4679,7 +4679,7 @@ fishB: @ 808CD94
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -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
@@ -4727,7 +4727,7 @@ fishC: @ 808CE04
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -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,10 +4884,10 @@ 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
bl AnimateSprite
movs r0, 0
strh r0, [r4, 0x24]
strh r0, [r4, 0x26]
@@ -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
+5 -5
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
@@ -203,12 +203,12 @@ _080F96C0:
cmp r0, 0
beq _080F96F0
_080F96E6:
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
strh r5, [r0]
b _080F9718
.pool
_080F96F0:
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x1
strh r0, [r1]
b _080F9718
@@ -224,7 +224,7 @@ _080F96FC:
b _080F9722
.pool
_080F9714:
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
strh r1, [r0]
_080F9718:
bl script_env_2_enable_and_set_ctx_running
@@ -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/field_region_map.s
+6 -6
View File
@@ -59,8 +59,8 @@ sub_81701C4: @ 81701C4
movs r0, 0x1E
movs r1, 0
bl SetGpuReg
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085E5068
@@ -87,8 +87,8 @@ sub_81701C4: @ 81701C4
thumb_func_start sub_8170260
sub_8170260: @ 8170260
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -98,8 +98,8 @@ sub_8170260: @ 8170260
sub_8170274: @ 8170274
push {lr}
bl sub_8170290
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
asm/field_tasks.s
+5 -5
View File
@@ -697,7 +697,7 @@ _0809DDAE:
cmp r0, 0
beq _0809DE1E
movs r0, 0x46
bl audio_play
bl PlaySE
b _0809DE1E
_0809DDDC:
ldrh r0, [r4, 0xC]
@@ -973,7 +973,7 @@ _0809DFF4:
bne _0809E008
_0809E002:
movs r0, 0x47
bl audio_play
bl PlaySE
_0809E008:
cmp r7, 0
beq _0809E044
@@ -1373,7 +1373,7 @@ _0809E306:
ldrh r0, [r5, 0xA]
strh r0, [r4]
movs r0, 0x2A
bl audio_play
bl PlaySE
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -1418,7 +1418,7 @@ _0809E370:
ldrh r0, [r5, 0xA]
strh r0, [r4]
movs r0, 0x29
bl audio_play
bl PlaySE
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -1521,7 +1521,7 @@ _0809E456:
movs r0, 0x87
lsls r0, 1
movs r1, 0x1
bl sub_80D6724
bl CheckBagHasItem
lsls r0, 24
cmp r0, 0
beq _0809E47A
asm/fldeff_80F9BCC.s
+48 -48
View File
@@ -563,7 +563,7 @@ _080F9FFE:
sub_80FA004: @ 80FA004
push {r4,lr}
bl sub_80E8BC8
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
ldrh r0, [r0]
cmp r0, 0x1
beq _080FA0AE
@@ -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
@@ -712,7 +712,7 @@ sub_80FA13C: @ 80FA13C
lsls r2, 16
asrs r2, 16
movs r3, 0x94
bl AddObjectToFront
bl CreateSprite
movs r0, 0
pop {r4}
pop {r1}
@@ -725,7 +725,7 @@ sub_80FA18C: @ 80FA18C
push {r4,lr}
adds r4, r0, 0
movs r0, 0x83
bl audio_play
bl PlaySE
movs r0, 0
strh r0, [r4, 0x2E]
ldr r0, =sub_80FA1A8
@@ -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
@@ -869,7 +869,7 @@ _080FA274:
lsls r2, 16
asrs r2, 16
movs r3, 0x94
bl AddObjectToFront
bl CreateSprite
ldr r0, [r4, 0x1C]
cmp r0, 0x1
beq _080FA2B2
@@ -890,7 +890,7 @@ sub_80FA2D8: @ 80FA2D8
push {r4,lr}
adds r4, r0, 0
movs r0, 0x9B
bl audio_play
bl PlaySE
ldr r0, =gUnknown_02038C08
ldr r1, [r0, 0x1C]
adds r2, r4, 0
@@ -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
@@ -1020,7 +1020,7 @@ sub_80FA3AC: @ 80FA3AC
lsls r2, 16
asrs r2, 16
movs r3, 0x94
bl AddObjectToFront
bl CreateSprite
movs r0, 0
pop {r4}
pop {r1}
@@ -1033,7 +1033,7 @@ sub_80FA3FC: @ 80FA3FC
push {r4,lr}
adds r4, r0, 0
movs r0, 0xA9
bl audio_play
bl PlaySE
movs r0, 0
strh r0, [r4, 0x2E]
ldr r0, =sub_80FA418
@@ -1219,7 +1219,7 @@ sub_80FA57C: @ 80FA57C
adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
movs r0, 0x3
bl audio_play
bl PlaySE
ldr r0, =0x00004054
bl VarGet
lsls r0, 16
@@ -1385,19 +1385,19 @@ _080FA6C8:
b _080FA6F6
_080FA6D8:
movs r0, 0x4A
bl audio_play
bl PlaySE
b _080FA6F6
_080FA6E0:
movs r0, 0x4B
bl audio_play
bl PlaySE
b _080FA6F6
_080FA6E8:
movs r0, 0x4C
bl audio_play
bl PlaySE
b _080FA6F6
_080FA6F0:
movs r0, 0x4E
bl audio_play
bl PlaySE
_080FA6F6:
pop {r0}
bx r0
@@ -1425,7 +1425,7 @@ sub_80FA704: @ 80FA704
lsls r4, 16
lsrs r4, 16
movs r0, 0x4D
bl audio_play
bl PlaySE
lsls r5, 16
asrs r5, 16
lsls r4, 16
@@ -1625,35 +1625,35 @@ _080FA830:
.4byte _080FA958
_080FA920:
movs r0, 0x3E
bl audio_play
bl PlaySE
b _080FA95E
_080FA928:
movs r0, 0x3F
bl audio_play
bl PlaySE
b _080FA95E
_080FA930:
movs r0, 0x40
bl audio_play
bl PlaySE
b _080FA95E
_080FA938:
movs r0, 0x41
bl audio_play
bl PlaySE
b _080FA95E
_080FA940:
movs r0, 0x42
bl audio_play
bl PlaySE
b _080FA95E
_080FA948:
movs r0, 0x43
bl audio_play
bl PlaySE
b _080FA95E
_080FA950:
movs r0, 0x44
bl audio_play
bl PlaySE
b _080FA95E
_080FA958:
movs r0, 0x45
bl audio_play
bl PlaySE
_080FA95E:
adds r0, r4, 0
bl DestroyTask
@@ -1704,14 +1704,14 @@ sub_80FA9A4: @ 80FA9A4
cmp r0, 0x8
bne _080FA9BC
movs r0, 0xC3
bl audio_play
bl PlaySE
_080FA9BC:
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0x1F
ble _080FA9CA
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_080FA9CA:
pop {r4}
pop {r0}
@@ -1754,12 +1754,12 @@ sub_80FA9D0: @ 80FA9D0
movs r3, 0
ldrsh r2, [r4, r3]
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
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
@@ -1851,12 +1851,12 @@ _080FAAC6:
ldrb r2, [r2]
adds r2, 0x20
movs r3, 0
bl AddObjectToFront
bl CreateSprite
b _080FAB8C
.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
@@ -1892,12 +1892,12 @@ _080FAB2C:
adds r2, 0x10
_080FAB4C:
movs r3, 0x94
bl AddObjectToFront
bl CreateSprite
b _080FAB8C
.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
@@ -1914,7 +1914,7 @@ _080FAB64:
ldrb r2, [r2]
adds r2, 0x10
movs r3, 0x94
bl AddObjectToFront
bl CreateSprite
_080FAB8C:
movs r0, 0
add sp, 0x4
@@ -1929,7 +1929,7 @@ door_restore_tilemap: @ 80FABA4
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0x83
bl audio_play
bl PlaySE
ldr r4, =gUnknown_02038C08
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
@@ -2063,7 +2063,7 @@ _080FACC2:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA88B
bl StringCopy
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2087,7 +2087,7 @@ _080FAD14:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA890
bl StringCopy
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2103,12 +2103,12 @@ _080FAD14:
b _080FAD8A
.pool
_080FAD60:
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x1
b _080FAD70
.pool
_080FAD6C:
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x2
_080FAD70:
strh r0, [r1]
@@ -2131,7 +2131,7 @@ _080FAD8A:
b _080FADCE
.pool
_080FADA4:
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x3
strh r0, [r1]
ldr r0, =0x00004054
@@ -2266,7 +2266,7 @@ _080FAEA2:
overworld_posion_effect: @ 80FAEA8
push {lr}
movs r0, 0x4F
bl audio_play
bl PlaySE
ldr r0, =task50_overworld_posion_effect
movs r1, 0x50
bl CreateTask
@@ -2435,12 +2435,12 @@ sub_80FAFF8: @ 80FAFF8
sub_80FB00C: @ 80FB00C
push {r4,r5,lr}
ldr r0, =gUnknown_0858E864
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r0, =gUnknown_0858E880
movs r1, 0
movs r2, 0
movs r3, 0x52
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x40
@@ -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
@@ -2496,9 +2496,9 @@ _080FB07E:
cmp r1, r0
bne _080FB098
adds r0, r4, 0
bl FreeObjectPalette
bl FreeSpritePalette
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_080FB098:
adds r4, 0x44
adds r6, 0x44
asm/fldeff_emotion.s
+8 -8
View File
@@ -12,7 +12,7 @@ oei_exclamation_mark: @ 80B4620
movs r1, 0
movs r2, 0
movs r3, 0x53
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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
@@ -39,7 +39,7 @@ sub_80B4658: @ 80B4658
movs r1, 0
movs r2, 0
movs r3, 0x52
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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
@@ -66,7 +66,7 @@ sub_80B4690: @ 80B4690
movs r1, 0
movs r2, 0
movs r3, 0x52
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -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
@@ -126,7 +126,7 @@ sub_80B46D8: @ 80B46D8
strh r3, [r0, 0x34]
strh r1, [r0, 0x3C]
adds r1, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4}
pop {r0}
bx r0
@@ -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/fldeff_strength.s
+1 -1
View File
@@ -17,7 +17,7 @@ hm_prepare_rocksmash: @ 8145DC4
movs r0, 0
b _08145DF2
_08145DD8:
ldr r4, =gUnknown_020375F0
ldr r4, =gScriptResult
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
asm/front_pic_anim.s
+10 -10
View File
@@ -26,7 +26,7 @@ sub_817F498: @ 817F498
movs r0, 0x8
ldrsh r4, [r2, r0]
mov r8, r1
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
mov r12, r0
cmp r4, 0
bne _0817F508
@@ -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]
@@ -213,7 +213,7 @@ sub_817F618: @ 817F618
movs r2, 0x1
movs r3, 0x2
bl ObjAffineSet
ldr r0, =gUnknown_02021BC0
ldr r0, =gOamMatrices
lsls r4, 3
adds r4, r0
ldrh r0, [r5]
@@ -246,7 +246,7 @@ sub_817F670: @ 817F670
cmp r0, 0x1
bne _0817F68E
adds r0, r4, 0
bl obj_alloc_rotscale_entry
bl InitSpriteAffineAnim
_0817F68E:
movs r1, 0x30
ldrsh r0, [r4, r1]
@@ -254,13 +254,13 @@ _0817F68E:
bne _0817F6A8
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0817F6B0
.pool
_0817F6A8:
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0817F6B0:
ldrb r3, [r4, 0x1]
lsrs r1, r3, 6
@@ -269,7 +269,7 @@ _0817F6B0:
lsls r3, 30
lsrs r3, 30
adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
adds r2, r4, 0
adds r2, 0x2C
ldrb r0, [r2]
@@ -396,7 +396,7 @@ sub_817F77C: @ 817F77C
lsls r3, 30
lsrs r3, 30
adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
ldr r0, =gUnknown_03001274
ldr r0, [r0]
cmp r0, 0x1
@@ -426,7 +426,7 @@ _0817F7D0:
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
bl rotscale_free_entry
bl FreeOamMatrix
ldrb r2, [r4, 0x3]
lsls r1, r2, 26
lsrs r1, 27
@@ -11677,7 +11677,7 @@ sub_8184D88: @ 8184D88
ands r0, r1
cmp r0, 0
beq _08184D9C
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_08184D9C:
pop {r0}
asm/hall_of_fame.s
+49 -49
View File
@@ -8,8 +8,8 @@
thumb_func_start sub_817354C
sub_817354C: @ 817354C
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -20,8 +20,8 @@ sub_8173560: @ 8173560
push {lr}
bl RunTasks
bl RunTextPrinters
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -127,7 +127,7 @@ _0817365C:
bl SetMainCallback2
movs r0, 0xDA
lsls r0, 1
bl song_play_for_text
bl PlayBGM
movs r0, 0
b _0817368A
.pool
@@ -519,16 +519,16 @@ sub_81739C4: @ 81739C4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gUnknown_03006214
ldr r1, =gGameContinueCallback
ldr r0, =sub_81736D8
str r0, [r1]
movs r0, 0x3
bl save_game_when_memory_present
bl TrySavingData
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _08173A34
ldr r0, =gUnknown_030061FC
ldr r0, =gDamagedSaveSectors
ldr r0, [r0]
cmp r0, 0
beq _08173A34
@@ -559,7 +559,7 @@ _08173A16:
.pool
_08173A34:
movs r0, 0x37
bl audio_play
bl PlaySE
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -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,10 +772,10 @@ 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
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08173C1A
ldrb r1, [r3, 0x1]
@@ -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:
@@ -961,7 +961,7 @@ _08173D74:
movs r1, 0xF
bl sub_8174A38
movs r0, 0x69
bl audio_play
bl PlaySE
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r4
@@ -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
@@ -1272,7 +1272,7 @@ sub_8174028: @ 8174028
cmp r0, 0
beq _0817404E
movs r0, 0x4
bl play_sound_effect
bl FadeOutBGM
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
@@ -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:
@@ -1356,7 +1356,7 @@ _081740DC:
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
bl rotscale_free_entry
bl FreeOamMatrix
adds r0, r4, 0
bl sub_818D820
_081740FA:
@@ -1513,8 +1513,8 @@ _08174240:
.pool
_08174280:
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
bl sub_80F9C1C
lsls r0, 24
@@ -1651,7 +1651,7 @@ _081743BC:
_081743C6:
strh r0, [r1, 0x8]
movs r0, 0xA
bl sub_80847F8
bl GetGameStat
ldr r2, =gTasks
adds r1, r5, r6
lsls r1, 3
@@ -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
@@ -2015,12 +2015,12 @@ _0817466C:
lsls r1, 1
cmp r0, r1
beq _081746E6
bl sub_80A369C
bl StopCryAndClearCrySongs
ldrh r0, [r4, 0x8]
lsls r0, 23
lsrs r0, 23
movs r1, 0
bl cry_related
bl PlayCry1
_081746E6:
adds r0, r4, 0
movs r1, 0
@@ -2109,11 +2109,11 @@ _081747A4:
b _08174884
.pool
_081747B8:
bl sub_80A36C8
bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _081747D2
bl sub_80A369C
bl StopCryAndClearCrySongs
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
@@ -2129,11 +2129,11 @@ _081747E4:
ands r0, r2
cmp r0, 0
beq _08174828
bl sub_80A36C8
bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _08174806
bl sub_80A369C
bl StopCryAndClearCrySongs
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
@@ -2977,11 +2977,11 @@ sub_8174F70: @ 8174F70
push {lr}
bl remove_some_task
bl ResetTasks
bl ResetAllObjectData
bl ResetSpriteData
bl reset_temp_tile_data_buffers
bl dp13_810BB8C
bl ResetObjectPaletteAllocator
ldr r1, =gUnknown_0300301C
bl FreeAllSpritePalettes
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_085E5394
@@ -3238,7 +3238,7 @@ sub_81751A4: @ 81751A4
cmp r0, 0x78
ble _081751BA
adds r0, r5, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _081751F2
_081751BA:
adds r0, r1, 0x1
@@ -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
@@ -3301,13 +3301,13 @@ sub_81751FC: @ 81751FC
asrs r2, 16
adds r1, r4, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
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
@@ -3318,7 +3318,7 @@ sub_81751FC: @ 81751FC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
bl Random
movs r1, 0x3
ands r1, r0
@@ -3340,7 +3340,7 @@ _08175276:
thumb_func_start sub_8175280
sub_8175280: @ 8175280
push {r4,lr}
ldr r4, =gUnknown_020375E0
ldr r4, =gSpecialVar_0x8004
movs r0, 0xB4
strh r0, [r4]
ldr r0, =sub_8175364
@@ -3357,7 +3357,7 @@ sub_8175280: @ 8175280
adds r0, r1
ldrh r1, [r4]
strh r1, [r0, 0xA]
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
strh r2, [r0]
_081752AA:
pop {r4}
@@ -3380,9 +3380,9 @@ _081752D4:
bl sub_8152254
ldr r4, =0x000003e9
adds r0, r4, 0
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
pop {r4}
pop {r0}
bx r0
@@ -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
@@ -3483,9 +3483,9 @@ _0817539C:
bne _081753B8
adds r0, r4, 0
bl DestroyTask
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
strh r7, [r0]
ldr r1, =gUnknown_020375E2
ldr r1, =gSpecialVar_0x8005
ldr r2, =0x0000ffff
adds r0, r2, 0
strh r0, [r1]
@@ -3584,9 +3584,9 @@ _08175494:
b _081754B0
_081754A0:
bl sub_81752C0
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
strh r7, [r0]
ldr r1, =gUnknown_020375E2
ldr r1, =gSpecialVar_0x8005
ldr r2, =0x0000ffff
adds r0, r2, 0
strh r0, [r1]
asm/intro.s
+125 -125
View File
@@ -8,8 +8,8 @@
thumb_func_start sub_816CBE8
sub_816CBE8: @ 816CBE8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@@ -20,8 +20,8 @@ sub_816CBE8: @ 816CBE8
sub_816CC00: @ 816CC00
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
ldr r0, =gMain
ldrh r0, [r0, 0x2E]
@@ -186,8 +186,8 @@ _0816CCF4:
bl load_copyright_graphics
bl remove_some_task
bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0x1
negs r0, r0
ldr r1, =0x0000ffff
@@ -309,17 +309,17 @@ c2_copyright_1: @ 816CEAC
lsrs r0, 16
bl InitSaveBlockPointersWithRandomOffset
bl sub_808447C
bl sub_8152680
bl ResetSaveCounters
movs r0, 0
bl sub_81534D0
ldr r0, =gUnknown_03006210
ldr r0, =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _0816CEDE
cmp r0, 0x2
bne _0816CEE2
_0816CEDE:
bl init_sav2
bl Sav2_ClearSetDefault
_0816CEE2:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -447,11 +447,11 @@ task_intro_1: @ 816CF18
ldr r0, =gUnknown_085E4FEC
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085E4FFC
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
ldr r0, =gUnknown_085E4A74
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085E4A84
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
ldr r4, =gPlttBufferUnfaded + 0x200
movs r3, 0xF0
lsls r3, 1
@@ -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
@@ -744,7 +744,7 @@ _0816D2D8:
lsls r2, 16
asrs r2, 16
movs r3, 0
bl AddObjectToFront
bl CreateSprite
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -789,7 +789,7 @@ sub_816D338: @ 816D338
cmp r0, 0xC
bne _0816D350
adds r0, r1, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0816D350:
pop {r0}
bx r0
@@ -860,10 +860,10 @@ task_intro_4: @ 816D354
movs r1, 0x78
movs r2, 0xA0
movs r3, 0xA
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -934,8 +934,8 @@ task_intro_6: @ 816D48C
bl intro_reset_and_hide_bgs
movs r0, 0
bl SetVBlankCallback
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
ldr r0, =gUnknown_0203BD24
movs r1, 0
strh r1, [r0]
@@ -993,22 +993,22 @@ _0816D51C:
cmp r6, 0x2
bls _0816D51C
ldr r0, =gUnknown_085F530C
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
ldr r0, =gUnknown_085E4B08
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
ldr r0, =gUnknown_085E4BDC
movs r5, 0x88
lsls r5, 1
adds r1, r5, 0
movs r2, 0x80
movs r3, 0
bl AddObjectToFront
bl CreateSprite
ldr r0, =gUnknown_085E4BA4
movs r1, 0x90
lsls r1, 1
movs r2, 0x6E
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
ldr r0, =gUnknown_0203BCC8
ldrh r0, [r0]
cmp r0, 0
@@ -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
@@ -1048,7 +1048,7 @@ _0816D598:
lsls r1, 1
movs r2, 0x50
movs r3, 0x4
bl AddObjectToFront
bl CreateSprite
movs r0, 0x40
negs r0, r0
movs r1, 0x3C
@@ -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
@@ -1493,7 +1493,7 @@ _0816D96E:
cmp r1, r0
bge _0816D9BA
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _0816D9BA
_0816D99C:
ldrh r0, [r4, 0x34]
@@ -1585,7 +1585,7 @@ _0816DA20:
_0816DA50:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -1645,7 +1645,7 @@ _0816DABA:
adds r0, r4, 0
movs r1, 0x1
_0816DABE:
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -1726,7 +1726,7 @@ _0816DB42:
cmp r0, r1
bgt _0816DB60
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _0816DBA4
.pool
_0816DB60:
@@ -1806,8 +1806,8 @@ task_intro_10: @ 816DBAC
movs r2, 0
movs r3, 0
bl sub_816F2A8
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0x1
negs r0, r0
ldr r1, =0x0000ffff
@@ -1940,9 +1940,9 @@ task_intro_13: @ 816DD28
cmp r0, 0
bne _0816DD94
bl intro_reset_and_hide_bgs
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r1, =gUnknown_0300301C
bl ResetSpriteData
bl FreeAllSpritePalettes
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_08D88494
@@ -2325,7 +2325,7 @@ _0816E09A:
movs r1, 0
movs r2, 0x64
movs r3, 0xA
bl sub_80A344C
bl PlayCryInternal
b _0816E14E
.pool
_0816E0C8:
@@ -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
@@ -2437,7 +2437,7 @@ _0816E19C:
lsrs r3, 24
ldr r0, =gUnknown_08596C10
movs r2, 0xA0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -2459,7 +2459,7 @@ _0816E19C:
strh r7, [r2, 0x36]
ldrb r1, [r5, 0x2]
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x6
adds r4, 0x1
cmp r4, 0x5
@@ -2570,7 +2570,7 @@ task_intro_19: @ 816E2A0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl ResetAllObjectData
bl ResetSpriteData
ldr r0, =gUnknown_08D89224
movs r1, 0xC0
lsls r1, 19
@@ -2584,7 +2584,7 @@ task_intro_19: @ 816E2A0
ldr r0, =gUnknown_085E4C88
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085E4C98
bl LoadTaggedObjectPalette
bl LoadSpritePalette
movs r0, 0x2
negs r0, r0
ldr r1, =0x0000ffff
@@ -2857,7 +2857,7 @@ _0816E528:
movs r1, 0
movs r2, 0x78
movs r3, 0xA
bl sub_80A344C
bl PlayCryInternal
b _0816E6BC
_0816E544:
ldrh r0, [r5, 0xC]
@@ -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
@@ -3074,7 +3074,7 @@ _0816E6EE:
lsls r3, r5, 24
lsrs r3, 24
ldr r0, =gUnknown_085E4D14
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -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
@@ -3128,7 +3128,7 @@ _0816E75E:
lsls r3, r5, 24
lsrs r3, 24
ldr r0, =gUnknown_085E4D14
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -3200,7 +3200,7 @@ _0816E7C6:
cmp r0, 0
beq _0816E82A
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _0816E82A
_0816E80A:
subs r0, r1, 0x1
@@ -3210,7 +3210,7 @@ _0816E80A:
bne _0816E82A
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x3E
ldrb r1, [r2]
@@ -3265,7 +3265,7 @@ _0816E86E:
cmp r0, 0x8C
bls _0816E882
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0816E882:
pop {r4}
pop {r0}
@@ -3541,7 +3541,7 @@ task_intro_25: @ 816EAB8
ldr r0, =gUnknown_085E4BF4
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_085E4C04
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
pop {r4}
pop {r0}
bx r0
@@ -3584,26 +3584,26 @@ _0816EB72:
movs r1, 0xC8
movs r2, 0x30
movs r3, 0
bl AddObjectToFront
bl CreateSprite
adds r0, r4, 0
movs r1, 0xC8
movs r2, 0x50
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
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
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0xC8
movs r2, 0x70
movs r3, 0x2
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 4
@@ -3611,7 +3611,7 @@ _0816EB72:
lsls r0, 2
adds r0, r5
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r6]
adds r0, 0x1
strh r0, [r6]
@@ -3631,26 +3631,26 @@ _0816EBE0:
movs r1, 0x28
movs r2, 0x30
movs r3, 0
bl AddObjectToFront
bl CreateSprite
adds r0, r4, 0
movs r1, 0x28
movs r2, 0x50
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
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
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0x28
movs r2, 0x70
movs r3, 0x2
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 4
@@ -3658,7 +3658,7 @@ _0816EBE0:
lsls r0, 2
adds r0, r5
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r6]
adds r0, 0x1
strh r0, [r6]
@@ -3771,7 +3771,7 @@ _0816ECDC:
cmp r0, r1
bne _0816ED12
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0816ED12:
pop {r4}
pop {r0}
@@ -3789,7 +3789,7 @@ task_intro_27: @ 816ED20
ldr r0, =gUnknown_085E5048
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085E5058
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
movs r1, 0xD5
lsls r1, 6
movs r0, 0
@@ -4099,13 +4099,13 @@ _0816EFB6:
movs r1, 0x78
movs r2, 0x58
movs r3, 0xF
bl AddObjectToFront
bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x67
bl audio_play
ldr r1, =gUnknown_02020630
bl PlaySE
ldr r1, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -4519,7 +4519,7 @@ _0816F336:
str r1, [sp]
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
movs r0, 0x32
ldrsh r1, [r4, r0]
lsls r0, r1, 1
@@ -4554,7 +4554,7 @@ _0816F386:
b _0816F39A
_0816F394:
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0816F39A:
add sp, 0x4
pop {r4}
@@ -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
@@ -4593,7 +4593,7 @@ sub_816F3A4: @ 816F3A4
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x80
lsls r0, 3
strh r0, [r4, 0x32]
@@ -4618,7 +4618,7 @@ sub_816F3A4: @ 816F3A4
movs r1, 0x1
movs r2, 0x3
movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
b _0816F44C
.pool
_0816F420:
@@ -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
@@ -4795,7 +4795,7 @@ _0816F550:
adds r1, r4, 0
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
ldrh r0, [r7, 0x30]
adds r0, 0x1
lsls r0, 24
@@ -4808,7 +4808,7 @@ _0816F550:
str r6, [sp]
mov r1, r8
mov r2, r9
bl SetSpriteTransformationMatrix
bl SetOamMatrix
ldrh r0, [r7, 0x30]
adds r0, 0x2
lsls r0, 24
@@ -4821,7 +4821,7 @@ _0816F550:
mov r1, r8
mov r2, r9
adds r3, r5, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
_0816F59E:
add sp, 0x4
pop {r3-r5}
@@ -4849,7 +4849,7 @@ sub_816F5B4: @ 816F5B4
str r1, [sp]
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
ldrh r0, [r4, 0x30]
adds r0, 0x1
lsls r0, 24
@@ -4861,7 +4861,7 @@ sub_816F5B4: @ 816F5B4
str r1, [sp]
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
ldrh r0, [r4, 0x30]
adds r0, 0x2
lsls r0, 24
@@ -4873,7 +4873,7 @@ sub_816F5B4: @ 816F5B4
str r1, [sp]
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
ldrh r1, [r4, 0x36]
movs r2, 0x36
ldrsh r0, [r4, r2]
@@ -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
@@ -5017,7 +5017,7 @@ _0816F6E8:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x80
lsls r0, 3
strh r0, [r4, 0x32]
@@ -5042,7 +5042,7 @@ _0816F6E8:
movs r1, 0x1
movs r2, 0x3
movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
_0816F744:
pop {r4}
pop {r0}
@@ -5083,7 +5083,7 @@ _0816F768:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x80
lsls r0, 3
strh r0, [r4, 0x32]
@@ -5108,7 +5108,7 @@ _0816F768:
movs r1, 0x1
movs r2, 0x3
movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
_0816F7C4:
pop {r4}
pop {r0}
@@ -5153,10 +5153,10 @@ sub_816F7D0: @ 816F7D0
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
mov r9, r2
lsls r0, r7, 4
adds r0, r7
@@ -5196,10 +5196,10 @@ sub_816F7D0: @ 816F7D0
movs r1, 0
movs r2, 0x2
movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
mov r1, r8
cmp r1, 0
bne _0816F898
@@ -5229,10 +5229,10 @@ _0816F8A0:
mov r1, r10
mov r2, r8
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r4, r7, 4
adds r4, r7
lsls r4, 2
@@ -5262,8 +5262,8 @@ _0816F8A0:
movs r1, 0
movs r2, 0x2
movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft
ldr r2, =gUnknown_0202064C
bl CalcCenterToCornerVec
ldr r2, =gSprites + 0x1C
adds r4, r2
ldr r0, =sub_816F3A4
str r0, [r4]
@@ -5271,7 +5271,7 @@ _0816F8A0:
mov r1, r10
mov r2, r8
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
lsls r4, r7, 4
@@ -5287,7 +5287,7 @@ _0816F8A0:
strh r2, [r5, 0x30]
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r0, [r5, 0x1]
movs r1, 0x3
orrs r0, r1
@@ -5304,8 +5304,8 @@ _0816F8A0:
movs r1, 0
movs r2, 0x2
movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft
ldr r0, =gUnknown_0202064C
bl CalcCenterToCornerVec
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r1, =sub_816F3A4
str r1, [r4]
@@ -5320,7 +5320,7 @@ _0816F8A0:
adds r1, r4, 0
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
mov r0, r9
lsls r0, 24
lsrs r0, 24
@@ -5329,7 +5329,7 @@ _0816F8A0:
adds r1, r4, 0
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
mov r1, r8
lsls r1, 24
lsrs r1, 24
@@ -5341,7 +5341,7 @@ _0816F8A0:
adds r1, r4, 0
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
ldr r0, [sp, 0x10]
add sp, 0x14
pop {r3-r5}
@@ -5378,14 +5378,14 @@ _0816F9F0:
_0816FA04:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r0, [r4, 0x20]
subs r0, 0x1
b _0816FA60
_0816FA12:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldr r0, =gUnknown_030062A0
ldr r0, [r0]
movs r1, 0x7
@@ -5586,7 +5586,7 @@ _0816FB7C:
strb r1, [r2]
adds r0, r6, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0816FCE6
_0816FB94:
ldr r0, =gUnknown_030062A0
@@ -5735,7 +5735,7 @@ _0816FCC4:
bne _0816FD38
adds r0, r6, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldrb r1, [r6, 0x1]
movs r0, 0xD
negs r0, r0
@@ -5783,7 +5783,7 @@ _0816FD24:
cmp r0, 0
beq _0816FD38
adds r0, r6, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0816FD38:
pop {r4-r6}
pop {r0}
@@ -5831,7 +5831,7 @@ _0816FD7C:
bne _0816FDB0
adds r0, r4, 0
movs r1, 0x3
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0816FD90:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -5847,7 +5847,7 @@ _0816FD9C:
cmp r0, 0
beq _0816FDB0
adds r0, r4, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0816FDB0:
pop {r4}
pop {r0}
@@ -5890,13 +5890,13 @@ _0816FDD2:
ldr r0, =gUnknown_085E4F5C
asrs r2, 16
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
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]
@@ -5932,10 +5932,10 @@ _0816FDD2:
adds r5, r3
ldrb r1, [r5]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r7, 0x1
lsls r0, 16
lsrs r7, r0, 16
@@ -5948,13 +5948,13 @@ _0816FDD2:
asrs r2, 16
movs r1, 0x78
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
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]
@@ -5975,7 +5975,7 @@ _0816FDD2:
orrs r1, r2
strb r1, [r0, 0x3]
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r6, 0
add sp, 0xC
pop {r3-r5}
@@ -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
@@ -6045,7 +6045,7 @@ _0816FF38:
adds r3, r5, 0
str r1, [sp]
movs r0, 0x1
bl SetSpriteTransformationMatrix
bl SetOamMatrix
_0816FF48:
movs r2, 0x2E
ldrsh r0, [r4, r2]
@@ -6071,7 +6071,7 @@ _0816FF58:
movs r1, 0x1
movs r2, 0x3
movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
adds r2, r4, 0
adds r2, 0x3E
ldrb r1, [r2]
@@ -6207,7 +6207,7 @@ _08170056:
movs r1, 0
movs r2, 0x3
movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
movs r0, 0
strh r0, [r5, 0x30]
movs r0, 0x1
@@ -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
@@ -6259,7 +6259,7 @@ _081700BE:
movs r0, 0x12
movs r2, 0
movs r3, 0
bl SetSpriteTransformationMatrix
bl SetOamMatrix
add sp, 0x4
pop {r4,r5}
pop {r0}
asm/intro_credits_graphics.s
+24 -24
View File
@@ -70,7 +70,7 @@ _0817B11E:
ldr r1, =gUnknown_0203BD28
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_0300301C
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
pop {r4}
@@ -258,7 +258,7 @@ _0817B334:
bl LoadPalette
bl sub_817B7A4
_0817B370:
ldr r1, =gUnknown_0300301C
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r1, =gUnknown_0203BD28
@@ -581,7 +581,7 @@ sub_817B62C: @ 817B62C
cmp r0, 0
beq _0817B64C
adds r0, r2, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
b _0817B690
.pool
_0817B64C:
@@ -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
@@ -654,7 +654,7 @@ _0817B6C2:
ldrb r2, [r6, 0x2]
ldrb r3, [r6, 0x3]
ldr r0, =gUnknown_085F504C
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r5, r0, 4
@@ -668,7 +668,7 @@ _0817B6C2:
lsrs r2, 6
adds r0, r4, 0
movs r3, 0
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
ldrb r3, [r4, 0x5]
movs r0, 0xC
orrs r3, r0
@@ -693,7 +693,7 @@ _0817B6C2:
movs r0, 0xF
ands r3, r0
strb r3, [r4, 0x5]
ldr r0, =gUnknown_02020638
ldr r0, =gSprites + 8
adds r5, r0
ldr r2, [sp, 0x8]
str r2, [r5]
@@ -701,7 +701,7 @@ _0817B6C2:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r1, 0
mov r0, sp
ldrh r0, [r0]
@@ -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
@@ -841,7 +841,7 @@ sub_817B834: @ 817B834
adds r1, r5, 0
adds r2, r4, 0
movs r3, 0x2
bl AddObjectToFront
bl CreateSprite
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -852,10 +852,10 @@ sub_817B834: @ 817B834
adds r1, r5, 0
adds r2, r4, 0
movs r3, 0x3
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -881,7 +881,7 @@ sub_817B88C: @ 817B88C
adds r1, r5, 0
adds r2, r4, 0
movs r3, 0x2
bl AddObjectToFront
bl CreateSprite
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -892,10 +892,10 @@ sub_817B88C: @ 817B88C
adds r1, r5, 0
adds r2, r4, 0
movs r3, 0x3
bl AddObjectToFront
bl CreateSprite
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
@@ -984,7 +984,7 @@ sub_817B948: @ 817B948
adds r1, r2, 0
adds r2, r5, 0
movs r3, 0x5
bl AddObjectToFront
bl CreateSprite
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -995,17 +995,17 @@ sub_817B948: @ 817B948
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x6
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
adds r0, r4, r5
strh r6, [r0, 0x2E]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_817B8E8
@@ -1039,7 +1039,7 @@ sub_817B9C4: @ 817B9C4
adds r1, r2, 0
adds r2, r5, 0
movs r3, 0x5
bl AddObjectToFront
bl CreateSprite
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -1050,17 +1050,17 @@ sub_817B9C4: @ 817B9C4
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x6
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_02020630
ldr r5, =gSprites
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
adds r0, r4, r5
strh r6, [r0, 0x2E]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_817B8E8
asm/item.s
+133 -511
View File
File diff suppressed because it is too large Load Diff
asm/item_use.s
+23 -23
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
@@ -536,7 +536,7 @@ ItemUseOutOfBattle_Itemfinder: @ 80FD490
lsls r4, 24
lsrs r4, 24
movs r0, 0x27
bl sav12_xor_increment
bl IncrementGameStat
ldr r1, =gUnknown_0203A0F4
ldr r0, =ItemUseOnFieldCB_Itemfinder
str r0, [r1]
@@ -659,7 +659,7 @@ _080FD584:
.pool
_080FD5AC:
movs r0, 0x48
bl audio_play
bl PlaySE
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -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
@@ -1664,7 +1664,7 @@ sub_80FDD74: @ 80FDD74
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
movs r1, 0x1
bl remove_item
bl RemoveBagItem
bl script_env_2_enable
ldr r0, =gUnknown_08274482
bl script_env_1_execute_new_script
@@ -1919,7 +1919,7 @@ sub_80FDF90: @ 80FDF90
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
bl audio_play
bl PlaySE
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -2005,10 +2005,10 @@ sub_80FE058: @ 80FE058
ldr r4, =gUnknown_0203CE7C
ldrh r0, [r4]
movs r1, 0x1
bl remove_item
bl RemoveBagItem
ldrh r0, [r4]
ldr r1, =gStringVar2
bl itemid_get_name
bl CopyItemName
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9080
bl StringExpandPlaceholders
@@ -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
@@ -2101,7 +2101,7 @@ sub_80FE124: @ 80FE124
movs r0, 0
strh r0, [r1, 0x10]
movs r0, 0x2F
bl audio_play
bl PlaySE
adds r0, r5, 0
subs r0, 0x8
adds r0, r4, r0
@@ -2120,14 +2120,14 @@ sub_80FE164: @ 80FE164
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
bl mplay_has_finished_maybe
bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080FE1C2
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
@@ -2176,7 +2176,7 @@ sub_80FE1D0: @ 80FE1D0
cmp r0, 0x7
ble _080FE226
movs r0, 0x75
bl audio_play
bl PlaySE
bl InBattlePyramid
lsls r0, 24
cmp r0, 0
@@ -2208,7 +2208,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
ldr r4, =gUnknown_0203CE7C
ldrh r0, [r4]
ldr r1, =gStringVar2
bl itemid_get_name
bl CopyItemName
ldrh r0, [r4]
cmp r0, 0x2B
bne _080FE278
@@ -2364,7 +2364,7 @@ ItemUseInBattle_PokeBall: @ 80FE394
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
movs r1, 0x1
bl remove_item
bl RemoveBagItem
bl InBattlePyramid
lsls r0, 24
cmp r0, 0
@@ -2449,11 +2449,11 @@ sub_80FE440: @ 80FE440
cmp r0, 0x7
ble _080FE4AC
movs r0, 0x1
bl audio_play
bl PlaySE
ldr r4, =gUnknown_0203CE7C
ldrh r0, [r4]
movs r1, 0x1
bl remove_item
bl RemoveBagItem
bl InBattlePyramid
lsls r0, 24
cmp r0, 0
@@ -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
+422 -422
View File
File diff suppressed because it is too large Load Diff
asm/load_save.s
+21 -21
View File
@@ -29,8 +29,8 @@ _08076B8A:
.pool
thumb_func_end CheckForFlashMemory
thumb_func_start memclr_stdsav2
memclr_stdsav2: @ 8076B94
thumb_func_start ClearSav2
ClearSav2: @ 8076B94
push {lr}
sub sp, 0x4
mov r1, sp
@@ -44,10 +44,10 @@ memclr_stdsav2: @ 8076B94
pop {r0}
bx r0
.pool
thumb_func_end memclr_stdsav2
thumb_func_end ClearSav2
thumb_func_start clear_sav1
clear_sav1: @ 8076BB8
thumb_func_start ClearSav1
ClearSav1: @ 8076BB8
push {lr}
sub sp, 0x4
mov r1, sp
@@ -61,7 +61,7 @@ clear_sav1: @ 8076BB8
pop {r0}
bx r0
.pool
thumb_func_end clear_sav1
thumb_func_end ClearSav1
thumb_func_start InitSaveBlockPointersWithRandomOffset
@ void InitSaveBlockPointersWithRandomOffset(u8 offset)
@@ -86,7 +86,7 @@ InitSaveBlockPointersWithRandomOffset: @ 8076BDC
ldr r0, =gUnknown_02029808
adds r4, r0
str r4, [r1]
bl init_bag_pockets
bl SetBagItemsPointers
bl sub_81617F4
pop {r4,r5}
pop {r0}
@@ -258,7 +258,7 @@ copy_player_party_to_sav1: @ 8076D8C
push {r4,lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =gUnknown_020244E9
ldr r1, =gPlayerPartyCount
ldrb r1, [r1]
movs r2, 0x8D
lsls r2, 2
@@ -290,7 +290,7 @@ _08076DA0:
thumb_func_start copy_player_party_from_sav1
copy_player_party_from_sav1: @ 8076DD4
push {r4,r5,lr}
ldr r1, =gUnknown_020244E9
ldr r1, =gPlayerPartyCount
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r2, 0x8D
@@ -398,23 +398,23 @@ _08076E7A:
.pool
thumb_func_end save_deserialize_npcs
thumb_func_start save_serialize_game
save_serialize_game: @ 8076EAC
thumb_func_start SaveSerializedGame
SaveSerializedGame: @ 8076EAC
push {lr}
bl copy_player_party_to_sav1
bl save_serialize_npcs
pop {r0}
bx r0
thumb_func_end save_serialize_game
thumb_func_end SaveSerializedGame
thumb_func_start save_deserialize_game
save_deserialize_game: @ 8076EBC
thumb_func_start LoadSerializedGame
LoadSerializedGame: @ 8076EBC
push {lr}
bl copy_player_party_from_sav1
bl save_deserialize_npcs
pop {r0}
bx r0
thumb_func_end save_deserialize_game
thumb_func_end LoadSerializedGame
thumb_func_start copy_bags_and_unk_data_from_save_blocks
copy_bags_and_unk_data_from_save_blocks: @ 8076ECC
@@ -685,7 +685,7 @@ _080770A0:
ldr r1, [r2]
str r1, [r0]
adds r0, r4, 0
bl encrypt_decrypt_all_item_quantities
bl ApplyNewEncyprtionKeyToBagItems
ldr r0, [r7]
adds r0, 0xAC
str r4, [r0]
@@ -699,8 +699,8 @@ _080770A0:
.pool
thumb_func_end copy_bags_and_unk_data_to_save_blocks
thumb_func_start apply_u16_xor_crypto
apply_u16_xor_crypto: @ 8077100
thumb_func_start ApplyNewEncyprtionKeyToHword
ApplyNewEncyprtionKeyToHword: @ 8077100
ldr r2, =gSaveBlock2Ptr
ldr r2, [r2]
adds r2, 0xAC
@@ -711,7 +711,7 @@ apply_u16_xor_crypto: @ 8077100
strh r2, [r0]
bx lr
.pool
thumb_func_end apply_u16_xor_crypto
thumb_func_end ApplyNewEncyprtionKeyToHword
thumb_func_start apply_u32_xor_crypto
apply_u32_xor_crypto: @ 8077118
@@ -733,7 +733,7 @@ saveblock_apply_crypto: @ 8077130
adds r4, r0, 0
bl sub_8084864
adds r0, r4, 0
bl call_encrypt_decrypt_all_item_quantities
bl ApplyNewEncyprtionKeyToBagItems_
adds r0, r4, 0
bl sub_8024690
ldr r5, =gSaveBlock1Ptr
@@ -747,7 +747,7 @@ saveblock_apply_crypto: @ 8077130
ldr r1, =0x00000494
adds r0, r1
adds r1, r4, 0
bl apply_u16_xor_crypto
bl ApplyNewEncyprtionKeyToHword
pop {r4,r5}
pop {r0}
bx r0
asm/lottery_corner.s
+13 -13
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8177558
sub_8177558: @ 8177558
thumb_func_start ResetLotteryCorner
ResetLotteryCorner: @ 8177558
push {r4,lr}
bl Random
adds r4, r0, 0
@@ -23,7 +23,7 @@ sub_8177558: @ 8177558
pop {r0}
bx r0
.pool
thumb_func_end sub_8177558
thumb_func_end ResetLotteryCorner
thumb_func_start sub_8177584
sub_8177584: @ 8177584
@@ -64,7 +64,7 @@ _081775B4:
sub_81775CC: @ 81775CC
push {lr}
bl sub_817783C
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
strh r0, [r1]
pop {r0}
bx r0
@@ -79,7 +79,7 @@ sub_81775E0: @ 81775E0
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
movs r0, 0
strh r0, [r1]
movs r0, 0
@@ -107,14 +107,14 @@ _081775FC:
movs r1, 0x1
bl GetMonData
adds r1, r0, 0
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
ldrh r0, [r0]
lsls r1, 16
lsrs r1, 16
bl sub_817778C
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
ldrh r2, [r1]
cmp r0, r2
bls _0817764E
@@ -174,14 +174,14 @@ _0817766A:
movs r1, 0x1
bl pokemon_getattr_encrypted
adds r1, r0, 0
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
ldrh r0, [r0]
lsls r1, 16
lsrs r1, 16
bl sub_817778C
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
ldrh r2, [r1]
cmp r0, r2
bls _081776D2
@@ -202,11 +202,11 @@ _081776D2:
lsrs r7, r0, 16
cmp r7, 0xD
bls _0817765E
ldr r3, =gUnknown_020375E0
ldr r3, =gSpecialVar_0x8004
ldrh r0, [r3]
cmp r0, 0
beq _0817776E
ldr r2, =gUnknown_020375E2
ldr r2, =gSpecialVar_0x8005
ldr r1, =gUnknown_085E7080
subs r0, 0x1
lsls r0, 1
@@ -216,7 +216,7 @@ _081776D2:
ldr r2, [sp]
cmp r2, 0xE
bne _0817773C
ldr r1, =gUnknown_020375E4
ldr r1, =gSpecialVar_0x8006
movs r0, 0
strh r0, [r1]
movs r0, 0x64
@@ -230,7 +230,7 @@ _081776D2:
b _08177768
.pool
_0817773C:
ldr r1, =gUnknown_020375E4
ldr r1, =gSpecialVar_0x8006
movs r0, 0x1
strh r0, [r1]
ldr r2, =gUnknown_03005D94
asm/mail.s
+9 -9
View File
@@ -227,10 +227,10 @@ _0812168E:
bl ResetTasks
b _081219D4
_08121694:
bl ResetAllObjectData
bl ResetSpriteData
b _081219D4
_0812169A:
bl ResetObjectPaletteAllocator
bl FreeAllSpritePalettes
bl reset_temp_tile_data_buffers
movs r0, 0x10
movs r1, 0
@@ -513,7 +513,7 @@ _08121910:
_08121940:
adds r0, r4, 0
bl sub_80D2F68
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -524,7 +524,7 @@ _08121940:
_08121958:
adds r0, r4, 0
bl sub_80D2F68
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -883,8 +883,8 @@ _08121BCC:
thumb_func_start sub_8121C50
sub_8121C50: @ 8121C50
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -900,8 +900,8 @@ sub_8121C64: @ 8121C64
ldrb r0, [r0]
cmp r0, 0
beq _08121C7C
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
_08121C7C:
ldr r0, [r4]
movs r1, 0x84
@@ -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
+46 -46
View File
@@ -10,8 +10,8 @@
CB2_MainMenu: @ 802F6B0
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -21,8 +21,8 @@ CB2_MainMenu: @ 802F6B0
@ void VBlankCB_MainMenu()
VBlankCB_MainMenu: @ 802F6C8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -129,8 +129,8 @@ InitMainMenu: @ 802F6F4
bl LoadPalette
bl remove_some_task
bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
cmp r4, 0
beq _0802F7EC
movs r0, 0x1
@@ -278,7 +278,7 @@ _0802F900:
movs r0, 0x1
strh r0, [r4, 0x1E]
_0802F946:
ldr r0, =gUnknown_03006210
ldr r0, =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0x2
beq _0802F990
@@ -298,7 +298,7 @@ _0802F968:
b _0802F9D0
_0802F972:
strh r0, [r4]
bl sub_809D4C4
bl IsMysteryGiftEnabled
cmp r0, 0
beq _0802F982
ldrh r0, [r4]
@@ -330,7 +330,7 @@ _0802F9A4:
str r1, [r0]
movs r0, 0x1
strh r0, [r4]
bl sub_809D4C4
bl IsMysteryGiftEnabled
cmp r0, 0x1
bne _0802F9FE
ldrh r0, [r4]
@@ -479,7 +479,7 @@ Task_MainMenuCheckBattery: @ 802FAB0
movs r0, 0x54
movs r1, 0x7
bl SetGpuReg
bl GameFreakRTC_GetErrorFlags
bl RtcGetErrorStatus
movs r1, 0xFF
lsls r1, 4
ands r1, r0
@@ -1085,7 +1085,7 @@ HandleMainMenuInput: @ 80300E0
cmp r0, 0
beq _08030130
movs r0, 0x5
bl audio_play
bl PlaySE
bl sub_80093CC
movs r0, 0x1
negs r0, r0
@@ -1109,7 +1109,7 @@ _08030130:
cmp r6, 0
beq _08030178
movs r0, 0x5
bl audio_play
bl PlaySE
movs r0, 0x1
negs r0, r0
ldr r1, =0x0000ffff
@@ -1720,7 +1720,7 @@ _08030664:
cmp r1, 0
beq _08030688
movs r0, 0x5
bl audio_play
bl PlaySE
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -1930,8 +1930,8 @@ task_new_game_prof_birch_speech_1: @ 80307B0
movs r2, 0x10
bl LoadPalette
bl remove_some_task
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
bl dp13_810BB8C
adds r0, r4, 0
bl AddBirchSpeechObjects
@@ -1958,7 +1958,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
strh r1, [r0, 0x16]
movs r0, 0xBB
lsls r0, 1
bl song_play_for_text
bl PlayBGM
movs r0, 0
bl ShowBg
movs r0, 0x1
@@ -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]
@@ -2277,7 +2277,7 @@ sub_8030B14: @ 8030B14
.pool
_08030B64:
ldr r1, [r3, 0x1C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08030BBA
ldrb r1, [r3, 0x1]
@@ -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
@@ -2638,7 +2638,7 @@ task_new_game_prof_birch_speech_13: @ 8030E38
b _08030E76
_08030E52:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
strb r4, [r0, 0x8]
@@ -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
@@ -3043,8 +3043,8 @@ _080311A8:
b _08031210
_080311AE:
movs r0, 0x5
bl audio_play
ldr r2, =gUnknown_02020630
bl PlaySE
ldr r2, =gSprites
ldr r0, =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -3075,7 +3075,7 @@ _080311AE:
.pool
_080311FC:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, 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
@@ -3463,10 +3463,10 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4
ldr r1, =gUnknown_082FF114
str r1, [r0]
adds r0, r5, 0
bl obj_alloc_rotscale_entry
bl InitSpriteAffineAnim
adds r0, r5, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r7, 0
adds r0, 0x1C
adds r4, r0
@@ -3480,7 +3480,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4
movs r3, 0x10
bl BeginNormalPaletteFade
movs r0, 0x4
bl play_sound_effect
bl FadeOutBGM
ldr r0, =task_new_game_prof_birch_speech_part2_10
str r0, [r6]
_0803155C:
@@ -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
@@ -3709,8 +3709,8 @@ new_game_prof_birch_speech_part2_start: @ 8031678
ldr r0, =0x0000ffc4
strh r0, [r4, 0x10]
bl remove_some_task
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
bl dp13_810BB8C
adds r0, r5, 0
bl AddBirchSpeechObjects
@@ -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
@@ -4650,7 +4650,7 @@ fmt_pokedex: @ 8031F7C
lsrs r0, 24
cmp r0, 0x1
bne _08031FFE
bl sub_809D42C
bl IsNationalPokedexEnabled
cmp r0, 0
beq _08031FA4
movs r0, 0x1
asm/map_obj_8097404.s
+19 -19
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
@@ -811,7 +811,7 @@ obj_anim_image_set_and_seek: @ 8097994
ands r1, r3
strb r1, [r4]
adds r1, r2, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r4}
pop {r0}
bx r0
@@ -864,7 +864,7 @@ sub_80979D4: @ 80979D4
adds r4, 0x28
movs r0, 0
ldrsb r0, [r4, r0]
ldr r2, =gUnknown_02021BBC
ldr r2, =gSpriteCoordOffsetX
adds r0, r1
ldrh r2, [r2]
adds r0, r2
@@ -877,7 +877,7 @@ sub_80979D4: @ 80979D4
subs r3, 0x15
movs r0, 0
ldrsb r0, [r3, r0]
ldr r2, =gUnknown_02021BBE
ldr r2, =gSpriteCoordOffsetY
adds r0, r1
ldrh r2, [r2]
adds r0, r2
@@ -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
@@ -1005,7 +1005,7 @@ _08097AF6:
cmp r1, r0
bne _08097B16
adds r0, r2, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_08097B16:
adds r5, 0x44
subs r4, 0x1
@@ -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
@@ -1081,7 +1081,7 @@ sub_8097B78: @ 8097B78
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08097BAA:
pop {r4,r5}
pop {r0}
@@ -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
@@ -1141,7 +1141,7 @@ sub_8097BB4: @ 8097BB4
.pool
_08097C20:
adds r0, r4, 0
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
adds r2, r4, 0
adds r2, 0x42
ldrb r0, [r2]
@@ -1153,7 +1153,7 @@ _08097C20:
_08097C36:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08097C3E:
pop {r4,r5}
pop {r0}
@@ -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/map_obj_lock.s
+1 -1
View File
@@ -256,7 +256,7 @@ sub_8098574: @ 8098574
lsls r0, 2
ldr r1, =gUnknown_02037350
adds r0, r1
ldr r1, =gUnknown_020375F4
ldr r1, =gScriptFacing
ldrb r1, [r1]
bl FieldObjectFaceOppositeDirection
pop {r0}
asm/mauville_old_man.s
+20 -20
View File
@@ -95,8 +95,8 @@ sub_8120154: @ 8120154
bx r0
thumb_func_end sub_8120154
thumb_func_start sub_8120160
sub_8120160: @ 8120160
thumb_func_start SetMauvilleOldMan
SetMauvilleOldMan: @ 8120160
push {lr}
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -141,7 +141,7 @@ _081201C0:
bl sub_8120B5C
pop {r0}
bx r0
thumb_func_end sub_8120160
thumb_func_end SetMauvilleOldMan
thumb_func_start sub_81201C8
sub_81201C8: @ 81201C8
@@ -157,7 +157,7 @@ sub_81201C8: @ 81201C8
thumb_func_start sub_81201DC
sub_81201DC: @ 81201DC
push {r4,lr}
ldr r4, =gUnknown_020375F0
ldr r4, =gScriptResult
bl sub_81201C8
lsls r0, 24
lsrs r0, 24
@@ -170,7 +170,7 @@ sub_81201DC: @ 81201DC
thumb_func_start sub_81201F4
sub_81201F4: @ 81201F4
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00002e51
@@ -238,7 +238,7 @@ sub_8120280: @ 8120280
push {r4-r7,lr}
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
ldr r2, =0x00002e36
adds r5, r1, r2
@@ -336,7 +336,7 @@ _0812031E:
thumb_func_start sub_8120340
sub_8120340: @ 8120340
push {lr}
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrb r0, [r0]
bl sub_81206C0
bl script_env_2_set_ctx_paused
@@ -347,7 +347,7 @@ sub_8120340: @ 8120340
thumb_func_start sub_8120358
sub_8120358: @ 8120358
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00002e28
@@ -379,14 +379,14 @@ sub_812038C: @ 812038C
ldr r0, =0x0000ffff
cmp r1, r0
bne _081203AC
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0
b _081203B6
.pool
_081203AC:
ldr r0, =gStringVar1
bl CopyEasyChatWord
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x1
_081203B6:
strh r0, [r1]
@@ -405,14 +405,14 @@ sub_81203C4: @ 81203C4
ldrb r0, [r2, 0x1]
cmp r0, 0xA
bne _081203EC
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0
strh r0, [r1]
strb r0, [r2, 0x1]
b _081203F2
.pool
_081203EC:
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x1
strh r0, [r1]
_081203F2:
@@ -503,7 +503,7 @@ _081204C4:
adds r0, 0x1
_081204C8:
strb r0, [r5, 0x1]
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0x1
strh r0, [r1]
pop {r4-r6}
@@ -850,7 +850,7 @@ _08120764:
_0812077C:
ldr r0, =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
ldr r3, =0x00002e36
adds r1, r2, r3
@@ -1114,12 +1114,12 @@ _08120994:
strh r0, [r5, 0xE]
strh r0, [r5, 0x10]
movs r0, 0x4
bl sub_80A31E8
bl FadeOutBGMTemporarily
movs r0, 0x1
b _08120B4E
.pool
_081209B8:
bl sub_80A3200
bl IsBGMPausedOrStopped
lsls r0, 24
cmp r0, 0
bne _081209C4
@@ -1227,7 +1227,7 @@ _08120A7E:
cmp r4, 0xFF
bne _08120AB0
movs r0, 0x6
bl sub_80A3228
bl FadeInBGM
ldr r0, =gMPlay_SE2
movs r1, 0x2
bl m4aMPlayFadeOutTemporarily
@@ -1775,7 +1775,7 @@ sub_8120E74: @ 8120E74
bne _08120E80
movs r0, 0
_08120E80:
bl sub_80847F8
bl GetGameStat
pop {r1}
bx r1
thumb_func_end sub_8120E74
@@ -2382,13 +2382,13 @@ _0812132C:
cmp r4, r0
bne _0812135C
_0812134E:
ldr r1, =gUnknown_020375F0
ldr r1, =gScriptResult
movs r0, 0
strh r0, [r1]
b _08121364
.pool
_0812135C:
ldr r0, =gUnknown_020375F0
ldr r0, =gScriptResult
strh r5, [r0]
ldr r0, =gUnknown_03001178
strb r4, [r0]
asm/menu_helpers.s
+11 -11
View File
@@ -295,7 +295,7 @@ _08121FFC:
b _08122028
_08122002:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_0203A138
ldr r1, [r0]
adds r0, r4, 0
@@ -304,7 +304,7 @@ _08122002:
.pool
_08122018:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_0203A138
ldr r1, [r0, 0x4]
adds r0, r4, 0
@@ -395,7 +395,7 @@ _081220B6:
cmp r1, r0
beq _081220C6
movs r0, 0x5
bl audio_play
bl PlaySE
movs r0, 0x1
b _081220C8
_081220C6:
@@ -775,13 +775,13 @@ 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
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
mov r1, r8
adds r4, r1, r5
strb r0, [r4]
@@ -793,7 +793,7 @@ _08122358:
lsls r0, 2
adds r0, r7
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0812237E:
ldrb r1, [r4]
lsls r0, r1, 4
@@ -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
@@ -839,7 +839,7 @@ _081223C0:
adds r0, r1
lsls r0, 2
adds r0, r7
bl RemoveObjectAndFreeResources
bl DestroySpriteAndFreeResources
b _081223EC
.pool
_081223DC:
@@ -849,7 +849,7 @@ _081223DC:
adds r0, r1
lsls r0, 2
adds r0, r7
bl RemoveObjectAndFreeTiles
bl DestroySprite
_081223EC:
adds r0, r4, 0x1
lsls r0, 24
@@ -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
+32 -32
View File
@@ -257,13 +257,13 @@ _0811FAFE:
adds r0, r5, r0
lsls r0, 16
lsrs r0, 16
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
ldr r0, [r4]
ldrh r0, [r0, 0x2]
adds r0, r5, r0
lsls r0, 16
lsrs r0, 16
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -279,7 +279,7 @@ _0811FB28:
ldr r0, [r0]
cmp r0, 0
beq _0811FB9A
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r6]
adds r0, 0xC
adds r0, r4
@@ -300,7 +300,7 @@ _0811FB52:
ldr r0, [r0]
cmp r0, 0
beq _0811FB9A
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r6]
adds r0, 0x14
adds r0, r4
@@ -316,7 +316,7 @@ _0811FB52:
ldr r0, [r0, 0x24]
cmp r0, 0
beq _0811FB8A
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r4]
str r7, [r0, 0x24]
_0811FB8A:
@@ -324,7 +324,7 @@ _0811FB8A:
ldr r0, [r0, 0x28]
cmp r0, 0
beq _0811FB9A
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r4]
str r7, [r0, 0x28]
_0811FB9A:
@@ -346,7 +346,7 @@ sub_811FBA4: @ 811FBA4
cmp r5, 0
beq _0811FBDC
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r2, =gUnknown_0203A124
ldr r1, [r2]
ldrb r0, [r1, 0x5]
@@ -368,7 +368,7 @@ _0811FBDC:
cmp r4, 0
beq _0811FC0C
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r2, =gUnknown_0203A124
ldr r1, [r2]
ldrb r0, [r1, 0x5]
@@ -388,7 +388,7 @@ _0811FC0C:
cmp r0, 0
beq _0811FC68
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r2, =gUnknown_0203A124
ldr r0, [r2]
movs r1, 0x5
@@ -436,7 +436,7 @@ _0811FC68:
cmp r0, 0
beq _0811FC64
movs r0, 0x5
bl audio_play
bl PlaySE
_0811FC76:
movs r0, 0
_0811FC78:
@@ -523,14 +523,14 @@ sub_811FC80: @ 811FC80
ldr r0, =gUnknown_0859EF14
str r0, [r4, 0x8]
str r7, [r4, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
ldr r0, =gDummySpriteAffineAnimTable
str r0, [r4, 0x10]
ldr r0, =TaskDummy7
str r0, [r4, 0x14]
mov r0, sp
bl LoadObjectPics
bl LoadSpriteSheets
mov r0, r10
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
movs r5, 0
mov r3, r8
lsls r3, 16
@@ -555,7 +555,7 @@ _0811FD58:
asrs r1, r2, 16
asrs r2, r7, 16
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -570,12 +570,12 @@ _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
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -618,7 +618,7 @@ _0811FDC8:
mov r3, r9
asrs r1, r3, 16
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -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]
@@ -642,13 +642,13 @@ _0811FDEE:
lsrs r5, r0, 16
cmp r5, 0x3
bls _0811FDC8
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x14]
adds r0, r4, 0
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -674,7 +674,7 @@ _0811FDEE:
ldr r0, [r6]
ldr r0, [r0, 0x28]
movs r1, 0x9
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r6]
ldr r2, [r1, 0x28]
ldr r3, [sp, 0x48]
@@ -689,7 +689,7 @@ _0811FDEE:
movs r1, 0x1
movs r2, 0x2
movs r3, 0
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
b _0811FEAE
.pool
_0811FEA8:
@@ -707,7 +707,7 @@ _0811FEAE:
adds r0, r4, 0
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -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]
@@ -726,7 +726,7 @@ _0811FEAE:
strh r0, [r1, 0x2E]
ldr r0, [r2, 0x24]
movs r1, 0x8
bl StartObjectImageAnim
bl StartSpriteAnim
b _0811FF28
.pool
_0811FEFC:
@@ -787,14 +787,14 @@ sub_811FF40: @ 811FF40
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _0811FF76
.pool
_0811FF6C:
lsls r1, 25
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0811FF76:
pop {r0}
bx r0
@@ -885,7 +885,7 @@ sub_811FFD4: @ 811FFD4
ldr r0, =gUnknown_0859EFA4
str r0, [sp, 0x8]
str r2, [sp, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
ldr r0, =gDummySpriteAffineAnimTable
str r0, [sp, 0x10]
ldr r0, =TaskDummy7
str r0, [sp, 0x14]
@@ -897,14 +897,14 @@ sub_811FFD4: @ 811FFD4
orrs r0, r3
str r0, [r5, 0x4]
adds r0, r5, 0
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r4, 0
bl LoadTaggedObjectPalette
bl LoadSpritePalette
mov r0, sp
movs r1, 0
movs r2, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -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
+11 -11
View File
@@ -18,9 +18,9 @@ DecryptMoney: @ 80E5114
.pool
thumb_func_end DecryptMoney
thumb_func_start EncryptMoney
@ void EncryptMoney(u32 *moneyPointer, u32 moneyAmount)
EncryptMoney: @ 80E5128
thumb_func_start SetMoney
@ void SetMoney(u32 *moneyPointer, u32 moneyAmount)
SetMoney: @ 80E5128
ldr r2, =gSaveBlock2Ptr
ldr r2, [r2]
adds r2, 0xAC
@@ -29,7 +29,7 @@ EncryptMoney: @ 80E5128
str r2, [r0]
bx lr
.pool
thumb_func_end EncryptMoney
thumb_func_end SetMoney
thumb_func_start IsEnoughMoney
@ bool8 IsEnoughMoney(u32 *moneyPointer, u32 price)
@@ -71,7 +71,7 @@ add_money: @ 80E5154
_080E5178:
adds r0, r6, 0
adds r1, r5, 0
bl EncryptMoney
bl SetMoney
pop {r4-r6}
pop {r0}
bx r0
@@ -94,7 +94,7 @@ _080E51A0:
subs r1, r4
_080E51A2:
adds r0, r5, 0
bl EncryptMoney
bl SetMoney
pop {r4,r5}
pop {r0}
bx r0
@@ -108,7 +108,7 @@ sub_80E51B0: @ 80E51B0
movs r1, 0x92
lsls r1, 3
adds r0, r1
ldr r1, =gUnknown_020375E2
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
bl IsEnoughMoney
lsls r0, 24
@@ -126,7 +126,7 @@ sub_80E51D4: @ 80E51D4
movs r1, 0x92
lsls r1, 3
adds r0, r1
ldr r1, =gUnknown_020375E2
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
bl subtract_money
pop {r0}
@@ -374,7 +374,7 @@ AddMoneyLabelObject: @ 80E53AC
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
bl AddObjectToFront
bl CreateSprite
ldr r1, =gUnknown_02039F99
strb r0, [r1]
pop {r4,r5}
@@ -391,9 +391,9 @@ RemoveMoneyLabelObject: @ 80E53F4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeResources
bl DestroySpriteAndFreeResources
pop {r0}
bx r0
.pool
asm/mystery_event_menu.s
+15 -15
View File
@@ -8,8 +8,8 @@
thumb_func_start sub_8178944
sub_8178944: @ 8178944
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -36,8 +36,8 @@ _08178968:
sub_8178974: @ 8178974
push {r4,lr}
sub sp, 0x8
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
bl ResetTasks
ldr r0, =sub_8178944
bl SetVBlankCallback
@@ -87,10 +87,10 @@ _081789AC:
ldr r0, =sub_8009404
movs r1, 0
bl CreateTask
bl sub_80A2F30
bl StopMapMusic
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
movs r0, 0
@@ -255,7 +255,7 @@ _08178B8E:
b _08178D00
_08178B98:
movs r0, 0x15
bl audio_play
bl PlaySE
ldr r1, =gUnknown_085EE788
movs r0, 0x1
str r0, [sp]
@@ -294,7 +294,7 @@ _08178BDC:
cmp r0, 0
beq _08178C38
movs r0, 0x5
bl audio_play
bl PlaySE
bl sub_800A620
movs r0, 0x1
movs r1, 0x1
@@ -326,7 +326,7 @@ _08178C38:
b _08178E58
_08178C42:
movs r0, 0x5
bl audio_play
bl PlaySE
bl sub_80097E8
movs r0, 0x87
lsls r0, 3
@@ -415,7 +415,7 @@ _08178D00:
b _08178E58
_08178D0E:
movs r0, 0x5
bl audio_play
bl PlaySE
bl sub_80097E8
movs r2, 0x87
lsls r2, 3
@@ -484,7 +484,7 @@ _08178D74:
cmp r0, 0
bne _08178E34
movs r0, 0
bl save_game_when_memory_present
bl TrySavingData
b _08178E34
.pool
_08178DBC:
@@ -526,7 +526,7 @@ _08178E0C:
cmp r0, 0
beq _08178E58
movs r0, 0x5
bl audio_play
bl PlaySE
movs r2, 0x87
lsls r2, 3
adds r1, r4, r2
@@ -590,8 +590,8 @@ _08178E58:
strb r1, [r0]
_08178E98:
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
add sp, 0x8
asm/mystery_event_script.s
+4 -4
View File
@@ -418,7 +418,7 @@ sub_8153ACC: @ 8153ACC
subs r0, r1
ldr r1, [r4, 0x64]
adds r0, r1
bl script_env_2_execute_new_script
bl ScriptContext2_RunNewScript
movs r0, 0
pop {r4}
pop {r1}
@@ -582,7 +582,7 @@ sub_8153BE4: @ 8153BE4
sub_8153C4C: @ 8153C4C
push {r4,lr}
adds r4, r0, 0
bl sub_809D3E8
bl EnableNationalPokedex
ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B9E
bl StringExpandPlaceholders
@@ -680,7 +680,7 @@ _08153D18:
movs r2, 0xB
bl StringCopyN
_08153D22:
ldr r0, =gUnknown_020244E9
ldr r0, =gPlayerPartyCount
ldrb r0, [r0]
cmp r0, 0x6
bne _08153D4C
@@ -780,7 +780,7 @@ sub_8153DD4: @ 8153DD4
sub_8153E1C: @ 8153E1C
push {r4,lr}
adds r4, r0, 0
bl sub_809D5F4
bl EnableResetRTC
ldr r0, =gStringVar4
ldr r1, =gUnknown_085ECAD8
bl StringExpandPlaceholders
asm/naming_screen.s
+60 -60
View File
@@ -104,8 +104,8 @@ _080E2E58:
bl ResetPaletteFade
b _080E2E86
_080E2E5E:
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
b _080E2E86
_080E2E68:
bl ResetTasks
@@ -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:
@@ -972,7 +972,7 @@ sub_80E3640: @ 80E3640
movs r2, 0x1
bl sub_80E3948
movs r0, 0x6
bl audio_play
bl PlaySE
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
@@ -1490,7 +1490,7 @@ sub_80E3A74: @ 80E3A74
lsls r4, 24
lsrs r4, 24
movs r0, 0x4
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
movs r1, 0x87
@@ -1500,7 +1500,7 @@ sub_80E3A74: @ 80E3A74
add r6, sp, 0x8
strh r0, [r6]
movs r0, 0x6
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
adds r0, r5
@@ -1508,14 +1508,14 @@ sub_80E3A74: @ 80E3A74
adds r1, 0xA
strh r0, [r1]
movs r0, 0x7
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
adds r0, r5
add r1, sp, 0xC
strh r0, [r1]
movs r0, 0x7
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
ldr r1, =0x00000101
@@ -1589,7 +1589,7 @@ sub_80E3B30: @ 80E3B30
beq _080E3B48
adds r0, r5, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080E3B48:
ldrh r0, [r5, 0x36]
movs r1, 0xFF
@@ -1686,7 +1686,7 @@ _080E3BDE:
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
ldr r2, =0x01010000
@@ -1812,7 +1812,7 @@ sub_80E3CE4: @ 80E3CE4
movs r1, 0x26
movs r2, 0x58
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
ldr r5, =gUnknown_02039F94
ldr r1, [r5]
ldr r4, =0x00001e23
@@ -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
@@ -1998,7 +1998,7 @@ sub_80E3E3C: @ 80E3E3C
lsls r0, 2
adds r0, r5
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -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,10 +2049,10 @@ 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
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@@ -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
@@ -2135,7 +2135,7 @@ sub_80E3F8C: @ 80E3F8C
movs r1, 0xCC
movs r2, 0x58
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02039F94
@@ -2146,12 +2146,12 @@ 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
adds r0, r5, 0
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
adds r1, r5, 0
adds r1, 0x3E
ldrb r0, [r1]
@@ -2162,7 +2162,7 @@ sub_80E3F8C: @ 80E3F8C
movs r1, 0xCC
movs r2, 0x54
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
@@ -2172,7 +2172,7 @@ sub_80E3F8C: @ 80E3F8C
add r4, r8
ldr r1, =gUnknown_0858C058
adds r0, r4, 0
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
adds r4, 0x3E
ldrb r0, [r4]
orrs r0, r6
@@ -2181,7 +2181,7 @@ sub_80E3F8C: @ 80E3F8C
movs r1, 0xCC
movs r2, 0x53
movs r3, 0x2
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -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
@@ -2402,7 +2402,7 @@ sub_80E41B8: @ 80E41B8
lsls r4, r5, 1
adds r0, r4, r0
ldrh r0, [r0]
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
lsls r0, 4
mov r1, r8
ldrb r2, [r1, 0x5]
@@ -2414,7 +2414,7 @@ sub_80E41B8: @ 80E41B8
ldr r0, =gUnknown_0858BEFE
adds r4, r0
ldrh r0, [r4]
bl GetObjectTileRangeStartByTag
bl GetSpriteTileStartByTag
adds r1, r6, 0
adds r1, 0x40
strh r0, [r1]
@@ -2444,19 +2444,19 @@ sub_80E4218: @ 80E4218
movs r1, 0xCC
movs r2, 0x74
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
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
adds r0, r4, 0
mov r1, r8
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
adds r4, 0x3E
ldrb r0, [r4]
movs r5, 0x4
@@ -2466,7 +2466,7 @@ sub_80E4218: @ 80E4218
movs r1, 0xCC
movs r2, 0x8C
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -2475,7 +2475,7 @@ sub_80E4218: @ 80E4218
adds r4, r6
adds r0, r4, 0
mov r1, r8
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
adds r4, 0x3E
ldrb r0, [r4]
orrs r0, r5
@@ -2502,10 +2502,10 @@ sub_80E4290: @ 80E4290
asrs r1, 16
movs r2, 0x38
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
ldr r3, =gUnknown_02020630
ldr r3, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -2540,7 +2540,7 @@ _080E42E2:
ldr r0, =gUnknown_0858C168
movs r2, 0x3C
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 4
@@ -2615,7 +2615,7 @@ sub_80E4384: @ 80E4384
bl sub_808BD3C
lsls r0, 24
lsrs r0, 24
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r2, 0
str r2, [sp]
movs r2, 0x38
@@ -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
@@ -2634,7 +2634,7 @@ sub_80E4384: @ 80E4384
orrs r1, r2
strb r1, [r0, 0x5]
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
add sp, 0x4
pop {r0}
bx r0
@@ -2648,17 +2648,17 @@ sub_80E43E0: @ 80E43E0
movs r1, 0x38
movs r2, 0x29
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
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
bl SetSpriteOamTables_NoPriorityFromTable
bl SetSubspriteTables
ldrb r0, [r4, 0x5]
movs r1, 0xC
orrs r0, r1
@@ -2679,7 +2679,7 @@ sub_80E4420: @ 80E4420
ldr r1, =0x00001e34
adds r0, r3, r1
ldrh r0, [r0]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r2, 0
str r2, [sp]
ldr r2, =0x00001e38
@@ -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
@@ -2712,7 +2712,7 @@ sub_80E4420: @ 80E4420
sub_80E447C: @ 80E447C
push {lr}
sub sp, 0x4
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0x13
@@ -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
@@ -2732,7 +2732,7 @@ sub_80E447C: @ 80E447C
orrs r1, r2
strb r1, [r0, 0x5]
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
add sp, 0x4
pop {r0}
bx r0
@@ -2877,7 +2877,7 @@ sub_80E45A4: @ 80E45A4
b _080E45D2
_080E45BE:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
@@ -3577,7 +3577,7 @@ _080E4B38:
bl sub_80E3948
_080E4B42:
movs r0, 0x17
bl audio_play
bl PlaySE
pop {r4-r6}
pop {r0}
bx r0
@@ -3606,7 +3606,7 @@ sub_80E4B54: @ 80E4B54
movs r0, 0x3
bl CopyBgTilemapBufferToVram
movs r0, 0x5
bl audio_play
bl PlaySE
bl sub_80E4AB4
lsls r0, 24
lsrs r0, 24
@@ -3739,9 +3739,9 @@ choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54
movs r3, 0
bl LoadBgTiles
ldr r0, =gUnknown_0858C1C8
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_0858C230
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
pop {r4-r6}
pop {r0}
bx r0
@@ -4059,8 +4059,8 @@ sub_80E4EF0: @ 80E4EF0
sub_80E4F58: @ 80E4F58
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -4090,8 +4090,8 @@ sub_80E4F84: @ 80E4F84
thumb_func_start sub_80E4F94
sub_80E4F94: @ 80E4F94
push {r4,r5,lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
asm/new_game.s
+47 -285
View File
@@ -5,260 +5,22 @@
.text
thumb_func_start write_word_to_mem
@ void write_word_to_mem(int value, int *mem)
write_word_to_mem: @ 80842CC
strb r0, [r1]
lsrs r2, r0, 8
strb r2, [r1, 0x1]
lsrs r2, r0, 16
strb r2, [r1, 0x2]
lsrs r0, 24
strb r0, [r1, 0x3]
bx lr
thumb_func_end write_word_to_mem
thumb_func_start sub_80842DC
sub_80842DC: @ 80842DC
adds r2, r0, 0
ldrb r0, [r2, 0x3]
lsls r0, 24
ldrb r1, [r2, 0x2]
lsls r1, 16
orrs r0, r1
ldrb r1, [r2, 0x1]
lsls r1, 8
orrs r0, r1
ldrb r1, [r2]
orrs r0, r1
bx lr
thumb_func_end sub_80842DC
thumb_func_start sub_80842F4
sub_80842F4: @ 80842F4
push {r4,lr}
adds r4, r0, 0
adds r3, r1, 0
movs r2, 0
_080842FC:
adds r0, r4, r2
adds r1, r3, r2
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x3
ble _080842FC
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80842F4
thumb_func_start set_player_trainer_id
set_player_trainer_id: @ 8084310
push {r4,lr}
bl Random
adds r4, r0, 0
bl GetTrainerId
lsls r4, 16
lsls r0, 16
lsrs r0, 16
orrs r4, r0
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r1, 0xA
adds r0, r4, 0
bl write_word_to_mem
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end set_player_trainer_id
thumb_func_start init_options
init_options: @ 808433C
ldr r3, =gSaveBlock2Ptr
ldr r2, [r3]
ldrb r1, [r2, 0x14]
movs r0, 0x8
negs r0, r0
ands r0, r1
movs r1, 0x1
orrs r0, r1
strb r0, [r2, 0x14]
ldr r2, [r3]
ldrb r1, [r2, 0x14]
movs r0, 0x7
ands r0, r1
strb r0, [r2, 0x14]
ldr r2, [r3]
ldrb r1, [r2, 0x15]
movs r0, 0x2
negs r0, r0
ands r0, r1
strb r0, [r2, 0x15]
ldr r2, [r3]
ldrb r1, [r2, 0x15]
movs r0, 0x3
negs r0, r0
ands r0, r1
strb r0, [r2, 0x15]
ldr r2, [r3]
ldrb r1, [r2, 0x15]
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2, 0x15]
ldr r2, [r3]
ldrb r1, [r2, 0x15]
movs r0, 0x9
negs r0, r0
ands r0, r1
strb r0, [r2, 0x15]
bx lr
.pool
thumb_func_end init_options
thumb_func_start sub_8084390
sub_8084390: @ 8084390
push {r4,lr}
ldr r1, =gUnknown_030060B0
movs r0, 0
strb r0, [r1]
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
adds r0, 0x28
movs r1, 0
movs r2, 0x34
bl memset
ldr r0, [r4]
adds r0, 0x5C
movs r1, 0
movs r2, 0x34
bl memset
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8084390
thumb_func_start sub_80843C0
sub_80843C0: @ 80843C0
push {r4-r7,lr}
bl sub_80DF040
movs r2, 0x8
ldr r0, =gSaveBlock1Ptr
mov r12, r0
ldr r4, =0x00002e90
ldr r3, =gUnknown_08339D1C
_080843D0:
mov r1, r12
ldr r0, [r1]
lsls r1, r2, 5
adds r0, r1
adds r0, r4
adds r1, r3, 0
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldm r1!, {r5,r6}
stm r0!, {r5,r6}
adds r2, 0x1
cmp r2, 0xC
ble _080843D0
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80843C0
thumb_func_start sub_8084400
sub_8084400: @ 8084400
push {r4,lr}
sub sp, 0x4
movs r0, 0
str r0, [sp]
ldr r4, =gSaveBlock2Ptr
ldr r1, [r4]
ldr r0, =0x0000064c
adds r1, r0
ldr r2, =0x05000238
mov r0, sp
bl CpuSet
ldr r0, [r4]
ldr r1, =0x00000ee1
adds r0, r1
movs r1, 0xFF
strb r1, [r0]
ldr r0, [r4]
ldr r1, =0x00000ee9
adds r0, r1
movs r1, 0x1
negs r1, r1
strb r1, [r0]
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8084400
thumb_func_start sub_808444C
sub_808444C: @ 808444C
push {lr}
sub sp, 0x4
movs r3, 0x1
negs r3, r3
str r3, [sp]
movs r0, 0x19
movs r1, 0x28
adds r2, r3, 0
bl warp1_set
bl warp_in
add sp, 0x4
pop {r0}
bx r0
thumb_func_end sub_808444C
thumb_func_start init_sav2
init_sav2: @ 808446C
push {lr}
bl memclr_stdsav2
bl init_options
pop {r0}
bx r0
thumb_func_end init_sav2
thumb_func_start sub_808447C
sub_808447C: @ 808447C
push {lr}
ldr r1, =gUnknown_020322D4
movs r0, 0
strb r0, [r1]
bl sub_80BB358
bl zero_player_party_data
bl zero_enemy_party_data
bl sub_81AAB70
bl sub_813624C
pop {r0}
bx r0
.pool
thumb_func_end sub_808447C
thumb_func_start NewGameInitData
@ void NewGameInitData()
NewGameInitData: @ 80844A0
push {r4,r5,lr}
ldr r0, =gUnknown_03006210
ldr r0, =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _080844AE
cmp r0, 0x2
bne _080844B2
_080844AE:
bl GameFreakRTC_Reset
bl RtcReset
_080844B2:
ldr r1, =gUnknown_020322D4
ldr r1, =gDifferentSaveFile
movs r0, 0x1
strb r0, [r1]
ldr r4, =gSaveBlock2Ptr
@@ -266,80 +28,80 @@ _080844B2:
adds r0, 0xAC
movs r5, 0
str r5, [r0]
bl zero_player_party_data
bl zero_enemy_party_data
bl sub_80BB2D0
bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
bl ResetPokedex
bl sub_8084400
bl clear_sav1
bl sub_80D436C
bl ClearSav1
bl ClearMailData
ldr r0, [r4]
strb r5, [r0, 0x9]
ldr r0, [r4]
adds r0, 0xA8
str r5, [r0]
bl set_player_trainer_id
bl reset_playtime
bl sub_8084390
bl sub_809D300
bl sub_80EBEE0
bl GabbyAndTyNewGameInitData
bl sub_80E8B28
bl RemoveAllBerryTrees
bl InitPlayerTrainerId
bl PlayTimeCounter_Reset
bl ClearPokedexFlags
bl InitEventData
bl ClearTVShowData
bl ResetGabbyAndTy
bl ResetSecretBases
bl ClearBerryTrees
ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0x92
lsls r1, 3
adds r0, r1
ldr r1, =0x00000bb8
bl EncryptMoney
bl SetMoney
movs r0, 0
bl SetCoins
bl sub_80D766C
bl sub_80847A8
bl sub_80843C0
bl sub_813C1F8
bl sub_80F9A7C
bl sub_80F9AD4
ldr r0, =gUnknown_020244E9
bl ResetLinkContestBoolean
bl ResetGameStats
bl ClearAllContestWinnerPics
bl InitLinkBattleRecords
bl InitSeedotSizeRecord
bl InitLotadSizeRecord
ldr r0, =gPlayerPartyCount
strb r5, [r0]
bl zero_player_party_data
bl sub_80C7770
bl sub_8161B34
bl sub_8161B60
bl ZeroPlayerPartyMons
bl ResetPokemonStorageSystem
bl ClearRoamerData
bl ClearRoamerLocationData
ldr r0, [r4]
ldr r1, =0x00000496
adds r0, r1
strh r5, [r0]
bl sub_80D7094
bl sub_816ADF4
bl sub_8136E88
bl sub_81618B4
bl sub_811F184
bl sub_8120160
bl sub_81224D4
bl sub_813BA10
bl sub_8177558
bl sub_808444C
bl ClearBag
bl NewGameInitPCItems
bl ClearPokeblocks
bl ClearDecorationInventories
bl InitEasyChatPhrases
bl SetMauvilleOldMan
bl InitDewfordTrend
bl ResetFanClub
bl ResetLotteryCorner
bl WarpToTruck
ldr r0, =gUnknown_082715DE
bl script_env_2_execute_new_script
bl sub_80845CC
bl ScriptContext2_RunNewScript
bl ResetMiniGamesResults
bl copy_strings_to_sav1
bl sub_818DA30
bl SetLilycoveLady
bl sub_819FAA0
bl sub_81A4B14
bl sub_8195E10
bl sub_801AFD8
bl sub_800E5AC
bl sub_81D54BC
bl sub_80DED74
bl ResetContestLinkResults
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end NewGameInitData
thumb_func_start sub_80845CC
sub_80845CC: @ 80845CC
thumb_func_start ResetMiniGamesResults
ResetMiniGamesResults: @ 80845CC
push {r4-r6,lr}
sub sp, 0x4
mov r0, sp
@@ -359,8 +121,8 @@ sub_80845CC: @ 80845CC
lsls r1, 1
adds r0, r1
movs r1, 0
bl sub_802467C
bl sub_802E33C
bl SetBerryPowder
bl ResetPokeJumpResults
mov r0, sp
adds r0, 0x2
strh r5, [r0]
@@ -375,6 +137,6 @@ sub_80845CC: @ 80845CC
pop {r0}
bx r0
.pool
thumb_func_end sub_80845CC
thumb_func_end ResetMiniGamesResults
.align 2, 0 @ Don't pad with nop.
asm/option_menu.s
+5 -5
View File
@@ -9,8 +9,8 @@
sub_80BA4B0: @ 80BA4B0
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -19,8 +19,8 @@ sub_80BA4B0: @ 80BA4B0
thumb_func_start sub_80BA4C8
sub_80BA4C8: @ 80BA4C8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -212,7 +212,7 @@ _080BA69C:
bl ResetPaletteFade
bl remove_some_task
bl ResetTasks
bl ResetAllObjectData
bl ResetSpriteData
ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
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
+36 -36
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_816ADF4
sub_816ADF4: @ 816ADF4
thumb_func_start NewGameInitPCItems
NewGameInitPCItems: @ 816ADF4
push {r4-r6,lr}
movs r4, 0
ldr r0, =gSaveBlock1Ptr
@@ -15,7 +15,7 @@ sub_816ADF4: @ 816ADF4
lsls r1, 3
adds r0, r1
movs r1, 0x32
bl sub_80D6C7C
bl ClearItemSlots
ldr r1, =gUnknown_085DFEFC
ldrh r0, [r1]
cmp r0, 0
@@ -53,7 +53,7 @@ _0816AE48:
pop {r0}
bx r0
.pool
thumb_func_end sub_816ADF4
thumb_func_end NewGameInitPCItems
thumb_func_start sub_816AE58
sub_816AE58: @ 816AE58
@@ -210,7 +210,7 @@ _0816AFC4:
cmp r5, r0
bne _0816B014
movs r0, 0x5
bl audio_play
bl PlaySE
ldrb r0, [r4, 0x8]
movs r1, 0
bl sub_8198070
@@ -504,7 +504,7 @@ sub_816B248: @ 816B248
cmp r4, r0
beq _0816B2B4
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_085DFEDC
lsls r1, r4, 3
adds r0, 0x4
@@ -529,7 +529,7 @@ _0816B298:
.pool
_0816B2B4:
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r6, 0
bl sub_816B4A4
_0816B2C0:
@@ -1033,7 +1033,7 @@ sub_816B674: @ 816B674
.pool
_0816B6D4:
movs r0, 0x5
bl audio_play
bl PlaySE
mov r1, r8
ldrb r0, [r1, 0x9]
bl RemoveScrollIndicatorArrowPair
@@ -1042,7 +1042,7 @@ _0816B6D4:
b _0816B71E
_0816B6EA:
movs r0, 0x5
bl audio_play
bl PlaySE
movs r0, 0
bl sub_81D1D04
movs r0, 0x1
@@ -1192,13 +1192,13 @@ sub_816B82C: @ 816B82C
cmp r4, r0
bne _0816B858
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r5, 0
bl sub_816BBD4
b _0816B86E
_0816B858:
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r0, =gUnknown_085DFF04
lsls r1, r4, 3
adds r0, 0x4
@@ -1398,7 +1398,7 @@ _0816B9FC:
b _0816BA10
_0816BA04:
movs r0, 0x5
bl audio_play
bl PlaySE
_0816BA0A:
adds r0, r4, 0
bl sub_816BAAC
@@ -1428,7 +1428,7 @@ sub_816BA18: @ 816BA18
adds r5, r1, r0
ldrh r0, [r5, 0x20]
movs r1, 0x1
bl bag_add_item
bl AddBagItem
lsls r0, 24
cmp r0, 0
bne _0816BA68
@@ -1850,7 +1850,7 @@ sub_816BDC8: @ 816BDC8
lsls r0, r1, 16
lsrs r0, 16
adds r1, r2, 0
bl itemid_get_name
bl CopyItemName
pop {r0}
bx r0
thumb_func_end sub_816BDC8
@@ -1864,7 +1864,7 @@ sub_816BDDC: @ 816BDDC
cmp r1, 0x1
beq _0816BDEE
movs r0, 0x5
bl audio_play
bl PlaySE
_0816BDEE:
ldr r0, =gUnknown_0203BCC4
ldr r0, [r0]
@@ -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:
@@ -2173,9 +2173,9 @@ sub_816C060: @ 816C060
bne _0816C0B2
ldr r4, =0x000013f6
adds r0, r4, 0
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -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
@@ -2218,16 +2218,16 @@ sub_816C0C8: @ 816C0C8
beq _0816C0FA
ldr r4, =0x000013f6
adds r0, r4, 0
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
ldrb r1, [r5]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_02020630
ldr r1, =gSprites
adds r0, r1
bl RemoveObjectAndFreeTiles
bl DestroySprite
movs r0, 0xFF
strb r0, [r5]
_0816C0FA:
@@ -2416,7 +2416,7 @@ _0816C2AC:
.pool
_0816C2B4:
adds r0, r1, 0
bl itemid_get_description
bl ItemId_GetDescription
_0816C2BA:
pop {r1}
bx r1
@@ -2485,7 +2485,7 @@ sub_816C30C: @ 816C30C
cmp r1, r0
beq _0816C39E
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r5, 0
bl sub_816C450
b _0816C39E
@@ -2509,13 +2509,13 @@ _0816C35C:
.pool
_0816C384:
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r5, 0
bl sub_816C400
b _0816C39E
_0816C392:
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r5, 0
bl sub_816C71C
_0816C39E:
@@ -2653,7 +2653,7 @@ sub_816C450: @ 816C450
adds r1, r0
ldrh r0, [r1]
ldr r1, =gStringVar1
bl itemid_get_name
bl CopyItemName
ldr r0, =0x0000fff7
bl sub_816C228
bl sub_816C2C0
@@ -2771,7 +2771,7 @@ sub_816C5A0: @ 816C5A0
lsls r0, 16
lsrs r6, r0, 16
movs r0, 0x5
bl audio_play
bl PlaySE
mov r2, r8
ldrb r0, [r2, 0xA]
adds r1, r4, 0x2
@@ -2960,7 +2960,7 @@ _0816C774:
adds r0, r1, r2
ldrh r0, [r0]
ldr r1, =gStringVar1
bl itemid_get_name
bl CopyItemName
ldr r0, =0x0000fffe
bl sub_816C228
bl sub_816C2C0
@@ -2986,7 +2986,7 @@ _0816C7BC:
adds r0, r1, r2
ldrh r0, [r0]
ldr r1, =gStringVar1
bl itemid_get_name
bl CopyItemName
ldr r0, =0x0000fffc
bl sub_816C228
bl sub_816C2C0
@@ -3073,7 +3073,7 @@ _0816C888:
cmp r0, 0
beq _0816C8BC
movs r0, 0x5
bl audio_play
bl PlaySE
movs r0, 0x4
bl sub_816BCC4
movs r3, 0x6
@@ -3094,7 +3094,7 @@ _0816C8BC:
cmp r0, 0
beq _0816C8EC
movs r0, 0x5
bl audio_play
bl PlaySE
movs r0, 0x4
bl sub_816BCC4
mov r1, r8
@@ -3145,7 +3145,7 @@ sub_816C8FC: @ 816C8FC
adds r0, r1
ldrh r0, [r0]
ldrh r1, [r4, 0x4]
bl bag_add_item
bl AddBagItem
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3157,7 +3157,7 @@ sub_816C8FC: @ 816C8FC
adds r0, r2
ldrh r0, [r0]
ldr r1, =gStringVar1
bl itemid_get_name
bl CopyItemName
ldr r0, =gStringVar2
movs r2, 0x4
ldrsh r1, [r4, r2]
@@ -3234,7 +3234,7 @@ sub_816C9B8: @ 816C9B8
adds r0, r2
ldrh r0, [r0]
ldr r1, =gStringVar1
bl itemid_get_name
bl CopyItemName
ldr r0, =gStringVar2
movs r2, 0x4
ldrsh r1, [r7, r2]
asm/pokeblock_feed.s
+32 -32
View File
@@ -9,8 +9,8 @@
sub_8179B68: @ 8179B68
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl do_scheduled_bg_tilemap_copies_to_vram
bl UpdatePaletteFade
pop {r0}
@@ -20,8 +20,8 @@ sub_8179B68: @ 8179B68
thumb_func_start sub_8179B84
sub_8179B84: @ 8179B84
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -84,7 +84,7 @@ _08179C20:
b _08179D30
.pool
_08179C34:
bl ResetAllObjectData
bl ResetSpriteData
ldr r1, =gMain
movs r2, 0x87
lsls r2, 3
@@ -92,7 +92,7 @@ _08179C34:
b _08179D3A
.pool
_08179C48:
bl ResetObjectPaletteAllocator
bl FreeAllSpritePalettes
b _08179D32
_08179C4E:
bl init_uns_table_pokemon_copy
@@ -327,7 +327,7 @@ _08179E48:
ldr r1, [r1, 0x8]
adds r2, r5, 0
adds r3, r4, 0
bl DecompressMonPic_DetectFrontOrBack_2
bl HandleLoadSpecialPokePic_2
ldr r0, =gUnknown_0203BD18
ldr r1, [r0]
b _08179F5E
@@ -781,8 +781,8 @@ sub_817A2C0: @ 817A2C0
ands r0, r1
cmp r0, 0
bne _0817A304
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
@@ -849,7 +849,7 @@ sub_817A358: @ 817A358
movs r1, 0x30
movs r2, 0x50
movs r3, 0x2
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -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
@@ -880,7 +880,7 @@ sub_817A358: @ 817A358
adds r0, r7, 0
adds r0, 0x1C
adds r0, r5, r0
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
mov r2, r9
ldr r0, [r2]
@@ -908,7 +908,7 @@ sub_817A358: @ 817A358
lsls r3, 30
lsrs r3, 30
adds r0, r6, 0
bl CalcVecFromObjectCenterToObjectUpperLeft
bl CalcCenterToCornerVec
mov r2, r9
ldr r0, [r2]
ldr r1, =0x00001053
@@ -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
@@ -970,13 +970,13 @@ sub_817A468: @ 817A468
bne _0817A48E
ldrh r0, [r4, 0x32]
movs r1, 0
bl cry_related
bl PlayCry1
_0817A48E:
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0x9
bne _0817A49A
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_0817A49A:
pop {r4}
@@ -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
@@ -1014,9 +1014,9 @@ sub_817A4A4: @ 817A4A4
str r2, [r1]
adds r5, 0x1C
adds r3, r5
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r3]
bl obj_alloc_rotscale_entry
bl InitSpriteAffineAnim
adds r0, r4, 0
pop {r4,r5}
pop {r1}
@@ -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
@@ -1044,7 +1044,7 @@ sub_817A4F8: @ 817A4F8
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
bl rotscale_free_entry
bl FreeOamMatrix
ldrb r0, [r4, 0x1]
movs r1, 0x3
orrs r0, r1
@@ -1067,9 +1067,9 @@ _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
bl InitSpriteAffineAnim
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -1085,10 +1085,10 @@ sub_817A56C: @ 817A56C
movs r1, 0xAE
movs r2, 0x54
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020630
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -1121,7 +1121,7 @@ sub_817A5A0: @ 817A5A0
cmp r0, 0xA
bne _0817A5C6
adds r0, r2, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0817A5C6:
pop {r0}
bx r0
@@ -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}
@@ -1342,7 +1342,7 @@ _0817A818:
ldr r0, [r4]
ldr r1, =gUnknown_085F04FC
str r1, [r0, 0x10]
bl obj_alloc_rotscale_entry
bl InitSpriteAffineAnim
_0817A850:
ldr r0, =0x00001050
adds r1, r4, r0
@@ -1368,13 +1368,13 @@ _0817A858:
adds r1, 0xA
lsls r1, 24
lsrs r1, 24
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0817A8C8
.pool
_0817A898:
ldr r0, [r4]
ldrb r1, [r2]
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0817A8C8
_0817A8A2:
bl sub_817A9E4
@@ -1406,7 +1406,7 @@ _0817A8E0:
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
bl rotscale_free_entry
bl FreeOamMatrix
ldr r2, =0x00001050
adds r1, r4, r2
movs r0, 0x46
@@ -1569,7 +1569,7 @@ sub_817AA3C: @ 817AA3C
ldr r0, =gUnknown_0203BD18
ldr r0, [r0]
ldr r0, [r0]
bl obj_free_rotscale_entry
bl FreeSpriteOamMatrix
movs r0, 0
pop {r1}
bx r1
asm/pokedex.s
+213 -213
View File
File diff suppressed because it is too large Load Diff
asm/pokedex_area_screen.s
+19 -19
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
@@ -1287,8 +1287,8 @@ _0813D45C:
.4byte _0813D544
.4byte _0813D56C
_0813D48C:
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0x3
bl HideBg
movs r0, 0x2
@@ -1460,7 +1460,7 @@ _0813D5F8:
beq _0813D614
strh r1, [r6, 0xA]
movs r0, 0x3
bl audio_play
bl PlaySE
b _0813D698
.pool
_0813D614:
@@ -1481,7 +1481,7 @@ _0813D614:
_0813D630:
strh r3, [r6, 0xA]
movs r0, 0x6D
bl audio_play
bl PlaySE
b _0813D698
.pool
_0813D640:
@@ -1560,9 +1560,9 @@ sub_813D6D0: @ 813D6D0
mov r5, r8
push {r5-r7}
ldr r0, =gUnknown_085B401C
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085B4024
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r0, =gUnknown_03001204
movs r1, 0
strh r1, [r0]
@@ -1642,12 +1642,12 @@ _0813D710:
ldrsh r2, [r3, r0]
ldr r0, =gUnknown_085B4034
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
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
@@ -1708,9 +1708,9 @@ _0813D7D8:
sub_813D824: @ 813D824
push {r4,r5,lr}
movs r0, 0x2
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
movs r0, 0x2
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
movs r4, 0
ldr r1, =gUnknown_0203AB7C
ldr r0, [r1]
@@ -1729,7 +1729,7 @@ _0813D846:
adds r0, r2
adds r0, r1
ldr r0, [r0]
bl RemoveObjectAndFreeTiles
bl DestroySprite
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -1742,9 +1742,9 @@ _0813D846:
bcc _0813D846
_0813D86C:
movs r0, 0x3
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
movs r0, 0x3
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
movs r4, 0
_0813D87A:
ldr r0, =gUnknown_0203AB7C
@@ -1757,7 +1757,7 @@ _0813D87A:
ldr r0, [r0]
cmp r0, 0
beq _0813D892
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0813D892:
adds r0, r4, 0x1
lsls r0, 16
@@ -1784,9 +1784,9 @@ sub_813D8A8: @ 813D8A8
ldr r0, =gUnknown_08DC4140
bl LZ77UnCompWram
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085B40EC
bl LoadTaggedObjectPalette
bl LoadSpritePalette
add sp, 0x8
pop {r0}
bx r0
@@ -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
@@ -1834,7 +1834,7 @@ _0813D924:
ldr r0, =gUnknown_085B40FC
movs r2, 0x8C
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
asm/pokedex_cry_screen.s
+14 -14
View File
@@ -179,7 +179,7 @@ _081454B8:
_081454C2:
cmp r0, 0x8
bls _081454E6
bl sub_80A36EC
bl IsCryPlaying
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -253,12 +253,12 @@ sub_8145534: @ 8145534
bne _08145582
movs r0, 0x4
strb r0, [r1, 0x1B]
bl sub_80A36EC
bl IsCryPlaying
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0814557C
bl sub_80A36B4
bl StopCry
ldr r1, [r6]
strh r4, [r1, 0x18]
movs r0, 0x2
@@ -282,7 +282,7 @@ sub_8145588: @ 8145588
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
bl sub_80A32C0
bl PlayCry2
ldr r0, =gUnknown_0203AB90
ldr r1, [r0]
movs r0, 0x1
@@ -676,9 +676,9 @@ _08145884:
.pool
_081458B0:
ldr r0, =gUnknown_085B8C80
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_085B8C90
bl LoadTaggedObjectPalettes
bl LoadSpritePalettes
ldr r0, =gUnknown_085B8C68
ldrb r1, [r4, 0x4]
lsls r1, 19
@@ -693,7 +693,7 @@ _081458B0:
adds r2, r3
asrs r2, 16
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
ldr r2, =gUnknown_0203AB98
ldr r3, [r2]
lsls r0, 24
@@ -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]
@@ -731,17 +731,17 @@ sub_8145914: @ 8145914
adds r0, r4
ldrb r0, [r0, 0x5]
lsrs r0, 4
bl GetObjectPaletteTagBySlot
bl GetSpritePaletteTagByPaletteNum
lsls r0, 16
lsrs r0, 16
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
ldr r0, [r6]
ldrh r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r4, =gUnknown_0203AB90
ldr r0, [r4]
bl Free
@@ -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]
@@ -935,8 +935,8 @@ _08145A82:
ldrh r0, [r4, 0x6]
str r0, [sp]
movs r0, 0
bl SetSpriteTransformationMatrix
ldr r2, =gUnknown_08329F40
bl SetOamMatrix
ldr r2, =gSineTable
ldr r0, [r6]
ldrb r0, [r0]
lsls r0, 24
asm/pokemon_1.s
+130 -130
View File
@@ -34,54 +34,54 @@ 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}
bx r0
thumb_func_end zero_pokemon_struct
thumb_func_start zero_player_party_data
@ void zero_player_party_data()
zero_player_party_data: @ 8067B0C
thumb_func_start ZeroPlayerPartyMons
@ void ZeroPlayerPartyMons()
ZeroPlayerPartyMons: @ 8067B0C
push {r4,r5,lr}
ldr r4, =gPlayerParty
movs r0, 0xFA
@@ -97,10 +97,10 @@ _08067B16:
pop {r0}
bx r0
.pool
thumb_func_end zero_player_party_data
thumb_func_end ZeroPlayerPartyMons
thumb_func_start zero_enemy_party_data
zero_enemy_party_data: @ 8067B2C
thumb_func_start ZeroEnemyPartyMons
ZeroEnemyPartyMons: @ 8067B2C
push {r4,r5,lr}
ldr r4, =gEnemyParty
movs r0, 0xFA
@@ -116,7 +116,7 @@ _08067B36:
pop {r0}
bx r0
.pool
thumb_func_end zero_enemy_party_data
thumb_func_end ZeroEnemyPartyMons
thumb_func_start create_pokemon_set_level
@ void create_pokemon_set_level(pokemon *mon, s16 species_num, u8 level, u8 forced_iv, char pokemon_id_is_nonrandom, int pokemon_id, u8 trainer_id_mode, int trainer_id)
@@ -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
@@ -2133,13 +2133,13 @@ _08068BE0:
DoScriptedWildBattle: @ 8068C18
push {r4-r7,lr}
sub sp, 0x14
ldr r0, =gUnknown_020375E0
ldr r0, =gSpecialVar_0x8004
ldrh r5, [r0]
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrh r4, [r0]
ldr r0, =gUnknown_020375E4
ldr r0, =gSpecialVar_0x8006
ldrh r6, [r0]
bl zero_enemy_party_data
bl ZeroEnemyPartyMons
ldr r7, =gEnemyParty
lsls r4, 24
lsrs r4, 24
@@ -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
+50 -50
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
@@ -2916,7 +2916,7 @@ _0806B446:
adds r1, r6, 0
movs r2, 0x64
bl memcpy_pokemon
ldr r1, =gUnknown_020244E9
ldr r1, =gPlayerPartyCount
adds r0, r5, 0x1
strb r0, [r1]
movs r0, 0
@@ -2968,9 +2968,9 @@ _0806B4B2:
mov r1, r8
movs r2, 0x50
bl memcpy_pokemon
ldr r0, =gUnknown_020375F6
ldr r0, =gSpecialVar_0x8012
strh r5, [r0]
ldr r0, =gUnknown_020375F8
ldr r0, =gSpecialVar_0x8013
strh r6, [r0]
bl get_unknown_box_id
lsls r0, 16
@@ -3014,7 +3014,7 @@ _0806B530:
@ u8 calc_player_party_count()
calc_player_party_count: @ 806B53C
push {r4,lr}
ldr r0, =gUnknown_020244E9
ldr r0, =gPlayerPartyCount
movs r1, 0
strb r1, [r0]
b _0806B554
@@ -3089,7 +3089,7 @@ sub_806B5C4: @ 806B5C4
push {r4-r6,lr}
movs r6, 0
bl calc_player_party_count
ldr r1, =gUnknown_020244E9
ldr r1, =gPlayerPartyCount
ldrb r0, [r1]
cmp r0, 0x1
beq _0806B628
@@ -3126,7 +3126,7 @@ _0806B5DC:
adds r6, 0x1
_0806B616:
adds r5, 0x1
ldr r0, =gUnknown_020244E9
ldr r0, =gPlayerPartyCount
ldrb r0, [r0]
cmp r5, r0
blt _0806B5DC
@@ -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
@@ -3262,8 +3262,8 @@ create_enemy_party: @ 806B70C
push {r5-r7}
sub sp, 0x14
adds r5, r0, 0
bl zero_enemy_party_data
ldr r4, =gUnknown_020244A8
bl ZeroEnemyPartyMons
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
+101 -101
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:
@@ -2507,8 +2507,8 @@ _0806D1DC:
adds r0, r3
b _0806D228
_0806D1E6:
bl GameFreakRTC_CalcLocalDateTime
ldr r0, =gUnknown_03005CF8
bl RtcCalcLocalTime
ldr r0, =gLocalTime
ldrb r0, [r0, 0x2]
subs r0, 0xC
lsls r0, 24
@@ -2525,8 +2525,8 @@ _0806D202:
b _0806D21E
.pool
_0806D208:
bl GameFreakRTC_CalcLocalDateTime
ldr r0, =gUnknown_03005CF8
bl RtcCalcLocalTime
ldr r0, =gLocalTime
ldrb r0, [r0, 0x2]
cmp r0, 0xB
bls _0806D216
@@ -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
@@ -2945,8 +2945,8 @@ _0806D50A:
bx r1
thumb_func_end HoennToNationalOrder
thumb_func_start speciesid_conv
speciesid_conv: @ 806D510
thumb_func_start SpeciesToCryId
SpeciesToCryId: @ 806D510
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -2969,7 +2969,7 @@ _0806D53C:
_0806D53E:
pop {r1}
bx r1
thumb_func_end speciesid_conv
thumb_func_end SpeciesToCryId
thumb_func_start sub_806D544
sub_806D544: @ 806D544
@@ -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
@@ -4893,7 +4893,7 @@ sub_806E3C0: @ 806E3C0
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl sub_809D42C
bl IsNationalPokedexEnabled
cmp r0, 0
beq _0806E3DA
adds r0, r4, 0
@@ -5157,38 +5157,38 @@ _0806E646:
thumb_func_start sub_806E64C
sub_806E64C: @ 806E64C
push {lr}
bl map_music_set_to_zero
bl ResetMapMusic
bl m4aMPlayAllStop
bl song_id_for_battle
lsls r0, 16
lsrs r0, 16
bl song_play_for_text
bl PlayBGM
pop {r0}
bx r0
thumb_func_end sub_806E64C
thumb_func_start current_map_music_set__default_for_battle
current_map_music_set__default_for_battle: @ 806E668
thumb_func_start PlayNewMapMusic__default_for_battle
PlayNewMapMusic__default_for_battle: @ 806E668
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl map_music_set_to_zero
bl ResetMapMusic
bl m4aMPlayAllStop
cmp r4, 0
beq _0806E682
adds r0, r4, 0
bl current_map_music_set
bl PlayNewMapMusic
b _0806E68E
_0806E682:
bl song_id_for_battle
lsls r0, 16
lsrs r0, 16
bl current_map_music_set
bl PlayNewMapMusic
_0806E68E:
pop {r4}
pop {r0}
bx r0
thumb_func_end current_map_music_set__default_for_battle
thumb_func_end PlayNewMapMusic__default_for_battle
thumb_func_start sub_806E694
sub_806E694: @ 806E694
@@ -5196,7 +5196,7 @@ sub_806E694: @ 806E694
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
bl map_music_set_to_zero
bl ResetMapMusic
bl m4aMPlayAllStop
ldr r0, =sub_806E6CC
movs r1, 0
@@ -5230,14 +5230,14 @@ sub_806E6CC: @ 806E6CC
cmp r0, 0
beq _0806E6F0
ldrh r0, [r1, 0x8]
bl current_map_music_set
bl PlayNewMapMusic
b _0806E6FC
.pool
_0806E6F0:
bl song_id_for_battle
lsls r0, 16
lsrs r0, 16
bl current_map_music_set
bl PlayNewMapMusic
_0806E6FC:
adds r0, r4, 0
bl DestroyTask
@@ -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
@@ -6056,9 +6056,9 @@ _0806ED66:
lsls r1, 24
asrs r1, 24
adds r0, r4, 0
bl cry_related
bl PlayCry1
_0806ED7C:
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
b _0806EDFA
.pool
_0806ED84:
@@ -6067,7 +6067,7 @@ _0806ED84:
lsls r1, 24
asrs r1, 24
adds r0, r4, 0
bl cry_related
bl PlayCry1
adds r0, r4, 0
bl sub_806F0D4
lsls r0, 24
@@ -6075,7 +6075,7 @@ _0806ED84:
beq _0806EDA6
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0806EDA6:
ldr r0, =gUnknown_08329B87
subs r4, 0x1
@@ -6136,7 +6136,7 @@ sub_806EE0C: @ 806EE0C
beq _0806EE2E
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0806EE2E:
ldr r0, =gUnknown_08329B87
subs r4, 0x1
@@ -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
@@ -6215,7 +6215,7 @@ sub_806EEB4: @ 806EEB4
ands r0, r1
cmp r0, 0
bne _0806EEE8
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
b _0806EEFC
.pool
_0806EEE8:
asm/porthole.s
+4 -4
View File
@@ -176,7 +176,7 @@ _080FB6E2:
sub_80FB6EC: @ 80FB6EC
push {r4,lr}
sub sp, 0x4
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0x8C
@@ -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
@@ -209,7 +209,7 @@ sub_80FB6EC: @ 80FB6EC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _080FB75E
.pool
_080FB74C:
@@ -219,7 +219,7 @@ _080FB74C:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080FB75E:
add sp, 0x4
pop {r4}
asm/record_mixing.s
+23 -23
View File
@@ -498,7 +498,7 @@ sub_80E7128: @ 80E7128
cmp r0, 0x32
bne _080E7150
movs r0, 0xE2
bl audio_play
bl PlaySE
movs r0, 0
strh r0, [r4, 0x8]
_080E7150:
@@ -547,7 +547,7 @@ _080E71A0:
ldr r0, =0x00005110
bl Alloc
str r0, [r4]
ldr r0, =gUnknown_020375E2
ldr r0, =gSpecialVar_0x8005
ldrb r0, [r0]
bl sub_8009628
movs r0, 0x80
@@ -605,7 +605,7 @@ _080E724C:
movs r0, 0x3
strh r0, [r5]
movs r0, 0xE0
bl audio_play
bl PlaySE
b _080E730A
.pool
_080E726C:
@@ -781,7 +781,7 @@ _080E73B8:
b _080E7566
_080E73DA:
movs r0, 0x15
bl audio_play
bl PlaySE
movs r1, 0
movs r0, 0xC9
strh r0, [r5, 0x8]
@@ -789,7 +789,7 @@ _080E73DA:
b _080E7566
_080E73EA:
movs r0, 0x16
bl audio_play
bl PlaySE
ldr r0, =0x0000012d
b _080E7564
.pool
@@ -2253,14 +2253,14 @@ sub_80E7F68: @ 80E7F68
ldrh r0, [r4]
cmp r0, 0
beq _080E7FEC
bl sub_80D6C68
bl GetPocketByItemId
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
bne _080E7FEC
ldrh r0, [r4]
movs r1, 0x1
bl sub_80D6724
bl CheckBagHasItem
lsls r0, 24
cmp r0, 0
bne _080E7FE4
@@ -2272,7 +2272,7 @@ sub_80E7F68: @ 80E7F68
bne _080E7FE4
ldrh r0, [r4]
movs r1, 0x1
bl bag_add_item
bl AddBagItem
lsls r0, 24
cmp r0, 0
beq _080E7FE4
@@ -2484,12 +2484,12 @@ _080E8150:
adds r5, r1, 0
adds r5, 0x34
adds r0, r5, 0
bl sub_80842DC
bl ReadUnalignedWord
adds r4, r0, 0
mov r1, r9
ldr r0, [r1]
adds r0, 0xA
bl sub_80842DC
bl ReadUnalignedWord
cmp r4, r0
beq _080E819A
movs r2, 0x1
@@ -2497,12 +2497,12 @@ _080E8150:
str r6, [sp, 0x4]
_080E819A:
adds r0, r5, 0
bl sub_80842DC
bl ReadUnalignedWord
adds r4, r0, 0
mov r1, r9
ldr r0, [r1]
adds r0, 0xA
bl sub_80842DC
bl ReadUnalignedWord
cmp r4, r0
bne _080E81B8
ldr r2, [sp, 0xC]
@@ -2619,7 +2619,7 @@ _080E8286:
ldr r1, [r2]
adds r1, 0xA
adds r0, r5, 0
bl sub_80842F4
bl CopyUnalignedWord
movs r0, 0x2
strb r0, [r4, 0xE]
mov r0, r10
@@ -2662,13 +2662,13 @@ _080E82DA:
ldr r1, [r2]
adds r1, 0xA
adds r0, r5, 0
bl sub_80842F4
bl CopyUnalignedWord
mov r0, r10
ldr r1, [r0]
ldr r2, [sp, 0x8]
adds r1, r2
adds r0, r6, 0
bl sub_80842F4
bl CopyUnalignedWord
mov r0, r10
ldr r1, [r0]
mov r0, r9
@@ -2810,10 +2810,10 @@ sub_80E841C: @ 80E841C
_080E842E:
adds r0, r7, 0
adds r0, 0x34
bl sub_80842DC
bl ReadUnalignedWord
adds r4, r0, 0
adds r0, r6, 0
bl sub_80842DC
bl ReadUnalignedWord
cmp r4, r0
bne _080E844E
ldrb r0, [r7, 0x2]
@@ -3109,13 +3109,13 @@ _080E8666:
ldr r6, [sp, 0x1C]
adds r0, r6, r0
str r3, [sp, 0x4C]
bl sub_80842DC
bl ReadUnalignedWord
adds r4, r0, 0
ldr r1, [sp, 0x50]
ldr r0, [r1]
add r0, r9
adds r0, r7
bl sub_80842DC
bl ReadUnalignedWord
ldr r3, [sp, 0x4C]
cmp r4, r0
bne _080E86A8
@@ -3271,7 +3271,7 @@ _080E878E:
adds r5, r0, r6
adds r0, r5, 0
str r3, [sp, 0x4C]
bl sub_80842DC
bl ReadUnalignedWord
adds r4, r0, 0
movs r6, 0x90
lsls r6, 1
@@ -3279,18 +3279,18 @@ _080E878E:
mov r1, r9
ldr r0, [r1]
adds r0, r6
bl sub_80842DC
bl ReadUnalignedWord
ldr r3, [sp, 0x4C]
cmp r4, r0
bne _080E8808
adds r0, r5, 0x4
bl sub_80842DC
bl ReadUnalignedWord
adds r4, r0, 0
mov r2, r9
ldr r0, [r2]
adds r0, r6
adds r0, 0x4
bl sub_80842DC
bl ReadUnalignedWord
ldr r3, [sp, 0x4C]
cmp r4, r0
bne _080E8808
asm/region_map.s
+39 -39
View File
@@ -426,29 +426,29 @@ sub_812305C: @ 812305C
ldr r0, [r0, 0x1C]
cmp r0, 0
beq _08123080
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r4]
adds r0, 0x58
ldrh r0, [r0]
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
ldr r0, [r4]
adds r0, 0x5A
ldrh r0, [r0]
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
_08123080:
ldr r0, [r4]
ldr r0, [r0, 0x20]
cmp r0, 0
beq _081230A0
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r4]
adds r0, 0x70
ldrh r0, [r0]
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
ldr r0, [r4]
adds r0, 0x72
ldrh r0, [r0]
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
_081230A0:
pop {r4}
pop {r0}
@@ -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
@@ -2639,14 +2639,14 @@ _08124158:
_0812416E:
str r0, [sp, 0x14]
adds r0, r2, 0
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r7, 0
bl LoadTaggedObjectPalette
bl LoadSpritePalette
mov r0, sp
movs r1, 0x38
movs r2, 0x48
movs r3, 0
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 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
@@ -2680,7 +2680,7 @@ _0812416E:
strh r0, [r1, 0x22]
ldr r0, [r2, 0x1C]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _08124204
.pool
_081241DC:
@@ -2711,7 +2711,7 @@ _08124204:
movs r0, 0x2
strh r0, [r1, 0x30]
adds r0, r6, 0
bl IndexOfObjectPaletteTag
bl IndexOfSpritePaletteTag
ldr r1, [r4]
ldr r2, [r1, 0x1C]
lsls r0, 24
@@ -2738,15 +2738,15 @@ sub_8124238: @ 8124238
ldr r0, [r0, 0x1C]
cmp r0, 0
beq _0812425C
bl RemoveObjectAndFreeTiles
bl DestroySprite
ldr r0, [r4]
adds r0, 0x58
ldrh r0, [r0]
bl FreeObjectTilesByTag
bl FreeSpriteTilesByTag
ldr r0, [r4]
adds r0, 0x5A
ldrh r0, [r0]
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
_0812425C:
pop {r4}
pop {r0}
@@ -2807,9 +2807,9 @@ sub_8124288: @ 8124288
ldr r0, =gUnknown_085A1C30
str r0, [sp, 0x8]
str r5, [sp, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
ldr r0, =gDummySpriteAffineAnimTable
str r0, [sp, 0x10]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [sp, 0x14]
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x14]
@@ -2833,14 +2833,14 @@ _08124304:
str r0, [sp, 0x20]
_08124316:
adds r0, r6, 0
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r4, 0
bl LoadTaggedObjectPalette
bl LoadSpritePalette
mov r0, sp
movs r1, 0
movs r2, 0
movs r3, 0x1
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_0203A144
@@ -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
@@ -2914,7 +2914,7 @@ sub_81243B0: @ 81243B0
strb r0, [r2]
ldr r0, [r3]
ldr r1, [r0, 0x20]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1, 0x1C]
_081243CE:
pop {r0}
@@ -3378,9 +3378,9 @@ _081246E4:
.pool
_08124754:
bl ResetPaletteFade
bl ResetAllObjectData
bl FreeAllObjectTiles
bl ResetObjectPaletteAllocator
bl ResetSpriteData
bl FreeSpriteTileRanges
bl FreeAllSpritePalettes
b _0812489C
_08124766:
movs r0, 0
@@ -3516,8 +3516,8 @@ _081248AA:
thumb_func_start sub_81248C0
sub_81248C0: @ 81248C0
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -3530,8 +3530,8 @@ sub_81248D4: @ 81248D4
ldr r0, [r0]
ldr r0, [r0]
bl _call_via_r0
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
bx r0
@@ -3739,9 +3739,9 @@ sub_8124A70: @ 8124A70
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085A1F10
bl LoadTaggedObjectPalette
bl LoadSpritePalette
bl sub_8124AD4
bl sub_8124BE4
add sp, 0x8
@@ -3818,12 +3818,12 @@ _08124B44:
ldrsh r2, [r3, r0]
ldr r0, =gUnknown_085A1F7C
movs r3, 0xA
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
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,12 +3854,12 @@ _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
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
mov r2, r9
strh r2, [r4, 0x2E]
_08124BB8:
@@ -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
@@ -3942,7 +3942,7 @@ _08124C0C:
ldrsh r2, [r5, r0]
ldr r0, =gUnknown_085A1F7C
movs r3, 0xA
bl AddObjectToFront
bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -3963,7 +3963,7 @@ _08124C0C:
str r0, [r2]
adds r0, r4, 0
movs r1, 0x6
bl StartObjectImageAnim
bl StartSpriteAnim
strh r6, [r4, 0x2E]
_08124C84:
mov r0, r8
asm/reset_rtc_screen.s
+31 -31
View File
@@ -144,7 +144,7 @@ _0809E9CE:
b _0809E9FE
_0809E9F8:
adds r0, r3, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0809E9FE:
pop {r0}
bx r0
@@ -275,7 +275,7 @@ _0809EAEA:
b _0809EAFE
_0809EAF8:
adds r0, r3, 0
bl RemoveObjectAndFreeTiles
bl DestroySprite
_0809EAFE:
pop {r0}
bx r0
@@ -290,16 +290,16 @@ sub_809EB04: @ 809EB04
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_085104C4
bl LoadTaggedObjectPalette
bl LoadSpritePalette
ldr r0, =gUnknown_085104F0
mov r8, r0
movs r1, 0x35
movs r2, 0x44
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
ldr r6, =gUnknown_02020630
ldr r6, =gSprites
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -316,7 +316,7 @@ sub_809EB04: @ 809EB04
movs r1, 0x35
movs r2, 0x44
movs r3, 0
bl AddObjectToBack
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 4
@@ -343,7 +343,7 @@ sub_809EB8C: @ 809EB8C
push {lr}
ldr r0, =gUnknown_085104C4
ldrh r0, [r0, 0x4]
bl FreeObjectPaletteByTag
bl FreeSpritePaletteByTag
pop {r0}
bx r0
.pool
@@ -695,7 +695,7 @@ _0809EE4A:
_0809EE5C:
strh r0, [r5, 0x4]
movs r0, 0x5
bl audio_play
bl PlaySE
b _0809EEF4
_0809EE66:
cmp r4, 0x5
@@ -707,7 +707,7 @@ _0809EE66:
ands r0, r1
cmp r0, 0
beq _0809EEF4
ldr r1, =gUnknown_03005CF8
ldr r1, =gLocalTime
ldrh r0, [r5, 0x6]
strh r0, [r1]
ldrh r0, [r5, 0x8]
@@ -717,7 +717,7 @@ _0809EE66:
ldrh r0, [r5, 0xC]
strb r0, [r1, 0x4]
movs r0, 0x5
bl audio_play
bl PlaySE
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
@@ -744,7 +744,7 @@ _0809EEB4:
cmp r0, 0
beq _0809EEF4
movs r0, 0x5
bl audio_play
bl PlaySE
ldrb r0, [r5, 0x10]
ldrh r3, [r5, 0x6]
ldrb r1, [r5, 0x8]
@@ -787,7 +787,7 @@ sub_809EF00: @ 809EF00
adds r5, r6, r0
movs r0, 0
strh r0, [r5]
ldr r1, =gUnknown_03005CF8
ldr r1, =gLocalTime
ldrh r0, [r1]
strh r0, [r5, 0x6]
movs r0, 0x2
@@ -885,11 +885,11 @@ _0809EFCA:
ldr r0, [r1, 0x8]
movs r0, 0
movs r1, 0x80
bl ResetSpriteRange
bl LoadOamFromSprites
bl ResetOamRange
bl LoadOam
bl remove_some_task
bl dp12_8087EA4
bl ResetAllObjectData
bl ResetSpriteData
bl ResetTasks
bl ResetPaletteFade
bl sub_809F048
@@ -938,8 +938,8 @@ sub_809F048: @ 809F048
sub_809F090: @ 809F090
push {lr}
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl AnimateSprites
bl BuildOamBuffer
bl do_scheduled_bg_tilemap_copies_to_vram
bl UpdatePaletteFade
pop {r0}
@@ -949,8 +949,8 @@ sub_809F090: @ 809F090
thumb_func_start sub_809F0AC
sub_809F0AC: @ 809F0AC
push {lr}
bl ProcessObjectCopyRequests
bl LoadOamFromSprites
bl ProcessSpriteCopyRequests
bl LoadOam
bl TransferPlttBuffer
pop {r0}
bx r0
@@ -1021,7 +1021,7 @@ _0809F11C:
movs r1, 0x1
movs r3, 0
bl Print
ldr r1, =gUnknown_03005CF8
ldr r1, =gLocalTime
ldrh r3, [r1]
ldrb r0, [r1, 0x2]
str r0, [sp]
@@ -1090,7 +1090,7 @@ _0809F1E4:
cmp r0, 0
beq _0809F1F8
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r7, 0
bl DestroyTask
_0809F1F8:
@@ -1154,7 +1154,7 @@ _0809F268:
beq _0809F276
b _0809F404
_0809F276:
ldr r0, =gUnknown_03006210
ldr r0, =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _0809F282
@@ -1168,7 +1168,7 @@ _0809F282:
b _0809F404
.pool
_0809F29C:
bl GameFreakRTC_CalcLocalDateTime
bl RtcCalcLocalTime
ldr r0, =sub_809F0F8
movs r1, 0x50
bl CreateTask
@@ -1195,7 +1195,7 @@ _0809F2CA:
bl sub_8198070
ldr r0, =gUnknown_085ECA38
bl sub_809F0C0
ldr r2, =gUnknown_03005CF8
ldr r2, =gLocalTime
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xA0
@@ -1239,8 +1239,8 @@ _0809F334:
_0809F340:
ldrb r0, [r5, 0x2]
bl DestroyTask
bl GameFreakRTC_Reset
ldr r4, =gUnknown_03005CF8
bl RtcReset
ldr r4, =gLocalTime
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0x2
@@ -1249,7 +1249,7 @@ _0809F340:
ldrsb r2, [r4, r2]
movs r3, 0x4
ldrsb r3, [r4, r3]
bl GameFreakRTC_CalcRTCToLocalDelta
bl RtcCalcLocalTimeOffset
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
adds r2, 0xA0
@@ -1260,7 +1260,7 @@ _0809F340:
ldr r0, =0x00004040
ldrh r1, [r4]
bl VarSet
bl sub_809D5D8
bl DisableResetRTC
ldr r0, =gUnknown_085ECA4F
bl sub_809F0C0
movs r0, 0x4
@@ -1269,7 +1269,7 @@ _0809F340:
.pool
_0809F398:
movs r0, 0
bl save_game_when_memory_present
bl TrySavingData
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1277,14 +1277,14 @@ _0809F398:
ldr r0, =gUnknown_085ECA8A
bl sub_809F0C0
movs r0, 0x49
bl audio_play
bl PlaySE
b _0809F3C4
.pool
_0809F3B8:
ldr r0, =gUnknown_085ECA9A
bl sub_809F0C0
movs r0, 0x16
bl audio_play
bl PlaySE
_0809F3C4:
movs r0, 0x5
strh r0, [r5]
asm/reshow_battle_screen.s
+1040
View File
File diff suppressed because it is too large Load Diff
asm/rom3.s
+138 -138
View File
@@ -40,18 +40,18 @@ _08032686:
sub_803269C: @ 803269C
push {r4-r7,lr}
sub sp, 0x14
ldr r0, =gUnknown_03005D04
ldr r0, =gBattleMainFunc
ldr r1, =nullsub_20
str r1, [r0]
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
@@ -85,7 +85,7 @@ _080326B8:
ands r0, r1
cmp r0, 0
beq _08032728
bl zero_enemy_party_data
bl ZeroEnemyPartyMons
ldr r4, =gEnemyParty
movs r1, 0x90
lsls r1, 1
@@ -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
@@ -221,7 +221,7 @@ b_setup_bx: @ 8032824
ands r5, r3
cmp r5, 0
beq _080328E4
ldr r1, =gUnknown_03005D04
ldr r1, =gBattleMainFunc
ldr r0, =sub_8039ECC
str r0, [r1]
movs r4, 0x80
@@ -229,33 +229,33 @@ b_setup_bx: @ 8032824
ands r4, r3
cmp r4, 0
beq _08032874
ldr r2, =gUnknown_03005D60
ldr r0, =sub_818994C
ldr r2, =gBattleBankFunc
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
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
ldr r3, =SetBankFuncToOpponentBufferRunCommand
str r3, [r2, 0x4]
movs r0, 0x1
strb r0, [r1, 0x1]
ldr r0, =sub_81BADF4
ldr r0, =SetBankFuncToPlayerPartnerBufferRunCommand
str r0, [r2, 0x8]
movs r0, 0x2
strb r0, [r1, 0x2]
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]
@@ -285,7 +285,7 @@ _080328E4:
beq _080328F0
b _080329E0
_080328F0:
ldr r0, =gUnknown_03005D04
ldr r0, =gBattleMainFunc
ldr r2, =sub_8039ECC
str r2, [r0]
movs r1, 0x80
@@ -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,28 +303,28 @@ _08032918:
ands r3, r0
cmp r3, 0
beq _08032930
ldr r1, =gUnknown_03005D60
ldr r0, =bx_goto_buffer_A_ch0_tbl3
ldr r1, =gBattleBankFunc
ldr r0, =SetBankFuncToWallyBufferRunCommand
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
strb r1, [r4]
mov r5, r10
ldr r2, =sub_805F164
ldr r2, =SetBankFuncToOpponentBufferRunCommand
mov r8, r2
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
@@ -347,30 +347,30 @@ _08032964:
cmp r1, 0
beq _080329B4
mov r1, r12
ldr r0, =gUnknown_03005D04
ldr r0, =gBattleMainFunc
str r1, [r0]
ldr r0, =sub_818994C
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
str r0, [r5]
mov r1, r9
strb r1, [r4]
ldr r0, =sub_81864EC
ldr r0, =SetBankFuncToRecordedOpponentBufferRunCommand
str r0, [r5, 0x4]
strb r6, [r4, 0x1]
strb r7, [r2]
b _08032CB2
.pool
_080329B4:
ldr r0, =sub_818994C
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
str r0, [r5, 0x4]
strb r1, [r4, 0x1]
ldr r0, =sub_81864EC
ldr r0, =SetBankFuncToRecordedOpponentBufferRunCommand
str r0, [r5]
strb r6, [r4]
strb r7, [r2]
b _08032CB2
.pool
_080329CC:
ldr r0, =sub_818994C
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
mov r2, r10
str r0, [r2]
strb r1, [r4]
@@ -381,14 +381,14 @@ _080329CC:
.pool
_080329E0:
ldr r1, =sub_8039ECC
ldr r2, =gUnknown_03005D04
ldr r2, =gBattleMainFunc
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
ldr r6, =SetBankFuncToOpponentBufferRunCommand
str r6, [r2, 0x4]
strb r7, [r4, 0x1]
str r0, [r2, 0x8]
@@ -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
@@ -420,9 +420,9 @@ _08032A20:
cmp r0, r1
bne _08032AA0
ldr r0, =sub_8039ECC
ldr r1, =gUnknown_03005D04
ldr r1, =gBattleMainFunc
str r0, [r1]
ldr r0, =sub_818994C
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
str r0, [r2]
strb r5, [r4]
str r6, [r2, 0x4]
@@ -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,9 +511,9 @@ _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
ldr r2, =SetBankFuncToRecordedPlayerBufferRunCommand
str r2, [r1]
ldrh r1, [r3, 0x18]
mov r12, r0
@@ -579,9 +579,9 @@ _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
ldr r1, =SetBankFuncToRecordedPlayerBufferRunCommand
str r1, [r0]
ldrh r1, [r2, 0x18]
cmp r1, 0x2
@@ -614,9 +614,9 @@ _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
ldr r1, =SetBankFuncToRecordedOpponentBufferRunCommand
str r1, [r0]
ldrh r0, [r2, 0x18]
cmp r0, 0x2
@@ -670,7 +670,7 @@ _08032C3C:
ands r1, r3
cmp r1, 0
beq _08032C7C
ldr r0, =sub_818994C
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
str r0, [r2]
strb r5, [r4]
str r0, [r2, 0x8]
@@ -681,7 +681,7 @@ _08032C3C:
ands r3, r0
cmp r3, 0
beq _08032C70
ldr r0, =sub_81864EC
ldr r0, =SetBankFuncToRecordedOpponentBufferRunCommand
str r0, [r2, 0x4]
strb r7, [r4, 0x1]
str r0, [r2, 0xC]
@@ -697,7 +697,7 @@ _08032C70:
strb r2, [r4, 0x3]
b _08032CB2
_08032C7C:
ldr r0, =sub_818994C
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
str r0, [r2, 0x4]
strb r1, [r4, 0x1]
str r0, [r2, 0xC]
@@ -708,7 +708,7 @@ _08032C7C:
ands r3, r0
cmp r3, 0
beq _08032CA8
ldr r0, =sub_81864EC
ldr r0, =SetBankFuncToRecordedOpponentBufferRunCommand
str r0, [r2]
strb r7, [r4]
str r0, [r2, 0x8]
@@ -750,31 +750,31 @@ b_setup_bx_link: @ 8032CC0
ands r4, r1
cmp r4, 0
beq _08032D1C
ldr r1, =gUnknown_03005D04
ldr r1, =gBattleMainFunc
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
ldr r0, =SetBankFuncToLinkOpponentBufferRunCommand
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
ldr r0, =SetBankFuncToLinkOpponentBufferRunCommand
str r0, [r2]
strb r5, [r1]
ldr r1, =gUnknown_0202406C
ldr r1, =gNoOfAllBanks
movs r0, 0x2
b _0803303A
.pool
@@ -788,16 +788,16 @@ _08032D48:
ands r3, r1
cmp r3, 0
beq _08032D98
ldr r1, =gUnknown_03005D04
ldr r1, =gBattleMainFunc
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
ldr r3, =SetBankFuncToLinkOpponentBufferRunCommand
str r3, [r2, 0x4]
strb r5, [r1, 0x1]
str r4, [r2, 0x8]
@@ -809,12 +809,12 @@ _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
ldr r3, =SetBankFuncToLinkOpponentBufferRunCommand
str r3, [r2]
strb r5, [r1]
str r0, [r2, 0xC]
@@ -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
@@ -839,31 +839,31 @@ _08032DD0:
ands r3, r1
cmp r3, 0
beq _08032E1C
ldr r1, =gUnknown_03005D04
ldr r1, =gBattleMainFunc
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
ldr r3, =SetBankFuncToOpponentBufferRunCommand
str r3, [r2, 0x4]
strb r5, [r1, 0x1]
ldr r0, =sub_814AEB0
ldr r0, =SetBankFuncToLinkPartnerBufferRunCommand
b _08032E2E
.pool
_08032E1C:
ldr r2, =gUnknown_03005D60
ldr r0, =sub_814AEB0
ldr r2, =gBattleBankFunc
ldr r0, =SetBankFuncToLinkPartnerBufferRunCommand
str r0, [r2]
ldr r1, =gUnknown_02024076
ldr r1, =gBanksBySide
strb r3, [r1]
ldr r3, =sub_8064394
ldr r3, =SetBankFuncToLinkOpponentBufferRunCommand
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]
@@ -903,7 +903,7 @@ _08032E8C:
ands r0, r1
cmp r0, 0
beq _08032EA4
ldr r1, =gUnknown_03005D04
ldr r1, =gBattleMainFunc
ldr r0, =sub_8039ECC
str r0, [r1]
_08032EA4:
@@ -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,9 +1020,9 @@ _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
ldr r1, =SetBankFuncToLinkPartnerBufferRunCommand
str r1, [r0]
ldrh r1, [r2, 0x18]
cmp r1, 0x2
@@ -1055,9 +1055,9 @@ _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
ldr r1, =SetBankFuncToLinkOpponentBufferRunCommand
str r1, [r0]
ldrh r0, [r2, 0x18]
cmp r0, 0x2
@@ -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
+58 -58
View File
@@ -9,7 +9,7 @@
sub_8084620: @ 8084620
push {r4,lr}
ldr r0, =gUnknown_08271857
bl script_env_2_execute_new_script
bl ScriptContext2_RunNewScript
ldr r0, =gSaveBlock1Ptr
ldr r4, [r0]
movs r0, 0x92
@@ -20,7 +20,7 @@ sub_8084620: @ 8084620
adds r1, r0, 0
lsrs r1, 1
adds r0, r4, 0
bl EncryptMoney
bl SetMoney
bl sp000_heal_pokemon
bl sub_8084720
bl copy_saved_warp3_bank_and_enter_x_to_warp1
@@ -65,7 +65,7 @@ sub_808469C: @ 808469C
ldr r0, =0x00000888
bl FlagReset
ldr r0, =gUnknown_08271862
bl script_env_2_execute_new_script
bl ScriptContext2_RunNewScript
pop {r0}
bx r0
.pool
@@ -138,8 +138,8 @@ sub_8084788: @ 8084788
.pool
thumb_func_end sub_8084788
thumb_func_start sub_80847A8
sub_80847A8: @ 80847A8
thumb_func_start ResetGameStats
ResetGameStats: @ 80847A8
push {r4,lr}
movs r4, 0
_080847AC:
@@ -153,18 +153,18 @@ _080847AC:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80847A8
thumb_func_end ResetGameStats
thumb_func_start sav12_xor_increment
@ void sav12_xor_increment(u8 a1)
sav12_xor_increment: @ 80847C4
thumb_func_start IncrementGameStat
@ void IncrementGameStat(u8 a1)
IncrementGameStat: @ 80847C4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x33
bhi _080847EC
adds r0, r4, 0
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
ldr r0, =0x00fffffe
cmp r1, r0
@@ -182,10 +182,10 @@ _080847EC:
pop {r0}
bx r0
.pool
thumb_func_end sav12_xor_increment
thumb_func_end IncrementGameStat
thumb_func_start sub_80847F8
sub_80847F8: @ 80847F8
thumb_func_start GetGameStat
GetGameStat: @ 80847F8
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -210,7 +210,7 @@ _08084828:
_0808482A:
pop {r1}
bx r1
thumb_func_end sub_80847F8
thumb_func_end GetGameStat
thumb_func_start sav12_xor_set
sav12_xor_set: @ 8084830
@@ -1376,7 +1376,7 @@ _080850C8:
bl set_current_map_header_from_sav1_save_old_name
bl CopyFieldObjectTemplatesToSav1
bl sav2_set_x9_depending_on_sav1_map
bl sub_809D344
bl ClearTempFieldEventData
bl wild_pokemon_reroll
bl prev_quest_postbuffer_cursor_backup_reset
adds r0, r6, 0
@@ -1464,7 +1464,7 @@ _080851A2:
lsrs r6, r0, 24
bl sub_80EB218
bl sav2_set_x9_depending_on_sav1_map
bl sub_809D344
bl ClearTempFieldEventData
bl wild_pokemon_reroll
bl prev_quest_postbuffer_cursor_backup_reset
ldr r0, =gSaveBlock1Ptr
@@ -2204,13 +2204,13 @@ _08085774:
bx r1
thumb_func_end warp1_target_get_music
thumb_func_start call_map_music_set_to_zero
call_map_music_set_to_zero: @ 8085778
thumb_func_start call_ResetMapMusic
call_ResetMapMusic: @ 8085778
push {lr}
bl map_music_set_to_zero
bl ResetMapMusic
pop {r0}
bx r0
thumb_func_end call_map_music_set_to_zero
thumb_func_end call_ResetMapMusic
thumb_func_start sub_8085784
sub_8085784: @ 8085784
@@ -2249,13 +2249,13 @@ _080857C8:
beq _080857D6
ldr r4, =0x0000016d
_080857D6:
bl current_map_music_get
bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r4, r0
beq _080857E8
adds r0, r4, 0
bl current_map_music_set
bl PlayNewMapMusic
_080857E8:
pop {r4}
pop {r0}
@@ -2294,7 +2294,7 @@ sub_8085810: @ 8085810
bl warp1_target_get_music
lsls r0, 16
lsrs r4, r0, 16
bl current_map_music_get
bl GetCurrentMapMusic
lsls r0, 16
lsrs r5, r0, 16
ldr r0, =0x000001bb
@@ -2326,13 +2326,13 @@ _08085856:
adds r0, r4, 0
movs r1, 0x4
movs r2, 0x4
bl sub_80A2FBC
bl FadeOutAndFadeInNewMapMusic
b _08085890
.pool
_08085888:
adds r0, r4, 0
movs r1, 0x8
bl sub_80A2F88
bl FadeOutAndPlayNewMapMusic
_08085890:
pop {r4-r6}
pop {r0}
@@ -2342,7 +2342,7 @@ _08085890:
thumb_func_start sub_8085898
sub_8085898: @ 8085898
push {r4,lr}
bl current_map_music_get
bl GetCurrentMapMusic
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2355,7 +2355,7 @@ sub_8085898: @ 8085898
lsls r0, 16
lsrs r0, 16
movs r1, 0x8
bl sub_80A2F88
bl FadeOutAndPlayNewMapMusic
_080858BE:
pop {r4}
pop {r0}
@@ -2367,7 +2367,7 @@ sub_80858C4: @ 80858C4
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl current_map_music_get
bl GetCurrentMapMusic
lsls r0, 16
lsrs r1, r0, 16
cmp r1, r4
@@ -2377,7 +2377,7 @@ sub_80858C4: @ 80858C4
beq _080858E4
adds r0, r4, 0
movs r1, 0x8
bl sub_80A2F88
bl FadeOutAndPlayNewMapMusic
_080858E4:
pop {r4}
pop {r0}
@@ -2407,7 +2407,7 @@ _0808590A:
thumb_func_start music_something
music_something: @ 8085910
push {r4,r5,lr}
bl current_map_music_get
bl GetCurrentMapMusic
lsls r0, 16
lsrs r5, r0, 16
bl warp1_target_get_music
@@ -2419,7 +2419,7 @@ music_something: @ 8085910
lsrs r0, 24
cmp r0, 0x1
beq _0808597E
bl current_map_music_get
bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r4, r0
@@ -2454,7 +2454,7 @@ _08085972:
bl is_warp1_light_level_8_or_9
lsls r0, 24
lsrs r0, 24
bl sub_80A2F50
bl FadeOutMapMusic
_0808597E:
pop {r4,r5}
pop {r0}
@@ -2465,7 +2465,7 @@ _0808597E:
thumb_func_start sub_80859A0
sub_80859A0: @ 80859A0
push {lr}
bl sub_80A303C
bl IsNotWaitingForBGMStop
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2476,7 +2476,7 @@ sub_80859A0: @ 80859A0
sub_80859B0: @ 80859B0
push {lr}
movs r0, 0x4
bl sub_80A2F50
bl FadeOutMapMusic
pop {r0}
bx r0
thumb_func_end sub_80859B0
@@ -2531,7 +2531,7 @@ _080859F0:
asrs r2, 24
adds r1, r4, 0
movs r3, 0x1
bl sub_80A32C0
bl PlayCry2
_08085A2C:
add sp, 0x4
pop {r4}
@@ -3061,10 +3061,10 @@ c2_overworld_basic: @ 8085E24
push {lr}
bl script_env_2_run_current_script
bl RunTasks
bl CallObjectCallbacks
bl AnimateSprites
bl CameraUpdate
bl UpdateCameraPanning
bl PrepareSpritesForOamLoad
bl BuildOamBuffer
bl UpdatePaletteFade
bl sub_80A0A38
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -3167,11 +3167,11 @@ _08085EEC:
CB2_NewGame: @ 8085EF8
push {lr}
bl sub_808631C
bl sub_80A2F30
bl StopMapMusic
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
@@ -3208,7 +3208,7 @@ c2_whiteout: @ 8085F58
cmp r0, 0x77
bls _08085FB0
bl sub_808631C
bl sub_80A2F30
bl StopMapMusic
bl ResetSafariZoneFlag_
bl sub_8084620
bl player_avatar_init_params_reset
@@ -3391,7 +3391,7 @@ _08086132:
c2_8056854: @ 8086140
push {lr}
bl sub_808631C
bl sub_80A2F30
bl StopMapMusic
ldr r0, =c1_link_related
bl set_callback1
bl sub_8086C2C
@@ -3494,9 +3494,9 @@ _08086222:
sub_8086230: @ 8086230
push {r4,lr}
bl sub_808631C
bl sub_80A2F30
bl StopMapMusic
bl ResetSafariZoneFlag_
ldr r0, =gUnknown_03006210
ldr r0, =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0xFF
bne _0808624A
@@ -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
@@ -3635,8 +3635,8 @@ SetFieldVBlankCallback: @ 8086380
thumb_func_start VBlankCB_Field
VBlankCB_Field: @ 8086390
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl LoadOam
bl ProcessSpriteCopyRequests
bl sub_80BA0A8
bl FieldUpdateBgTilemapScroll
bl TransferPlttBuffer
@@ -4168,8 +4168,8 @@ _08086816:
ldr r0, [r1, 0x8]
movs r0, 0
movs r1, 0x80
bl ResetSpriteRange
bl LoadOamFromSprites
bl ResetOamRange
bl LoadOam
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -4292,7 +4292,7 @@ sub_8086988: @ 8086988
push {r4,lr}
adds r4, r0, 0
bl ResetTasks
bl ResetAllObjectData
bl ResetSpriteData
bl ResetPaletteFade
bl dp12_8087EA4
bl dp13_810BB8C
@@ -5760,7 +5760,7 @@ sub_8087510: @ 8087510
sub_808751C: @ 808751C
push {lr}
movs r0, 0x6
bl audio_play
bl PlaySE
bl sub_809FA9C
bl script_env_2_enable
pop {r0}
@@ -5772,7 +5772,7 @@ sub_8087530: @ 8087530
push {r4,lr}
adds r4, r0, 0
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r4, 0
bl script_env_1_execute_new_script
bl script_env_2_enable
@@ -5785,7 +5785,7 @@ sub_8087530: @ 8087530
sub_808754C: @ 808754C
push {lr}
movs r0, 0x6
bl audio_play
bl PlaySE
ldr r0, =gUnknown_082774EF
bl script_env_1_execute_new_script
bl script_env_2_enable
@@ -5799,7 +5799,7 @@ sub_8087568: @ 8087568
push {r4,lr}
adds r4, r0, 0
movs r0, 0x5
bl audio_play
bl PlaySE
adds r0, r4, 0
bl script_env_1_execute_new_script
bl script_env_2_enable
@@ -6157,9 +6157,9 @@ 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
bl DestroySprite
_08087838:
movs r0, 0
strb r0, [r5]
@@ -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
@@ -6780,7 +6780,7 @@ sub_8087C8C: @ 8087C8C
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _08087D0A
.pool
_08087CF8:
@@ -6790,7 +6790,7 @@ _08087CF8:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_08087D0A:
adds r0, r5, 0
movs r1, 0
asm/rom5.s
-1961
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More