Skip to content

Only lock Nemesis battle if requirements not met #229

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

Merged
Andrewki44 merged 1 commit into from
Jun 5, 2026
Merged

Only lock Nemesis battle if requirements not met #229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 31 additions & 17 deletions src/hooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,36 +1184,47 @@ AtelOp.NOT .build(),
AtelOp.NOT .build(),

// (priv175A5 >= 13 [0Dh])
AtelOp.PUSHV .build(0x001F),
AtelOp.PUSHII .build(0x000D),
AtelOp.GTE .build(),
AtelOp.PUSHV .build(0x001F),
AtelOp.PUSHII .build(0x000D),
AtelOp.GTE .build(),

// Common.?checkMultipleMonsterArenaUnlocks [023Ch](from=Creation #1 defeated [0300h], next=34 [22h])
AtelOp.PUSHII .build(0x0300),
AtelOp.PUSHII .build(0x0022),
AtelOp.CALL .build(0x023C),
AtelOp.PUSHII .build(0x0300),
AtelOp.PUSHII .build(0x0022),
AtelOp.CALL .build(0x023C),

// else jump to jAD8 (DCED)
AtelOp.LAND .build(),
AtelOp.LAND .build(),
AtelOp.LAND .build(),
AtelOp.LAND .build(),
AtelOp.POPXNCJMP.build(0x0AD8),

// if Custom.isTreasureLocationChecked(0x01CA) jump by 9
AtelOp.PUSHII .build(0x01CA),
AtelOp.CALL .build((ushort)CustomCallTarget.IS_TREASURE_LOCATION_CHECKED),
AtelOp.PUSHII .build(0x0009),
AtelOp.CALLPOPA .build((ushort)CustomCallTarget.OFFSET_IF_TRUE),

// call Common.obtainTreasure [015Bh](msgWindow=0 [00h], treasure=Item: 10x Master Sphere [2050h] [01CAh]);
AtelOp.PUSHII .build(0x0000),
AtelOp.PUSHII .build(0x01CA),
AtelOp.CALLPOPA .build(0x015B),

// Custom.isGoalUnlocked
AtelOp.CALL .build((ushort)CustomCallTarget.IS_GOAL_UNLOCKED),
AtelOp.CALL .build((ushort)CustomCallTarget.IS_GOAL_UNLOCKED),

// if Custom.isGoalUnlocked() jump to jAD7 (D7B3)
AtelOp.POPXCJMP.build(0x0AD7),
AtelOp.POPXCJMP .build(0x0AD7),

// display customStrings[2]
.. atelDisplayFieldString(1, 0x8002, 256, 224, 4, 0, 0),

// call Common.waitForText [0084h](boxIndex=1 [01h], p2=1 [01h]);
AtelOp.PUSHII .build(0x0001),
AtelOp.PUSHII .build(0x0001),
AtelOp.CALLPOPA.build(0x0084),
AtelOp.PUSHII .build(0x0001),
AtelOp.PUSHII .build(0x0001),
AtelOp.CALLPOPA .build(0x0084),

// jump to jAD8 (DCED)
AtelOp.JMP .build(0x0AD8),
AtelOp.JMP .build(0x0AD8),

]).SelectMany(x => x.to_bytes()).ToArray(),
};
Expand Down Expand Up @@ -2043,6 +2054,9 @@ AtelOp.PUSHII .build(14),
AtelOp.PUSHII .build(0x000C),
AtelOp.CALLPOPA.build((ushort)CustomCallTarget.JUMP),
]);

// Remove obtainTreasure call
set(code_ptr, 0xD81D, atelNOPArray(9));
}
break;

Expand Down Expand Up @@ -4257,15 +4271,15 @@ public static int CT_RetInt_JumpIfTrue(AtelBasicWorker* work, int* storage, Atel
[UnmanagedCallersOnly(CallConvs = new[] { typeof(CallConvCdecl) })]
public static int CT_RetInt_Offset(AtelBasicWorker* work, int* storage, AtelStack* atelStack) {
int offset = atelStack->pop_int();
work->current_thread.pc += offset - 3;
work->current_thread.pc += offset;
return 1;
}
[UnmanagedCallersOnly(CallConvs = new[] { typeof(CallConvCdecl) })]
public static int CT_RetInt_OffsetIfFalse(AtelBasicWorker* work, int* storage, AtelStack* atelStack) {
int offset = atelStack->pop_int();
int val = atelStack->pop_int();
if (val == 0) {
work->current_thread.pc += offset - 3;
work->current_thread.pc += offset;
}
return 1;
}
Expand All @@ -4274,7 +4288,7 @@ public static int CT_RetInt_OffsetIfTrue(AtelBasicWorker* work, int* storage, At
int offset = atelStack->pop_int();
int val = atelStack->pop_int();
if (val == 1) {
work->current_thread.pc += offset - 3;
work->current_thread.pc += offset;
}
return 1;
}
Expand Down
Loading