summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/librfu_intr.s26
-rw-r--r--asm/pc_screen_effect.s477
-rw-r--r--common_syms/librfu_s32id.txt1
-rw-r--r--common_syms/librfu_sio32id.txt1
-rw-r--r--include/intro.h1
-rw-r--r--include/librfu.h4
-rw-r--r--include/link.h2
-rw-r--r--include/link_rfu.h2
-rw-r--r--include/load_save.h2
-rw-r--r--include/m4a.h1
-rw-r--r--include/overworld.h2
-rw-r--r--include/save_failed_screen.h2
-rw-r--r--include/text.h1
-rw-r--r--ld_script.txt6
-rw-r--r--src/librfu_sio32id.c (renamed from src/librfu_s32id.c)68
-rw-r--r--src/main.c57
-rw-r--r--src/pc_screen_effect.c156
-rw-r--r--src/vs_seeker.c352
-rw-r--r--sym_common.txt2
19 files changed, 270 insertions, 893 deletions
diff --git a/asm/librfu_intr.s b/asm/librfu_intr.s
index 10ee02e7b..2cc761554 100644
--- a/asm/librfu_intr.s
+++ b/asm/librfu_intr.s
@@ -19,7 +19,7 @@ IntrSIO32: @ 81DFC50
cmp r0, 0
ldmdbeq r11, {r11,sp,lr}
bxeq lr
- bl sub_81E05AC
+ bl Callback_Dummy_ID
ldmdb r11, {r11,sp,lr}
bx lr
_081DFC8C:
@@ -205,7 +205,7 @@ _081DFEFC:
beq _081DFF3C
ldrh r1, [r0, 0x12]
ldrb r0, [r0, 0x6]
- bl sub_81E05A4
+ bl Callback_Dummy_M
b _081DFF3C
.align 2, 0
_081DFF28: .4byte gSTWIStatus
@@ -424,7 +424,7 @@ _081E01D0:
beq _081E0348
mov r0, 0x1EC
add r0, r0, 0x2
- bl sub_81E05A8
+ bl Callback_Dummy_S
b _081E0348
_081E0244:
mov r3, 0x120
@@ -446,7 +446,7 @@ _081E0244:
ldrb r0, [r0, 0x6]
mov r1, r2
orr r0, r0, r3, lsl 8
- bl sub_81E05A8
+ bl Callback_Dummy_S
b _081E0348
_081E0298:
mov r3, 0x208
@@ -681,17 +681,17 @@ STWI_init_slave: @ 81E0518
_081E05A0: .4byte gSTWIStatus
arm_func_end STWI_init_slave
- arm_func_start sub_81E05A4
-sub_81E05A4: @ 81E05A4
+ arm_func_start Callback_Dummy_M
+Callback_Dummy_M: @ 81E05A4
bx r2
- arm_func_end sub_81E05A4
+ arm_func_end Callback_Dummy_M
- arm_func_start sub_81E05A8
-sub_81E05A8: @ 81E05A8
+ arm_func_start Callback_Dummy_S
+Callback_Dummy_S: @ 81E05A8
bx r1
- arm_func_end sub_81E05A8
+ arm_func_end Callback_Dummy_S
- arm_func_start sub_81E05AC
-sub_81E05AC: @ 81E05AC
+ arm_func_start Callback_Dummy_ID
+Callback_Dummy_ID: @ 81E05AC
bx r0
- arm_func_end sub_81E05AC
+ arm_func_end Callback_Dummy_ID
diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s
deleted file mode 100644
index 61c47a719..000000000
--- a/asm/pc_screen_effect.s
+++ /dev/null
@@ -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.
diff --git a/common_syms/librfu_s32id.txt b/common_syms/librfu_s32id.txt
deleted file mode 100644
index 6c24cc4a4..000000000
--- a/common_syms/librfu_s32id.txt
+++ /dev/null
@@ -1 +0,0 @@
-gRfuS32Id
diff --git a/common_syms/librfu_sio32id.txt b/common_syms/librfu_sio32id.txt
new file mode 100644
index 000000000..97395e84b
--- /dev/null
+++ b/common_syms/librfu_sio32id.txt
@@ -0,0 +1 @@
+gRfuSIO32Id
diff --git a/include/intro.h b/include/intro.h
index f01c81a9e..19cdcd032 100644
--- a/include/intro.h
+++ b/include/intro.h
@@ -2,5 +2,6 @@
#define GUARD_INTRO_H
void sub_80EC864(void);
+void c2_copyright_1(void);
#endif //GUARD_INTRO_H
diff --git a/include/librfu.h b/include/librfu.h
index f5a7b4d96..cf409ca69 100644
--- a/include/librfu.h
+++ b/include/librfu.h
@@ -490,7 +490,7 @@ struct RfuStatic
u32 totalPacketSize;
};
-struct RfuS32Id
+struct RfuSIO32Id
{
u8 unk0;
u8 unk1;
@@ -517,7 +517,7 @@ extern struct RfuStatic *gRfuStatic;
extern struct RfuFixed *gRfuFixed;
extern struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX];
extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX];
-extern struct RfuS32Id gRfuS32Id;
+extern struct RfuSIO32Id gRfuSIO32Id;
// librfu_s32id
s32 AgbRFU_checkID(u8);
diff --git a/include/link.h b/include/link.h
index 9465f0404..d61152d8a 100644
--- a/include/link.h
+++ b/include/link.h
@@ -259,5 +259,7 @@ void sub_80FA42C(void);
void sub_800B284(struct LinkPlayer * linkPlayer);
bool8 IsWirelessAdapterConnected(void);
bool8 sub_800A474(u8 a0);
+void LinkVSync(void);
+bool8 HandleLinkConnection(void);
#endif // GUARD_LINK_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index d1bc2b2bc..033f4c8d4 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -46,6 +46,8 @@ void sub_80FBB20(void);
bool8 sub_80FA484(bool32 a0);
void var_800D_set_xB(void);
struct UnkLinkRfuStruct_02022B14 *sub_80F9800(void);
+void sub_80FCF34(void);
+void InitRFU(void);
#include "mevent_server.h"
extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
diff --git a/include/load_save.h b/include/load_save.h
index 10d1083a8..20df691e5 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -4,6 +4,8 @@
#include "global.h"
extern bool32 gFlashMemoryPresent;
+extern struct SaveBlock1 gSaveBlock1;
+extern struct SaveBlock2 gSaveBlock2;
void ClearSav2(void);
void ClearSav1(void);
diff --git a/include/m4a.h b/include/m4a.h
index 2bb7f2124..ee23d917a 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -9,6 +9,7 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern struct MusicPlayerInfo gMPlayInfo_SE3;
+extern struct SoundInfo gSoundInfo;
void m4aSoundVSync(void);
void m4aSoundVSyncOn(void);
diff --git a/include/overworld.h b/include/overworld.h
index 324150779..69c1e964f 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -150,5 +150,7 @@ void sub_8055738(u8 loc);
void sub_8056078(void *, void *);
void sub_805546C(u8 a0);
+bool32 sub_80582E0(void);
+bool32 sub_8058274(void);
#endif //GUARD_OVERWORLD_H
diff --git a/include/save_failed_screen.h b/include/save_failed_screen.h
index feffa2014..5950430d2 100644
--- a/include/save_failed_screen.h
+++ b/include/save_failed_screen.h
@@ -2,5 +2,7 @@
#define GUARD_SAVE_FAILED_SCREEN_H
extern void DoSaveFailedScreen(u8 saveType); // save_failed_screen
+void sub_80F50F4(void);
+bool32 sub_80F5118(void);
#endif //GUARD_SAVE_FAILED_SCREEN_H
diff --git a/include/text.h b/include/text.h
index 578a0d735..a15b42c92 100644
--- a/include/text.h
+++ b/include/text.h
@@ -255,7 +255,6 @@ u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y);
u8 GetKeypadIconTileOffset(u8 keypadIconId);
u8 GetKeypadIconWidth(u8 keypadIconId);
u8 GetKeypadIconHeight(u8 keypadIconId);
-void SetDefaultFontsPointer(void);
u8 GetFontAttribute(u8 fontId, u8 attributeId);
u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension);
void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese);
diff --git a/ld_script.txt b/ld_script.txt
index a24e1a406..b18f0d5f2 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -148,7 +148,7 @@ SECTIONS {
asm/script_pokemon_util_80A0058.o(.text);
src/field_poison.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_berrytree.o(.text);
src/field_special_scene.o(.text);
@@ -320,7 +320,7 @@ SECTIONS {
src/librfu_stwi.o(.text);
asm/librfu_intr.o(.text);
src/librfu_rfu.o(.text);
- src/librfu_s32id.o(.text);
+ src/librfu_sio32id.o(.text);
src/isagbprn.o(.text);
asm/libagbsyscall.o(.text);
*libgcc.a:_call_via_rX.o(.text);
@@ -941,7 +941,7 @@ SECTIONS {
src/agb_flash_mx.o(.rodata);
src/agb_flash_le.o(.rodata);
src/librfu_rfu.o(.rodata);
- src/librfu_s32id.o(.rodata);
+ src/librfu_sio32id.o(.rodata);
src/isagbprn.o(.rodata);
*libgcc.a:_divdi3.o(.rodata);
*libgcc.a:_udivdi3.o(.rodata);
diff --git a/src/librfu_s32id.c b/src/librfu_sio32id.c
index ed51dcd12..fc5701986 100644
--- a/src/librfu_s32id.c
+++ b/src/librfu_sio32id.c
@@ -4,7 +4,7 @@ static void Sio32IDIntr(void);
static void Sio32IDInit(void);
static s32 Sio32IDMain(void);
-struct RfuS32Id gRfuS32Id;
+struct RfuSIO32Id gRfuSIO32Id;
static const u16 Sio32ConnectionData[] = { 0x494e, 0x544e, 0x4e45, 0x4f44 }; // NINTENDO
static const char Sio32IDLib_Var[] = "Sio32ID_030820";
@@ -52,7 +52,7 @@ static void Sio32IDInit(void)
REG_RCNT = 0;
REG_SIOCNT = SIO_32BIT_MODE;
REG_SIOCNT |= SIO_INTR_ENABLE | SIO_ENABLE;
- CpuFill32(0, &gRfuS32Id, sizeof(struct RfuS32Id));
+ CpuFill32(0, &gRfuSIO32Id, sizeof(struct RfuSIO32Id));
REG_IF = INTR_FLAG_SERIAL;
}
@@ -60,39 +60,39 @@ static s32 Sio32IDMain(void)
{
u8 r12;
- switch (r12 = gRfuS32Id.unk1)
+ switch (r12 = gRfuSIO32Id.unk1)
{
case 0:
- gRfuS32Id.unk0 = 1;
+ gRfuSIO32Id.unk0 = 1;
REG_SIOCNT |= SIO_38400_BPS;
REG_IME = r12;
REG_IE |= INTR_FLAG_SERIAL;
REG_IME = 1;
- gRfuS32Id.unk1 = 1;
+ gRfuSIO32Id.unk1 = 1;
*(vu8 *)&REG_SIOCNT |= SIO_ENABLE;
break;
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_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_IME = r12;
- REG_SIOCNT = gRfuS32Id.unk2;
+ REG_SIOCNT = gRfuSIO32Id.unk2;
REG_SIOCNT = SIO_32BIT_MODE;
REG_IF = INTR_FLAG_SERIAL;
REG_SIOCNT |= SIO_INTR_ENABLE | SIO_ENABLE;
- REG_IME = gRfuS32Id.unk2;
+ REG_IME = gRfuSIO32Id.unk2;
REG_IE |= INTR_FLAG_SERIAL;
REG_IME = r12;
}
@@ -100,11 +100,11 @@ static s32 Sio32IDMain(void)
}
else
{
- gRfuS32Id.unk1 = 2;
+ gRfuSIO32Id.unk1 = 2;
// fallthrough
}
default:
- return gRfuS32Id.unkA;
+ return gRfuSIO32Id.unkA;
}
return 0;
}
@@ -122,43 +122,43 @@ static void Sio32IDIntr(void)
#endif
r5 = REG_SIODATA32;
- if (gRfuS32Id.unk0 != 1)
+ if (gRfuSIO32Id.unk0 != 1)
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;
- r5 = (r5 << 16 * (1 - gRfuS32Id.unk0)) >> 16;
- if (gRfuS32Id.unkA == 0)
+ r5 = (r5 << 16 * (1 - gRfuSIO32Id.unk0)) >> 16;
+ 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_)
- ++gRfuS32Id.unk2;
+ ++gRfuSIO32Id.unk2;
}
}
else
{
- gRfuS32Id.unk2 = gRfuS32Id.unkA;
+ gRfuSIO32Id.unk2 = gRfuSIO32Id.unkA;
}
}
- if (gRfuS32Id.unk2 < 4)
- gRfuS32Id.unk4 = *(gRfuS32Id.unk2 + Sio32ConnectionData);
+ if (gRfuSIO32Id.unk2 < 4)
+ gRfuSIO32Id.unk4 = *(gRfuSIO32Id.unk2 + Sio32ConnectionData);
else
- gRfuS32Id.unk4 = 0x8001;
- gRfuS32Id.unk6 = ~r5;
- REG_SIODATA32 = (gRfuS32Id.unk4 << 16 * (1 - gRfuS32Id.unk0))
- + (gRfuS32Id.unk6 << 16 * gRfuS32Id.unk0);
- if (gRfuS32Id.unk0 == 1 && (gRfuS32Id.unk2 || r5 == 0x494E))
+ gRfuSIO32Id.unk4 = 0x8001;
+ gRfuSIO32Id.unk6 = ~r5;
+ REG_SIODATA32 = (gRfuSIO32Id.unk4 << 16 * (1 - gRfuSIO32Id.unk0))
+ + (gRfuSIO32Id.unk6 << 16 * gRfuSIO32Id.unk0);
+ if (gRfuSIO32Id.unk0 == 1 && (gRfuSIO32Id.unk2 || r5 == 0x494E))
{
for (r0 = 0; r0 < 600; ++r0)
;
- if (gRfuS32Id.unkA == 0)
+ if (gRfuSIO32Id.unkA == 0)
REG_SIOCNT |= SIO_ENABLE;
}
}
diff --git a/src/main.c b/src/main.c
index 60f762a62..5d2db95be 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,9 @@
#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 "m4a.h"
#include "random.h"
@@ -6,48 +11,20 @@
#include "gba/flash_internal.h"
#include "battle.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 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 HBlankIntr(void);
diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c
new file mode 100644
index 000000000..5cc09df71
--- /dev/null
+++ b/src/pc_screen_effect.c
@@ -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];
+}
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index 46a0649d7..87d15488a 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -637,7 +637,6 @@ void sub_810C444(void)
}
}
-#ifdef NONMATCHING
bool8 sub_810C4EC(void)
{
if (CheckBagHasItem(ITEM_VS_SEEKER, 1) == TRUE)
@@ -648,18 +647,18 @@ bool8 sub_810C4EC(void)
if (FlagGet(FLAG_SYS_VS_SEEKER_CHARGING) == TRUE)
{
- u16 x;
- do {
- x = (gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & 0xFF;
- } while (0);
+ u8 x = (gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & 0xFF;
+ u32 r4 = 0xFF;
+
if (x < 100)
{
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) & 0xFF;
- } while (0);
+ x = (gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & r4;
if (x == 100)
{
FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
@@ -671,80 +670,6 @@ bool8 sub_810C4EC(void)
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)
{
@@ -920,13 +845,17 @@ u8 CanUseVsSeeker(void)
}
}
-// Nonmatching due to register roulette
-#ifdef NONMATCHING
static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
{
u16 r8 = 0;
u8 sp0 = 0;
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++)
{
@@ -936,6 +865,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (!HasTrainerBeenFought(r8))
{
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F60);
+ sVsSeeker->trainerInfo[vsSeekerIdx].trainerIdx += 0;
sVsSeeker->trainerHasNotYetBeenFought = 1;
}
else
@@ -944,7 +874,15 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (r7 == 0)
{
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch);
+ #ifdef NONMATCHING
sVsSeeker->trainerDoesNotWantRematch = 1;
+ #else
+ r2 = (u8 *)sVsSeeker;
+ r3 = 0x431;
+ asm("":::"r1");
+ r2 = &r2[r3];
+ *(r2) |= 2;
+ #endif
}
else
{
@@ -957,7 +895,15 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (rval < 30)
{
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch);
+ #ifdef NONMATCHING
sVsSeeker->trainerDoesNotWantRematch = 1;
+ #else
+ r2 = (u8 *)sVsSeeker;
+ r0_ = 0x431;
+ asm("":::"r1");
+ r2 = &r2[r0_];
+ *(r2) |= 2;
+ #endif
}
else
{
@@ -985,242 +931,6 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
return 1;
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)
{
diff --git a/sym_common.txt b/sym_common.txt
index c50f09540..753ce9ebd 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -164,4 +164,4 @@ gUnknown_3005E94: @ 3005E94
.align 4
.include "librfu_rfu.o"
.align 4
- .include "librfu_s32id.o"
+ .include "librfu_sio32id.o"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 10:38:55 +0000