dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into script_pokemon_util

Browse Source
This commit is contained in:
PikalaxALT
2020-01-12 14:18:34 -05:00
parent bc4d3b892a 74fa8075ee
commit bcf07cb837
30 changed files with 399 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/librfu_intr.s
+13 -13
View File
@@ -19,7 +19,7 @@ IntrSIO32: @ 81DFC50
cmp r0, 0 cmp r0, 0
ldmdbeq r11, {r11,sp,lr} ldmdbeq r11, {r11,sp,lr}
bxeq lr bxeq lr
bl sub_81E05AC bl Callback_Dummy_ID
ldmdb r11, {r11,sp,lr} ldmdb r11, {r11,sp,lr}
bx lr bx lr
_081DFC8C: _081DFC8C:
@@ -205,7 +205,7 @@ _081DFEFC:
beq _081DFF3C beq _081DFF3C
ldrh r1, [r0, 0x12] ldrh r1, [r0, 0x12]
ldrb r0, [r0, 0x6] ldrb r0, [r0, 0x6]
bl sub_81E05A4 bl Callback_Dummy_M
b _081DFF3C b _081DFF3C
.align 2, 0 .align 2, 0
_081DFF28: .4byte gSTWIStatus _081DFF28: .4byte gSTWIStatus
@@ -424,7 +424,7 @@ _081E01D0:
beq _081E0348 beq _081E0348
mov r0, 0x1EC mov r0, 0x1EC
add r0, r0, 0x2 add r0, r0, 0x2
bl sub_81E05A8 bl Callback_Dummy_S
b _081E0348 b _081E0348
_081E0244: _081E0244:
mov r3, 0x120 mov r3, 0x120
@@ -446,7 +446,7 @@ _081E0244:
ldrb r0, [r0, 0x6] ldrb r0, [r0, 0x6]
mov r1, r2 mov r1, r2
orr r0, r0, r3, lsl 8 orr r0, r0, r3, lsl 8
bl sub_81E05A8 bl Callback_Dummy_S
b _081E0348 b _081E0348
_081E0298: _081E0298:
mov r3, 0x208 mov r3, 0x208
@@ -681,17 +681,17 @@ STWI_init_slave: @ 81E0518
_081E05A0: .4byte gSTWIStatus _081E05A0: .4byte gSTWIStatus
arm_func_end STWI_init_slave arm_func_end STWI_init_slave
arm_func_start sub_81E05A4 arm_func_start Callback_Dummy_M
sub_81E05A4: @ 81E05A4 Callback_Dummy_M: @ 81E05A4
bx r2 bx r2
arm_func_end sub_81E05A4 arm_func_end Callback_Dummy_M
arm_func_start sub_81E05A8 arm_func_start Callback_Dummy_S
sub_81E05A8: @ 81E05A8 Callback_Dummy_S: @ 81E05A8
bx r1 bx r1
arm_func_end sub_81E05A8 arm_func_end Callback_Dummy_S
arm_func_start sub_81E05AC arm_func_start Callback_Dummy_ID
sub_81E05AC: @ 81E05AC Callback_Dummy_ID: @ 81E05AC
bx r0 bx r0
arm_func_end sub_81E05AC arm_func_end Callback_Dummy_ID
asm/pc_screen_effect.s
-477
View File
@@ -1,477 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80A0A48
sub_80A0A48: @ 80A0A48
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
adds r3, r2, 0
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
lsls r3, 24
lsrs r3, 24
ldr r0, _080A0A6C @ =sub_80A0B0C
adds r1, r4, 0
adds r2, r5, 0
bl sub_80A0AC0
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080A0A6C: .4byte sub_80A0B0C
thumb_func_end sub_80A0A48
thumb_func_start sub_80A0A70
sub_80A0A70: @ 80A0A70
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
adds r3, r2, 0
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
lsls r3, 24
lsrs r3, 24
ldr r0, _080A0A94 @ =sub_80A0C78
adds r1, r4, 0
adds r2, r5, 0
bl sub_80A0AC0
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080A0A94: .4byte sub_80A0C78
thumb_func_end sub_80A0A70
thumb_func_start sub_80A0A98
sub_80A0A98: @ 80A0A98
push {lr}
ldr r0, _080A0AA8 @ =sub_80A0B0C
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_080A0AA8: .4byte sub_80A0B0C
thumb_func_end sub_80A0A98
thumb_func_start sub_80A0AAC
sub_80A0AAC: @ 80A0AAC
push {lr}
ldr r0, _080A0ABC @ =sub_80A0C78
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_080A0ABC: .4byte sub_80A0C78
thumb_func_end sub_80A0AAC
thumb_func_start sub_80A0AC0
sub_80A0AC0: @ 80A0AC0
push {r4,r5,lr}
lsls r1, 16
lsrs r4, r1, 16
adds r5, r4, 0
lsls r3, 24
lsrs r3, 24
adds r1, r3, 0
bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
ldr r1, _080A0B08 @ =gTasks
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
adds r1, r0, r1
movs r0, 0
strh r0, [r1, 0x8]
movs r0, 0x10
cmp r4, 0
beq _080A0AEE
adds r0, r4, 0
_080A0AEE:
strh r0, [r1, 0xA]
movs r0, 0x14
cmp r5, 0
beq _080A0AF8
adds r0, r5, 0
_080A0AF8:
strh r0, [r1, 0xC]
ldr r1, [r1]
adds r0, r2, 0
bl _call_via_r1
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080A0B08: .4byte gTasks
thumb_func_end sub_80A0AC0
thumb_func_start sub_80A0B0C
sub_80A0B0C: @ 80A0B0C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, _080A0B30 @ =gTasks
adds r4, r0, r1
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0x1
beq _080A0B8C
cmp r0, 0x1
bgt _080A0B34
cmp r0, 0
beq _080A0B3E
b _080A0C5A
.align 2, 0
_080A0B30: .4byte gTasks
_080A0B34:
cmp r0, 0x2
beq _080A0BAE
cmp r0, 0x3
beq _080A0C10
b _080A0C5A
_080A0B3E:
movs r0, 0x78
strh r0, [r4, 0xE]
strh r0, [r4, 0x10]
movs r0, 0x50
strh r0, [r4, 0x12]
movs r0, 0x51
strh r0, [r4, 0x14]
movs r1, 0x80
lsls r1, 6
movs r0, 0
bl SetGpuRegBits
ldrh r1, [r4, 0xE]
lsls r1, 8
ldrh r0, [r4, 0x10]
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x40
bl SetGpuReg
ldrh r1, [r4, 0x12]
lsls r1, 8
ldrh r0, [r4, 0x14]
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
bl SetGpuReg
movs r0, 0x48
movs r1, 0x3F
bl SetGpuReg
movs r0, 0x4A
movs r1, 0
bl SetGpuReg
b _080A0C6A
_080A0B8C:
movs r0, 0x50
bl GetGpuReg
strh r0, [r4, 0x16]
movs r0, 0x54
bl GetGpuReg
strh r0, [r4, 0x18]
movs r0, 0x50
movs r1, 0xBF
bl SetGpuReg
movs r0, 0x54
movs r1, 0x10
bl SetGpuReg
b _080A0C6A
_080A0BAE:
ldrh r0, [r4, 0xE]
ldrh r1, [r4, 0xA]
subs r0, r1
movs r5, 0
strh r0, [r4, 0xE]
ldrh r2, [r4, 0x10]
adds r1, r2
strh r1, [r4, 0x10]
lsls r0, 16
cmp r0, 0
ble _080A0BCC
lsls r0, r1, 16
asrs r0, 16
cmp r0, 0xEF
ble _080A0BF2
_080A0BCC:
strh r5, [r4, 0xE]
movs r0, 0xF0
strh r0, [r4, 0x10]
movs r0, 0x54
movs r1, 0
bl SetGpuReg
ldrh r1, [r4, 0x16]
movs r0, 0x50
bl SetGpuReg
movs r0, 0x1
negs r0, r0
movs r1, 0
movs r2, 0
bl BlendPalettes
ldr r0, _080A0C0C @ =gPlttBufferFaded
strh r5, [r0]
_080A0BF2:
ldrh r1, [r4, 0xE]
lsls r1, 8
ldrh r0, [r4, 0x10]
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x40
bl SetGpuReg
movs r1, 0xE
ldrsh r0, [r4, r1]
b _080A0C54
.align 2, 0
_080A0C0C: .4byte gPlttBufferFaded
_080A0C10:
ldrh r0, [r4, 0x12]
ldrh r1, [r4, 0xC]
subs r0, r1
strh r0, [r4, 0x12]
ldrh r2, [r4, 0x14]
adds r1, r2
strh r1, [r4, 0x14]
lsls r0, 16
cmp r0, 0
ble _080A0C2C
lsls r0, r1, 16
asrs r0, 16
cmp r0, 0x9F
ble _080A0C3E
_080A0C2C:
movs r0, 0
strh r0, [r4, 0x12]
movs r0, 0xA0
strh r0, [r4, 0x14]
movs r1, 0x80
lsls r1, 6
movs r0, 0
bl ClearGpuRegBits
_080A0C3E:
ldrh r1, [r4, 0x12]
lsls r1, 8
ldrh r0, [r4, 0x14]
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
bl SetGpuReg
movs r1, 0x12
ldrsh r0, [r4, r1]
_080A0C54:
cmp r0, 0
bne _080A0C70
b _080A0C6A
_080A0C5A:
ldrh r1, [r4, 0x16]
movs r0, 0x50
bl SetGpuReg
adds r0, r5, 0
bl DestroyTask
b _080A0C70
_080A0C6A:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_080A0C70:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80A0B0C
thumb_func_start sub_80A0C78
sub_80A0C78: @ 80A0C78
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, _080A0C9C @ =gTasks
adds r4, r0, r1
movs r0, 0x8
ldrsh r1, [r4, r0]
cmp r1, 0x1
beq _080A0CB4
cmp r1, 0x1
bgt _080A0CA0
cmp r1, 0
beq _080A0CAA
b _080A0DA8
.align 2, 0
_080A0C9C: .4byte gTasks
_080A0CA0:
cmp r1, 0x2
beq _080A0D02
cmp r1, 0x3
beq _080A0D54
b _080A0DA8
_080A0CAA:
ldr r0, _080A0CB0 @ =gPlttBufferFaded
strh r1, [r0]
b _080A0DCA
.align 2, 0
_080A0CB0: .4byte gPlttBufferFaded
_080A0CB4:
movs r1, 0
strh r1, [r4, 0xE]
movs r0, 0xF0
strh r0, [r4, 0x10]
strh r1, [r4, 0x12]
movs r0, 0xA0
strh r0, [r4, 0x14]
movs r1, 0x80
lsls r1, 6
movs r0, 0
bl SetGpuRegBits
ldrh r1, [r4, 0xE]
lsls r1, 8
ldrh r0, [r4, 0x10]
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x40
bl SetGpuReg
ldrh r1, [r4, 0x12]
lsls r1, 8
ldrh r0, [r4, 0x14]
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
bl SetGpuReg
movs r0, 0x48
movs r1, 0x3F
bl SetGpuReg
movs r0, 0x4A
movs r1, 0
bl SetGpuReg
b _080A0DCA
_080A0D02:
ldrh r0, [r4, 0xC]
ldrh r2, [r4, 0x12]
adds r1, r0, r2
strh r1, [r4, 0x12]
ldrh r2, [r4, 0x14]
subs r0, r2, r0
strh r0, [r4, 0x14]
lsls r1, 16
asrs r1, 16
cmp r1, 0x4F
bgt _080A0D20
lsls r0, 16
asrs r0, 16
cmp r0, 0x51
bgt _080A0D38
_080A0D20:
movs r0, 0x50
strh r0, [r4, 0x12]
movs r0, 0x51
strh r0, [r4, 0x14]
movs r0, 0x50
movs r1, 0xBF
bl SetGpuReg
movs r0, 0x54
movs r1, 0x10
bl SetGpuReg
_080A0D38:
ldrh r1, [r4, 0x12]
lsls r1, 8
ldrh r0, [r4, 0x14]
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
bl SetGpuReg
movs r1, 0x12
ldrsh r0, [r4, r1]
cmp r0, 0x50
bne _080A0DD0
b _080A0DCA
_080A0D54:
ldrh r0, [r4, 0xA]
ldrh r2, [r4, 0xE]
adds r1, r0, r2
strh r1, [r4, 0xE]
ldrh r2, [r4, 0x10]
subs r0, r2, r0
strh r0, [r4, 0x10]
lsls r1, 16
asrs r1, 16
cmp r1, 0x77
bgt _080A0D72
lsls r0, 16
asrs r0, 16
cmp r0, 0x78
bgt _080A0D88
_080A0D72:
movs r0, 0x78
strh r0, [r4, 0xE]
strh r0, [r4, 0x10]
subs r0, 0x79
movs r1, 0x10
movs r2, 0
bl BlendPalettes
ldr r1, _080A0DA4 @ =gPlttBufferFaded
movs r0, 0
strh r0, [r1]
_080A0D88:
ldrh r1, [r4, 0xE]
lsls r1, 8
ldrh r0, [r4, 0x10]
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x40
bl SetGpuReg
movs r1, 0xE
ldrsh r0, [r4, r1]
cmp r0, 0x78
bne _080A0DD0
b _080A0DCA
.align 2, 0
_080A0DA4: .4byte gPlttBufferFaded
_080A0DA8:
movs r1, 0x80
lsls r1, 6
movs r0, 0
bl ClearGpuRegBits
movs r0, 0x54
movs r1, 0
bl SetGpuReg
movs r0, 0x50
movs r1, 0
bl SetGpuReg
adds r0, r5, 0
bl DestroyTask
b _080A0DD0
_080A0DCA:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_080A0DD0:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80A0C78
.align 2, 0 @ Don't pad with nop.
asm/script_pokemon_util_80BF8FC.s
-422
View File
@@ -1,422 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Special_ChooseMonFromParty
Special_ChooseMonFromParty: @ 80BF8FC
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
ldr r0, _080BF934 @ =sub_80BF97C
movs r1, 0xA
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080BF938 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
movs r2, 0
movs r0, 0x3
strh r0, [r1, 0x8]
subs r0, 0x4
str r2, [sp]
movs r1, 0
movs r3, 0x10
bl BeginNormalPaletteFade
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_080BF934: .4byte sub_80BF97C
_080BF938: .4byte gTasks
thumb_func_end Special_ChooseMonFromParty
thumb_func_start SelectMoveTutorMon
SelectMoveTutorMon: @ 80BF93C
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
ldr r0, _080BF974 @ =sub_80BF97C
movs r1, 0xA
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080BF978 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
movs r2, 0
movs r0, 0x7
strh r0, [r1, 0x8]
subs r0, 0x8
str r2, [sp]
movs r1, 0
movs r3, 0x10
bl BeginNormalPaletteFade
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_080BF974: .4byte sub_80BF97C
_080BF978: .4byte gTasks
thumb_func_end SelectMoveTutorMon
thumb_func_start sub_80BF97C
sub_80BF97C: @ 80BF97C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r2, _080BF9B4 @ =gPaletteFade
ldrb r1, [r2, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _080BF9AC
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
strb r0, [r2, 0x8]
ldr r1, _080BF9B8 @ =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x8]
bl ChoosePartyMonByMenuType
adds r0, r4, 0
bl DestroyTask
_080BF9AC:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080BF9B4: .4byte gPaletteFade
_080BF9B8: .4byte gTasks
thumb_func_end sub_80BF97C
thumb_func_start SelectMove
SelectMove: @ 80BF9BC
push {r4,lr}
sub sp, 0x4
ldr r0, _080BF9F0 @ =gPlayerParty
ldr r1, _080BF9F4 @ =gSpecialVar_0x8004
ldrb r1, [r1]
ldr r2, _080BF9F8 @ =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldr r3, _080BF9FC @ =CB2_ReturnToField
movs r4, 0
str r4, [sp]
bl ShowSelectMovePokemonSummaryScreen
movs r0, 0x3
bl sub_8138B38
ldr r1, _080BFA00 @ =gFieldCallback
ldr r0, _080BFA04 @ =FieldCallback_ReturnToEventScript2
str r0, [r1]
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080BF9F0: .4byte gPlayerParty
_080BF9F4: .4byte gSpecialVar_0x8004
_080BF9F8: .4byte gPlayerPartyCount
_080BF9FC: .4byte CB2_ReturnToField
_080BFA00: .4byte gFieldCallback
_080BFA04: .4byte FieldCallback_ReturnToEventScript2
thumb_func_end SelectMove
thumb_func_start ScrSpecial_CountPokemonMoves
ScrSpecial_CountPokemonMoves: @ 80BFA08
push {r4,r5,lr}
ldr r1, _080BFA44 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0
adds r5, r1, 0
_080BFA14:
ldr r0, _080BFA48 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, _080BFA4C @ =gPlayerParty
adds r0, r1
adds r1, r4, 0
adds r1, 0xD
bl GetMonData
cmp r0, 0
beq _080BFA32
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
_080BFA32:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x3
bls _080BFA14
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080BFA44: .4byte gSpecialVar_Result
_080BFA48: .4byte gSpecialVar_0x8004
_080BFA4C: .4byte gPlayerParty
thumb_func_end ScrSpecial_CountPokemonMoves
thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName
ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
push {r4,r5,lr}
ldr r0, _080BFA90 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
adds r5, r1, 0
muls r5, r0
ldr r0, _080BFA94 @ =gPlayerParty
adds r5, r0
ldr r0, _080BFA98 @ =gSpecialVar_0x8005
ldrh r1, [r0]
adds r1, 0xD
adds r0, r5, 0
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r1, _080BFA9C @ =gStringVar1
adds r0, r5, 0
bl GetMonNickname
ldr r0, _080BFAA0 @ =gStringVar2
movs r1, 0xD
muls r1, r4
ldr r2, _080BFAA4 @ =gMoveNames
adds r1, r2
bl StringCopy
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080BFA90: .4byte gSpecialVar_0x8004
_080BFA94: .4byte gPlayerParty
_080BFA98: .4byte gSpecialVar_0x8005
_080BFA9C: .4byte gStringVar1
_080BFAA0: .4byte gStringVar2
_080BFAA4: .4byte gMoveNames
thumb_func_end ScrSpecial_GetPokemonNicknameAndMoveName
thumb_func_start sub_80BFAA8
sub_80BFAA8: @ 80BFAA8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x20
mov r8, r0
adds r5, r1, 0
adds r4, r2, 0
lsls r5, 24
lsrs r5, 24
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
adds r0, 0xD
str r0, [sp, 0x8]
mov r0, r8
ldr r1, [sp, 0x8]
bl GetMonData
mov r1, sp
adds r1, 0x2
str r1, [sp, 0x14]
strh r0, [r1]
adds r3, r4, 0
adds r3, 0xD
str r3, [sp, 0xC]
mov r0, r8
adds r1, r3, 0
bl GetMonData
mov r1, sp
strh r0, [r1]
adds r7, r5, 0
adds r7, 0x11
str r7, [sp, 0x10]
mov r0, r8
adds r1, r7, 0
bl GetMonData
mov r1, sp
adds r1, 0x5
str r1, [sp, 0x18]
strb r0, [r1]
adds r3, r4, 0
adds r3, 0x11
str r3, [sp, 0x1C]
mov r0, r8
adds r1, r3, 0
bl GetMonData
add r7, sp, 0x4
mov r10, r7
strb r0, [r7]
mov r0, r8
movs r1, 0x15
bl GetMonData
mov r6, sp
adds r6, 0x6
strb r0, [r6]
ldr r1, _080BFBA4 @ =gPPUpGetMask
adds r0, r5, r1
ldrb r0, [r0]
mov r9, r0
ldrb r0, [r6]
adds r2, r0, 0
mov r3, r9
ands r2, r3
lsls r5, 1
asrs r2, r5
lsls r2, 24
lsrs r2, 24
adds r1, r4, r1
ldrb r3, [r1]
adds r1, r0, 0
ands r1, r3
lsls r4, 1
asrs r1, r4
lsls r1, 24
lsrs r1, 24
mov r7, r9
bics r0, r7
strb r0, [r6]
ldrb r0, [r6]
bics r0, r3
strb r0, [r6]
lsls r2, r4
lsls r1, r5
adds r2, r1
ldrb r0, [r6]
orrs r0, r2
strb r0, [r6]
mov r0, r8
ldr r1, [sp, 0x8]
mov r2, sp
bl SetMonData
mov r0, r8
ldr r1, [sp, 0xC]
ldr r2, [sp, 0x14]
bl SetMonData
mov r0, r8
ldr r1, [sp, 0x10]
mov r2, r10
bl SetMonData
mov r0, r8
ldr r1, [sp, 0x1C]
ldr r2, [sp, 0x18]
bl SetMonData
mov r0, r8
movs r1, 0x15
adds r2, r6, 0
bl SetMonData
add sp, 0x20
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080BFBA4: .4byte gPPUpGetMask
thumb_func_end sub_80BFAA8
thumb_func_start DeleteMonMove
DeleteMonMove: @ 80BFBA8
push {r4-r6,lr}
mov r6, r8
push {r6}
ldr r0, _080BFC08 @ =gSpecialVar_0x8004
mov r8, r0
ldrh r0, [r0]
movs r6, 0x64
muls r0, r6
ldr r5, _080BFC0C @ =gPlayerParty
adds r0, r5
ldr r4, _080BFC10 @ =gSpecialVar_0x8005
ldrb r2, [r4]
movs r1, 0
bl SetMonMoveSlot
mov r1, r8
ldrh r0, [r1]
muls r0, r6
adds r0, r5
ldrb r1, [r4]
bl RemoveMonPPBonus
ldrh r4, [r4]
cmp r4, 0x2
bhi _080BFBFC
_080BFBDA:
ldr r0, _080BFC08 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, _080BFC0C @ =gPlayerParty
adds r0, r1
lsls r1, r4, 24
lsrs r1, 24
adds r4, 0x1
lsls r2, r4, 24
lsrs r2, 24
bl sub_80BFAA8
lsls r4, 16
lsrs r4, 16
cmp r4, 0x2
bls _080BFBDA
_080BFBFC:
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080BFC08: .4byte gSpecialVar_0x8004
_080BFC0C: .4byte gPlayerParty
_080BFC10: .4byte gSpecialVar_0x8005
thumb_func_end DeleteMonMove
thumb_func_start IsSelectedMonEgg
IsSelectedMonEgg: @ 80BFC14
push {lr}
ldr r0, _080BFC38 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, _080BFC3C @ =gPlayerParty
adds r0, r1
movs r1, 0x2D
bl GetMonData
adds r1, r0, 0
cmp r1, 0
beq _080BFC44
ldr r1, _080BFC40 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _080BFC48
.align 2, 0
_080BFC38: .4byte gSpecialVar_0x8004
_080BFC3C: .4byte gPlayerParty
_080BFC40: .4byte gSpecialVar_Result
_080BFC44:
ldr r0, _080BFC4C @ =gSpecialVar_Result
strh r1, [r0]
_080BFC48:
pop {r0}
bx r0
.align 2, 0
_080BFC4C: .4byte gSpecialVar_Result
thumb_func_end IsSelectedMonEgg
.align 2, 0 @ Don't pad with nop.
common_syms/librfu_s32id.txt
-1
View File
@@ -1 +0,0 @@
gRfuS32Id
common_syms/librfu_sio32id.txt
+1
View File
@@ -0,0 +1 @@
gRfuSIO32Id
data/maps/FuchsiaCity_House3/scripts.inc
+6 -6
View File
@@ -16,19 +16,19 @@ EventScript_16D8B0:: @ 816D8B0
waitstate waitstate
compare_var_to_value VAR_0x8004, 6 compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_16D941 goto_if ge, EventScript_16D941
special IsSelectedMonEgg special Special_IsSelectedMonEgg
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16D937 goto_if eq, EventScript_16D937
special ScrSpecial_CountPokemonMoves special Special_GetNumMovesSelectedMonHas
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16D92A goto_if eq, EventScript_16D92A
msgbox gUnknown_8199445 msgbox gUnknown_8199445
fadescreen 1 fadescreen 1
special SelectMove special Special_SelectMove
fadescreen 0 fadescreen 0
compare_var_to_value VAR_0x8005, 4 compare_var_to_value VAR_0x8005, 4
goto_if eq, EventScript_16D8B0 goto_if eq, EventScript_16D8B0
special ScrSpecial_GetPokemonNicknameAndMoveName special Special_BufferMoveDeleterNicknameAndMove
msgbox gUnknown_8199485, MSGBOX_YESNO msgbox gUnknown_8199485, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16D919 goto_if eq, EventScript_16D919
@@ -36,7 +36,7 @@ EventScript_16D8B0:: @ 816D8B0
end end
EventScript_16D919:: @ 816D919 EventScript_16D919:: @ 816D919
special DeleteMonMove special Special_MoveDeleterForgetMove
playfanfare MUS_ME_WASURE playfanfare MUS_ME_WASURE
waitfanfare waitfanfare
msgbox gUnknown_81994B1 msgbox gUnknown_81994B1
@@ -44,7 +44,7 @@ EventScript_16D919:: @ 816D919
end end
EventScript_16D92A:: @ 816D92A EventScript_16D92A:: @ 816D92A
special ScrSpecial_GetPokemonNicknameAndMoveName special Special_BufferMoveDeleterNicknameAndMove
msgbox gUnknown_8199465 msgbox gUnknown_8199465
release release
end end
data/maps/TwoIsland_House/scripts.inc
+2 -2
View File
@@ -53,11 +53,11 @@ EventScript_1716A5:: @ 81716A5
EventScript_1716BE:: @ 81716BE EventScript_1716BE:: @ 81716BE
msgbox gUnknown_81A2CC3 msgbox gUnknown_81A2CC3
special SelectMoveTutorMon special Special_SelectMoveTutorMon
waitstate waitstate
compare_var_to_value VAR_0x8004, 6 compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_17179E goto_if ge, EventScript_17179E
special IsSelectedMonEgg special Special_IsSelectedMonEgg
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_171790 goto_if eq, EventScript_171790
compare_var_to_value VAR_0x8005, 0 compare_var_to_value VAR_0x8005, 0
data/specials.inc
+6 -6
View File
@@ -227,11 +227,11 @@ gSpecials:: @ 815FD60
def_special Special_GetElevatorFloor def_special Special_GetElevatorFloor
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special SelectMoveTutorMon def_special Special_SelectMoveTutorMon
def_special SelectMove def_special Special_SelectMove
def_special DeleteMonMove def_special Special_MoveDeleterForgetMove
def_special ScrSpecial_GetPokemonNicknameAndMoveName def_special Special_BufferMoveDeleterNicknameAndMove
def_special ScrSpecial_CountPokemonMoves def_special Special_GetNumMovesSelectedMonHas
def_special DisplayMoveTutorMenu def_special DisplayMoveTutorMenu
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
@@ -336,7 +336,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special Special_GetSpeciesOfPartySlot_x8004 def_special Special_GetSpeciesOfPartySlot_x8004
def_special IsSelectedMonEgg def_special Special_IsSelectedMonEgg
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special LoadPlayerBag def_special LoadPlayerBag
include/intro.h
+1
View File
@@ -2,5 +2,6 @@
#define GUARD_INTRO_H #define GUARD_INTRO_H
void sub_80EC864(void); void sub_80EC864(void);
void c2_copyright_1(void);
#endif //GUARD_INTRO_H #endif //GUARD_INTRO_H
include/librfu.h
+2 -2
View File
@@ -490,7 +490,7 @@ struct RfuStatic
u32 totalPacketSize; u32 totalPacketSize;
}; };
struct RfuS32Id struct RfuSIO32Id
{ {
u8 unk0; u8 unk0;
u8 unk1; u8 unk1;
@@ -517,7 +517,7 @@ extern struct RfuStatic *gRfuStatic;
extern struct RfuFixed *gRfuFixed; extern struct RfuFixed *gRfuFixed;
extern struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX]; extern struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX];
extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX]; extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX];
extern struct RfuS32Id gRfuS32Id; extern struct RfuSIO32Id gRfuSIO32Id;
// librfu_s32id // librfu_s32id
s32 AgbRFU_checkID(u8); s32 AgbRFU_checkID(u8);
include/link.h
+2
View File
@@ -259,5 +259,7 @@ void sub_80FA42C(void);
void sub_800B284(struct LinkPlayer * linkPlayer); void sub_800B284(struct LinkPlayer * linkPlayer);
bool8 IsWirelessAdapterConnected(void); bool8 IsWirelessAdapterConnected(void);
bool8 sub_800A474(u8 a0); bool8 sub_800A474(u8 a0);
void LinkVSync(void);
bool8 HandleLinkConnection(void);
#endif // GUARD_LINK_H #endif // GUARD_LINK_H
include/link_rfu.h
+2
View File
@@ -46,6 +46,8 @@ void sub_80FBB20(void);
bool8 sub_80FA484(bool32 a0); bool8 sub_80FA484(bool32 a0);
void var_800D_set_xB(void); void var_800D_set_xB(void);
struct UnkLinkRfuStruct_02022B14 *sub_80F9800(void); struct UnkLinkRfuStruct_02022B14 *sub_80F9800(void);
void sub_80FCF34(void);
void InitRFU(void);
#include "mevent_server.h" #include "mevent_server.h"
extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[]; extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
include/load_save.h
+2
View File
@@ -4,6 +4,8 @@
#include "global.h" #include "global.h"
extern bool32 gFlashMemoryPresent; extern bool32 gFlashMemoryPresent;
extern struct SaveBlock1 gSaveBlock1;
extern struct SaveBlock2 gSaveBlock2;
void ClearSav2(void); void ClearSav2(void);
void ClearSav1(void); void ClearSav1(void);
include/m4a.h
+1
View File
@@ -9,6 +9,7 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern struct MusicPlayerInfo gMPlayInfo_SE3; extern struct MusicPlayerInfo gMPlayInfo_SE3;
extern struct SoundInfo gSoundInfo;
void m4aSoundVSync(void); void m4aSoundVSync(void);
void m4aSoundVSyncOn(void); void m4aSoundVSyncOn(void);
include/overworld.h
+2
View File
@@ -150,5 +150,7 @@ void sub_8055738(u8 loc);
void sub_8056078(void *, void *); void sub_8056078(void *, void *);
void sub_805546C(u8 a0); void sub_805546C(u8 a0);
bool32 sub_80582E0(void);
bool32 sub_8058274(void);
#endif //GUARD_OVERWORLD_H #endif //GUARD_OVERWORLD_H
include/pokemon.h
+1
View File
@@ -513,6 +513,7 @@ extern const u16 *const gLevelUpLearnsets[];
extern const u8 gFacilityClassToPicIndex[]; extern const u8 gFacilityClassToPicIndex[];
extern const u8 gFacilityClassToTrainerClass[]; extern const u8 gFacilityClassToTrainerClass[];
extern const struct SpriteTemplate gUnknown_825DEF0[]; extern const struct SpriteTemplate gUnknown_825DEF0[];
extern const u8 gPPUpGetMask[];
void ZeroBoxMonData(struct BoxPokemon *boxMon); void ZeroBoxMonData(struct BoxPokemon *boxMon);
void ZeroMonData(struct Pokemon *mon); void ZeroMonData(struct Pokemon *mon);
include/pokemon_summary_screen.h
+1
View File
@@ -34,5 +34,6 @@ enum PokemonSummaryScreenPage
s32 GetLastViewedMonIndex(void); s32 GetLastViewedMonIndex(void);
void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4); void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
void sub_8138B38(u8);
#endif // GUARD_POKEMON_SUMMARY_SCREEN_H #endif // GUARD_POKEMON_SUMMARY_SCREEN_H
include/save_failed_screen.h
+2
View File
@@ -2,5 +2,7 @@
#define GUARD_SAVE_FAILED_SCREEN_H #define GUARD_SAVE_FAILED_SCREEN_H
extern void DoSaveFailedScreen(u8 saveType); // save_failed_screen extern void DoSaveFailedScreen(u8 saveType); // save_failed_screen
void sub_80F50F4(void);
bool32 sub_80F5118(void);
#endif //GUARD_SAVE_FAILED_SCREEN_H #endif //GUARD_SAVE_FAILED_SCREEN_H
include/script_pokemon_80F8.h
-12
View File
@@ -1,12 +0,0 @@
#ifndef GUARD_SCRIPTPOKE80F8_H
#define GUARD_SCRIPTPOKE80F8_H
#include "global.h"
void ShowContestWinner(void);
u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
u8 ScriptGiveEgg(u16);
void CreateScriptedWildMon(u16, u8, u16);
void ScriptSetMonMoveSlot(u8, u16, u8);
#endif
include/script_pokemon_81B9.h
-8
View File
@@ -1,8 +0,0 @@
#ifndef GUARD_SCRIPTPOKE81B9_H
#define GUARD_SCRIPTPOKE81B9_H
#include "global.h"
void sub_81B9404(void);
#endif
include/script_pokemon_util_80A0058.h
+1
View File
@@ -6,5 +6,6 @@ bool8 ScriptGiveEgg(u16 species);
void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot); void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
void HealPlayerParty(void); void HealPlayerParty(void);
void ReducePlayerPartyToThree(void); void ReducePlayerPartyToThree(void);
void CreateScriptedWildMon(u16 species, u8 level, u16 item);
#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H #endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
include/text.h
-1
View File
@@ -255,7 +255,6 @@ u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y);
u8 GetKeypadIconTileOffset(u8 keypadIconId); u8 GetKeypadIconTileOffset(u8 keypadIconId);
u8 GetKeypadIconWidth(u8 keypadIconId); u8 GetKeypadIconWidth(u8 keypadIconId);
u8 GetKeypadIconHeight(u8 keypadIconId); u8 GetKeypadIconHeight(u8 keypadIconId);
void SetDefaultFontsPointer(void);
u8 GetFontAttribute(u8 fontId, u8 attributeId); u8 GetFontAttribute(u8 fontId, u8 attributeId);
u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension); u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension);
void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese);
ld_script.txt
+4 -4
View File
@@ -148,7 +148,7 @@ SECTIONS {
src/script_pokemon_util_80A0058.o(.text); src/script_pokemon_util_80A0058.o(.text);
src/field_poison.o(.text); src/field_poison.o(.text);
src/pokemon_size_record.o(.text); src/pokemon_size_record.o(.text);
asm/pc_screen_effect.o(.text); src/pc_screen_effect.o(.text);
src/fldeff_poison.o(.text); src/fldeff_poison.o(.text);
src/fldeff_berrytree.o(.text); src/fldeff_berrytree.o(.text);
src/field_special_scene.o(.text); src/field_special_scene.o(.text);
@@ -178,7 +178,7 @@ SECTIONS {
src/mon_markings.o(.text); src/mon_markings.o(.text);
src/mail.o(.text); src/mail.o(.text);
src/menu_helpers.o(.text); src/menu_helpers.o(.text);
asm/script_pokemon_util_80BF8FC.o(.text); src/party_menu_specials.o(.text);
src/heal_location.o(.text); src/heal_location.o(.text);
src/region_map.o(.text); src/region_map.o(.text);
src/image_processing_effects.o(.text); src/image_processing_effects.o(.text);
@@ -320,7 +320,7 @@ SECTIONS {
src/librfu_stwi.o(.text); src/librfu_stwi.o(.text);
asm/librfu_intr.o(.text); asm/librfu_intr.o(.text);
src/librfu_rfu.o(.text); src/librfu_rfu.o(.text);
src/librfu_s32id.o(.text); src/librfu_sio32id.o(.text);
src/isagbprn.o(.text); src/isagbprn.o(.text);
asm/libagbsyscall.o(.text); asm/libagbsyscall.o(.text);
*libgcc.a:_call_via_rX.o(.text); *libgcc.a:_call_via_rX.o(.text);
@@ -941,7 +941,7 @@ SECTIONS {
src/agb_flash_mx.o(.rodata); src/agb_flash_mx.o(.rodata);
src/agb_flash_le.o(.rodata); src/agb_flash_le.o(.rodata);
src/librfu_rfu.o(.rodata); src/librfu_rfu.o(.rodata);
src/librfu_s32id.o(.rodata); src/librfu_sio32id.o(.rodata);
src/isagbprn.o(.rodata); src/isagbprn.o(.rodata);
*libgcc.a:_divdi3.o(.rodata); *libgcc.a:_divdi3.o(.rodata);
*libgcc.a:_udivdi3.o(.rodata); *libgcc.a:_udivdi3.o(.rodata);
src/librfu_s32id.c → src/librfu_sio32id.c
+34 -34
View File
@@ -4,7 +4,7 @@ static void Sio32IDIntr(void);
static void Sio32IDInit(void); static void Sio32IDInit(void);
static s32 Sio32IDMain(void); static s32 Sio32IDMain(void);
struct RfuS32Id gRfuS32Id; struct RfuSIO32Id gRfuSIO32Id;
static const u16 Sio32ConnectionData[] = { 0x494e, 0x544e, 0x4e45, 0x4f44 }; // NINTENDO static const u16 Sio32ConnectionData[] = { 0x494e, 0x544e, 0x4e45, 0x4f44 }; // NINTENDO
static const char Sio32IDLib_Var[] = "Sio32ID_030820"; static const char Sio32IDLib_Var[] = "Sio32ID_030820";
@@ -52,7 +52,7 @@ static void Sio32IDInit(void)
REG_RCNT = 0; REG_RCNT = 0;
REG_SIOCNT = SIO_32BIT_MODE; REG_SIOCNT = SIO_32BIT_MODE;
REG_SIOCNT |= SIO_INTR_ENABLE | SIO_ENABLE; REG_SIOCNT |= SIO_INTR_ENABLE | SIO_ENABLE;
CpuFill32(0, &gRfuS32Id, sizeof(struct RfuS32Id)); CpuFill32(0, &gRfuSIO32Id, sizeof(struct RfuSIO32Id));
REG_IF = INTR_FLAG_SERIAL; REG_IF = INTR_FLAG_SERIAL;
} }
@@ -60,39 +60,39 @@ static s32 Sio32IDMain(void)
{ {
u8 r12; u8 r12;
switch (r12 = gRfuS32Id.unk1) switch (r12 = gRfuSIO32Id.unk1)
{ {
case 0: case 0:
gRfuS32Id.unk0 = 1; gRfuSIO32Id.unk0 = 1;
REG_SIOCNT |= SIO_38400_BPS; REG_SIOCNT |= SIO_38400_BPS;
REG_IME = r12; REG_IME = r12;
REG_IE |= INTR_FLAG_SERIAL; REG_IE |= INTR_FLAG_SERIAL;
REG_IME = 1; REG_IME = 1;
gRfuS32Id.unk1 = 1; gRfuSIO32Id.unk1 = 1;
*(vu8 *)&REG_SIOCNT |= SIO_ENABLE; *(vu8 *)&REG_SIOCNT |= SIO_ENABLE;
break; break;
case 1: case 1:
if (gRfuS32Id.unkA == 0) if (gRfuSIO32Id.unkA == 0)
{ {
if (gRfuS32Id.unk0 == 1) if (gRfuSIO32Id.unk0 == 1)
{ {
if (gRfuS32Id.unk2 == 0) if (gRfuSIO32Id.unk2 == 0)
{ {
REG_IME = gRfuS32Id.unk2; REG_IME = gRfuSIO32Id.unk2;
REG_SIOCNT |= SIO_ENABLE; REG_SIOCNT |= SIO_ENABLE;
REG_IME = r12; REG_IME = r12;
} }
} }
else if (gRfuS32Id.unk4 != 0x8001 && !gRfuS32Id.unk2) else if (gRfuSIO32Id.unk4 != 0x8001 && !gRfuSIO32Id.unk2)
{ {
REG_IME = gRfuS32Id.unk2; REG_IME = gRfuSIO32Id.unk2;
REG_IE &= ~INTR_FLAG_SERIAL; REG_IE &= ~INTR_FLAG_SERIAL;
REG_IME = r12; REG_IME = r12;
REG_SIOCNT = gRfuS32Id.unk2; REG_SIOCNT = gRfuSIO32Id.unk2;
REG_SIOCNT = SIO_32BIT_MODE; REG_SIOCNT = SIO_32BIT_MODE;
REG_IF = INTR_FLAG_SERIAL; REG_IF = INTR_FLAG_SERIAL;
REG_SIOCNT |= SIO_INTR_ENABLE | SIO_ENABLE; REG_SIOCNT |= SIO_INTR_ENABLE | SIO_ENABLE;
REG_IME = gRfuS32Id.unk2; REG_IME = gRfuSIO32Id.unk2;
REG_IE |= INTR_FLAG_SERIAL; REG_IE |= INTR_FLAG_SERIAL;
REG_IME = r12; REG_IME = r12;
} }
@@ -100,11 +100,11 @@ static s32 Sio32IDMain(void)
} }
else else
{ {
gRfuS32Id.unk1 = 2; gRfuSIO32Id.unk1 = 2;
// fallthrough // fallthrough
} }
default: default:
return gRfuS32Id.unkA; return gRfuSIO32Id.unkA;
} }
return 0; return 0;
} }
@@ -122,43 +122,43 @@ static void Sio32IDIntr(void)
#endif #endif
r5 = REG_SIODATA32; r5 = REG_SIODATA32;
if (gRfuS32Id.unk0 != 1) if (gRfuSIO32Id.unk0 != 1)
REG_SIOCNT |= SIO_ENABLE; REG_SIOCNT |= SIO_ENABLE;
r1 = 16 * gRfuS32Id.unk0; // to handle side effect of inline asm r1 = 16 * gRfuSIO32Id.unk0; // to handle side effect of inline asm
r1 = (r5 << r1) >> 16; r1 = (r5 << r1) >> 16;
r5 = (r5 << 16 * (1 - gRfuS32Id.unk0)) >> 16; r5 = (r5 << 16 * (1 - gRfuSIO32Id.unk0)) >> 16;
if (gRfuS32Id.unkA == 0) if (gRfuSIO32Id.unkA == 0)
{ {
if (r1 == gRfuS32Id.unk6) if (r1 == gRfuSIO32Id.unk6)
{ {
if (gRfuS32Id.unk2 > 3) if (gRfuSIO32Id.unk2 > 3)
{ {
gRfuS32Id.unkA = r5; gRfuSIO32Id.unkA = r5;
} }
else if (r1 == (u16)~gRfuS32Id.unk4) else if (r1 == (u16)~gRfuSIO32Id.unk4)
{ {
r0_ = ~gRfuS32Id.unk6; r0_ = ~gRfuSIO32Id.unk6;
if (r5 == r0_) if (r5 == r0_)
++gRfuS32Id.unk2; ++gRfuSIO32Id.unk2;
} }
} }
else else
{ {
gRfuS32Id.unk2 = gRfuS32Id.unkA; gRfuSIO32Id.unk2 = gRfuSIO32Id.unkA;
} }
} }
if (gRfuS32Id.unk2 < 4) if (gRfuSIO32Id.unk2 < 4)
gRfuS32Id.unk4 = *(gRfuS32Id.unk2 + Sio32ConnectionData); gRfuSIO32Id.unk4 = *(gRfuSIO32Id.unk2 + Sio32ConnectionData);
else else
gRfuS32Id.unk4 = 0x8001; gRfuSIO32Id.unk4 = 0x8001;
gRfuS32Id.unk6 = ~r5; gRfuSIO32Id.unk6 = ~r5;
REG_SIODATA32 = (gRfuS32Id.unk4 << 16 * (1 - gRfuS32Id.unk0)) REG_SIODATA32 = (gRfuSIO32Id.unk4 << 16 * (1 - gRfuSIO32Id.unk0))
+ (gRfuS32Id.unk6 << 16 * gRfuS32Id.unk0); + (gRfuSIO32Id.unk6 << 16 * gRfuSIO32Id.unk0);
if (gRfuS32Id.unk0 == 1 && (gRfuS32Id.unk2 || r5 == 0x494E)) if (gRfuSIO32Id.unk0 == 1 && (gRfuSIO32Id.unk2 || r5 == 0x494E))
{ {
for (r0 = 0; r0 < 600; ++r0) for (r0 = 0; r0 < 600; ++r0)
; ;
if (gRfuS32Id.unkA == 0) if (gRfuSIO32Id.unkA == 0)
REG_SIOCNT |= SIO_ENABLE; REG_SIOCNT |= SIO_ENABLE;
} }
} }
src/main.c
+17 -40
View File
@@ -1,4 +1,9 @@
#include "global.h" #include "global.h"
#include "bg.h"
#include "gpu_regs.h"
#include "link.h"
#include "link_rfu.h"
#include "load_save.h"
#include "main.h" #include "main.h"
#include "m4a.h" #include "m4a.h"
#include "random.h" #include "random.h"
@@ -6,48 +11,20 @@
#include "gba/flash_internal.h" #include "gba/flash_internal.h"
#include "battle.h" #include "battle.h"
#include "help_system.h" #include "help_system.h"
#include "sound.h"
#include "new_menu_helpers.h"
#include "malloc.h"
#include "overworld.h"
#include "sprite.h"
#include "play_time.h"
#include "pokemon.h"
#include "intro.h"
#include "battle_controllers.h"
#include "scanline_effect.h"
#include "save_failed_screen.h"
#include "battle.h"
extern u16 GetGpuReg(u8);
extern void SetGpuReg(u8, u16);
extern void RFUVSync(void);
extern void LinkVSync(void);
extern void sub_80FCF34(void);
extern void LinkVSync(void);
extern void InitGpuRegManager(void);
extern void InitRFU(void);
extern void CheckForFlashMemory(void);
extern void InitMapMusic(void);
extern void ResetBgs(void);
extern void SetDefaultFontsPointer(void);
extern void InitHeap(void *heapStart, u32 heapSize); // malloc.h
extern void rfu_REQ_stopMode(void);
extern void rfu_waitREQComplete(void);
extern bool32 sub_80582E0(void);
extern bool32 sub_8058274(void);
extern void ClearSpriteCopyRequests(void);
extern void PlayTimeCounter_Update(void);
extern void MapMusicMain(void);
extern void EnableInterrupts(u16);
extern void sub_800DD28(void);
extern u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
extern void ScanlineEffect_Stop(void);
extern void sub_80F50F4(void);
extern bool32 sub_80F5118(void);
extern struct SoundInfo gSoundInfo;
extern u32 gFlashMemoryPresent;
extern u32 intr_main[]; extern u32 intr_main[];
extern u8 gHeap[];
extern struct SaveBlock1 gSaveBlock1;
extern struct SaveBlock2 gSaveBlock2;
extern struct PokemonStorage gPokemonStorage;
extern u32 gBattleTypeFlags;
extern u8 gUnknown_03002748;
extern u32 *gUnknown_0203CF5C;
void Timer3Intr(void);
bool8 HandleLinkConnection(void);
void c2_copyright_1(void);
static void VBlankIntr(void); static void VBlankIntr(void);
static void HBlankIntr(void); static void HBlankIntr(void);
src/party_menu_specials.c
+111
View File
@@ -0,0 +1,111 @@
#include "global.h"
#include "data.h"
#include "script.h"
#include "overworld.h"
#include "battle.h"
#include "palette.h"
#include "pokemon.h"
#include "party_menu.h"
#include "field_fadetransition.h"
#include "pokemon_summary_screen.h"
#include "event_data.h"
#include "string_util.h"
#include "constants/moves.h"
static void sub_80BF97C(u8 taskId);
void Special_ChooseMonFromParty(void)
{
u8 taskId;
ScriptContext2_Enable();
taskId = CreateTask(sub_80BF97C, 10);
gTasks[taskId].data[0] = PARTY_MENU_TYPE_CHOOSE_MON;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
}
void Special_SelectMoveTutorMon(void)
{
u8 taskId;
ScriptContext2_Enable();
taskId = CreateTask(sub_80BF97C, 10);
gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_RELEARNER;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
}
static void sub_80BF97C(u8 taskId)
{
if (!gPaletteFade.active)
{
gPaletteFade.bufferTransferDisabled = TRUE;
ChoosePartyMonByMenuType((u8)gTasks[taskId].data[0]);
DestroyTask(taskId);
}
}
void Special_SelectMove(void)
{
ShowSelectMovePokemonSummaryScreen(gPlayerParty, gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField, 0);
sub_8138B38(3);
gFieldCallback = FieldCallback_ReturnToEventScript2;
}
void Special_GetNumMovesSelectedMonHas(void)
{
u8 i;
gSpecialVar_Result = 0;
for (i = 0; i < MAX_MON_MOVES; ++i)
if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_MOVE1 + i) != MOVE_NONE)
++gSpecialVar_Result;
}
void Special_BufferMoveDeleterNicknameAndMove(void)
{
struct Pokemon *mon = &gPlayerParty[gSpecialVar_0x8004];
u16 move = GetMonData(mon, MON_DATA_MOVE1 + gSpecialVar_0x8005);
GetMonNickname(mon, gStringVar1);
StringCopy(gStringVar2, gMoveNames[move]);
}
static void ShiftMoveSlot(struct Pokemon *mon, u8 slotTo, u8 slotFrom)
{
u16 move1 = GetMonData(mon, MON_DATA_MOVE1 + slotTo);
u16 move0 = GetMonData(mon, MON_DATA_MOVE1 + slotFrom);
u8 pp1 = GetMonData(mon, MON_DATA_PP1 + slotTo);
u8 pp0 = GetMonData(mon, MON_DATA_PP1 + slotFrom);
u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
u8 ppBonusMask1 = gPPUpGetMask[slotTo];
u8 ppBonusMove1 = (ppBonuses & ppBonusMask1) >> (slotTo * 2);
u8 ppBonusMask2 = gPPUpGetMask[slotFrom];
u8 ppBonusMove2 = (ppBonuses & ppBonusMask2) >> (slotFrom * 2);
ppBonuses &= ~ppBonusMask1;
ppBonuses &= ~ppBonusMask2;
ppBonuses |= (ppBonusMove1 << (slotFrom * 2)) + (ppBonusMove2 << (slotTo * 2));
SetMonData(mon, MON_DATA_MOVE1 + slotTo, &move0);
SetMonData(mon, MON_DATA_MOVE1 + slotFrom, &move1);
SetMonData(mon, MON_DATA_PP1 + slotTo, &pp0);
SetMonData(mon, MON_DATA_PP1 + slotFrom, &pp1);
SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses);
}
void Special_MoveDeleterForgetMove(void)
{
u16 i;
SetMonMoveSlot(&gPlayerParty[gSpecialVar_0x8004], MOVE_NONE, gSpecialVar_0x8005);
RemoveMonPPBonus(&gPlayerParty[gSpecialVar_0x8004], gSpecialVar_0x8005);
for (i = gSpecialVar_0x8005; i < MAX_MON_MOVES - 1; ++i)
ShiftMoveSlot(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
}
void Special_IsSelectedMonEgg(void)
{
if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_IS_EGG))
gSpecialVar_Result = TRUE;
else
gSpecialVar_Result = FALSE;
}
src/pc_screen_effect.c
+156
View File
@@ -0,0 +1,156 @@
#include "global.h"
#include "task.h"
#include "gpu_regs.h"
#include "palette.h"
static void sub_80A0AC0(TaskFunc func, u16 a2, UNUSED u16 a3, u8 priority);
static void sub_80A0B0C(u8 taskId);
static void sub_80A0C78(u8 taskId);
void sub_80A0A48(u16 a1, u16 a2, u8 a3)
{
sub_80A0AC0(sub_80A0B0C, a1, a2, a3);
}
void sub_80A0A70(u16 a1, u16 a2, u8 a3)
{
sub_80A0AC0(sub_80A0C78, a1, a2, a3);
}
bool8 sub_80A0A98(void)
{
return FuncIsActiveTask(sub_80A0B0C);
}
bool8 sub_80A0AAC(void)
{
return FuncIsActiveTask(sub_80A0C78);
}
static void sub_80A0AC0(TaskFunc func, u16 a2, UNUSED u16 a3, u8 priority)
{
u8 taskId = CreateTask(func, priority);
gTasks[taskId].data[0] = 0;
gTasks[taskId].data[1] = a2 == 0 ? 16 : a2;
gTasks[taskId].data[2] = a2 == 0 ? 20 : a2;
gTasks[taskId].func(taskId);
}
static void sub_80A0B0C(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[0])
{
case 0:
task->data[3] = 120;
task->data[4] = 120;
task->data[5] = 80;
task->data[6] = 81;
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
SetGpuReg(REG_OFFSET_WINOUT, 0);
break;
case 1:
task->data[7] = GetGpuReg(REG_OFFSET_BLDCNT);
task->data[8] = GetGpuReg(REG_OFFSET_BLDY);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_LIGHTEN);
SetGpuReg(REG_OFFSET_BLDY, 16);
break;
case 2:
task->data[3] -= task->data[1];
task->data[4] += task->data[1];
if (task->data[3] <= 0 || task->data[4] >= DISPLAY_WIDTH)
{
task->data[3] = 0;
task->data[4] = DISPLAY_WIDTH;
SetGpuReg(REG_OFFSET_BLDY, 0);
SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]);
BlendPalettes(0xFFFFFFFF, 0, RGB_BLACK);
gPlttBufferFaded[0] = 0;
}
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
if (task->data[3])
return;
break;
case 3:
task->data[5] -= task->data[2];
task->data[6] += task->data[2];
if (task->data[5] <= 0 || task->data[6] >= DISPLAY_HEIGHT)
{
task->data[5] = 0;
task->data[6] = DISPLAY_HEIGHT;
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
}
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
if (task->data[5])
return;
break;
default:
SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]);
DestroyTask(taskId);
return;
}
++task->data[0];
}
static void sub_80A0C78(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[0])
{
case 0:
gPlttBufferFaded[0] = 0;
break;
case 1:
task->data[3] = 0;
task->data[4] = DISPLAY_WIDTH;
task->data[5] = 0;
task->data[6] = DISPLAY_HEIGHT;
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
SetGpuReg(REG_OFFSET_WINOUT, 0);
break;
case 2:
task->data[5] += task->data[2];
task->data[6] -= task->data[2];
if (task->data[5] >= 80 || task->data[6] <= 81)
{
task->data[5] = 80;
task->data[6] = 81;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_LIGHTEN);
SetGpuReg(REG_OFFSET_BLDY, 16);
}
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
if (task->data[5] != 80)
return;
break;
case 3:
task->data[3] += task->data[1];
task->data[4] -= task->data[1];
if (task->data[3] >= 120 || task->data[4] <= 120)
{
task->data[3] = 120;
task->data[4] = 120;
BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
gPlttBufferFaded[0] = 0;
}
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
if (task->data[3] != 120)
return;
break;
default:
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
SetGpuReg(REG_OFFSET_BLDY, 0);
SetGpuReg(REG_OFFSET_BLDCNT, 0);
DestroyTask(taskId);
return;
}
++task->data[0];
}
src/scrcmd.c
-1
View File
@@ -34,7 +34,6 @@
#include "coins.h" #include "coins.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "shop.h" #include "shop.h"
#include "script_pokemon_80F8.h"
#include "slot_machine.h" #include "slot_machine.h"
#include "field_effect.h" #include "field_effect.h"
#include "fieldmap.h" #include "fieldmap.h"
src/vs_seeker.c
+31 -321
View File
@@ -637,7 +637,6 @@ void sub_810C444(void)
} }
} }
#ifdef NONMATCHING
bool8 sub_810C4EC(void) bool8 sub_810C4EC(void)
{ {
if (CheckBagHasItem(ITEM_VS_SEEKER, 1) == TRUE) if (CheckBagHasItem(ITEM_VS_SEEKER, 1) == TRUE)
@@ -648,18 +647,18 @@ bool8 sub_810C4EC(void)
if (FlagGet(FLAG_SYS_VS_SEEKER_CHARGING) == TRUE) if (FlagGet(FLAG_SYS_VS_SEEKER_CHARGING) == TRUE)
{ {
u16 x; u8 x = (gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & 0xFF;
do { u32 r4 = 0xFF;
x = (gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & 0xFF;
} while (0);
if (x < 100) if (x < 100)
{ {
x++; x++;
gSaveBlock1Ptr->trainerRematchStepCounter = ((u16)(x << 8)) | (gSaveBlock1Ptr->trainerRematchStepCounter & 0xFF); #ifndef NONMATCHING // fool the compiler that r4 has been changed
asm("":"=r"(r4));
#endif
gSaveBlock1Ptr->trainerRematchStepCounter = (gSaveBlock1Ptr->trainerRematchStepCounter & 0xFF) | (x << 8);
} }
do { x = (gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & r4;
x = (gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & 0xFF;
} while (0);
if (x == 100) if (x == 100)
{ {
FlagClear(FLAG_SYS_VS_SEEKER_CHARGING); FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
@@ -671,80 +670,6 @@ bool8 sub_810C4EC(void)
return FALSE; return FALSE;
} }
#else
NAKED
bool8 sub_810C4EC(void)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmovs r0, 0xB5\n"
"\tlsls r0, 1\n"
"\tmovs r1, 0x1\n"
"\tbl CheckBagHasItem\n"
"\tlsls r0, 24\n"
"\tlsrs r0, 24\n"
"\tcmp r0, 0x1\n"
"\tbne _0810C516\n"
"\tldr r0, _0810C568 @ =gSaveBlock1Ptr\n"
"\tldr r0, [r0]\n"
"\tmovs r2, 0xC7\n"
"\tlsls r2, 3\n"
"\tadds r1, r0, r2\n"
"\tldrh r2, [r1]\n"
"\tldrb r0, [r1]\n"
"\tcmp r0, 0x63\n"
"\tbhi _0810C516\n"
"\tadds r0, r2, 0x1\n"
"\tstrh r0, [r1]\n"
"_0810C516:\n"
"\tldr r7, _0810C56C @ =0x00000801\n"
"\tadds r0, r7, 0\n"
"\tbl FlagGet\n"
"\tlsls r0, 24\n"
"\tlsrs r0, 24\n"
"\tcmp r0, 0x1\n"
"\tbne _0810C570\n"
"\tldr r6, _0810C568 @ =gSaveBlock1Ptr\n"
"\tldr r0, [r6]\n"
"\tmovs r5, 0xC7\n"
"\tlsls r5, 3\n"
"\tadds r3, r0, r5\n"
"\tldrh r2, [r3]\n"
"\tlsrs r1, r2, 8\n"
"\tmovs r4, 0xFF\n"
"\tcmp r1, 0x63\n"
"\tbhi _0810C548\n"
"\tadds r1, 0x1\n"
"\tlsls r1, 24\n"
"\tmovs r0, 0xFF\n"
"\tands r0, r2\n"
"\tlsrs r1, 16\n"
"\torrs r0, r1\n"
"\tstrh r0, [r3]\n"
"_0810C548:\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tldrh r0, [r0]\n"
"\tlsrs r0, 8\n"
"\tands r0, r4\n"
"\tcmp r0, 0x64\n"
"\tbne _0810C570\n"
"\tadds r0, r7, 0\n"
"\tbl FlagClear\n"
"\tbl sub_810C640\n"
"\tbl sub_810D0D0\n"
"\tmovs r0, 0x1\n"
"\tb _0810C572\n"
"\t.align 2, 0\n"
"_0810C568: .4byte gSaveBlock1Ptr\n"
"_0810C56C: .4byte 0x00000801\n"
"_0810C570:\n"
"\tmovs r0, 0\n"
"_0810C572:\n"
"\tpop {r4-r7}\n"
"\tpop {r1}\n"
"\tbx r1");
}
#endif
void sub_810C578(void) void sub_810C578(void)
{ {
@@ -920,13 +845,17 @@ u8 CanUseVsSeeker(void)
} }
} }
// Nonmatching due to register roulette
#ifdef NONMATCHING
static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
{ {
u16 r8 = 0; u16 r8 = 0;
u8 sp0 = 0; u8 sp0 = 0;
s32 vsSeekerIdx; s32 vsSeekerIdx;
u8 *r2;
#ifndef NONMATCHING
register u32 r3 asm("r3");
register s32 r0_ asm("r0");
asm("":::"r10", "r8", "r6", "r4");
#endif
for (vsSeekerIdx = 0; sVsSeeker->trainerInfo[vsSeekerIdx].localId != 0xFF; vsSeekerIdx++) for (vsSeekerIdx = 0; sVsSeeker->trainerInfo[vsSeekerIdx].localId != 0xFF; vsSeekerIdx++)
{ {
@@ -936,6 +865,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (!HasTrainerBeenFought(r8)) if (!HasTrainerBeenFought(r8))
{ {
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F60); StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F60);
sVsSeeker->trainerInfo[vsSeekerIdx].trainerIdx += 0;
sVsSeeker->trainerHasNotYetBeenFought = 1; sVsSeeker->trainerHasNotYetBeenFought = 1;
} }
else else
@@ -944,7 +874,15 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (r7 == 0) if (r7 == 0)
{ {
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch); StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch);
#ifdef NONMATCHING
sVsSeeker->trainerDoesNotWantRematch = 1; sVsSeeker->trainerDoesNotWantRematch = 1;
#else
r2 = (u8 *)sVsSeeker;
r3 = 0x431;
asm("":::"r1");
r2 = &r2[r3];
*(r2) |= 2;
#endif
} }
else else
{ {
@@ -957,7 +895,15 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (rval < 30) if (rval < 30)
{ {
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch); StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch);
#ifdef NONMATCHING
sVsSeeker->trainerDoesNotWantRematch = 1; sVsSeeker->trainerDoesNotWantRematch = 1;
#else
r2 = (u8 *)sVsSeeker;
r0_ = 0x431;
asm("":::"r1");
r2 = &r2[r0_];
*(r2) |= 2;
#endif
} }
else else
{ {
@@ -985,242 +931,6 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
return 1; return 1;
return 0; return 0;
} }
#else
NAKED
static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmov r7, r10\n"
"\tmov r6, r9\n"
"\tmov r5, r8\n"
"\tpush {r5-r7}\n"
"\tsub sp, 0x8\n"
"\tstr r0, [sp, 0x4]\n"
"\tmovs r0, 0\n"
"\tmov r8, r0\n"
"\tmov r0, sp\n"
"\tmov r1, r8\n"
"\tstrb r1, [r0]\n"
"\tmovs r2, 0\n"
"\tmov r9, r2\n"
"\tldr r4, _0810CA14 @ =sVsSeeker\n"
"\tldr r0, [r4]\n"
"\tldrb r0, [r0, 0x6]\n"
"\tcmp r0, 0xFF\n"
"\tbne _0810C9D0\n"
"\tb _0810CB2C\n"
"_0810C9D0:\n"
"\tadds r6, r4, 0\n"
"\tmovs r3, 0x86\n"
"\tlsls r3, 3\n"
"\tmov r10, r3\n"
"\tmovs r5, 0\n"
"_0810C9DA:\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tbl IsTrainerVisibleOnScreen\n"
"\tlsls r0, 24\n"
"\tlsrs r0, 24\n"
"\tcmp r0, 0x1\n"
"\tbeq _0810C9EC\n"
"\tb _0810CB18\n"
"_0810C9EC:\n"
"\tldr r0, [r4]\n"
"\tadds r0, r5\n"
"\tldrh r0, [r0, 0x4]\n"
"\tmov r8, r0\n"
"\tbl HasTrainerBeenFought\n"
"\tlsls r0, 24\n"
"\tcmp r0, 0\n"
"\tbne _0810CA20\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tldr r1, _0810CA18 @ =gUnknown_8453F60\n"
"\tbl StartTrainerObjectMovementScript\n"
"\tldr r2, [r6]\n"
"\tldr r0, _0810CA1C @ =0x00000431\n"
"\tadds r2, r0\n"
"\tldrb r0, [r2]\n"
"\tmovs r1, 0x1\n"
"\tb _0810CB14\n"
"\t.align 2, 0\n"
"_0810CA14: .4byte sVsSeeker\n"
"_0810CA18: .4byte gUnknown_8453F60\n"
"_0810CA1C: .4byte 0x00000431\n"
"_0810CA20:\n"
"\tldr r0, [sp, 0x4]\n"
"\tmov r1, r8\n"
"\tmov r2, sp\n"
"\tbl GetNextAvailableRematchTrainer\n"
"\tlsls r0, 24\n"
"\tlsrs r7, r0, 24\n"
"\tcmp r7, 0\n"
"\tbne _0810CA50\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tldr r1, _0810CA48 @ =sMovementScript_TrainerNoRematch\n"
"\tbl StartTrainerObjectMovementScript\n"
"\tldr r2, [r6]\n"
"\tldr r3, _0810CA4C @ =0x00000431\n"
"\tadds r2, r3\n"
"\tldrb r0, [r2]\n"
"\tmovs r1, 0x2\n"
"\tb _0810CB14\n"
"\t.align 2, 0\n"
"_0810CA48: .4byte sMovementScript_TrainerNoRematch\n"
"_0810CA4C: .4byte 0x00000431\n"
"_0810CA50:\n"
"\tbl Random\n"
"\tlsls r0, 16\n"
"\tlsrs r0, 16\n"
"\tmovs r1, 0x64\n"
"\tbl __umodsi3\n"
"\tlsls r0, 16\n"
"\tlsrs r4, r0, 16\n"
"\tmov r0, r9\n"
"\tmov r1, r8\n"
"\tbl GetCurVsSeekerResponse\n"
"\tlsls r0, 24\n"
"\tlsrs r0, 24\n"
"\tcmp r0, 0x2\n"
"\tbne _0810CA76\n"
"\tmovs r4, 0x64\n"
"\tb _0810CA7C\n"
"_0810CA76:\n"
"\tcmp r0, 0x1\n"
"\tbne _0810CA7C\n"
"\tmovs r4, 0\n"
"_0810CA7C:\n"
"\tcmp r4, 0x1D\n"
"\tbhi _0810CAA0\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tldr r1, _0810CA98 @ =sMovementScript_TrainerNoRematch\n"
"\tbl StartTrainerObjectMovementScript\n"
"\tldr r2, [r6]\n"
"\tldr r0, _0810CA9C @ =0x00000431\n"
"\tadds r2, r0\n"
"\tldrb r0, [r2]\n"
"\tmovs r1, 0x2\n"
"\tb _0810CB14\n"
"\t.align 2, 0\n"
"_0810CA98: .4byte sMovementScript_TrainerNoRematch\n"
"_0810CA9C: .4byte 0x00000431\n"
"_0810CAA0:\n"
"\tldr r0, _0810CB54 @ =gSaveBlock1Ptr\n"
"\tldr r1, [r0]\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tldr r2, _0810CB58 @ =0x0000063a\n"
"\tadds r1, r2\n"
"\tldrb r0, [r0, 0x6]\n"
"\tadds r1, r0\n"
"\tstrb r7, [r1]\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tldrb r1, [r0, 0x7]\n"
"\tlsls r0, r1, 3\n"
"\tadds r0, r1\n"
"\tlsls r0, 2\n"
"\tldr r1, _0810CB5C @ =gObjectEvents\n"
"\tadds r0, r1\n"
"\tbl npc_coords_shift_still\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tldr r1, _0810CB60 @ =gUnknown_8453F64\n"
"\tbl StartTrainerObjectMovementScript\n"
"\tldr r2, [r6]\n"
"\tmov r3, r10\n"
"\tadds r0, r2, r3\n"
"\tldrb r1, [r0]\n"
"\tlsls r1, 1\n"
"\tmovs r3, 0x80\n"
"\tlsls r3, 3\n"
"\tadds r0, r2, r3\n"
"\tadds r0, r1\n"
"\tmov r1, r8\n"
"\tstrh r1, [r0]\n"
"\tadds r2, r5\n"
"\tldrb r0, [r2, 0xC]\n"
"\tbl GetRunningBehaviorFromGraphicsId\n"
"\tldr r1, [r6]\n"
"\tmov r3, r10\n"
"\tadds r2, r1, r3\n"
"\tmovs r3, 0x84\n"
"\tlsls r3, 3\n"
"\tadds r1, r3\n"
"\tldrb r2, [r2]\n"
"\tadds r1, r2\n"
"\tstrb r0, [r1]\n"
"\tldr r1, [r6]\n"
"\tadd r1, r10\n"
"\tldrb r0, [r1]\n"
"\tadds r0, 0x1\n"
"\tstrb r0, [r1]\n"
"\tldr r2, [r6]\n"
"\tldr r0, _0810CB64 @ =0x00000431\n"
"\tadds r2, r0\n"
"\tldrb r0, [r2]\n"
"\tmovs r1, 0x4\n"
"_0810CB14:\n"
"\torrs r0, r1\n"
"\tstrb r0, [r2]\n"
"_0810CB18:\n"
"\tadds r5, 0x10\n"
"\tmovs r1, 0x1\n"
"\tadd r9, r1\n"
"\tldr r4, _0810CB68 @ =sVsSeeker\n"
"\tldr r0, [r4]\n"
"\tadds r0, r5\n"
"\tldrb r0, [r0, 0x6]\n"
"\tcmp r0, 0xFF\n"
"\tbeq _0810CB2C\n"
"\tb _0810C9DA\n"
"_0810CB2C:\n"
"\tldr r2, _0810CB68 @ =sVsSeeker\n"
"\tldr r0, [r2]\n"
"\tldr r3, _0810CB64 @ =0x00000431\n"
"\tadds r0, r3\n"
"\tldrb r1, [r0]\n"
"\tmovs r0, 0x4\n"
"\tands r0, r1\n"
"\tcmp r0, 0\n"
"\tbeq _0810CB70\n"
"\tmovs r0, 0x15\n"
"\tbl PlaySE\n"
"\tldr r0, _0810CB6C @ =0x00000801\n"
"\tbl FlagSet\n"
"\tbl sub_810C640\n"
"\tmovs r0, 0x2\n"
"\tb _0810CB7E\n"
"\t.align 2, 0\n"
"_0810CB54: .4byte gSaveBlock1Ptr\n"
"_0810CB58: .4byte 0x0000063a\n"
"_0810CB5C: .4byte gObjectEvents\n"
"_0810CB60: .4byte gUnknown_8453F64\n"
"_0810CB64: .4byte 0x00000431\n"
"_0810CB68: .4byte sVsSeeker\n"
"_0810CB6C: .4byte 0x00000801\n"
"_0810CB70:\n"
"\tmovs r0, 0x1\n"
"\tands r0, r1\n"
"\tcmp r0, 0\n"
"\tbne _0810CB7C\n"
"\tmovs r0, 0\n"
"\tb _0810CB7E\n"
"_0810CB7C:\n"
"\tmovs r0, 0x1\n"
"_0810CB7E:\n"
"\tadd sp, 0x8\n"
"\tpop {r3-r5}\n"
"\tmov r8, r3\n"
"\tmov r9, r4\n"
"\tmov r10, r5\n"
"\tpop {r4-r7}\n"
"\tpop {r1}\n"
"\tbx r1");
}
#endif
void sub_810CB90(void) void sub_810CB90(void)
{ {
sym_common.txt
+1 -1
View File
@@ -164,4 +164,4 @@ gUnknown_3005E94: @ 3005E94
.align 4 .align 4
.include "librfu_rfu.o" .include "librfu_rfu.o"
.align 4 .align 4
.include "librfu_s32id.o" .include "librfu_sio32id.o"