Add addresses to functions

README.md

@@ -1,6 +1,6 @@
 # Ninja
 
-This repository contains the source code of the Ninja extension for Gothic 1 and Gothic 2 NotR.
+This repository contains the source code of the Ninja extension for Gothic, Gothic Sequel, and Gothic 2 NotR.
 
 If you are interested in developing patches with Ninja, please follow the instructions in the relevant chapters of the
 [documentation](https://github.com/szapp/Ninja/wiki).

getBinList.bat

@@ -34,6 +34,9 @@ COPY /Y NUL "%outfile%" >NUL
 SET gothic=1
 FOR %%N IN ("%indir%") DO CALL :fileloop %%N || EXIT /B 3
 ECHO/>> %outfile%
+SET gothic=112
+FOR %%N IN ("%indir%") DO CALL :fileloop %%N || EXIT /B 3
+ECHO/>> %outfile%
 SET gothic=2
 FOR %%N IN ("%indir%") DO CALL :fileloop %%N || EXIT /B 3
 

src/func/allowRedefine.asm

@@ -50,7 +50,7 @@ ninja_allowRedefine:
         push    eax
 
         mov     eax, [esp+stackoffset+arg_1]
-        mov     eax, [eax+g1g2(0x10A4,0,0x20A4)]                           ; parser->line
+        mov     eax, [eax+g1g2(0x10A4,0x10A4,0x20A4)]                      ; parser->line
         push    0xA
         push    ecx
         push    eax

src/func/armParser.asm

@@ -14,8 +14,8 @@ ninja_armParser:
         push    eax
         mov     eax, DWORD [zCParser__ParseBlock+4]
         push    eax
-        mov     DWORD [zCParser__ParseBlock], g1g2(0xC868FF6A,0,0x0868FF6A)
-        mov     DWORD [zCParser__ParseBlock+4], g1g2(0x64007C4A,0,0x640082A6)
+        mov     DWORD [zCParser__ParseBlock], g1g2(0xC868FF6A,0x1868FF6A,0x0868FF6A)
+        mov     DWORD [zCParser__ParseBlock+4], g1g2(0x64007C4A,0x6400807C,0x640082A6)
 
         mov     eax, DWORD [zCParser__cur_parser]
         push    eax