diff --git a/code__80005FD0_8c.html b/code__80005FD0_8c.html index 7a2e23a1d..7598374e8 100644 --- a/code__80005FD0_8c.html +++ b/code__80005FD0_8c.html @@ -626,8 +626,8 @@ Variables   s32 D_8016359C   -TrainStuff gTrains [NUM_TRAINS] -  +TrainStuff gTrainList [NUM_TRAINS] +  u16 isCrossingTriggeredByIndex [2]   u16 D_801637BC [2] @@ -11814,14 +11814,14 @@ Here is the caller graph for this function: - -

◆ gTrains

+ +

◆ gTrainList

- +
TrainStuff gTrains[NUM_TRAINS]TrainStuff gTrainList[NUM_TRAINS]
diff --git a/code__80005FD0_8c.js b/code__80005FD0_8c.js index 4113908a6..ee223868e 100644 --- a/code__80005FD0_8c.js +++ b/code__80005FD0_8c.js @@ -505,7 +505,7 @@ var code__80005FD0_8c = [ "gPathIndexByPlayerId", "code__80005FD0_8c.html#a0b26bdf729078d93a000712adc0d1b13", null ], [ "gSchoolBusList", "code__80005FD0_8c.html#a3d59d1ae4786bf64a71c2a015160e7af", null ], [ "gTankerTruckList", "code__80005FD0_8c.html#af4d9bb3e12dd9902c5992c5c064a0fc7", null ], - [ "gTrains", "code__80005FD0_8c.html#a09249d625e1a367d36fbd2863e006f1d", null ], + [ "gTrainList", "code__80005FD0_8c.html#a2dc210a40d4102b45970958fee517232", null ], [ "gUnexpiredActorsList", "code__80005FD0_8c.html#a84f9a428f9485f5a469a669ee4f0777b", null ], [ "gWaypointCountByPathIndex", "code__80005FD0_8c.html#ab9c90834732ff4f23dce6c23cd508fa3", null ], [ "isCrossingTriggeredByIndex", "code__80005FD0_8c.html#a83af9aa3b6352cd4a408bb0525bf442f", null ], diff --git a/globals_g.html b/globals_g.html index f8c3839f2..95e720d59 100644 --- a/globals_g.html +++ b/globals_g.html @@ -14188,9 +14188,9 @@ $(document).ready(function(){initNavTree('globals_g.html',''); initResizable();
  • gTorchSpawns : objects.h
    • -
  • gTrains -: code_80005FD0.c -, vehicles.h +
  • gTrainList +: code_80005FD0.c +, vehicles.h
  • GU_PI : gu.h diff --git a/globals_vars_g.html b/globals_vars_g.html index 942c9e89a..63f971e10 100644 --- a/globals_vars_g.html +++ b/globals_vars_g.html @@ -12537,9 +12537,9 @@ $(document).ready(function(){initNavTree('globals_vars_g.html',''); initResizabl
  • gTorchSpawns : objects.h
    • -
  • gTrains -: code_80005FD0.c -, vehicles.h +
  • gTrainList +: code_80005FD0.c +, vehicles.h
  • gUnexpiredActorsList : code_80005FD0.c diff --git a/md_tools_doxygen_syms.html b/md_tools_doxygen_syms.html index fbfd42b42..42e8e78e9 100644 --- a/md_tools_doxygen_syms.html +++ b/md_tools_doxygen_syms.html @@ -8578,7 +8578,7 @@ Memory Addresses D_8016359C 0x8016359C -gTrains 0x801635A0 +gTrainList 0x801635A0 isCrossingTriggeredByIndex 0x801637B8 diff --git a/navtreeindex6.js b/navtreeindex6.js index 314426603..38e936bad 100644 --- a/navtreeindex6.js +++ b/navtreeindex6.js @@ -110,7 +110,6 @@ var NAVTREEINDEX6 = "code__80005FD0_8c.html#a08982160b5c1b69681625f490d779d85":[3,0,1,14,498], "code__80005FD0_8c.html#a08be3e527988708ea42520639102572a":[3,0,1,14,238], "code__80005FD0_8c.html#a0912164a77ed58dcae727df888a8a709":[3,0,1,14,232], -"code__80005FD0_8c.html#a09249d625e1a367d36fbd2863e006f1d":[3,0,1,14,505], "code__80005FD0_8c.html#a096cba6f9c8aa3e1aad4faf96050d826":[3,0,1,14,281], "code__80005FD0_8c.html#a09e11c2d2b010ef391c82fa12e4bd5fb":[3,0,1,14,438], "code__80005FD0_8c.html#a0a648b345a39b2070d8f56dc0ed04cb4":[3,0,1,14,109], @@ -179,6 +178,7 @@ var NAVTREEINDEX6 = "code__80005FD0_8c.html#a2c0567e84e5a8472aea76c83eaf693cc":[3,0,1,14,179], "code__80005FD0_8c.html#a2c81aa62d51190f87f67f482191690e9":[3,0,1,14,192], "code__80005FD0_8c.html#a2cc4bcaf3843fae4df442ce5e1cfb135":[3,0,1,14,455], +"code__80005FD0_8c.html#a2dc210a40d4102b45970958fee517232":[3,0,1,14,505], "code__80005FD0_8c.html#a2dc98fb7ac6f1395ff2e423987976509":[3,0,1,14,466], "code__80005FD0_8c.html#a2e9bd3bfe6460c5f84ce6820d25853af":[3,0,1,14,42], "code__80005FD0_8c.html#a325ddded54aab32025174f6aedd5e391":[3,0,1,14,147], diff --git a/navtreeindex86.js b/navtreeindex86.js index d26d63e58..d61ec4326 100644 --- a/navtreeindex86.js +++ b/navtreeindex86.js @@ -149,12 +149,12 @@ var NAVTREEINDEX86 = "vehicles_8h.html#a7bb7f90607adbbc2d74f3b248f820e09":[3,0,0,26,4], "vehicles_8h.html#a7dd94b807c565ffabd9a4650a0a75faa":[3,0,0,26,15], "vehicles_8h.html#a85a7ae4a72ab40a4ff366fb5b1c8f64e":[3,0,0,26,24], -"vehicles_8h.html#a8c4f429aeaf1bd513f784ba2377dbf5a":[3,0,0,26,25], "vehicles_8h.html#a9b5074d95dff86e0f463a4112c92fbd3":[3,0,0,26,21], "vehicles_8h.html#a9fd6b310eb9ff6f0d15d13aca61f9af9":[3,0,0,26,14], "vehicles_8h.html#aa234af45a3a8bb426ef5c9ac20400086":[3,0,0,26,13], "vehicles_8h.html#aadc918ca4fd1d63a595e14e462be8f6a":[3,0,0,26,7], "vehicles_8h.html#abdde9f9274897ca74ed73c8f0e5ad507":[3,0,0,26,16], +"vehicles_8h.html#ac244743e5ba49da3393199a6866f1461":[3,0,0,26,25], "vehicles_8h.html#ac85fa8465a4900385df692695bc47cd7":[3,0,0,26,20], "vehicles_8h.html#acb05d4b88a09604307082f07c3877156":[3,0,0,26,8], "vehicles_8h.html#ad9c9b7eb822fcdb32e92b5878bca3fbc":[3,0,0,26,17], diff --git a/search/all_7.js b/search/all_7.js index 3c4e965b2..a47e59cd0 100644 --- a/search/all_7.js +++ b/search/all_7.js @@ -4513,7 +4513,7 @@ var searchData= ['gtopspeedextra_11090',['gTopSpeedExtra',['../kart__attributes_8h.html#acca55962295f1a1c20ebc9a631d7c1bd',1,'gTopSpeedExtra(): kart_attributes.inc.c'],['../kart__attributes_8inc_8c.html#a510915a7a9a0a456e71c807c5a875166',1,'gTopSpeedExtra(): kart_attributes.inc.c']]], ['gtopspeedtable_11091',['gTopSpeedTable',['../kart__attributes_8h.html#a30ffc7e2ce3b39a0e830985298f048da',1,'gTopSpeedTable(): kart_attributes.inc.c'],['../kart__attributes_8inc_8c.html#a30ffc7e2ce3b39a0e830985298f048da',1,'gTopSpeedTable(): kart_attributes.inc.c']]], ['gtorchspawns_11092',['gTorchSpawns',['../objects_8h.html#af40885efd72dc665a278c6f29e19ecf3',1,'objects.h']]], - ['gtrains_11093',['gTrains',['../vehicles_8h.html#a8c4f429aeaf1bd513f784ba2377dbf5a',1,'gTrains(): code_80005FD0.c'],['../code__80005FD0_8c.html#a09249d625e1a367d36fbd2863e006f1d',1,'gTrains(): code_80005FD0.c']]], + ['gtrainlist_11093',['gTrainList',['../vehicles_8h.html#ac244743e5ba49da3393199a6866f1461',1,'gTrainList(): code_80005FD0.c'],['../code__80005FD0_8c.html#a2dc210a40d4102b45970958fee517232',1,'gTrainList(): code_80005FD0.c']]], ['gu_2eh_11094',['gu.h',['../gu_8h.html',1,'']]], ['gu_5fpi_11095',['GU_PI',['../gu_8h.html#a771a71c2d959bf835362325d128647f2',1,'gu.h']]], ['gufrustum_11096',['guFrustum',['../gu_8h.html#ab2d0e72372b38fe03d85cecaf3705ebb',1,'gu.h']]], diff --git a/search/variables_7.js b/search/variables_7.js index d3997028d..1986593a2 100644 --- a/search/variables_7.js +++ b/search/variables_7.js @@ -3964,7 +3964,7 @@ var searchData= ['gtopspeedextra_25254',['gTopSpeedExtra',['../kart__attributes_8inc_8c.html#a510915a7a9a0a456e71c807c5a875166',1,'gTopSpeedExtra(): kart_attributes.inc.c'],['../kart__attributes_8h.html#acca55962295f1a1c20ebc9a631d7c1bd',1,'gTopSpeedExtra(): kart_attributes.inc.c']]], ['gtopspeedtable_25255',['gTopSpeedTable',['../kart__attributes_8inc_8c.html#a30ffc7e2ce3b39a0e830985298f048da',1,'gTopSpeedTable(): kart_attributes.inc.c'],['../kart__attributes_8h.html#a30ffc7e2ce3b39a0e830985298f048da',1,'gTopSpeedTable(): kart_attributes.inc.c']]], ['gtorchspawns_25256',['gTorchSpawns',['../objects_8h.html#af40885efd72dc665a278c6f29e19ecf3',1,'objects.h']]], - ['gtrains_25257',['gTrains',['../code__80005FD0_8c.html#a09249d625e1a367d36fbd2863e006f1d',1,'gTrains(): code_80005FD0.c'],['../vehicles_8h.html#a8c4f429aeaf1bd513f784ba2377dbf5a',1,'gTrains(): code_80005FD0.c']]], + ['gtrainlist_25257',['gTrainList',['../code__80005FD0_8c.html#a2dc210a40d4102b45970958fee517232',1,'gTrainList(): code_80005FD0.c'],['../vehicles_8h.html#ac244743e5ba49da3393199a6866f1461',1,'gTrainList(): code_80005FD0.c']]], ['gunexpiredactorslist_25258',['gUnexpiredActorsList',['../code__80005FD0_8h.html#a52b827315d66140beaa00ab43fc3bc73',1,'gUnexpiredActorsList(): code_80005FD0.c'],['../code__80005FD0_8c.html#a84f9a428f9485f5a469a669ee4f0777b',1,'gUnexpiredActorsList(): code_80005FD0.c']]], ['gunkloadstatus_25259',['gUnkLoadStatus',['../heap_8c.html#a18c8c9565c3255791bc80dc8d669e9fd',1,'gUnkLoadStatus(): heap.c'],['../heap_8h.html#ae1259c2a2b59eb3363f37701b26b7487',1,'gUnkLoadStatus(): heap.c']]], ['gunknowndata_5f800f6290_25260',['gUnknownData_800F6290',['../data_8c.html#abab56f372f4ac5dd8af337a822f92b23',1,'gUnknownData_800F6290(): data.c'],['../data_8h.html#abab56f372f4ac5dd8af337a822f92b23',1,'gUnknownData_800F6290(): data.c']]], diff --git a/vehicles_8h.html b/vehicles_8h.html index 6dd1057f7..f07548599 100644 --- a/vehicles_8h.html +++ b/vehicles_8h.html @@ -153,8 +153,8 @@ Macros - - + + @@ -502,8 +502,8 @@ Variables - -

    ◆ gTrains

    + +

    ◆ gTrainList

    @@ -512,7 +512,7 @@ Variables
    diff --git a/vehicles_8h.js b/vehicles_8h.js index 62c7c2e9f..cc56f007e 100644 --- a/vehicles_8h.js +++ b/vehicles_8h.js @@ -25,5 +25,5 @@ var vehicles_8h = [ "gFerries", "vehicles_8h.html#addcb10530364906261cfa5b2255811db", null ], [ "gSchoolBusList", "vehicles_8h.html#a71aa7bba57e9949e3b3cd875f2574cae", null ], [ "gTankerTruckList", "vehicles_8h.html#a85a7ae4a72ab40a4ff366fb5b1c8f64e", null ], - [ "gTrains", "vehicles_8h.html#a8c4f429aeaf1bd513f784ba2377dbf5a", null ] + [ "gTrainList", "vehicles_8h.html#ac244743e5ba49da3393199a6866f1461", null ] ]; \ No newline at end of file diff --git a/vehicles_8h_source.html b/vehicles_8h_source.html index 8e79a0af9..875391d92 100644 --- a/vehicles_8h_source.html +++ b/vehicles_8h_source.html @@ -160,7 +160,7 @@ $(document).ready(function(){initNavTree('vehicles_8h_source.html',''); initResi
    82  /* 0x32 */ // s16 compilerPadding2;
    83 } VehicleStuff; // size = 0x34
    84 
    -
    85 extern TrainStuff gTrains[];
    +
    85 extern TrainStuff gTrainList[];
    86 
    87 // This is an array, maybe they intended to have multiple boats at some point in development?
    88 extern PaddleWheelBoatStuff gFerries[];
    @@ -218,8 +218,8 @@ $(document).ready(function(){initNavTree('vehicles_8h_source.html',''); initResi
    u16
    unsigned short int u16
    Definition: ultratypes.h:14
    gSchoolBusList
    VehicleStuff gSchoolBusList[]
    Definition: code_80005FD0.c:145
    gTankerTruckList
    VehicleStuff gTankerTruckList[]
    Definition: code_80005FD0.c:146
    -
    gTrains
    TrainStuff gTrains[]
    Definition: code_80005FD0.c:140
    gCarList
    VehicleStuff gCarList[]
    Definition: code_80005FD0.c:147
    +
    gTrainList
    TrainStuff gTrainList[]
    Definition: code_80005FD0.c:140
    gBoxTruckList
    VehicleStuff gBoxTruckList[]
    Definition: code_80005FD0.c:144
    gFerries
    PaddleWheelBoatStuff gFerries[]
    Definition: code_80005FD0.c:143
    NUM_PASSENGER_CAR_ENTRIES
    #define NUM_PASSENGER_CAR_ENTRIES
    Definition: vehicles.h:8

    Variables

    TrainStuff gTrains []
     
    TrainStuff gTrainList []
     
    PaddleWheelBoatStuff gFerries []
     
    VehicleStuff gBoxTruckList []
    - +
    TrainStuff gTrains[]TrainStuff gTrainList[]