Skip to content

Commit

Permalink
Merge pull request #9 from Shidesu/master
Browse files Browse the repository at this point in the history
Overwritting the Lock Touch Vanilla routine to make it flexible and w…
  • Loading branch information
boviex authored Feb 20, 2018
2 parents 3af309a + f5bda26 commit 97fb335
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 0 deletions.
Binary file added Engine Hacks/Skill System/Kao Skills/LockTouch.dmp
Binary file not shown.
42 changes: 42 additions & 0 deletions Engine Hacks/Skill System/Kao Skills/LockTouch.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.thumb

.equ LockTouchID, SkillTester+4

@Check for TouchLock Skill

push {r2} @The vanilla routine we jump back to needs this value

ldr r0, SkillTester
mov lr, r0
mov r0, r2
ldr r1, LockTouchID

.short 0xf800

cmp r0, #0
beq NoPickSkill
mov r2, r5

pop {r2}

ldr r3, PickSkillBranch
bx r3

NoPickSkill:
pop {r2}
ldr r3, NoPickSkillBranch
bx r3

.align

PickSkillBranch:
.long 0x8023E9D

NoPickSkillBranch:
.long 0x8023E95

.ltorg

SkillTester:
@POIN SkillTester
@WORD LockTouchID
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include "Extensions/Hack Installation.txt"
PUSH
ORG $8023E8C
jumpToHack(HackLocation)
POP

HackLocation:
#incbin "doubleRogueSkillFE8.dmp"

POIN ClassTable

ClassTable:
BYTE 0x33 0x5E 0x00
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
.thumb

.equ LockTouchID, SkillTester+4

@Check for TouchLock Skill


push {r3, r4}
mov r3, #0x00
Loop:
ldr r4, ClassList
ldrb r4, [r4, r3]
cmp r4, #0x00
beq NoPickSkill
cmp r4, r0
bne NextIteration
b PickSkill

NoPickSkill:
pop {r3, r4}
ldr r3, NoPickSkillBranch
bx r3
PickSkill:
pop {r3, r4}
ldr r3, PickSkillBranch
bx r3
NextIteration:
add r3, #0x01
b Loop

.align
PickSkillBranch:
.long 0x8023E9D
NoPickSkillBranch:
.long 0x8023E95
.ltorg
ClassList:
@list of the classes you give access to PickSkill
Binary file not shown.
9 changes: 9 additions & 0 deletions Engine Hacks/Skill System/Master Skill Installer.event
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jumpToHack(RightfulCheck)
ORG $1a4cc
jumpToHack(AcrobatCheck)

//LockTouch
ORG $23E8C //ignore vanilla locktouch routine
jumpToHack(LockTouch)

//Pass
ORG $800 //modifies movement ARM code
WORD 0xE59FC000 0xE12FFF1C //ldr r12,Pass; bx r12
Expand Down Expand Up @@ -355,6 +359,11 @@ _12SkillList:
BYTE SureShotID IgnisID ColossusID ImpaleID PaviseID AegisID AstraID SolID LunaID AetherID AdeptID LethalityID
ALIGN 4

LockTouch:
#incbin "Kao Skills/LockTouch.dmp"
POIN SkillTester
WORD LockTouchID

TraceSkill:
#incbin "Other Skills/trace.dmp"
POIN SkillTester
Expand Down

0 comments on commit 97fb335

Please sign in to comment.