ソドマスの兵種スキルを流星にした

ngmansion · Jul 29, 2017 · e49ef10 · e49ef10
1 parent db5790d
commit e49ef10
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/Engine Hacks/_N/_Skills/CLASS.bin b/Engine Hacks/_N/_Skills/CLASS.bin
diff --git a/Engine Hacks/_N/_Skills/astraether/astraether.asm b/Engine Hacks/_N/_Skills/astraether/astraether.asm
@@ -24,20 +24,21 @@ mov	lr r2
 	add	r0, #0x31
 	ldrb	r0, [r0]
 	cmp r0, #1
-	bne	skill2
-astra
+	beq	ouiAstra
+;クラスチェック
+	ldr	r0, [r7, #4]
+	ldrb	r0, [r0, #4]
+	cmp	r0, #0x15	;ソドマス
+	beq	ouiAstra
+	cmp	r0, #0x16	;ソドマス
+	beq	ouiAstra
+	b	skill2
+ouiAstra:
 ;ダメージがゼロなら発動しない
 	mov	r0, #4
 	ldsh	r0, [r5, r0]
 	cmp	r0, #0
 	ble	skill2
-;クラスチェック
-	ldr	r0, [r7, #4]
-	ldrb	r0, [r0, #4]
-	cmp	r0, #0x17	;アサシン
-	beq	skill2
-	cmp	r0, #0x18	;アサシン
-	beq	skill2
 ;近距離しか発動しない
 	ldr	r0,	=$0203a4d2
 	ldrb	r0, [r0]

diff --git a/Engine Hacks/_N/_Skills/astraether/astraether.gba b/Engine Hacks/_N/_Skills/astraether/astraether.gba
diff --git a/Engine Hacks/_N/_Skills/renzoku/Adept_v01.asm b/Engine Hacks/_N/_Skills/renzoku/Adept_v01.asm
@@ -31,11 +31,12 @@ skill
 ;クラス
 	ldr	r0, [r6, #4]
 	ldrb	r0, [r0, #4]
-	cmp	r0, #0x15			;ソドマス男
-	blt	end
-	cmp	r0, #0x16			;ソドマス女
-	bgt	end
-got
+	cmp	r0, #0x00			;
+	beq	got
+	cmp	r0, #0x00			;
+	beq	got
+	b	end
+got:
 	mov	r0, #0x15
 	ldsb	r0, [r6, r0]
 	lsl	r0, r0, #16

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