ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Match battle_tower.c function

Browse Source 
For some reason, I gave the function of type void, type u16 instead, which messed up the registers, LMAO
This commit is contained in:
DizzyEggg 2018-12-03 21:09:26 +01:00 committed by GitHub
parent 8064b011d1
commit c7dd347bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/battle_tower.c
View File

@ -424,10 +424,9 @@ u16 sub_8162548(u8 challengeNum, u8 battleNum)
return trainerId; return trainerId;
} }
#ifdef NONMATCHING static void sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg3) // Unused
static u16 sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg3) // Unused
{ {
register u16 trainerId, count; u16 trainerId, count;
if (challengeNum <= 7) if (challengeNum <= 7)
{ {
@ -451,59 +450,6 @@ static u16 sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg
*trainerIdPtr = trainerId; *trainerIdPtr = trainerId;
*arg3 = count; *arg3 = count;
} }
#else
NAKED
static u16 sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg3)
{
asm_unified(" push {r4,lr}\n\
adds r4, r2, 0\n\
lsls r0, 24\n\
lsrs r0, 24\n\
adds r2, r0, 0\n\
lsls r1, 24\n\
lsrs r1, 24\n\
cmp r0, 0x7\n\
bhi _081625F4\n\
cmp r1, 0x6\n\
bne _081625D4\n\
ldr r1, =gUnknown_085DFA1A\n\
lsls r2, r0, 2\n\
b _081625D8\n\
.pool\n\
_081625D4:\n\
ldr r1, =gUnknown_085DF9FA\n\
lsls r2, 2\n\
_081625D8:\n\
adds r0, r1, 0x2\n\
adds r0, r2, r0\n\
adds r2, r1\n\
ldrh r0, [r0]\n\
ldrh r1, [r2]\n\
subs r0, r1\n\
adds r0, 0x1\n\
lsls r0, 16\n\
lsrs r1, r0, 16\n\
ldrh r0, [r2]\n\
b _08162604\n\
.pool\n\
_081625F4:\n\
ldr r0, =gUnknown_085DF9FA\n\
ldrh r1, [r0, 0x1E]\n\
ldrh r2, [r0, 0x1C]\n\
subs r1, r2\n\
adds r1, 0x1\n\
lsls r1, 16\n\
lsrs r1, 16\n\
ldrh r0, [r0, 0x1C]\n\
_08162604:\n\
strh r0, [r4]\n\
strb r1, [r3]\n\
pop {r4}\n\
pop {r0}\n\
bx r0\n\
.pool");
}
#endif
void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId) void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId)
{ {