Skip to content

Poison point #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blademastersf wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Poison point #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc6b4c5
Poison point
blademastersf Jul 8, 2025
b18e055
Skill defs
AlcalineAlice Jul 11, 2025
9461e31
Fix?
AlcalineAlice Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions EngineHacks/SkillSystem/Skills/ProcSkills/BlackMagic/AssembleARM.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
@echo off

SET startDir=C:\devkitPro\devkitARM\bin\

@rem Assemble into an elf
SET as="%startDir%arm-none-eabi-as"
%as% -g -mcpu=arm7tdmi -mthumb-interwork %1 -o "%~n1.elf"

@rem Print symbol table
SET readelf="%startDir%arm-none-eabi-readelf"
%readelf% -s "%~n1.elf" > "%~n1.symbols.log"

@rem Extract raw assembly binary (text section) from elf
SET objcopy="%startDir%arm-none-eabi-objcopy"
%objcopy% -S "%~n1.elf" -O binary "%~n1.dmp"

echo y | del "%~n1.elf"

echo y | del "%~n1.symbols.log"
pause
Binary file modified EngineHacks/SkillSystem/Skills/ProcSkills/BlackMagic/proc_blackmagic.dmp
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions EngineHacks/SkillSystem/Skills/ProcSkills/BlackMagic/proc_blackmagic.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ mov r14,r3
.short 0xF800
cmp r0,#0
beq End
ldrb r0,[r4,#0x15] @skill% proc rate
@ldrb r0,[r4,#0x100] @skill% proc rate
@mov r0,#100 @for testing
mov r1,r4
blh d100Result
cmp r0,#1
bne End @didn't proc
@mov r1,r4
@blh d100Result
@cmp r0,#1
@bne End @didn't proc

@if we proc, set the offensive skill and poison flag
ldr r2,[r6]
Expand Down
8 changes: 4 additions & 4 deletions EngineHacks/SkillSystem/Skills/ProcSkills/ProcSkills.event
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ POIN BlackMagicTable
//Bytes are status id, percent chance
//MAKE SURE THE PERCENTAGES SUM UP TO 100%
BlackMagicTable:
BYTE 1 25 //poison
BYTE 2 25 //silence
BYTE 3 25 //sleep
BYTE 4 25 //berserk
BYTE 1 100 //poison
BYTE 2 0 //silence
BYTE 3 0 //sleep
BYTE 4 0 //berserk
//BYTE 0xB 20 //petrify NOTE: As is, Petrify seems hardcoded to not double and will stop combat if it works. Which is neat and all, but if you're expecting to double and don't, that might piss people off instead

//Poison blob only plays when poison effect is done (animations off)
Expand Down
5 changes: 3 additions & 2 deletions EngineHacks/SkillSystem/skill_definitions.event
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,11 +622,12 @@

//Barricade+: In combat, damage recieved equals half of the damage when struck last.
//By Snakey1
#define BarricadePlusID 188
#define BarricadePlusID 255

//Black Magic: Skill% chance to inflict a random status.
//By Tequila
#define BlackMagicID 255
//Changed to be Poison Point, by blademaster!sf
#define BlackMagicID 188

//Colossus: Triples Strength. (Skill % activation)
//Author Unknown (Initial Commit)
Expand Down
4 changes: 2 additions & 2 deletions Text/skilldesc_text.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,8 +710,8 @@ Capture: Capture an enemy after[N]
defeating it with reduced stats.[X]

## SD_BlackMagic
Black Magic: Skill% chance to[N]
inflict a random status.[X]
Poison Point: Inflict poison[N]
on foe.[X]

## SD_FortressDefense
Fortress Defense:[N]
Expand Down