From 580ca17408b7a716264e375209fecd56722c63d0 Mon Sep 17 00:00:00 2001
From: ngmansion <eliwooood@gmail.com>
Date: Thu, 20 Jul 2017 22:54:42 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=99=E3=82=8A=E6=8A=9C=E3=81=91=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Engine Hacks/_N/_Skills/pass/EA.txt   |   8 ++++--
 Engine Hacks/_N/_Skills/pass/pass.asm |  38 ++++++++++++++++++++------
 Engine Hacks/_N/_Skills/pass/pass.dmp | Bin 72 -> 0 bytes
 Engine Hacks/_N/_Skills/pass/pass.gba | Bin 0 -> 88 bytes
 4 files changed, 36 insertions(+), 10 deletions(-)
 delete mode 100644 Engine Hacks/_N/_Skills/pass/pass.dmp
 create mode 100644 Engine Hacks/_N/_Skills/pass/pass.gba

diff --git a/Engine Hacks/_N/_Skills/pass/EA.txt b/Engine Hacks/_N/_Skills/pass/EA.txt
index 6904c0c6..09be5025 100644
--- a/Engine Hacks/_N/_Skills/pass/EA.txt	
+++ b/Engine Hacks/_N/_Skills/pass/EA.txt	
@@ -1,8 +1,12 @@
+PassList:
+ BYTE	$17 $18 0
+
+ALIGN 4
 PUSH
 ORG	0x1A1D0
 BYTE	$00 $48 $87 $46
 POIN	passem
 POP
 passem:
-#incbin "pass.dmp"
-ALIGN 4
\ No newline at end of file
+#incbin "pass.gba"
+POIN	PassList
\ No newline at end of file
diff --git a/Engine Hacks/_N/_Skills/pass/pass.asm b/Engine Hacks/_N/_Skills/pass/pass.asm
index 73108109..18ec671d 100644
--- a/Engine Hacks/_N/_Skills/pass/pass.asm	
+++ b/Engine Hacks/_N/_Skills/pass/pass.asm	
@@ -1,28 +1,48 @@
 @thumb
+	
+
 	cmp	r3, #0
 	bne	Start
 	strb	r3, [r6, #8]
 	ldr	r0, =$0801a1ea
 	mov	pc, r0
 Start:
+;
+;索敵マップなら無効
+;
+	ldr	r0, =$0202BCF9
+	ldrb	r0, [r0]
+	cmp	r0, #0
+	bne	nonPass
+;
+;謎のバグ防止
+;
 	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
-	ldr	r0, [r4, #4]
-	ldrb	r0, [r0, #4]
-	cmp	r0, #23
-	beq	ouiPass
-	cmp	r0, #24
-	beq	ouiPass
-	cmp	r0, #0
-	beq	ouiPass
+;
+;兵種スキルチェック
+;
+@align 4
+	ldr	r2, [adr]	;すり抜け兵種ドレス
+	ldr	r1, [r4, #4]
+	ldrb	r1, [r1, #4]
+loopPass:
+	ldrb	r0, [r2]
 	cmp	r0, #0
+	beq	nonPass
+	cmp	r0, r1
 	beq	ouiPass
+	add	r2, #1
+	b	loopPass
 nonPass:
 	mov	r0, #1
 	b	Return
@@ -31,3 +51,5 @@ ouiPass:
 Return:
 	ldr	r1, =$0801a1e6
 	mov	pc, r1
+@ltorg
+adr:
\ No newline at end of file
diff --git a/Engine Hacks/_N/_Skills/pass/pass.dmp b/Engine Hacks/_N/_Skills/pass/pass.dmp
deleted file mode 100644
index 6ed7957648301249d2c6c7ae647db6c363520534..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmZS3X1-`#bij?rqunjT?SLD%XNME-1%-?QJq)beR}wN9D#bO}FGy&xUSQB*24cnw
Zj0y}77!;U1``unGWaN;jWng{=qyaMR6_5Y`

diff --git a/Engine Hacks/_N/_Skills/pass/pass.gba b/Engine Hacks/_N/_Skills/pass/pass.gba
new file mode 100644
index 0000000000000000000000000000000000000000..63b82aa17a1d9d958dcb099a0cd0567a81eacc65
GIT binary patch
literal 88
zcmZS3X1-`#bij?@qaBDDDi}0`FJ`zMaO3staN@h5ka3`gftBY90|U2LVg_fW08pO!
pLWdLc1xBME&lwdM9xx~zaAWrDcYC#vk>lqcCMJnm2Igl#HUO|*8>9dL

literal 0
HcmV?d00001