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

sub_810C9A8

Browse Source
This commit is contained in:
PikalaxALT
2018-10-06 22:00:21 -04:00
parent b6cc51de43
commit b09d7508d0
5 changed files with 325 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/vs_seeker.s
-234
View File
@@ -5,240 +5,6 @@
.text
thumb_func_start sub_810C9A8
sub_810C9A8: @ 810C9A8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
str r0, [sp, 0x4]
movs r0, 0
mov r8, r0
mov r0, sp
mov r1, r8
strb r1, [r0]
movs r2, 0
mov r9, r2
ldr r4, _0810CA14 @ =gUnknown_203ADB8
ldr r0, [r4]
ldrb r0, [r0, 0x6]
cmp r0, 0xFF
bne _0810C9D0
b _0810CB2C
_0810C9D0:
adds r6, r4, 0
movs r3, 0x86
lsls r3, 3
mov r10, r3
movs r5, 0
_0810C9DA:
ldr r0, [r6]
adds r0, r5
bl sub_810D0FC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0810C9EC
b _0810CB18
_0810C9EC:
ldr r0, [r4]
adds r0, r5
ldrh r0, [r0, 0x4]
mov r8, r0
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
bne _0810CA20
ldr r0, [r6]
adds r0, r5
ldr r1, _0810CA18 @ =gUnknown_8453F60
bl sub_810D24C
ldr r2, [r6]
ldr r0, _0810CA1C @ =0x00000431
adds r2, r0
ldrb r0, [r2]
movs r1, 0x1
b _0810CB14
.align 2, 0
_0810CA14: .4byte gUnknown_203ADB8
_0810CA18: .4byte gUnknown_8453F60
_0810CA1C: .4byte 0x00000431
_0810CA20:
ldr r0, [sp, 0x4]
mov r1, r8
mov r2, sp
bl sub_810D164
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0
bne _0810CA50
ldr r0, [r6]
adds r0, r5
ldr r1, _0810CA48 @ =gUnknown_8453F62
bl sub_810D24C
ldr r2, [r6]
ldr r3, _0810CA4C @ =0x00000431
adds r2, r3
ldrb r0, [r2]
movs r1, 0x2
b _0810CB14
.align 2, 0
_0810CA48: .4byte gUnknown_8453F62
_0810CA4C: .4byte 0x00000431
_0810CA50:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
bl __umodsi3
lsls r0, 16
lsrs r4, r0, 16
mov r0, r9
mov r1, r8
bl sub_810D280
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bne _0810CA76
movs r4, 0x64
b _0810CA7C
_0810CA76:
cmp r0, 0x1
bne _0810CA7C
movs r4, 0
_0810CA7C:
cmp r4, 0x1D
bhi _0810CAA0
ldr r0, [r6]
adds r0, r5
ldr r1, _0810CA98 @ =gUnknown_8453F62
bl sub_810D24C
ldr r2, [r6]
ldr r0, _0810CA9C @ =0x00000431
adds r2, r0
ldrb r0, [r2]
movs r1, 0x2
b _0810CB14
.align 2, 0
_0810CA98: .4byte gUnknown_8453F62
_0810CA9C: .4byte 0x00000431
_0810CAA0:
ldr r0, _0810CB54 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, [r6]
adds r0, r5
ldr r2, _0810CB58 @ =0x0000063a
adds r1, r2
ldrb r0, [r0, 0x6]
adds r1, r0
strb r7, [r1]
ldr r0, [r6]
adds r0, r5
ldrb r1, [r0, 0x7]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0810CB5C @ =gUnknown_2036E38
adds r0, r1
bl npc_coords_shift_still
ldr r0, [r6]
adds r0, r5
ldr r1, _0810CB60 @ =gUnknown_8453F64
bl sub_810D24C
ldr r2, [r6]
mov r3, r10
adds r0, r2, r3
ldrb r1, [r0]
lsls r1, 1
movs r3, 0x80
lsls r3, 3
adds r0, r2, r3
adds r0, r1
mov r1, r8
strh r1, [r0]
adds r2, r5
ldrb r0, [r2, 0xC]
bl sub_810CF90
ldr r1, [r6]
mov r3, r10
adds r2, r1, r3
movs r3, 0x84
lsls r3, 3
adds r1, r3
ldrb r2, [r2]
adds r1, r2
strb r0, [r1]
ldr r1, [r6]
add r1, r10
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
ldr r2, [r6]
ldr r0, _0810CB64 @ =0x00000431
adds r2, r0
ldrb r0, [r2]
movs r1, 0x4
_0810CB14:
orrs r0, r1
strb r0, [r2]
_0810CB18:
adds r5, 0x10
movs r1, 0x1
add r9, r1
ldr r4, _0810CB68 @ =gUnknown_203ADB8
ldr r0, [r4]
adds r0, r5
ldrb r0, [r0, 0x6]
cmp r0, 0xFF
beq _0810CB2C
b _0810C9DA
_0810CB2C:
ldr r2, _0810CB68 @ =gUnknown_203ADB8
ldr r0, [r2]
ldr r3, _0810CB64 @ =0x00000431
adds r0, r3
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
cmp r0, 0
beq _0810CB70
movs r0, 0x15
bl PlaySE
ldr r0, _0810CB6C @ =0x00000801
bl FlagSet
bl sub_810C640
movs r0, 0x2
b _0810CB7E
.align 2, 0
_0810CB54: .4byte gSaveBlock1Ptr
_0810CB58: .4byte 0x0000063a
_0810CB5C: .4byte gUnknown_2036E38
_0810CB60: .4byte gUnknown_8453F64
_0810CB64: .4byte 0x00000431
_0810CB68: .4byte gUnknown_203ADB8
_0810CB6C: .4byte 0x00000801
_0810CB70:
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _0810CB7C
movs r0, 0
b _0810CB7E
_0810CB7C:
movs r0, 0x1
_0810CB7E:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_810C9A8
thumb_func_start sub_810CB90
sub_810CB90: @ 810CB90
push {r4-r7,lr}
include/field_map_obj.h
+1
View File
@@ -76,6 +76,7 @@ void MoveCoords(u8, s16 *, s16 *);
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
void npc_coords_shift_still(struct MapObject *);
// Exported data declarations
include/global.h
+2 -1
View File
@@ -482,7 +482,8 @@ struct SaveBlock1
/*0x24*/ struct WarpData warp4;
/*0x002C*/ u8 filler2C[0x60C];
/*0x638*/ u8 trainerRematchStepCounter;
/*0x639*/ u8 trainerRematches[100];
u8 filler_639;
/*0x63a*/ u8 trainerRematches[100];
/*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
/*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64];
/*0x0EE0*/ u8 fillerEE0[0x273C];
include/vs_seeker.h
+7 -2
View File
@@ -17,8 +17,13 @@ struct VsSeekerSubstruct
struct VsSeekerStruct
{
/*0x000*/ struct VsSeekerSubstruct unk_000[MAP_OBJECTS_COUNT];
/*0x100*/ u8 filler_100[0x331];
/*0x431*/ u8 unk_431_0:3;
/*0x100*/ u8 filler_100[0x300];
/*0x400*/ u16 unk_400[0x10];
/*0x420*/ u8 unk_420[0x10];
/*0x430*/ u8 unk_430;
/*0x431*/ u8 unk_431_0:1;
/*0x431*/ u8 unk_431_1:1;
/*0x431*/ u8 unk_431_2:1;
u8 unk_431_3:5;
};
src/vs_seeker.c
+315
View File
@@ -7,12 +7,16 @@
#include "new_menu_helpers.h"
#include "item_use.h"
#include "event_scripts.h"
#include "event_data.h"
#include "script.h"
#include "map_obj_lock.h"
#include "field_specials.h"
#include "item_menu.h"
#include "field_effect.h"
#include "script_movement.h"
#include "battle_setup.h"
#include "random.h"
#include "field_map_obj.h"
#include "vs_seeker.h"
// static types
@@ -33,12 +37,21 @@ void sub_810D304(void);
bool8 sub_810C96C(void);
void sub_810C604(void);
u8 sub_810C9A8(const void *);
bool8 sub_810D0FC(struct VsSeekerSubstruct *);
u16 sub_810D074(const u8 *);
u8 sub_810D1CC(void);
void sub_810D24C(struct VsSeekerSubstruct *, const u8 *);
bool8 sub_810D164(const void *, u16, u8 *);
u8 sub_810D280(int, u16);
u8 sub_810CF90(u8);
void sub_810C640(void);
// rodata
extern const struct UnkStruct_845318C gUnknown_845318C[];
extern const u8 gUnknown_8453F5C[];
extern const u8 gUnknown_8453F60[];
extern const u8 gUnknown_8453F62[];
extern const u8 gUnknown_8453F64[];
// text
void sub_810C670(u8 taskId)
@@ -164,3 +177,305 @@ u8 sub_810C96C(void)
return 0;
}
}
// Nonmatching due to register roulette
#ifdef NONMATCHING
u8 sub_810C9A8(const void * a0)
{
u16 r8 = 0;
u8 sp0 = 0;
int vsSeekerIdx;
for (vsSeekerIdx = 0; gUnknown_203ADB8->unk_000[vsSeekerIdx].unk_6 != 0xFF; vsSeekerIdx++)
{
if (sub_810D0FC(&gUnknown_203ADB8->unk_000[vsSeekerIdx]) == 1)
{
r8 = gUnknown_203ADB8->unk_000[vsSeekerIdx].unk_4;
if (!HasTrainerAlreadyBeenFought(r8))
{
sub_810D24C(&gUnknown_203ADB8->unk_000[vsSeekerIdx], gUnknown_8453F60);
gUnknown_203ADB8->unk_431_0 = 1;
}
else
{
u8 r7 = sub_810D164(a0, r8, &sp0);
if (r7 == 0)
{
sub_810D24C(&gUnknown_203ADB8->unk_000[vsSeekerIdx], gUnknown_8453F62);
gUnknown_203ADB8->unk_431_1 = 1;
}
else
{
u16 rval = Random() % 100;
u8 r0 = sub_810D280(vsSeekerIdx, r8);
if (r0 == 2)
rval = 100;
else if (r0 == 1)
rval = 0;
if (rval < 30)
{
sub_810D24C(&gUnknown_203ADB8->unk_000[vsSeekerIdx], gUnknown_8453F62);
gUnknown_203ADB8->unk_431_1 = 1;
}
else
{
gSaveBlock1Ptr->trainerRematches[gUnknown_203ADB8->unk_000[vsSeekerIdx].unk_6] = r7;
npc_coords_shift_still(&gUnknown_2036E38[gUnknown_203ADB8->unk_000[vsSeekerIdx].unk_7]);
sub_810D24C(&gUnknown_203ADB8->unk_000[vsSeekerIdx], gUnknown_8453F64);
gUnknown_203ADB8->unk_400[gUnknown_203ADB8->unk_430] = r8;
gUnknown_203ADB8->unk_420[gUnknown_203ADB8->unk_430] = sub_810CF90(gUnknown_203ADB8->unk_000[vsSeekerIdx].unk_c);
gUnknown_203ADB8->unk_430++;
gUnknown_203ADB8->unk_431_2 = 1;
}
}
}
}
}
if (gUnknown_203ADB8->unk_431_2)
{
PlaySE(SE_PIN);
FlagSet(0x801); // TODO: make this an enum
sub_810C640();
return 2;
}
if (gUnknown_203ADB8->unk_431_0)
return 1;
return 0;
}
#else
NAKED
u8 sub_810C9A8(const void * 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 @ =gUnknown_203ADB8\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 sub_810D0FC\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 HasTrainerAlreadyBeenFought\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 sub_810D24C\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 gUnknown_203ADB8\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 sub_810D164\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 @ =gUnknown_8453F62\n"
"\tbl sub_810D24C\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 gUnknown_8453F62\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 sub_810D280\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 @ =gUnknown_8453F62\n"
"\tbl sub_810D24C\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 gUnknown_8453F62\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 @ =gUnknown_2036E38\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 sub_810D24C\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 sub_810CF90\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 @ =gUnknown_203ADB8\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 @ =gUnknown_203ADB8\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 gUnknown_2036E38\n"
"_0810CB60: .4byte gUnknown_8453F64\n"
"_0810CB64: .4byte 0x00000431\n"
"_0810CB68: .4byte gUnknown_203ADB8\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