diff --git a/src/DETHRACE/common/car.c b/src/DETHRACE/common/car.c index 58e6896b..49340788 100644 --- a/src/DETHRACE/common/car.c +++ b/src/DETHRACE/common/car.c @@ -65,6 +65,7 @@ br_angle gOld_yaw__car = 0; // suffix added to avoid duplicate symbol br_angle gOld_zoom = 0; // GLOBAL: CARM95 0x514cf8 br_vector3 gCamera_pos_before_collide = { { 0 } }; +// GLOBAL: CARM95 0x514d08 int gMetal_crunch_sound_id__car[5] = { // suffix added to avoid duplicate symbol 5000, diff --git a/src/DETHRACE/common/drmem.c b/src/DETHRACE/common/drmem.c index 6f900d1d..be3f9dca 100644 --- a/src/DETHRACE/common/drmem.c +++ b/src/DETHRACE/common/drmem.c @@ -9,6 +9,7 @@ br_allocator gAllocator = { "Death Race", DRStdlibAllocate, DRStdlibFree, DRStdl // GLOBAL: CARM95 0x513614 int gNon_fatal_allocation_errors = 0; // Is 247 in DOS executable, last entry NULL +// GLOBAL: CARM95 0x513618 char* gMem_names[246] = { "", "BR_MEMORY_SCRATCH", diff --git a/src/DETHRACE/common/flicplay.c b/src/DETHRACE/common/flicplay.c index 6c9ca0da..719fdfd1 100644 --- a/src/DETHRACE/common/flicplay.c +++ b/src/DETHRACE/common/flicplay.c @@ -377,6 +377,7 @@ tFlic_spec gMain_flic_list[372] = { { "MAI2OPFL.FLI", 0, 0, 0, 0, 0, 0, NULL, 0u }, { "MAI2OPGL.FLI", 0, 0, 0, 0, 0, 0, NULL, 0u } }; +// GLOBAL: CARM95 0x518420 int gFlic_bunch0[29] = { 10, 11, @@ -408,6 +409,7 @@ int gFlic_bunch0[29] = { 135, 45 }; +// GLOBAL: CARM95 0x518498 int gFlic_bunch1[31] = { 140, 141, @@ -441,8 +443,11 @@ int gFlic_bunch1[31] = { 43, 154 }; +// GLOBAL: CARM95 0x518518 int gFlic_bunch2[8] = { 70, 71, 72, 73, 74, 56, 57, 59 }; +// GLOBAL: CARM95 0x518538 int gFlic_bunch3[13] = { 40, 41, 42, 43, 44, 45, 50, 51, 73, 74, 56, 57, 59 }; +// GLOBAL: CARM95 0x518570 int gFlic_bunch4[22] = { 80, 81, @@ -467,7 +472,9 @@ int gFlic_bunch4[22] = { 120, 121 }; +// GLOBAL: CARM95 0x5185c8 int gFlic_bunch5[5] = { 100, 101, 42, 43, 45 }; +// GLOBAL: CARM95 0x5185e0 int gFlic_bunch6[51] = { 190, 191, @@ -521,8 +528,11 @@ int gFlic_bunch6[51] = { 43, 284 }; +// GLOBAL: CARM95 0x5186b0 int gFlic_bunch7[7] = { 130, 131, 132, 42, 43, 135, 45 }; +// GLOBAL: CARM95 0x5186d0 int gFlic_bunch8[16] = { 290, 291, 292, 293, 294, 295, 296, 297, 42, 43, 154, 301, 42, 43, 304, 305 }; +// GLOBAL: CARM95 0x518710 tFlic_bunch gFlic_bunch[9] = { { COUNT_OF(gFlic_bunch0), gFlic_bunch0 }, { COUNT_OF(gFlic_bunch1), gFlic_bunch1 }, diff --git a/src/DETHRACE/common/graphics.c b/src/DETHRACE/common/graphics.c index 4d2dc40c..7a796a43 100644 --- a/src/DETHRACE/common/graphics.c +++ b/src/DETHRACE/common/graphics.c @@ -44,6 +44,7 @@ int gPalette_munged; int gColourValues[1]; // GLOBAL: CARM95 0x520048 int gNext_transient; +// GLOBAL: CARM95 0x520050 int gCursor_x_offsets[8] = { 6, 8, @@ -54,6 +55,7 @@ int gCursor_x_offsets[8] = { 16, 36, }; +// GLOBAL: CARM95 0x520070 int gCursor_y_offsets[8] = { 26, 19, @@ -86,6 +88,7 @@ int gCursor_gib_y_offsets[8] = { 93, 106, }; +// GLOBAL: CARM95 0x5200d0 int gCursor_giblet_sequence0[7] = { 6, 0, @@ -95,6 +98,7 @@ int gCursor_giblet_sequence0[7] = { 4, 5, }; +// GLOBAL: CARM95 0x5200f0 int gCursor_giblet_sequence1[5] = { 4, 6, @@ -102,6 +106,7 @@ int gCursor_giblet_sequence1[5] = { 8, 9, }; +// GLOBAL: CARM95 0x520108 int gCursor_giblet_sequence2[5] = { 4, 10, @@ -109,6 +114,7 @@ int gCursor_giblet_sequence2[5] = { 12, 13, }; +// GLOBAL: CARM95 0x520120 int gCursor_giblet_sequence3[5] = { 4, 14, @@ -123,6 +129,7 @@ int* gCursor_giblet_sequences[4] = { gCursor_giblet_sequence2, gCursor_giblet_sequence3, }; +// GLOBAL: CARM95 0x520148 char* gFont_names[21] = { "TYPEABLE", "ORANGHED", diff --git a/src/DETHRACE/common/loading.c b/src/DETHRACE/common/loading.c index aca7db35..944ccacd 100644 --- a/src/DETHRACE/common/loading.c +++ b/src/DETHRACE/common/loading.c @@ -117,6 +117,7 @@ char* gRaces_file_names[] = { "NETRACES.TXT", "NETRACES.TXT" }; +// GLOBAL: CARM95 0x50a5a0 char* gNet_avail_names[] = { "never", "eagle", "hawk", "all" }; // GLOBAL: CARM95 0x50a5b0 char* gFloorpan_names[] = { "GBUNDER.MAT", "BGLUNDER.MAT", "GRIMBOT.MAT", "DDBASE.MAT", "HFUNDER.MAT" }; diff --git a/src/DETHRACE/common/network.c b/src/DETHRACE/common/network.c index 85f91f5c..1e024752 100644 --- a/src/DETHRACE/common/network.c +++ b/src/DETHRACE/common/network.c @@ -39,6 +39,7 @@ int gNet_service_disable = 0; int gIn_net_service = 0; // GLOBAL: CARM95 0x50d230 int gPlayer_list_batch_number = 0; +// GLOBAL: CARM95 0x50d234 int gOnly_receive_guarantee_replies = 0; // GLOBAL: CARM95 0x50d238 void* gMessage_to_free; @@ -75,6 +76,7 @@ tMax_message* gMax_messages; int gNext_guarantee; // GLOBAL: CARM95 0x534c84 tU32 gAsk_time; +// GLOBAL: CARM95 0x551420 int gNet_initialised; // GLOBAL: CARM95 0x534c60 int gDont_allow_joiners; @@ -104,6 +106,7 @@ int gReceived_game_scores; #define MAX_MESAGE_STACK_SIZE 512 // IDA: int __cdecl NetInitialise() +// FUNCTION: CARM95 0x4463c0 int NetInitialise(void) { int i; LOG_TRACE("()"); @@ -249,6 +252,7 @@ void NetSendHeadupToPlayer(char* pMessage, tPlayer_ID pPlayer) { } // IDA: void __cdecl InitialisePlayerStati() +// FUNCTION: CARM95 0x44754e void InitialisePlayerStati(void) { int i; LOG_TRACE("()"); @@ -963,6 +967,7 @@ tU32 NetGetContentsSize(tNet_message_type pType, tS32 pSize_decider) { } // IDA: tU32 __usercall NetGetMessageSize@(tNet_message_type pType@, tS32 pSize_decider@) +// FUNCTION: CARM95 0x447dd9 tU32 NetGetMessageSize(tNet_message_type pType, tS32 pSize_decider) { LOG_TRACE("(%d, %d)", pType, pSize_decider); @@ -1162,6 +1167,7 @@ int NetDisposeMessage(tNet_game_details* pDetails, tNet_message* pMessage) { } // IDA: tNet_message* __usercall NetGetNextMessage@(tNet_game_details *pDetails@, void **pSender_address@) +// FUNCTION: CARM95 0x448475 tNet_message* NetGetNextMessage(tNet_game_details* pDetails, void** pSender_address) { LOG_TRACE("(%p, %p)", pDetails, pSender_address); diff --git a/src/DETHRACE/common/newgame.c b/src/DETHRACE/common/newgame.c index b1186940..86543cba 100644 --- a/src/DETHRACE/common/newgame.c +++ b/src/DETHRACE/common/newgame.c @@ -49,6 +49,7 @@ tRadio_bastards gRadio_bastards__newgame[11] = { // suffix added to avoid duplic // clang-format on char _name1[] = "xxxxxxxx.TXT"; // keep compiler happy char _name2[] = "yyyyyyyy.TXT"; // keep compiler happy +// GLOBAL: CARM95 0x51ea80 char* gBasic_car_names[2] = { _name1, _name2 }; tNet_game_options gNet_settings[8]; tJoinable_game gGames_to_join[6]; diff --git a/src/DETHRACE/common/pedestrn.c b/src/DETHRACE/common/pedestrn.c index b5353247..2bff6d9d 100644 --- a/src/DETHRACE/common/pedestrn.c +++ b/src/DETHRACE/common/pedestrn.c @@ -69,6 +69,7 @@ char* gInstruc_commands[10] = { "faction", "reverse" }; +// GLOBAL: CARM95 0x511798 float gMin_ped_gib_speeds[4] = { 10000.f, .005f, .002f, .001f }; float gPed_gib_distrib[4] = { 0.f, 0.33f, 0.34f, 0.33f }; float gPed_gib_speeds[4] = { 0.f, 1.f, 1.f, 1.f }; @@ -94,6 +95,7 @@ int gPed_gib_maxes[4][5] = { { 3, 3, 2, 3, 3 }, { 3, 3, 3, 3, 3 }, }; +// GLOBAL: CARM95 0x5118c8 br_scalar gExploding_ped_scale[3] = { 0.0028f, 0.0033f, 0.0045f }; // GLOBAL: CARM95 0x5118d8 br_vector3 gZero_v__pedestrn; // suffix added to avoid duplicate symbol @@ -143,6 +145,7 @@ br_material* gPath_mat_normal; // GLOBAL: CARM95 0x536b1c br_material* gInit_pos_mat_calc; int gPed_other; +// GLOBAL: CARM95 0x550a98 int gAttracted_pedestrians; // GLOBAL: CARM95 0x536aac int gPed_ref_num; diff --git a/src/DETHRACE/common/racestrt.c b/src/DETHRACE/common/racestrt.c index 4c429088..0a079b7f 100644 --- a/src/DETHRACE/common/racestrt.c +++ b/src/DETHRACE/common/racestrt.c @@ -26,6 +26,7 @@ #include "world.h" #include +// GLOBAL: CARM95 0x50f198 int gGrid_number_colour[4] = { 49u, 201u, 1u, 201u }; // GLOBAL: CARM95 0x50f1a8 int gJust_bought_part; diff --git a/src/DETHRACE/common/replay.c b/src/DETHRACE/common/replay.c index e5f688d5..1eb2136b 100644 --- a/src/DETHRACE/common/replay.c +++ b/src/DETHRACE/common/replay.c @@ -27,6 +27,7 @@ #include #include +// GLOBAL: CARM95 0x50a1b0 char* gReplay_pixie_names[10] = { "REPLAY.PIX", "RBUTTONS.PIX",