Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-03-21 17:25:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Decomped CanLearnIqSkill

Browse Source
This commit is contained in:
AnonymousRandomPerson 2025-12-04 23:03:02 -05:00
parent b28359d072
commit a24bde3d06
9 changed files with 150 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/include/main_02058C4C.inc
View File

@ -1,8 +1,2 @@
#pragma once #pragma once
.public GetIqGroup
.public GetPerformanceFlagWithChecks
.public IQ_GROUP_SKILLS
.public IQ_SKILLS
.public IQ_SKILL_RESTRICTIONS
.public IqSkillFlagTest
.public TACTICS_UNLOCK_LEVEL_TABLE .public TACTICS_UNLOCK_LEVEL_TABLE

7
asm/include/main_02058D04.inc Normal file
View File

@ -0,0 +1,7 @@
#pragma once
.public CanLearnIqSkill
.public GetIqGroup
.public GetPerformanceFlagWithChecks
.public IQ_GROUP_SKILLS
.public IQ_SKILL_RESTRICTIONS
.public IqSkillFlagTest

129
asm/main_02058C4C.s
View File

@ -51,132 +51,3 @@ _02058CB0:
.align 2, 0 .align 2, 0
_02058CD4: .word TACTICS_UNLOCK_LEVEL_TABLE _02058CD4: .word TACTICS_UNLOCK_LEVEL_TABLE
arm_func_end GetUnlockedTacticFlags arm_func_end GetUnlockedTacticFlags
arm_func_start CanLearnIqSkill
CanLearnIqSkill: ; 0x02058CD8
cmp r1, #0
moveq r0, #0
bxeq lr
ldr r2, _02058D00 ; =IQ_SKILLS
ldr r1, [r2, r1, lsl #2]
cmp r1, r0
movle r0, #1
movgt r0, #0
and r0, r0, #0xff
bx lr
.align 2, 0
_02058D00: .word IQ_SKILLS
arm_func_end CanLearnIqSkill
arm_func_start GetLearnableIqSkills
GetLearnableIqSkills: ; 0x02058D04
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
mov r6, #0
mov sl, r0
mov sb, r1
mov r8, r2
mov r5, r6
ldr r4, _02058DA0 ; =IQ_GROUP_SKILLS
mov fp, #0x19
b _02058D74
_02058D28:
mov r0, sb
bl GetIqGroup
mla r1, r0, fp, r4
and r0, r5, #0xff
ldrb r7, [r0, r1]
cmp r7, #0xff
beq _02058D7C
cmp r7, #0x18
bne _02058D58
mov r0, #3
bl GetPerformanceFlagWithChecks
b _02058D64
_02058D58:
mov r0, r8
mov r1, r7
bl CanLearnIqSkill
_02058D64:
cmp r0, #0
strneb r7, [sl, r6]
addne r6, r6, #1
add r5, r5, #1
_02058D74:
cmp r5, #0x19
blt _02058D28
_02058D7C:
mov r1, r6
mov r0, #0
b _02058D90
_02058D88:
strb r0, [sl, r1]
add r1, r1, #1
_02058D90:
cmp r1, #0x45
blt _02058D88
mov r0, r6
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_02058DA0: .word IQ_GROUP_SKILLS
arm_func_end GetLearnableIqSkills
arm_func_start DisableIqSkill
DisableIqSkill: ; 0x02058DA4
stmdb sp!, {r3, r4, r5, lr}
mov r4, r0
mov r5, r1
bl IqSkillFlagTest
cmp r0, #0
beq _02058DE4
mov r0, r5, asr #4
add r0, r5, r0, lsr #27
mov r2, r0, asr #5
sub r0, r5, r2, lsl #5
mov r1, #1
mvn r0, r1, lsl r0
ldr r1, [r4, r2, lsl #2]
and r0, r1, r0
str r0, [r4, r2, lsl #2]
ldmia sp!, {r3, r4, r5, pc}
_02058DE4:
mov r0, r4
mov r1, r5
bl EnableIqSkill
ldmia sp!, {r3, r4, r5, pc}
arm_func_end DisableIqSkill
arm_func_start EnableIqSkill
EnableIqSkill: ; 0x02058DF4
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _02058E64 ; =IQ_SKILL_RESTRICTIONS
mov r3, r1, lsl #1
ldrsh ip, [r2, r3]
mov r3, #0
mov r4, #1
_02058E0C:
mov r5, r3, lsl #1
ldrsh r5, [r2, r5]
cmp ip, r5
bne _02058E3C
mov lr, r3, asr #4
add lr, r3, lr, lsr #27
mov r6, lr, asr #5
sub lr, r3, r6, lsl #5
mvn lr, r4, lsl lr
ldr r5, [r0, r6, lsl #2]
and r5, r5, lr
str r5, [r0, r6, lsl #2]
_02058E3C:
add r3, r3, #1
cmp r3, #0x45
blt _02058E0C
mov ip, r1, lsr #5
ldr r3, [r0, ip, lsl #2]
sub r1, r1, ip, lsl #5
mov r2, #1
orr r1, r3, r2, lsl r1
str r1, [r0, ip, lsl #2]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02058E64: .word IQ_SKILL_RESTRICTIONS
arm_func_end EnableIqSkill

117
asm/main_02058D04.s Normal file
View File

@ -0,0 +1,117 @@
.include "asm/macros.inc"
.include "main_02058D04.inc"
.text
arm_func_start GetLearnableIqSkills
GetLearnableIqSkills: ; 0x02058D04
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
mov r6, #0
mov sl, r0
mov sb, r1
mov r8, r2
mov r5, r6
ldr r4, _02058DA0 ; =IQ_GROUP_SKILLS
mov fp, #0x19
b _02058D74
_02058D28:
mov r0, sb
bl GetIqGroup
mla r1, r0, fp, r4
and r0, r5, #0xff
ldrb r7, [r0, r1]
cmp r7, #0xff
beq _02058D7C
cmp r7, #0x18
bne _02058D58
mov r0, #3
bl GetPerformanceFlagWithChecks
b _02058D64
_02058D58:
mov r0, r8
mov r1, r7
bl CanLearnIqSkill
_02058D64:
cmp r0, #0
strneb r7, [sl, r6]
addne r6, r6, #1
add r5, r5, #1
_02058D74:
cmp r5, #0x19
blt _02058D28
_02058D7C:
mov r1, r6
mov r0, #0
b _02058D90
_02058D88:
strb r0, [sl, r1]
add r1, r1, #1
_02058D90:
cmp r1, #0x45
blt _02058D88
mov r0, r6
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_02058DA0: .word IQ_GROUP_SKILLS
arm_func_end GetLearnableIqSkills
arm_func_start DisableIqSkill
DisableIqSkill: ; 0x02058DA4
stmdb sp!, {r3, r4, r5, lr}
mov r4, r0
mov r5, r1
bl IqSkillFlagTest
cmp r0, #0
beq _02058DE4
mov r0, r5, asr #4
add r0, r5, r0, lsr #27
mov r2, r0, asr #5
sub r0, r5, r2, lsl #5
mov r1, #1
mvn r0, r1, lsl r0
ldr r1, [r4, r2, lsl #2]
and r0, r1, r0
str r0, [r4, r2, lsl #2]
ldmia sp!, {r3, r4, r5, pc}
_02058DE4:
mov r0, r4
mov r1, r5
bl EnableIqSkill
ldmia sp!, {r3, r4, r5, pc}
arm_func_end DisableIqSkill
arm_func_start EnableIqSkill
EnableIqSkill: ; 0x02058DF4
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _02058E64 ; =IQ_SKILL_RESTRICTIONS
mov r3, r1, lsl #1
ldrsh ip, [r2, r3]
mov r3, #0
mov r4, #1
_02058E0C:
mov r5, r3, lsl #1
ldrsh r5, [r2, r5]
cmp ip, r5
bne _02058E3C
mov lr, r3, asr #4
add lr, r3, lr, lsr #27
mov r6, lr, asr #5
sub lr, r3, r6, lsl #5
mvn lr, r4, lsl lr
ldr r5, [r0, r6, lsl #2]
and r5, r5, lr
str r5, [r0, r6, lsl #2]
_02058E3C:
add r3, r3, #1
cmp r3, #0x45
blt _02058E0C
mov ip, r1, lsr #5
ldr r3, [r0, ip, lsl #2]
sub r1, r1, ip, lsl #5
mov r2, #1
orr r1, r3, r2, lsl r1
str r1, [r0, ip, lsl #2]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02058E64: .word IQ_SKILL_RESTRICTIONS
arm_func_end EnableIqSkill

2
include/iq_skills.h
View File

@ -3,6 +3,8 @@
#include "enums.h" #include "enums.h"
// Table of 4-byte values for each IQ skill that represent the required IQ value to unlock a skill.
extern const s32 IQ_SKILLS[69];
extern const enum iq_skill_id IQ_GROUP_SKILLS[16][25]; extern const enum iq_skill_id IQ_GROUP_SKILLS[16][25];
#endif //PMDSKY_IQ_SKILLS_H #endif //PMDSKY_IQ_SKILLS_H

11
include/main_02058CD8.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef PMDSKY_MAIN_02058CD8_H
#define PMDSKY_MAIN_02058CD8_H
#include "enums.h"
#include "util.h"
// Returns whether an IQ skill can be learned with a given IQ amount or not.
// If the specified amount is 0, it always returns false.
bool8 CanLearnIqSkill(s32 iq_amount, enum iq_skill_id iq_id);
#endif //PMDSKY_MAIN_02058CD8_H

2
main.lsf
View File

@ -130,6 +130,8 @@ Static main
Object asm/main_02054E4C.o Object asm/main_02054E4C.o
Object src/main_02058C3C.o Object src/main_02058C3C.o
Object asm/main_02058C4C.o Object asm/main_02058C4C.o
Object src/main_02058CD8.o
Object asm/main_02058D04.o
Object src/main_02058E68.o Object src/main_02058E68.o
Object asm/main_02058E8C.o Object asm/main_02058E8C.o
Object src/pokemon.o Object src/pokemon.o

2
src/dungeon_pokemon_attributes_1.c
View File

@ -3,12 +3,12 @@
#include "dungeon_parameters_3.h" #include "dungeon_parameters_3.h"
#include "dungeon_parameters_4.h" #include "dungeon_parameters_4.h"
#include "dungeon_util_static.h" #include "dungeon_util_static.h"
#include "main_02058CD8.h"
#include "main_02058E68.h" #include "main_02058E68.h"
#include "overlay_29_022FF898.h" #include "overlay_29_022FF898.h"
#include "overlay_29_023000E4.h" #include "overlay_29_023000E4.h"
#include "pokemon.h" #include "pokemon.h"
extern bool8 CanLearnIqSkill(s32 iq_amount, enum iq_skill_id iq_id);
extern void DisableIqSkill(u32 *iq_skills_flags, enum iq_skill_id iq_id); extern void DisableIqSkill(u32 *iq_skills_flags, enum iq_skill_id iq_id);
extern void EnableIqSkill(u32 *iq_skills_flags, enum iq_skill_id iq_id); extern void EnableIqSkill(u32 *iq_skills_flags, enum iq_skill_id iq_id);
extern bool8 GetPerformanceFlagWithChecks(s32 flag_id); extern bool8 GetPerformanceFlagWithChecks(s32 flag_id);

10
src/main_02058CD8.c Normal file
View File

@ -0,0 +1,10 @@
#include "main_02058CD8.h"
#include "iq_skills.h"
bool8 CanLearnIqSkill(s32 iq_amount, enum iq_skill_id iq_id)
{
if (iq_id == IQ_NONE)
return 0;
return IQ_SKILLS[iq_id] <= iq_amount;
}