自軍以外は索敵時でも有効

ngmansion · Jul 20, 2017 · db5790d · db5790d
1 parent 580ca17
commit db5790d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Engine Hacks/_N/_Skills/pass/pass.asm b/Engine Hacks/_N/_Skills/pass/pass.asm
@@ -6,33 +6,37 @@
 	strb	r3, [r6, #8]
 	ldr	r0, =$0801a1ea
 	mov	pc, r0
-Start:
 ;
-;索敵マップなら無効
+;索敵マップ無効
 ;
+Start:
+	ldrb	r0, [r4, #11]
+	lsr	r0, r0, #6
+	bne	Jump
 	ldr	r0, =$0202BCF9
 	ldrb	r0, [r0]
 	cmp	r0, #0
 	bne	nonPass
 ;
-;謎のバグ防止
+;謎のバグ防止
 ;
+Jump:
 	mov	r0, r13
 	ldr	r1, =$03007d18
 	cmp	r0, r1
 	beq	nonPass
 ;
-;個人スキルチェック
+;個人スキルチェック
 ;
 	ldr	r0, [r4, #0]
 	ldrh	r0, [r0, #38]
 	lsl	r0, r0, #20
 	bmi	ouiPass
 ;
-;兵種スキルチェック
+;兵種スキルチェック
 ;
 @align 4
-	ldr	r2, [adr]	;すり抜け兵種ドレス
+	ldr	r2, [adr]	;すり抜け兵種ドレス
 	ldr	r1, [r4, #4]
 	ldrb	r1, [r1, #4]
 loopPass:

diff --git a/Engine Hacks/_N/_Skills/pass/pass.gba b/Engine Hacks/_N/_Skills/pass/pass.gba