diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-04-06 19:35:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-06 11:35:13 -0600 |
| commit | 2b66867af1975759dc7acfb3bbc2c9063ffa4353 (patch) | |
| tree | bf8da88f60fc335b9b0529e6ade2f1676e3da610 /src/data | |
| parent | c4d596d297182d81488c7d09769666de450140bb (diff) | |
Rename cpu behaviour related symbols (#586)
* Rename cpu related symbols
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/common_textures.c | 420 | ||||
| -rw-r--r-- | src/data/path_spawn_data.c | 34 | ||||
| -rw-r--r-- | src/data/path_spawn_data.h | 6 |
3 files changed, 238 insertions, 222 deletions
diff --git a/src/data/common_textures.c b/src/data/common_textures.c index b67c00d4a..c4a9fe5a1 100644 --- a/src/data/common_textures.c +++ b/src/data/common_textures.c @@ -1881,7 +1881,7 @@ u8 common_grand_prix_human_item_curve[8][100] = { }, }; -u8 common_grand_prix_cpu_item_curve[8][100] = { +u8 common_grand_prix_kart_ai_item_curve[8][100] = { { ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, @@ -2257,215 +2257,215 @@ Vtx D_0D008ED8[] = { {{{ -1, 3, -1}, 3, {65535, 3}, {0x00, 0x01, 0x00, 0x00}}}, }; -UnkCommonTextureStruct0 D_0D008F18[] = { - { 1, 3, 2, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D008F28[] = { - { 1, 2, 6, }, - { 11, 30, 1, }, - { 55, 74, 1, }, - { 90, 105, 1, }, - { 139, 155, 1, }, - { 177, 205, 1, }, - { 225, 242, 1, }, - { 292, 313, 1, }, - { 352, 373, 1, }, - { 452, 465, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D008F80[] = { - { 1, 2, 6, }, - { 10, 25, 1, }, - { 190, 210, 1, }, - { 270, 290, 1, }, - { 410, 440, 1, }, - { 540, 550, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D008FB8[] = { - { 1, 2, 6, }, - { 60, 80, 1, }, - { 125, 140, 1, }, - { 170, 185, 1, }, - { 230, 240, 1, }, - { 275, 285, 1, }, - { 310, 320, 1, }, - { 321, 349, 3, }, - { 350, 360, 1, }, - { 385, 415, 1, }, - { 450, 468, 1, }, - { 470, 477, 9, }, - { 480, 485, 11, }, - { 543, 546, 9, }, - { 548, 550, 11, }, - { 565, 568, 2, }, - { 630, 631, 6, }, - { 635, 640, 10, }, - { 645, 655, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D009058[] = { - { 1, 2, 6, }, - { 15, 30, 1, }, - { 55, 65, 1, }, - { 125, 150, 1, }, - { 265, 270, 1, }, - { 275, 285, 1, }, - { 305, 320, 2, }, - { 330, 340, 1, }, - { 375, 385, 1, }, - { 547, 570, 1, }, - { 582, 600, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D0090B8[] = { - { 1, 2, 6, }, - { 70, 94, 1, }, - { 120, 133, 1, }, - { 150, 170, 1, }, - { 249, 265, 1, }, - { 360, 395, 1, }, - { 635, 655, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D0090F8[] = { - { 1, 2, 6, }, - { 15, 30, 1, }, - { 41, 63, 1, }, - { 115, 155, 1, }, - { 200, 215, 1, }, - { 240, 241, 9, }, - { 264, 265, 10, }, - { 270, 290, 1, }, - { 345, 375, 1, }, - { 493, 544, 1, }, - { 583, 605, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D009158[] = { - { 1, 2, 6, }, - { 75, 100, 1, }, - { 135, 150, 1, }, - { 355, 390, 1, }, - { 505, 525, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D009188[] = { - { 1, 2, 6, }, - { 65, 80, 1, }, - { 165, 166, 9, }, - { 180, 210, 1, }, - { 220, 221, 10, }, - { 250, 275, 1, }, - { 360, 380, 1, }, - { 440, 480, 1, }, - { 600, 601, 9, }, - { 689, 690, 10, }, - { 695, 725, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D0091E8[] = { - { 1, 2, 6, }, - { 128, 275, 1, }, - { 320, 345, 1, }, - { 465, 565, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D009210[] = { - { 1, 2, 6, }, - { 75, 100, 1, }, - { 175, 210, 1, }, - { 275, 300, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D009238[] = { - { 1, 2, 6, }, - { 106, 188, 1, }, - { 220, 386, 1, }, - { 583, 765, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D009260[] = { - { 1, 2, 6, }, - { 245, 262, 1, }, - { 585, 606, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D009280[] = { - { 1, 2, 6, }, - { 7, 38, 1, }, - { 36, 54, 1, }, - { 129, 150, 1, }, - { 380, 410, 1, }, - { 425, 445, 1, }, - { 456, 500, 1, }, - { 594, 625, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D0092C8[] = { - { 1, 2, 6, }, - { 4, 5, 9, }, - { 129, 130, 10, }, - { 555, 560, 9, }, - { 827, 832, 10, }, - { 810, 845, 1, }, - { 910, 993, 1, }, - { 1390, 1600, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D009310[] = { - { 1, 2, 6, }, - { 80, 120, 1, }, - { 200, 250, 1, }, - { 252, 253, 9, }, - { 273, 295, 1, }, - { 300, 315, 1, }, - { 333, 384, 1, }, - { 400, 401, 10, }, - { 405, 435, 1, }, - { 445, 475, 1, }, - { 485, 525, 1, }, - { 585, 615, 1, }, - { 685, 735, 1, }, - { 783, 820, 1, }, - { 956, 984, 1, }, - { 1005, 1050, 1, }, - { 1063, 1088, 1, }, - { 1130, 1131, 9, }, - { 1169, 1170, 10, }, - { 1195, 1240, 1, }, - { 1262, 1300, 1, }, - { -1, -1, 0, }, -}; - -UnkCommonTextureStruct0 D_0D0093C0[] = { - { 1, 2, 6, }, - { 20, 40, 1, }, - { 190, 191, 9, }, - { 259, 260, 10, }, - { 315, 335, 1, }, - { 353, 370, 1, }, - { 398, 430, 1, }, - { 458, 485, 1, }, - { 510, 535, 1, }, - { 580, 660, 3, }, - { -1, -1, 0, }, +KartAIBehaviour common_kart_ai_behaviour_battle_courses[] = { + { 1, 3, BEHAVIOUR_HOP, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_mario_raceway[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 11, 30, BEHAVIOUR_1, }, + { 55, 74, BEHAVIOUR_1, }, + { 90, 105, BEHAVIOUR_1, }, + { 139, 155, BEHAVIOUR_1, }, + { 177, 205, BEHAVIOUR_1, }, + { 225, 242, BEHAVIOUR_1, }, + { 292, 313, BEHAVIOUR_1, }, + { 352, 373, BEHAVIOUR_1, }, + { 452, 465, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_choco_mountain[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 10, 25, BEHAVIOUR_1, }, + { 190, 210, BEHAVIOUR_1, }, + { 270, 290, BEHAVIOUR_1, }, + { 410, 440, BEHAVIOUR_1, }, + { 540, 550, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_bowser_castle[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 60, 80, BEHAVIOUR_1, }, + { 125, 140, BEHAVIOUR_1, }, + { 170, 185, BEHAVIOUR_1, }, + { 230, 240, BEHAVIOUR_1, }, + { 275, 285, BEHAVIOUR_1, }, + { 310, 320, BEHAVIOUR_1, }, + { 321, 349, BEHAVIOUR_3, }, + { 350, 360, BEHAVIOUR_1, }, + { 385, 415, BEHAVIOUR_1, }, + { 450, 468, BEHAVIOUR_1, }, + { 470, 477, BEHAVIOUR_9, }, + { 480, 485, BEHAVIOUR_MAX_SPEED, }, + { 543, 546, BEHAVIOUR_9, }, + { 548, 550, BEHAVIOUR_MAX_SPEED, }, + { 565, 568, BEHAVIOUR_HOP, }, + { 630, 631, BEHAVIOUR_NORMAL_SPEED, }, + { 635, 640, BEHAVIOUR_10, }, + { 645, 655, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_banshee_boardwalk[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 15, 30, BEHAVIOUR_1, }, + { 55, 65, BEHAVIOUR_1, }, + { 125, 150, BEHAVIOUR_1, }, + { 265, 270, BEHAVIOUR_1, }, + { 275, 285, BEHAVIOUR_1, }, + { 305, 320, BEHAVIOUR_HOP, }, + { 330, 340, BEHAVIOUR_1, }, + { 375, 385, BEHAVIOUR_1, }, + { 547, 570, BEHAVIOUR_1, }, + { 582, 600, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_yoshi_valley[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 70, 94, BEHAVIOUR_1, }, + { 120, 133, BEHAVIOUR_1, }, + { 150, 170, BEHAVIOUR_1, }, + { 249, 265, BEHAVIOUR_1, }, + { 360, 395, BEHAVIOUR_1, }, + { 635, 655, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_frappe_snowland[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 15, 30, BEHAVIOUR_1, }, + { 41, 63, BEHAVIOUR_1, }, + { 115, 155, BEHAVIOUR_1, }, + { 200, 215, BEHAVIOUR_1, }, + { 240, 241, BEHAVIOUR_9, }, + { 264, 265, BEHAVIOUR_10, }, + { 270, 290, BEHAVIOUR_1, }, + { 345, 375, BEHAVIOUR_1, }, + { 493, 544, BEHAVIOUR_1, }, + { 583, 605, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_koopa_beach[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 75, 100, BEHAVIOUR_1, }, + { 135, 150, BEHAVIOUR_1, }, + { 355, 390, BEHAVIOUR_1, }, + { 505, 525, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_royal_raceway[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 65, 80, BEHAVIOUR_1, }, + { 165, 166, BEHAVIOUR_9, }, + { 180, 210, BEHAVIOUR_1, }, + { 220, 221, BEHAVIOUR_10, }, + { 250, 275, BEHAVIOUR_1, }, + { 360, 380, BEHAVIOUR_1, }, + { 440, 480, BEHAVIOUR_1, }, + { 600, 601, BEHAVIOUR_9, }, + { 689, 690, BEHAVIOUR_10, }, + { 695, 725, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_luigi_raceway[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 128, 275, BEHAVIOUR_1, }, + { 320, 345, BEHAVIOUR_1, }, + { 465, 565, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_moo_moo_farm[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 75, 100, BEHAVIOUR_1, }, + { 175, 210, BEHAVIOUR_1, }, + { 275, 300, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_toad_turnpike[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 106, 188, BEHAVIOUR_1, }, + { 220, 386, BEHAVIOUR_1, }, + { 583, 765, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_kalamari_desert[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 245, 262, BEHAVIOUR_1, }, + { 585, 606, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_sherbet_land[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 7, 38, BEHAVIOUR_1, }, + { 36, 54, BEHAVIOUR_1, }, + { 129, 150, BEHAVIOUR_1, }, + { 380, 410, BEHAVIOUR_1, }, + { 425, 445, BEHAVIOUR_1, }, + { 456, 500, BEHAVIOUR_1, }, + { 594, 625, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_rainbow_road[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 4, 5, BEHAVIOUR_9, }, + { 129, 130, BEHAVIOUR_10, }, + { 555, 560, BEHAVIOUR_9, }, + { 827, 832, BEHAVIOUR_10, }, + { 810, 845, BEHAVIOUR_1, }, + { 910, 993, BEHAVIOUR_1, }, + { 1390, 1600, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_wario_stadium[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 80, 120, BEHAVIOUR_1, }, + { 200, 250, BEHAVIOUR_1, }, + { 252, 253, BEHAVIOUR_9, }, + { 273, 295, BEHAVIOUR_1, }, + { 300, 315, BEHAVIOUR_1, }, + { 333, 384, BEHAVIOUR_1, }, + { 400, 401, BEHAVIOUR_10, }, + { 405, 435, BEHAVIOUR_1, }, + { 445, 475, BEHAVIOUR_1, }, + { 485, 525, BEHAVIOUR_1, }, + { 585, 615, BEHAVIOUR_1, }, + { 685, 735, BEHAVIOUR_1, }, + { 783, 820, BEHAVIOUR_1, }, + { 956, 984, BEHAVIOUR_1, }, + { 1005, 1050, BEHAVIOUR_1, }, + { 1063, 1088, BEHAVIOUR_1, }, + { 1130, 1131, BEHAVIOUR_9, }, + { 1169, 1170, BEHAVIOUR_10, }, + { 1195, 1240, BEHAVIOUR_1, }, + { 1262, 1300, BEHAVIOUR_1, }, + { -1, -1, BEHAVIOUR_NONE, }, +}; + +KartAIBehaviour common_kart_ai_behaviour_dk_jungle[] = { + { 1, 2, BEHAVIOUR_NORMAL_SPEED, }, + { 20, 40, BEHAVIOUR_1, }, + { 190, 191, BEHAVIOUR_9, }, + { 259, 260, BEHAVIOUR_10, }, + { 315, 335, BEHAVIOUR_1, }, + { 353, 370, BEHAVIOUR_1, }, + { 398, 430, BEHAVIOUR_1, }, + { 458, 485, BEHAVIOUR_1, }, + { 510, 535, BEHAVIOUR_1, }, + { 580, 660, BEHAVIOUR_3, }, + { -1, -1, BEHAVIOUR_NONE, }, }; // unknown float data diff --git a/src/data/path_spawn_data.c b/src/data/path_spawn_data.c index 8f9f1be68..6d893603f 100644 --- a/src/data/path_spawn_data.c +++ b/src/data/path_spawn_data.c @@ -2,13 +2,29 @@ #include "courses/all_course_data.h" #include "ending/ceremony_data.h" -UnkCommonTextureStruct0 *D_800DC720[] = { - D_0D008F28, D_0D008F80, D_0D008FB8, D_0D009058, - D_0D0090B8, D_0D0090F8, D_0D009158, D_0D009188, - D_0D0091E8, D_0D009210, D_0D009238, D_0D009260, - D_0D009280, D_0D0092C8, D_0D009310, D_0D008F18, - D_0D008F18, D_0D008F18, D_0D0093C0, D_0D008F18, - D_0D008F18, NULL, +KartAIBehaviour *gKartAIBehaviourLUT[NUM_COURSES+1] = { + common_kart_ai_behaviour_mario_raceway, + common_kart_ai_behaviour_choco_mountain, + common_kart_ai_behaviour_bowser_castle, + common_kart_ai_behaviour_banshee_boardwalk, + common_kart_ai_behaviour_yoshi_valley, + common_kart_ai_behaviour_frappe_snowland, + common_kart_ai_behaviour_koopa_beach, + common_kart_ai_behaviour_royal_raceway, + common_kart_ai_behaviour_luigi_raceway, + common_kart_ai_behaviour_moo_moo_farm, + common_kart_ai_behaviour_toad_turnpike, + common_kart_ai_behaviour_kalamari_desert, + common_kart_ai_behaviour_sherbet_land, + common_kart_ai_behaviour_rainbow_road, + common_kart_ai_behaviour_wario_stadium, + common_kart_ai_behaviour_battle_courses, /* COURSE_BLOCK_FORT */ + common_kart_ai_behaviour_battle_courses, /* COURSE_SKYSCRAPER */ + common_kart_ai_behaviour_battle_courses, /* COURSE_DOUBLE_DECK */ + common_kart_ai_behaviour_dk_jungle, + common_kart_ai_behaviour_battle_courses, /* COURSE_BIG_DONUT */ + common_kart_ai_behaviour_battle_courses, /* COURSE_AWARD_CEREMONY */ + NULL, /* NUM_COURSES */ }; TrackWaypoint nullPath = { 0x8000, 0x0000, 0x0000, 0x0000 }; @@ -67,7 +83,7 @@ s16 D_800DCA20[] = { 0x0035, 0x0035, 0x0035, 0x0028, 0x0035, 0x0000, }; -f32 D_800DCA4C[] = { +f32 gKartAICourseMaximumWaypointSeparation[] = { 50.0, 35.0, 35.0, 40.0, 35.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, @@ -76,7 +92,7 @@ f32 D_800DCA4C[] = { 40.0, }; -f32 D_800DCAA0[] = { +f32 gKartAICourseMinimumWaypointSeparation[] = { 0.3, 0.3, 0.2, 0.4, 0.0, 0.3, 0.5, 0.4, 0.7, 0.5, 0.5, 0.3, diff --git a/src/data/path_spawn_data.h b/src/data/path_spawn_data.h index eb394c262..458239037 100644 --- a/src/data/path_spawn_data.h +++ b/src/data/path_spawn_data.h @@ -15,13 +15,13 @@ struct _struct_D_800DD9D0_0x10 { /* 0x0A */ char padA[6]; }; // size 0x10 -extern UnkCommonTextureStruct0 *D_800DC720[]; +extern KartAIBehaviour *gKartAIBehaviourLUT[NUM_COURSES+1]; extern TrackWaypoint nullPath; extern TrackWaypoint *gCoursePathTable[][4]; extern TrackWaypoint *D_800DC8D0[][4]; extern s16 D_800DCA20[]; -extern f32 D_800DCA4C[]; -extern f32 D_800DCAA0[]; +extern f32 gKartAICourseMaximumWaypointSeparation[]; +extern f32 gKartAICourseMinimumWaypointSeparation[]; extern s16 D_800DCAF4[]; extern s16 D_800DCB34[]; extern s16 *D_800DCBB4[]; |
