summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2018-09-29 00:46:02 +0800
committerIru Cai <mytbk920423@gmail.com>2018-09-29 00:46:02 +0800
commitfd78fb3e31c4740fd119578dc69b85e36f16daa5 (patch)
treef1a9d447a0367f00fbd0e8d1d8d6b4beff63f114
parenta80265809d1a79ff41de87003e54539af16f5c75 (diff)
downloadrich4-fd78fb3e31c4740fd119578dc69b85e36f16daa5.tar.xz
move 0x455109
-rw-r--r--csrc/mkf_asm.asm21
-rw-r--r--csrc/mkf_asm_data.c8
2 files changed, 12 insertions, 17 deletions
diff --git a/csrc/mkf_asm.asm b/csrc/mkf_asm.asm
index 494077b..edf2b28 100644
--- a/csrc/mkf_asm.asm
+++ b/csrc/mkf_asm.asm
@@ -6,6 +6,7 @@ extern data_483630
extern gtables
extern cfcn_45511b
extern cfcn_004550cc
+extern cfcn_00455109
fcn_00455040:
push ebp
@@ -91,7 +92,9 @@ push ebx
push ecx
push edi
-call fcn_00455109
+push ebx
+call cfcn_00455109
+add esp, 4
pop edi
pop ecx
@@ -99,19 +102,3 @@ pop ebx
shr bx, 1
ret
-
-fcn_00455109:
-cmp word [gtables + 1280], 0x8000
-jne L20_1
-
-push ebx
-call cfcn_004550cc
-pop ebx
-
-L20_1:
-
-push ebx
-call cfcn_45511b
-add esp, 4
-
-ret
diff --git a/csrc/mkf_asm_data.c b/csrc/mkf_asm_data.c
index 3a4457b..3f7a463 100644
--- a/csrc/mkf_asm_data.c
+++ b/csrc/mkf_asm_data.c
@@ -593,3 +593,11 @@ void cfcn_004550cc()
}
return;
}
+
+void cfcn_00455109(uint32_t ebx)
+{
+ if (gtables.tab1[640] == 0x8000) {
+ cfcn_004550cc();
+ }
+ cfcn_45511b(ebx);
+}