Finish port for 1.12f and 1.30 fix

szapp · Jul 31, 2023 · 6122ac8 · 6122ac8
1 parent 92d3c36
commit 6122ac8
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 52 deletions.
diff --git a/Makefile b/Makefile
@@ -141,7 +141,6 @@ BIN_BASE		:=	core										\
 					ow_playerInfoName3							\
 					ow_playerInfoName4							\
 					ow_playerInfoName5
-BIN_BASE_G130	:=	ow_zCParser__LoadGlobalVars
 BIN_BASE_G2		:=	ow_zCParser__LoadGlobalVars					\
 					skip_writeAniBinFile_ModelTag				\
 					skip_writeAniBinFile_ReadMeshAndTree		\
@@ -183,7 +182,7 @@ DATA_BASE		:=	symbols										\
 
 BINARIES_G1		:=	$(BIN_BASE:%=$(BINDIR)%_g1)
 BINARIES_G112	:=	$(BIN_BASE:%=$(BINDIR)%_g112)
-BINARIES_G130	:=	$(BIN_BASE:%=$(BINDIR)%_g130) $(BIN_BASE_G130:%=$(BINDIR)%_g130) # $(BIN_BASE_G2:%=$(BINDIR)%_g130)
+BINARIES_G130	:=	$(BIN_BASE:%=$(BINDIR)%_g130) $(BIN_BASE_G2:%=$(BINDIR)%_g130)
 BINARIES_G2		:=	$(BIN_BASE:%=$(BINDIR)%_g2) $(BIN_BASE_G2:%=$(BINDIR)%_g2)
 FUNC			:=	$(FUNC_BASE:%=$(FUNCDIR)%$(ASMEXT))
 EXEC			:=	$(EXEC_BASE:%=$(EXECDIR)%$(ASMEXT))

diff --git a/src/ow_zCParser__LoadGlobalVars.asm b/src/ow_zCParser__LoadGlobalVars.asm
@@ -3,7 +3,7 @@
 %include "inc/macros.inc"
 
 %if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
-    %fatal This file is for Gothic 130 / 2 only
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin

diff --git a/src/skip_writeAniBinFile_ModelTag.asm b/src/skip_writeAniBinFile_ModelTag.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x5999AE
+    org     g1g2(0x000000,0x000000,0x59444E,0x5999AE)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x599C65
+        jmp     g1g2(,,0x594705,0x599C65)
diff --git a/src/skip_writeAniBinFile_ReadMeshAndTree.asm b/src/skip_writeAniBinFile_ReadMeshAndTree.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x5937DE
+    org     g1g2(0x000000,0x000000,0x58E27E,0x5937DE)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x59388B
+        jmp     g1g2(,,0x58E32B,0x59388B)
diff --git a/src/skip_writeAniBinFile_RegisterMesh.asm b/src/skip_writeAniBinFile_RegisterMesh.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x593D72
+    org     g1g2(0x000000,0x000000,0x58E812,0x593D72)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x593E2B
+        jmp     g1g2(,,0x58E8CB,0x593E2B)
diff --git a/src/skip_writeAniBinFile_ani.asm b/src/skip_writeAniBinFile_ani.asm
@@ -2,12 +2,12 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x59BFA9
+    org     g1g2(0x000000,0x000000,0x596A49,0x59BFA9)
 %endif
 
 bits    32
@@ -18,4 +18,4 @@ section .text   align=1                                                    ; Pre
     resetStackoffset 0x12AC
         mov     eax, [esp+stackoffset-0x129C+0x10]
         mov     [esp+stackoffset-0x12C8], eax
-        jmp     0x59C247
+        jmp     g1g2(,,0x596CE7,0x59C247)
diff --git a/src/skip_writeAniBinFile_aniAlias.asm b/src/skip_writeAniBinFile_aniAlias.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x597755
+    org     g1g2(0x000000,0x000000,0x5921F5,0x597755)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x597956
+        jmp     g1g2(,,0x5923F6,0x597956)
diff --git a/src/skip_writeAniBinFile_aniBlend.asm b/src/skip_writeAniBinFile_aniBlend.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x597DCF
+    org     g1g2(0x000000,0x000000,0x59286F,0x597DCF)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x597F7F
+        jmp     g1g2(,,0x592A1F,0x597F7F)
diff --git a/src/skip_writeAniBinFile_aniComb.asm b/src/skip_writeAniBinFile_aniComb.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x599003
+    org     g1g2(0x000000,0x000000,0x593AA3,0x599003)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x59926D
+        jmp     g1g2(,,0x593D0D,0x59926D)
diff --git a/src/skip_writeAniBinFile_aniDisable.asm b/src/skip_writeAniBinFile_aniDisable.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x59966A
+    org     g1g2(0x000000,0x000000,0x59410A,0x59966A)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x599701
+        jmp     g1g2(,,0x5941A1,0x599701)
diff --git a/src/skip_writeAniBinFile_aniSync.asm b/src/skip_writeAniBinFile_aniSync.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x5982DC
+    org     g1g2(0x000000,0x000000,0x592D7C,0x5982DC)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x59844C
+        jmp     g1g2(,,0x5923F6,0x59844C)
diff --git a/src/skip_writeAniBinFile_other.asm b/src/skip_writeAniBinFile_other.asm
@@ -2,17 +2,17 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x597E63
+    org     g1g2(0x000000,0x000000,0x592903,0x597E63)
 %endif
 
 bits    32
 
 
 section .text   align=1                                                    ; Prevent auto-alignment
 
-        jmp     0x597F7F
+        jmp     g1g2(,,0x592A1F,0x597F7F)
diff --git a/src/skip_zCFileBIN__BinWriteFloat.asm b/src/skip_zCFileBIN__BinWriteFloat.asm
@@ -2,12 +2,12 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x59D180
+    org     g1g2(0x000000,0x000000,0x597C20,0x59D180)
 %endif
 
 bits    32

diff --git a/src/skip_zCFileBIN__BinWriteInt.asm b/src/skip_zCFileBIN__BinWriteInt.asm
@@ -2,12 +2,12 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x59D1A0
+    org     g1g2(0x000000,0x000000,0x597C40,0x59D1A0)
 %endif
 
 bits    32

diff --git a/src/skip_zCFileBIN__BinWriteString.asm b/src/skip_zCFileBIN__BinWriteString.asm
@@ -2,12 +2,12 @@
 
 %include "inc/macros.inc"
 
-%if GOTHIC_BASE_VERSION == 1
-    %fatal This file is for Gothic 2 only
+%if GOTHIC_BASE_VERSION != 130 && GOTHIC_BASE_VERSION != 2
+    %fatal This file is for Gothic 1.30 and Gothic 2 only
 %endif
 
 %ifidn __OUTPUT_FORMAT__, bin
-    org     0x5884C0
+    org     g1g2(0x000000,0x000000,0x582F60,0x5884C0)
 %endif
 
 bits    32