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

Merge remote-tracking branch 'upstream/master' into shop

Browse Source 
# Conflicts:
#	asm/shop.s
This commit is contained in:
Marcus Huderle
2018-10-13 10:22:58 -05:00
parent fa9d1759bd a2a6700966
commit b24559d69b
3192 changed files with 42738 additions and 556806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_80A5C6C.s
-6526
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80A9C70.s
-930
View File
@@ -1,930 +0,0 @@
.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, =gBattlerSpriteIds
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, =gBattleAnimPicTable + 0x440
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gBattleAnimPaletteTable + 0x440
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, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffe00000
adds r0, r1
lsrs r5, r0, 16
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffdc0000
adds r0, r1
lsrs r4, r0, 16
bl IsContest
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 DestroyAnimVisualTask
_080AA186:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80AA124
thumb_func_start AnimTask_StatsChange
AnimTask_StatsChange: @ 80AA18C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
movs r3, 0
ldr r0, =gBattleSpritesDataPtr
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 DestroyAnimVisualTask
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 AnimTask_StatsChange
thumb_func_start LaunchStatusAnimation
LaunchStatusAnimation: @ 80AA364
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r1, 24
lsrs r1, 24
ldr r0, =gBattleAnimAttacker
strb r4, [r0]
ldr r0, =gBattleAnimTarget
strb r4, [r0]
ldr r0, =gBattleAnims_Statuses
movs r2, 0
bl LaunchBattleAnimation
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 LaunchStatusAnimation
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, =gBattleSpritesDataPtr
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_anim_80D51AC.s
-2446
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80FE840.s
+168 -168
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_815A0D4.s
+24 -24
View File
@@ -231,7 +231,7 @@ sub_815A254: @ 815A254
subs r1, r6
lsls r1, 16
asrs r1, 16
bl sub_80A74F4
bl ArcTan2Neg
lsls r0, 16
movs r1, 0xC0
lsls r1, 23
@@ -775,7 +775,7 @@ sub_815A6C4: @ 815A6C4
movs r1, 0
mov r2, sp
adds r3, r5, 0
bl sub_80A8924
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -816,7 +816,7 @@ _0815A6F8:
sub_815A73C: @ 815A73C
push {r4,lr}
adds r4, r0, 0
bl AnimateBallThrow
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _0815A75E
@@ -1012,8 +1012,8 @@ _0815A8C2:
bx r0
thumb_func_end sub_815A8AC
thumb_func_start sub_815A8C8
sub_815A8C8: @ 815A8C8
thumb_func_start AnimTask_IsTargetPlayerSide
AnimTask_IsTargetPlayerSide: @ 815A8C8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1039,10 +1039,10 @@ _0815A8F0:
pop {r0}
bx r0
.pool
thumb_func_end sub_815A8C8
thumb_func_end AnimTask_IsTargetPlayerSide
thumb_func_start sub_815A904
sub_815A904: @ 815A904
thumb_func_start AnimTask_IsHealingMove
AnimTask_IsHealingMove: @ 815A904
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -1064,7 +1064,7 @@ _0815A924:
pop {r0}
bx r0
.pool
thumb_func_end sub_815A904
thumb_func_end AnimTask_IsHealingMove
thumb_func_start sub_815A934
sub_815A934: @ 815A934
@@ -1625,7 +1625,7 @@ _0815ADDC:
ldr r4, =gBattleAnimTarget
_0815ADDE:
ldrb r0, [r4]
bl sub_80A6190
bl GetBattlerYCoordWithElevation
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
@@ -6104,7 +6104,7 @@ _0815D26E:
strh r0, [r4, 0x18]
_0815D2A0:
adds r0, r5, 0
bl sub_80A6190
bl GetBattlerYCoordWithElevation
lsls r0, 24
lsrs r0, 24
subs r0, 0x22
@@ -8524,7 +8524,7 @@ _0815E5FE:
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
bl AnimateBallThrow
bl TranslateAnimArc
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -8542,7 +8542,7 @@ _0815E634:
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
bl AnimateBallThrow
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _0815E6D2
@@ -9804,11 +9804,11 @@ _0815F022:
strh r0, [r4, 0x34]
strh r1, [r4, 0x36]
adds r0, r4, 0
bl obj_translate_based_on_private_1_2_3_4
bl InitAnimLinearTranslation
b _0815F0F8
_0815F038:
adds r0, r4, 0
bl sub_80A6F3C
bl TranslateAnimLinear
lsls r0, 24
cmp r0, 0
beq _0815F106
@@ -10048,8 +10048,8 @@ _0815F1DE:
.pool
thumb_func_end sub_815F18C
thumb_func_start sub_815F20C
sub_815F20C: @ 815F20C
thumb_func_start AnimTask_MonToSubstitute
AnimTask_MonToSubstitute: @ 815F20C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -10183,7 +10183,7 @@ _0815F310:
pop {r0}
bx r0
.pool
thumb_func_end sub_815F20C
thumb_func_end AnimTask_MonToSubstitute
thumb_func_start sub_815F330
sub_815F330: @ 815F330
@@ -10861,8 +10861,8 @@ _0815F896:
.pool
thumb_func_end sub_815F7C4
thumb_func_start sub_815F8A0
sub_815F8A0: @ 815F8A0
thumb_func_start AnimTask_GetReturnPowerLevel
AnimTask_GetReturnPowerLevel: @ 815F8A0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -10904,7 +10904,7 @@ _0815F8E0:
pop {r0}
bx r0
.pool
thumb_func_end sub_815F8A0
thumb_func_end AnimTask_GetReturnPowerLevel
thumb_func_start sub_815F8F4
sub_815F8F4: @ 815F8F4
@@ -12336,8 +12336,8 @@ _081604E8:
bx r0
thumb_func_end sub_81603F4
thumb_func_start sub_81604F0
sub_81604F0: @ 81604F0
thumb_func_start AnimTask_GetWeather
AnimTask_GetWeather: @ 81604F0
push {lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -12380,7 +12380,7 @@ _08160538:
bl DestroyAnimVisualTask
pop {r0}
bx r0
thumb_func_end sub_81604F0
thumb_func_end AnimTask_GetWeather
thumb_func_start sub_8160544
sub_8160544: @ 8160544
asm/battle_anim_8170478.s
+9 -9
View File
@@ -1030,8 +1030,8 @@ sub_8170D24: @ 8170D24
.pool
thumb_func_end sub_8170D24
thumb_func_start sub_8170D4C
sub_8170D4C: @ 8170D4C
thumb_func_start AnimTask_IsBallBlockedByTrainer
AnimTask_IsBallBlockedByTrainer: @ 8170D4C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -1055,7 +1055,7 @@ _08170D74:
pop {r0}
bx r0
.pool
thumb_func_end sub_8170D4C
thumb_func_end AnimTask_IsBallBlockedByTrainer
thumb_func_start ItemIdToBallId
ItemIdToBallId: @ 8170D84
@@ -1487,7 +1487,7 @@ sub_8171134: @ 8171134
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
bl AnimateBallThrow
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _081711D2
@@ -2671,7 +2671,7 @@ sub_8171AAC: @ 8171AAC
orrs r0, r1
strb r0, [r3]
adds r0, r4, 0
bl AnimateBallThrow
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _08171ADC
@@ -5652,7 +5652,7 @@ _081733C0:
sub_81733D4: @ 81733D4
push {r4,lr}
adds r4, r0, 0
bl AnimateBallThrow
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _081733F6
@@ -5757,8 +5757,8 @@ _081734A0:
.pool
thumb_func_end sub_817345C
thumb_func_start sub_81734B4
sub_81734B4: @ 81734B4
thumb_func_start AnimTask_GetTrappedMoveAnimId
AnimTask_GetTrappedMoveAnimId: @ 81734B4
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -5805,7 +5805,7 @@ _0817350C:
pop {r0}
bx r0
.pool
thumb_func_end sub_81734B4
thumb_func_end AnimTask_GetTrappedMoveAnimId
thumb_func_start sub_817351C
sub_817351C: @ 817351C
asm/battle_frontier_2.s
+66 -10092
View File
File diff suppressed because it is too large Load Diff
asm/battle_tent.s
-260
View File
@@ -1,260 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81BA040
sub_81BA040: @ 81BA040
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x10
movs r0, 0
mov r10, r0
ldr r1, =gFacilityTrainers
ldr r0, =gSlateportBattleTentTrainers
str r0, [r1]
ldr r1, =gFacilityTrainerMons
ldr r0, =gSlateportBattleTentMons
str r0, [r1]
ldr r7, =gSaveBlock2Ptr
ldr r1, =0x0000ffff
mov r8, r1
_081BA062:
mov r2, r10
lsls r6, r2, 1
_081BA066:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1E
bl __umodsi3
lsls r0, 16
lsrs r3, r0, 16
movs r5, 0
ldr r1, [r7]
ldr r4, =0x00000cb2
adds r0, r1, r4
ldrh r0, [r0]
cmp r5, r0
bge _081BA0AA
ldr r2, =0x00000cb4
adds r0, r1, r2
ldrh r0, [r0]
cmp r0, r3
beq _081BA0AA
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r1, r4
ldrh r2, [r0]
adds r4, 0x2
adds r1, r4
_081BA09C:
adds r1, 0x2
adds r5, 0x1
cmp r5, r2
bge _081BA0AA
ldrh r0, [r1]
cmp r0, r3
bne _081BA09C
_081BA0AA:
ldr r0, [r7]
ldr r1, =0x00000cb2
adds r0, r1
ldrh r0, [r0]
cmp r5, r0
bne _081BA066
ldr r2, =gTrainerBattleOpponent_A
strh r3, [r2]
ldrh r3, [r2]
ldr r4, =gFacilityTrainers
ldr r1, [r4]
movs r0, 0x34
muls r0, r3
adds r0, r1
ldr r0, [r0, 0x30]
adds r1, r6, r0
ldrh r0, [r1]
cmp r0, r8
beq _081BA0DE
ldr r3, =0x0000ffff
_081BA0D2:
adds r1, 0x2
movs r6, 0x1
add r10, r6
ldrh r0, [r1]
cmp r0, r3
bne _081BA0D2
_081BA0DE:
mov r0, r10
cmp r0, 0x8
bgt _081BA110
movs r1, 0
mov r10, r1
b _081BA062
.pool
_081BA110:
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r6, =0x00000cb2
adds r3, r1, r6
ldrh r0, [r3]
cmp r0, 0x1
bhi _081BA12A
lsls r0, 1
ldr r3, =0x00000cb4
adds r1, r3
adds r1, r0
ldrh r0, [r2]
strh r0, [r1]
_081BA12A:
ldrh r1, [r2]
ldr r2, [r4]
movs r0, 0x34
muls r0, r1
adds r0, r2
ldr r0, [r0, 0x30]
mov r9, r0
movs r5, 0
ldr r7, =gUnknown_03001298
mov r8, sp
_081BA13E:
bl Random
lsls r0, 16
lsrs r0, 16
mov r1, r10
bl __modsi3
lsls r0, 1
add r0, r9
ldrh r0, [r0]
strh r0, [r7]
movs r2, 0
ldrh r0, [r7]
ldr r4, =gFacilityTrainerMons
ldr r3, [r4]
lsls r0, 4
adds r0, r3
ldr r1, =gSaveBlock2Ptr
ldrh r6, [r0]
ldr r1, [r1]
_081BA166:
movs r4, 0xE7
lsls r4, 4
adds r0, r1, r4
ldrh r0, [r0]
lsls r0, 4
adds r0, r3
ldrh r0, [r0]
cmp r6, r0
beq _081BA180
adds r1, 0xC
adds r2, 0x1
cmp r2, 0x5
ble _081BA166
_081BA180:
cmp r2, 0x6
bne _081BA220
movs r4, 0
cmp r4, r5
bge _081BA1B0
mov r0, sp
ldrh r0, [r0]
cmp r0, r6
beq _081BA1B0
ldr r6, =gUnknown_03001298
ldr r3, =gFacilityTrainerMons
mov r2, sp
_081BA198:
adds r2, 0x2
adds r4, 0x1
cmp r4, r5
bge _081BA1B0
ldrh r0, [r6]
ldr r1, [r3]
lsls r0, 4
adds r0, r1
ldrh r1, [r2]
ldrh r0, [r0]
cmp r1, r0
bne _081BA198
_081BA1B0:
cmp r4, r5
bne _081BA220
movs r4, 0
cmp r4, r5
bge _081BA1E6
ldr r6, =gBattleFrontierHeldItems
mov r12, r6
add r3, sp, 0x8
_081BA1C0:
ldrh r2, [r3]
cmp r2, 0
beq _081BA1DE
ldr r1, =gUnknown_03001298
ldrh r0, [r1]
ldr r6, =gFacilityTrainerMons
ldr r1, [r6]
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0xA]
lsls r0, 1
add r0, r12
ldrh r0, [r0]
cmp r2, r0
beq _081BA1E6
_081BA1DE:
adds r3, 0x2
adds r4, 0x1
cmp r4, r5
blt _081BA1C0
_081BA1E6:
cmp r4, r5
bne _081BA220
lsls r2, r5, 1
ldrh r0, [r7]
ldr r1, =gFacilityTrainerMons
ldr r4, [r1]
lsls r0, 4
adds r0, r4
ldrh r0, [r0]
mov r3, r8
strh r0, [r3]
add r1, sp, 0x8
adds r1, r2
ldr r3, =gBattleFrontierHeldItems
ldrh r0, [r7]
lsls r0, 4
adds r0, r4
ldrb r0, [r0, 0xA]
lsls r0, 1
adds r0, r3
ldrh r0, [r0]
strh r0, [r1]
ldr r0, =gUnknown_03006298
adds r2, r0
ldrh r0, [r7]
strh r0, [r2]
movs r4, 0x2
add r8, r4
adds r5, 0x1
_081BA220:
cmp r5, 0x3
bne _081BA13E
add sp, 0x10
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BA040
.align 2, 0 @ Don't pad with nop.
asm/battle_tower.s
+2 -2
View File
@@ -2544,7 +2544,7 @@ _08163718:
adds r0, r6, r2
adds r2, r3, 0
str r3, [sp, 0x1C]
bl sub_81A7024
bl SetMonMoveAvoidReturn
ldr r3, [sp, 0x1C]
adds r0, r3, 0x1
lsls r0, 24
@@ -2662,7 +2662,7 @@ _08163818:
ldr r2, =gEnemyParty
adds r0, r6, r2
adds r2, r7, 0
bl sub_81A7024
bl SetMonMoveAvoidReturn
ldr r1, =gFacilityTrainerMons
ldr r0, [r1]
adds r0, r5, r0
asm/cable_car.s
+1 -1
View File
@@ -774,7 +774,7 @@ _08150340:
orrs r3, r0
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
bl warp_in
bl WarpIntoMap
ldr r0, =gFieldCallback
str r4, [r0]
ldr r0, =CB2_LoadMap
asm/cable_car_util.s
-762
View File
@@ -1,762 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81520A8
sub_81520A8: @ 81520A8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r10, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r1, 16
lsrs r1, 16
mov r9, r1
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsls r0, 24
lsrs r7, r0, 24
lsls r4, 24
lsrs r4, 24
mov r8, r4
movs r0, 0
lsrs r4, r3, 24
cmp r0, r8
bcs _08152122
_081520DA:
ldr r2, [sp]
movs r3, 0
adds r6, r4, 0x1
adds r0, 0x1
mov r12, r0
cmp r3, r7
bcs _0815210C
lsls r5, r4, 6
_081520EA:
lsls r0, r2, 1
adds r0, r5
add r0, r10
mov r1, r9
strh r1, [r0]
adds r1, r2, 0x1
adds r0, r1, 0
asrs r0, 5
lsls r0, 5
subs r0, r1, r0
lsls r0, 24
lsrs r2, r0, 24
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r7
bcc _081520EA
_0815210C:
adds r0, r6, 0
asrs r0, 5
lsls r0, 5
subs r0, r6, r0
lsls r0, 24
lsrs r4, r0, 24
mov r1, r12
lsls r0, r1, 24
lsrs r0, 24
cmp r0, r8
bcc _081520DA
_08152122:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81520A8
thumb_func_start sub_8152134
sub_8152134: @ 8152134
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r10, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsls r0, 24
lsrs r0, 24
mov r12, r0
lsls r4, 24
lsrs r4, 24
mov r9, r4
movs r0, 0
adds r5, r1, 0
lsrs r4, r3, 24
cmp r0, r9
bcs _081521AE
_08152164:
ldr r2, [sp]
movs r3, 0
adds r7, r4, 0x1
adds r0, 0x1
mov r8, r0
cmp r3, r12
bcs _08152198
lsls r6, r4, 6
_08152174:
lsls r0, r2, 1
adds r0, r6
add r0, r10
ldrh r1, [r5]
strh r1, [r0]
adds r5, 0x2
adds r1, r2, 0x1
adds r0, r1, 0
asrs r0, 5
lsls r0, 5
subs r0, r1, r0
lsls r0, 24
lsrs r2, r0, 24
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r12
bcc _08152174
_08152198:
adds r0, r7, 0
asrs r0, 5
lsls r0, 5
subs r0, r7, r0
lsls r0, 24
lsrs r4, r0, 24
mov r1, r8
lsls r0, r1, 24
lsrs r0, 24
cmp r0, r9
bcc _08152164
_081521AE:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8152134
thumb_func_start sub_81521C0
sub_81521C0: @ 81521C0
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 24
lsrs r4, r0, 24
movs r5, 0
cmp r4, 0
beq _081521FE
cmp r4, 0x40
bls _081521D6
movs r4, 0x40
_081521D6:
ldr r6, =gUnknown_0203ABB8
movs r0, 0x8
bl AllocZeroed
str r0, [r6]
cmp r0, 0
beq _081521FE
lsls r0, r4, 1
adds r0, r4
lsls r0, 4
bl AllocZeroed
ldr r1, [r6]
str r0, [r1, 0x4]
cmp r0, 0
bne _08152208
adds r0, r1, 0
bl Free
str r5, [r6]
_081521FE:
movs r0, 0
b _08152244
.pool
_08152208:
strb r4, [r1]
cmp r5, r4
bcs _08152242
adds r3, r6, 0
ldr r0, =gDummyOamData
mov r12, r0
movs r2, 0x4
mov r8, r2
_08152218:
ldr r0, [r3]
ldr r2, [r0, 0x4]
lsls r1, r5, 1
adds r1, r5
lsls r1, 4
adds r2, r1, r2
mov r0, r12
ldm r0!, {r6,r7}
stm r2!, {r6,r7}
ldr r0, [r3]
ldr r0, [r0, 0x4]
adds r1, r0
ldrb r0, [r1, 0x19]
mov r2, r8
orrs r0, r2
strb r0, [r1, 0x19]
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, r4
bcc _08152218
_08152242:
movs r0, 0x1
_08152244:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_81521C0
thumb_func_start sub_8152254
sub_8152254: @ 8152254
push {r4-r7,lr}
movs r3, 0
ldr r0, =gUnknown_0203ABB8
ldr r2, [r0]
adds r5, r0, 0
cmp r2, 0
bne _0815226C
movs r0, 0
b _081522C4
.pool
_0815226C:
ldrb r2, [r2]
cmp r3, r2
bcs _08152292
ldr r0, =gMain+0x238
mov r12, r0
ldr r4, =gDummyOamData
adds r2, r5, 0
_0815227A:
lsls r1, r3, 3
add r1, r12
adds r0, r4, 0
ldm r0!, {r6,r7}
stm r1!, {r6,r7}
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
ldr r0, [r2]
ldrb r0, [r0]
cmp r3, r0
bcc _0815227A
_08152292:
ldr r1, [r5]
ldrb r0, [r1]
lsls r2, r0, 1
adds r2, r0
ldr r0, [r1, 0x4]
lsls r2, 4
movs r1, 0
bl memset
ldr r0, [r5]
ldr r0, [r0, 0x4]
bl Free
ldr r0, [r5]
movs r4, 0
str r4, [r0, 0x4]
movs r1, 0
movs r2, 0x8
bl memset
ldr r0, [r5]
bl Free
str r4, [r5]
movs r0, 0x1
_081522C4:
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_8152254
thumb_func_start sub_81522D4
sub_81522D4: @ 81522D4
push {r4-r7,lr}
mov r7, r8
push {r7}
movs r6, 0
ldr r0, =gUnknown_0203ABB8
ldr r1, [r0]
adds r3, r0, 0
cmp r1, 0
beq _081522EC
ldr r0, [r1, 0x4]
cmp r0, 0
bne _081522F4
_081522EC:
movs r0, 0
b _081523D2
.pool
_081522F4:
ldrb r1, [r1]
cmp r6, r1
bcs _081523D0
adds r7, r3, 0
movs r0, 0x3
mov r8, r0
_08152300:
ldr r0, [r7]
ldr r1, [r0, 0x4]
lsls r0, r6, 1
adds r0, r6
lsls r5, r0, 4
adds r2, r5, r1
ldrb r1, [r2, 0x19]
movs r0, 0x3
ands r0, r1
cmp r0, 0x3
bne _081523C2
ldr r1, [r2, 0x2C]
cmp r1, 0
beq _08152322
adds r0, r2, 0
bl _call_via_r1
_08152322:
ldr r0, [r7]
ldr r0, [r0, 0x4]
adds r2, r5, r0
ldrb r1, [r2, 0x19]
movs r0, 0x4
ands r0, r1
cmp r0, 0
beq _08152348
lsls r0, r6, 3
ldr r1, =gMain+0x238
adds r0, r1
ldr r1, =gDummyOamData
ldm r1!, {r2,r3}
stm r0!, {r2,r3}
b _081523C0
.pool
_08152348:
ldrb r0, [r2, 0xE]
ldrb r4, [r2, 0xA]
adds r0, r4
strb r0, [r2]
ldr r4, [r7]
ldr r3, [r4, 0x4]
adds r3, r5, r3
movs r0, 0x8
ldrsh r2, [r3, r0]
movs r1, 0xC
ldrsh r0, [r3, r1]
adds r2, r0
ldr r1, =0x000001ff
adds r0, r1, 0
ands r2, r0
ldrh r0, [r3, 0x2]
ldr r1, =0xfffffe00
mov r12, r1
mov r1, r12
ands r0, r1
orrs r0, r2
strh r0, [r3, 0x2]
ldr r3, [r4, 0x4]
adds r3, r5, r3
ldrb r0, [r3, 0x19]
lsls r0, 27
lsrs r0, 30
mov r2, r8
ands r0, r2
lsls r0, 2
ldrb r1, [r3, 0x5]
movs r4, 0xD
negs r4, r4
adds r2, r4, 0
ands r1, r2
orrs r1, r0
strb r1, [r3, 0x5]
ldr r4, [r7]
ldr r2, [r4, 0x4]
adds r2, r5, r2
ldrh r3, [r2, 0x14]
ldr r1, =0x000003ff
adds r0, r1, 0
adds r1, r3, 0
ands r1, r0
mov r12, r1
ldrh r0, [r2, 0x4]
ldr r3, =0xfffffc00
adds r1, r3, 0
ands r0, r1
mov r1, r12
orrs r0, r1
strh r0, [r2, 0x4]
lsls r1, r6, 3
ldr r2, =gMain+0x238
ldr r0, [r4, 0x4]
adds r1, r2
adds r0, r5, r0
ldm r0!, {r2,r3}
stm r1!, {r2,r3}
_081523C0:
ldr r3, =gUnknown_0203ABB8
_081523C2:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
ldr r0, [r3]
ldrb r0, [r0]
cmp r6, r0
bcc _08152300
_081523D0:
movs r0, 0x1
_081523D2:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_81522D4
thumb_func_start sub_81523F4
sub_81523F4: @ 81523F4
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 24
lsrs r6, r1, 24
cmp r4, 0
beq _08152430
ldrh r0, [r4, 0x10]
bl GetSpriteTileStartByTag
lsls r0, 16
lsrs r5, r0, 16
ldr r0, =0x0000ffff
cmp r5, r0
beq _08152430
strb r6, [r4, 0x18]
ldrb r0, [r4, 0x1]
lsrs r0, 6
ldrb r1, [r4, 0x3]
lsrs r1, 6
bl sub_80355F8
lsls r0, 24
lsrs r0, 24
muls r0, r6
adds r0, r5, r0
strh r0, [r4, 0x14]
movs r0, 0x1
b _08152432
.pool
_08152430:
movs r0, 0
_08152432:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81523F4
thumb_func_start sub_8152438
sub_8152438: @ 8152438
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _0815246C
ldrb r1, [r0]
cmp r2, r1
bcs _0815246C
ldr r1, [r0, 0x4]
lsls r0, r2, 1
adds r0, r2
lsls r0, 4
adds r3, r0, r1
ldrb r1, [r3, 0x19]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0815246C
str r4, [r3, 0x2C]
adds r0, r2, 0
b _0815246E
.pool
_0815246C:
movs r0, 0xFF
_0815246E:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8152438
thumb_func_start sub_8152474
sub_8152474: @ 8152474
push {r4,r5,lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r1, 24
lsrs r4, r1, 24
lsls r2, 16
lsrs r5, r2, 16
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _081524A8
ldrb r1, [r0]
cmp r3, r1
bcs _081524A8
ldr r1, [r0, 0x4]
lsls r0, r3, 1
adds r0, r3
lsls r0, 4
adds r2, r0, r1
ldrb r1, [r2, 0x19]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _081524A8
cmp r4, 0x7
bls _081524B0
_081524A8:
movs r0, 0xFF
b _081524BC
.pool
_081524B0:
lsls r1, r4, 1
adds r0, r2, 0
adds r0, 0x1A
adds r0, r1
strh r5, [r0]
adds r0, r3, 0
_081524BC:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8152474
thumb_func_start sub_81524C4
sub_81524C4: @ 81524C4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x10
mov r9, r0
ldr r0, [sp, 0x30]
ldr r4, [sp, 0x34]
ldr r5, [sp, 0x38]
lsls r1, 16
lsrs r1, 16
str r1, [sp]
lsls r2, 16
lsrs r2, 16
mov r8, r2
lsls r3, 16
lsrs r3, 16
str r3, [sp, 0x4]
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
lsls r4, 24
lsrs r4, 24
str r4, [sp, 0xC]
lsls r5, 24
lsrs r5, 24
mov r10, r5
movs r5, 0
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _0815255E
mov r1, r9
cmp r1, 0
bne _08152530
b _0815255E
.pool
_08152514:
adds r5, r2, 0
adds r0, r5, 0
movs r1, 0
movs r2, 0x30
bl memset
strb r4, [r5, 0x16]
ldrb r0, [r5, 0x19]
movs r1, 0x1
orrs r0, r1
movs r1, 0x2
orrs r0, r1
strb r0, [r5, 0x19]
b _0815255A
_08152530:
movs r4, 0
ldrb r1, [r0]
cmp r5, r1
bcs _0815255A
ldr r6, [r0, 0x4]
adds r3, r1, 0
movs r7, 0x1
_0815253E:
lsls r0, r4, 1
adds r0, r4
lsls r0, 4
adds r2, r0, r6
ldrb r1, [r2, 0x19]
adds r0, r7, 0
ands r0, r1
cmp r0, 0
beq _08152514
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r3
bcc _0815253E
_0815255A:
cmp r5, 0
bne _08152562
_0815255E:
movs r0, 0xFF
b _081525C0
_08152562:
adds r1, r5, 0
mov r0, r9
ldm r0!, {r2,r3}
stm r1!, {r2,r3}
mov r0, sp
ldrh r0, [r0]
strh r0, [r5, 0x10]
mov r1, r8
strh r1, [r5, 0x12]
mov r2, sp
ldrh r2, [r2, 0x4]
strh r2, [r5, 0x8]
mov r3, sp
ldrh r3, [r3, 0x8]
strh r3, [r5, 0xA]
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 4
ldrb r1, [r5, 0x5]
movs r4, 0xF
ands r4, r1
orrs r4, r0
strb r4, [r5, 0x5]
mov r0, r10
cmp r0, 0x3
bhi _081525B6
movs r1, 0x3
ands r1, r0
lsls r3, r1, 3
ldrb r2, [r5, 0x19]
movs r0, 0x19
negs r0, r0
ands r0, r2
orrs r0, r3
strb r0, [r5, 0x19]
lsls r1, 2
movs r0, 0xD
negs r0, r0
ands r4, r0
orrs r4, r1
strb r4, [r5, 0x5]
_081525B6:
adds r0, r5, 0
ldr r1, [sp, 0xC]
bl sub_81523F4
ldrb r0, [r5, 0x16]
_081525C0:
add sp, 0x10
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_81524C4
thumb_func_start sub_81525D0
sub_81525D0: @ 81525D0
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =gUnknown_0203ABB8
ldr r0, [r6]
cmp r0, 0
beq _081525F2
ldr r1, [r0, 0x4]
lsls r0, r5, 1
adds r0, r5
lsls r4, r0, 4
adds r2, r4, r1
ldrb r1, [r2, 0x19]
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _081525FC
_081525F2:
movs r0, 0xFF
b _0815263C
.pool
_081525FC:
adds r0, r2, 0
movs r1, 0
movs r2, 0x30
bl memset
ldr r0, [r6]
ldr r0, [r0, 0x4]
adds r0, r4, r0
movs r1, 0xA0
strb r1, [r0]
ldr r3, [r6]
ldr r2, [r3, 0x4]
adds r2, r4, r2
ldrh r1, [r2, 0x2]
ldr r0, =0xfffffe00
ands r0, r1
movs r1, 0xF0
orrs r0, r1
strh r0, [r2, 0x2]
ldr r1, [r3, 0x4]
adds r1, r4, r1
ldrb r0, [r1, 0x19]
movs r2, 0x4
orrs r0, r2
strb r0, [r1, 0x19]
lsls r1, r5, 3
ldr r0, =gMain+0x238
adds r1, r0
ldr r0, =gDummyOamData
ldm r0!, {r2,r3}
stm r1!, {r2,r3}
adds r0, r5, 0
_0815263C:
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_81525D0
.align 2, 0 @ Don't pad with nop.
asm/cable_club.s
+1 -1
View File
@@ -74,7 +74,7 @@ sub_80B23B0: @ 80B23B0
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0x3
bl CopyWindowToVram
asm/contest_link_80F57C4.s
+1 -1
View File
@@ -2237,7 +2237,7 @@ _080F6BD0:
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
adds r0, r4, 0
movs r1, 0x7
bl GetWindowAttribute
asm/contest_painting.s
+1 -1
View File
@@ -438,7 +438,7 @@ _081301A6:
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r4, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x1
bl CopyBgTilemapBufferToVram
_081301D4:
asm/easy_chat.s
+2 -2
View File
@@ -4644,7 +4644,7 @@ sub_811D028: @ 811D028
str r4, [sp]
str r5, [sp, 0x4]
str r6, [sp, 0x8]
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -4693,7 +4693,7 @@ sub_811D058: @ 811D058
str r4, [sp, 0x4]
str r2, [sp, 0x8]
mov r2, r9
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r3-r5}
mov r8, r3
asm/field_control_avatar.s
+16 -16
View File
@@ -51,7 +51,7 @@ FieldGetPlayerInput: @ 809BF08
bl cur_mapdata_block_role_at_player_pos
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsMoveTile
bl MetatileBehavior_IsForcedMovementTile
lsls r0, 24
lsrs r7, r0, 24
cmp r6, 0x2
@@ -530,7 +530,7 @@ sub_809C2C8: @ 809C2C8
ldrh r1, [r4, 0x2]
b _0809C30E
_0809C2F0:
ldr r1, =gUnknown_08339D64
ldr r1, =gDirectionToVectors
lsls r2, r6, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -631,7 +631,7 @@ _0809C3B4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C400
ldr r1, =gUnknown_08339D64
ldr r1, =gDirectionToVectors
lsls r2, r7, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -1043,7 +1043,7 @@ _0809C74C:
.pool
_0809C764:
adds r0, r5, 0
bl MetatileBehavior_IsMB_BF
bl MetatileBehavior_IsSecretBaseSandOrnament
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1072,7 +1072,7 @@ _0809C794:
b _0809C7E2
_0809C7A8:
adds r0, r5, 0
bl MetatileBehavior_IsMB_C3
bl MetatileBehavior_IsLargeMatCenter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1081,7 +1081,7 @@ _0809C7A8:
b _0809C7E2
_0809C7BC:
adds r0, r5, 0
bl MetatileBehavior_IsMB_B5
bl MetatileBehavior_IsSecretBaseLargeMatEdge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1376,7 +1376,7 @@ _0809CA04:
bne _0809CAF8
lsls r0, r4, 24
lsrs r0, 24
bl MetatileBehavior_IsMoveTile
bl MetatileBehavior_IsForcedMovementTile
lsls r0, 24
cmp r0, 0
bne _0809CAF8
@@ -1658,7 +1658,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38
negs r0, r0
cmp r4, r0
beq _0809CC90
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
mov r0, r8
adds r1, r4, 0
adds r2, r7, 0
@@ -1699,7 +1699,7 @@ sub_809CC9C: @ 809CC9C
lsrs r0, 24
cmp r0, 0x1
bne _0809CD8A
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
adds r0, r7, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -2048,7 +2048,7 @@ map_warp_consider_2_to_inside: @ 809CF78
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl MetatileBehavior_IsSecretBaseOpen
bl MetatileBehavior_IsOpenSecretBaseDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2083,7 +2083,7 @@ _0809CFB0:
lsrs r0, 24
cmp r0, 0x1
bne _0809CFFC
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
@@ -2334,7 +2334,7 @@ dive_warp: @ 809D16C
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085058
bl SetDiveWarpEmerge
b _0809D1C8
.pool
_0809D1A4:
@@ -2353,12 +2353,12 @@ _0809D1A4:
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085078
bl SetDiveWarpDive
_0809D1C8:
lsls r0, 24
cmp r0, 0
beq _0809D1E0
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
bl sp13E_warp_to_last_warp
movs r0, 0xE9
bl PlaySE
@@ -2407,7 +2407,7 @@ sub_809D1E8: @ 809D1E8
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085058
bl SetDiveWarpEmerge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2431,7 +2431,7 @@ _0809D244:
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085078
bl SetDiveWarpDive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/field_effect_helpers.s
+8 -8
View File
@@ -20,7 +20,7 @@ SetUpReflection: @ 8153ED4
ldrsh r2, [r4, r0]
adds r0, r4, 0
movs r3, 0x98
bl obj_unfreeze
bl CreateCopySpriteAt
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -34,7 +34,7 @@ SetUpReflection: @ 8153ED4
movs r0, 0xC
orrs r1, r0
strb r1, [r7, 0x5]
ldr r2, =gUnknown_084975C4
ldr r2, =gReflectionEffectPaletteMap
lsrs r0, r1, 4
adds r0, r2
ldrb r0, [r0]
@@ -185,7 +185,7 @@ npc_pal_op_B: @ 815401C
bne _0815404C
ldrh r0, [r2, 0x2]
adds r1, r4, 0
bl npc_load_two_palettes__no_record
bl LoadPlayerObjectReflectionPalette
b _0815406A
.pool
_0815404C:
@@ -193,15 +193,15 @@ _0815404C:
bne _0815405A
ldrh r0, [r2, 0x2]
adds r1, r4, 0
bl npc_load_two_palettes__and_record
bl LoadSpecialObjectReflectionPalette
b _0815406A
_0815405A:
adds r0, r4, 0
bl npc_paltag_by_palslot
bl GetObjectPaletteTag
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
bl pal_patch_for_npc
bl PatchObjectPalette
_0815406A:
adds r0, r4, 0
bl UpdateSpritePaletteWithWeather
@@ -225,7 +225,7 @@ npc_pal_op_A: @ 8154078
beq _0815409C
adds r0, r1, 0
adds r1, r4, 0
bl pal_patch_for_npc
bl PatchObjectPalette
adds r0, r4, 0
bl UpdateSpritePaletteWithWeather
_0815409C:
@@ -277,7 +277,7 @@ _081540E0:
b _08154214
.pool
_081540FC:
ldr r1, =gUnknown_084975C4
ldr r1, =gReflectionEffectPaletteMap
ldrb r0, [r5, 0x5]
lsrs r0, 4
adds r0, r1
asm/field_player_avatar.s
+5 -5
View File
@@ -3022,7 +3022,7 @@ _0808CA94:
movs r0, 0
movs r1, 0x1
add r2, sp, 0xC
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -3133,7 +3133,7 @@ fish6: @ 808CB6C
movs r0, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -3266,7 +3266,7 @@ fish9: @ 808CC64
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -3423,7 +3423,7 @@ fishB: @ 808CD94
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
movs r0, 0xD
strh r0, [r5, 0x8]
movs r0, 0x1
@@ -3471,7 +3471,7 @@ fishC: @ 808CE04
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
asm/field_screen.s
+12 -12
View File
@@ -7914,7 +7914,7 @@ sub_80AF0B4: @ 80AF0B4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl warp1_get_mapheader
bl GetDestinationWarpMapHeader
ldrb r1, [r0, 0x17]
adds r0, r4, 0
bl sub_8137360
@@ -8924,7 +8924,7 @@ _080AF914:
bl sub_80AF710
cmp r0, 0
bne _080AF93E
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AF93E
@@ -8934,7 +8934,7 @@ _080AF926:
strh r0, [r4, 0x8]
b _080AF93E
_080AF92E:
bl warp_in
bl WarpIntoMap
ldr r0, =sub_8086074
bl SetMainCallback2
adds r0, r5, 0
@@ -8999,7 +8999,7 @@ _080AF9B2:
bl sub_80AF710
cmp r0, 0
bne _080AF9E8
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AF9E8
@@ -9014,7 +9014,7 @@ _080AF9D0:
ldrb r0, [r0]
cmp r0, 0
bne _080AF9E8
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
@@ -9076,7 +9076,7 @@ _080AFA44:
bl sub_81BE72C
strh r5, [r4, 0xA]
_080AFA5A:
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AFA7C
@@ -9086,7 +9086,7 @@ _080AFA64:
strh r0, [r4, 0x8]
b _080AFA7C
_080AFA6C:
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r6, 0
@@ -9297,7 +9297,7 @@ _080AFC2C:
bl sub_80AF710
cmp r0, 0
bne _080AFC56
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AFC56
@@ -9307,7 +9307,7 @@ _080AFC3E:
strh r0, [r4, 0x8]
b _080AFC56
_080AFC46:
bl warp_in
bl WarpIntoMap
ldr r0, =sub_8086024
bl SetMainCallback2
adds r0, r5, 0
@@ -10049,7 +10049,7 @@ _080B0210:
bl sub_80AF710
cmp r0, 0
bne _080B023A
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080B023A
@@ -10059,7 +10059,7 @@ _080B0222:
strh r0, [r4, 0x8]
b _080B023A
_080B022A:
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
@@ -10492,7 +10492,7 @@ task50_0807F0C8: @ 80B05CC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/macros/battle_ai_script.inc
+84 -84
View File
@@ -27,86 +27,86 @@
.byte \param0
.endm
.macro if_hp_less_than bank, param1, param2
.macro if_hp_less_than battler, param1, param2
.byte 0x5
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_more_than bank, param1, param2
.macro if_hp_more_than battler, param1, param2
.byte 0x6
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_equal bank, param1, param2
.macro if_hp_equal battler, param1, param2
.byte 0x7
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_not_equal bank, param1, param2
.macro if_hp_not_equal battler, param1, param2
.byte 0x8
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_status bank, status1, param2
.macro if_status battler, status1, param2
.byte 0x9
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_not_status bank, status1, param2
.macro if_not_status battler, status1, param2
.byte 0xa
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_status2 bank, status2, param2
.macro if_status2 battler, status2, param2
.byte 0xb
.byte \bank
.byte \battler
.4byte \status2
.4byte \param2
.endm
.macro if_not_status2 bank, status2, param2
.macro if_not_status2 battler, status2, param2
.byte 0xc
.byte \bank
.byte \battler
.4byte \status2
.4byte \param2
.endm
.macro if_status3 bank, status3, param2
.macro if_status3 battler, status3, param2
.byte 0xd
.byte \bank
.byte \battler
.4byte \status3
.4byte \param2
.endm
.macro if_not_status3 bank, status3, param2
.macro if_not_status3 battler, status3, param2
.byte 0xe
.byte \bank
.byte \battler
.4byte \status3
.4byte \param2
.endm
.macro if_side_affecting bank, sidestatus, param2
.macro if_side_affecting battler, sidestatus, param2
.byte 0xf
.byte \bank
.byte \battler
.4byte \sidestatus
.4byte \param2
.endm
.macro if_not_side_affecting bank, sidestatus, param2
.macro if_not_side_affecting battler, sidestatus, param2
.byte 0x10
.byte \bank
.byte \battler
.4byte \sidestatus
.4byte \param2
.endm
@@ -222,9 +222,9 @@
.byte 0x24
.endm
.macro get_last_used_bank_move bank
.macro get_last_used_bank_move battler
.byte 0x25
.byte \bank
.byte \battler
.endm
.macro if_equal_ param0, param1
@@ -259,9 +259,9 @@
.byte 0x2b
.endm
.macro count_usable_party_mons bank
.macro count_usable_party_mons battler
.byte 0x2c
.byte \bank
.byte \battler
.endm
.macro get_considered_move
@@ -272,9 +272,9 @@
.byte 0x2e
.endm
.macro get_ability bank
.macro get_ability battler
.byte 0x2f
.byte \bank
.byte \battler
.endm
.macro get_highest_type_effectiveness
@@ -295,16 +295,16 @@
.byte 0x33
.endm
.macro if_status_in_party bank, status1, param2
.macro if_status_in_party battler, status1, param2
.byte 0x34
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_status_not_in_party bank, status1, param2
.macro if_status_not_in_party battler, status1, param2
.byte 0x35
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
@@ -325,33 +325,33 @@
.4byte \param1
.endm
.macro if_stat_level_less_than bank, stat, param2, param3
.macro if_stat_level_less_than battler, stat, param2, param3
.byte 0x39
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_more_than bank, stat, param2, param3
.macro if_stat_level_more_than battler, stat, param2, param3
.byte 0x3a
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_equal bank, stat, param2, param3
.macro if_stat_level_equal battler, stat, param2, param3
.byte 0x3b
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_not_equal bank, stat, param2, param3
.macro if_stat_level_not_equal battler, stat, param2, param3
.byte 0x3c
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
@@ -367,37 +367,37 @@
.4byte \param0
.endm
.macro if_has_move bank, param1, param2
.macro if_has_move battler, param1, param2
.byte 0x3f
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
.macro if_doesnt_have_move bank, param1, param2
.macro if_doesnt_have_move battler, param1, param2
.byte 0x40
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
.macro if_has_move_with_effect bank, param1, param2
.macro if_has_move_with_effect battler, param1, param2
.byte 0x41
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_doesnt_have_move_with_effect bank, param1, param2
.macro if_doesnt_have_move_with_effect battler, param1, param2
.byte 0x42
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_any_move_disabled_or_encored bank, param1, param2
.macro if_any_move_disabled_or_encored battler, param1, param2
.byte 0x43
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
@@ -421,33 +421,33 @@
.byte 0x47
.endm
.macro get_hold_effect bank
.macro get_hold_effect battler
.byte 0x48
.byte \bank
.byte \battler
.endm
.macro get_gender bank
.macro get_gender battler
.byte 0x49
.byte \bank
.byte \battler
.endm
.macro is_first_turn_for bank
.macro is_first_turn_for battler
.byte 0x4a
.byte \bank
.byte \battler
.endm
.macro get_stockpile_count bank
.macro get_stockpile_count battler
.byte 0x4b
.byte \bank
.byte \battler
.endm
.macro is_double_battle
.byte 0x4c
.endm
.macro get_used_held_item bank
.macro get_used_held_item battler
.byte 0x4d
.byte \bank
.byte \battler
.endm
.macro get_move_type_from_result
@@ -462,9 +462,9 @@
.byte 0x50
.endm
.macro get_protect_count bank
.macro get_protect_count battler
.byte 0x51
.byte \bank
.byte \battler
.endm
.macro nullsub_52
@@ -526,27 +526,27 @@
.4byte \param0
.endm
.macro is_of_type bank, type
.macro is_of_type battler, type
.byte 0x5f
.byte \bank
.byte \battler
.byte \type
.endm
.macro check_ability bank, ability
.macro check_ability battler, ability
.byte 0x60
.byte \bank
.byte \battler
.byte \ability
.endm
.macro if_flash_fired bank, param1
.macro if_flash_fired battler, param1
.byte 0x61
.byte \bank
.byte \battler
.4byte \param1
.endm
.macro if_holds_item bank, param1, param2
.macro if_holds_item battler, param1, param2
.byte 0x62
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
@@ -572,23 +572,23 @@
get_type AI_TYPE2_TARGET
.endm
.macro if_ability bank, ability, ptr
check_ability \bank, \ability
.macro if_ability battler, ability, ptr
check_ability \battler, \ability
if_equal 1, \ptr
.endm
.macro if_no_ability bank, ability, ptr
check_ability \bank, \ability
.macro if_no_ability battler, ability, ptr
check_ability \battler, \ability
if_equal 0, \ptr
.endm
.macro if_type bank, type, ptr
is_of_type \bank, \type
.macro if_type battler, type, ptr
is_of_type \battler, \type
if_equal 1, \ptr
.endm
.macro if_no_type bank, type, ptr
is_of_type \bank, \type
.macro if_no_type battler, type, ptr
is_of_type \battler, \type
if_equal 0, \ptr
.endm
@@ -610,10 +610,10 @@
if_equal 0, \ptr
.endm
.macro if_any_move_disabled bank, ptr
if_any_move_disabled_or_encored \bank, 0, \ptr
.macro if_any_move_disabled battler, ptr
if_any_move_disabled_or_encored \battler, 0, \ptr
.endm
.macro if_any_move_encored bank, ptr
if_any_move_disabled_or_encored \bank, 1, \ptr
.macro if_any_move_encored battler, ptr
if_any_move_disabled_or_encored \battler, 1, \ptr
.endm
asm/macros/battle_anim_script.inc
+36 -23
View File
@@ -56,19 +56,19 @@
.2byte \param0
.endm
.macro monbg bank
.macro monbg battler
.byte 0xa
.byte \bank
.byte \battler
.endm
.macro clearmonbg bank
.macro clearmonbg battler
.byte 0xb
.byte \bank
.byte \battler
.endm
.macro setalpha param0
.byte 0xc
.2byte \param0
.macro setalpha eva, evb
.byte 0x0C
.2byte ((\evb) << 8) | (\eva)
.endm
.macro blendoff
@@ -189,14 +189,14 @@
.4byte \param2
.endm
.macro monbg_22 bank
.macro monbg_22 battler
.byte 0x22
.byte \bank
.byte \battler
.endm
.macro clearmonbg_23 bank
.macro clearmonbg_23 battler
.byte 0x23
.byte \bank
.byte \battler
.endm
.macro jumpifcontest param0
@@ -229,40 +229,53 @@
.byte \param4
.endm
.macro monbgprio_28 bank
.macro monbgprio_28 battler
.byte 0x28
.byte \bank
.byte \battler
.endm
.macro monbgprio_29
.byte 0x29
.endm
.macro monbgprio_2A bank
.macro monbgprio_2A battler
.byte 0x2a
.byte \bank
.byte \battler
.endm
.macro invisible bank
.macro invisible battler
.byte 0x2b
.byte \bank
.byte \battler
.endm
.macro visible bank
.macro visible battler
.byte 0x2c
.byte \bank
.byte \battler
.endm
.macro doublebattle_2D bank
.macro doublebattle_2D battler
.byte 0x2d
.byte \bank
.byte \battler
.endm
.macro doublebattle_2E bank
.macro doublebattle_2E battler
.byte 0x2e
.byte \bank
.byte \battler
.endm
.macro stopsound
.byte 0x2f
.endm
@ useful macros
.macro jumpreteq value, ptr
jumpargeq ARG_RET_ID, \value, \ptr
.endm
.macro jumprettrue ptr
jumpreteq TRUE, \ptr
.endm
.macro jumpretfalse ptr
jumpreteq FALSE, \ptr
.endm
asm/macros/battle_script.inc
+1 -1
View File
@@ -530,7 +530,7 @@
.byte \battler
.endm
.macro jumptorandomattack param0
.macro jumptocalledmove param0
.byte 0x63
.byte \param0
.endm
asm/party_menu.s
+9 -9
View File
@@ -4454,7 +4454,7 @@ _081B243E:
adds r0, r4, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
@@ -4502,7 +4502,7 @@ _081B24C0:
adds r0, r5, 0
movs r1, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
b _081B2540
.pool
_081B2514:
@@ -4525,7 +4525,7 @@ _081B2514:
adds r0, r5, 0
movs r1, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_081B2540:
adds r0, r5, 0
bl PutWindowTilemap
@@ -5108,7 +5108,7 @@ sub_81B2A3C: @ 81B2A3C
str r1, [sp, 0x8]
movs r1, 0
adds r2, r5, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -5804,7 +5804,7 @@ _081B2FF2:
ldr r1, [r1]
str r1, [sp, 0x8]
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
_081B3018:
add sp, 0xC
pop {r3}
@@ -5938,7 +5938,7 @@ _081B3104:
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
_081B313C:
@@ -6132,7 +6132,7 @@ _081B328C:
str r1, [sp, 0x10]
movs r1, 0x1
mov r2, r9
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -6193,7 +6193,7 @@ sub_81B3300: @ 81B3300
movs r0, 0x6
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4}
pop {r0}
@@ -12508,7 +12508,7 @@ _081B6A40:
adds r0, r6, 0
mov r1, r10
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
cmp r4, 0
beq _081B6A82
adds r0, r7, 0x1
asm/pokemon_storage_system.s
+10 -10
View File
@@ -4387,7 +4387,7 @@ sub_80CA4FC: @ 80CA4FC
movs r0, 0
movs r1, 0x1
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d1d
adds r2, r1
@@ -4398,7 +4398,7 @@ sub_80CA4FC: @ 80CA4FC
movs r0, 0
movs r1, 0x2
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r0, =0x00000d41
adds r2, r0
@@ -4409,7 +4409,7 @@ sub_80CA4FC: @ 80CA4FC
movs r0, 0
movs r1, 0x2
movs r3, 0xA
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d65
adds r2, r1
@@ -4420,7 +4420,7 @@ sub_80CA4FC: @ 80CA4FC
movs r0, 0
movs r1, 0
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _080CA5E8
.pool
_080CA588:
@@ -4434,7 +4434,7 @@ _080CA588:
movs r0, 0
movs r1, 0
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000cf9
adds r2, r1
@@ -4445,7 +4445,7 @@ _080CA588:
movs r0, 0
movs r1, 0x1
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r0, =0x00000d1d
adds r2, r0
@@ -4456,7 +4456,7 @@ _080CA588:
movs r0, 0
movs r1, 0x2
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d41
adds r2, r1
@@ -4467,7 +4467,7 @@ _080CA588:
movs r0, 0
movs r1, 0x2
movs r3, 0xA
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_080CA5E8:
movs r0, 0
movs r1, 0x2
@@ -5337,7 +5337,7 @@ _080CAD30:
movs r0, 0x1
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x1
movs r1, 0x2
movs r2, 0xE
@@ -18189,7 +18189,7 @@ _080D17DA:
movs r1, 0x1
adds r2, r4, 0
movs r3, 0x4
bl sub_8199F74
bl AddTextPrinterParameterized5
add sp, 0x14
pop {r4}
pop {r0}
asm/pokenav.s
+69 -69
View File
@@ -1471,7 +1471,7 @@ sub_81C7BA4: @ 81C7BA4
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -2559,7 +2559,7 @@ _081C8434:
str r6, [sp, 0x8]
adds r2, r7, 0
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -3707,7 +3707,7 @@ sub_81C8CB4: @ 81C8CB4
str r2, [sp, 0x4]
str r6, [sp, 0x8]
movs r2, 0x8
bl box_print
bl AddTextPrinterParameterized3
adds r0, r4, 0
movs r1, 0x1
bl sub_81C8C64
@@ -3769,7 +3769,7 @@ sub_81C8D4C: @ 81C8D4C
str r2, [sp, 0x8]
adds r2, r5, 0
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0
bl sub_81C8C64
@@ -3835,7 +3835,7 @@ sub_81C8DBC: @ 81C8DBC
movs r1, 0x7
movs r2, 0x2
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
ldrh r0, [r6, 0x8]
lsls r4, 1
ldrb r1, [r6, 0x4]
@@ -3897,7 +3897,7 @@ sub_81C8E54: @ 81C8E54
movs r1, 0x7
adds r2, r5, 0
movs r3, 0x2
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r0, [r7, 0x8]
ldrb r1, [r7, 0x4]
str r1, [sp]
@@ -7078,7 +7078,7 @@ sub_81CA714: @ 81CA714
str r6, [sp, 0x8]
movs r1, 0x1
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -7116,7 +7116,7 @@ sub_81CA770: @ 81CA770
str r6, [sp, 0x8]
movs r1, 0x1
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -10073,7 +10073,7 @@ sub_81CBE88: @ 81CBE88
movs r1, 0x7
adds r2, r3, 0
movs r3, 0x2
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r0}
bx r0
@@ -10108,7 +10108,7 @@ sub_81CBEB4: @ 81CBEB4
adds r0, r5, 0
movs r1, 0x7
adds r2, r6, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -10156,7 +10156,7 @@ _081CBF24:
movs r1, 0x7
add r2, sp, 0xC
adds r3, r4, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0x2C
pop {r4,r5}
pop {r0}
@@ -10190,7 +10190,7 @@ _081CBF76:
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0x10
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x80
lsls r0, 21
adds r6, r0
@@ -10375,7 +10375,7 @@ sub_81CC0E0: @ 81CC0E0
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x20
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r0}
bx r0
@@ -10409,7 +10409,7 @@ sub_81CC11C: @ 81CC11C
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r0}
bx r0
@@ -10452,7 +10452,7 @@ sub_81CC158: @ 81CC158
adds r0, r2, 0
adds r2, r5, 0
movs r3, 0x20
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -11694,7 +11694,7 @@ _081CCB44:
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r1, [r5]
ldrb r2, [r5, 0x3]
adds r0, r4, 0
@@ -11726,7 +11726,7 @@ _081CCB8E:
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r1, =0x00001041
movs r0, 0xC
str r0, [sp]
@@ -11756,7 +11756,7 @@ _081CCBDC:
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r1, [r5]
ldrb r2, [r5, 0x3]
adds r0, r4, 0
@@ -12035,7 +12035,7 @@ _081CCE08:
movs r1, 0x7
adds r2, r6, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x80
lsls r0, 21
adds r4, r0
@@ -15151,7 +15151,7 @@ _081CE7DA:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _081CE924
_081CE800:
bl sub_81CDD5C
@@ -15176,7 +15176,7 @@ _081CE80C:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add r1, sp, 0xC
movs r0, 0xFC
strb r0, [r1]
@@ -15202,7 +15202,7 @@ _081CE80C:
movs r1, 0x1
add r2, sp, 0xC
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
bl sub_81CDD48
adds r1, r0, 0
lsls r1, 16
@@ -15218,7 +15218,7 @@ _081CE80C:
movs r1, 0x1
add r2, sp, 0xC
movs r3, 0x1C
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _081CE924
.pool
_081CE89C:
@@ -17198,7 +17198,7 @@ sub_81CF7F4: @ 81CF7F4
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r4, 0
adds r1, r7, 0
movs r2, 0x1
@@ -17214,7 +17214,7 @@ sub_81CF7F4: @ 81CF7F4
movs r1, 0x1
adds r2, r4, 0
movs r3, 0x22
bl PrintTextOnWindow
bl AddTextPrinterParameterized
mov r1, r8
ldrb r0, [r1, 0x8]
movs r1, 0x2
@@ -18597,7 +18597,7 @@ sub_81D02B0: @ 81D02B0
adds r0, r4, 0
movs r1, 0x1
add r2, sp, 0xC
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0x1C
pop {r4,r5}
pop {r0}
@@ -20108,7 +20108,7 @@ sub_81D0E84: @ 81D0E84
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldrb r0, [r5, 0xA]
movs r1, 0x2
bl CopyWindowToVram
@@ -20155,7 +20155,7 @@ _081D0F2E:
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r5, r0
@@ -20195,7 +20195,7 @@ _081D0F7C:
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r6, r0
@@ -20260,7 +20260,7 @@ sub_81D0FF0: @ 81D0FF0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r6]
cmp r0, 0
beq _081D1040
@@ -20305,7 +20305,7 @@ _081D104A:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x3C
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0x2
bl CopyWindowToVram
@@ -20379,7 +20379,7 @@ sub_81D10D0: @ 81D10D0
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
mov r1, r8
ldrb r0, [r1, 0xC]
movs r1, 0x2
@@ -21106,7 +21106,7 @@ _081D1D8C:
movs r1, 0x1
movs r2, 0x8
adds r3, r5, 0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
_081D1DAC:
add sp, 0x34
pop {r4,r5}
@@ -22636,7 +22636,7 @@ sub_81D28FC: @ 81D28FC
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_PPSlash
movs r1, 0x29
mov r10, r1
@@ -22648,7 +22648,7 @@ sub_81D28FC: @ 81D28FC
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_PowerSlash
movs r0, 0x1
adds r1, r5, 0
@@ -22665,7 +22665,7 @@ sub_81D28FC: @ 81D28FC
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_AccuracySlash
movs r0, 0x1
adds r1, r5, 0
@@ -22682,7 +22682,7 @@ sub_81D28FC: @ 81D28FC
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
negs r0, r0
cmp r9, r0
@@ -22713,7 +22713,7 @@ _081D29C4:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r1, =gText_PPSlash
movs r0, 0x1
movs r2, 0
@@ -22734,7 +22734,7 @@ _081D29C4:
movs r0, 0
movs r1, 0x1
add r2, sp, 0xC
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r6, 0x1]
cmp r0, 0x1
bhi _081D2A3C
@@ -22758,7 +22758,7 @@ _081D2A4A:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x6A
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r6, 0x3]
cmp r0, 0
bne _081D2A70
@@ -22783,7 +22783,7 @@ _081D2A7E:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x6A
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r1, =gMoveDescriptionPointers
mov r0, r9
subs r0, 0x1
@@ -22798,7 +22798,7 @@ _081D2A7E:
movs r1, 0x7
adds r2, r5, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_081D2AB6:
add sp, 0x2C
pop {r3-r5}
@@ -22837,7 +22837,7 @@ sub_81D2ACC: @ 81D2ACC
str r6, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_Appeal2
movs r0, 0x1
adds r1, r5, 0
@@ -22853,7 +22853,7 @@ sub_81D2ACC: @ 81D2ACC
movs r0, 0x1
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_Jam2
movs r0, 0x1
adds r1, r5, 0
@@ -22868,7 +22868,7 @@ sub_81D2ACC: @ 81D2ACC
movs r0, 0x1
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -22896,7 +22896,7 @@ _081D2B6C:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r1, =gContestEffectDescriptionPointers
ldrb r0, [r4]
lsls r0, 2
@@ -22910,7 +22910,7 @@ _081D2B6C:
movs r1, 0x7
adds r2, r5, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x1
movs r1, 0x2
bl CopyWindowToVram
@@ -22971,7 +22971,7 @@ sub_81D2BF4: @ 81D2BF4
str r0, [sp, 0xC]
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4}
pop {r0}
@@ -24413,7 +24413,7 @@ _081D36CA:
movs r1, 0x1
movs r2, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
lsls r0, r7, 1
mov r4, sp
adds r4, r0
@@ -24436,7 +24436,7 @@ _081D3704:
movs r1, 0x1
movs r2, 0x38
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
ldrsh r1, [r4, r0]
adds r0, r1, 0
@@ -24467,7 +24467,7 @@ _081D373A:
mov r0, r8
movs r1, 0x1
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0x1
lsls r0, 16
lsrs r7, r0, 16
@@ -24585,7 +24585,7 @@ _081D3808:
movs r1, 0x1
movs r2, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r4, 0x38
lsls r4, 24
lsrs r4, 24
@@ -24599,7 +24599,7 @@ _081D3808:
movs r1, 0x1
adds r2, r4, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
@@ -28079,8 +28079,8 @@ sub_81D5520: @ 81D5520
.pool
thumb_func_end sub_81D5520
thumb_func_start sub_81D5530
sub_81D5530: @ 81D5530
thumb_func_start GetTrainerHillOpponentClass
GetTrainerHillOpponentClass: @ 81D5530
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -28096,10 +28096,10 @@ sub_81D5530: @ 81D5530
ldrb r0, [r0]
bx lr
.pool
thumb_func_end sub_81D5530
thumb_func_end GetTrainerHillOpponentClass
thumb_func_start sub_81D5554
sub_81D5554: @ 81D5554
thumb_func_start GetTrainerHillTrainerName
GetTrainerHillTrainerName: @ 81D5554
push {r4,lr}
adds r4, r0, 0
lsls r1, 24
@@ -28125,10 +28125,10 @@ _081D556E:
pop {r0}
bx r0
.pool
thumb_func_end sub_81D5554
thumb_func_end GetTrainerHillTrainerName
thumb_func_start sub_81D5588
sub_81D5588: @ 81D5588
thumb_func_start GetTrainerHillTrainerFrontSpriteId
GetTrainerHillTrainerFrontSpriteId: @ 81D5588
push {r4,lr}
adds r4, r0, 0
lsls r4, 16
@@ -28160,7 +28160,7 @@ sub_81D5588: @ 81D5588
pop {r1}
bx r1
.pool
thumb_func_end sub_81D5588
thumb_func_end GetTrainerHillTrainerFrontSpriteId
thumb_func_start sub_81D55D0
sub_81D55D0: @ 81D55D0
@@ -28324,8 +28324,8 @@ _081D5722:
.pool
thumb_func_end sub_81D5710
thumb_func_start sub_81D572C
sub_81D572C: @ 81D572C
thumb_func_start CopyTrainerHillTrainerText
CopyTrainerHillTrainerText: @ 81D572C
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -28441,7 +28441,7 @@ _081D580E:
pop {r0}
bx r0
.pool
thumb_func_end sub_81D572C
thumb_func_end CopyTrainerHillTrainerText
thumb_func_start sub_81D581C
sub_81D581C: @ 81D581C
@@ -28979,7 +28979,7 @@ PrintOnTrainerHillRecordsWindow: @ 81D5C8C
movs r0, 0
movs r1, 0x1
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r7, 0x12
movs r0, 0
mov r8, r0
@@ -29002,7 +29002,7 @@ _081D5CD6:
movs r0, 0
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
adds r7, 0xF
ldr r0, =gSaveBlock1Ptr
ldr r1, =0x00003718
@@ -29068,7 +29068,7 @@ _081D5CD6:
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
adds r7, 0x11
movs r1, 0x1
add r8, r1
@@ -29704,7 +29704,7 @@ sub_81D62B4: @ 81D62B4
ldr r0, =gSpecialVar_LastTalked
ldrh r1, [r0]
movs r0, 0x5
bl sub_81D572C
bl CopyTrainerHillTrainerText
bl sub_80982B8
pop {r0}
bx r0
asm/rom_8011DC0.s
+97 -97
View File
@@ -2831,7 +2831,7 @@ sub_8017020: @ 8017020
thumb_func_start sub_801704C
sub_801704C: @ 801704C
push {lr}
bl sub_8197224
bl RunTextPrintersAndIsPrinter0Active
lsls r0, 16
cmp r0, 0
beq _0801705C
@@ -2871,7 +2871,7 @@ _08017076:
b _080170AE
.pool
_0801709C:
bl sub_8197224
bl RunTextPrintersAndIsPrinter0Active
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -5689,7 +5689,7 @@ _08018720:
movs r1, 0x1
movs r2, 0x4
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
movs r0, 0
adds r1, r7, 0
movs r2, 0xDE
@@ -5705,7 +5705,7 @@ _08018720:
movs r0, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
movs r0, 0
movs r1, 0x2
bl CopyWindowToVram
@@ -5877,7 +5877,7 @@ sub_8018884: @ 8018884
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
movs r0, 0x1
movs r1, 0x1
movs r2, 0xF
@@ -6230,7 +6230,7 @@ _08018B4A:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
ldrb r0, [r4]
movs r1, 0x1
movs r2, 0xF
@@ -6376,7 +6376,7 @@ _08018C8C:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
ldrb r0, [r5]
movs r1, 0x1
movs r2, 0xF
@@ -9928,7 +9928,7 @@ _0801A93A:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
add sp, 0x18
pop {r4-r7}
pop {r0}
@@ -10249,7 +10249,7 @@ sub_801AB68: @ 801AB68
movs r1, 0x1
adds r2, r6, 0
ldr r3, [sp, 0x14]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -12955,7 +12955,7 @@ _0801C1D0:
movs r1, 0x3
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r4, [r7]
movs r1, 0xDA
lsls r1, 1
@@ -12996,7 +12996,7 @@ _0801C22E:
adds r0, r5, 0
movs r1, 0x3
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
ldr r2, [r7]
ldr r0, [r2, 0x4]
mov r9, r6
@@ -13023,7 +13023,7 @@ _0801C266:
movs r1, 0x1
movs r2, 0xA6
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
b _0801C498
.pool
_0801C2A0:
@@ -13064,7 +13064,7 @@ _0801C2A2:
lsrs r0, r2, 24
movs r1, 0x3
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
adds r4, 0x1
lsls r4, 24
lsrs r0, r4, 24
@@ -13104,7 +13104,7 @@ _0801C304:
adds r0, r5, 0
movs r1, 0x3
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r2, [r7]
ldrb r1, [r2, 0x8]
movs r0, 0x3
@@ -13137,7 +13137,7 @@ _0801C304:
adds r0, r5, 0
movs r1, 0x3
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
mov r9, r6
b _0801C498
.pool
@@ -13202,7 +13202,7 @@ _0801C3CE:
ldr r0, [sp, 0x10]
movs r1, 0x3
ldr r3, [sp, 0x14]
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r0, r1, r5
ldr r2, =0x00000306
@@ -13240,7 +13240,7 @@ _0801C3CE:
ldr r0, [sp, 0x10]
movs r1, 0x3
ldr r3, [sp, 0x14]
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r1, r4
adds r1, 0x2A
@@ -14515,7 +14515,7 @@ _0801CEEC:
str r4, [sp, 0x8]
movs r1, 0x3
movs r3, 0x6
bl box_print
bl AddTextPrinterParameterized3
_0801CF1C:
ldr r6, =gUnknown_02022C78
ldr r4, [r6]
@@ -14550,7 +14550,7 @@ _0801CF1C:
str r4, [sp, 0x8]
movs r1, 0x3
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -20539,7 +20539,7 @@ sub_801FDDC: @ 801FDDC
str r4, [sp, 0x4]
str r6, [sp, 0x8]
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x18]
ldr r2, =gText_No
@@ -20549,7 +20549,7 @@ sub_801FDDC: @ 801FDDC
str r6, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x18]
movs r1, 0x1
@@ -20757,7 +20757,7 @@ _0801FFE2:
adds r0, r5, 0
movs r1, 0x1
adds r2, r6, 0
bl sub_8199F74
bl AddTextPrinterParameterized5
b _0802007A
.pool
_08020050:
@@ -20779,7 +20779,7 @@ _08020050:
adds r0, r5, 0
movs r1, 0x1
adds r2, r6, 0
bl sub_8199F74
bl AddTextPrinterParameterized5
_0802007A:
ldr r0, =gUnknown_02022C88
ldr r0, [r0]
@@ -20926,7 +20926,7 @@ _08020154:
movs r0, 0x1
movs r1, 0x2
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x34
pop {r3-r5}
mov r8, r3
@@ -21004,7 +21004,7 @@ _08020206:
movs r0, 0x2
movs r1, 0
lsrs r2, r5, 24
bl box_print
bl AddTextPrinterParameterized3
adds r4, 0x4
adds r7, 0x1
adds r0, r6, 0
@@ -21043,7 +21043,7 @@ _08020248:
movs r4, 0x80
lsls r4, 19
lsrs r2, r4, 24
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0x1
str r0, [sp, 0x48]
adds r6, 0xC
@@ -21094,7 +21094,7 @@ _080202AC:
movs r0, 0x2
movs r1, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
adds r2, r7, 0
add r0, sp, 0xC
str r0, [sp]
@@ -21106,7 +21106,7 @@ _080202AC:
movs r0, 0x2
movs r1, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
_08020300:
ldr r7, [sp, 0x48]
mov r4, r10
@@ -21299,7 +21299,7 @@ sub_8020420: @ 8020420
movs r1, 0x2
movs r2, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -23909,7 +23909,7 @@ sub_80219C8: @ 80219C8
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3}
mov r8, r3
@@ -24217,7 +24217,7 @@ _08021C5E:
ldr r1, =gStringVar4
str r1, [sp, 0x8]
movs r1, 0x2
bl box_print
bl AddTextPrinterParameterized3
ldr r3, [sp, 0x18]
ldr r2, [sp, 0xC]
ldrb r2, [r2, 0x8]
@@ -24260,7 +24260,7 @@ _08021CC8:
str r2, [sp, 0x8]
movs r1, 0x2
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
lsls r0, r5, 24
lsrs r5, r0, 24
ldr r3, [sp, 0xC]
@@ -24324,7 +24324,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
movs r2, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gText_SpaceSec
movs r0, 0x2
adds r1, r4, 0
@@ -24345,7 +24345,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x9F
lsls r0, 1
add r0, r8
@@ -24386,7 +24386,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gText_SpaceMin
movs r0, 0x2
adds r1, r4, 0
@@ -24406,7 +24406,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x9E
lsls r0, 1
add r0, r8
@@ -24437,7 +24437,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0
adds r0, 0xE
lsls r0, 24
@@ -24452,7 +24452,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
movs r2, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gText_TimesPerSec
movs r0, 0x2
adds r1, r4, 0
@@ -24474,7 +24474,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
mov r4, r8
ldrb r2, [r4, 0x16]
ldrh r0, [r4, 0x16]
@@ -24555,7 +24555,7 @@ _08021F0A:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
b _08021FDE
.pool
_08021FC4:
@@ -24570,7 +24570,7 @@ _08021FC4:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
_08021FDE:
adds r0, r7, 0
adds r0, 0xE
@@ -24591,7 +24591,7 @@ _08021FDE:
movs r1, 0x2
movs r2, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r0, =gStringVar1
ldr r4, [sp, 0x10]
ldrh r1, [r4, 0x8]
@@ -24620,7 +24620,7 @@ _08021FDE:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@@ -24942,7 +24942,7 @@ _080222D0:
movs r1, 0x1
adds r2, r7, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r0, =gText_PressingSpeedRankings
mov r10, r0
movs r0, 0x1
@@ -24962,7 +24962,7 @@ _080222D0:
movs r1, 0x1
adds r2, r7, 0
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x29
mov r10, r0
_08022336:
@@ -24985,7 +24985,7 @@ _08022336:
movs r1, 0x1
movs r2, 0
mov r3, r10
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
ldr r1, =gText_TimesPerSec
movs r2, 0x1
@@ -25005,7 +25005,7 @@ _08022336:
movs r1, 0x1
adds r2, r7, 0
mov r3, r10
bl box_print
bl AddTextPrinterParameterized3
movs r2, 0
mov r0, r9
lsls r4, r0, 1
@@ -25078,7 +25078,7 @@ _080223CA:
movs r1, 0x1
adds r2, r7, 0
mov r3, r10
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [sp, 0x10]
lsls r0, r1, 24
lsrs r0, 24
@@ -25326,7 +25326,7 @@ _08022616:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
b _0802269C
.pool
_08022668:
@@ -25353,7 +25353,7 @@ _08022668:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
_0802269C:
ldr r1, =0x000001bb
adds r0, r6, r1
@@ -26229,7 +26229,7 @@ _08022D42:
movs r0, 0
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
b _08022DB2
.pool
_08022D90:
@@ -26248,7 +26248,7 @@ _08022D90:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
_08022DB2:
movs r0, 0
movs r1, 0x3
@@ -28812,7 +28812,7 @@ _080241A6:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -29171,7 +29171,7 @@ _08024460:
str r1, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
b _080244AC
.pool
_08024490:
@@ -29187,7 +29187,7 @@ _08024490:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
_080244AC:
movs r0, 0
movs r1, 0x3
@@ -29653,7 +29653,7 @@ sub_80247D4: @ 80247D4
movs r1, 0x1
mov r2, r9
mov r3, r8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -29695,7 +29695,7 @@ sub_802482C: @ 802482C
adds r0, r6, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
str r4, [sp]
adds r0, r6, 0
mov r1, r8
@@ -36210,7 +36210,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
movs r1, 0x1
adds r2, r4, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r6, 0
ldr r2, =gStringVar1
mov r8, r2
@@ -36252,7 +36252,7 @@ _08027C76:
adds r0, r7, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [sp, 0x18]
lsls r3, r2, 3
subs r3, r5
@@ -36269,7 +36269,7 @@ _08027C76:
adds r0, r7, 0
movs r1, 0x1
mov r2, r8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r6, 0x1
cmp r6, 0x2
ble _08027C76
@@ -39391,7 +39391,7 @@ _0802955A:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
mov r2, r10
ldr r0, [r2]
add r0, r9
@@ -39648,7 +39648,7 @@ _08029774:
str r3, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
@@ -39677,7 +39677,7 @@ _080297CC:
movs r1, 0x1
movs r2, 0x1C
adds r3, r6, 0
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
mov r1, r9
movs r2, 0
@@ -39704,7 +39704,7 @@ _080297CC:
str r1, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gUnknown_02022CF8
ldr r0, [r2]
add r0, r10
@@ -39719,7 +39719,7 @@ _080297CC:
movs r1, 0x1
ldr r2, =gText_SpacePoints
lsrs r3, 24
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -39858,7 +39858,7 @@ _0802996C:
movs r5, 0
str r5, [sp, 0x8]
mov r2, r8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r4]
add r0, r9
ldrb r0, [r0]
@@ -39869,7 +39869,7 @@ _0802996C:
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0x44
bl PrintTextOnWindow
bl AddTextPrinterParameterized
mov r9, r5
ldr r0, [sp, 0xC]
cmp r9, r0
@@ -39908,7 +39908,7 @@ _080299F2:
str r6, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
movs r7, 0
mov r8, r5
mov r0, r9
@@ -39971,7 +39971,7 @@ _08029A36:
mov r1, r10
str r1, [sp, 0x8]
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
b _08029B10
.pool
_08029AE0:
@@ -39997,7 +39997,7 @@ _08029AE0:
str r1, [sp, 0x8]
movs r1, 0x1
ldr r2, =gStringVar4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_08029B10:
adds r0, r7, 0x1
lsls r0, 24
@@ -40125,7 +40125,7 @@ _08029BFC:
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r6, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _08029F88
.pool
_08029C60:
@@ -40291,7 +40291,7 @@ _08029DA0:
str r6, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
bl DynamicPlaceholderTextUtil_Reset
bl sub_802762C
lsls r0, 16
@@ -40317,7 +40317,7 @@ _08029DA0:
movs r1, 0x1
adds r2, r7, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
bl sub_80279C8
lsls r0, 24
lsrs r4, r0, 24
@@ -40363,7 +40363,7 @@ _08029EA8:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_08029EC8:
ldr r4, =gUnknown_02022CF8
ldr r0, [r4]
@@ -40597,7 +40597,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@@ -40609,7 +40609,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@@ -40622,7 +40622,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@@ -40634,7 +40634,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -40701,7 +40701,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -40714,7 +40714,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -40731,7 +40731,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -40901,7 +40901,7 @@ _0802A3AE:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
b _0802A410
.pool
_0802A3D8:
@@ -41021,7 +41021,7 @@ _0802A4AC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -41181,7 +41181,7 @@ _0802A610:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
@@ -47057,7 +47057,7 @@ _0802D46A:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -47141,7 +47141,7 @@ _0802D516:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -47259,7 +47259,7 @@ _0802D606:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -47339,7 +47339,7 @@ _0802D6AA:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -47538,7 +47538,7 @@ sub_802D7E8: @ 802D7E8
str r1, [sp, 0x4]
str r3, [sp, 0x8]
movs r1, 0x1
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -47592,7 +47592,7 @@ sub_802D884: @ 802D884
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -47645,7 +47645,7 @@ sub_802D8FC: @ 802D8FC
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -47951,7 +47951,7 @@ sub_802DB8C: @ 802DB8C
movs r1, 0
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
str r0, [sp]
str r4, [sp, 0x4]
@@ -47961,7 +47961,7 @@ sub_802DB8C: @ 802DB8C
movs r1, 0
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r4}
pop {r0}
@@ -48390,7 +48390,7 @@ sub_802DED8: @ 802DED8
movs r1, 0x1
adds r2, r4, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r0, [r6]
adds r0, 0x1C
add r0, r8
@@ -49203,7 +49203,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r6, 0
adds r7, r4, 0
movs r0, 0xFF
@@ -49231,7 +49231,7 @@ _0802E58A:
adds r0, r7, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [sp, 0x20]
ldm r0!, {r1}
str r0, [sp, 0x20]
@@ -49258,7 +49258,7 @@ _0802E58A:
adds r0, r7, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x80
lsls r0, 21
add r8, r0
asm/roulette.s
+13 -13
View File
@@ -519,7 +519,7 @@ _081406E0:
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@@ -751,7 +751,7 @@ sub_8140914: @ 8140914
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r5]
movs r1, 0x3
bl CopyWindowToVram
@@ -2655,7 +2655,7 @@ _08141902:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@@ -2678,7 +2678,7 @@ _08141928:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@@ -2816,7 +2816,7 @@ sub_8141A18: @ 8141A18
movs r1, 0x1
mov r2, r8
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r5]
movs r1, 0x3
bl CopyWindowToVram
@@ -3012,7 +3012,7 @@ _08141BB0:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@@ -3039,7 +3039,7 @@ _08141C58:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@@ -3071,7 +3071,7 @@ _08141CBC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@@ -3158,7 +3158,7 @@ _08141D44:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@@ -4676,7 +4676,7 @@ sub_81429F0: @ 81429F0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -4753,7 +4753,7 @@ sub_8142A88: @ 8142A88
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -4778,7 +4778,7 @@ _08142B28:
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -4808,7 +4808,7 @@ _08142B78:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
asm/script_menu.s
+17 -17
View File
@@ -761,7 +761,7 @@ _080E23D4:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_LogOff
movs r0, 0x31
str r0, [sp]
@@ -770,7 +770,7 @@ _080E23D4:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _080E247A
.pool
_080E2448:
@@ -795,7 +795,7 @@ _080E2448:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_080E247A:
ldr r0, =0x000008ab
bl FlagGet
@@ -813,7 +813,7 @@ _080E247A:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _080E24C6
.pool
_080E24B0:
@@ -826,7 +826,7 @@ _080E24B0:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_080E24C6:
ldr r4, =gStringVar4
ldr r1, =gText_PlayersPC
@@ -877,7 +877,7 @@ ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r0}
bx r0
@@ -1228,7 +1228,7 @@ _080E2802:
adds r0, r6, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -1606,7 +1606,7 @@ _080E2B12:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
b _080E2B70
.pool
_080E2B40:
@@ -1630,7 +1630,7 @@ _080E2B40:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
_080E2B70:
add sp, 0x10
pop {r4}
@@ -1687,7 +1687,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionPokemon
movs r0, 0x19
str r0, [sp]
@@ -1696,7 +1696,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionBag
movs r0, 0x29
str r0, [sp]
@@ -1705,7 +1705,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionPokenav
movs r0, 0x39
str r0, [sp]
@@ -1714,7 +1714,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
movs r0, 0x49
@@ -1724,7 +1724,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionSave
movs r0, 0x59
str r0, [sp]
@@ -1733,7 +1733,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionOption
movs r0, 0x69
str r0, [sp]
@@ -1742,7 +1742,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionExit
movs r0, 0x79
str r0, [sp]
@@ -1751,7 +1751,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x10
str r0, [sp]
movs r0, 0x8
asm/slot_machine.s
-8535
View File
File diff suppressed because it is too large Load Diff
asm/trade.s
+6 -6
View File
@@ -1881,7 +1881,7 @@ sub_807825C: @ 807825C
lsrs r1, 24
movs r0, 0x1C
bl SetGpuReg
bl sub_8197224
bl RunTextPrintersAndIsPrinter0Active
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
@@ -4588,7 +4588,7 @@ _080798BC:
str r0, [sp, 0x8]
adds r0, r5, 0
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
add r6, sp, 0x28
adds r0, r6, 0
ldr r1, [sp, 0x60]
@@ -4608,7 +4608,7 @@ _080798BC:
movs r1, 0x1
movs r2, 0
movs r3, 0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
adds r0, r5, 0
bl PutWindowTilemap
adds r0, r5, 0
@@ -4847,7 +4847,7 @@ sub_8079B84: @ 8079B84
adds r0, r4, 0
movs r1, 0
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
@@ -5599,7 +5599,7 @@ sub_807A19C: @ 807A19C
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x14
movs r2, 0xC
@@ -14295,7 +14295,7 @@ sub_807F1A8: @ 807F1A8
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
adds r0, r5, 0
movs r1, 0x3
bl CopyWindowToVram
asm/trainer_card.s
+37 -37
View File
@@ -419,7 +419,7 @@ _080C2A2C:
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -1747,7 +1747,7 @@ sub_80C3574: @ 80C3574
movs r1, 0x1
movs r2, 0x14
movs r3, 0x1C
bl box_print
bl AddTextPrinterParameterized3
b _080C35FA
.pool
_080C35E0:
@@ -1762,7 +1762,7 @@ _080C35E0:
movs r1, 0x1
movs r2, 0x10
movs r3, 0x21
bl box_print
bl AddTextPrinterParameterized3
_080C35FA:
add sp, 0x2C
pop {r4,r5}
@@ -1818,7 +1818,7 @@ _080C365C:
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x2C
pop {r4}
pop {r0}
@@ -1848,7 +1848,7 @@ sub_80C3684: @ 80C3684
movs r1, 0x1
movs r2, 0x14
movs r3, 0x38
bl box_print
bl AddTextPrinterParameterized3
b _080C36DE
.pool
_080C36C4:
@@ -1863,7 +1863,7 @@ _080C36C4:
movs r1, 0x1
movs r2, 0x10
movs r3, 0x39
bl box_print
bl AddTextPrinterParameterized3
_080C36DE:
ldr r0, =gStringVar1
ldr r4, =gUnknown_02039CE8
@@ -1910,7 +1910,7 @@ _080C3740:
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -1964,7 +1964,7 @@ sub_80C378C: @ 80C378C
movs r1, 0x1
movs r2, 0x14
movs r3, 0x48
bl box_print
bl AddTextPrinterParameterized3
b _080C37F6
.pool
_080C37DC:
@@ -1979,7 +1979,7 @@ _080C37DC:
movs r1, 0x1
movs r2, 0x10
movs r3, 0x49
bl box_print
bl AddTextPrinterParameterized3
_080C37F6:
ldr r5, =gStringVar4
ldr r4, =gUnknown_02039CE8
@@ -2025,7 +2025,7 @@ _080C3854:
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
_080C386E:
add sp, 0xC
pop {r4,r5}
@@ -2060,7 +2060,7 @@ sub_80C3880: @ 80C3880
movs r1, 0x1
movs r2, 0x14
movs r3, 0x58
bl box_print
bl AddTextPrinterParameterized3
b _080C38E2
.pool
_080C38C8:
@@ -2075,7 +2075,7 @@ _080C38C8:
movs r1, 0x1
movs r2, 0x10
movs r3, 0x59
bl box_print
bl AddTextPrinterParameterized3
_080C38E2:
ldr r0, =gUnknown_02039CE8
ldr r1, [r0]
@@ -2159,7 +2159,7 @@ _080C395C:
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
adds r7, 0x12
lsls r2, r7, 24
lsrs r2, 24
@@ -2177,7 +2177,7 @@ _080C395C:
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add r7, r10
mov r0, r9
adds r1, r6, 0
@@ -2194,7 +2194,7 @@ _080C395C:
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -2235,7 +2235,7 @@ sub_80C3A18: @ 80C3A18
movs r0, 0x1
movs r1, 0x1
movs r2, 0x8
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r1, 0x19
movs r0, 0x1
@@ -2256,7 +2256,7 @@ sub_80C3A18: @ 80C3A18
str r1, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r0, =gUnknown_0856FB4A
mov r8, r0
ldr r1, [r7]
@@ -2271,7 +2271,7 @@ sub_80C3A18: @ 80C3A18
movs r0, 0x1
movs r1, 0x1
movs r2, 0x8
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r1, 0x33
movs r0, 0x1
@@ -2292,7 +2292,7 @@ sub_80C3A18: @ 80C3A18
str r1, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
_080C3ACE:
add sp, 0xC
pop {r3}
@@ -2363,7 +2363,7 @@ sub_80C3B50: @ 80C3B50
movs r1, 0x1
movs r2, 0x88
movs r3, 0x9
bl box_print
bl AddTextPrinterParameterized3
b _080C3BB6
.pool
_080C3B8C:
@@ -2385,7 +2385,7 @@ _080C3B8C:
movs r0, 0x1
movs r1, 0x1
movs r3, 0x9
bl box_print
bl AddTextPrinterParameterized3
_080C3BB6:
add sp, 0xC
pop {r4}
@@ -2470,7 +2470,7 @@ sub_80C3C34: @ 80C3C34
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r1, =gUnknown_0856FB57
ldr r0, [r6]
adds r0, r5
@@ -2492,7 +2492,7 @@ sub_80C3C34: @ 80C3C34
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -6361,7 +6361,7 @@ _080C5DC2:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0x5
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gText_BattleRecord
movs r0, 0x1
adds r1, r4, 0
@@ -6376,7 +6376,7 @@ _080C5DC2:
movs r0, 0x1
movs r1, 0x1
movs r3, 0x5
bl box_print
bl AddTextPrinterParameterized3
str r6, [sp]
mov r0, r8
str r0, [sp, 0x4]
@@ -6386,7 +6386,7 @@ _080C5DC2:
movs r1, 0x8
movs r2, 0x5
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gStringVar4
ldr r5, =gUnknown_02039CEC
ldr r0, [r5]
@@ -6408,7 +6408,7 @@ _080C5DC2:
movs r0, 0x2
movs r1, 0x8
movs r3, 0x10
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r5]
ldrh r0, [r1, 0x8]
subs r0, 0x5
@@ -6476,7 +6476,7 @@ sub_80C5ED0: @ 80C5ED0
movs r1, 0x1
movs r2, 0x2
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
b _080C5F3A
.pool
_080C5F18:
@@ -6495,7 +6495,7 @@ _080C5F18:
movs r1, 0x1
movs r2, 0x2
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
_080C5F3A:
movs r0, 0x3
movs r1, 0x3
@@ -7983,7 +7983,7 @@ _080C6BB8:
movs r0, 0x1
movs r1, 0x7
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
b _080C6C0E
.pool
_080C6BF0:
@@ -8000,7 +8000,7 @@ _080C6BF0:
movs r0, 0x1
movs r1, 0x7
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
_080C6C0E:
adds r0, r4, 0x1
lsls r0, 24
@@ -8024,7 +8024,7 @@ _080C6C0E:
movs r1, 0x1
movs r2, 0x4
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r4, 0
_080C6C40:
adds r0, r4, 0
@@ -8084,7 +8084,7 @@ _080C6C94:
movs r0, 0x1
movs r1, 0x7
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
ldr r5, =gUnknown_02039CF4
ldr r1, [r5]
ldrb r3, [r1, 0x10]
@@ -8104,7 +8104,7 @@ _080C6C94:
movs r0, 0x1
movs r1, 0x7
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r5]
ldr r2, [r1, 0x4]
ldrb r0, [r1, 0x10]
@@ -8148,7 +8148,7 @@ _080C6C94:
movs r1, 0x1
movs r2, 0x4
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r4, 0
_080C6D4A:
adds r0, r4, 0
@@ -8258,7 +8258,7 @@ _080C6E08:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
ldr r0, [sp, 0x4C]
mov r10, r4
cmp r0, 0x6
@@ -8410,7 +8410,7 @@ sub_80C6EAC: @ 80C6EAC
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
lsrs r5, 1
adds r0, r7, 0
ldr r1, [sp, 0x24]
asm/use_pokeblock.s
+5 -5
View File
@@ -879,7 +879,7 @@ sub_8166D44: @ 8166D44
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0x2
@@ -1095,7 +1095,7 @@ sub_8166F50: @ 8166F50
movs r0, 0x2
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0x2
@@ -1134,7 +1134,7 @@ sub_8166FB0: @ 8166FB0
movs r0, 0x2
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r0}
bx r0
@@ -2536,7 +2536,7 @@ sub_8167BA0: @ 8167BA0
movs r0, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
ldr r1, =0x00008041
adds r0, r1
@@ -2572,7 +2572,7 @@ sub_8167BA0: @ 8167BA0
movs r1, 0x1
movs r2, 0x2
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_08167C46:
mov r2, r8
cmp r2, 0