use window_util.c

4 files changed, 215 insertions, 268 deletions

diff --git a/asm/Makefile b/asm/Makefile
index 0a175e7..4e4041a 100644
--- a/asm/Makefile
+++ b/asm/Makefile
@@ -7,6 +7,7 @@ LIBS+=-lmsvcrt
 
 OBJS = rich4.obj rich4_time.obj card_strings.obj stocks_data.obj card_table.obj tool_strings.obj \
        players.obj \
+       window_util.obj \
        rich4_crt_mthread.obj rich4_clib.obj
 
 rich4.exe: $(OBJS)
diff --git a/asm/rich4.asm b/asm/rich4.asm
index 5048cad..4898558 100644
--- a/asm/rich4.asm
+++ b/asm/rich4.asm
@@ -188,6 +188,12 @@ global ref_0046c9a1
 global ref_0046c9c9
 global __init_stack_limits
 
+global _gWindowHandle
+extern _Wait_0402_Message
+extern _Post_0402_Message
+extern _callbackSize
+extern _windowCallbacks
+
 section .text
 db 0xcc
 db 0xeb
@@ -292,7 +298,7 @@ je short loc_00401134  ; je 0x401134
 push eax
 push 0
 push 0x202
-mov edx, dword [gWindowHandle]  ; mov edx, dword [0x48a0d4]
+mov edx, dword [_gWindowHandle]  ; mov edx, dword [0x48a0d4]
 push edx
 call dword [cs:__imp__PostMessageA@16]  ; ucall: call dword cs:[0x462310]
 xor ebx, ebx
@@ -303,7 +309,7 @@ loc_00401134:
 push eax
 push 0
 push 0x201
-mov eax, dword [gWindowHandle]  ; mov eax, dword [0x48a0d4]
+mov eax, dword [_gWindowHandle]  ; mov eax, dword [0x48a0d4]
 push eax
 call dword [cs:__imp__PostMessageA@16]  ; ucall: call dword cs:[0x462310]
 mov word [ref_0046cb09], 1  ; mov word [0x46cb09], 1
@@ -318,7 +324,7 @@ test ebx, 0x80000000
 je near loc_004011df  ; je 0x4011df
 cmp byte [ref_0046cafe], 0  ; cmp byte [0x46cafe], 0
 je short loc_004011c3  ; je 0x4011c3
-cmp dword [callbackSize], 1  ; cmp dword [0x46cad8], 1
+cmp dword [_callbackSize], 1  ; cmp dword [0x46cad8], 1
 jne short loc_004011c3  ; jne 0x4011c3
 xor edx, edx
 xor ebx, ebx
@@ -347,7 +353,7 @@ loc_004011c3:
 push 0
 push 0
 push 0x205
-mov edi, dword [gWindowHandle]  ; mov edi, dword [0x48a0d4]
+mov edi, dword [_gWindowHandle]  ; mov edi, dword [0x48a0d4]
 push edi
 call dword [cs:__imp__PostMessageA@16]  ; ucall: call dword cs:[0x462310]
 jmp near loc_00401537  ; jmp 0x401537
@@ -737,7 +743,7 @@ loc_0040161b:
 mov eax, dword [ref_0048a0d8]  ; mov eax, dword [0x48a0d8]
 mov edx, dword [eax]
 push 0x11
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
+mov ecx, dword [_gWindowHandle]  ; mov ecx, dword [0x48a0d4]
 push ecx
 push eax
 call dword [edx + 0x50]  ; ucall
@@ -854,8 +860,8 @@ mov dword [ref_00474938], eax  ; mov dword [0x474938], eax
 xor esi, esi
 mov dword [ref_00474930], esi  ; mov dword [0x474930], esi
 mov dword [ref_00474934], esi  ; mov dword [0x474934], esi
-mov dword [windowCallbacks], esi  ; mov dword [0x48a010], esi
-mov dword [callbackSize], esi  ; mov dword [0x46cad8], esi
+mov dword [_windowCallbacks], esi  ; mov dword [0x48a010], esi
+mov dword [_callbackSize], esi  ; mov dword [0x46cad8], esi
 xor bh, bh
 mov byte [ref_0047e771], bh  ; mov byte [0x47e771], bh
 mov eax, 1
@@ -938,70 +944,16 @@ pop esi
 pop ebx
 ret
 
-Wait_0402_Message:
-push ebx
-sub esp, 0x1c
-mov edx, dword [callbackSize]  ; mov edx, dword [0x46cad8]
-inc edx
-mov dword [callbackSize], edx  ; mov dword [0x46cad8], edx
-mov eax, edx
-mov edx, dword [esp + 0x24]
-mov dword [eax*4 + windowCallbacks], edx  ; mov dword [eax*4 + 0x48a010], edx
-mov ecx, dword [esp + 0x28]
-push ecx
-push 0
-push 0x401
-mov ebx, dword [gWindowHandle]  ; mov ebx, dword [0x48a0d4]
-push ebx
-call dword [cs:__imp__PostMessageA@16]  ; ucall: call dword cs:[0x462310]
-
-loc_0040191f:
-push 1
-push 0
-push 0
-push 0
-lea eax, [esp + 0x10]
-push eax
-call dword [cs:__imp__PeekMessageA@20]  ; ucall: call dword cs:[0x46230c]
-test eax, eax
-je short loc_0040191f  ; je 0x40191f
-cmp dword [esp + 4], 0x402
-je short loc_00401957  ; je 0x401957
-mov eax, esp
-push eax
-call dword [cs:__imp__TranslateMessage@4]  ; ucall: call dword cs:[0x462334]
-mov eax, esp
-push eax
-call dword [cs:__imp__DispatchMessageA@4]  ; ucall: call dword cs:[0x4622e0]
-jmp short loc_0040191f  ; jmp 0x40191f
-
-loc_00401957:
-dec dword [callbackSize]  ; dec dword [0x46cad8]
-mov eax, dword [esp + 0xc]
-add esp, 0x1c
-pop ebx
-ret
-
-Post_0402_Message:
-mov edx, dword [esp + 4]
-push edx
-push 0
-push 0x402
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
-push ecx
-call dword [cs:__imp__PostMessageA@16]  ; ucall: call dword cs:[0x462310]
-ret
-
 fcn_00401981:
 push ebx
-mov edx, dword [callbackSize]  ; mov edx, dword [0x46cad8]
+mov edx, dword [_callbackSize]  ; mov edx, dword [0x46cad8]
 inc edx
-mov dword [callbackSize], edx  ; mov dword [0x46cad8], edx
-mov dword [edx*4 + windowCallbacks], fcn_00417e26  ; mov dword [edx*4 + 0x48a010], 0x417e26
+mov dword [_callbackSize], edx  ; mov dword [0x46cad8], edx
+mov dword [edx*4 + _windowCallbacks], fcn_00417e26  ; mov dword [edx*4 + 0x48a010], 0x417e26
 push 0
 push 0
 push 0x401
-mov ebx, dword [gWindowHandle]  ; mov ebx, dword [0x48a0d4]
+mov ebx, dword [_gWindowHandle]  ; mov ebx, dword [0x48a0d4]
 push ebx
 call dword [cs:__imp__PostMessageA@16]  ; ucall: call dword cs:[0x462310]
 imul eax, dword [_current_player], 0x34  ; imul eax, dword [0x49910c], 0x34
@@ -1017,7 +969,7 @@ pop ebx
 ret
 
 fcn_004019d2:
-dec dword [callbackSize]  ; dec dword [0x46cad8]
+dec dword [_callbackSize]  ; dec dword [0x46cad8]
 jmp near fcn_00454edc  ; jmp 0x454edc
 
 fcn_004019dd:
@@ -1073,7 +1025,7 @@ call dword [cs:__imp__mciSendStringA@16]  ; ucall: call dword cs:[0x46245c]
 loc_00401a67:
 cmp byte [ref_0046cb04], 0  ; cmp byte [0x46cb04], 0
 je short loc_00401a87  ; je 0x401a87
-mov edi, dword [gWindowHandle]  ; mov edi, dword [0x48a0d4]
+mov edi, dword [_gWindowHandle]  ; mov edi, dword [0x48a0d4]
 push edi
 push 0
 push 0
@@ -1137,9 +1089,9 @@ call dword [cs:__imp__PostQuitMessage@4]  ; ucall: call dword cs:[0x462314]
 jmp short loc_00401b6e  ; jmp 0x401b6e
 
 loc_00401b33:
-mov ebx, dword [callbackSize]  ; mov ebx, dword [0x46cad8]
+mov ebx, dword [_callbackSize]  ; mov ebx, dword [0x46cad8]
 shl ebx, 2
-cmp dword [ebx + windowCallbacks], 0  ; cmp dword [ebx + 0x48a010], 0
+cmp dword [ebx + _windowCallbacks], 0  ; cmp dword [ebx + 0x48a010], 0
 je short loc_00401b59  ; je 0x401b59
 mov edi, dword [esp + 0x20]
 push edi
@@ -1147,7 +1099,7 @@ push edx
 push eax
 mov ebp, dword [esp + 0x20]
 push ebp
-call dword [ebx + windowCallbacks]  ; ucall: call dword [ebx + 0x48a010]
+call dword [ebx + _windowCallbacks]  ; ucall: call dword [ebx + 0x48a010]
 jmp short loc_00401b6c  ; jmp 0x401b6c
 
 loc_00401b59:
@@ -1241,15 +1193,15 @@ push ebp
 push ebp
 push ebx
 call dword [cs:__imp__CreateWindowExA@48]  ; ucall: call dword cs:[0x4622d4]
-mov dword [gWindowHandle], eax  ; mov dword [0x48a0d4], eax
+mov dword [_gWindowHandle], eax  ; mov dword [0x48a0d4], eax
 call fcn_004015d6  ; call 0x4015d6
 test eax, eax
 je near loc_00401e50  ; je 0x401e50
 push 5
-mov edx, dword [gWindowHandle]  ; mov edx, dword [0x48a0d4]
+mov edx, dword [_gWindowHandle]  ; mov edx, dword [0x48a0d4]
 push edx
 call dword [cs:__imp__ShowWindow@8]  ; ucall: call dword cs:[0x462330]
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
+mov ecx, dword [_gWindowHandle]  ; mov ecx, dword [0x48a0d4]
 push ecx
 call dword [cs:__imp__UpdateWindow@4]  ; ucall: call dword cs:[0x46233c]
 push 1
@@ -1308,7 +1260,7 @@ jmp short loc_00401cfe  ; jmp 0x401cfe
 
 loc_00401d18:
 call fcn_00401815  ; call 0x401815
-mov esi, dword [gWindowHandle]  ; mov esi, dword [0x48a0d4]
+mov esi, dword [_gWindowHandle]  ; mov esi, dword [0x48a0d4]
 push esi
 
 loc_00401d24:
@@ -1386,7 +1338,7 @@ cmp byte [ref_0046caf9], 0  ; cmp byte [0x46caf9], 0
 je near loc_00401d2b  ; je 0x401d2b
 call fcn_00451b36  ; call 0x451b36
 call fcn_00401815  ; call 0x401815
-mov eax, dword [gWindowHandle]  ; mov eax, dword [0x48a0d4]
+mov eax, dword [_gWindowHandle]  ; mov eax, dword [0x48a0d4]
 push eax
 jmp near loc_00401d24  ; jmp 0x401d24
 
@@ -2097,7 +2049,7 @@ mov edx, dword [ref_0048a184]  ; mov edx, dword [0x48a184]
 push edx
 
 loc_0040266d:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_00402672:
 add esp, 4
@@ -2457,7 +2409,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_0040257a  ; push 0x40257a
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 mov ebx, eax
 add esp, 8
 call fcn_00454acb  ; call 0x454acb
@@ -3697,7 +3649,7 @@ mov ebx, dword [ref_0048a34a]  ; mov ebx, dword [0x48a34a]
 push ebx
 
 loc_00403927:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00403865  ; jmp 0x403865
 
@@ -3999,7 +3951,7 @@ mov ebp, dword [ref_0048a34e]  ; mov ebp, dword [0x48a34e]
 push ebp
 
 loc_00403ce7:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00403865  ; jmp 0x403865
 
@@ -4342,7 +4294,7 @@ cmp dword [esp + 0x48], 0
 je short loc_004040dd  ; je 0x4040dd
 push 0
 push fcn_0040363a  ; push 0x40363a
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebp, eax
 cmp eax, 0xffffffff
@@ -4443,7 +4395,7 @@ add esp, 4
 mov dword [ref_0048a334], eax  ; mov dword [0x48a334], eax
 push 0
 push fcn_004039c2  ; push 0x4039c2
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 cmp eax, 0xffffffff
 je short loc_004041fe  ; je 0x4041fe
@@ -5641,7 +5593,7 @@ add esp, 4
 call fcn_00404504  ; call 0x404504
 push 0
 push 0x64
-mov edx, dword [callbackSize]  ; mov edx, dword [0x46cad8]
+mov edx, dword [_callbackSize]  ; mov edx, dword [0x46cad8]
 push edx
 push ebp
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -5680,7 +5632,7 @@ ret 0x10
 loc_00404feb:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_00404fdf  ; je 0x404fdf
-cmp edx, dword [callbackSize]  ; cmp edx, dword [0x46cad8]
+cmp edx, dword [_callbackSize]  ; cmp edx, dword [0x46cad8]
 jne short loc_00404fdf  ; jne 0x404fdf
 mov edx, dword [ref_0048a3c8]  ; mov edx, dword [0x48a3c8]
 add edx, 4
@@ -6460,7 +6412,7 @@ push ebx
 push ebp
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0040591c  ; jmp 0x40591c
 
 loc_00405a49:
@@ -6514,7 +6466,7 @@ call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
 
 loc_00405af7:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_00405afc:
 add esp, 4
@@ -6640,7 +6592,7 @@ cmp eax, 0x113
 jne near loc_00405ee2  ; jne 0x405ee2
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_00404fdf  ; je 0x404fdf
-cmp edx, dword [callbackSize]  ; cmp edx, dword [0x46cad8]
+cmp edx, dword [_callbackSize]  ; cmp edx, dword [0x46cad8]
 jne near loc_00404fdf  ; jne 0x404fdf
 mov eax, dword [ref_0048a3c8]  ; mov eax, dword [0x48a3c8]
 add eax, 4
@@ -6669,7 +6621,7 @@ push ebp
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push ebx
 push 0x32
-mov edi, dword [callbackSize]  ; mov edi, dword [0x46cad8]
+mov edi, dword [_callbackSize]  ; mov edi, dword [0x46cad8]
 push edi
 push ebp
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -6856,7 +6808,7 @@ jmp short loc_00405edc  ; jmp 0x405edc
 loc_00405f04:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_00404fdf  ; je 0x404fdf
-cmp edx, dword [callbackSize]  ; cmp edx, dword [0x46cad8]
+cmp edx, dword [_callbackSize]  ; cmp edx, dword [0x46cad8]
 jne near loc_00404fdf  ; jne 0x404fdf
 add dword [ref_0048a3fc], ecx  ; add dword [0x48a3fc], ecx
 mov ecx, dword [ref_0048a400]  ; mov ecx, dword [0x48a400]
@@ -7079,7 +7031,7 @@ setne al
 mov byte [ref_0048a435], al  ; mov byte [0x48a435], al
 push 0
 push 0x32
-mov ebp, dword [callbackSize]  ; mov ebp, dword [0x46cad8]
+mov ebp, dword [_callbackSize]  ; mov ebp, dword [0x46cad8]
 push ebp
 push esi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -7094,7 +7046,7 @@ loc_0040622c:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_0040672c  ; je 0x40672c
 mov eax, dword [esp + 0x7c]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_0040672c  ; jne 0x40672c
 cmp byte [ref_0048a43a], 2  ; cmp byte [0x48a43a], 2
 jne short loc_0040627a  ; jne 0x40627a
@@ -7664,7 +7616,7 @@ push eax
 push esi
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_0040672c  ; jmp 0x40672c
 
@@ -7866,7 +7818,7 @@ push eax
 call dword [edx + 0x80]  ; ucall
 push 0
 push 0x3e8
-mov ebp, dword [callbackSize]  ; mov ebp, dword [0x46cad8]
+mov ebp, dword [_callbackSize]  ; mov ebp, dword [0x46cad8]
 push ebp
 push ebx
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -7888,7 +7840,7 @@ jmp near loc_00404fe4  ; jmp 0x404fe4
 loc_00406c52:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_00406c48  ; je 0x406c48
-cmp edx, dword [callbackSize]  ; cmp edx, dword [0x46cad8]
+cmp edx, dword [_callbackSize]  ; cmp edx, dword [0x46cad8]
 jne short loc_00406c48  ; jne 0x406c48
 mov edi, dword [ref_0048a440]  ; mov edi, dword [0x48a440]
 dec edi
@@ -7979,7 +7931,7 @@ call fcn_00451edb  ; call 0x451edb
 add esp, 0xc
 mov ecx, dword [ref_0048a444]  ; mov ecx, dword [0x48a444]
 push ecx
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00406c48  ; jmp 0x406c48
 
@@ -8281,7 +8233,7 @@ add esp, 4
 mov ebx, dword [esp + 0x24]
 push ebx
 push fcn_00404e44  ; push 0x404e44
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 mov ebx, eax
 add esp, 8
 mov dword [esp + 4], eax
@@ -8797,7 +8749,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_004060e9  ; push 0x4060e9
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454acb  ; call 0x454acb
 jmp short loc_004077fe  ; jmp 0x4077fe
@@ -8933,7 +8885,7 @@ add esp, 4
 loc_00407912:
 push 0
 push fcn_00406b14  ; push 0x406b14
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 test eax, eax
 je near loc_004079de  ; je 0x4079de
@@ -12782,7 +12734,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_0040a998  ; jmp 0x40a998
 
@@ -12910,7 +12862,7 @@ jmp short loc_0040a99a  ; jmp 0x40a99a
 map_ui:
 push 0
 push fcn_0040a801  ; push 0x40a801
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 push 1
 call fcn_00415e70  ; call 0x415e70
@@ -20705,7 +20657,7 @@ mov dword [esp + 0x34], edx
 push 0
 lea eax, [esp + 0x2c]
 push eax
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
+mov ecx, dword [_gWindowHandle]  ; mov ecx, dword [0x48a0d4]
 push ecx
 call dword [cs:__imp__InvalidateRect@12]  ; ucall: call dword cs:[0x4622f8]
 add esp, 0x38
@@ -21199,7 +21151,7 @@ sub eax, 2
 push eax
 
 loc_0041091a:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_0041091f:
 add esp, 4
@@ -21825,7 +21777,7 @@ add esp, 0xc
 push 0xffffffffffffffff
 
 loc_00411074:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00410ff8  ; jmp 0x410ff8
 
@@ -21980,7 +21932,7 @@ call fcn_00410158  ; call 0x410158
 add esp, 8
 push esi
 push 0xfa
-mov eax, dword [callbackSize]  ; mov eax, dword [0x46cad8]
+mov eax, dword [_callbackSize]  ; mov eax, dword [0x46cad8]
 push eax
 push ebx
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -21994,7 +21946,7 @@ cmp dword [ref_0048bba6], 0  ; cmp dword [0x48bba6], 0
 je near loc_00410ff8  ; je 0x410ff8
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_00410ff8  ; je 0x410ff8
-cmp esi, dword [callbackSize]  ; cmp esi, dword [0x46cad8]
+cmp esi, dword [_callbackSize]  ; cmp esi, dword [0x46cad8]
 jne near loc_00410ff8  ; jne 0x410ff8
 xor byte [ref_0048bbaa], 1  ; xor byte [0x48bbaa], 1
 mov ebp, dword [ref_0048bbaa]  ; mov ebp, dword [0x48bbaa]
@@ -22365,7 +22317,7 @@ loc_004117a8:
 call fcn_00451edb  ; call 0x451edb
 add esp, 0xc
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp short loc_0041182e  ; jmp 0x41182e
 
@@ -22510,7 +22462,7 @@ push edi
 call fcn_00451edb  ; call 0x451edb
 add esp, 0xc
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0041160f  ; jmp 0x41160f
 
 loc_0041197c:
@@ -22599,7 +22551,7 @@ add edx, eax
 mov dword [ref_0048bb5c], edx  ; mov dword [0x48bb5c], edx
 push 0
 push fcn_00410ac3  ; push 0x410ac3
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 cmp eax, 0xffffffff
 je short loc_00411a81  ; je 0x411a81
@@ -22616,7 +22568,7 @@ ret
 fcn_00411a86:
 push 0
 push fcn_00411122  ; push 0x411122
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 ret
 
@@ -22923,7 +22875,7 @@ shl eax, 0x10
 add eax, dword [esp]
 push eax
 push fcn_004103a3  ; push 0x4103a3
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebx, eax
 mov ebp, dword [esp + 4]
@@ -26508,7 +26460,7 @@ call fcn_0041461b  ; call 0x41461b
 add esp, 4
 push 0
 push 0x64
-mov ebp, dword [callbackSize]  ; mov ebp, dword [0x46cad8]
+mov ebp, dword [_callbackSize]  ; mov ebp, dword [0x46cad8]
 push ebp
 push ebx
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -26523,7 +26475,7 @@ loc_00414900:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_00414a4a  ; je 0x414a4a
 mov eax, dword [esp + 0x1c]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_00414a4a  ; jne 0x414a4a
 mov eax, dword [ref_0048bd2c]  ; mov eax, dword [0x48bd2c]
 dec eax
@@ -26537,7 +26489,7 @@ push esi
 push ebx
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_0041494f:
 add esp, 4
@@ -26775,7 +26727,7 @@ mov dword [ref_0048bd84], 0x63  ; mov dword [0x48bd84], 0x63
 call fcn_004146ee  ; call 0x4146ee
 push 0
 push 0x64
-mov ebp, dword [callbackSize]  ; mov ebp, dword [0x46cad8]
+mov ebp, dword [_callbackSize]  ; mov ebp, dword [0x46cad8]
 push ebp
 push ebx
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -26795,7 +26747,7 @@ loc_00414c69:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_00414a4a  ; je 0x414a4a
 mov eax, dword [esp + 0x1c]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_00414a4a  ; jne 0x414a4a
 mov ecx, dword [ref_0048bd84]  ; mov ecx, dword [0x48bd84]
 test ecx, ecx
@@ -26856,7 +26808,7 @@ push 0x7d0
 call fcn_0045285e  ; call 0x45285e
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_00414c61  ; jmp 0x414c61
 
 loc_00414d51:
@@ -27088,7 +27040,7 @@ mov dword [ref_0048bd8c], 0x63  ; mov dword [0x48bd8c], 0x63
 call fcn_0041473b  ; call 0x41473b
 push 0
 push 0x32
-mov edi, dword [callbackSize]  ; mov edi, dword [0x46cad8]
+mov edi, dword [_callbackSize]  ; mov edi, dword [0x46cad8]
 push edi
 push ebx
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -27103,7 +27055,7 @@ loc_00415051:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_0041517f  ; je 0x41517f
 mov eax, dword [esp + 0x20]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_0041517f  ; jne 0x41517f
 mov eax, dword [ref_0048bd8c]  ; mov eax, dword [0x48bd8c]
 test eax, eax
@@ -27172,7 +27124,7 @@ push 0x7d0
 call fcn_0045285e  ; call 0x45285e
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 
 loc_00415156:
@@ -27360,7 +27312,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push edi
 push fcn_00414858  ; push 0x414858
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 push ref_00475057  ; push 0x475057
@@ -27506,7 +27458,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push ebx
 push fcn_00414bbc  ; push 0x414bbc
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 push ref_0047509f  ; push 0x47509f
@@ -27663,7 +27615,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_00414fcd  ; push 0x414fcd
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 push ref_004750bf  ; push 0x4750bf
@@ -31238,7 +31190,7 @@ mov dword [ref_0048bddc], eax  ; mov dword [0x48bddc], eax
 mov dword [ref_0048bdd4], edi  ; mov dword [0x48bdd4], edi
 push edi
 push 0x1f4
-mov eax, dword [callbackSize]  ; mov eax, dword [0x46cad8]
+mov eax, dword [_callbackSize]  ; mov eax, dword [0x46cad8]
 push eax
 push esi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -32057,7 +32009,7 @@ call fcn_00417c67  ; call 0x417c67
 jmp near loc_00418c30  ; jmp 0x418c30
 
 loc_00418b7a:
-cmp ecx, dword [callbackSize]  ; cmp ecx, dword [0x46cad8]
+cmp ecx, dword [_callbackSize]  ; cmp ecx, dword [0x46cad8]
 jne near loc_00418c30  ; jne 0x418c30
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_00418c30  ; je 0x418c30
@@ -32502,7 +32454,7 @@ push ebp
 push 0
 push 0
 push 0xf
-mov edx, dword [gWindowHandle]  ; mov edx, dword [0x48a0d4]
+mov edx, dword [_gWindowHandle]  ; mov edx, dword [0x48a0d4]
 push edx
 call fcn_00417e26  ; call 0x417e26
 cmp dword [esp + 0x14], 0
@@ -32700,7 +32652,7 @@ add esp, 4
 call fcn_004080f5  ; call 0x4080f5
 mov esi, dword [ref_0048bdc8]  ; mov esi, dword [0x48bdc8]
 push esi
-mov edi, dword [gWindowHandle]  ; mov edi, dword [0x48a0d4]
+mov edi, dword [_gWindowHandle]  ; mov edi, dword [0x48a0d4]
 push edi
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 xor ah, ah
@@ -38085,7 +38037,7 @@ push ebx
 mov edx, dword [esp + 8]
 cmp edx, 7
 jg short loc_0041d474  ; jg 0x41d474
-cmp dword [callbackSize], 1  ; cmp dword [0x46cad8], 1
+cmp dword [_callbackSize], 1  ; cmp dword [0x46cad8], 1
 jg short loc_0041d474  ; jg 0x41d474
 mov ebx, dword [_current_player]  ; mov ebx, dword [0x49910c]
 mov dword [_current_player], edx  ; mov dword [0x49910c], edx
@@ -38173,7 +38125,7 @@ je short loc_0041d53f  ; je 0x41d53f
 push 0
 push 0
 push 0xf
-mov eax, dword [gWindowHandle]  ; mov eax, dword [0x48a0d4]
+mov eax, dword [_gWindowHandle]  ; mov eax, dword [0x48a0d4]
 push eax
 call fcn_00417e26  ; call 0x417e26
 
@@ -38759,7 +38711,7 @@ mov dword [esp + 0xc], 0x180
 push 0
 lea eax, [esp + 4]
 push eax
-mov ebp, dword [gWindowHandle]  ; mov ebp, dword [0x48a0d4]
+mov ebp, dword [_gWindowHandle]  ; mov ebp, dword [0x48a0d4]
 push ebp
 call dword [cs:__imp__InvalidateRect@12]  ; ucall: call dword cs:[0x4622f8]
 add esp, 0x10
@@ -38916,7 +38868,7 @@ mov dword [esp + 0xc], 0x1a1
 push 0
 lea eax, [esp + 4]
 push eax
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
+mov ecx, dword [_gWindowHandle]  ; mov ecx, dword [0x48a0d4]
 push ecx
 call dword [cs:__imp__InvalidateRect@12]  ; ucall: call dword cs:[0x4622f8]
 add esp, 0x10
@@ -39394,7 +39346,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_0041de89  ; jmp 0x41de89
 
@@ -39676,7 +39628,7 @@ jmp near loc_0041e594  ; jmp 0x41e594
 loc_0041e66f:
 push 0
 push fcn_0041dda9  ; push 0x41dda9
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 push 1
 call fcn_0041906a  ; call 0x41906a
@@ -46251,7 +46203,7 @@ mov dword [esp + 0x8c], 0x1c0
 push 0
 lea eax, [esp + 0x84]
 push eax
-mov edx, dword [gWindowHandle]  ; mov edx, dword [0x48a0d4]
+mov edx, dword [_gWindowHandle]  ; mov edx, dword [0x48a0d4]
 push edx
 call dword [cs:__imp__InvalidateRect@12]  ; ucall: call dword cs:[0x4622f8]
 
@@ -47763,7 +47715,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00424359  ; jmp 0x424359
 
@@ -47941,7 +47893,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00423dc5  ; jmp 0x423dc5
 
@@ -48008,7 +47960,7 @@ add esp, 0x10
 mov dword [ref_0048c274], eax  ; mov dword [0x48c274], eax
 push 0
 push fcn_00423cf3  ; push 0x423cf3
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 push 1
 call fcn_0041906a  ; call 0x41906a
@@ -48559,7 +48511,7 @@ mov dword [esp + 0xc], 0x19e
 push 0
 lea eax, [esp + 4]
 push eax
-mov edi, dword [gWindowHandle]  ; mov edi, dword [0x48a0d4]
+mov edi, dword [_gWindowHandle]  ; mov edi, dword [0x48a0d4]
 push edi
 call dword [cs:__imp__InvalidateRect@12]  ; ucall: call dword cs:[0x4622f8]
 add esp, 0x10
@@ -49537,7 +49489,7 @@ mov dword [esp + 0x8c], 0x1bf
 push 0
 lea eax, [esp + 0x84]
 push eax
-mov eax, dword [gWindowHandle]  ; mov eax, dword [0x48a0d4]
+mov eax, dword [_gWindowHandle]  ; mov eax, dword [0x48a0d4]
 push eax
 call dword [cs:__imp__InvalidateRect@12]  ; ucall: call dword cs:[0x4622f8]
 
@@ -50331,7 +50283,7 @@ push ecx
 call fcn_00451edb  ; call 0x451edb
 add esp, 0xc
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00425b0c  ; jmp 0x425b0c
 
@@ -50843,7 +50795,7 @@ push edx
 call fcn_00451edb  ; call 0x451edb
 add esp, 0xc
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0042650d  ; jmp 0x42650d
 
 loc_0042669c:
@@ -51246,7 +51198,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_00426a5b  ; jmp 0x426a5b
 
 loc_00426b9f:
@@ -51564,7 +51516,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_00426e7f  ; jmp 0x426e7f
 
 loc_00426fba:
@@ -52469,7 +52421,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_00427ad1  ; jmp 0x427ad1
 
 loc_00427b93:
@@ -52987,7 +52939,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_0042836b  ; jmp 0x42836b
 
@@ -53071,7 +53023,7 @@ push 0
 call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp short loc_004283b0  ; jmp 0x4283b0
 
 loc_0042838b:
@@ -53082,7 +53034,7 @@ push 0
 push fcn_004258c1  ; push 0x4258c1
 
 loc_0042839c:
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_004249c2  ; call 0x4249c2
 push 1
@@ -53478,7 +53430,7 @@ jmp short loc_004287f3  ; jmp 0x4287f3
 loc_00428825:
 push 0
 push fcn_00427c21  ; push 0x427c21
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 push 1
 call fcn_0041906a  ; call 0x41906a
@@ -56281,7 +56233,7 @@ push ebx
 call fcn_00451edb  ; call 0x451edb
 add esp, 0xc
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp short loc_0042a9fb  ; jmp 0x42a9fb
 
@@ -56897,7 +56849,7 @@ mov al, byte [ref_0048c2eb]  ; mov al, byte [0x48c2eb]
 push eax
 
 loc_0042b197:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_0042b19c:
 add esp, 4
@@ -56949,7 +56901,7 @@ mov al, byte [ref_0048c2eb]  ; mov al, byte [0x48c2eb]
 dec eax
 push eax
 push fcn_00429d65  ; push 0x429d65
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 push 1
 call fcn_00402460  ; call 0x402460
@@ -57081,7 +57033,7 @@ jmp short loc_0042b3ca  ; jmp 0x42b3ca
 
 loc_0042b385:
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp short loc_0042b3ca  ; jmp 0x42b3ca
 
@@ -57190,7 +57142,7 @@ push eax
 call dword [edx + 0x80]  ; ucall
 push 0
 push 0x3e8
-mov esi, dword [callbackSize]  ; mov esi, dword [0x46cad8]
+mov esi, dword [_callbackSize]  ; mov esi, dword [0x46cad8]
 push esi
 push ebx
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -57211,7 +57163,7 @@ loc_0042b4db:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_0042b3ca  ; je 0x42b3ca
 mov eax, dword [esp + 0x5c]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_0042b3ca  ; jne 0x42b3ca
 mov ecx, dword [ref_0048c2f2]  ; mov ecx, dword [0x48c2f2]
 inc ecx
@@ -57231,7 +57183,7 @@ push ebp
 push ebx
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_0042b3ca  ; jmp 0x42b3ca
 
@@ -57395,7 +57347,7 @@ call fcn_0044fabc  ; call 0x44fabc
 add esp, 0x14
 push 0
 push fcn_0042b2ec  ; push 0x42b2ec
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebx, eax
 jmp near loc_0042ba6d  ; jmp 0x42ba6d
@@ -57646,7 +57598,7 @@ add esp, 0x14
 mov edx, dword [esp + 0x14]
 push edx
 push fcn_0042aaff  ; push 0x42aaff
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebx, eax
 push ref_00475590  ; push 0x475590
@@ -57980,7 +57932,7 @@ jmp short loc_0042bdf6  ; jmp 0x42bdf6
 loc_0042be43:
 push 0
 push fcn_0042b3eb  ; push 0x42b3eb
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov eax, dword [ref_0048c2dc]  ; mov eax, dword [0x48c2dc]
 push eax
@@ -59687,7 +59639,7 @@ mov byte [ref_0048c34a], al  ; mov byte [0x48c34a], al
 call fcn_0042d299  ; call 0x42d299
 push ebp
 push 0x32
-mov ecx, dword [callbackSize]  ; mov ecx, dword [0x46cad8]
+mov ecx, dword [_callbackSize]  ; mov ecx, dword [0x46cad8]
 push ecx
 push edi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -59981,7 +59933,7 @@ loc_0042d847:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_0042d48d  ; je 0x42d48d
 mov eax, dword [esp + 0x7c]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_0042d48d  ; jne 0x42d48d
 cmp dword [ref_0048c318], 1  ; cmp dword [0x48c318], 1
 jne short loc_0042d87e  ; jne 0x42d87e
@@ -60272,7 +60224,7 @@ push edi
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 mov eax, dword [ref_0048c343]  ; mov eax, dword [0x48c343]
 push eax
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_0042dc33:
 add esp, 4
@@ -61182,7 +61134,7 @@ push edi
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 mov esi, dword [ref_0048c343]  ; mov esi, dword [0x48c343]
 push esi
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0042e45e  ; jmp 0x42e45e
 
 loc_0042e8bc:
@@ -61529,7 +61481,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_0042d37f  ; push 0x42d37f
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebp, eax
 call fcn_00454bcc  ; call 0x454bcc
@@ -62525,7 +62477,7 @@ mov byte [ref_0048c372], ch  ; mov byte [0x48c372], ch
 call fcn_0042f32c  ; call 0x42f32c
 push 0
 push 0x64
-mov ecx, dword [callbackSize]  ; mov ecx, dword [0x46cad8]
+mov ecx, dword [_callbackSize]  ; mov ecx, dword [0x46cad8]
 push ecx
 push ebp
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -62664,7 +62616,7 @@ cmp byte [ref_0048c370], 0  ; cmp byte [0x48c370], 0
 je near loc_0042f924  ; je 0x42f924
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_0042f924  ; je 0x42f924
-cmp ebx, dword [callbackSize]  ; cmp ebx, dword [0x46cad8]
+cmp ebx, dword [_callbackSize]  ; cmp ebx, dword [0x46cad8]
 jne near loc_0042f924  ; jne 0x42f924
 xor eax, eax
 mov al, byte [ref_0048c372]  ; mov al, byte [0x48c372]
@@ -62732,7 +62684,7 @@ push eax
 push ebp
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0042fa9b  ; jmp 0x42fa9b
 
 loc_0042fb2a:
@@ -63250,7 +63202,7 @@ mov dword [ref_0048c377], ecx  ; mov dword [0x48c377], ecx
 call fcn_0042f6c3  ; call 0x42f6c3
 push ebx
 push 0x32
-mov ebp, dword [callbackSize]  ; mov ebp, dword [0x46cad8]
+mov ebp, dword [_callbackSize]  ; mov ebp, dword [0x46cad8]
 push ebp
 push esi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -63292,7 +63244,7 @@ je short loc_004301db  ; je 0x4301db
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_004301db  ; je 0x4301db
 mov eax, dword [esp + 0xa0]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne short loc_004301db  ; jne 0x4301db
 push 0
 call fcn_0044ee18  ; call 0x44ee18
@@ -63978,7 +63930,7 @@ add esp, 0xc
 
 loc_00430afb:
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_00430249  ; jmp 0x430249
 
 loc_00430b07:
@@ -64854,7 +64806,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_0042f7fc  ; push 0x42f7fc
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 mov ebp, dword [ref_0048c35c]  ; mov ebp, dword [0x48c35c]
@@ -64979,7 +64931,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_0043010c  ; push 0x43010c
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 mov edi, dword [ref_0048c360]  ; mov edi, dword [0x48c360]
@@ -66259,7 +66211,7 @@ mov byte [ref_0048c3a5], al  ; mov byte [0x48c3a5], al
 call fcn_00432511  ; call 0x432511
 push 0
 push 0x64
-mov ecx, dword [callbackSize]  ; mov ecx, dword [0x46cad8]
+mov ecx, dword [_callbackSize]  ; mov ecx, dword [0x46cad8]
 push ecx
 push ebx
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -66302,7 +66254,7 @@ loc_004326e5:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_004326ad  ; je 0x4326ad
 mov eax, dword [esp + 0x78]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne short loc_004326ad  ; jne 0x4326ad
 cmp byte [ref_0048c3a2], 4  ; cmp byte [0x48c3a2], 4
 jne near loc_00432828  ; jne 0x432828
@@ -66570,7 +66522,7 @@ xor eax, eax
 mov al, byte [ref_0048c3a1]  ; mov al, byte [0x48c3a1]
 dec eax
 push eax
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0043286e  ; jmp 0x43286e
 
 loc_00432a85:
@@ -67084,7 +67036,7 @@ mov byte [ref_0048c3af], dh  ; mov byte [0x48c3af], dh
 call fcn_00432511  ; call 0x432511
 push 0
 push 0x64
-mov ecx, dword [callbackSize]  ; mov ecx, dword [0x46cad8]
+mov ecx, dword [_callbackSize]  ; mov ecx, dword [0x46cad8]
 push ecx
 push ebp
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -67119,7 +67071,7 @@ loc_00433196:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_0043316d  ; je 0x43316d
 mov eax, dword [esp + 0x74]
-mov ebx, dword [callbackSize]  ; mov ebx, dword [0x46cad8]
+mov ebx, dword [_callbackSize]  ; mov ebx, dword [0x46cad8]
 cmp eax, ebx
 jne short loc_0043316d  ; jne 0x43316d
 xor eax, ebx
@@ -67203,7 +67155,7 @@ mov al, byte [ref_0048c3ae]  ; mov al, byte [0x48c3ae]
 mov al, byte [eax + ref_004757e3]  ; mov al, byte [eax + 0x4757e3]
 and eax, 0xff
 push eax
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_004332c9:
 add esp, 4
@@ -67564,7 +67516,7 @@ push ebx
 push ebp
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp short loc_0043375b  ; jmp 0x43375b
 
 loc_0043379e:
@@ -67656,7 +67608,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_004325c2  ; push 0x4325c2
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov esi, eax
 call fcn_00454bcc  ; call 0x454bcc
@@ -67899,7 +67851,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push ebp
 push fcn_00433088  ; push 0x433088
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 mov ebx, eax
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
@@ -68712,7 +68664,7 @@ mov byte [ref_0048c3cf], ah  ; mov byte [0x48c3cf], ah
 mov byte [ref_0048c3d0], ah  ; mov byte [0x48c3d0], ah
 push 0
 push 0x64
-mov eax, dword [callbackSize]  ; mov eax, dword [0x46cad8]
+mov eax, dword [_callbackSize]  ; mov eax, dword [0x46cad8]
 push eax
 push edi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -68885,7 +68837,7 @@ je near loc_00434641  ; je 0x434641
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_00434641  ; je 0x434641
 mov eax, dword [esp + 0x70]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_00434641  ; jne 0x434641
 push 0
 call fcn_0044ee18  ; call 0x44ee18
@@ -69027,7 +68979,7 @@ call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 xor eax, eax
 mov al, byte [ref_0048c3d0]  ; mov al, byte [0x48c3d0]
 push eax
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0043479f  ; jmp 0x43479f
 
 loc_0043493a:
@@ -69686,7 +69638,7 @@ call fcn_00434186  ; call 0x434186
 add esp, 4
 push ebp
 push 0x32
-mov eax, dword [callbackSize]  ; mov eax, dword [0x46cad8]
+mov eax, dword [_callbackSize]  ; mov eax, dword [0x46cad8]
 push eax
 push esi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -69933,7 +69885,7 @@ je near loc_0043518a  ; je 0x43518a
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_0043518a  ; je 0x43518a
 mov eax, dword [esp + 0xf0]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_0043518a  ; jne 0x43518a
 mov ebp, dword [ref_0048c3d9]  ; mov ebp, dword [0x48c3d9]
 test ebp, ebp
@@ -70201,7 +70153,7 @@ push ebp
 push esi
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_0043588e:
 add esp, 4
@@ -70591,7 +70543,7 @@ call fcn_00402460  ; call 0x402460
 add esp, 4
 push 0
 push fcn_00434492  ; push 0x434492
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov byte [ref_0048c3e2], al  ; mov byte [0x48c3e2], al
 test al, al
@@ -70823,7 +70775,7 @@ push eax
 call dword [edx + 0x80]  ; ucall
 push 0
 push 0x32
-mov edx, dword [callbackSize]  ; mov edx, dword [0x46cad8]
+mov edx, dword [_callbackSize]  ; mov edx, dword [0x46cad8]
 push edx
 push esi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -70874,7 +70826,7 @@ je short loc_00436162  ; je 0x436162
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_00436162  ; je 0x436162
 mov eax, dword [esp + 0x100]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_00436162  ; jne 0x436162
 push 0
 call fcn_0044ee18  ; call 0x44ee18
@@ -70912,7 +70864,7 @@ push ebx
 push esi
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_00436245:
 add esp, 4
@@ -71294,7 +71246,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push ebx
 push fcn_00435062  ; push 0x435062
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 mov ebx, dword [ref_0048c3c0]  ; mov ebx, dword [0x48c3c0]
@@ -71480,7 +71432,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_00436034  ; push 0x436034
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 push 1
 call fcn_0041906a  ; call 0x41906a
@@ -71895,7 +71847,7 @@ mov dword [esp + 0xc], 0xec
 push 0
 lea eax, [esp + 4]
 push eax
-mov edx, dword [gWindowHandle]  ; mov edx, dword [0x48a0d4]
+mov edx, dword [_gWindowHandle]  ; mov edx, dword [0x48a0d4]
 push edx
 call dword [cs:__imp__InvalidateRect@12]  ; ucall: call dword cs:[0x4622f8]
 
@@ -72597,7 +72549,7 @@ add esp, 0xc
 
 loc_00437774:
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_004378f4  ; jmp 0x4378f4
 
 loc_00437780:
@@ -72743,7 +72695,7 @@ push 0x29
 call fcn_004021f8  ; call 0x4021f8
 add esp, 0xc
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_004373e3  ; jmp 0x4373e3
 
 loc_00437942:
@@ -72842,7 +72794,7 @@ add esp, 4
 loc_00437a6f:
 push 0
 push fcn_00436ef8  ; push 0x436ef8
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 test ebx, ebx
 je short loc_00437aa3  ; je 0x437aa3
@@ -73240,7 +73192,7 @@ mov byte [ref_0048c42d], dh  ; mov byte [0x48c42d], dh
 mov byte [ref_0048c42e], dh  ; mov byte [0x48c42e], dh
 push 0
 push 0x64
-mov edx, dword [callbackSize]  ; mov edx, dword [0x46cad8]
+mov edx, dword [_callbackSize]  ; mov edx, dword [0x46cad8]
 push edx
 push esi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -73281,7 +73233,7 @@ je short loc_00437f23  ; je 0x437f23
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_00437f23  ; je 0x437f23
 mov eax, dword [esp + 0xec]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne short loc_00437f23  ; jne 0x437f23
 push 0
 call fcn_0044ee18  ; call 0x44ee18
@@ -74639,7 +74591,7 @@ push ebp
 push esi
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_00439193:
 add esp, 4
@@ -75601,7 +75553,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_00437e61  ; push 0x437e61
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 mov edi, dword [ref_0048c41c]  ; mov edi, dword [0x48c41c]
@@ -76019,7 +75971,7 @@ mov dword [ref_0048c4a4], ecx  ; mov dword [0x48c4a4], ecx
 mov dword [ref_0048c4a8], 0xffffffff  ; mov dword [0x48c4a8], 0xffffffff
 push ecx
 push 0x64
-mov esi, dword [callbackSize]  ; mov esi, dword [0x46cad8]
+mov esi, dword [_callbackSize]  ; mov esi, dword [0x46cad8]
 push esi
 push ebp
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -76272,7 +76224,7 @@ cmp byte [ref_0048c4ac], 0  ; cmp byte [0x48c4ac], 0
 je near loc_0043a3d7  ; je 0x43a3d7
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_0043a3d7  ; je 0x43a3d7
-cmp ebx, dword [callbackSize]  ; cmp ebx, dword [0x46cad8]
+cmp ebx, dword [_callbackSize]  ; cmp ebx, dword [0x46cad8]
 jne near loc_0043a3d7  ; jne 0x43a3d7
 test byte [ref_0048c4a5], 0xff  ; test byte [0x48c4a5], 0xff
 je near loc_0043ab5a  ; je 0x43ab5a
@@ -77413,7 +77365,7 @@ push ebp
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 mov ecx, dword [ref_0048c4a8]  ; mov ecx, dword [0x48c4a8]
 push ecx
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_0043b5da:
 add esp, 4
@@ -78698,7 +78650,7 @@ mov dword [esp + 0x84], eax
 loc_0043c6db:
 push edi
 push fcn_0043a2dd  ; push 0x43a2dd
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov dword [esp + 0x8c], eax
 cmp dword [esp + 0xb4], 0
@@ -79067,7 +79019,7 @@ mov byte [ref_0048c4c8], ah  ; mov byte [0x48c4c8], ah
 mov byte [ref_0048c4c9], ah  ; mov byte [0x48c4c9], ah
 push 0
 push 0x64
-mov ecx, dword [callbackSize]  ; mov ecx, dword [0x46cad8]
+mov ecx, dword [_callbackSize]  ; mov ecx, dword [0x46cad8]
 push ecx
 push edi
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -79092,7 +79044,7 @@ je near loc_0043cbe9  ; je 0x43cbe9
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je near loc_0043cbe9  ; je 0x43cbe9
 mov eax, dword [esp + 0x98]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne near loc_0043cbe9  ; jne 0x43cbe9
 xor dl, dl
 mov byte [ref_0048c4c8], dl  ; mov byte [0x48c4c8], dl
@@ -79629,7 +79581,7 @@ push 1
 call fcn_0044ee18  ; call 0x44ee18
 add esp, 4
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0043cf06  ; jmp 0x43cf06
 
 loc_0043d295:
@@ -79726,7 +79678,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_0043caab  ; push 0x43caab
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 mov edi, dword [ref_0048c4b4]  ; mov edi, dword [0x48c4b4]
@@ -80343,7 +80295,7 @@ mov byte [ref_0048c4f4], dh  ; mov byte [0x48c4f4], dh
 mov byte [ref_0048c4f6], dh  ; mov byte [0x48c4f6], dh
 push 0
 push 0x64
-mov ecx, dword [callbackSize]  ; mov ecx, dword [0x46cad8]
+mov ecx, dword [_callbackSize]  ; mov ecx, dword [0x46cad8]
 push ecx
 push ebp
 call dword [cs:__imp__SetTimer@16]  ; ucall: call dword cs:[0x462324]
@@ -80401,7 +80353,7 @@ je short loc_0043db35  ; je 0x43db35
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_0043db35  ; je 0x43db35
 mov eax, dword [esp + 0x94]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne short loc_0043db35  ; jne 0x43db35
 push 0
 call fcn_0044ee18  ; call 0x44ee18
@@ -80712,7 +80664,7 @@ push ebx
 push ebp
 call dword [cs:__imp__KillTimer@8]  ; ucall: call dword cs:[0x4622fc]
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 
 loc_0043df8b:
@@ -81592,7 +81544,7 @@ call fcn_004549cf  ; call 0x4549cf
 add esp, 4
 push 0
 push fcn_0043da27  ; push 0x43da27
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 call fcn_00454bcc  ; call 0x454bcc
 mov edi, dword [ref_0048c4d4]  ; mov edi, dword [0x48c4d4]
@@ -83255,7 +83207,7 @@ dec eax
 push eax
 
 loc_0043feae:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_0043fd7e  ; jmp 0x43fd7e
 
@@ -83547,7 +83499,7 @@ mov ebx, dword [ref_0048c52c]  ; mov ebx, dword [0x48c52c]
 push ebx
 
 loc_00440248:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_0043fd7e  ; jmp 0x43fd7e
 
@@ -83851,7 +83803,7 @@ mov esi, dword [ref_0048c530]  ; mov esi, dword [0x48c530]
 push esi
 
 loc_0044065c:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 
 loc_00440661:
 add esp, 4
@@ -84258,7 +84210,7 @@ call dword [eax + 0x80]  ; ucall
 mov eax, dword [esp + 0x20]
 push eax
 push fcn_0043fae4  ; push 0x43fae4
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 mov ebx, eax
 add esp, 8
 push 0x28
@@ -84614,7 +84566,7 @@ push eax
 call dword [edx + 0x80]  ; ucall
 push 0
 push fcn_0043ff56  ; push 0x43ff56
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov esi, eax
 cmp eax, 0xffffffff
@@ -84778,7 +84730,7 @@ xor eax, eax
 mov al, byte [edi + 0x1a]
 push eax
 push fcn_004402d7  ; push 0x4402d7
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebx, eax
 push 0x28
@@ -85250,7 +85202,7 @@ mov esi, dword [ref_0048c538]  ; mov esi, dword [0x48c538]
 push esi
 
 loc_00441664:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00441579  ; jmp 0x441579
 
@@ -85446,7 +85398,7 @@ mov ebx, dword [ref_0048c544]  ; mov ebx, dword [0x48c544]
 push ebx
 
 loc_004418ac:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00441579  ; jmp 0x441579
 
@@ -85572,7 +85524,7 @@ shl eax, 0x10
 or eax, edi
 push eax
 push fcn_004413ec  ; push 0x4413ec
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebx, eax
 push 0x28
@@ -85783,7 +85735,7 @@ push eax
 call dword [edx + 0x80]  ; ucall
 push 0
 push fcn_004416f0  ; push 0x4416f0
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 mov ebx, eax
 add esp, 8
 push 0x8028
@@ -91561,7 +91513,7 @@ mov ebx, dword [ref_0048c560]  ; mov ebx, dword [0x48c560]
 push ebx
 
 loc_00445da3:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp short loc_00445d7d  ; jmp 0x445d7d
 
@@ -91733,7 +91685,7 @@ loc_00445f88:
 cmp byte [ref_0046cb01], 0  ; cmp byte [0x46cb01], 0
 je short loc_00445f7e  ; je 0x445f7e
 mov eax, dword [esp + 0x64]
-cmp eax, dword [callbackSize]  ; cmp eax, dword [0x46cad8]
+cmp eax, dword [_callbackSize]  ; cmp eax, dword [0x46cad8]
 jne short loc_00445f7e  ; jne 0x445f7e
 mov edi, dword [ref_0048c56c]  ; mov edi, dword [0x48c56c]
 cmp edi, 0x40
@@ -91875,7 +91827,7 @@ add esp, 0xc
 loc_0044618d:
 push 0
 push 0x32
-mov edx, dword [callbackSize]  ; mov edx, dword [0x46cad8]
+mov edx, dword [_callbackSize]  ; mov edx, dword [0x46cad8]
 push edx
 mov ecx, dword [esp + 0x68]
 push ecx
@@ -92253,7 +92205,7 @@ mov ebp, dword [ref_0048c584]  ; mov ebp, dword [0x48c584]
 push ebp
 
 loc_00446698:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00445f7e  ; jmp 0x445f7e
 
@@ -92566,7 +92518,7 @@ mov ebx, dword [ref_0048c598]  ; mov ebx, dword [0x48c598]
 push ebx
 
 loc_00446a59:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00445d7d  ; jmp 0x445d7d
 
@@ -92625,7 +92577,7 @@ fcn_00446ae8:
 mov edx, dword [esp + 4]
 push edx
 push fcn_00445e4d  ; push 0x445e4d
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 ret
 
@@ -93190,7 +93142,7 @@ push eax
 call dword [edx + 0x80]  ; ucall
 push 0
 push fcn_00446774  ; push 0x446774
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebx, eax
 mov dword [esp], 0x5c
@@ -94349,7 +94301,7 @@ push eax
 call dword [edx + 0x80]  ; ucall
 push 0
 push tools_ui_callback  ; push 0x445c14
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 mov esi, eax
 add esp, 8
 mov eax, dword [ref_0048a0e0]  ; mov eax, dword [0x48a0e0]
@@ -103104,7 +103056,7 @@ push ebp
 call fcn_00451edb  ; call 0x451edb
 add esp, 0xc
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 
 loc_0044e586:
@@ -103651,7 +103603,7 @@ and edx, 0xffff
 or eax, edx
 push eax
 push fcn_0044e40b  ; push 0x44e40b
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebp, dword [ref_0048c5f8]  ; mov ebp, dword [0x48c5f8]
 push ebp
@@ -107825,7 +107777,7 @@ je short loc_00451632  ; je 0x451632
 xor bl, bl
 mov byte [ref_0046cb02], bl  ; mov byte [0x46cb02], bl
 push 1
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp short loc_00451632  ; jmp 0x451632
 
@@ -107890,7 +107842,7 @@ loc_00451701:
 mov ebx, dword [esp + 0x5c]
 push ebx
 push fcn_0045156f  ; push 0x45156f
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 mov ebx, eax
 add esp, 8
 push 0
@@ -107915,7 +107867,7 @@ fcn_0045174a:
 xor ah, ah
 mov byte [ref_0046cb02], ah  ; mov byte [0x46cb02], ah
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 ret
 
@@ -109862,7 +109814,7 @@ mov dword [esp + 0xc], eax
 push 0
 lea eax, [esp + 4]
 push eax
-mov edx, dword [gWindowHandle]  ; mov edx, dword [0x48a0d4]
+mov edx, dword [_gWindowHandle]  ; mov edx, dword [0x48a0d4]
 push edx
 call dword [cs:__imp__InvalidateRect@12]  ; ucall: call dword cs:[0x4622f8]
 
@@ -110374,7 +110326,7 @@ push 0x29
 call fcn_004021f8  ; call 0x4021f8
 add esp, 0xc
 push ebx
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp short loc_00453107  ; jmp 0x453107
 
 loc_00453145:
@@ -110648,7 +110600,7 @@ push 0x29
 call fcn_004021f8  ; call 0x4021f8
 add esp, 0xc
 push 0
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 jmp near loc_0045342f  ; jmp 0x45342f
 
 loc_004534d6:
@@ -110746,7 +110698,7 @@ mov eax, dword [esp + 0x24]
 mov dword [ref_0048ca98], eax  ; mov dword [0x48ca98], eax
 push 0
 push fcn_00452c02  ; push 0x452c02
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov ebx, eax
 movsx eax, word [ref_0048cab6]  ; movsx eax, word [0x48cab6]
@@ -111061,7 +111013,7 @@ add esp, 4
 push 0
 
 loc_004539bd:
-call Post_0402_Message  ; call 0x401966
+call _Post_0402_Message  ; call 0x401966
 add esp, 4
 jmp near loc_00453739  ; jmp 0x453739
 
@@ -111175,7 +111127,7 @@ push eax
 call dword [edx + 0x80]  ; ucall
 push 0
 push fcn_0045367e  ; push 0x45367e
-call Wait_0402_Message  ; call 0x4018e7
+call _Wait_0402_Message  ; call 0x4018e7
 add esp, 8
 mov esi, eax
 mov eax, dword [ref_0048cac8]  ; mov eax, dword [0x48cac8]
@@ -111238,7 +111190,7 @@ loc_00453bad:
 mov eax, dword [ref_0047e748]  ; mov eax, dword [0x47e748]
 mov edx, dword [eax]
 push 3
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
+mov ecx, dword [_gWindowHandle]  ; mov ecx, dword [0x48a0d4]
 push ecx
 push eax
 call dword [edx + 0x18]  ; ucall
@@ -112679,7 +112631,7 @@ jne short loc_00454ab8  ; jne 0x454ab8
 loc_00454a93:
 test edi, edi
 je short loc_00454ab8  ; je 0x454ab8
-mov eax, dword [gWindowHandle]  ; mov eax, dword [0x48a0d4]
+mov eax, dword [_gWindowHandle]  ; mov eax, dword [0x48a0d4]
 push eax
 push 0
 push 0
@@ -112858,7 +112810,7 @@ lea eax, [esp + 8]
 push eax
 call fcn_00457110  ; call 0x457110
 add esp, 0xc
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
+mov ecx, dword [_gWindowHandle]  ; mov ecx, dword [0x48a0d4]
 push ecx
 push 0
 push 0
@@ -112871,7 +112823,7 @@ mov byte [ref_0046cb03], 1  ; mov byte [0x46cb03], 1
 jmp short loc_00454d1e  ; jmp 0x454d1e
 
 loc_00454cd9:
-mov edx, dword [gWindowHandle]  ; mov edx, dword [0x48a0d4]
+mov edx, dword [_gWindowHandle]  ; mov edx, dword [0x48a0d4]
 push edx
 push ebx
 push ebx
@@ -112919,7 +112871,7 @@ pop ebx
 ret
 
 loc_00454d4b:
-mov ebx, dword [gWindowHandle]  ; mov ebx, dword [0x48a0d4]
+mov ebx, dword [_gWindowHandle]  ; mov ebx, dword [0x48a0d4]
 push ebx
 push 0
 push 0
@@ -112929,7 +112881,7 @@ jmp short loc_00454d88  ; jmp 0x454d88
 loc_00454d5d:
 test byte [ref_0047e772], 0x80  ; test byte [0x47e772], 0x80
 je short loc_00454d78  ; je 0x454d78
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
+mov ecx, dword [_gWindowHandle]  ; mov ecx, dword [0x48a0d4]
 push ecx
 push 0
 push 0
@@ -112937,7 +112889,7 @@ push ref_0046655f  ; push 0x46655f
 jmp short loc_00454d88  ; jmp 0x454d88
 
 loc_00454d78:
-mov edx, dword [gWindowHandle]  ; mov edx, dword [0x48a0d4]
+mov edx, dword [_gWindowHandle]  ; mov edx, dword [0x48a0d4]
 push edx
 push 0
 push 0
@@ -113015,7 +112967,7 @@ jne short loc_00454ec8  ; jne 0x454ec8
 loc_00454e5c:
 test ebx, ebx
 je short loc_00454ec8  ; je 0x454ec8
-mov ebp, dword [gWindowHandle]  ; mov ebp, dword [0x48a0d4]
+mov ebp, dword [_gWindowHandle]  ; mov ebp, dword [0x48a0d4]
 push ebp
 push 0
 push 0
@@ -113037,7 +112989,7 @@ lea eax, [esp + 8]
 push eax
 call fcn_00457110  ; call 0x457110
 add esp, 0xc
-mov ecx, dword [gWindowHandle]  ; mov ecx, dword [0x48a0d4]
+mov ecx, dword [_gWindowHandle]  ; mov ecx, dword [0x48a0d4]
 push ecx
 push 0
 push 0
@@ -144181,9 +144133,6 @@ dd 0x00000000
 ref_0046cad4:
 dd 0x7ff00000
 
-callbackSize:
-dd 0x00000000
-
 ref_0046cadc:
 dd 0x00000000
 
@@ -173515,9 +173464,6 @@ section .bss
 ref_0048a000:
 resb 16
 
-windowCallbacks:
-resb 64
-
 ref_0048a050:
 resb 4
 
@@ -173557,7 +173503,7 @@ resb 68
 ref_0048a0d0:
 resb 4
 
-gWindowHandle:
+_gWindowHandle:
 resb 4
 
 ref_0048a0d8:
diff --git a/csrc/window_util.c b/asm/window_util.c
index 41c857a..fadc86a 100644
--- a/csrc/window_util.c
+++ b/asm/window_util.c
@@ -5,22 +5,22 @@
 
 #include "window_util.h"
 
-wProc windowCallbacks[100]; // 48a010
-int cb_top = 0; // 0x46cad8
+wProc windowCallbacks[16]; // 48a010
+int callbackSize = 0; // 0x46cad8
 
-extern HWND gwindowHandle;
+extern HWND gWindowHandle;
 
-int register_wait_callback(wProc a1, int a2)
+int Wait_0402_Message(wProc cb, int a2)
 {
-	cb_top++;
-	windowCallbacks[cb_top] = a1;
-	PostMessageA(gwindowHandle, 0x401, 0, a2);
+	callbackSize++;
+	windowCallbacks[callbackSize] = cb;
+	PostMessageA(gWindowHandle, 0x401, 0, a2);
 	while (1) {
 		MSG msg;
 		if (PeekMessageA(&msg, 0, 0, 0, 1) == 0)
 			continue;
 		if (msg.message == 0x402) {
-			cb_top--;
+			callbackSize--;
 			return msg.lParam;
 		}
 		TranslateMessage(&msg);
@@ -30,5 +30,5 @@ int register_wait_callback(wProc a1, int a2)
 
 void Post_0402_Message(LPARAM lp)
 {
-	PostMessageA(gwindowHandle, 0x402, 0, lp);
+	PostMessageA(gWindowHandle, 0x402, 0, lp);
 }
diff --git a/csrc/window_util.h b/asm/window_util.h
index af4dbd9..b3c6cae 100644
--- a/csrc/window_util.h
+++ b/asm/window_util.h
@@ -5,10 +5,10 @@
 
 #include <windows.h>
 
-extern int cb_top;
-
 typedef LRESULT (CALLBACK *wProc)(HWND, UINT, WPARAM, LPARAM);
-extern wProc windowCallbacks[100]; // 48a010
 
-int register_wait_callback(wProc a1, int a2);
+extern wProc windowCallbacks[];
+extern int callbackSize;
+
+int Wait_0402_Message(wProc, int);
 void Post_0402_Message(LPARAM lp);