diff --git a/black/Game.h b/black/Game.h index c9f9356..565b0d0 100644 --- a/black/Game.h +++ b/black/Game.h @@ -221,6 +221,8 @@ void __fastcall Loop__5GGameFv(struct GGame* this); void __fastcall ProcessOneGameTurn__5GGameFv(struct GGame* this); // win1.41 0054d820 mac 10083dd0 GGame::ProcessGameCode(void) void __fastcall ProcessGameCode__5GGameFv(struct GGame* this); +// win1.41 0054d840 mac inline GGame::DisplayPlayerTextMessages(void) +void __fastcall DisplayPlayerTextMessages__5GGameFv(struct GGame* this); // win1.41 0054d850 mac 10079980 GGame::ProcessGraphicsEngine(unsigned long, unsigned long) void __fastcall ProcessGraphicsEngine__5GGameFUlUl(struct GGame* this, const void* edx, uint32_t param_1, uint32_t param_2); // win1.41 0054da80 mac 10033dd0 GGame::ProcessGraphicsEngine(void) diff --git a/src/asm/unprocessed/runblack.reassemble.0479.0054a180-0054c180.asm b/src/asm/unprocessed/runblack.reassemble.0479.0054a180-0054c180.asm index ffaf9f9..d619391 100644 --- a/src/asm/unprocessed/runblack.reassemble.0479.0054a180-0054c180.asm +++ b/src/asm/unprocessed/runblack.reassemble.0479.0054a180-0054c180.asm @@ -170,7 +170,6 @@ .extern _jmp_addr_0x00579440 .extern _jmp_addr_0x00590f00 .extern _jmp_addr_0x00590fb0 -.extern _jmp_addr_0x005910f0 .extern _jmp_addr_0x00591330 .extern _jmp_addr_0x00591370 .extern _jmp_addr_0x005c4410 diff --git a/src/asm/unprocessed/runblack.reassemble.0480.0054c340-0054d820.asm b/src/asm/unprocessed/runblack.reassemble.0480.0054c340-0054d820.asm index 157842c..60290e8 100644 --- a/src/asm/unprocessed/runblack.reassemble.0480.0054c340-0054d820.asm +++ b/src/asm/unprocessed/runblack.reassemble.0480.0054c340-0054d820.asm @@ -170,7 +170,6 @@ .extern _jmp_addr_0x00579440 .extern _jmp_addr_0x00590f00 .extern _jmp_addr_0x00590fb0 -.extern _jmp_addr_0x005910f0 .extern _jmp_addr_0x00591330 .extern _jmp_addr_0x00591370 .extern _jmp_addr_0x005c4410 diff --git a/src/asm/unprocessed/runblack.reassemble.0481.0054d840-0054ff80.asm b/src/asm/unprocessed/runblack.reassemble.0481.0054d840-0054ff80.asm index 968b64c..9db7575 100644 --- a/src/asm/unprocessed/runblack.reassemble.0481.0054d840-0054ff80.asm +++ b/src/asm/unprocessed/runblack.reassemble.0481.0054d840-0054ff80.asm @@ -170,7 +170,6 @@ .extern _jmp_addr_0x00579440 .extern _jmp_addr_0x00590f00 .extern _jmp_addr_0x00590fb0 -.extern _jmp_addr_0x005910f0 .extern _jmp_addr_0x00591330 .extern _jmp_addr_0x00591370 .extern _jmp_addr_0x005c4410 @@ -633,14 +632,6 @@ .globl _jmp_addr_0x0054ff09 .globl _jmp_addr_0x0054ff40 - mov ecx, 0x00cd3b20 // 0x0054d840 b9203bcd00 - {disp32} jmp _jmp_addr_0x005910f0 // 0x0054d845 e9a6380400 - nop // 0x0054d84a 90 - nop // 0x0054d84b 90 - nop // 0x0054d84c 90 - nop // 0x0054d84d 90 - nop // 0x0054d84e 90 - nop // 0x0054d84f 90 _jmp_addr_0x0054d850: push esi // 0x0054d850 56 mov.s esi, ecx // 0x0054d851 8bf1 mov ecx, 0x00e85204 // 0x0054d853 b90452e800 diff --git a/src/asm/unprocessed/runblack.reassemble.0542.00573840-00596fd0.asm b/src/asm/unprocessed/runblack.reassemble.0542.00573840-00596fd0.asm index 9041f52..72597fa 100644 --- a/src/asm/unprocessed/runblack.reassemble.0542.00573840-00596fd0.asm +++ b/src/asm/unprocessed/runblack.reassemble.0542.00573840-00596fd0.asm @@ -3956,7 +3956,7 @@ .globl _jmp_addr_0x005910a0 .globl _jmp_addr_0x005910ad .globl _jmp_addr_0x005910ce -.globl _jmp_addr_0x005910f0 +.globl @DisplayPlayerTextMessages__7GGlobalFv@4 .globl _jmp_addr_0x0059111f .globl _jmp_addr_0x00591149 .globl _jmp_addr_0x0059114d @@ -49862,7 +49862,7 @@ _jmp_addr_0x005910ce: mov.s eax, edx nop // 0x005910ed 90 nop // 0x005910ee 90 nop // 0x005910ef 90 -_jmp_addr_0x005910f0: sub esp, 0x0000020c // 0x005910f0 81ec0c020000 +@DisplayPlayerTextMessages__7GGlobalFv@4: sub esp, 0x0000020c // 0x005910f0 81ec0c020000 {disp32} mov eax, dword ptr [data_bytes + 0x53076c] // 0x005910f6 a16c67ef00 push ebx // 0x005910fb 53 push edi // 0x005910fc 57 diff --git a/src/asm/unprocessed/runblack.reassemble.0759.00641fe0-006464f0.asm b/src/asm/unprocessed/runblack.reassemble.0759.00641fe0-006464f0.asm index 32c8eb4..c6f4772 100644 --- a/src/asm/unprocessed/runblack.reassemble.0759.00641fe0-006464f0.asm +++ b/src/asm/unprocessed/runblack.reassemble.0759.00641fe0-006464f0.asm @@ -44,7 +44,7 @@ .extern _jmp_addr_0x0056fe00 .extern _jmp_addr_0x005739f0 .extern _jmp_addr_0x00591010 -.extern _jmp_addr_0x005910f0 +.extern @DisplayPlayerTextMessages__7GGlobalFv@4 .extern _jmp_addr_0x005e1860 .extern _jmp_addr_0x005e1950 .extern _jmp_addr_0x005ea980 @@ -583,7 +583,7 @@ _jmp_addr_0x0064202f: {disp32} mov eax, dword ptr [data_bytes + 0x23899 {disp32} mov byte ptr [esp + 0x00000197], 0x00 // 0x0064208b c684249701000000 call _jmp_addr_0x00591010 // 0x00642093 e878eff4ff mov ecx, 0x00cd3b20 // 0x00642098 b9203bcd00 - call _jmp_addr_0x005910f0 // 0x0064209d e84ef0f4ff + call @DisplayPlayerTextMessages__7GGlobalFv@4 // 0x0064209d e84ef0f4ff {disp32} mov esi, dword ptr [data_bytes + 0x530bec] // 0x006420a2 8b35ec6bef00 push 0x0 // 0x006420a8 6a00 call _jmp_addr_0x00641fe0 // 0x006420aa e831ffffff @@ -861,7 +861,7 @@ _jmp_addr_0x006423d0: {disp32} mov ecx, dword ptr [esp + 0x00000494] {disp32} mov byte ptr [esp + 0x00000397], 0x00 // 0x00642412 c684249703000000 call _jmp_addr_0x00591010 // 0x0064241a e8f1ebf4ff mov ecx, 0x00cd3b20 // 0x0064241f b9203bcd00 - call _jmp_addr_0x005910f0 // 0x00642424 e8c7ecf4ff + call @DisplayPlayerTextMessages__7GGlobalFv@4 // 0x00642424 e8c7ecf4ff push 0x0 // 0x00642429 6a00 mov ecx, 0x00e85050 // 0x0064242b b95050e800 call _jmp_addr_0x007de090 // 0x00642430 e85bbc1900 diff --git a/src/c/Game.0481.0054d820-0054d83e.c b/src/c/Game.0481.0054d820-0054d83e.c index 4ea2d90..3caa54d 100644 --- a/src/c/Game.0481.0054d820-0054d83e.c +++ b/src/c/Game.0481.0054d820-0054d83e.c @@ -1,4 +1,6 @@ #include "Game.h" +#include "Global.h" +#include "../../globals.h" __attribute__((MOV32rr_REV, disable_tail_calls)) void __fastcall ProcessGameCode__5GGameFv(struct GGame* this) { @@ -9,3 +11,8 @@ void __fastcall ProcessGameCode__5GGameFv(struct GGame* this) { } EndTurn__5GGameFv(this); } + +void DisplayPlayerTextMessages__5GGameFv(void) +{ + DisplayPlayerTextMessages__7GGlobalFv(globals.global); +}